@legalplace/tagextractor 1.1.0 → 1.1.2

package/dist/libs/Extractor.d.ts

@@ -11,7 +11,6 @@ declare class TagExtractor {
     get getTags(): TagsType;
     private extractFromOptions;
     private extractFromVariables;
-    private optionConditionValue;
     isVariableDisplayed(id: number, index: number): boolean;
     isOptionDisplayed(id: number, index: number): boolean;
     private getVariableCondition;

package/dist/libs/Extractor.js

@@ -76,22 +76,13 @@ var TagExtractor = (function () {
             }
         });
     };
-    TagExtractor.prototype.optionConditionValue = function (optionId) {
-        var _this = this;
-        var conditions = this.references.conditions.options[optionId];
-        var inputs = this.inputs.options[optionId];
-        if (conditions === undefined)
-            return inputs.map(function () { return true; });
-        return inputs.map(function (input, index) {
-            return _this.conditionsRunner.executeCondition(conditions, optionId, index, 'options');
-        });
-    };
     TagExtractor.prototype.isVariableDisplayed = function (id, index) {
-        var _a;
+        var _a, _b;
         var variableCondition = this.getVariableCondition(id, index);
         var variableParents = ((_a = this.references.relations.variables[id]) === null || _a === void 0 ? void 0 : _a.parents) || [];
         var parentOptionIsDisplayed = this.isOptionDisplayed(variableParents[0], index);
-        return [variableCondition, parentOptionIsDisplayed].filter(function (c) { return c !== true; }).length === 0;
+        var parentOptionIsTruethful = ((_b = this.inputs.options[variableParents[0]]) === null || _b === void 0 ? void 0 : _b[index]) === true;
+        return [variableCondition, parentOptionIsDisplayed, parentOptionIsTruethful].filter(function (c) { return c !== true; }).length === 0;
     };
     TagExtractor.prototype.isOptionDisplayed = function (id, index) {
         var _this = this;

package/dist/libs/OvcConverter.js

@@ -57,6 +57,13 @@ var OvcConverter = (function () {
                 }
             });
         }
+        Object.keys(references.options).forEach(function (optionId) {
+            var option = references.options[optionId];
+            var parents = references.relations.options[optionId].parents;
+            if (inputs.options[optionId] === undefined && parents.length === 0 && option.meta.type === 'static') {
+                inputs.options[optionId] = [true];
+            }
+        });
         if (typeof ovc.c === 'object') {
             Object.keys(ovc.c).forEach(function (id) {
                 var currentCheckbox = ovc.c[id];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",

package/src/libs/Extractor.ts

@@ -89,23 +89,6 @@ class TagExtractor {
     })
   }
 
-  /**
-   * Calculates option's condition
-   */
-  private optionConditionValue(optionId: number) {
-    // Getting option conditions
-    const conditions = this.references.conditions.options[optionId]
-
-    // Getting option inputs length
-    const inputs = this.inputs.options[optionId]
-
-    if (conditions === undefined) return inputs.map(() => true)
-
-    return inputs.map((input, index) => {
-      return this.conditionsRunner.executeCondition(conditions, optionId, index, 'options')
-    })
-  }
-
   /**
    * Checks whether a variable is displayed at a given index
    * @param id Variable's ID
@@ -116,8 +99,9 @@ class TagExtractor {
     const variableCondition = this.getVariableCondition(id, index)
     const variableParents = this.references.relations.variables[id]?.parents || []
     const parentOptionIsDisplayed = this.isOptionDisplayed(variableParents[0], index)
+    const parentOptionIsTruethful = this.inputs.options[variableParents[0]]?.[index] === true
 
-    return [variableCondition, parentOptionIsDisplayed].filter(c => c !== true).length === 0
+    return [variableCondition, parentOptionIsDisplayed, parentOptionIsTruethful].filter(c => c !== true).length === 0
   }
 
   /**

package/src/libs/OvcConverter.ts

@@ -58,6 +58,16 @@ class OvcConverter {
       })
     }
 
+    // Adding static root options
+    Object.keys(references.options).forEach(optionId => {
+      const option = references.options[optionId]
+      const { parents } = references.relations.options[optionId]
+
+      if (inputs.options[optionId] === undefined && parents.length === 0 && option.meta.type === 'static') {
+        inputs.options[optionId] = [true]
+      }
+    })
+
     // Reading checkboxes
     if (typeof ovc.c === 'object') {
       Object.keys(ovc.c).forEach(id => {
@@ -104,6 +114,7 @@ class OvcConverter {
     const foundKeys = Object.keys(_obj)
       .map((key): number => (ovcKeys.includes(key) ? 1 : 0))
       .reduce((a, b) => a + b, 0)
+
     return foundKeys > 1
   }