@legalplace/prerenderx 2.3.54 → 2.3.55

package/dist/libs/OvcConverter.d.ts

@@ -1,4 +1,5 @@
 import OVC_TYPE from './ovc.type';
+import { Types } from '@legalplace/referencesparser';
 export interface OldOVC {
     o: {
         [k: string]: string | number | (string | number)[];
@@ -11,9 +12,10 @@ export interface OldOVC {
     };
 }
 declare class OvcConverter {
-    convertToOptionsVariables(ovc: OldOVC): OVC_TYPE;
+    convertToOptionsVariables(ovc: OldOVC, references: Types.ReferencesType): OVC_TYPE;
     isOvc(_obj: OVC_TYPE | OldOVC): _obj is OldOVC;
     isOptionsVariables(_obj: OVC_TYPE | OldOVC): boolean;
+    private pushStaticChildren;
 }
 declare const _default: OvcConverter;
 export default _default;

package/dist/libs/OvcConverter.js

@@ -1,9 +1,28 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var OvcConverter = (function () {
     function OvcConverter() {
     }
-    OvcConverter.prototype.convertToOptionsVariables = function (ovc) {
+    OvcConverter.prototype.convertToOptionsVariables = function (ovc, references) {
+        var _this = this;
         var inputs = {
             options: {},
             variables: {}
@@ -15,37 +34,33 @@ var OvcConverter = (function () {
                 var currentOption = ovc.o[id];
                 if (Array.isArray(currentOption)) {
                     var occurences_1 = currentOption.length;
+                    inputs.options = __assign(__assign({}, inputs.options), _this.pushStaticChildren(inputs.options, id, occurences_1, references));
                     currentOption.forEach(function (childId, index) {
-                        if (typeof childId === 'string' && childId.trim().length === 0) {
-                            if (!Object.prototype.hasOwnProperty.call(inputs.options, childId)) {
-                                inputs.options[id] = new Array(occurences_1).fill(false);
-                            }
+                        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);
+                        }
+                        if (typeof sanitizedId === 'string' &&
+                            sanitizedId.trim().length === 0) {
                             return;
                         }
-                        if (!Object.prototype.hasOwnProperty.call(inputs.options, childId)) {
-                            inputs.options[childId] = new Array(occurences_1).fill(false);
+                        if (!Object.prototype.hasOwnProperty.call(inputs.options, sanitizedId)) {
+                            inputs.options[sanitizedId] = new Array(occurences_1).fill(false);
                         }
-                        inputs.options[childId][index] = true;
+                        inputs.options = __assign(__assign({}, inputs.options), _this.pushStaticChildren(inputs.options, sanitizedId, occurences_1, references));
+                        inputs.options[sanitizedId][index] = true;
                     });
                 }
                 else {
-                    if (typeof currentOption === 'string' && currentOption.trim().length === 0)
+                    if (typeof currentOption === 'string' &&
+                        currentOption.trim().length === 0)
                         return;
                     inputs.options[currentOption] = [true];
                 }
             });
         }
-        if (typeof ovc.v === 'object') {
-            Object.keys(ovc.v).forEach(function (id) {
-                var currentVariable = ovc.v[id];
-                if (Array.isArray(currentVariable)) {
-                    inputs.variables[id] = currentVariable;
-                }
-                else {
-                    inputs.variables[id] = [currentVariable];
-                }
-            });
-        }
         if (typeof ovc.c === 'object') {
             Object.keys(ovc.c).forEach(function (id) {
                 var currentCheckbox = ovc.c[id];
@@ -59,6 +74,25 @@ var OvcConverter = (function () {
                 }
             });
         }
+        if (typeof ovc.v === 'object') {
+            Object.keys(ovc.v).forEach(function (id) {
+                var currentVariable = ovc.v[id];
+                if (Array.isArray(currentVariable)) {
+                    inputs.variables[id] = currentVariable;
+                    var parentsTree = references.relations.variables[id].parents;
+                    var parentOption = inputs.options["" + parentsTree[parentsTree.length - 1]];
+                    if (Array.isArray(parentOption)) {
+                        var occurences = parentOption.length;
+                        if (currentVariable.length < occurences) {
+                            inputs.variables[id] = __spreadArrays(currentVariable, Array(occurences - currentVariable.length).fill(''));
+                        }
+                    }
+                }
+                else {
+                    inputs.variables[id] = [currentVariable];
+                }
+            });
+        }
         return inputs;
     };
     OvcConverter.prototype.isOvc = function (_obj) {
@@ -79,6 +113,20 @@ var OvcConverter = (function () {
             .reduce(function (a, b) { return a + b; }, 0);
         return foundKeys === 2;
     };
+    OvcConverter.prototype.pushStaticChildren = function (inputOptions, id, occurences, references) {
+        var result = __assign({}, inputOptions);
+        var intId = typeof id === 'number' ? id : parseInt(id, 10);
+        var options = references.relations.options[intId].children.options;
+        var staticOptions = options.filter(function (childId) {
+            return references.options[childId].meta.type === 'static';
+        });
+        staticOptions.forEach(function (childId) {
+            if (!Object.prototype.hasOwnProperty.call(result, childId)) {
+                result[childId] = new Array(occurences).fill(false);
+            }
+        });
+        return result;
+    };
     return OvcConverter;
 }());
 exports.default = new OvcConverter();

package/dist/libs/Prerender.js

@@ -16,9 +16,11 @@ var Prerender = (function () {
         this.documentsIndex = {};
         this.renderedDocuments = {};
         this.model = model;
-        this.ovc = OvcConverter_1.default.isOvc(ovc) ? OvcConverter_1.default.convertToOptionsVariables(ovc) : ovc;
         this.NumAuto = new NumAuto_1.default();
         this.references = new referencesparser_1.ReferencesParser(model).getReferences();
+        this.ovc = OvcConverter_1.default.isOvc(ovc)
+            ? OvcConverter_1.default.convertToOptionsVariables(ovc, this.references)
+            : ovc;
         var inputs = new InputsInitiator_1.default(this.references, this.ovc).getInputs();
         this.conditions = new ConditionsRunner_1.default(this.references, inputs);
         this.documentRender = new DocumentRender_1.default(this.references, this.conditions, inputs, this.NumAuto);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.3.54",
+  "version": "2.3.55",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",

package/src/libs/OvcConverter.ts

@@ -1,4 +1,5 @@
 import OVC_TYPE from './ovc.type'
+import { Types } from '@legalplace/referencesparser'
 
 export interface OldOVC {
   o: {
@@ -13,75 +14,128 @@ export interface OldOVC {
 }
 
 class OvcConverter {
-  public convertToOptionsVariables(ovc: OldOVC) {
+  public convertToOptionsVariables(
+    ovc: OldOVC,
+    references: Types.ReferencesType
+  ) {
     const inputs: OVC_TYPE = {
       options: {},
       variables: {}
     }
 
-    if (typeof ovc !== 'object') return inputs
+if (typeof ovc !== 'object') return inputs;
 
     // Reading options
     if (typeof ovc.o === 'object') {
       Object.keys(ovc.o).forEach(id => {
-        const currentOption = ovc.o[id]
+        const currentOption = ovc.o[id];
 
         // If it's a multiple
         if (Array.isArray(currentOption)) {
-          const occurences = currentOption.length
+          const occurences = currentOption.length;
+          // Adding static childrens
+          inputs.options = {
+            ...inputs.options,
+            ...this.pushStaticChildren(
+              inputs.options,
+              id,
+              occurences,
+              references
+            )
+          };
           currentOption.forEach((childId, index) => {
-            if (typeof childId === 'string' && childId.trim().length === 0) {
-              // Creating input if it doesn't exist
-              if (!Object.prototype.hasOwnProperty.call(inputs.options, childId)) {
-                inputs.options[id] = new Array(occurences).fill(false)
-              }
-              return
+            const sanitizedId =
+              typeof childId === 'string' && childId.split('_').length > 0
+                ? childId.split('_')[0]
+                : childId;
+
+            // Making sure the input exist
+            if (!Object.prototype.hasOwnProperty.call(inputs.options, id)) {
+              inputs.options[id] = new Array(occurences).fill(false);
+            }
+
+            // Making sure the childId is not empty
+            if (
+              typeof sanitizedId === 'string' &&
+              sanitizedId.trim().length === 0
+            ) {
+              return;
             }
 
             // Creating input if it doesn't exist
-            if (!Object.prototype.hasOwnProperty.call(inputs.options, childId)) {
-              inputs.options[childId] = new Array(occurences).fill(false)
+            if (
+              !Object.prototype.hasOwnProperty.call(inputs.options, sanitizedId)
+            ) {
+              inputs.options[sanitizedId] = new Array(occurences).fill(false);
             }
 
+            // Adding static childrens
+            inputs.options = {
+              ...inputs.options,
+              ...this.pushStaticChildren(
+                inputs.options,
+                sanitizedId,
+                occurences,
+                references
+              )
+            };
+
             // Setting current index to true
-            inputs.options[childId][index] = true
-          })
+            inputs.options[sanitizedId][index] = true;
+          });
         } else {
-          if (typeof currentOption === 'string' && currentOption.trim().length === 0) return
-          inputs.options[currentOption] = [true]
+          if (
+            typeof currentOption === 'string' &&
+            currentOption.trim().length === 0
+          )
+            return;
+          inputs.options[currentOption] = [true];
         }
-      })
+      });
     }
 
-    // Reading variables
-    if (typeof ovc.v === 'object') {
-      Object.keys(ovc.v).forEach(id => {
-        const currentVariable = ovc.v[id]
-
+    // Reading checkboxes
+    if (typeof ovc.c === 'object') {
+      Object.keys(ovc.c).forEach(id => {
+        const currentCheckbox = ovc.c[id];
+        if (typeof id === 'string' && id.trim().length === 0) return;
         // If it's a multiple
-        if (Array.isArray(currentVariable)) {
-          inputs.variables[id] = currentVariable
+        if (Array.isArray(currentCheckbox)) {
+          inputs.options[id] = currentCheckbox;
         } else {
-          inputs.variables[id] = [currentVariable]
+          inputs.options[id] = [currentCheckbox];
         }
-      })
+      });
     }
 
-    // Reading checkboxes
-    if (typeof ovc.c === 'object') {
-      Object.keys(ovc.c).forEach(id => {
-        const currentCheckbox = ovc.c[id]
-        if (typeof id === 'string' && id.trim().length === 0) return
+    // Reading variables
+    if (typeof ovc.v === 'object') {
+      Object.keys(ovc.v).forEach(id => {
+        const currentVariable = ovc.v[id];
+
         // If it's a multiple
-        if (Array.isArray(currentCheckbox)) {
-          inputs.options[id] = currentCheckbox
+        if (Array.isArray(currentVariable)) {
+          inputs.variables[id] = currentVariable;
+          // Getting parentsTree & parent id
+          const parentsTree = references.relations.variables[id].parents;
+          const parentOption =
+            inputs.options[`${parentsTree[parentsTree.length - 1]}`];
+          if (Array.isArray(parentOption)) {
+            const occurences = parentOption.length;
+            if (currentVariable.length < occurences) {
+              inputs.variables[id] = [
+                ...currentVariable,
+                ...Array(occurences - currentVariable.length).fill('')
+              ];
+            }
+          }
         } else {
-          inputs.options[id] = [currentCheckbox]
+          inputs.variables[id] = [currentVariable];
         }
-      })
+      });
     }
 
-    return inputs
+    return inputs;
   }
 
   public isOvc(_obj: OVC_TYPE | OldOVC): _obj is OldOVC {
@@ -101,6 +155,33 @@ class OvcConverter {
       .reduce((a, b) => a + b, 0)
     return foundKeys === 2
   }
+
+    private pushStaticChildren(
+    inputOptions: OVC_TYPE['options'],
+    id: number | string,
+    occurences: number,
+    references: Types.ReferencesType
+  ) {
+    const result = { ...inputOptions };
+    const intId = typeof id === 'number' ? id : parseInt(id, 10);
+
+    // Getting children options and variables
+    const { options } = references.relations.options[intId].children;
+
+    // Getting static children
+    const staticOptions = options.filter(childId => {
+      return references.options[childId].meta.type === 'static';
+    });
+
+    staticOptions.forEach(childId => {
+      // Creating input if it doesn't exist
+      if (!Object.prototype.hasOwnProperty.call(result, childId)) {
+        result[childId] = new Array(occurences).fill(false);
+      }
+    });
+
+    return result;
+  }
 }
 
 export default new OvcConverter()

package/src/libs/Prerender.ts

@@ -56,15 +56,17 @@ class Prerender {
   constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC) {
     this.model = model
 
-    // Converting OVC if needed
-    this.ovc = OvcConverter.isOvc(ovc) ? OvcConverter.convertToOptionsVariables(ovc) : ovc
-
     // Initiating num auto
     this.NumAuto = new NumAuto()
 
     // Parsing references
     this.references = new ReferencesParser(model).getReferences()
 
+    // Converting OVC if needed
+    this.ovc = OvcConverter.isOvc(ovc)
+      ? OvcConverter.convertToOptionsVariables(ovc, this.references)
+      : ovc
+
     // Initiating inputs
     const inputs = new IntputsInitiator(this.references, this.ovc).getInputs()