@legalplace/prerenderx 2.2.1 → 2.2.2

package/.gitlab-ci.yml

@@ -1,8 +1,9 @@
-image: node:11-alpine
+image: 148253454541.dkr.ecr.eu-west-1.amazonaws.com/legalplace:latest
 
 
 stages:
-  - deploy
+  - setup
+  - publish
 
 before_script:
 - export PATH=$PATH:./node_modules/.bin/
@@ -10,18 +11,30 @@ before_script:
 variables: 
   DOCKER_DRIVER: overlay2
 
+setup:
+  stage: setup
+  cache:
+    key: yarn-cache-front
+    untracked: true
+    paths:
+      - .yarn-cache-front
+    policy: pull-push
+  only:
+    changes:
+      - yarn.lock
+      - package.json
+      - .gitlab-ci.yml
+  script:
+    - yarn install --frozen-lockfile  --check-files --silent --cache-folder .yarn-cache-front
+    - yarn build
+
 publish:
-  image: node:11-alpine
-  stage: deploy
+  stage: publish
   except:
     variables:
       - $CI_COMMIT_MESSAGE =~ /skip-publish/
-  script:
-    - echo -e "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-    - yarn install
-    - yarn build
+  script: 
     - npm publish
-    - echo "PUBLISHED SUCCESSFULLY"
   environment:
     name: development
   only:

package/dist/libs/OutputParser.js

@@ -38,7 +38,7 @@ exports.parseOutputWithVariables = function (output, variables, autonums) {
         }
         parsedOutput = parsedOutput.replace(new RegExp("\\[var:" + variableId + "\\]", "g"), value);
     });
-    parsedOutput = parsedOutput.replace(/\[\[PAGE_BREAK\]\]/gi, '<p class="pagebreak"><!-- pagebreak --></p>');
+    parsedOutput = parsedOutput.replace(/\[\[PAGE_BREAK\]\]/gi, '<div style="page-break-after:always"></div>');
     parsedOutput = parsedOutput.replace(/\[(E|B)_BLUR\]/gi, "");
     autonums.forEach(function (currentAn) {
         if (currentAn[3] === null)

package/package.json

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

package/src/libs/OutputParser.ts

@@ -101,7 +101,7 @@ export const parseOutputWithVariables: parseOutputT = (
   // Inserting page breaks
   parsedOutput = parsedOutput.replace(
     /\[\[PAGE_BREAK\]\]/gi,
-    '<p class="pagebreak"><!-- pagebreak --></p>'
+    '<div style="page-break-after:always"></div>'
   );
 
   // Cleaning BLURS

package/dist/libs/DataPopulator.d.ts

@@ -1,49 +0,0 @@
-import { Types } from "@legalplace/referencesparser";
-import ConditionsRunner from "./ConditionsRunner";
-declare type OVC_TYPE = {
-    options: {
-        [key: string]: boolean[];
-    };
-    variables: {
-        [key: string]: (number | string)[];
-    };
-};
-declare class DataPopulator {
-    private references;
-    private ovc;
-    private conditionsRunner;
-    private id?;
-    private index?;
-    private dataMap;
-    private data;
-    constructor(conditionsRunner: ConditionsRunner, references: Types.ReferencesType, ovc: OVC_TYPE, dataMap: ConditionDataMap, id?: number, index?: number);
-    getData(): Readonly<ConditionData>;
-    private populateConditions;
-    private populateVariables;
-    private getVariableValues;
-    private getVariableRootParent;
-    private cleanArrayFromNullValues;
-    populateOptions(): void;
-    private getOptionInputs;
-    private getOptionRootParent;
-    private optionConditionValue;
-    private variableConditionValue;
-    private sectionConditionValue;
-}
-export interface ConditionDataMap {
-    o: number[];
-    v: number[];
-    c: {
-        o: number[];
-        s: number[];
-    };
-}
-export interface ConditionData {
-    o: Record<string, boolean[]>;
-    v: Record<string, (string | number)[]>;
-    c: {
-        o: Record<string, boolean[]>;
-        s: Record<string, boolean[]>;
-    };
-}
-export default DataPopulator;

package/dist/libs/DataPopulator.js

@@ -1,153 +0,0 @@
-"use strict";
-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 DataPopulator = (function () {
-    function DataPopulator(conditionsRunner, references, ovc, dataMap, id, index) {
-        this.data = {
-            o: {},
-            v: {},
-            c: {
-                o: {},
-                s: {}
-            }
-        };
-        this.id = id;
-        this.ovc = ovc;
-        this.index = index;
-        this.dataMap = dataMap;
-        this.references = references;
-        this.conditionsRunner = conditionsRunner;
-        this.populateVariables();
-        this.populateOptions();
-        this.populateConditions();
-    }
-    DataPopulator.prototype.getData = function () {
-        return this.data;
-    };
-    DataPopulator.prototype.populateConditions = function () {
-        for (var i = 0; i < this.dataMap.c.s.length; i += 1) {
-            var sectionId = this.dataMap.c.s[i];
-            var sectionCondition = this.sectionConditionValue(sectionId);
-            this.data.c.s[sectionId] = [sectionCondition === true];
-        }
-        for (var i = 0; i < this.dataMap.c.o.length; i += 1) {
-            var optionId = this.dataMap.c.o[i];
-            var optionCondition = this.optionConditionValue(optionId);
-            this.data.c.o[optionId] =
-                optionCondition === undefined ? [false] : optionCondition;
-        }
-    };
-    DataPopulator.prototype.populateVariables = function () {
-        for (var i = 0; i < this.dataMap.v.length; i += 1) {
-            var variableId = this.dataMap.v[i];
-            var variableReference = this.references.variables[variableId];
-            var values = this.getVariableValues(variableId);
-            if (variableReference.type === "number") {
-                values = values.map(function (v) { return (typeof v === "number" ? v : parseFloat(v)); });
-            }
-            this.data.v[variableId] = __spreadArrays(values);
-        }
-    };
-    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;
-        }
-        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;
-        });
-    };
-    DataPopulator.prototype.getVariableRootParent = function (variableId) {
-        var variableParents = this.references.relations.variables[variableId]
-            .parents;
-        return variableParents[variableParents.length - 1];
-    };
-    DataPopulator.prototype.cleanArrayFromNullValues = function (arr) {
-        return arr.map(function (v) { return (v === null ? "" : v); });
-    };
-    DataPopulator.prototype.populateOptions = function () {
-        for (var i = 0; i < this.dataMap.o.length; i += 1) {
-            var optionId = this.dataMap.o[i];
-            var inputs = this.getOptionInputs(optionId);
-            this.data.o[optionId] = __spreadArrays(inputs);
-        }
-    };
-    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;
-        }
-        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;
-        });
-    };
-    DataPopulator.prototype.getOptionRootParent = function (optionId) {
-        var optionParents = this.references.relations.options[optionId].parents;
-        return optionParents.length > 0
-            ? optionParents[optionParents.length - 1]
-            : optionId;
-    };
-    DataPopulator.prototype.optionConditionValue = function (optionId) {
-        var _this = this;
-        var conditions = this.references.conditions.options[optionId];
-        if (conditions === undefined)
-            return undefined;
-        var inputs = this.ovc.options[optionId];
-        return inputs.map(function (input, index) {
-            return _this.conditionsRunner.executeCondition(conditions, optionId, index, "options");
-        });
-    };
-    DataPopulator.prototype.variableConditionValue = function (variableId) {
-        var _this = this;
-        var conditions = this.references.conditions.variables[variableId];
-        if (conditions === undefined)
-            return undefined;
-        var inputs = this.ovc.variables[variableId];
-        return inputs.map(function (input, index) {
-            return _this.conditionsRunner.executeCondition(conditions, variableId, index, "variables");
-        });
-    };
-    DataPopulator.prototype.sectionConditionValue = function (sectionId) {
-        var conditions = this.references.conditions.sections.main[sectionId];
-        if (conditions === undefined)
-            return undefined;
-        return this.conditionsRunner.executeCondition(conditions, 0, 0, "sections");
-    };
-    return DataPopulator;
-}());
-exports.default = DataPopulator;

package/dist/libs/InputsInitiator.d.ts

@@ -1,21 +0,0 @@
-import { Types } from "@legalplace/referencesparser";
-declare type References = Types.ReferencesType;
-declare type OVC_TYPE = {
-    options: {
-        [key: string]: boolean[];
-    };
-    variables: {
-        [key: string]: (number | string)[];
-    };
-};
-declare class IntputsInitiator {
-    private inputs;
-    private references;
-    private ovc;
-    constructor(references: References, ovc: OVC_TYPE | null);
-    getInputs(): OVC_TYPE;
-    private setMultiples;
-    private initOptionsInputs;
-    private initVariablesInputs;
-}
-export default IntputsInitiator;

package/dist/libs/InputsInitiator.js

@@ -1,104 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var IntputsInitiator = (function () {
-    function IntputsInitiator(references, ovc) {
-        this.inputs = {
-            options: {},
-            variables: {}
-        };
-        this.references = references;
-        this.ovc = ovc;
-        this.setMultiples();
-        this.initOptionsInputs();
-        this.initVariablesInputs();
-    }
-    IntputsInitiator.prototype.getInputs = function () {
-        return this.inputs;
-    };
-    IntputsInitiator.prototype.setMultiples = function () {
-        var _this = this;
-        if (this.ovc === null)
-            return;
-        Object.keys(this.ovc.options).forEach(function (id) {
-            if (_this.ovc === null)
-                return;
-            var inputs = _this.ovc.options[id];
-            if (inputs.length > 1) {
-                var parentsTree = _this.references.relations.options[id].parents;
-                var rootOptionId = parentsTree.length > 0 ? parentsTree[parentsTree.length - 1] : id;
-                if (!_this.ovc.options[rootOptionId]) {
-                    var rootReference = _this.references.options[rootOptionId];
-                    if (rootReference.meta.type === "static") {
-                        _this.ovc.options[rootOptionId] = new Array(inputs.length).fill(true);
-                    }
-                }
-            }
-        });
-    };
-    IntputsInitiator.prototype.initOptionsInputs = function () {
-        var optionsIds = Object.keys(this.references.options);
-        for (var i = 0; i < optionsIds.length; i += 1) {
-            var optionId = optionsIds[i];
-            var option = this.references.options[optionId];
-            var values = [false];
-            if (this.ovc &&
-                Object.prototype.hasOwnProperty.call(this.ovc.options, optionId)) {
-                if ([
-                    "static",
-                    "hidden",
-                    "brut-text",
-                    "repeated",
-                    "box",
-                    "separator"
-                ].includes(option.meta.type)) {
-                    values = new Array(this.ovc.options[optionId].length).fill(true);
-                }
-                else {
-                    values = this.ovc.options[optionId];
-                }
-            }
-            else if ([
-                "static",
-                "hidden",
-                "brut-text",
-                "repeated",
-                "box",
-                "separator"
-            ].includes(option.meta.type)) {
-                values = [true];
-            }
-            this.inputs.options[optionId] = values;
-        }
-    };
-    IntputsInitiator.prototype.initVariablesInputs = function () {
-        var variablesIds = Object.keys(this.references.variables);
-        for (var i = 0; i < variablesIds.length; i += 1) {
-            var variableId = variablesIds[i];
-            var values = [""];
-            if (this.ovc &&
-                Object.prototype.hasOwnProperty.call(this.ovc.variables, variableId)) {
-                values = this.ovc.variables[variableId];
-            }
-            else {
-                var defaultValue = "";
-                var prefillings = this.references.variables[variableId].prefillings;
-                if (prefillings &&
-                    Array.isArray(prefillings) &&
-                    prefillings.length > 0) {
-                    var noConditionsPrefills = prefillings.filter(function (prefill) {
-                        return typeof prefill.conditions === "undefined" ||
-                            Object.keys(prefill.conditions).length === 0;
-                    });
-                    defaultValue =
-                        noConditionsPrefills.length > 0
-                            ? noConditionsPrefills[0].value
-                            : "";
-                }
-                values = [defaultValue];
-            }
-            this.inputs.variables[variableId] = values;
-        }
-    };
-    return IntputsInitiator;
-}());
-exports.default = IntputsInitiator;

package/dist/libs/OvcConverter.d.ts

@@ -1,19 +0,0 @@
-import OVC_TYPE from "./ovc.type";
-export interface OldOVC {
-    o: {
-        [k: string]: string | number | (string | number)[];
-    };
-    v: {
-        [k: string]: string | number | (string | number)[];
-    };
-    c: {
-        [k: string]: boolean | boolean[];
-    };
-}
-declare class OvcConverter {
-    convertToOptionsVariables(ovc: OldOVC): OVC_TYPE;
-    isOvc(_obj: OVC_TYPE | OldOVC): _obj is OldOVC;
-    isOptionsVariables(_obj: OVC_TYPE | OldOVC): boolean;
-}
-declare const _default: OvcConverter;
-export default _default;

package/dist/libs/OvcConverter.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var OvcConverter = (function () {
-    function OvcConverter() {
-    }
-    OvcConverter.prototype.convertToOptionsVariables = function (ovc) {
-        var inputs = {
-            options: {},
-            variables: {}
-        };
-        if (typeof ovc !== "object")
-            return inputs;
-        if (typeof ovc.o === "object") {
-            Object.keys(ovc.o).forEach(function (id) {
-                var currentOption = ovc.o[id];
-                if (Array.isArray(currentOption)) {
-                    var occurences_1 = currentOption.length;
-                    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);
-                            }
-                            return;
-                        }
-                        if (!Object.prototype.hasOwnProperty.call(inputs.options, childId)) {
-                            inputs.options[childId] = new Array(occurences_1).fill(false);
-                        }
-                        inputs.options[childId][index] = true;
-                    });
-                }
-                else {
-                    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];
-                if (typeof id === "string" && id.trim().length === 0)
-                    return;
-                if (Array.isArray(currentCheckbox)) {
-                    inputs.options[id] = currentCheckbox;
-                }
-                else {
-                    inputs.options[id] = [currentCheckbox];
-                }
-            });
-        }
-        return inputs;
-    };
-    OvcConverter.prototype.isOvc = function (_obj) {
-        if (typeof _obj !== "object" || _obj === null)
-            return false;
-        var ovcKeys = ["o", "v", "c"];
-        var foundKeys = Object.keys(_obj)
-            .map(function (key) { return (ovcKeys.includes(key) ? 1 : 0); })
-            .reduce(function (a, b) { return a + b; }, 0);
-        return foundKeys > 1;
-    };
-    OvcConverter.prototype.isOptionsVariables = function (_obj) {
-        if (typeof _obj !== "object" || _obj === null)
-            return false;
-        var optionsVariablesKeys = ["options", "variables"];
-        var foundKeys = Object.keys(_obj)
-            .map(function (key) { return (optionsVariablesKeys.includes(key) ? 1 : 0); })
-            .reduce(function (a, b) { return a + b; }, 0);
-        return foundKeys === 2;
-    };
-    return OvcConverter;
-}());
-exports.default = new OvcConverter();