@legalplace/prerenderx 2.6.0 → 2.6.1

package/dist/libs/Prerender.d.ts

@@ -1,5 +1,4 @@
 import { ModelV3 } from '@legalplace/models-v3-types';
-import { Types } from '@legalplace/referencesparser';
 import OVC_TYPE from './ovc.type';
 import { OldOVC } from './OvcConverter';
 declare type DocumentOutputIndex = {
@@ -22,6 +21,7 @@ declare type FDFType = {
     fields: Record<string, string>;
 };
 declare class Prerender {
+    private model;
     private references;
     private ovc;
     private conditions;
@@ -30,21 +30,12 @@ declare class Prerender {
     private NumAuto;
     private documentsIndex;
     private renderedDocuments;
-    constructor(entry: ModelV3 | Types.ReferencesType, ovc: OVC_TYPE | OldOVC);
+    constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC);
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
-    getDocument(documentNameHash: string): string | FDFType | {
-        fdf: string | FDFType;
-        name: string;
-        slug: string;
-        pdf: boolean;
-        docx: boolean;
-    } | {
-        fdf: string | FDFType;
-        name: string;
-        slug: string;
-        form: boolean;
-    };
+    getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;
+    private fillPdfForms;
+    private generateAllDocuments;
     static isPdfForm(index: DocumentOutputIndex | DocumentPdfFormIndex): index is DocumentPdfFormIndex;
     static isOutput(index: DocumentOutputIndex | DocumentPdfFormIndex): index is DocumentOutputIndex;
 }

package/dist/libs/Prerender.js

@@ -1,15 +1,4 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,16 +13,12 @@ var InputsInitiator_1 = __importDefault(require("./InputsInitiator"));
 var FillPdfForm_1 = __importDefault(require("./FillPdfForm"));
 var OutputParser_1 = require("./OutputParser");
 var Prerender = (function () {
-    function Prerender(entry, ovc) {
+    function Prerender(model, ovc) {
         this.documentsIndex = {};
         this.renderedDocuments = {};
-        if (referencesparser_1.ReferencesParser.isReferences(entry)) {
-            this.references = entry;
-        }
-        else {
-            this.references = new referencesparser_1.ReferencesParser(entry).getReferences();
-        }
+        this.model = model;
         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;
@@ -41,27 +26,22 @@ var Prerender = (function () {
         this.conditions = new ConditionsRunner_1.default(this.references, inputs);
         this.documentRender = new DocumentRender_1.default(this.references, this.conditions, inputs, this.NumAuto);
         this.pdfFiller = new FillPdfForm_1.default(this.references, this.conditions, inputs);
+        this.generateDocumentNamesHash();
+        this.generateAllDocuments();
+        this.fillPdfForms();
     }
     Prerender.prototype.getDocumentsIndex = function () {
-        this.generateDocumentNamesHash();
         return this.documentsIndex;
     };
     Prerender.prototype.getDocument = function (documentNameHash) {
-        if (Prerender.isPdfForm(this.documentsIndex[documentNameHash])) {
-            if (!Object.prototype.hasOwnProperty.call(this.renderedDocuments, documentNameHash))
-                this.renderedDocuments[documentNameHash] = this.pdfFiller.fillDocument(this.documentsIndex[documentNameHash].slug);
-            return __assign(__assign({}, this.documentsIndex[documentNameHash]), { fdf: this.renderedDocuments[documentNameHash] });
-        }
-        if (!Object.prototype.hasOwnProperty.call(this.renderedDocuments, documentNameHash))
-            this.renderedDocuments[documentNameHash] = this.documentRender.renderDocument(this.documentsIndex[documentNameHash].slug);
         return this.renderedDocuments[documentNameHash];
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
         var _this = this;
-        Object.keys(this.references.documents).forEach(function (slug) {
+        Object.keys(this.model.documents).forEach(function (slug) {
             var _a, _b;
-            var document = _this.references.documents[slug];
-            var documentParams = _this.references.documents[slug].params;
+            var document = _this.model.documents[slug];
+            var documentParams = _this.model.documents[slug].params;
             var conditionObject = _this.references.conditions.documents[slug];
             var condition = conditionObject === undefined ? true : _this.conditions.executeCondition(conditionObject, 0, 0, 'documents');
             if (condition === true) {
@@ -91,6 +71,27 @@ var Prerender = (function () {
             }
         });
     };
+    Prerender.prototype.fillPdfForms = function () {
+        var _this = this;
+        Object.keys(this.documentsIndex).forEach(function (documentNameHash) {
+            var index = _this.documentsIndex[documentNameHash];
+            if (Prerender.isPdfForm(index)) {
+                index.fdf = _this.getDocument(documentNameHash);
+            }
+        });
+    };
+    Prerender.prototype.generateAllDocuments = function () {
+        var _this = this;
+        Object.keys(this.documentsIndex).forEach(function (documentNameHash) {
+            var index = _this.documentsIndex[documentNameHash];
+            if (Prerender.isPdfForm(index)) {
+                _this.renderedDocuments[documentNameHash] = _this.pdfFiller.fillDocument(_this.documentsIndex[documentNameHash].slug);
+            }
+            else {
+                _this.renderedDocuments[documentNameHash] = _this.documentRender.renderDocument(_this.documentsIndex[documentNameHash].slug);
+            }
+        });
+    };
     Prerender.isPdfForm = function (index) {
         return Object.prototype.hasOwnProperty.call(index, 'form');
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/models-v3-types": "^3.5.1",
-    "@legalplace/referencesparser": "^1.7.0",
+    "@legalplace/referencesparser": "1.7.0",
     "crypto": "^1.0.1",
     "typescript": "3.9.3"
   },

package/src/libs/Prerender.ts

@@ -51,10 +51,9 @@ class Prerender {
   private renderedDocuments: Record<string, string | FDFType> = {}
 
   constructor(entry: ModelV3 | Types.ReferencesType, ovc: OVC_TYPE | OldOVC) {
-    
     // Initiating references
     if (ReferencesParser.isReferences(entry)) {
-      this.references = entry;
+      this.references = entry
     } else {
       // Parsing references
       this.references = new ReferencesParser(entry).getReferences()
@@ -62,11 +61,9 @@ class Prerender {
 
     // Initiating num auto
     this.NumAuto = new NumAuto()
-    
+
     // Converting OVC if needed
-    this.ovc = OvcConverter.isOvc(ovc)
-      ? OvcConverter.convertToOptionsVariables(ovc, this.references)
-      : ovc
+    this.ovc = OvcConverter.isOvc(ovc) ? OvcConverter.convertToOptionsVariables(ovc, this.references) : ovc
 
     // Initiating inputs
     const inputs = new IntputsInitiator(this.references, this.ovc).getInputs()
@@ -79,32 +76,17 @@ class Prerender {
 
     // Filling pdf documents
     this.pdfFiller = new FillPdfForm(this.references, this.conditions, inputs)
+
+    this.generateDocumentNamesHash()
+    this.generateAllDocuments()
+    this.fillPdfForms()
   }
 
   public getDocumentsIndex() {
-    // Generating documents names
-    this.generateDocumentNamesHash();
-
     return this.documentsIndex
   }
 
   public getDocument(documentNameHash: string) {
-    // Handling Pdf form
-    if (Prerender.isPdfForm(this.documentsIndex[documentNameHash])) {
-      if (!Object.prototype.hasOwnProperty.call(this.renderedDocuments, documentNameHash))
-        this.renderedDocuments[documentNameHash] = this.pdfFiller.fillDocument(this.documentsIndex[documentNameHash].slug);
-      
-      return {
-        ...this.documentsIndex[documentNameHash],
-        fdf: this.renderedDocuments[documentNameHash]
-      }
-    }
-    
-    // Avoiding regeneration if document exists before rendering it
-    if (!Object.prototype.hasOwnProperty.call(this.renderedDocuments, documentNameHash))
-      this.renderedDocuments[documentNameHash] = this.documentRender.renderDocument(this.documentsIndex[documentNameHash].slug)
-
-    // Returning rendered document
     return this.renderedDocuments[documentNameHash]
   }
 
@@ -145,6 +127,26 @@ class Prerender {
     })
   }
 
+  private fillPdfForms() {
+    Object.keys(this.documentsIndex).forEach(documentNameHash => {
+      const index = this.documentsIndex[documentNameHash]
+      if (Prerender.isPdfForm(index)) {
+        index.fdf = this.getDocument(documentNameHash) as FDFType
+      }
+    })
+  }
+
+  private generateAllDocuments() {
+    Object.keys(this.documentsIndex).forEach(documentNameHash => {
+      const index = this.documentsIndex[documentNameHash]
+      if (Prerender.isPdfForm(index)) {
+        this.renderedDocuments[documentNameHash] = this.pdfFiller.fillDocument(this.documentsIndex[documentNameHash].slug)
+      } else {
+        this.renderedDocuments[documentNameHash] = this.documentRender.renderDocument(this.documentsIndex[documentNameHash].slug)
+      }
+    })
+  }
+
   static isPdfForm(index: DocumentOutputIndex | DocumentPdfFormIndex): index is DocumentPdfFormIndex {
     return Object.prototype.hasOwnProperty.call(index, 'form')
   }