@legalplace/prerenderx 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.
 
+## [3.1.0](https://git.legalplace.eu/legalplace/prerenderx/compare/v2.5.5-alpha...v3.1.0) (2021-12-16)
+
+
+### Features
+
+* add .gitlab-automator to .gitignore file ([56c8502](https://git.legalplace.eu/legalplace/prerenderx/commit/56c8502787a6f4b0019c8e3c91f4aec9f4d2e94c))
+* add conditions-runner, types and ovc-converter as packages ([772bfdc](https://git.legalplace.eu/legalplace/prerenderx/commit/772bfdce518ac90306da996c54159fc7919427f4))
+* add InputsType from Types package for OVC_TYPE ([24eb6b0](https://git.legalplace.eu/legalplace/prerenderx/commit/24eb6b01f8c0904d4a2612748b1cfe0175c0e2d8))
+* move package types from dependencies to devDependencies ([8abc056](https://git.legalplace.eu/legalplace/prerenderx/commit/8abc05623d6d69f473139e613bbfe1c438f732f8))
+* remove cache key ([e89e5d5](https://git.legalplace.eu/legalplace/prerenderx/commit/e89e5d5dd0353d44927151cc19c23a6192263c60))
+* use package in FillPdfFormBase ([c96b782](https://git.legalplace.eu/legalplace/prerenderx/commit/c96b7829a378483e9f3f02b50a1ff1da6829bf2d))
+
+
+### Bug Fixes
+
+* use types package instead of ovc.type file ([d0af6ee](https://git.legalplace.eu/legalplace/prerenderx/commit/d0af6ee936a054dd6292e054e035f92e5954caad))
+
 ### [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/DocumentRender.d.ts

@@ -1,13 +1,13 @@
 import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from './ConditionsRunner';
-import OVC_TYPE from './ovc.type';
+import ConditionsRunner from '@legalplace/conditions-runner';
+import InputsType from '@legalplace/types/dist/inputs';
 import NumAuto from './NumAuto';
 declare class DocumentRender {
     references: Types.ReferencesType;
     conditions: ConditionsRunner;
-    ovc: OVC_TYPE;
+    ovc: InputsType;
     private NumAuto;
-    constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: OVC_TYPE, numauto: NumAuto);
+    constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: InputsType, numauto: NumAuto);
     renderDocument(documentName: string): string;
 }
 export default DocumentRender;

package/dist/libs/OptionRender.d.ts

@@ -1,6 +1,6 @@
 import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from './ConditionsRunner';
-import OVC_TYPE from './ovc.type';
+import ConditionsRunner from '@legalplace/conditions-runner';
+import InputsType from '@legalplace/types/dist/inputs';
 import NumAuto from './NumAuto';
 declare class OptionRender {
     outputs: string[];
@@ -8,12 +8,12 @@ declare class OptionRender {
     index: number;
     id: number;
     conditions: ConditionsRunner;
-    ovc: OVC_TYPE;
+    ovc: InputsType;
     private NumAuto;
     constructor(options: {
         references: Types.ReferencesType;
         conditions: ConditionsRunner;
-        ovc: OVC_TYPE;
+        ovc: InputsType;
         index: number;
         id: number;
         numauto: NumAuto;

package/dist/libs/OutputParser.d.ts

@@ -1,11 +1,11 @@
 import { Types } from '@legalplace/referencesparser';
-import OVC_TYPE from './ovc.type';
+import InputsType from '@legalplace/types/dist/inputs';
 declare type relVarsValsT = Record<string, string | number>;
-declare type getRelatedVarsT = (optionId: number, index: number, variables: number[], ovc: OVC_TYPE, references: Types.ReferencesType) => relVarsValsT;
+declare type getRelatedVarsT = (optionId: number, index: number, variables: number[], ovc: InputsType, references: Types.ReferencesType) => relVarsValsT;
 export declare const getRelatedVariablesValues: getRelatedVarsT;
 declare type autonumsType = [string, string, number, string | null][];
 declare type parseOutputT = (output: string, index: number, variables: relVarsValsT, autonums: autonumsType) => string;
 export declare const parseOutputWithVariables: parseOutputT;
-declare type TParseDocumentNameWithVariables = (text: string, ovc: OVC_TYPE, references: Types.ReferencesType, fallback?: string) => string;
+declare type TParseDocumentNameWithVariables = (text: string, ovc: InputsType, references: Types.ReferencesType, fallback?: string) => string;
 export declare const parseDocumentNameWithVariables: TParseDocumentNameWithVariables;
 export {};

package/dist/libs/Prerender.d.ts

@@ -1,6 +1,6 @@
 import { ModelV3 } from '@legalplace/models-v3-types';
-import OVC_TYPE from './ovc.type';
-import { OldOVC } from './OvcConverter';
+import OvcType from '@legalplace/types/dist/ovc';
+import InputsType from '@legalplace/types/dist/inputs';
 declare type DocumentOutputIndex = {
     name: string;
     slug: string;
@@ -30,7 +30,7 @@ declare class Prerender {
     private NumAuto;
     private documentsIndex;
     private renderedDocuments;
-    constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC);
+    constructor(model: ModelV3, ovc: InputsType | OvcType);
     getDocumentsIndex(): Record<string, DocumentOutputIndex | DocumentPdfFormIndex>;
     getDocument(documentNameHash: string): string | FDFType;
     private generateDocumentNamesHash;

package/dist/libs/Prerender.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var referencesparser_1 = require("@legalplace/referencesparser");
+var conditions_runner_1 = __importDefault(require("@legalplace/conditions-runner"));
+var ovc_converter_1 = __importDefault(require("@legalplace/ovc-converter"));
 var crypto_1 = __importDefault(require("crypto"));
 var DocumentRender_1 = __importDefault(require("./DocumentRender"));
-var ConditionsRunner_1 = __importDefault(require("./ConditionsRunner"));
-var OvcConverter_1 = __importDefault(require("./OvcConverter"));
 var NumAuto_1 = __importDefault(require("./NumAuto"));
 var InputsInitiator_1 = __importDefault(require("./InputsInitiator"));
 var FillPdfForm_1 = __importDefault(require("./FillPdfForm"));
@@ -19,11 +19,11 @@ var Prerender = (function () {
         this.model = model;
         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)
+        this.ovc = ovc_converter_1.default.isOvc(ovc)
+            ? ovc_converter_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.conditions = new conditions_runner_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();

package/dist/libs/SectionRender.d.ts

@@ -1,6 +1,6 @@
 import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from './ConditionsRunner';
-import OVC_TYPE from './ovc.type';
+import ConditionsRunner from '@legalplace/conditions-runner';
+import InputsType from '@legalplace/types/dist/inputs';
 import NumAuto from './NumAuto';
 declare class SectionRender {
     outputs: string[];
@@ -8,12 +8,12 @@ declare class SectionRender {
     currentSection: number;
     documentName: string;
     conditions: ConditionsRunner;
-    ovc: OVC_TYPE;
+    ovc: InputsType;
     private NumAuto;
     constructor(options: {
         references: Types.ReferencesType;
         conditions: ConditionsRunner;
-        ovc: OVC_TYPE;
+        ovc: InputsType;
         documentName: string;
         currentSection: number;
         numauto: NumAuto;

package/dist/libs/misc/FillPdfFormBase.d.ts

@@ -1,11 +1,11 @@
 import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from '../ConditionsRunner';
-import OVC_TYPE from '../ovc.type';
+import ConditionsRunner from '@legalplace/conditions-runner';
+import InputsType from '@legalplace/types/dist/inputs';
 declare class FillPdfFormBase {
     references: Types.ReferencesType;
     conditions: ConditionsRunner;
-    ovc: OVC_TYPE;
-    constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: OVC_TYPE);
+    ovc: InputsType;
+    constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: InputsType);
     isVariableDisplayed(id: number, index: number): boolean;
     isOptionDisplayed(id: number, index: number): boolean;
     private getVariableCondition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -15,8 +15,10 @@
     "release": "standard-version -a --no-verify"
   },
   "dependencies": {
+    "@legalplace/conditions-runner": "1.1.0",
     "@legalplace/lplogic": "2.1.6",
     "@legalplace/models-v3-types": "3.5.1",
+    "@legalplace/ovc-converter": "1.1.0",
     "@legalplace/referencesparser": "1.6.3",
     "crypto": "^1.0.1",
     "standard-version": "^9.3.1",
@@ -25,6 +27,7 @@
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@babel/preset-typescript": "^7.7.2",
+    "@legalplace/types": "1.1.0",
     "@types/jest": "^24.0.15",
     "@types/node": "^12.12.6",
     "@typescript-eslint/eslint-plugin": "^2.6.1",

package/src/libs/DocumentRender.ts

@@ -1,7 +1,7 @@
 import { Types } from '@legalplace/referencesparser'
-import ConditionsRunner from './ConditionsRunner'
+import ConditionsRunner from '@legalplace/conditions-runner'
+import InputsType from '@legalplace/types/dist/inputs'
 import SectionRender from './SectionRender'
-import OVC_TYPE from './ovc.type'
 import NumAuto from './NumAuto'
 
 class DocumentRender {
@@ -9,11 +9,11 @@ class DocumentRender {
 
   conditions: ConditionsRunner
 
-  ovc: OVC_TYPE
+  ovc: InputsType
 
   private NumAuto: NumAuto
 
-  constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: OVC_TYPE, numauto: NumAuto) {
+  constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: InputsType, numauto: NumAuto) {
     this.references = references
     this.conditions = conditions
     this.ovc = ovc

package/src/libs/OptionRender.ts

@@ -1,6 +1,6 @@
 import { Types } from '@legalplace/referencesparser'
-import ConditionsRunner from './ConditionsRunner'
-import OVC_TYPE from './ovc.type'
+import ConditionsRunner from '@legalplace/conditions-runner'
+import InputsType from '@legalplace/types/dist/inputs'
 import { parseOutputWithVariables, getRelatedVariablesValues } from './OutputParser'
 import NumAuto from './NumAuto'
 
@@ -15,11 +15,11 @@ class OptionRender {
 
   conditions: ConditionsRunner
 
-  ovc: OVC_TYPE
+  ovc: InputsType
 
   private NumAuto: NumAuto
 
-  constructor(options: { references: Types.ReferencesType; conditions: ConditionsRunner; ovc: OVC_TYPE; index: number; id: number; numauto: NumAuto }) {
+  constructor(options: { references: Types.ReferencesType; conditions: ConditionsRunner; ovc: InputsType; index: number; id: number; numauto: NumAuto }) {
     this.references = options.references
     this.conditions = options.conditions
     this.index = options.index

package/src/libs/OutputParser.ts

@@ -1,5 +1,6 @@
 import { Types } from '@legalplace/referencesparser'
-import OVC_TYPE from './ovc.type'
+import InputsType from '@legalplace/types/dist/inputs'
+
 
 /**
  * Parses number to correct french number format ("," instead of ".")
@@ -18,7 +19,7 @@ const frenchNumber = (value: string | number) => {
  * @param variables Variables ids list
  */
 type relVarsValsT = Record<string, string | number>
-type getRelatedVarsT = (optionId: number, index: number, variables: number[], ovc: OVC_TYPE, references: Types.ReferencesType) => relVarsValsT
+type getRelatedVarsT = (optionId: number, index: number, variables: number[], ovc: InputsType, references: Types.ReferencesType) => relVarsValsT
 export const getRelatedVariablesValues: getRelatedVarsT = (optionId, index, variables, ovc, references) => {
   // Getting variables values
   const variablesValues: Record<string, string> = {}
@@ -105,7 +106,7 @@ export const parseOutputWithVariables: parseOutputT = (output, index, variables,
  */
  type TParseDocumentNameWithVariables = (
    text: string,
-   ovc: OVC_TYPE,
+   ovc: InputsType,
    references: Types.ReferencesType,
    fallback?: string
 ) => string;

package/src/libs/Prerender.ts

@@ -1,10 +1,11 @@
 import { ModelV3 } from '@legalplace/models-v3-types'
 import { Types, ReferencesParser } from '@legalplace/referencesparser'
+import ConditionsRunner from '@legalplace/conditions-runner'
+import OvcConverter from '@legalplace/ovc-converter'
+import OvcType from '@legalplace/types/dist/ovc'
+import InputsType from '@legalplace/types/dist/inputs'
 import crypto from 'crypto'
 import DocumentRender from './DocumentRender'
-import ConditionsRunner from './ConditionsRunner'
-import OVC_TYPE from './ovc.type'
-import OvcConverter, { OldOVC } from './OvcConverter'
 import NumAuto from './NumAuto'
 import IntputsInitiator from './InputsInitiator'
 import FillPdfForm from './FillPdfForm'
@@ -38,7 +39,7 @@ class Prerender {
 
   private references: Types.ReferencesType
 
-  private ovc: OVC_TYPE
+  private ovc: InputsType
 
   private conditions: ConditionsRunner
 
@@ -52,7 +53,7 @@ class Prerender {
 
   private renderedDocuments: Record<string, string | FDFType> = {}
 
-  constructor(model: ModelV3, ovc: OVC_TYPE | OldOVC) {
+  constructor(model: ModelV3, ovc: InputsType | OvcType) {
     this.model = model
 
     // Initiating num auto

package/src/libs/SectionRender.ts

@@ -1,7 +1,7 @@
 import { Types } from '@legalplace/referencesparser'
-import ConditionsRunner from './ConditionsRunner'
+import ConditionsRunner from '@legalplace/conditions-runner'
+import InputsType from '@legalplace/types/dist/inputs'
 import OptionRender from './OptionRender'
-import OVC_TYPE from './ovc.type'
 import NumAuto from './NumAuto'
 
 class SectionRender {
@@ -15,11 +15,11 @@ class SectionRender {
 
   conditions: ConditionsRunner
 
-  ovc: OVC_TYPE
+  ovc: InputsType
 
   private NumAuto: NumAuto
 
-  constructor(options: { references: Types.ReferencesType; conditions: ConditionsRunner; ovc: OVC_TYPE; documentName: string; currentSection: number; numauto: NumAuto }) {
+  constructor(options: { references: Types.ReferencesType; conditions: ConditionsRunner; ovc: InputsType; documentName: string; currentSection: number; numauto: NumAuto }) {
     this.references = options.references
     this.conditions = options.conditions
     this.documentName = options.documentName

package/src/libs/misc/FillPdfFormBase.ts

@@ -1,15 +1,15 @@
 import { Types } from '@legalplace/referencesparser'
-import ConditionsRunner from '../ConditionsRunner'
-import OVC_TYPE from '../ovc.type'
+import ConditionsRunner from '@legalplace/conditions-runner'
+import InputsType from '@legalplace/types/dist/inputs'
 
 class FillPdfFormBase {
   references: Types.ReferencesType
 
   conditions: ConditionsRunner
 
-  ovc: OVC_TYPE
+  ovc: InputsType
 
-  constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: OVC_TYPE) {
+  constructor(references: Types.ReferencesType, conditions: ConditionsRunner, ovc: InputsType) {
     this.references = references
     this.conditions = conditions
     this.ovc = ovc

package/dist/libs/ConditionsRunner.d.ts

@@ -1,24 +0,0 @@
-import { Types } from '@legalplace/referencesparser';
-import { ConditionV3 } from '@legalplace/models-v3-types';
-import { ConditionDataMap } from './DataPopulator';
-declare type OVC_TYPE = {
-    options: {
-        [key: string]: boolean[];
-    };
-    variables: {
-        [key: string]: (number | string)[];
-    };
-};
-declare class ConditionsRunner {
-    private references;
-    private ovc;
-    constructor(references: Types.ReferencesType, ovc: OVC_TYPE);
-    isOptionRelatedToOption(optionA: number, optionB: number): boolean;
-    isVariableRelatedToOption(variableId: number, optionId: number): boolean;
-    isVariableRelatedToVariable(variableA: number, variableB: number): boolean;
-    executeCondition(condition: {
-        dataMap: ConditionDataMap;
-        conditions: ConditionV3;
-    }, id: number, index: number, conditionType: 'options' | 'optionValidator' | 'variables' | 'prefillers' | 'variableValidator' | 'sections' | 'documents'): any;
-}
-export default ConditionsRunner;

package/dist/libs/ConditionsRunner.js

@@ -1,69 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var lplogic_1 = __importDefault(require("@legalplace/lplogic"));
-var DataPopulator_1 = __importDefault(require("./DataPopulator"));
-var conditionsCache = {};
-var ConditionsRunner = (function () {
-    function ConditionsRunner(references, ovc) {
-        this.references = references;
-        this.ovc = ovc;
-    }
-    ConditionsRunner.prototype.isOptionRelatedToOption = function (optionA, optionB) {
-        var OptionBParents = this.references.relations.options[optionB].parents;
-        var OptionBRoot = OptionBParents[OptionBParents.length - 1];
-        var OptionBRootRelations = OptionBRoot ? this.references.relations.options[OptionBRoot] : undefined;
-        if (OptionBRootRelations) {
-            if (optionA === optionB || OptionBRootRelations.children.options.includes(optionA) || OptionBRootRelations.dependants.includes(optionA)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    ConditionsRunner.prototype.isVariableRelatedToOption = function (variableId, optionId) {
-        var variableParentId = this.references.relations.variables[variableId].parents[0];
-        var optionParents = this.references.relations.options[variableParentId].parents;
-        var optionRoot = optionParents[optionParents.length - 1];
-        var optionRootRelations = optionRoot ? this.references.relations.options[optionRoot] : undefined;
-        if (optionRootRelations) {
-            if (optionRootRelations.children.options.includes(optionId) || optionRootRelations.dependants.includes(optionId)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    ConditionsRunner.prototype.isVariableRelatedToVariable = function (variableA, variableB) {
-        var optionA = this.references.relations.variables[variableA].parents[0];
-        var optionB = this.references.relations.variables[variableB].parents[0];
-        var OptionBParents = this.references.relations.options[optionB].parents;
-        var OptionBRoot = OptionBParents[OptionBParents.length - 1];
-        var OptionBRootRelations = OptionBRoot ? this.references.relations.options[OptionBRoot] : undefined;
-        if (OptionBRootRelations) {
-            if (optionA === optionB || OptionBRootRelations.children.options.includes(optionA) || OptionBRootRelations.dependants.includes(optionA)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    ConditionsRunner.prototype.executeCondition = function (condition, id, index, conditionType) {
-        var _this = this;
-        if (Array.isArray(condition))
-            return condition.map(function (_condition) { return _this.executeCondition(_condition, id, index, conditionType); });
-        var currentData;
-        if (conditionType === 'options' || conditionType === 'optionValidator') {
-            currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
-        }
-        else if (conditionType === 'variables' || conditionType === 'prefillers' || conditionType === 'variableValidator') {
-            var dataId = this.references.relations.variables[id].parents[0];
-            currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, dataId, index).getData();
-        }
-        else if (conditionType === 'sections' || conditionType === 'documents') {
-            currentData = new DataPopulator_1.default(this, this.references, this.ovc, condition.dataMap, id, index).getData();
-        }
-        return lplogic_1.default(condition.conditions, currentData);
-    };
-    return ConditionsRunner;
-}());
-exports.default = ConditionsRunner;

package/dist/libs/DataPopulator.d.ts

@@ -1,53 +0,0 @@
-import { Types } from '@legalplace/referencesparser';
-import ConditionsRunner from './ConditionsRunner';
-declare type OVC_TYPE = {
-    options: {
-        [key: string]: boolean[];
-    };
-    variables: {
-        [key: string]: (number | string)[];
-    };
-};
-declare class DataPopulator {
-    private references;
-    private ovc;
-    private conditionsRunner;
-    private id?;
-    private index?;
-    private dataMap;
-    private data;
-    constructor(conditionsRunner: ConditionsRunner, references: Types.ReferencesType, ovc: OVC_TYPE, dataMap: ConditionDataMap, id?: number, index?: number);
-    getData(): Readonly<ConditionData>;
-    private populateConditions;
-    private getOptionConditions;
-    private getVariablesConditions;
-    private populateVariables;
-    private getVariableValues;
-    private getVariableRootParent;
-    private cleanArrayFromNullValues;
-    populateOptions(): void;
-    private getOptionInputs;
-    private getOptionRootParent;
-    private optionConditionValue;
-    private variableConditionValue;
-    private sectionConditionValue;
-}
-export interface ConditionDataMap {
-    o: number[];
-    v: number[];
-    c: {
-        o: number[];
-        s: number[];
-        v: number[];
-    };
-}
-export interface ConditionData {
-    o: Record<string, boolean[]>;
-    v: Record<string, (string | number)[]>;
-    c: {
-        o: Record<string, boolean[]>;
-        s: Record<string, boolean[]>;
-        v: Record<string, boolean[]>;
-    };
-}
-export default DataPopulator;