@legalplace/prerenderx 2.3.0 → 2.3.2

package/README.md

@@ -64,12 +64,3 @@ const pdfFormsDocuments = documentsIndex.filter((documentDescription) => Prerend
 // Extracting outputs documents only
 const outputDocuments = documentsIndex.filter((documentDescription) => Prerender.isOutput(documentDescription))
 ```
-
-Variable `documents` will now contain an object containing all documents and their respective outputs
-```
-{
-  'main': [..., 'some output', ...],
-  'some secondary document': [..., 'some other output', ...]
-  ...
-}
-```

package/dist/libs/FillPdfForm.d.ts

@@ -1,10 +1,11 @@
 import FillPdfFormBase from './misc/FillPdfFormBase';
+declare type FDFType = {
+    id: string;
+    inputs: Record<string, string>;
+    boxes: Record<string, string>;
+};
 declare class FillPdfForm extends FillPdfFormBase {
-    fillDocument(documentName: string): {
-        id: string;
-        inputs: Record<string, string>;
-        boxes: Record<string, string>;
-    };
+    fillDocument(documentName: string): FDFType;
     private getInputValue;
     private getBoxValue;
     private getVariableValue;

package/dist/libs/FillPdfForm.js

@@ -41,7 +41,9 @@ var FillPdfForm = (function (_super) {
         });
         form.boxes.forEach(function (box) {
             var id = "Page" + box.page + "[0]." + box.name;
-            result.boxes[id] = _this.getBoxValue(box);
+            var value = _this.getBoxValue(box);
+            if (!(value === '' && Object.prototype.hasOwnProperty.call(result.boxes, id)))
+                result.boxes[id] = value;
         });
         return result;
     };

package/dist/libs/Prerender.d.ts

@@ -9,8 +9,14 @@ declare type DocumentOutputIndex = {
 declare type DocumentPdfFormIndex = {
     name: string;
     form: boolean;
+    fdf: {
+        id: string;
+        inputs: Record<string, string>;
+        boxes: Record<string, string>;
+    };
 };
 declare type FDFType = {
+    id: string;
     inputs: Record<string, string>;
     boxes: Record<string, string>;
 };
@@ -28,6 +34,7 @@ declare class Prerender {
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     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

@@ -25,6 +25,7 @@ var Prerender = (function () {
         this.pdfFiller = new FillPdfForm_1.default(this.references, this.conditions, inputs);
         this.generateDocumentNamesHash();
         this.generateAllDocuments();
+        this.fillPdfForms();
     }
     Prerender.prototype.getDocumentsIndex = function () {
         return this.documentsIndex;
@@ -48,7 +49,12 @@ var Prerender = (function () {
                 if (typeof document.pdf === 'object' && typeof document.pdf.id === 'string' && typeof document.pdf.form === 'object') {
                     _this.documentsIndex[hash] = {
                         name: documentName,
-                        form: true
+                        form: true,
+                        fdf: {
+                            id: '',
+                            inputs: {},
+                            boxes: {}
+                        }
                     };
                 }
                 else {
@@ -61,6 +67,15 @@ 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) {

package/package.json

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

package/src/libs/FillPdfForm.ts

@@ -1,13 +1,14 @@
 import { FDFBoxesV3, FDFInputsV3 } from '@legalplace/models-v3-types'
 import FillPdfFormBase from './misc/FillPdfFormBase'
 
+type FDFType = {
+  id: string
+  inputs: Record<string, string>
+  boxes: Record<string, string>
+}
 class FillPdfForm extends FillPdfFormBase {
   public fillDocument(documentName: string) {
-    const result: {
-      id: string
-      inputs: Record<string, string>
-      boxes: Record<string, string>
-    } = {
+    const result: FDFType = {
       id: '',
       inputs: {},
       boxes: {}
@@ -31,7 +32,8 @@ class FillPdfForm extends FillPdfFormBase {
     // Filling boxes
     form.boxes.forEach(box => {
       const id = `Page${box.page}[0].${box.name}`
-      result.boxes[id] = this.getBoxValue(box)
+      const value = this.getBoxValue(box)
+      if (!(value === '' && Object.prototype.hasOwnProperty.call(result.boxes, id))) result.boxes[id] = value
     })
 
     return result

package/src/libs/Prerender.ts

@@ -17,11 +17,17 @@ type DocumentOutputIndex = {
 type DocumentPdfFormIndex = {
   name: string
   form: boolean
+  fdf: {
+    id: string
+    inputs: Record<string, string>
+    boxes: Record<string, string>
+  }
 }
 
 type DocumentIndex = Record<string, DocumentOutputIndex | DocumentPdfFormIndex>
 
 type FDFType = {
+  id: string
   inputs: Record<string, string>
   boxes: Record<string, string>
 }
@@ -71,6 +77,7 @@ class Prerender {
 
     this.generateDocumentNamesHash()
     this.generateAllDocuments()
+    this.fillPdfForms()
   }
 
   public getDocumentsIndex() {
@@ -99,7 +106,12 @@ class Prerender {
         if (typeof document.pdf === 'object' && typeof document.pdf.id === 'string' && typeof document.pdf.form === 'object') {
           this.documentsIndex[hash] = {
             name: documentName,
-            form: true
+            form: true,
+            fdf: {
+              id: '',
+              inputs: {},
+              boxes: {}
+            }
           }
         } else {
           this.documentsIndex[hash] = {
@@ -112,6 +124,15 @@ 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]