@legalplace/prerenderx 2.4.3 → 2.5.0

package/dist/libs/FillPdfForm.d.ts

@@ -1,8 +1,7 @@
 import FillPdfFormBase from './misc/FillPdfFormBase';
 declare type FDFType = {
     id: string;
-    inputs: Record<string, string>;
-    boxes: Record<string, string>;
+    fields: Record<string, string>;
 };
 declare class FillPdfForm extends FillPdfFormBase {
     fillDocument(documentName: string): FDFType;

package/dist/libs/FillPdfForm.js

@@ -26,8 +26,7 @@ var FillPdfForm = (function (_super) {
         var _this = this;
         var result = {
             id: '',
-            inputs: {},
-            boxes: {}
+            fields: {}
         };
         var document = this.references.documents[documentName];
         var pdf = document.pdf;
@@ -36,14 +35,14 @@ var FillPdfForm = (function (_super) {
         var form = pdf.form;
         result.id = pdf.id;
         form.inputs.forEach(function (input) {
-            var id = "Page" + input.page + "[0]." + input.name;
-            result.inputs[id] = _this.getInputValue(input);
+            var id = "" + input.name;
+            result.fields[id] = _this.getInputValue(input);
         });
         form.boxes.forEach(function (box) {
-            var id = "Page" + box.page + "[0]." + box.name;
+            var id = "" + box.name;
             var value = _this.getBoxValue(box);
-            if (!(value === '' && Object.prototype.hasOwnProperty.call(result.boxes, id)))
-                result.boxes[id] = value;
+            if (!(value === '' && Object.prototype.hasOwnProperty.call(result.fields, id)))
+                result.fields[id] = value;
         });
         return result;
     };

package/dist/libs/OptionRender.js

@@ -39,7 +39,7 @@ var OptionRender = (function () {
                 }
                 var variables = OutputParser_1.getRelatedVariablesValues(this.id, this.index, outputReference.variables, this.ovc, this.references);
                 var output = OutputParser_1.parseOutputWithVariables(option.meta.output, this.index, variables, autonums);
-                output = output.replace(/>([\n\s]+)</g, '><');
+                output = output.replace(/<\/([a-z]+)>([\n\s]+)</gi, '</$1><');
                 output = output.replace(/\n/g, '<br />');
                 output = output.replace(/\xA0/g, ' ');
                 this.outputs.push(output);

package/dist/libs/Prerender.d.ts

@@ -13,14 +13,12 @@ declare type DocumentPdfFormIndex = {
     form: boolean;
     fdf: {
         id: string;
-        inputs: Record<string, string>;
-        boxes: Record<string, string>;
+        fields: Record<string, string>;
     };
 };
 declare type FDFType = {
     id: string;
-    inputs: Record<string, string>;
-    boxes: Record<string, string>;
+    fields: Record<string, string>;
 };
 declare class Prerender {
     private model;

package/dist/libs/Prerender.js

@@ -55,8 +55,7 @@ var Prerender = (function () {
                         form: true,
                         fdf: {
                             id: '',
-                            inputs: {},
-                            boxes: {}
+                            fields: {}
                         }
                     };
                 }

package/package.json

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

package/src/libs/FillPdfForm.ts

@@ -3,15 +3,13 @@ import FillPdfFormBase from './misc/FillPdfFormBase'
 
 type FDFType = {
   id: string
-  inputs: Record<string, string>
-  boxes: Record<string, string>
+  fields: Record<string, string>
 }
 class FillPdfForm extends FillPdfFormBase {
   public fillDocument(documentName: string) {
     const result: FDFType = {
       id: '',
-      inputs: {},
-      boxes: {}
+      fields: {}
     }
 
     // Getting document
@@ -25,15 +23,15 @@ class FillPdfForm extends FillPdfFormBase {
 
     // Filling inputs
     form.inputs.forEach(input => {
-      const id = `Page${input.page}[0].${input.name}`
-      result.inputs[id] = this.getInputValue(input)
+      const id = `${input.name}`
+      result.fields[id] = this.getInputValue(input)
     })
 
     // Filling boxes
     form.boxes.forEach(box => {
-      const id = `Page${box.page}[0].${box.name}`
+      const id = `${box.name}`
       const value = this.getBoxValue(box)
-      if (!(value === '' && Object.prototype.hasOwnProperty.call(result.boxes, id))) result.boxes[id] = value
+      if (!(value === '' && Object.prototype.hasOwnProperty.call(result.fields, id))) result.fields[id] = value
     })
 
     return result

package/src/libs/OptionRender.ts

@@ -59,7 +59,7 @@ class OptionRender {
         let output = parseOutputWithVariables(option.meta.output, this.index, variables, autonums)
 
         // Removing spaces between tags
-        output = output.replace(/>([\n\s]+)</g, '><');
+        output = output.replace(/<\/([a-z]+)>([\n\s]+)</gi, '</$1><');
 
         // Replacing \n with line-break
         output = output.replace(/\n/g, '<br />')

package/src/libs/Prerender.ts

@@ -21,8 +21,7 @@ type DocumentPdfFormIndex = {
   form: boolean
   fdf: {
     id: string
-    inputs: Record<string, string>
-    boxes: Record<string, string>
+    fields: Record<string, string>
   }
 }
 
@@ -30,8 +29,7 @@ type DocumentIndex = Record<string, DocumentOutputIndex | DocumentPdfFormIndex>
 
 type FDFType = {
   id: string
-  inputs: Record<string, string>
-  boxes: Record<string, string>
+  fields: Record<string, string>
 }
 
 class Prerender {
@@ -114,8 +112,7 @@ class Prerender {
             form: true,
             fdf: {
               id: '',
-              inputs: {},
-              boxes: {}
+              fields: {}
             }
           }
         } else {