@legalplace/prerenderx 2.4.0 → 2.4.2

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@legalplace/lplogic": "^2.1.4",
     "@legalplace/models-v3-types": "^3.4.47",
-    "@legalplace/referencesparser": "^1.4.11",
+    "@legalplace/referencesparser": "^1.5.0",
     "crypto": "^1.0.1",
     "typescript": "3.9.3"
   },

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