@legalplace/prerenderx 2.2.1 → 2.2.3

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,24 @@ before_script:
 variables: 
   DOCKER_DRIVER: overlay2
 
+setup:
+  stage: setup
+  only:
+    changes:
+      - yarn.lock
+      - package.json
+      - .gitlab-ci.yml
+  script:
+    - yarn install --frozen-lockfile  --check-files --silent
+    - 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/.prettierrc.js

@@ -0,0 +1,10 @@
+module.exports =  {
+  printWidth: 180,
+  useTabs: false,
+  tabWidth: 2,
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'none',
+  parser: 'typescript',
+  endOfLine: 'lf'
+}

package/.vscode/settings.json

@@ -4,9 +4,6 @@
   "eslint.options": {
     "extensions": [".ts", ".js"]
   },
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
   "files.autoSave": "off",
   "editor.formatOnSave": false,
   "editor.formatOnType": true,
@@ -14,4 +11,7 @@
   "eslint.packageManager": "yarn",
   "eslint.quiet": true,
   "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
 }

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import Prerender from "./libs/Prerender";
-export { Prerender };
+import Prerender from './libs/Prerender';
+export default Prerender;

package/dist/index.js

@@ -4,4 +4,4 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var Prerender_1 = __importDefault(require("./libs/Prerender"));
-exports.Prerender = Prerender_1.default;
+exports.default = Prerender_1.default;

package/dist/libs/ConditionsRunner.d.ts

@@ -1,6 +1,6 @@
-import { Types } from "@legalplace/referencesparser";
-import { ConditionV3 } from "@legalplace/models-v3-types";
-import { ConditionDataMap } from "./DataPopulator";
+import { Types } from '@legalplace/referencesparser';
+import { ConditionV3 } from '@legalplace/models-v3-types';
+import { ConditionDataMap } from './DataPopulator';
 declare type OVC_TYPE = {
     options: {
         [key: string]: boolean[];
@@ -19,6 +19,6 @@ declare class ConditionsRunner {
     executeCondition(condition: {
         dataMap: ConditionDataMap;
         conditions: ConditionV3;
-    }, id: number, index: number, conditionType: "options" | "optionValidator" | "variables" | "prefillers" | "variableValidator" | "sections" | "documents"): any;
+    }, id: number, index: number, conditionType: 'options' | 'optionValidator' | 'variables' | 'prefillers' | 'variableValidator' | 'sections' | 'documents'): any;
 }
 export default ConditionsRunner;

package/dist/libs/ConditionsRunner.js

@@ -13,30 +13,21 @@ var ConditionsRunner = (function () {
     ConditionsRunner.prototype.isOptionRelatedToOption = function (optionA, optionB) {
         var OptionBParents = this.references.relations.options[optionB].parents;
         var OptionBRoot = OptionBParents[OptionBParents.length - 1];
-        var OptionBRootRelations = OptionBRoot
-            ? this.references.relations.options[OptionBRoot]
-            : undefined;
+        var OptionBRootRelations = OptionBRoot ? this.references.relations.options[OptionBRoot] : undefined;
         if (OptionBRootRelations) {
-            if (optionA === optionB ||
-                OptionBRootRelations.children.options.includes(optionA) ||
-                OptionBRootRelations.dependants.includes(optionA)) {
+            if (optionA === optionB || OptionBRootRelations.children.options.includes(optionA) || OptionBRootRelations.dependants.includes(optionA)) {
                 return true;
             }
         }
         return false;
     };
     ConditionsRunner.prototype.isVariableRelatedToOption = function (variableId, optionId) {
-        var variableParentId = this.references.relations.variables[variableId]
-            .parents[0];
-        var optionParents = this.references.relations.options[variableParentId]
-            .parents;
+        var variableParentId = this.references.relations.variables[variableId].parents[0];
+        var optionParents = this.references.relations.options[variableParentId].parents;
         var optionRoot = optionParents[optionParents.length - 1];
-        var optionRootRelations = optionRoot
-            ? this.references.relations.options[optionRoot]
-            : undefined;
+        var optionRootRelations = optionRoot ? this.references.relations.options[optionRoot] : undefined;
         if (optionRootRelations) {
-            if (optionRootRelations.children.options.includes(optionId) ||
-                optionRootRelations.dependants.includes(optionId)) {
+            if (optionRootRelations.children.options.includes(optionId) || optionRootRelations.dependants.includes(optionId)) {
                 return true;
             }
         }
@@ -47,13 +38,9 @@ var ConditionsRunner = (function () {
         var optionB = this.references.relations.variables[variableB].parents[0];
         var OptionBParents = this.references.relations.options[optionB].parents;
         var OptionBRoot = OptionBParents[OptionBParents.length - 1];
-        var OptionBRootRelations = OptionBRoot
-            ? this.references.relations.options[OptionBRoot]
-            : undefined;
+        var OptionBRootRelations = OptionBRoot ? this.references.relations.options[OptionBRoot] : undefined;
         if (OptionBRootRelations) {
-            if (optionA === optionB ||
-                OptionBRootRelations.children.options.includes(optionA) ||
-                OptionBRootRelations.dependants.includes(optionA)) {
+            if (optionA === optionB || OptionBRootRelations.children.options.includes(optionA) || OptionBRootRelations.dependants.includes(optionA)) {
                 return true;
             }
         }
@@ -62,20 +49,16 @@ var ConditionsRunner = (function () {
     ConditionsRunner.prototype.executeCondition = function (condition, id, index, conditionType) {
         var _this = this;
         if (Array.isArray(condition))
-            return condition.map(function (_condition) {
-                return _this.executeCondition(_condition, id, index, conditionType);
-            });
+            return condition.map(function (_condition) { return _this.executeCondition(_condition, id, index, conditionType); });
         var currentData;
-        if (conditionType === "options" || conditionType === "optionValidator") {
+        if (conditionType === 'options' || conditionType === 'optionValidator') {
             currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
         }
-        else if (conditionType === "variables" ||
-            conditionType === "prefillers" ||
-            conditionType === "variableValidator") {
+        else if (conditionType === 'variables' || conditionType === 'prefillers' || conditionType === 'variableValidator') {
             var dataId = this.references.relations.variables[id].parents[0];
             currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, dataId, index).getData();
         }
-        else if (conditionType === "sections" || conditionType === "documents") {
+        else if (conditionType === 'sections' || conditionType === 'documents') {
             currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
         }
         return lplogic_1.default(condition.conditions, currentData);

package/dist/libs/DocumentRender.d.ts

@@ -1,7 +1,7 @@
-import { Types } from "@legalplace/referencesparser";
-import ConditionsRunner from "./ConditionsRunner";
-import OVC_TYPE from "./ovc.type";
-import NumAuto from "./NumAuto";
+import { Types } from '@legalplace/referencesparser';
+import ConditionsRunner from './ConditionsRunner';
+import OVC_TYPE from './ovc.type';
+import NumAuto from './NumAuto';
 declare class DocumentRender {
     references: Types.ReferencesType;
     conditions: ConditionsRunner;

package/dist/libs/DocumentRender.js

@@ -27,7 +27,7 @@ var DocumentRender = (function () {
                 numauto: _this.NumAuto
             }).getOutputs());
         });
-        return documentOutputs.join("");
+        return documentOutputs.join('');
     };
     return DocumentRender;
 }());

package/dist/libs/NumAuto.js

@@ -12,7 +12,7 @@ var NumAuto = (function () {
                 _this.indexesList[index] = 0;
             }
             _this.indexesList[index] += 1;
-            if (typeof tag === "string")
+            if (typeof tag === 'string')
                 _this.tagsIndex[tag] = _this.indexesList[index];
             return _this.indexesList[index];
         };

package/dist/libs/OptionRender.d.ts

@@ -1,7 +1,7 @@
-import { Types } from "@legalplace/referencesparser";
-import ConditionsRunner from "./ConditionsRunner";
-import OVC_TYPE from "./ovc.type";
-import NumAuto from "./NumAuto";
+import { Types } from '@legalplace/referencesparser';
+import ConditionsRunner from './ConditionsRunner';
+import OVC_TYPE from './ovc.type';
+import NumAuto from './NumAuto';
 declare class OptionRender {
     outputs: string[];
     references: Types.ReferencesType;

package/dist/libs/OptionRender.js

@@ -26,25 +26,15 @@ var OptionRender = (function () {
         var _this = this;
         var option = this.references.options[this.id];
         var conditionObject = this.references.conditions.options[this.id];
-        var condition = conditionObject === undefined
-            ? true
-            : this.conditions.executeCondition(conditionObject, this.id, this.index, "options");
+        var condition = conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, this.id, this.index, 'options');
         if (condition === true) {
-            if (typeof option.meta.output === "string" &&
-                option.meta.output.trim().length > 0) {
+            if (typeof option.meta.output === 'string' && option.meta.output.trim().length > 0) {
                 var outputReference = this.references.outputs[this.id];
                 var autonums = [];
                 if (condition !== false) {
                     autonums = outputReference.autonums.map(function (currentAn) {
-                        var fn = currentAn[0] === "numauto-pre"
-                            ? _this.NumAuto.getNumPre
-                            : _this.NumAuto.getNum;
-                        return [
-                            currentAn[0],
-                            currentAn[1],
-                            fn(currentAn[1], currentAn[2]),
-                            currentAn[2]
-                        ];
+                        var fn = currentAn[0] === 'numauto-pre' ? _this.NumAuto.getNumPre : _this.NumAuto.getNum;
+                        return [currentAn[0], currentAn[1], fn(currentAn[1], currentAn[2]), currentAn[2]];
                     });
                 }
                 var variables = OutputParser_1.getRelatedVariablesValues(this.id, this.index, outputReference.variables, this.ovc, this.references);

package/dist/libs/OutputParser.d.ts

@@ -1,5 +1,5 @@
-import { Types } from "@legalplace/referencesparser";
-import OVC_TYPE from "./ovc.type";
+import { Types } from '@legalplace/referencesparser';
+import OVC_TYPE from './ovc.type';
 declare type relVarsValsT = Record<string, string | number>;
 declare type getRelatedVarsT = (optionId: number, index: number, variables: number[], ovc: OVC_TYPE, references: Types.ReferencesType) => relVarsValsT;
 export declare const getRelatedVariablesValues: getRelatedVarsT;

package/dist/libs/OutputParser.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, references) {
     var variablesValues = {};
     variables.forEach(function (currentVariableId) {
-        var value = ovc.variables[currentVariableId] || [""];
+        var value = ovc.variables[currentVariableId] || [''];
         var variableParents = references.relations.variables[currentVariableId].parents;
         if (variableParents === undefined)
             throw new Error("Variable " + currentVariableId + " parents object does not exist");
@@ -11,21 +11,18 @@ exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, r
         var rootVariableParentRelations = references.relations.options[rootVariableParentId];
         if (rootVariableParentRelations === undefined)
             throw new Error("Option " + rootVariableParentId + " does not exist");
-        if (typeof variableParents === "undefined")
+        if (typeof variableParents === 'undefined')
             return;
-        if (rootVariableParentRelations.children.options.includes(optionId) ||
-            rootVariableParentRelations.dependants.includes(optionId) ||
-            optionId === rootVariableParentId)
+        if (rootVariableParentRelations.children.options.includes(optionId) || rootVariableParentRelations.dependants.includes(optionId) || optionId === rootVariableParentId)
             value = [value[index]];
         var cleanValues = value.map(function (currentValue) {
-            if (typeof currentValue === "number")
+            if (typeof currentValue === 'number')
                 return currentValue.toString();
-            if (typeof currentValue === "string")
+            if (typeof currentValue === 'string')
                 return currentValue;
-            return "";
+            return '';
         });
-        variablesValues[currentVariableId] =
-            cleanValues.length === 1 ? cleanValues[0] : cleanValues.join(", ");
+        variablesValues[currentVariableId] = cleanValues.length === 1 ? cleanValues[0] : cleanValues.join(', ');
     });
     return variablesValues;
 };
@@ -34,12 +31,12 @@ exports.parseOutputWithVariables = function (output, variables, autonums) {
     Object.keys(variables).forEach(function (variableId) {
         var value = variables[variableId].toString();
         if (value.trim().length === 0) {
-            value = new Array(16).join("_");
+            value = new Array(16).join('_');
         }
-        parsedOutput = parsedOutput.replace(new RegExp("\\[var:" + variableId + "\\]", "g"), value);
+        parsedOutput = parsedOutput.replace(new RegExp("\\[var:" + variableId + "\\]", 'g'), value);
     });
-    parsedOutput = parsedOutput.replace(/\[\[PAGE_BREAK\]\]/gi, '<p class="pagebreak"><!-- pagebreak --></p>');
-    parsedOutput = parsedOutput.replace(/\[(E|B)_BLUR\]/gi, "");
+    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)
             parsedOutput = parsedOutput.replace("[" + currentAn[0] + ":" + currentAn[1] + "]", "<span class=\"" + currentAn[0] + "\">" + currentAn[2] + "</span>");

package/dist/libs/Prerender.d.ts

@@ -1,6 +1,6 @@
-import { ModelV3 } from "@legalplace/models-v3-types";
-import OVC_TYPE from "./ovc.type";
-import { OldOVC } from "./OvcConverter";
+import { ModelV3 } from '@legalplace/models-v3-types';
+import OVC_TYPE from './ovc.type';
+import { OldOVC } from './OvcConverter';
 declare class Prerender {
     private model;
     private references;

package/dist/libs/Prerender.js

@@ -15,9 +15,7 @@ var Prerender = (function () {
         this.documentsIndex = {};
         this.renderedDocuments = {};
         this.model = model;
-        this.ovc = OvcConverter_1.default.isOvc(ovc)
-            ? OvcConverter_1.default.convertToOptionsVariables(ovc)
-            : ovc;
+        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();
         var inputs = new InputsInitiator_1.default(this.references, this.ovc).getInputs();
@@ -33,14 +31,12 @@ var Prerender = (function () {
         var _this = this;
         Object.keys(this.model.documents).forEach(function (documentName) {
             var conditionObject = _this.references.conditions.documents[documentName];
-            var condition = conditionObject === undefined
-                ? true
-                : _this.conditions.executeCondition(conditionObject, 0, 0, "documents");
+            var condition = conditionObject === undefined ? true : _this.conditions.executeCondition(conditionObject, 0, 0, 'documents');
             if (condition === true) {
                 var hash = crypto_1.default
-                    .createHash("sha1")
+                    .createHash('sha1')
                     .update(documentName)
-                    .digest("hex");
+                    .digest('hex');
                 _this.documentsIndex[hash] = {
                     name: documentName,
                     pdf: true,

package/dist/libs/SectionRender.d.ts

@@ -1,7 +1,7 @@
-import { Types } from "@legalplace/referencesparser";
-import ConditionsRunner from "./ConditionsRunner";
-import OVC_TYPE from "./ovc.type";
-import NumAuto from "./NumAuto";
+import { Types } from '@legalplace/referencesparser';
+import ConditionsRunner from './ConditionsRunner';
+import OVC_TYPE from './ovc.type';
+import NumAuto from './NumAuto';
 declare class SectionRender {
     outputs: string[];
     references: Types.ReferencesType;

package/dist/libs/SectionRender.js

@@ -29,24 +29,17 @@ var SectionRender = (function () {
         var _this = this;
         var section = this.references.sections[this.documentName][this.currentSection];
         var conditionObject = this.references.conditions.sections[this.documentName][this.currentSection];
-        var condition = conditionObject === undefined
-            ? true
-            : this.conditions.executeCondition(conditionObject, 0, 0, "sections");
+        var condition = conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, 0, 0, 'sections');
         if (condition === true) {
             section.options.forEach(function (optionId) {
                 var option = _this.references.options[optionId];
                 var repeatOption = optionId;
-                if (option.meta.type === "repeated") {
+                if (option.meta.type === 'repeated') {
                     if (option.meta.repeatOption === undefined)
                         return;
-                    repeatOption =
-                        typeof option.meta.repeatOption === "number"
-                            ? option.meta.repeatOption
-                            : parseInt(option.meta.repeatOption, 10);
+                    repeatOption = typeof option.meta.repeatOption === 'number' ? option.meta.repeatOption : parseInt(option.meta.repeatOption, 10);
                 }
-                var inputs = _this.ovc.options[repeatOption] || [
-                    !["radio", "checkbox"].includes(option.meta.type)
-                ];
+                var inputs = _this.ovc.options[repeatOption] || [!['radio', 'checkbox'].includes(option.meta.type)];
                 inputs.forEach(function (value, index) {
                     if (value !== true)
                         return;

package/package.json

@@ -1,21 +1,23 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
   "author": "Moncef Hammou <moncef@legalplace.fr> <moncef@legalplace.fr>",
   "license": "MIT",
   "scripts": {
-    "lint": "npx eslint ./src/ --ext ts,js",
-    "test": "npx jest",
-    "build": "npx tsc"
+    "format": "prettier --single-quote --no-semi --trailing-comma none --write \"src/**/*.{js,ts,tsx}\"",
+    "lint": "tsc && eslint ./src/ --ext ts,js",
+    "lint:fix": "tsc && eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
+    "test": "jest",
+    "build": "tsc"
   },
   "dependencies": {
-    "crypto": "^1.0.1",
     "@legalplace/lplogic": "^2.0.0",
     "@legalplace/models-v3-types": "^3.1.1",
-    "@legalplace/referencesparser": "^1.2.0"
+    "@legalplace/referencesparser": "^1.2.0",
+    "typescript": "3.9.3"
   },
   "devDependencies": {
     "@babel/core": "^7.7.2",
@@ -33,7 +35,6 @@
     "jest": "^24.8.0",
     "prettier": "1.19.1",
     "redux-mock-store": "^1.5.3",
-    "ts-jest": "^24.0.2",
-    "typescript": "^3.7.2"
+    "ts-jest": "^24.0.2"
   }
 }

package/src/index.ts

@@ -1,3 +1,3 @@
-import Prerender from "./libs/Prerender";
+import Prerender from './libs/Prerender'
 
-export { Prerender };
+export default Prerender