@legalplace/prerenderx 3.1.0 → 3.2.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.2.1](https://git.legalplace.eu/legalplace/prerenderx/compare/v3.2.0...v3.2.1) (2022-12-07)
+
+
+### Bug Fixes
+
+* enabling pdf/docx when model value is null api[#7032](https://git.legalplace.eu/legalplace/prerenderx/issues/7032) ([12c6983](https://git.legalplace.eu/legalplace/prerenderx/commit/12c698324add0c0723aea21a2b8db6b309c59336))
+
+## [3.2.0](https://git.legalplace.eu/legalplace/prerenderx/compare/v3.1.0...v3.2.0) (2022-04-04)
+
+
+### Features
+
+* bump conditions-runner ([7df10d2](https://git.legalplace.eu/legalplace/prerenderx/commit/7df10d2a778ed69f6cb803dc355b983e55492b8d))
+* optimization of documents rendering ([f0afac8](https://git.legalplace.eu/legalplace/prerenderx/commit/f0afac8839ceb75b1415187c7970de9edf0f99ee))
+
+
+### Bug Fixes
+
+* fix review ([ec04225](https://git.legalplace.eu/legalplace/prerenderx/commit/ec04225660d5a412af5ac5e351fc2916d603fb24))
+
 ## [3.1.0](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.5.5-alpha...v3.1.0) (2021-12-16)
 
 

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,7 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var Prerender_1 = __importDefault(require("./libs/Prerender"));
+__exportStar(require("./types/types"), exports);
 exports.default = Prerender_1.default;

package/dist/libs/Prerender.d.ts

@@ -1,25 +1,7 @@
 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 { FDFType, DocumentOutputIndex, DocumentPdfFormIndex } from "../types/types";
 declare class Prerender {
     private model;
     private references;
@@ -31,6 +13,7 @@ declare class Prerender {
     private documentsIndex;
     private renderedDocuments;
     constructor(model: ModelV3, ovc: InputsType | OvcType);
+    getDocumentsIndexWithoutFdf(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;

package/dist/libs/Prerender.js

@@ -19,21 +19,27 @@ var Prerender = (function () {
         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.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);
         this.pdfFiller = new FillPdfForm_1.default(this.references, this.conditions, inputs);
         this.generateDocumentNamesHash();
-        this.generateAllDocuments();
-        this.fillPdfForms();
     }
+    Prerender.prototype.getDocumentsIndexWithoutFdf = function () {
+        return this.documentsIndex;
+    };
     Prerender.prototype.getDocumentsIndex = function () {
+        this.generateAllDocuments();
+        this.fillPdfForms();
         return this.documentsIndex;
     };
     Prerender.prototype.getDocument = function (documentNameHash) {
+        if (this.renderedDocuments[documentNameHash]) {
+            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);
         return this.renderedDocuments[documentNameHash];
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
@@ -64,8 +70,8 @@ var Prerender = (function () {
                     _this.documentsIndex[hash] = {
                         name: 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
                     };
                 }
             }

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.1.0",
+  "version": "3.2.1",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -15,7 +15,7 @@
     "release": "standard-version -a --no-verify"
   },
   "dependencies": {
-    "@legalplace/conditions-runner": "1.1.0",
+    "@legalplace/conditions-runner": "1.1.7",
     "@legalplace/lplogic": "2.1.6",
     "@legalplace/models-v3-types": "3.5.1",
     "@legalplace/ovc-converter": "1.1.0",

package/src/index.ts

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

package/src/libs/Prerender.ts

@@ -10,29 +10,7 @@ import NumAuto from './NumAuto'
 import IntputsInitiator from './InputsInitiator'
 import FillPdfForm from './FillPdfForm'
 import { parseDocumentNameWithVariables } from './OutputParser'
-
-type DocumentOutputIndex = {
-  name: string
-  slug: string
-  pdf: boolean
-  docx: boolean
-}
-type DocumentPdfFormIndex = {
-  name: string
-  slug: string
-  form: boolean
-  fdf: {
-    id: string
-    fields: Record<string, string>
-  }
-}
-
-type DocumentIndex = Record<string, DocumentOutputIndex | DocumentPdfFormIndex>
-
-type FDFType = {
-  id: string
-  fields: Record<string, string>
-}
+import type { FDFType, DocumentIndex, DocumentOutputIndex, DocumentPdfFormIndex } from "../types/types"
 
 class Prerender {
   private model: ModelV3
@@ -63,9 +41,7 @@ class Prerender {
     this.references = new ReferencesParser(model).getReferences()
 
     // 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()
@@ -80,15 +56,27 @@ class Prerender {
     this.pdfFiller = new FillPdfForm(this.references, this.conditions, inputs)
 
     this.generateDocumentNamesHash()
-    this.generateAllDocuments()
-    this.fillPdfForms()
+  }
+
+  public getDocumentsIndexWithoutFdf() {
+    return this.documentsIndex
   }
 
   public getDocumentsIndex() {
+    this.generateAllDocuments()
+    this.fillPdfForms()
     return this.documentsIndex
   }
 
   public getDocument(documentNameHash: string) {
+    if (this.renderedDocuments[documentNameHash]) {
+      return this.renderedDocuments[documentNameHash]
+    }
+
+    const index = this.documentsIndex[documentNameHash]
+
+    this.renderedDocuments[documentNameHash] = Prerender.isPdfForm(index) ? this.pdfFiller.fillDocument(index.slug) : this.documentRender.renderDocument(index.slug)
+
     return this.renderedDocuments[documentNameHash]
   }
 
@@ -121,8 +109,8 @@ class Prerender {
           this.documentsIndex[hash] = {
             name: parseDocumentNameWithVariables(document.name, this.ovc, this.references, document.fallbackName),
             slug,
-            pdf: documentParams?.formats?.pdf === undefined ? true : documentParams.formats.pdf,
-            docx: documentParams?.formats?.docx === undefined ? true : documentParams.formats.docx
+            pdf: documentParams?.formats?.pdf !== false,
+            docx: documentParams?.formats?.docx !== false
           }
         }
       }

package/src/types/types.ts

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