@legalplace/tagextractor 1.1.3 → 1.1.5

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

@@ -38,13 +38,15 @@ var OvcConverter = (function () {
                     currentOption.forEach(function (childId, index) {
                         var sanitizedId = typeof childId === 'string' && childId.split('_').length > 0 ? childId.split('_')[0] : childId;
                         if (!Object.prototype.hasOwnProperty.call(inputs.options, id)) {
-                            inputs.options[id] = new Array(occurences_1).fill(false);
+                            var defaultValue = references.options[id].meta.type === 'static';
+                            inputs.options[id] = new Array(occurences_1).fill(defaultValue);
                         }
                         if (typeof sanitizedId === 'string' && sanitizedId.trim().length === 0) {
                             return;
                         }
                         if (!Object.prototype.hasOwnProperty.call(inputs.options, sanitizedId)) {
-                            inputs.options[sanitizedId] = new Array(occurences_1).fill(false);
+                            var defaultValue = references.options[sanitizedId].meta.type === 'static';
+                            inputs.options[sanitizedId] = new Array(occurences_1).fill(defaultValue);
                         }
                         inputs.options = __assign(__assign({}, inputs.options), _this.pushStaticChildren(inputs.options, sanitizedId, occurences_1, references));
                         inputs.options[sanitizedId][index] = true;
@@ -96,7 +98,7 @@ var OvcConverter = (function () {
                 }
             });
         }
-        return inputs;
+        return this.pushLeftOver(inputs, references);
     };
     OvcConverter.prototype.isOvc = function (_obj) {
         if (typeof _obj !== 'object' || _obj === null)
@@ -125,11 +127,47 @@ var OvcConverter = (function () {
         });
         staticOptions.forEach(function (childId) {
             if (!Object.prototype.hasOwnProperty.call(result, childId)) {
-                result[childId] = new Array(occurences).fill(false);
+                result[childId] = new Array(occurences).fill(true);
             }
         });
         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.3",
+  "version": "1.1.5",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",

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'
@@ -29,7 +30,8 @@ class OvcConverter {
 
             // Making sure the input exist
             if (!Object.prototype.hasOwnProperty.call(inputs.options, id)) {
-              inputs.options[id] = new Array(occurences).fill(false)
+              const defaultValue = references.options[id].meta.type === 'static'
+              inputs.options[id] = new Array(occurences).fill(defaultValue)
             }
 
             // Making sure the childId is not empty
@@ -39,7 +41,8 @@ class OvcConverter {
 
             // Creating input if it doesn't exist
             if (!Object.prototype.hasOwnProperty.call(inputs.options, sanitizedId)) {
-              inputs.options[sanitizedId] = new Array(occurences).fill(false)
+              const defaultValue = references.options[sanitizedId].meta.type === 'static'
+              inputs.options[sanitizedId] = new Array(occurences).fill(defaultValue)
             }
 
             // Adding static childrens
@@ -105,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 {
@@ -142,12 +146,73 @@ class OvcConverter {
     staticOptions.forEach(childId => {
       // Creating input if it doesn't exist
       if (!Object.prototype.hasOwnProperty.call(result, childId)) {
-        result[childId] = new Array(occurences).fill(false)
+        result[childId] = new Array(occurences).fill(true)
       }
     })
 
     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()