@legalplace/prerenderx 2.6.0 → 2.6.2

package/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+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.
+
+### [2.6.2](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.2.0...v2.6.2) (2021-10-01)
+
+
+### Features
+
+* adding french numbers displaying ([ffc1c1e](https://git.legalplace.eu/legalplace/prerenderx/commit/ffc1c1e4279dbd5d6529da0394cf03998fe1d4a3))
+* bump version ([1b94156](https://git.legalplace.eu/legalplace/prerenderx/commit/1b941562c157e4ee368ca6ced106bf5c2d1dddd3))
+* supporting parsed references ([39d5a8d](https://git.legalplace.eu/legalplace/prerenderx/commit/39d5a8d74fc9d9fd91936ab8d2c1edb9780e5afc))
+* supporting parsed references and rendering documents on-demand. ([17ccbeb](https://git.legalplace.eu/legalplace/prerenderx/commit/17ccbeb8fe6ef4529864df955fd83fbe4911e252))
+* Supporting variables in documents names ([da853c0](https://git.legalplace.eu/legalplace/prerenderx/commit/da853c0a1b0325d45570543195ada5f292645bad))
+
+
+### Bug Fixes
+
+* add version logging ([4815571](https://git.legalplace.eu/legalplace/prerenderx/commit/4815571df9dbb1dc2a394683fe0bb16723eae57c))
+* adding cache support for conditions ([34866b8](https://git.legalplace.eu/legalplace/prerenderx/commit/34866b8f7fc5b7e5d2bd1ff08dd50a80010c0262))
+* bimp version ([f3fbd55](https://git.legalplace.eu/legalplace/prerenderx/commit/f3fbd55bba169a449a282c34c85fa48f98b03be5))
+* datapopulator issue ([b8f8532](https://git.legalplace.eu/legalplace/prerenderx/commit/b8f8532fe7b03811e364387d3168c637d7bc6976))
+* fixing cache ([53cf0dd](https://git.legalplace.eu/legalplace/prerenderx/commit/53cf0ddd2e1cd8c6c98c86869081aa949317f0cb))
+* handle static chil in ovc converter ([5eadfab](https://git.legalplace.eu/legalplace/prerenderx/commit/5eadfab0aa8c0885f3e4268eb56c82e56e07d7ba))
+* handle static child in prerender ([f6e6115](https://git.legalplace.eu/legalplace/prerenderx/commit/f6e6115f9d04bd585e0e05e52871217da9e1cf1b))

package/dist/libs/OutputParser.js

@@ -8,6 +8,12 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDocumentNameWithVariables = exports.parseOutputWithVariables = exports.getRelatedVariablesValues = void 0;
+var frenchNumber = function (value) {
+    var result = typeof value === 'number' ? value.toString() : value;
+    if (/^([0-9]+)\.([0-9]+)$/.test(result.trim()))
+        result = result.trim().replace('.', ',');
+    return result;
+};
 exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, references) {
     var variablesValues = {};
     variables.forEach(function (currentVariableId) {
@@ -24,10 +30,8 @@ exports.getRelatedVariablesValues = function (optionId, index, variables, ovc, r
         if (rootVariableParentRelations.children.options.includes(optionId) || rootVariableParentRelations.dependants.includes(optionId) || optionId === rootVariableParentId)
             value = [value[index]];
         var cleanValues = value.map(function (currentValue) {
-            if (typeof currentValue === 'number')
-                return currentValue.toString();
-            if (typeof currentValue === 'string')
-                return currentValue;
+            if (['number', 'string'].includes(typeof currentValue))
+                return frenchNumber(currentValue);
             return '';
         });
         var currentVariableValue = cleanValues.length === 1 ? cleanValues[0] : cleanValues.join(', ');

package/dist/libs/Prerender.d.ts

@@ -32,19 +32,10 @@ declare class Prerender {
     private renderedDocuments;
     constructor(entry: ModelV3 | Types.ReferencesType, 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 };
 };
@@ -34,26 +23,19 @@ var Prerender = (function () {
             this.references = new referencesparser_1.ReferencesParser(entry).getReferences();
         }
         this.NumAuto = new NumAuto_1.default();
-        this.ovc = OvcConverter_1.default.isOvc(ovc)
-            ? OvcConverter_1.default.convertToOptionsVariables(ovc, this.references)
-            : ovc;
+        this.ovc = OvcConverter_1.default.isOvc(ovc) ? OvcConverter_1.default.convertToOptionsVariables(ovc, this.references) : ovc;
         var inputs = new InputsInitiator_1.default(this.references, this.ovc).getInputs();
         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 () {
@@ -91,6 +73,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.2",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -11,13 +11,15 @@
     "lint": "tsc && eslint ./src/ --ext ts,js",
     "lint:fix": "tsc && eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
     "test": "jest",
-    "build": "tsc"
+    "build": "tsc",
+    "release": "standard-version -a --no-verify"
   },
   "dependencies": {
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/models-v3-types": "^3.5.1",
     "@legalplace/referencesparser": "^1.7.0",
     "crypto": "^1.0.1",
+    "standard-version": "^9.3.1",
     "typescript": "3.9.3"
   },
   "devDependencies": {

package/src/libs/OutputParser.ts

@@ -1,6 +1,16 @@
 import { Types } from '@legalplace/referencesparser'
 import OVC_TYPE from './ovc.type'
 
+/**
+ * Parses number to correct french number format ("," instead of ".")
+ */
+const frenchNumber = (value: string | number) => {
+  let result = typeof value === 'number' ? value.toString() : value;
+  if (/^([0-9]+)\.([0-9]+)$/.test(result.trim()))
+    result = result.trim().replace('.', ',');
+  return result;
+};
+
 /**
  * Returns option's related variable values
  * @param optionId Option's id
@@ -31,8 +41,7 @@ export const getRelatedVariablesValues: getRelatedVarsT = (optionId, index, vari
 
     // Making sure all values are strings
     const cleanValues = value.map(currentValue => {
-      if (typeof currentValue === 'number') return currentValue.toString()
-      if (typeof currentValue === 'string') return currentValue
+      if (['number', 'string'].includes(typeof currentValue)) return frenchNumber(currentValue)
       return ''
     })
 

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')
   }