Commit b275b6a8 authored by Ludan Stoecklé's avatar Ludan Stoecklé

1.3.3

parent 2d798ebe
{
"name": "english-determiners",
"version": "2.3.2",
"version": "2.3.3",
"description": "English determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-adjectives",
"version": "2.3.2",
"version": "2.3.3",
"description": "Agreement of adjectives in French",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -45,7 +45,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.3.2"
"french-h-muet-aspire": "2.3.3"
},
"keywords": [
"french",
......
{
"name": "french-determiners",
"version": "2.3.2",
"version": "2.3.3",
"description": "French determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-h-muet-aspire",
"version": "2.3.2",
"version": "2.3.3",
"description": "List of French words that are \"aspiré\" (vs. \"muet\")\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[Dstarting with a h that is \"aspiré\" vs \"muet\"",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-ordinals",
"version": "2.3.2",
"version": "2.3.3",
"description": "Ordinal numbers in French: 12 => douzième",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-verbs",
"version": "2.3.2",
"version": "2.3.3",
"description": "French verbs: conjugation, based on the Lefff contents, and list of transitive and intransitive verbs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -50,7 +50,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.3.2"
"french-h-muet-aspire": "2.3.3"
},
"devDependencies": {
"copyfiles": "^2.1.0",
......
{
"name": "french-words-gender",
"version": "2.3.2",
"version": "2.3.3",
"description": "Gender of French words, based on the Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-adjectives",
"version": "2.3.2",
"version": "2.3.3",
"description": "German adjectives, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-determiners",
"version": "2.3.2",
"version": "2.3.3",
"description": "German determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-dict-helper",
"version": "2.3.2",
"version": "2.3.3",
"description": "Helper functions on an included database derived from german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-ordinals",
"version": "2.3.2",
"version": "2.3.3",
"description": "Ordinal numbers in German: 12 => zwölfte",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-verbs",
"version": "2.3.2",
"version": "2.3.3",
"description": "German verbs, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-words",
"version": "2.3.2",
"version": "2.3.3",
"description": "Gender and case of German words, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
......@@ -30,13 +30,13 @@ npm install gulp-freenlpg
* `entryTemplate`: string; the main template; do not put the full path
* `folderWithTemplates`: string; the folder containing all the templates (including the `entryTemplate`)
* `compileInfo`: mandatory as at some point compilation will occur
** `activate`: boolean; if set, the template will be compiled, and included in the output
** `compileDebug`: boolean; activate Pug debug
** `language`: language
* `activate`: boolean; if set, the template will be compiled, and included in the output
* `compileDebug`: boolean; activate Pug debug
* `language`: language
* `autotest`: all fields will just be copied as is in the output (not used during packaging)
** `activate`: boolean
** `input`: object that is a valid input to render the template
** `expected`: string[]; strings that should be in the rendered template
* `activate`: boolean
* `input`: object that is a valid input to render the template
* `expected`: string[]; strings that should be in the rendered template
```javascript
......
......@@ -111,10 +111,15 @@ export function packageTemplateJson(params: PackagedTemplateParams): PackagedTem
const res: PackagedTemplate = {
templateId: params.templateId,
entryTemplate: params.entryTemplate,
compileInfo: params.compileInfo,
compileInfo: Object.assign({}, params.compileInfo), // as we will modify the object in res
templates: {},
};
// as it is not useful in the result
if (res.compileInfo && res.compileInfo.activate != null) {
delete res.compileInfo.activate;
}
// autotest data if present
if (params.autotest) {
res.autotest = params.autotest;
......
{
"name": "gulp-rosaenlg",
"version": "2.3.2",
"version": "2.3.3",
"description": "RosaeNLG client side packaging helper",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -60,6 +60,6 @@
"browserify": "^16.2.3",
"debug": "^4.1.1",
"minify-stream": "^1.2.0",
"rosaenlg": "1.3.2"
"rosaenlg": "1.3.3"
}
}
......@@ -105,6 +105,7 @@ describe('gulp-rosaenlg', function() {
},
});
// console.log(JSON.stringify(packagedObj));
assert(!packagedObj.activate);
assert(packagedObj.compiled != null);
assert(packagedObj.compiled.indexOf('bla') > -1);
assert(packagedObj.compiled.indexOf('pug_html') > -1);
......
{
"name": "italian-adjectives",
"version": "2.3.2",
"version": "2.3.3",
"description": "Italian adjectives, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -58,6 +58,6 @@
"license": "MIT",
"dependencies": {
"debug": "^4.1.1",
"rosaenlg-filter": "2.3.2"
"rosaenlg-filter": "2.3.3"
}
}
{
"name": "italian-determiners",
"version": "2.3.2",
"version": "2.3.3",
"description": "Italian determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-ordinals-cardinals",
"version": "2.3.2",
"version": "2.3.3",
"description": "Ordinal and cardinal numbers in Italian",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-verbs",
"version": "2.3.2",
"version": "2.3.3",
"description": "Italian verbs, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-words",
"version": "2.3.2",
"version": "2.3.3",
"description": "Gender and plural of Italian words, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "lefff-helper",
"version": "2.3.2",
"version": "2.3.3",
"description": "Helper functions on an included database derived from Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "morph-it-helper",
"version": "2.3.2",
"version": "2.3.3",
"description": "Helper functions on an included database derived from morph-it (Free Morphological Lexicon for the Italian Language)",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "rosaenlg-filter",
"version": "2.3.2",
"version": "2.3.3",
"description": "Filtering feature of RosaeNLG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -43,7 +43,7 @@
"better-title-case": "^1.0.1",
"compromise": "^11.14.3",
"debug": "^4.1.1",
"french-h-muet-aspire": "2.3.2",
"french-h-muet-aspire": "2.3.3",
"titlecase-french": "^1.0.1"
},
"keywords": [
......
{
"name": "rosaenlg-pug-code-gen",
"version": "3.3.2",
"version": "3.3.3",
"description": "Default code-generator for pug. It generates HTML via a JavaScript template function. - RosaeNLG fork",
"scripts": {
"build": "tsc && cp lib/index.js dist/",
......@@ -53,13 +53,13 @@
"constantinople": "^3.1.2",
"debug": "^4.1.1",
"doctypes": "^1.1.0",
"french-verbs": "2.3.2",
"german-adjectives": "2.3.2",
"german-verbs": "2.3.2",
"german-words": "2.3.2",
"italian-adjectives": "2.3.2",
"italian-verbs": "2.3.2",
"italian-words": "2.3.2",
"french-verbs": "2.3.3",
"german-adjectives": "2.3.3",
"german-verbs": "2.3.3",
"german-words": "2.3.3",
"italian-adjectives": "2.3.3",
"italian-verbs": "2.3.3",
"italian-words": "2.3.3",
"js-stringify": "^1.0.1",
"pug-attrs": "^2.0.3",
"pug-error": "^1.3.2",
......
{
"name": "rosaenlg-pug-filters",
"version": "4.3.2",
"version": "4.3.3",
"description": "Code for processing filters in pug templates - RosaeNLG fork",
"scripts": {},
"keywords": [
......@@ -12,7 +12,7 @@
"jstransformer": "1.0.0",
"pug-error": "^1.3.2",
"resolve": "^1.1.6",
"rosaenlg-pug-walk": "2.2.2",
"rosaenlg-pug-walk": "2.2.3",
"snyk": "^1.232.0"
},
"devDependencies": {
......@@ -21,9 +21,9 @@
"jstransformer-less": "^2.3.0",
"jstransformer-markdown-it": "^2.1.0",
"jstransformer-stylus": "^1.0.0",
"rosaenlg-pug-lexer": "5.2.2",
"rosaenlg-pug-load": "3.2.2",
"rosaenlg-pug-parser": "6.2.2"
"rosaenlg-pug-lexer": "5.2.3",
"rosaenlg-pug-load": "3.2.3",
"rosaenlg-pug-parser": "6.2.3"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-lexer",
"version": "5.2.2",
"version": "5.2.3",
"description": "The pug lexer (takes a string and converts it to an array of tokens) - RosaeNLG fork",
"keywords": [
"pug"
......
{
"name": "rosaenlg-pug-linker",
"version": "4.2.2",
"version": "4.2.3",
"description": "Link multiple pug ASTs together using include/extends - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,12 +8,12 @@
"scripts": {},
"dependencies": {
"pug-error": "^1.3.2",
"rosaenlg-pug-walk": "2.2.2"
"rosaenlg-pug-walk": "2.2.3"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.2.2",
"rosaenlg-pug-load": "3.2.2",
"rosaenlg-pug-parser": "6.2.2"
"rosaenlg-pug-lexer": "5.2.3",
"rosaenlg-pug-load": "3.2.3",
"rosaenlg-pug-parser": "6.2.3"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-load",
"version": "3.2.2",
"version": "3.2.3",
"description": "The Pug loader is responsible for loading the depenendencies of a given Pug file. - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,11 +8,11 @@
"scripts": {},
"dependencies": {
"object-assign": "^4.1.0",
"rosaenlg-pug-walk": "2.2.2"
"rosaenlg-pug-walk": "2.2.3"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.2.2",
"rosaenlg-pug-parser": "6.2.2"
"rosaenlg-pug-lexer": "5.2.3",
"rosaenlg-pug-parser": "6.2.3"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-parser",
"version": "6.2.2",
"version": "6.2.3",
"description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree) - RosaeNLG fork",
"keywords": [
"pug"
......
{
"name": "rosaenlg-pug-walk",
"version": "2.2.2",
"version": "2.2.3",
"description": "Walk and transform a pug AST - RosaeNLG fork",
"keywords": [
"pug"
],
"scripts": {},
"devDependencies": {
"rosaenlg-pug-lexer": "5.2.2",
"rosaenlg-pug-parser": "6.2.2"
"rosaenlg-pug-lexer": "5.2.3",
"rosaenlg-pug-parser": "6.2.3"
},
"dependencies": {
"debug": "^4.1.1"
......
{
"name": "rosaenlg-yseop",
"version": "2.3.2",
"version": "2.3.3",
"description": "Yseop code generator for RosaeNLG. It generates Yseop Text compatible templates. Derived from rosaenlg-pug-code-gen.",
"scripts": {},
"keywords": [
......
name: rosaenlg
version: '1.3.2'
version: '1.3.3'
title: RosaeNLG
nav:
- modules/ROOT/nav.adoc
......
......@@ -8,8 +8,14 @@ https://keepachangelog.com/en/0.3.0/
=== Changed
////
== [1.3.3] - 2019-10-29
== [1.3.2]
=== Fixed
* `#[+value('some string')]` didn't work no more
== [1.3.2] - 2019-10-27
=== Added
......
......@@ -13,6 +13,7 @@ When using `renderFile` or `render`, parameters are (along Pug's standard parame
Along all https://pugjs.org/api/reference.html[Pug's parameters], you should put `cache:true`.
To xref:yseop:yseop.adoc[generate Yseop templates]:
* put `yseop:true`
* use `string:true` to generate a plain string containing all templates, which is handy for debug
* or to generate the Yseop TextFunction files, provide `yseopPath` as the folder where to write them
......
{
"name": "rosaenlg",
"description": "A complete Natural Language Generation library based on Pug",
"version": "1.3.2",
"version": "1.3.3",
"keywords": [
"NLG",
"Natural Language Generation"
......@@ -74,40 +74,40 @@
"@types/random-js": "^1.0.31",
"compromise": "^11.14.3",
"debug": "^4.1.1",
"english-determiners": "2.3.2",
"french-adjectives": "2.3.2",
"french-determiners": "2.3.2",
"french-ordinals": "2.3.2",
"french-verbs": "2.3.2",
"french-words-gender": "2.3.2",
"german-adjectives": "2.3.2",
"german-determiners": "2.3.2",
"german-dict-helper": "2.3.2",
"german-ordinals": "2.3.2",
"german-verbs": "2.3.2",
"german-words": "2.3.2",
"italian-adjectives": "2.3.2",
"italian-determiners": "2.3.2",
"italian-ordinals-cardinals": "2.3.2",
"italian-verbs": "2.3.2",
"italian-words": "2.3.2",
"lefff-helper": "2.3.2",
"english-determiners": "2.3.3",
"french-adjectives": "2.3.3",
"french-determiners": "2.3.3",
"french-ordinals": "2.3.3",
"french-verbs": "2.3.3",
"french-words-gender": "2.3.3",
"german-adjectives": "2.3.3",
"german-determiners": "2.3.3",
"german-dict-helper": "2.3.3",
"german-ordinals": "2.3.3",
"german-verbs": "2.3.3",
"german-words": "2.3.3",
"italian-adjectives": "2.3.3",
"italian-determiners": "2.3.3",
"italian-ordinals-cardinals": "2.3.3",
"italian-verbs": "2.3.3",
"italian-words": "2.3.3",
"lefff-helper": "2.3.3",
"moment": "^2.24.0",
"morph-it-helper": "2.3.2",
"morph-it-helper": "2.3.3",
"numeral": "^2.0.6",
"pluralize-fr": "^1.0.1",
"pug-runtime": "^2.0.4",
"pug-strip-comments": "^1.0.3",
"random-js": "^2.0.0-rc3",
"rosaenlg-filter": "2.3.2",
"rosaenlg-pug-code-gen": "3.3.2",
"rosaenlg-pug-filters": "4.3.2",
"rosaenlg-pug-lexer": "5.2.2",
"rosaenlg-pug-linker": "4.2.2",
"rosaenlg-pug-load": "3.2.2",
"rosaenlg-pug-parser": "6.2.2",
"rosaenlg-yseop": "2.3.2",
"synonym-optimizer": "2.3.2",
"rosaenlg-filter": "2.3.3",
"rosaenlg-pug-code-gen": "3.3.3",
"rosaenlg-pug-filters": "4.3.3",
"rosaenlg-pug-lexer": "5.2.3",
"rosaenlg-pug-linker": "4.2.3",
"rosaenlg-pug-load": "3.2.3",
"rosaenlg-pug-parser": "6.2.3",
"rosaenlg-yseop": "2.3.3",
"synonym-optimizer": "2.3.3",
"write-int": "^0.0.2",
"written-number": "^0.9.1"
},
......
......@@ -252,6 +252,11 @@ export class ValueManager {
return 'SOME_STRING';
}
// simplest case but edge case
if (!params) {
return val;
}
if (this.language === 'de_DE') {
params.case = params.case || 'NOMINATIVE';
}
......
-
util.expected = `
House
house
`;
t
l #[+value('house')]
l #[+value('house', {})]
......@@ -60,6 +60,7 @@ const testCasesByLang = {
'multilingual',
{ name: 'misc', params: { forceRandomSeed: 123 } },
'new_struct',
'value_basic',
],
};
......