Commit 649c1c2f authored by Ludan Stoecklé's avatar Ludan Stoecklé

1.5.7

parent c38acf30
......@@ -19,7 +19,7 @@ stages:
# variables etc.
variables:
ROSAENLG_VERSION: 1.5.6
ROSAENLG_VERSION: 1.5.7
DOCKER_REGISTRY: registry.gitlab.com/rosaenlg-projects/rosaenlg
DOCKER_CLI_ROOT: ${DOCKER_REGISTRY}/cli
DOCKER_SERVER_ROOT: ${DOCKER_REGISTRY}/server
......
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
SNYK-JS-HTTPSPROXYAGENT-469131:
- lerna > @lerna/publish > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/add > @evocateur/pacote > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/create > @evocateur/pacote > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/publish > @evocateur/pacote > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/add > @evocateur/pacote > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/create > @evocateur/pacote > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/publish > @evocateur/pacote > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/publish > @evocateur/libnpmaccess > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/publish > @lerna/npm-dist-tag > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
- lerna > @lerna/publish > @lerna/npm-publish > @evocateur/libnpmpublish > @evocateur/npm-registry-fetch > make-fetch-happen > https-proxy-agent:
patched: '2019-10-08T17:20:02.563Z'
......@@ -6,4 +6,7 @@
{"language": "typescript", "autoFix": true },
{"language": "typescriptreact", "autoFix": true }
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
}
\ No newline at end of file
Main repo for RosaeNLG.
Doc is published here: https://rosaenlg.org
Doc is published here: https://rosaenlg.org (mirror available here: https://rosaenlg-projects.gitlab.io/docs-site/)
......@@ -38,7 +38,5 @@
"packages/*"
],
"dependencies": {
"snyk": "^1.247.1"
},
"snyk": true
}
}
{
"name": "browser-ide-demo",
"version": "1.5.6",
"version": "1.5.7",
"description": "Client side demo of NLG templates compilation and rendering using RosaeNLG",
"main": "index.js",
"scripts": {
......@@ -34,7 +34,7 @@
"gulp-inject-string": "^1.1.2",
"gulp-rename": "^1.4.0",
"merge-stream": "^2.0.0",
"rosaenlg": "1.5.6",
"rosaenlg": "1.5.7",
"tinyify": "^2.5.2",
"vue-codemirror": "^4.0.6"
}
......
{
"name": "content-deduplicate",
"version": "0.0.4",
"version": "0.0.5",
"description": "Calculates distances between texts to prevent duplicate content",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -54,6 +54,6 @@
},
"dependencies": {
"k-medoids": "^1.0.6",
"synonym-optimizer": "2.5.6"
"synonym-optimizer": "2.5.7"
}
}
{
"name": "english-determiners",
"version": "2.5.6",
"version": "2.5.7",
"description": "English determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-adjectives",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6"
"french-h-muet-aspire": "2.5.7"
},
"keywords": [
"french",
......
{
"name": "french-determiners",
"version": "2.5.6",
"version": "2.5.7",
"description": "French determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-h-muet-aspire",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6",
"version": "2.5.7",
"description": "Ordinal numbers in French: 12 => douzième",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-verbs",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6"
"french-h-muet-aspire": "2.5.7"
},
"devDependencies": {
"copyfiles": "^2.1.1",
......
{
"name": "french-words-gender",
"version": "2.5.6",
"version": "2.5.7",
"description": "Gender of French words, based on the Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-adjectives",
"version": "2.5.6",
"version": "2.5.7",
"description": "German adjectives, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-determiners",
"version": "2.5.6",
"version": "2.5.7",
"description": "German determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-dict-helper",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6",
"version": "2.5.7",
"description": "Ordinal numbers in German: 12 => zwölfte",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-verbs",
"version": "2.5.6",
"version": "2.5.7",
"description": "German verbs, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-words",
"version": "2.5.6",
"version": "2.5.7",
"description": "Gender and case of German words, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "gulp-rosaenlg",
"version": "2.5.6",
"version": "2.5.7",
"description": "RosaeNLG client side packaging helper",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -60,6 +60,6 @@
"browserify": "^16.5.0",
"debug": "^4.1.1",
"minify-stream": "^1.2.1",
"rosaenlg": "1.5.6"
"rosaenlg": "1.5.7"
}
}
{
"name": "italian-adjectives",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6"
"rosaenlg-filter": "2.5.7"
}
}
{
"name": "italian-determiners",
"version": "2.5.6",
"version": "2.5.7",
"description": "Italian determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-ordinals-cardinals",
"version": "2.5.6",
"version": "2.5.7",
"description": "Ordinal and cardinal numbers in Italian",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-verbs",
"version": "2.5.6",
"version": "2.5.7",
"description": "Italian verbs, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-words",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6",
"version": "2.5.7",
"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.5.6",
"version": "2.5.7",
"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-cli",
"version": "1.5.6",
"version": "1.5.7",
"description": "RosaeNLG's CLI interface",
"bin": {
"rosaenlg": "./index.js",
......@@ -10,9 +10,9 @@
"dependencies": {
"chalk": "^3.0.0",
"commander": "^4.0.1",
"gulp-rosaenlg": "2.5.6",
"gulp-rosaenlg": "2.5.7",
"mkdirp": "^0.5.1",
"rosaenlg": "1.5.6"
"rosaenlg": "1.5.7"
},
"devDependencies": {
"mocha": "^6.2.2",
......
......@@ -10,6 +10,7 @@ import * as html from './html';
export const blockLevelHtmlElts = html.blockLevelElts;
export const inlineHtmlElts = html.inlineElts;
export const EATSPACE = punctuation.EATSPACE;
//import * as Debug from 'debug';
//const debug = Debug('rosaenlg-filter');
......
import { tousCaracteresMinMajRe, stdBetweenWithParenthesis } from './constants';
import { tousCaracteresMinMajRe } from './constants';
import { Languages, allPunctList, spaceOrNonBlockingClass } from './constants';
export const EATSPACE = 'EATSPACE';
export function duplicatePunctuation(input: string, lang: Languages): string {
let res = input;
......@@ -11,7 +13,7 @@ export function duplicatePunctuation(input: string, lang: Languages): string {
const regexDoublePunct = new RegExp(`([${allPunctList}])((?:${spaceOrNonBlockingClass}*[${allPunctList}])*)`, 'g');
res = res.replace(regexDoublePunct, function(match: string, firstPunct: string, otherStuff: string): string {
const regexRemovePunct = new RegExp(`[${allPunctList}]`, 'g');
const removedPunct = otherStuff.replace(regexRemovePunct, function(match: string): string {
const removedPunct = otherStuff.replace(regexRemovePunct, function(/*match: string*/): string {
return '';
});
return `${firstPunct}${removedPunct}`;
......@@ -69,7 +71,8 @@ export function cleanSpacesPunctuation(input: string, lang: Languages): string {
res = res.trim();
// eat spaces
res = res.replace(/\s+EATSPACE\s+/g, '');
const eatspaceRe = new RegExp(`[\\s¤]+${EATSPACE}[\\s¤]+`, 'g');
res = res.replace(eatspaceRe, '');
if (lang === 'en_US') {
// ['the phone \'s', 'The phone\'s'],
......@@ -106,7 +109,7 @@ export function quotes(input: string /*, lang: string*/): string {
const regexQuotes = new RegExp(`(\\s*)"(\\s*)`, 'g');
let alreadyStarted = false;
res = res.replace(regexQuotes, function(corresp, before, after): string {
res = res.replace(regexQuotes, function(/*corresp, before, after*/): string {
if (!alreadyStarted) {
alreadyStarted = true;
return ' "';
......
{
"name": "rosaenlg-filter",
"version": "2.5.6",
"version": "2.5.7",
"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.5.6",
"french-h-muet-aspire": "2.5.7",
"titlecase-french": "^1.0.1"
},
"keywords": [
......
{
"name": "rosaenlg-node-server",
"version": "1.5.6",
"version": "1.5.7",
"description": "Server for RosaeNLG, written in node.js",
"main": "dist/app.js",
"bin": {
......@@ -14,7 +14,7 @@
},
"repository": {
"type": "git",
"url": "git+ssh://git@gitlab.com/rosaenlg-projects/rosaenlg-node-server.git"
"url": "git@gitlab.com:rosaenlg-projects/rosaenlg.git"
},
"keywords": [
"RosaeNLG",
......@@ -24,9 +24,9 @@
"author": "Ludan Stoecklé <ludan.stoeckle@rosaenlg.org>",
"license": "MIT",
"bugs": {
"url": "https://gitlab.com/rosaenlg-projects/rosaenlg-node-server/issues"
"url": "https://gitlab.com/rosaenlg-projects/rosaenlg/issues"
},
"homepage": "https://gitlab.com/rosaenlg-projects/rosaenlg-node-server#readme",
"homepage": "https://rosaenlg.org",
"nyc": {
"extension": [
".ts"
......@@ -71,7 +71,7 @@
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-prettier": "^3.1.1",
"gulp": "^4.0.2",
"gulp-rosaenlg": "2.5.6",
"gulp-rosaenlg": "2.5.7",
"json-refs": "^3.0.13",
"mocha": "^6.2.2",
"nyc": "^14.1.1",
......@@ -85,7 +85,7 @@
"body-parser": "^1.19.0",
"express": "^4.17.1",
"node-cache": "5.0.2",
"rosaenlg": "1.5.6",
"rosaenlg": "1.5.7",
"sha1": "^1.1.1",
"swagger-ui-express": "^4.1.2"
}
......
{
"name": "rosaenlg-pug-code-gen",
"version": "3.5.6",
"version": "3.5.7",
"description": "Default code-generator for pug. It generates HTML via a JavaScript template function. - RosaeNLG fork",
"scripts": {
"build": "tsc && cp lib/index.js dist/",
......@@ -52,13 +52,13 @@
"constantinople": "^4.0.1",
"debug": "^4.1.1",
"doctypes": "^1.1.0",
"french-verbs": "2.5.6",
"german-adjectives": "2.5.6",
"german-verbs": "2.5.6",
"german-words": "2.5.6",
"italian-adjectives": "2.5.6",
"italian-verbs": "2.5.6",
"italian-words": "2.5.6",
"french-verbs": "2.5.7",
"german-adjectives": "2.5.7",
"german-verbs": "2.5.7",
"german-words": "2.5.7",
"italian-adjectives": "2.5.7",
"italian-verbs": "2.5.7",
"italian-words": "2.5.7",
"js-stringify": "^1.0.2",
"pug-attrs": "^2.0.3",
"pug-error": "^1.3.2",
......
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:hoek:20180212':
- jstransformer-less > less > request > hawk > hoek:
patched: '2019-10-08T17:22:18.014Z'
- jstransformer-less > less > request > hawk > boom > hoek:
patched: '2019-10-08T17:22:18.014Z'
- jstransformer-less > less > request > hawk > sntp > hoek:
patched: '2019-10-08T17:22:18.014Z'
- jstransformer-less > less > request > hawk > cryptiles > boom > hoek:
patched: '2019-10-08T17:22:18.014Z'
SNYK-JS-HTTPSPROXYAGENT-469131:
- snyk > proxy-agent > https-proxy-agent:
patched: '2019-10-08T17:55:02.017Z'
- snyk > proxy-agent > pac-proxy-agent > https-proxy-agent:
patched: '2019-10-08T17:55:02.017Z'
{
"name": "rosaenlg-pug-filters",
"version": "4.5.6",
"version": "4.5.7",
"description": "Code for processing filters in pug templates - RosaeNLG fork",
"scripts": {},
"keywords": [
......@@ -12,8 +12,7 @@
"jstransformer": "1.0.0",
"pug-error": "^1.3.2",
"resolve": "^1.1.6",
"rosaenlg-pug-walk": "2.4.6",
"snyk": "^1.232.0"
"rosaenlg-pug-walk": "2.4.7"
},
"devDependencies": {
"jstransformer-cdata": "^1.0.0",
......@@ -21,15 +20,14 @@
"jstransformer-less": "^2.3.0",
"jstransformer-markdown-it": "^2.1.0",
"jstransformer-stylus": "^1.0.0",
"rosaenlg-pug-lexer": "5.4.6",
"rosaenlg-pug-load": "3.4.6",
"rosaenlg-pug-parser": "6.4.6"
"rosaenlg-pug-lexer": "5.4.7",
"rosaenlg-pug-load": "3.4.7",
"rosaenlg-pug-parser": "6.4.7"
},
"repository": {
"type": "git",
"url": "git@gitlab.com:rosaenlg-projects/rosaenlg.git"
},
"author": "Ludan Stoecklé",
"license": "MIT",
"snyk": true
"license": "MIT"
}
{
"name": "rosaenlg-pug-lexer",
"version": "5.4.6",
"version": "5.4.7",
"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.4.6",
"version": "4.4.7",
"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.4.6"
"rosaenlg-pug-walk": "2.4.7"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.4.6",
"rosaenlg-pug-load": "3.4.6",
"rosaenlg-pug-parser": "6.4.6"
"rosaenlg-pug-lexer": "5.4.7",
"rosaenlg-pug-load": "3.4.7",
"rosaenlg-pug-parser": "6.4.7"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-load",
"version": "3.4.6",
"version": "3.4.7",
"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.4.6"
"rosaenlg-pug-walk": "2.4.7"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.4.6",