@legalplace/prerenderx 2.6.4 → 3.0.0

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 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.4](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.6.3...v2.6.4) (2021-10-04)
+### [2.5.5](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.6.3...v2.5.5) (2021-10-27)
 
 ### [2.6.3](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.6.2...v2.6.3) (2021-10-04)
 

package/dist/libs/ConditionsRunner.js

@@ -6,10 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var lplogic_1 = __importDefault(require("@legalplace/lplogic"));
 var DataPopulator_1 = __importDefault(require("./DataPopulator"));
 var conditionsCache = {};
-var createConditionCacheKey = function (condition, id, index, conditionType) {
-    var conditionString = JSON.stringify(condition);
-    return id + "-" + index + "-" + conditionType + "-" + conditionString;
-};
 var ConditionsRunner = (function () {
     function ConditionsRunner(references, ovc) {
         this.references = references;
@@ -55,9 +51,6 @@ var ConditionsRunner = (function () {
         var _this = this;
         if (Array.isArray(condition))
             return condition.map(function (_condition) { return _this.executeCondition(_condition, id, index, conditionType); });
-        var cacheKey = createConditionCacheKey(condition, id, index, conditionType);
-        if (Object.prototype.hasOwnProperty.call(conditionsCache, cacheKey))
-            return conditionsCache[cacheKey];
         var currentData;
         if (conditionType === 'options' || conditionType === 'optionValidator') {
             currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
@@ -69,8 +62,7 @@ var ConditionsRunner = (function () {
         else if (conditionType === 'sections' || conditionType === 'documents') {
             currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
         }
-        conditionsCache[cacheKey] = lplogic_1.default(condition.conditions, currentData);
-        return conditionsCache[cacheKey];
+        return lplogic_1.default(condition.conditions, currentData);
     };
     return ConditionsRunner;
 }());

package/dist/libs/Prerender.d.ts

@@ -1,5 +1,4 @@
 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 = {
@@ -22,6 +21,7 @@ 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(entry: ModelV3 | Types.ReferencesType, ovc: OVC_TYPE | OldOVC);
+    constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC);
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;

package/dist/libs/Prerender.js

@@ -13,17 +13,15 @@ var InputsInitiator_1 = __importDefault(require("./InputsInitiator"));
 var FillPdfForm_1 = __importDefault(require("./FillPdfForm"));
 var OutputParser_1 = require("./OutputParser");
 var Prerender = (function () {
-    function Prerender(entry, ovc) {
+    function Prerender(model, ovc) {
         this.documentsIndex = {};
         this.renderedDocuments = {};
-        if (referencesparser_1.ReferencesParser.isReferences(entry)) {
-            this.references = entry;
-        }
-        else {
-            this.references = new referencesparser_1.ReferencesParser(entry).getReferences();
-        }
+        this.model = model;
         this.NumAuto = new NumAuto_1.default();
-        this.ovc = OvcConverter_1.default.isOvc(ovc) ? OvcConverter_1.default.convertToOptionsVariables(ovc, this.references) : ovc;
+        this.references = new referencesparser_1.ReferencesParser(model).getReferences();
+        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);
@@ -40,10 +38,10 @@ var Prerender = (function () {
     };
     Prerender.prototype.generateDocumentNamesHash = function () {
         var _this = this;
-        Object.keys(this.references.documents).forEach(function (slug) {
+        Object.keys(this.model.documents).forEach(function (slug) {
             var _a, _b;
-            var document = _this.references.documents[slug];
-            var documentParams = _this.references.documents[slug].params;
+            var document = _this.model.documents[slug];
+            var documentParams = _this.model.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.4",
+  "version": "3.0.0",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -15,9 +15,9 @@
     "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/lplogic": "2.1.6",
+    "@legalplace/models-v3-types": "3.5.1",
+    "@legalplace/referencesparser": "1.6.3",
     "crypto": "^1.0.1",
     "standard-version": "^9.3.1",
     "typescript": "3.9.3"

package/src/libs/ConditionsRunner.ts

@@ -22,29 +22,6 @@ const conditionsCache: {
   [key: string]: boolean
 } = {}
 
-/**
- * Generates cache key
- * @param condition 
- * @param id 
- * @param index 
- * @param conditionType 
- * @returns string
- */
-const createConditionCacheKey = (
-  condition: {
-    dataMap: ConditionDataMap
-    conditions: ConditionV3
-  },
-  id: number,
-  index: number,
-  conditionType: 'options' | 'optionValidator' | 'variables' | 'prefillers' | 'variableValidator' | 'sections' | 'documents'
-) => {
-  const conditionString = JSON.stringify(condition);
-
-  return `${id}-${index}-${conditionType}-${conditionString}`
-}
-
-
 class ConditionsRunner {
   private references: Types.ReferencesType
 
@@ -122,13 +99,6 @@ class ConditionsRunner {
     // In case we have multiple conditions let's run them here
     if (Array.isArray(condition)) return condition.map(_condition => this.executeCondition(_condition, id, index, conditionType))
 
-    // Generating cache key
-    const cacheKey = createConditionCacheKey(condition, id, index, conditionType)
-
-    // Checking if condition was already calculated
-    if (Object.prototype.hasOwnProperty.call(conditionsCache, cacheKey))
-      return conditionsCache[cacheKey]
-
     // Populating Data
     let currentData
     if (conditionType === 'options' || conditionType === 'optionValidator') {
@@ -140,11 +110,8 @@ class ConditionsRunner {
       currentData = new DataPopulator(this, this.references, this.ovc, condition.dataMap, id, index).getData()
     }
 
-    // Running condition and storing it in cache
-    conditionsCache[cacheKey] = LpLogic(condition.conditions, currentData);
-
     // Returning cache result
-    return conditionsCache[cacheKey];
+    return LpLogic(condition.conditions, currentData)
   }
 }
 

package/src/libs/Prerender.ts

@@ -34,6 +34,8 @@ type FDFType = {
 }
 
 class Prerender {
+  private model: ModelV3
+
   private references: Types.ReferencesType
 
   private ovc: OVC_TYPE
@@ -50,20 +52,19 @@ 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
-    } else {
-      // Parsing references
-      this.references = new ReferencesParser(entry).getReferences()
-    }
+  constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC) {
+    this.model = model
 
     // Initiating num auto
     this.NumAuto = new NumAuto()
 
+    // Parsing references
+    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()
@@ -91,9 +92,9 @@ class Prerender {
   }
 
   private generateDocumentNamesHash() {
-    Object.keys(this.references.documents).forEach(slug => {
-      const document = this.references.documents[slug]
-      const documentParams = this.references.documents[slug].params
+    Object.keys(this.model.documents).forEach(slug => {
+      const document = this.model.documents[slug]
+      const documentParams = this.model.documents[slug].params
       const conditionObject = this.references.conditions.documents[slug]
       const condition = conditionObject === undefined ? true : this.conditions.executeCondition(conditionObject, 0, 0, 'documents')