@legalplace/tagextractor 1.1.5 → 1.1.8

package/dist/libs/DataPopulator.js

@@ -98,7 +98,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;
@@ -106,18 +105,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;
@@ -134,7 +124,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;
@@ -142,17 +131,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/Extractor.js

@@ -36,7 +36,7 @@ var TagExtractor = (function () {
         var _this = this;
         Object.keys(this.references.options).forEach(function (id) {
             var _a = _this.references.options[id].meta, tags = _a.tags, label = _a.label;
-            if (Array.isArray(tags) && tags.length > 0) {
+            if (Array.isArray(tags) && tags.length > 0 && _this.inputs.options[id]) {
                 _this.inputs.options[id].forEach(function (v, index) {
                     tags.forEach(function (tag) {
                         if (_this.tags.options[tag] === undefined)
@@ -58,7 +58,7 @@ var TagExtractor = (function () {
         var _this = this;
         Object.keys(this.references.variables).forEach(function (id) {
             var _a = _this.references.variables[id], tags = _a.tags, label = _a.label;
-            if (Array.isArray(tags) && tags.length > 0) {
+            if (Array.isArray(tags) && tags.length > 0 && _this.inputs.variables[id]) {
                 _this.inputs.variables[id].forEach(function (v, index) {
                     tags.forEach(function (tag) {
                         if (_this.tags.variables[tag] === undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",
@@ -14,9 +14,9 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@legalplace/lplogic": "^2.1.4",
+    "@legalplace/lplogic": "^2.1.6",
     "@legalplace/models-v3-types": "^3.4.47",
-    "@legalplace/referencesparser": "^1.5.0",
+    "@legalplace/referencesparser": "^1.6.1",
     "crypto": "^1.0.1",
     "typescript": "3.9.3"
   },
@@ -38,4 +38,4 @@
     "redux-mock-store": "^1.5.3",
     "ts-jest": "^24.0.2"
   }
-}
+}

package/src/libs/DataPopulator.ts

@@ -152,7 +152,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
@@ -162,19 +161,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])
   }
 
   /**
@@ -213,7 +203,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
@@ -223,16 +212,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/Extractor.ts

@@ -46,7 +46,7 @@ class TagExtractor {
     Object.keys(this.references.options).forEach(id => {
       const { tags, label } = this.references.options[id].meta
 
-      if (Array.isArray(tags) && tags.length > 0) {
+      if (Array.isArray(tags) && tags.length > 0 && this.inputs.options[id]) {
         this.inputs.options[id].forEach((v, index) => {
           tags.forEach(tag => {
             if (this.tags.options[tag] === undefined) this.tags.options[tag] = []
@@ -71,7 +71,7 @@ class TagExtractor {
     Object.keys(this.references.variables).forEach(id => {
       const { tags, label } = this.references.variables[id]
 
-      if (Array.isArray(tags) && tags.length > 0) {
+      if (Array.isArray(tags) && tags.length > 0 && this.inputs.variables[id]) {
         this.inputs.variables[id].forEach((v, index) => {
           tags.forEach(tag => {
             if (this.tags.variables[tag] === undefined) this.tags.variables[tag] = []