@legalplace/prerenderx 2.6.1 → 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

@@ -1,4 +1,5 @@
 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 = {
@@ -21,7 +22,6 @@ declare type FDFType = {
     fields: Record<string, string>;
 };
 declare class Prerender {
-    private model;
     private references;
     private ovc;
     private conditions;
@@ -30,7 +30,7 @@ declare class Prerender {
     private NumAuto;
     private documentsIndex;
     private renderedDocuments;
-    constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC);
+    constructor(entry: ModelV3 | Types.ReferencesType, ovc: OVC_TYPE | OldOVC);
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;

package/dist/libs/Prerender.js

@@ -13,15 +13,17 @@ var InputsInitiator_1 = __importDefault(require("./InputsInitiator"));
 var FillPdfForm_1 = __importDefault(require("./FillPdfForm"));
 var OutputParser_1 = require("./OutputParser");
 var Prerender = (function () {
-    function Prerender(model, ovc) {
+    function Prerender(entry, ovc) {
         this.documentsIndex = {};
         this.renderedDocuments = {};
-        this.model = model;
+        if (referencesparser_1.ReferencesParser.isReferences(entry)) {
+            this.references = entry;
+        }
+        else {
+            this.references = new referencesparser_1.ReferencesParser(entry).getReferences();
+        }
         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;
+        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);
@@ -38,10 +40,10 @@ var Prerender = (function () {
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
         var _this = this;
-        Object.keys(this.model.documents).forEach(function (slug) {
+        Object.keys(this.references.documents).forEach(function (slug) {
             var _a, _b;
-            var document = _this.model.documents[slug];
-            var documentParams = _this.model.documents[slug].params;
+            var document = _this.references.documents[slug];
+            var documentParams = _this.references.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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "2.6.1",
+  "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",
+    "@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 ''
     })