@legalplace/tagextractor 2.4.15 → 2.4.17

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.17](https://git.legalplace.eu/legalplace/tagextractor/compare/@legalplace/tagextractor@2.4.16...@legalplace/tagextractor@2.4.17) (2022-12-20)
+
+**Note:** Version bump only for package @legalplace/tagextractor
+
+
+
+
+
+## [2.4.16](https://git.legalplace.eu/legalplace/tagextractor/compare/@legalplace/tagextractor@2.4.15...@legalplace/tagextractor@2.4.16) (2022-12-14)
+
+
+### Bug Fixes
+
+* adding InputsInitiator to constructor of tagExtractor ([88b5b59](https://git.legalplace.eu/legalplace/tagextractor/commits/88b5b59b796ab89f9fcd61a114328079786d58fc)), closes [api#6881](https://git.legalplace.eu/api/issues/6881)
+* update tests ([b200c3f](https://git.legalplace.eu/legalplace/tagextractor/commits/b200c3f96d477569ac7ed26b143a739bc96f9fc0)), closes [api#6881](https://git.legalplace.eu/api/issues/6881)
+
+
+
+
+
 ## [2.4.15](https://git.legalplace.eu/legalplace/tagextractor/compare/@legalplace/tagextractor@2.4.14...@legalplace/tagextractor@2.4.15) (2022-12-13)
 
 **Note:** Version bump only for package @legalplace/tagextractor

package/dist/libs/Extractor.js

@@ -16,9 +16,8 @@ class TagExtractor {
         this.references = this.isReferencesType(modelOrReferences)
             ? modelOrReferences
             : new referencesparser_1.ReferencesParser(modelOrReferences).references;
-        this.inputs = ovc_converter_1.default.isOptionsVariables(ovc)
-            ? ovc
-            : ovc_converter_1.default.convertToOptionsVariables(ovc, this.references);
+        const dirtyInputs = ovc_converter_1.default.isOptionsVariables(ovc) ? ovc : ovc_converter_1.default.convertToOptionsVariables(ovc, this.references);
+        this.inputs = new referencesparser_1.InputsInitiator(this.references, dirtyInputs).getInputs();
         this.conditionsRunner = new conditions_runner_1.default(this.references, this.inputs);
         this.extractFromOptions();
         this.extractFromVariables();

package/dist/libs/Extractor.test.js

@@ -67,13 +67,13 @@ describe("TagsExtractor", () => {
             expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
             expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
         });
-        it("should return false when parentsInputs list contains false value", () => {
+        it("should return true when it's a static option", () => {
             const inputsWithParentsInputsFalse = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options, "6": [false] },
+                options: { ...simpleInputs.options, "6": [true] },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithParentsInputsFalse);
-            expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
+            expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
         });
         it("should not return errors when parentsInputs is undefined", () => {
             const inputsWithParentsInputsUndefined = {
@@ -82,7 +82,7 @@ describe("TagsExtractor", () => {
             };
             delete inputsWithParentsInputsUndefined.options["6"];
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithParentsInputsUndefined);
-            expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
+            expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
         });
         it("should return true when all checks are okay", () => {
             expect(tagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
@@ -142,7 +142,7 @@ describe("TagsExtractor", () => {
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithoutOptionTaggedAnswer);
             expect(customTagExtractor.getTags.options).toMatchObject({});
         });
-        it("should return option tag when champ multiples", () => {
+        it("should return option tag when static champ multiples", () => {
             const inputWithChampMultiple = {
                 ...simpleInputs,
                 options: { ...simpleInputs.options, "7": [true, false] },
@@ -164,7 +164,7 @@ describe("TagsExtractor", () => {
                         label: "Connaissiez-vous déjà LegalPlace ?",
                         condition: true,
                         visible: true,
-                        value: false,
+                        value: true,
                     },
                 ],
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "2.4.15",
+  "version": "2.4.17",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",
@@ -17,11 +17,11 @@
     "test:coverage": "jest test --coverage  --watchAll=false "
   },
   "dependencies": {
-    "@legalplace/conditions-runner": "^1.1.22",
+    "@legalplace/conditions-runner": "^1.1.23",
     "@legalplace/lplogic": "2.1.6",
     "@legalplace/models-v3-types": "3.8.0",
-    "@legalplace/ovc-converter": "^1.1.21",
-    "@legalplace/referencesparser": "1.9.0"
+    "@legalplace/ovc-converter": "^1.1.22",
+    "@legalplace/referencesparser": "2.2.0"
   },
   "devDependencies": {
     "@legalplace/eslint-config": "^2.1.3",
@@ -43,5 +43,5 @@
     "typescript": "4.5.2"
   },
   "prettier": "@legalplace/prettier-config",
-  "gitHead": "275a0a057a032b7f72593c4be37aa002d8fa16dd"
+  "gitHead": "bbe0fb6ed57107042f52b4fc68a2a07d65b47227"
 }

package/src/libs/Extractor.test.ts

@@ -101,17 +101,17 @@ describe("TagsExtractor", () => {
       expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
       expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
     });
-    it("should return false when parentsInputs list contains false value", () => {
+    it("should return true when it's a static option", () => {
       const inputsWithParentsInputsFalse = {
         ...simpleInputs,
-        options: { ...simpleInputs.options, "6": [false] },
+        options: { ...simpleInputs.options, "6": [true] },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
         inputsWithParentsInputsFalse
       );
 
-      expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
+      expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
     });
     it("should not return errors when parentsInputs is undefined", () => {
       const inputsWithParentsInputsUndefined = {
@@ -124,7 +124,7 @@ describe("TagsExtractor", () => {
         inputsWithParentsInputsUndefined
       );
 
-      expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
+      expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
     });
     it("should return true when all checks are okay", () => {
       expect(tagExtractor.isOptionDisplayed(24, 0)).toBeTruthy();
@@ -198,7 +198,7 @@ describe("TagsExtractor", () => {
 
       expect(customTagExtractor.getTags.options).toMatchObject({});
     });
-    it("should return option tag when champ multiples", () => {
+    it("should return option tag when static champ multiples", () => {
       const inputWithChampMultiple = {
         ...simpleInputs,
         options: { ...simpleInputs.options, "7": [true, false] },
@@ -223,7 +223,7 @@ describe("TagsExtractor", () => {
             label: "Connaissiez-vous déjà LegalPlace ?",
             condition: true,
             visible: true,
-            value: false,
+            value: true,
           },
         ],
       };

package/src/libs/Extractor.ts

@@ -1,5 +1,10 @@
-import { ModelV3 } from "@legalplace/models-v3-types";
-import { ReferencesParser, Types } from "@legalplace/referencesparser";
+/* eslint-disable */
+import { ModelV3 } from "@legalplace/models-v3-types"
+import {
+  ReferencesParser,
+  Types,
+  InputsInitiator,
+} from "@legalplace/referencesparser";
 import ConditionsRunner from "@legalplace/conditions-runner";
 import OvcConverter from "@legalplace/ovc-converter";
 import type InputsType from "@legalplace/types/dist/inputs";
@@ -33,11 +38,15 @@ class TagExtractor {
       : new ReferencesParser(modelOrReferences).references;
 
     // Converting inputs if needed
-    this.inputs = OvcConverter.isOptionsVariables(ovc)
-      ? ovc
-      : OvcConverter.convertToOptionsVariables(ovc, this.references);
+    // TODO to remove after ts-ignore et update references package on ovc-converter et conditions-runner packages
+    // @ts-ignore
+    const dirtyInputs = OvcConverter.isOptionsVariables(ovc) ? ovc : OvcConverter.convertToOptionsVariables(ovc, this.references);
 
+    // Initiating inputs
+    this.inputs = new InputsInitiator(this.references, dirtyInputs).getInputs();
     // Initiaing Conditions runner
+    // TODO to remove after ts-ignore et update references package on ovc-converter et conditions-runner packages
+    // @ts-ignore
     this.conditionsRunner = new ConditionsRunner(this.references, this.inputs);
 
     // Extracting tags from options