@legalplace/prerenderx 2.6.3 → 3.0.0

package/dist/libs/ovc.type.d.ts

@@ -0,0 +1,9 @@
+declare type OVC_TYPE = {
+    options: {
+        [key: string]: boolean[];
+    };
+    variables: {
+        [key: string]: (number | string)[];
+    };
+};
+export default OVC_TYPE;

package/dist/libs/ovc.type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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