@legalplace/prerenderx 2.5.1 → 2.5.3

package/dist/libs/DataPopulator.js

@@ -102,7 +102,6 @@ var DataPopulator = (function () {
         }
     };
     DataPopulator.prototype.getVariableValues = function (variableId) {
-        var conditions = this.variableConditionValue(variableId);
         var value = this.ovc.variables[variableId];
         if (this.id === undefined || this.index === undefined) {
             return value;
@@ -110,18 +109,9 @@ var DataPopulator = (function () {
         var variableRootParent = this.getVariableRootParent(variableId);
         var variableRootRelations = this.references.relations.options[variableRootParent];
         if (variableRootRelations.children.options.includes(this.id) || variableRootRelations.dependants.includes(this.id) || this.id === variableRootParent) {
-            if (conditions !== undefined && conditions[this.index] === false)
-                return ['fAl$e'];
             return [value[this.index]];
         }
-        var cleanValues = this.cleanArrayFromNullValues(__spreadArrays(value));
-        if (conditions === undefined)
-            return cleanValues;
-        return cleanValues.map(function (currentValue, index) {
-            if (conditions[index] === false)
-                return 'fAl$e';
-            return currentValue;
-        });
+        return this.cleanArrayFromNullValues(__spreadArrays(value));
     };
     DataPopulator.prototype.getVariableRootParent = function (variableId) {
         var variableParents = this.references.relations.variables[variableId].parents;
@@ -138,7 +128,6 @@ var DataPopulator = (function () {
         }
     };
     DataPopulator.prototype.getOptionInputs = function (optionId) {
-        var conditions = this.optionConditionValue(optionId);
         var inputs = this.ovc.options[optionId];
         if (this.id === undefined || this.index === undefined) {
             return inputs;
@@ -146,17 +135,9 @@ var DataPopulator = (function () {
         var optionRootParent = this.getOptionRootParent(optionId);
         var optionRootRelations = this.references.relations.options[optionRootParent];
         if (optionRootRelations.children.options.includes(this.id) || optionRootRelations.dependants.includes(this.id) || this.id === optionRootParent) {
-            if (conditions !== undefined && conditions[this.index] === false)
-                return [false];
             return [inputs[this.index]];
         }
-        if (conditions === undefined)
-            return inputs;
-        return inputs.map(function (value, index) {
-            if (conditions[index] === false)
-                return false;
-            return value;
-        });
+        return inputs;
     };
     DataPopulator.prototype.getOptionRootParent = function (optionId) {
         var optionParents = this.references.relations.options[optionId].parents;

package/dist/libs/OutputParser.d.ts

@@ -6,4 +6,6 @@ export declare const getRelatedVariablesValues: getRelatedVarsT;
 declare type autonumsType = [string, string, number, string | null][];
 declare type parseOutputT = (output: string, index: number, variables: relVarsValsT, autonums: autonumsType) => string;
 export declare const parseOutputWithVariables: parseOutputT;
+declare type TParseDocumentNameWithVariables = (text: string, ovc: OVC_TYPE, references: Types.ReferencesType, fallback?: string) => string;
+export declare const parseDocumentNameWithVariables: TParseDocumentNameWithVariables;
 export {};

package/dist/libs/OutputParser.js

@@ -1,6 +1,13 @@
 "use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseOutputWithVariables = exports.getRelatedVariablesValues = void 0;
+exports.parseDocumentNameWithVariables = exports.parseOutputWithVariables = exports.getRelatedVariablesValues = void 0;
 exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, references) {
     var variablesValues = {};
     variables.forEach(function (currentVariableId) {
@@ -49,3 +56,34 @@ exports.parseOutputWithVariables = function (output, index, variables, autonums)
     });
     return parsedOutput;
 };
+exports.parseDocumentNameWithVariables = function (text, ovc, references, fallback) {
+    var tagsMatch = text.match(/\[var:([0-9]+)\]/gi);
+    var variables = [];
+    if (tagsMatch !== null) {
+        var variablesTags = __spreadArrays(tagsMatch);
+        variables = variablesTags.map(function (current) {
+            var outputVariableMatch = current.match(/([0-9]+)/);
+            if (outputVariableMatch === null)
+                return 0;
+            return parseInt(outputVariableMatch[0], 10);
+        });
+    }
+    variables = variables.filter(function (c, i) { return variables.indexOf(c) === i; });
+    variables = variables.filter(function (c) { return ovc !== undefined || references.variables[c] !== undefined; });
+    var variablesValues = {};
+    variables.forEach(function (variableId) {
+        var _a;
+        var value = ((_a = ovc.variables[variableId]) === null || _a === void 0 ? void 0 : _a[0]) || '';
+        variablesValues[variableId] = value.toString();
+    });
+    var parsedText = "" + text;
+    variables.forEach(function (variableId) {
+        var value = variablesValues[variableId];
+        if (value.trim().length === 0 && fallback)
+            parsedText = fallback;
+        if (parsedText === fallback && fallback)
+            return;
+        parsedText = parsedText.replace(new RegExp("\\[var:" + variableId + "\\]", 'gi'), value);
+    });
+    return parsedText;
+};

package/dist/libs/Prerender.js

@@ -11,6 +11,7 @@ var OvcConverter_1 = __importDefault(require("./OvcConverter"));
 var NumAuto_1 = __importDefault(require("./NumAuto"));
 var InputsInitiator_1 = __importDefault(require("./InputsInitiator"));
 var FillPdfForm_1 = __importDefault(require("./FillPdfForm"));
+var OutputParser_1 = require("./OutputParser");
 var Prerender = (function () {
     function Prerender(model, ovc) {
         this.documentsIndex = {};
@@ -37,21 +38,21 @@ var Prerender = (function () {
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
         var _this = this;
-        Object.keys(this.model.documents).forEach(function (documentName) {
+        Object.keys(this.model.documents).forEach(function (slug) {
             var _a, _b;
-            var document = _this.model.documents[documentName];
-            var documentParams = _this.model.documents[documentName].params;
-            var conditionObject = _this.references.conditions.documents[documentName];
+            var document = _this.model.documents[slug];
+            var documentParams = _this.model.documents[slug].params;
+            var conditionObject = _this.references.conditions.documents[slug];
             var condition = conditionObject === undefined ? true : _this.conditions.executeCondition(conditionObject, 0, 0, 'documents');
             if (condition === true) {
                 var hash = crypto_1.default
                     .createHash('sha1')
-                    .update(documentName)
+                    .update(slug)
                     .digest('hex');
                 if (typeof document.pdf === 'object' && typeof document.pdf.id === 'string' && typeof document.pdf.form === 'object') {
                     _this.documentsIndex[hash] = {
-                        name: document.name,
-                        slug: documentName,
+                        name: OutputParser_1.parseDocumentNameWithVariables(document.name, _this.ovc, _this.references, document.fallbackName),
+                        slug: slug,
                         form: true,
                         fdf: {
                             id: '',
@@ -61,8 +62,8 @@ var Prerender = (function () {
                 }
                 else {
                     _this.documentsIndex[hash] = {
-                        name: document.name,
-                        slug: documentName,
+                        name: OutputParser_1.parseDocumentNameWithVariables(document.name, _this.ovc, _this.references, document.fallbackName),
+                        slug: slug,
                         pdf: ((_a = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _a === void 0 ? void 0 : _a.pdf) === undefined ? true : documentParams.formats.pdf,
                         docx: ((_b = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _b === void 0 ? void 0 : _b.docx) === undefined ? true : documentParams.formats.docx
                     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -14,9 +14,9 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@legalplace/lplogic": "^2.1.4",
-    "@legalplace/models-v3-types": "^3.4.47",
-    "@legalplace/referencesparser": "^1.5.0",
+    "@legalplace/lplogic": "^2.1.6",
+    "@legalplace/models-v3-types": "^3.5.1",
+    "@legalplace/referencesparser": "^1.6.3",
     "crypto": "^1.0.1",
     "typescript": "3.9.3"
   },

package/src/libs/DataPopulator.ts

@@ -160,7 +160,6 @@ class DataPopulator {
    * @param variableId Variable's id
    */
   private getVariableValues(variableId: number): Readonly<(string | number)[]> {
-    const conditions = this.variableConditionValue(variableId)
     const value = this.ovc.variables[variableId]
     if (this.id === undefined || this.index === undefined) {
       return value
@@ -170,19 +169,10 @@ class DataPopulator {
     const variableRootParent = this.getVariableRootParent(variableId)
     const variableRootRelations = this.references.relations.options[variableRootParent]
     if (variableRootRelations.children.options.includes(this.id) || variableRootRelations.dependants.includes(this.id) || this.id === variableRootParent) {
-      // TODO: Replace fAl$e with a safer solution
-      if (conditions !== undefined && conditions[this.index] === false) return ['fAl$e']
       return [value[this.index]]
     }
 
-    const cleanValues = this.cleanArrayFromNullValues([...value])
-
-    if (conditions === undefined) return cleanValues
-
-    return cleanValues.map((currentValue, index) => {
-      if (conditions[index] === false) return 'fAl$e'
-      return currentValue
-    })
+    return this.cleanArrayFromNullValues([...value])
   }
 
   /**
@@ -221,7 +211,6 @@ class DataPopulator {
    * @param optionId Option's id
    */
   private getOptionInputs(optionId: number): Readonly<boolean[]> {
-    const conditions = this.optionConditionValue(optionId)
     const inputs = this.ovc.options[optionId]
     if (this.id === undefined || this.index === undefined) {
       return inputs
@@ -231,16 +220,10 @@ class DataPopulator {
     const optionRootParent = this.getOptionRootParent(optionId)
     const optionRootRelations = this.references.relations.options[optionRootParent]
     if (optionRootRelations.children.options.includes(this.id) || optionRootRelations.dependants.includes(this.id) || this.id === optionRootParent) {
-      if (conditions !== undefined && conditions[this.index] === false) return [false]
       return [inputs[this.index]]
     }
 
-    if (conditions === undefined) return inputs
-
-    return inputs.map((value, index) => {
-      if (conditions[index] === false) return false
-      return value
-    })
+    return inputs
   }
 
   /**

package/src/libs/OutputParser.ts

@@ -87,3 +87,63 @@ export const parseOutputWithVariables: parseOutputT = (output, index, variables,
 
   return parsedOutput
 }
+
+
+
+/**
+ * Parses document name with variables
+ * @param text Document's name
+ */
+ type TParseDocumentNameWithVariables = (
+   text: string,
+   ovc: OVC_TYPE,
+   references: Types.ReferencesType,
+   fallback?: string
+) => string;
+export const parseDocumentNameWithVariables: TParseDocumentNameWithVariables = (text, ovc, references, fallback) => {
+  /**
+   * Variables
+   */
+
+  // Extracting list of variables
+  const tagsMatch = text.match(/\[var:([0-9]+)\]/gi);
+  let variables: number[] = [];
+  if (tagsMatch !== null) {
+    // Tranforming tags into integer ids
+    const variablesTags: string[] = [...tagsMatch];
+    variables = variablesTags.map((current) => {
+      const outputVariableMatch = current.match(/([0-9]+)/);
+      if (outputVariableMatch === null) return 0;
+      return parseInt(outputVariableMatch[0], 10);
+    });
+  }
+
+  // Removing duplicated variables
+  variables = variables.filter((c, i) => variables.indexOf(c) === i);
+
+  // Making sure all variables exist
+  variables = variables.filter(
+    (c) => ovc !== undefined || references.variables[c] !== undefined
+  );
+
+  // Getting values
+  const variablesValues: Record<string, string> = {};
+  variables.forEach((variableId) => {
+    const value = ovc.variables[variableId]?.[0] || ''
+    variablesValues[variableId] = value.toString();
+  });
+
+  // Inserting values
+  let parsedText = `${text}`;
+  variables.forEach((variableId) => {
+    const value: string = variablesValues[variableId];
+    if (value.trim().length === 0 && fallback) parsedText = fallback;
+    if (parsedText === fallback && fallback) return;
+    parsedText = parsedText.replace(
+      new RegExp(`\\[var:${variableId}\\]`, 'gi'),
+      value
+    );
+  });
+
+  return parsedText;
+};

package/src/libs/Prerender.ts

@@ -8,6 +8,7 @@ import OvcConverter, { OldOVC } from './OvcConverter'
 import NumAuto from './NumAuto'
 import IntputsInitiator from './InputsInitiator'
 import FillPdfForm from './FillPdfForm'
+import { parseDocumentNameWithVariables } from './OutputParser'
 
 type DocumentOutputIndex = {
   name: string
@@ -91,24 +92,24 @@ class Prerender {
   }
 
   private generateDocumentNamesHash() {
-    Object.keys(this.model.documents).forEach(documentName => {
-      const document = this.model.documents[documentName]
-      const documentParams = this.model.documents[documentName].params
-      const conditionObject = this.references.conditions.documents[documentName]
+    Object.keys(this.model.documents).forEach(slug => {
+      const document = this.model.documents[slug]
+      const documentParams = this.model.documents[slug].params
+      const conditionObject = this.references.conditions.documents[slug]
       const condition = conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, 0, 0, 'documents')
 
       // Rendering documents sections
       if (condition === true) {
         const hash = crypto
           .createHash('sha1')
-          .update(documentName)
+          .update(slug)
           .digest('hex')
 
         // Referencing in index
         if (typeof document.pdf === 'object' && typeof document.pdf.id === 'string' && typeof document.pdf.form === 'object') {
           this.documentsIndex[hash] = {
-            name: document.name,
-            slug: documentName,
+            name: parseDocumentNameWithVariables(document.name, this.ovc, this.references, document.fallbackName),
+            slug,
             form: true,
             fdf: {
               id: '',
@@ -117,8 +118,8 @@ class Prerender {
           }
         } else {
           this.documentsIndex[hash] = {
-            name: document.name,
-            slug: documentName,
+            name: parseDocumentNameWithVariables(document.name, this.ovc, this.references, document.fallbackName),
+            slug,
             pdf: documentParams?.formats?.pdf === undefined ? true : documentParams.formats.pdf,
             docx: documentParams?.formats?.docx === undefined ? true : documentParams.formats.docx
           }