@legalplace/tagextractor 1.1.4 → 1.1.7

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/OvcConverter.d.ts

@@ -6,6 +6,9 @@ declare class OvcConverter {
     isOvc(_obj: InputsType | OvcType): _obj is OvcType;
     isOptionsVariables(_obj: InputsType | OvcType): _obj is InputsType;
     private pushStaticChildren;
+    private pushLeftOver;
+    private pushLeftOverOption;
+    private pushLeftOverVariable;
 }
 declare const _default: OvcConverter;
 export default _default;

package/dist/libs/OvcConverter.js

@@ -98,7 +98,7 @@ var OvcConverter = (function () {
                 }
             });
         }
-        return inputs;
+        return this.pushLeftOver(inputs, references);
     };
     OvcConverter.prototype.isOvc = function (_obj) {
         if (typeof _obj !== 'object' || _obj === null)
@@ -132,6 +132,42 @@ var OvcConverter = (function () {
         });
         return result;
     };
+    OvcConverter.prototype.pushLeftOver = function (inputs, references) {
+        var _this = this;
+        var result = __assign({}, inputs);
+        Object.values(references.sections).forEach(function (document) {
+            Object.values(document).forEach(function (section) {
+                section.options.forEach(function (optionId) {
+                    var occurences = inputs.options[optionId] === undefined ? 1 : inputs.options[optionId].length;
+                    result = _this.pushLeftOverOption(result, references, references.options[optionId], occurences);
+                });
+            });
+        });
+        return result;
+    };
+    OvcConverter.prototype.pushLeftOverOption = function (inputs, references, option, occurences) {
+        var _a;
+        var _this = this;
+        var result = __assign({}, inputs);
+        var defaultValue = !['radio', 'checkbox'].includes(option.meta.type);
+        if (!Object.prototype.hasOwnProperty.call(result.options, option.meta.id)) {
+            result = __assign(__assign({}, result), { options: __assign(__assign({}, result.options), (_a = {}, _a[option.meta.id] = new Array(occurences).fill(defaultValue), _a)) });
+        }
+        option.options.forEach(function (optionId) {
+            result = _this.pushLeftOverOption(result, references, references.options[optionId], occurences);
+        });
+        option.variables.forEach(function (variableId) {
+            result = _this.pushLeftOverVariable(result, variableId, occurences);
+        });
+        return result;
+    };
+    OvcConverter.prototype.pushLeftOverVariable = function (inputs, id, occurences) {
+        var _a;
+        if (!Object.prototype.hasOwnProperty.call(inputs.variables, id)) {
+            return __assign(__assign({}, inputs), { variables: __assign(__assign({}, inputs.variables), (_a = {}, _a[id] = new Array(occurences).fill(''), _a)) });
+        }
+        return inputs;
+    };
     return OvcConverter;
 }());
 exports.default = new OvcConverter();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "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"
   },

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/OvcConverter.ts

@@ -1,3 +1,4 @@
+import { OptionV3 } from '@legalplace/models-v3-types'
 import { Types } from '@legalplace/referencesparser'
 import InputsType from '../types/inputs.type'
 import OvcType from '../types/ovc.type'
@@ -107,7 +108,8 @@ class OvcConverter {
       })
     }
 
-    return inputs
+    // Pushing left over and returning inputs
+    return this.pushLeftOver(inputs, references)
   }
 
   public isOvc(_obj: InputsType | OvcType): _obj is OvcType {
@@ -150,6 +152,67 @@ class OvcConverter {
 
     return result
   }
+
+  private pushLeftOver(inputs: InputsType, references: Types.ReferencesType): InputsType {
+    let result = {
+      ...inputs
+    }
+
+    Object.values(references.sections).forEach(document => {
+      Object.values(document).forEach(section => {
+        section.options.forEach(optionId => {
+          const occurences = inputs.options[optionId] === undefined ? 1 : inputs.options[optionId].length
+          result = this.pushLeftOverOption(result, references, references.options[optionId], occurences)
+        })
+      })
+    })
+
+    return result
+  }
+
+  private pushLeftOverOption(inputs: InputsType, references: Types.ReferencesType, option: OptionV3, occurences: number): InputsType {
+    let result = {
+      ...inputs
+    }
+
+    const defaultValue = !['radio', 'checkbox'].includes(option.meta.type)
+
+    // Adding option if it doesn't exist
+    if (!Object.prototype.hasOwnProperty.call(result.options, option.meta.id)) {
+      result = {
+        ...result,
+        options: {
+          ...result.options,
+          [option.meta.id]: new Array(occurences).fill(defaultValue)
+        }
+      }
+    }
+
+    // Reading option's children
+    option.options.forEach(optionId => {
+      result = this.pushLeftOverOption(result, references, references.options[optionId], occurences)
+    })
+
+    // Reading option variables
+    option.variables.forEach(variableId => {
+      result = this.pushLeftOverVariable(result, variableId, occurences)
+    })
+
+    return result
+  }
+
+  private pushLeftOverVariable(inputs: InputsType, id: number, occurences: number): InputsType {
+    if (!Object.prototype.hasOwnProperty.call(inputs.variables, id)) {
+      return {
+        ...inputs,
+        variables: {
+          ...inputs.variables,
+          [id]: new Array(occurences).fill('')
+        }
+      }
+    }
+    return inputs
+  }
 }
 
 export default new OvcConverter()