@legalplace/prerenderx 2.5.3 → 2.5.5-alpha

package/dist/prod_ovc.json

@@ -0,0 +1 @@
+{ "o": { "64": 65, "67": 68, "149": 150, "152": 153, "159": 160, "176": 177, "323": 324, "330": 331, "340": 341, "343": 344, "349": 350, "400": 403, "426": 427, "550": [""], "561": [""], "571": [""], "634": 74 }, "v": { "2": [""], "3": [""], "4": [""], "5": [""], "6": [""], "7": [""], "8": [""], "9": [""], "10": [""], "11": [""], "13": [""], "14": [""], "15": [""], "28": [""], "29": "", "30": "Samy", "31": "19/94/0226", "32": "Paris", "40": "", "41": "", "52": "", "53": "Monsieur", "56": "Madame", "57": "", "58": "jyr", "59": "11/11/1111", "61": "111", "64": "11/11/1111", "74": "", "81": "", "82": "", "83": "", "92": "", "93": "", "95": "", "97": "", "98": "", "99": "", "100": "", "101": "jytr", "129": "", "130": "", "131": "", "132": "", "133": "", "147": "", "148": "", "149": "", "150": "", "151": "", "152": "", "153": "yjt'", "154": "jytrjytr", "155": "", "165": ["Artisanat (Création, Fabrication, Réparation)"], "168": "0619487401", "169": "40 rue de paradis", "170": "75010", "171": "Paris", "177": "", "178": "75010", "179": "11/11/1111", "180": "au moins bac +3", "181": "licenciement économique", "182": "employé, ouvrier", "183": "", "184": "4", "186": "", "187": "60 rue François 1er - 75008 Paris", "188": "", "189": "", "190": "", "191": "", "192": "", "193": "jytrjytr", "194": "jytrjytr", "197": "Madame", "198": "Samy M'Nasri", "199": "19/94/0226", "200": "Paris", "207": "", "208": "", "209": "", "213": "M'Nasri", "214": "19/10/2021", "215": "0", "216": "jytr", "218": "", "219": "", "220": "", "221": "", "222": "", "223": "", "225": "", "265": ["Artisanat (Création, Fabrication, Réparation) - Broderie - "], "266": "", "268": "aaa", "273": "", "275": "", "277": "111111111111111", "278": "", "279": "", "280": [""], "281": [""], "282": [""], "283": ["Broderie"], "284": [""], "285": ["artisanale"], "286": "", "287": "FRANCE", "288": "Française", "289": "true", "294": "", "295": "", "296": "Française", "297": "FRANCE", "298": "", "299": "M'Nasri", "300": "FRANCE", "301": ["Broderie"], "302": "", "303": "", "304": "Samy", "305": "M'Nasri", "306": "", "307": "", "308": "", "309": "xavier.saintgeorges+super@legalplace.fr", "310": "xavier.saintgeorges+super@legalplace.fr", "311": [""], "312": [""], "313": [""], "314": [""], "315": [""], "316": [""], "317": "xavier.saintgeorges+super@legalplace.fr", "318": ["1"], "319": "1", "320": "", "321": "", "322": "", "323": "", "324": "", "325": "", "326": "Française", "327": "Française", "328": "FRANCE", "329": "FRANCE", "330": "x", "331": "", "332": "x", "333": "", "334": "", "335": "x", "336": "", "337": "", "338": "", "339": "", "340": "", "341": "", "342": "", "343": "", "344": "", "345": "", "348": "1", "349": "1", "350": "2", "352": "", "353": "", "354": "jytr", "355": "Samy M'Nasri", "356": "19/10/2021", "357": "false", "358": "optional", "359": "", "360": "[361]", "361": "19/10/2021", "362": "Nom", "363": "", "364": "", "365": "", "366": "40 rue de paradis 75010 Paris", "367": "", "368": "", "369": "", "370": "", "371": "", "372": "", "373": "", "374": "", "375": "", "376": "#domi-vf", "377": "", "378": "", "379": "40 rue de paradis 75010 Paris", "380": "représentant légal", "381": "40 rue de paradis 75010 Paris", "382": "Samy M'Nasri", "383": "newprocessupselloui", "384": "non", "385": "", "386": "non", "387": "signing", "388": "", "389": "", "390": "", "391": "", "392": "la micro-entreprise Samy M'Nasri", "393": "la micro-entreprise Samy M'Nasri", "394": "", "396": "", "397": "N/A (non applicable)", "401": "", "402": "", "403": "", "404": "", "405": "1" }, "c": { "72": false, "129": false, "196": false, "208": false, "210": false, "433": false, "434": false, "435": false, "437": true, "438": false, "439": false, "440": false, "445": false, "451": false, "452": false, "523": false, "525": false, "541": false, "579": [false], "580": [false], "581": [false], "677": false, "689": false, "733": false } }

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var Prerender_1 = __importDefault(require("./libs/Prerender"));
+var prod_ovc_json_1 = __importDefault(require("./prod_ovc.json"));
+var model_json_1 = __importDefault(require("./model.json"));
+console.time('test');
+var docIndex = new Prerender_1.default(model_json_1.default, prod_ovc_json_1.default).getDocumentsIndex();
+console.timeEnd('test');
+console.log(JSON.stringify(docIndex));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.5.3",
+  "version": "2.5.5-alpha",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -11,13 +11,15 @@
     "lint": "tsc && eslint ./src/ --ext ts,js",
     "lint:fix": "tsc && eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
     "test": "jest",
-    "build": "tsc"
+    "build": "tsc",
+    "release": "standard-version -a --no-verify"
   },
   "dependencies": {
-    "@legalplace/lplogic": "^2.1.6",
-    "@legalplace/models-v3-types": "^3.5.1",
-    "@legalplace/referencesparser": "^1.6.3",
+    "@legalplace/lplogic": "2.1.6",
+    "@legalplace/models-v3-types": "3.5.1",
+    "@legalplace/referencesparser": "1.6.3",
     "crypto": "^1.0.1",
+    "standard-version": "^9.3.1",
     "typescript": "3.9.3"
   },
   "devDependencies": {

package/src/libs/ConditionsRunner.ts

@@ -18,6 +18,33 @@ interface ConditionData {
   v: Record<string, (string | number)[]>
 }
 
+const conditionsCache: {
+  [key: string]: boolean
+} = {}
+
+/**
+ * Generates cache key
+ * @param condition 
+ * @param id 
+ * @param index 
+ * @param conditionType 
+ * @returns string
+ */
+const createConditionCacheKey = (
+  condition: {
+    dataMap: ConditionDataMap
+    conditions: ConditionV3
+  },
+  id: number,
+  index: number,
+  conditionType: 'options' | 'optionValidator' | 'variables' | 'prefillers' | 'variableValidator' | 'sections' | 'documents'
+) => {
+  const conditionString = JSON.stringify(condition);
+
+  return `${id}-${index}-${conditionType}-${conditionString}`
+}
+
+
 class ConditionsRunner {
   private references: Types.ReferencesType
 
@@ -92,8 +119,16 @@ class ConditionsRunner {
     index: number,
     conditionType: 'options' | 'optionValidator' | 'variables' | 'prefillers' | 'variableValidator' | 'sections' | 'documents'
   ): any {
+    // In case we have multiple conditions let's run them here
     if (Array.isArray(condition)) return condition.map(_condition => this.executeCondition(_condition, id, index, conditionType))
 
+    // Generating cache key
+    const cacheKey = createConditionCacheKey(condition, id, index, conditionType)
+
+    // Checking if condition was already calculated
+    if (Object.prototype.hasOwnProperty.call(conditionsCache, cacheKey))
+      return conditionsCache[cacheKey]
+
     // Populating Data
     let currentData
     if (conditionType === 'options' || conditionType === 'optionValidator') {
@@ -105,7 +140,11 @@ class ConditionsRunner {
       currentData = new DataPopulator(this, this.references, this.ovc, condition.dataMap, id, index).getData()
     }
 
-    return LpLogic(condition.conditions, currentData)
+    // Running condition and storing it in cache
+    conditionsCache[cacheKey] = LpLogic(condition.conditions, currentData);
+
+    // Returning cache result
+    return conditionsCache[cacheKey];
   }
 }
 

package/src/libs/OutputParser.ts

@@ -1,6 +1,16 @@
 import { Types } from '@legalplace/referencesparser'
 import OVC_TYPE from './ovc.type'
 
+/**
+ * Parses number to correct french number format ("," instead of ".")
+ */
+const frenchNumber = (value: string | number) => {
+  let result = typeof value === 'number' ? value.toString() : value;
+  if (/^([0-9]+)\.([0-9]+)$/.test(result.trim()))
+    result = result.trim().replace('.', ',');
+  return result;
+};
+
 /**
  * Returns option's related variable values
  * @param optionId Option's id
@@ -31,8 +41,7 @@ export const getRelatedVariablesValues: getRelatedVarsT = (optionId, index, vari
 
     // Making sure all values are strings
     const cleanValues = value.map(currentValue => {
-      if (typeof currentValue === 'number') return currentValue.toString()
-      if (typeof currentValue === 'string') return currentValue
+      if (['number', 'string'].includes(typeof currentValue)) return frenchNumber(currentValue)
       return ''
     })