@legalplace/prerenderx 3.2.0 → 3.3.0

package/dist/libs/Prerender.d.ts

@@ -1,27 +1,9 @@
-import { ModelV3 } from '@legalplace/models-v3-types';
-import OvcType from '@legalplace/types/dist/ovc';
-import InputsType from '@legalplace/types/dist/inputs';
-declare type DocumentOutputIndex = {
-    name: string;
-    slug: string;
-    pdf: boolean;
-    docx: boolean;
-};
-declare type DocumentPdfFormIndex = {
-    name: string;
-    slug: string;
-    form: boolean;
-    fdf: {
-        id: string;
-        fields: Record<string, string>;
-    };
-};
-declare type FDFType = {
-    id: string;
-    fields: Record<string, string>;
-};
+import type { ModelV3 } from "@legalplace/models-v3-types";
+import type { Types } from "@legalplace/referencesparser";
+import type OvcType from "@legalplace/types/dist/ovc";
+import type InputsType from "@legalplace/types/dist/inputs";
+import type { FDFType, DocumentIndex, DocumentOutputIndex, DocumentPdfFormIndex } from "../types/types";
 declare class Prerender {
-    private model;
     private references;
     private ovc;
     private conditions;
@@ -30,9 +12,9 @@ declare class Prerender {
     private NumAuto;
     private documentsIndex;
     private renderedDocuments;
-    constructor(model: ModelV3, ovc: InputsType | OvcType);
-    getDocumentsIndexWithoutFdf(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
-    getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
+    constructor(model: ModelV3 | Types.ReferencesType, ovc: InputsType | OvcType);
+    getDocumentsIndexWithoutFdf(): DocumentIndex;
+    getDocumentsIndex(): DocumentIndex;
     getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;
     private fillPdfForms;

package/dist/libs/Prerender.js

@@ -16,10 +16,13 @@ var Prerender = (function () {
     function Prerender(model, ovc) {
         this.documentsIndex = {};
         this.renderedDocuments = {};
-        this.model = model;
         this.NumAuto = new NumAuto_1.default();
-        this.references = new referencesparser_1.ReferencesParser(model).getReferences();
-        this.ovc = ovc_converter_1.default.isOvc(ovc) ? ovc_converter_1.default.convertToOptionsVariables(ovc, this.references) : ovc;
+        this.references = referencesparser_1.ReferencesParser.isReferences(model)
+            ? model
+            : new referencesparser_1.ReferencesParser(model).getReferences();
+        this.ovc = ovc_converter_1.default.isOvc(ovc)
+            ? ovc_converter_1.default.convertToOptionsVariables(ovc, this.references)
+            : ovc;
         var inputs = new InputsInitiator_1.default(this.references, this.ovc).getInputs();
         this.conditions = new conditions_runner_1.default(this.references, inputs);
         this.documentRender = new DocumentRender_1.default(this.references, this.conditions, inputs, this.NumAuto);
@@ -39,39 +42,42 @@ var Prerender = (function () {
             return this.renderedDocuments[documentNameHash];
         }
         var index = this.documentsIndex[documentNameHash];
-        this.renderedDocuments[documentNameHash] = Prerender.isPdfForm(index) ? this.pdfFiller.fillDocument(index.slug) : this.documentRender.renderDocument(index.slug);
+        this.renderedDocuments[documentNameHash] = Prerender.isPdfForm(index)
+            ? this.pdfFiller.fillDocument(index.slug)
+            : this.documentRender.renderDocument(index.slug);
         return this.renderedDocuments[documentNameHash];
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
         var _this = this;
-        Object.keys(this.model.documents).forEach(function (slug) {
+        Object.keys(this.references.documents).forEach(function (slug) {
             var _a, _b;
-            var document = _this.model.documents[slug];
-            var documentParams = _this.model.documents[slug].params;
+            var document = _this.references.documents[slug];
+            var documentParams = _this.references.documents[slug].params;
             var conditionObject = _this.references.conditions.documents[slug];
-            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')
-                    .update(slug)
-                    .digest('hex');
-                if (typeof document.pdf === 'object' && typeof document.pdf.id === 'string' && typeof document.pdf.form === 'object') {
+                var hash = crypto_1.default.createHash("sha1").update(slug).digest("hex");
+                if (typeof document.pdf === "object" &&
+                    typeof document.pdf.id === "string" &&
+                    typeof document.pdf.form === "object") {
                     _this.documentsIndex[hash] = {
-                        name: OutputParser_1.parseDocumentNameWithVariables(document.name, _this.ovc, _this.references, document.fallbackName),
+                        name: (0, OutputParser_1.parseDocumentNameWithVariables)(document.name, _this.ovc, _this.references, document.fallbackName),
                         slug: slug,
                         form: true,
                         fdf: {
-                            id: '',
-                            fields: {}
-                        }
+                            id: "",
+                            fields: {},
+                        },
                     };
                 }
                 else {
                     _this.documentsIndex[hash] = {
-                        name: OutputParser_1.parseDocumentNameWithVariables(document.name, _this.ovc, _this.references, document.fallbackName),
+                        name: (0, OutputParser_1.parseDocumentNameWithVariables)(document.name, _this.ovc, _this.references, document.fallbackName),
                         slug: slug,
-                        pdf: ((_a = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _a === void 0 ? void 0 : _a.pdf) === undefined ? true : documentParams.formats.pdf,
-                        docx: ((_b = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _b === void 0 ? void 0 : _b.docx) === undefined ? true : documentParams.formats.docx
+                        pdf: ((_a = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _a === void 0 ? void 0 : _a.pdf) !== false,
+                        docx: ((_b = documentParams === null || documentParams === void 0 ? void 0 : documentParams.formats) === null || _b === void 0 ? void 0 : _b.docx) !== false,
                     };
                 }
             }
@@ -94,15 +100,16 @@ var Prerender = (function () {
                 _this.renderedDocuments[documentNameHash] = _this.pdfFiller.fillDocument(_this.documentsIndex[documentNameHash].slug);
             }
             else {
-                _this.renderedDocuments[documentNameHash] = _this.documentRender.renderDocument(_this.documentsIndex[documentNameHash].slug);
+                _this.renderedDocuments[documentNameHash] =
+                    _this.documentRender.renderDocument(_this.documentsIndex[documentNameHash].slug);
             }
         });
     };
     Prerender.isPdfForm = function (index) {
-        return Object.prototype.hasOwnProperty.call(index, 'form');
+        return Object.prototype.hasOwnProperty.call(index, "form");
     };
     Prerender.isOutput = function (index) {
-        return !Object.prototype.hasOwnProperty.call(index, 'form');
+        return !Object.prototype.hasOwnProperty.call(index, "form");
     };
     return Prerender;
 }());

package/dist/libs/SectionRender.d.ts

@@ -1,7 +1,7 @@
-import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from '@legalplace/conditions-runner';
-import InputsType from '@legalplace/types/dist/inputs';
-import NumAuto from './NumAuto';
+import type { Types } from "@legalplace/referencesparser";
+import type ConditionsRunner from "@legalplace/conditions-runner";
+import type InputsType from "@legalplace/types/dist/inputs";
+import type NumAuto from "./NumAuto";
 declare class SectionRender {
     outputs: string[];
     references: Types.ReferencesType;

package/dist/libs/SectionRender.js

@@ -1,10 +1,12 @@
 "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;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -29,28 +31,35 @@ 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;
-                    _this.outputs = __spreadArrays(_this.outputs, new OptionRender_1.default({
+                    _this.outputs = __spreadArray(__spreadArray([], _this.outputs, true), new OptionRender_1.default({
                         references: _this.references,
                         id: optionId,
                         ovc: _this.ovc,
                         index: index,
                         conditions: _this.conditions,
-                        numauto: _this.NumAuto
-                    }).getOutputs());
+                        numauto: _this.NumAuto,
+                    }).getOutputs(), true);
                 });
             });
         }

package/dist/libs/misc/FillPdfFormBase.d.ts

@@ -1,6 +1,6 @@
-import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from '@legalplace/conditions-runner';
-import InputsType from '@legalplace/types/dist/inputs';
+import type { Types } from "@legalplace/referencesparser";
+import type ConditionsRunner from "@legalplace/conditions-runner";
+import type InputsType from "@legalplace/types/dist/inputs";
 declare class FillPdfFormBase {
     references: Types.ReferencesType;
     conditions: ConditionsRunner;

package/dist/libs/misc/FillPdfFormBase.js

@@ -1,10 +1,12 @@
 "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;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var FillPdfFormBase = (function () {
@@ -18,34 +20,40 @@ var FillPdfFormBase = (function () {
         var variableCondition = this.getVariableCondition(id, index);
         var variableParents = ((_a = this.references.relations.variables[id]) === null || _a === void 0 ? void 0 : _a.parents) || [];
         var parentOptionIsDisplayed = this.isOptionDisplayed(variableParents[0], index);
-        return [variableCondition, parentOptionIsDisplayed].filter(function (c) { return c !== true; }).length === 0;
+        return ([variableCondition, parentOptionIsDisplayed].filter(function (c) { return c !== true; })
+            .length === 0);
     };
     FillPdfFormBase.prototype.isOptionDisplayed = function (id, index) {
         var _this = this;
         var _a;
         var optionCondition = this.getOptionCondition(id, index);
         var optionParents = ((_a = this.references.relations.options[id]) === null || _a === void 0 ? void 0 : _a.parents) || [];
-        var parentsConditions = optionParents.map(function (optionId) {
-            return _this.getOptionCondition(optionId, index) !== false;
-        });
-        var parentsInputs = optionParents.map(function (optionId) {
-            return _this.ovc.options[optionId][index];
-        });
+        var parentsConditions = optionParents.map(function (optionId) { return _this.getOptionCondition(optionId, index) !== false; });
+        var parentsInputs = optionParents.map(function (optionId) { return _this.ovc.options[optionId][index]; });
         var parentSectionId = this.getOptionParentSection(id);
         var parentSectionCondition = this.getSectionCondition(parentSectionId) !== false;
-        return __spreadArrays([optionCondition, parentSectionCondition], parentsConditions, parentsInputs).filter(function (c) { return c !== true; }).length === 0;
+        return (__spreadArray(__spreadArray([
+            optionCondition,
+            parentSectionCondition
+        ], parentsConditions, true), parentsInputs, true).filter(function (c) { return c !== true; }).length === 0);
     };
     FillPdfFormBase.prototype.getVariableCondition = function (id, index) {
         var conditionObject = this.references.conditions.variables[id];
-        return conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, id, index, 'variables');
+        return conditionObject === undefined
+            ? true
+            : this.conditions.executeCondition(conditionObject, id, index, "variables");
     };
     FillPdfFormBase.prototype.getOptionCondition = function (id, index) {
         var conditionObject = this.references.conditions.options[id];
-        return conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, id, index, 'options');
+        return conditionObject === undefined
+            ? true
+            : this.conditions.executeCondition(conditionObject, id, index, "options");
     };
     FillPdfFormBase.prototype.getSectionCondition = function (id) {
         var conditionObject = this.references.conditions.sections.main[id];
-        return conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, id, 0, 'sections');
+        return conditionObject === undefined
+            ? true
+            : this.conditions.executeCondition(conditionObject, id, 0, "sections");
     };
     FillPdfFormBase.prototype.getOptionParentSection = function (id) {
         var parents = this.references.relations.options[id].parents;

package/dist/types/types.d.ts

@@ -0,0 +1,17 @@
+export declare type DocumentOutputIndex = {
+    name: string;
+    slug: string;
+    pdf: boolean;
+    docx: boolean;
+};
+export declare type DocumentPdfFormIndex = {
+    name: string;
+    slug: string;
+    form: boolean;
+    fdf: FDFType;
+};
+export declare type DocumentIndex = Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
+export declare type FDFType = {
+    id: string;
+    fields: Record<string, string>;
+};

package/dist/types/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -12,35 +12,31 @@
     "lint:fix": "tsc && eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
     "test": "jest",
     "build": "tsc",
+    "build:ci": "tsc",
     "release": "standard-version -a --no-verify"
   },
   "dependencies": {
-    "@legalplace/conditions-runner": "1.1.7",
+    "@legalplace/conditions-runner": "^2.0.3",
+    "@legalplace/eslint-config-base": "^1.1.1",
     "@legalplace/lplogic": "2.1.6",
-    "@legalplace/models-v3-types": "3.5.1",
-    "@legalplace/ovc-converter": "1.1.0",
-    "@legalplace/referencesparser": "1.6.3",
+    "@legalplace/models-v3-types": "^5.1.16",
+    "@legalplace/ovc-converter": "^2.0.3",
+    "@legalplace/prettier-config": "^2.1.3",
+    "@legalplace/referencesparser": "^3.0.3",
     "crypto": "^1.0.1",
     "standard-version": "^9.3.1",
-    "typescript": "3.9.3"
+    "typescript": "4.4.3"
   },
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@babel/preset-typescript": "^7.7.2",
-    "@legalplace/types": "1.1.0",
+    "@legalplace/types": "^2.0.17",
     "@types/jest": "^24.0.15",
-    "@types/node": "^12.12.6",
-    "@typescript-eslint/eslint-plugin": "^2.6.1",
-    "@typescript-eslint/parser": "^2.6.1",
-    "airbnb-standard": "^1.0.0",
-    "eslint": "^6.6.0",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-config-prettier": "^6.5.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-prettier": "^3.1.1",
+    "@types/node": "^20.8.10",
     "jest": "^24.8.0",
-    "prettier": "1.19.1",
     "redux-mock-store": "^1.5.3",
     "ts-jest": "^24.0.2"
-  }
+  },
+  "prettier": "@legalplace/prettier-config",
+  "gitHead": "51ad188d81ea4168bcd0f5922f1b19d730deacfe"
 }

package/src/index.ts

@@ -1,3 +1,5 @@
-import Prerender from './libs/Prerender'
+import Prerender from "./libs/Prerender";
 
-export default Prerender
+export * from "./types/types";
+
+export default Prerender;

package/src/libs/DocumentRender.ts

@@ -1,29 +1,34 @@
-import { Types } from '@legalplace/referencesparser'
-import ConditionsRunner from '@legalplace/conditions-runner'
-import InputsType from '@legalplace/types/dist/inputs'
-import SectionRender from './SectionRender'
-import NumAuto from './NumAuto'
+import type { Types } from "@legalplace/referencesparser";
+import type ConditionsRunner from "@legalplace/conditions-runner";
+import type InputsType from "@legalplace/types/dist/inputs";
+import SectionRender from "./SectionRender";
+import type NumAuto from "./NumAuto";
 
 class DocumentRender {
-  references: Types.ReferencesType
+  references: Types.ReferencesType;
 
-  conditions: ConditionsRunner
+  conditions: ConditionsRunner;
 
-  ovc: InputsType
+  ovc: InputsType;
 
-  private NumAuto: NumAuto
+  private NumAuto: NumAuto;
 
-  constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: InputsType, numauto: NumAuto) {
-    this.references = references
-    this.conditions = conditions
-    this.ovc = ovc
-    this.NumAuto = numauto
+  constructor(
+    references: Types.ReferencesType,
+    conditions: ConditionsRunner,
+    ovc: InputsType,
+    numauto: NumAuto
+  ) {
+    this.references = references;
+    this.conditions = conditions;
+    this.ovc = ovc;
+    this.NumAuto = numauto;
   }
 
   public renderDocument(documentName: string) {
-    const documentOutputs: string[] = []
-    this.NumAuto.resetIndexes()
-    Object.keys(this.references.sections[documentName]).forEach(sectionId => {
+    const documentOutputs: string[] = [];
+    this.NumAuto.resetIndexes();
+    Object.keys(this.references.sections[documentName]).forEach((sectionId) => {
       documentOutputs.push(
         ...new SectionRender({
           references: this.references,
@@ -31,13 +36,13 @@ class DocumentRender {
           documentName,
           ovc: this.ovc,
           currentSection: parseInt(sectionId, 10),
-          numauto: this.NumAuto
+          numauto: this.NumAuto,
         }).getOutputs()
-      )
-    })
+      );
+    });
 
-    return documentOutputs.join('')
+    return documentOutputs.join("");
   }
 }
 
-export default DocumentRender
+export default DocumentRender;