@legalplace/prerenderx 2.3.55 → 2.4.1

package/dist/libs/DataPopulator.d.ts

@@ -19,6 +19,8 @@ declare class DataPopulator {
     constructor(conditionsRunner: ConditionsRunner, references: Types.ReferencesType, ovc: OVC_TYPE, dataMap: ConditionDataMap, id?: number, index?: number);
     getData(): Readonly<ConditionData>;
     private populateConditions;
+    private getOptionConditions;
+    private getVariablesConditions;
     private populateVariables;
     private getVariableValues;
     private getVariableRootParent;

package/dist/libs/DataPopulator.js

@@ -35,19 +35,53 @@ var DataPopulator = (function () {
         for (var i = 0; i < this.dataMap.c.s.length; i += 1) {
             var sectionId = this.dataMap.c.s[i];
             var sectionCondition = this.sectionConditionValue(sectionId);
-            this.data.c.s[sectionId] = [sectionCondition === true];
+            this.data.c.s[sectionId] = [sectionCondition !== false];
         }
         for (var i = 0; i < this.dataMap.c.o.length; i += 1) {
             var optionId = this.dataMap.c.o[i];
-            var optionCondition = this.optionConditionValue(optionId);
+            var optionCondition = __spreadArrays(this.getOptionConditions(optionId));
             this.data.c.o[optionId] = optionCondition === undefined ? [false] : optionCondition;
         }
         for (var i = 0; i < this.dataMap.c.v.length; i += 1) {
             var variableId = this.dataMap.c.v[i];
-            var variableCondition = this.variableConditionValue(variableId);
+            var variableCondition = __spreadArrays(this.getVariablesConditions(variableId));
             this.data.c.v[variableId] = variableCondition === undefined ? [false] : variableCondition;
         }
     };
+    DataPopulator.prototype.getOptionConditions = function (optionId) {
+        var conditions = this.optionConditionValue(optionId);
+        if (conditions === undefined)
+            return [true];
+        if (this.id === undefined || this.index === undefined) {
+            return conditions;
+        }
+        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 [conditions[this.index]];
+        }
+        return conditions;
+    };
+    DataPopulator.prototype.getVariablesConditions = function (variableId) {
+        var conditions = this.variableConditionValue(variableId);
+        if (conditions === undefined)
+            return [true];
+        if (this.id === undefined || this.index === undefined) {
+            return conditions;
+        }
+        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) {
+            return [conditions[this.index]];
+        }
+        return conditions;
+    };
     DataPopulator.prototype.populateVariables = function () {
         var _loop_1 = function (i) {
             var variableId = this_1.dataMap.v[i];

package/dist/libs/OptionRender.js

@@ -38,7 +38,7 @@ var OptionRender = (function () {
                     });
                 }
                 var variables = OutputParser_1.getRelatedVariablesValues(this.id, this.index, outputReference.variables, this.ovc, this.references);
-                var output = OutputParser_1.parseOutputWithVariables(option.meta.output, variables, autonums);
+                var output = OutputParser_1.parseOutputWithVariables(option.meta.output, this.index, variables, autonums);
                 output = output.replace(/>([\n\s]+)</g, '><');
                 output = output.replace(/\n/g, '<br />');
                 output = output.replace(/\xA0/g, ' ');

package/dist/libs/OutputParser.d.ts

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

package/dist/libs/OutputParser.js

@@ -28,7 +28,7 @@ exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, r
     });
     return variablesValues;
 };
-exports.parseOutputWithVariables = function (output, variables, autonums) {
+exports.parseOutputWithVariables = function (output, index, variables, autonums) {
     var parsedOutput = "" + output;
     Object.keys(variables).forEach(function (variableId) {
         var value = variables[variableId].toString();
@@ -40,6 +40,7 @@ exports.parseOutputWithVariables = function (output, variables, autonums) {
     });
     parsedOutput = parsedOutput.replace(/\[\[PAGE_BREAK\]\]/gi, '<div style="page-break-after:always"></div>');
     parsedOutput = parsedOutput.replace(/\[(E|B)_BLUR\]/gi, '');
+    parsedOutput = parsedOutput.replace(/\[signature:([0-9]+)\]/g, function (v, signatureId) { return "<span data-signature-id=\"" + signatureId + "\" data-signer-index=\"" + index + "\"></span>"; });
     autonums.forEach(function (currentAn) {
         if (currentAn[3] === null)
             parsedOutput = parsedOutput.replace("[" + currentAn[0] + ":" + currentAn[1] + "]", "<span class=\"" + currentAn[0] + "\">" + currentAn[2] + "</span>");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.3.55",
+  "version": "2.4.1",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",

package/src/libs/DataPopulator.ts

@@ -63,23 +63,74 @@ class DataPopulator {
     for (let i = 0; i < this.dataMap.c.s.length; i += 1) {
       const sectionId = this.dataMap.c.s[i]
       const sectionCondition = this.sectionConditionValue(sectionId)
-      this.data.c.s[sectionId] = [sectionCondition === true]
+      this.data.c.s[sectionId] = [sectionCondition !== false]
     }
 
     // Options
     for (let i = 0; i < this.dataMap.c.o.length; i += 1) {
       const optionId = this.dataMap.c.o[i]
-      const optionCondition = this.optionConditionValue(optionId)
+      const optionCondition = [...this.getOptionConditions(optionId)];
       this.data.c.o[optionId] = optionCondition === undefined ? [false] : optionCondition
     }
 
     // Variables
     for (let i = 0; i < this.dataMap.c.v.length; i += 1) {
       const variableId = this.dataMap.c.v[i]
-      const variableCondition = this.variableConditionValue(variableId)
+      const variableCondition = [...this.getVariablesConditions(variableId)]
       this.data.c.v[variableId] = variableCondition === undefined ? [false] : variableCondition
     }
   }
+/**
+   * Returns a give option's conditions
+   * @param optionId Option's id
+   */
+  private getOptionConditions(optionId: number): Readonly<boolean[]> {
+    const conditions = this.optionConditionValue(optionId);
+    if (conditions === undefined) return [true];
+    if (this.id === undefined || this.index === undefined) {
+      return conditions;
+    }
+
+    // Getting variable parent option
+    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 [conditions[this.index]];
+    }
+
+    return conditions;
+  }
+
+  /**
+   * Returns a give variables conditions
+   * @param variableId Variable's id
+   */
+  private getVariablesConditions(variableId: number): Readonly<boolean[]> {
+    const conditions = this.variableConditionValue(variableId);
+    if (conditions === undefined) return [true];
+    if (this.id === undefined || this.index === undefined) {
+      return conditions;
+    }
+
+    // Getting variable parent option
+    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
+    ) {
+      return [conditions[this.index]];
+    }
+
+    return conditions;
+  }
 
   /**
    * Populates variables according to the current dataMap object

package/src/libs/OptionRender.ts

@@ -56,7 +56,7 @@ class OptionRender {
 
         // variables
         const variables = getRelatedVariablesValues(this.id, this.index, outputReference.variables, this.ovc, this.references)
-        let output = parseOutputWithVariables(option.meta.output, variables, autonums)
+        let output = parseOutputWithVariables(option.meta.output, this.index, variables, autonums)
 
         // Removing spaces between tags
         output = output.replace(/>([\n\s]+)</g, '><');

package/src/libs/OutputParser.ts

@@ -55,8 +55,8 @@ export const getRelatedVariablesValues: getRelatedVarsT = (optionId, index, vari
  * @param autonums Autonums values
  */
 type autonumsType = [string, string, number, string | null][]
-type parseOutputT = (output: string, variables: relVarsValsT, autonums: autonumsType) => string
-export const parseOutputWithVariables: parseOutputT = (output, variables, autonums) => {
+type parseOutputT = (output: string, index: number, variables: relVarsValsT, autonums: autonumsType) => string
+export const parseOutputWithVariables: parseOutputT = (output, index, variables, autonums) => {
   // Inserting values
   let parsedOutput = `${output}`
   Object.keys(variables).forEach(variableId => {
@@ -76,6 +76,9 @@ export const parseOutputWithVariables: parseOutputT = (output, variables, autonu
   // Cleaning BLURS
   parsedOutput = parsedOutput.replace(/\[(E|B)_BLUR\]/gi, '')
 
+  // Parsing Signatures
+  parsedOutput = parsedOutput.replace(/\[signature:([0-9]+)\]/g, (v, signatureId) => `<span data-signature-id="${signatureId}" data-signer-index="${index}"></span>`)
+
   // Inserting autonums
   autonums.forEach(currentAn => {
     if (currentAn[3] === null) parsedOutput = parsedOutput.replace(`[${currentAn[0]}:${currentAn[1]}]`, `<span class="${currentAn[0]}">${currentAn[2]}</span>`)