npm - @legalplace/tagextractor - Versions diffs - 2.2.0 → 2.3.0 - Mend

@legalplace/tagextractor 2.2.0 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/CHANGELOG.md +17 -0
package/dist/index.d.ts +2 -2
package/dist/libs/Extractor.d.ts +2 -2
package/dist/libs/Extractor.js +16 -22
package/dist/libs/Extractor.test.js +36 -40
package/jest.config.ts +4 -4
package/package.json +6 -5
package/setupJest.ts +2 -1
package/src/index.ts +4 -4
package/src/libs/Extractor.test.ts +44 -44
package/src/libs/Extractor.ts +22 -23
package/src/types/tags.type.ts +15 -15
package/tsconfig.json +2 -1
package/.gitlab-ci.yml +0 -44
package/.vscode/settings.json +0 -25

package/CHANGELOG.md ADDED Viewed

@@ -0,0 +1,17 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# 2.3.0 (2022-01-10)
+### Bug Fixes
+* fix test version api[#4631](https://git.legalplace.eu/legalplace/tagextractor/issues/4631) ([f5f15c2](https://git.legalplace.eu/legalplace/tagextractor/commits/f5f15c2e5fdd9b0d98edb822f1aeb02d3823a6ca))
+* remove unneeded gitlab-ci file api[#4631](https://git.legalplace.eu/legalplace/tagextractor/issues/4631) ([97b8424](https://git.legalplace.eu/legalplace/tagextractor/commits/97b8424281d804720438061bec2a7c0171f79b3b))
+### Features
+* add the tagExtractor package api[#4631](https://git.legalplace.eu/legalplace/tagextractor/issues/4631) ([70c502a](https://git.legalplace.eu/legalplace/tagextractor/commits/70c502a734ea8bf1df842d4d44c89f360d96d7db))

package/dist/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import TagExtractor from './libs/Extractor';
-import TagsType, { OptionTagType, VariableTagType } from './types/tags.type';
+import TagExtractor from "./libs/Extractor";
+import TagsType, { OptionTagType, VariableTagType } from "./types/tags.type";
 export type { TagsType, OptionTagType, VariableTagType };
 export default TagExtractor;

package/dist/libs/Extractor.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { ModelV3 } from "@legalplace/models-v3-types";
 import { ReferencesType } from "@legalplace/referencesparser/dist/libs/References.type";
-import InputsType from "@legalplace/types/dist/inputs";
-import OvcType from "@legalplace/types/dist/ovc";
+import type InputsType from "@legalplace/types/dist/inputs";
+import type OvcType from "@legalplace/types/dist/ovc";
 import TagsType from "../types/tags.type";
 declare class TagExtractor {
     private references;

package/dist/libs/Extractor.js CHANGED Viewed

@@ -10,11 +10,9 @@ class TagExtractor {
     constructor(modelOrReferences, ovc) {
         this.tags = {
             options: {},
-            variables: {}
-        };
-        this.isReferencesType = (_obj) => {
-            return Object.keys(_obj).some(key => key === "boxes");
+            variables: {},
         };
+        this.isReferencesType = (_obj) => Object.keys(_obj).some((key) => key === "boxes");
         this.references = this.isReferencesType(modelOrReferences)
             ? modelOrReferences
             : new referencesparser_1.ReferencesParser(modelOrReferences).references;
@@ -29,11 +27,11 @@ class TagExtractor {
         return this.tags;
     }
     extractFromOptions() {
-        Object.keys(this.references.options).forEach(id => {
+        Object.keys(this.references.options).forEach((id) => {
             const { tags, label } = this.references.options[id].meta;
             if (Array.isArray(tags) && tags.length > 0 && this.inputs.options[id]) {
                 this.inputs.options[id].forEach((v, index) => {
-                    tags.forEach(tag => {
+                    tags.forEach((tag) => {
                         if (this.tags.options[tag] === undefined)
                             this.tags.options[tag] = [];
                         this.tags.options[tag].push({
@@ -42,7 +40,7 @@ class TagExtractor {
                             label,
                             condition: this.getOptionCondition(parseInt(id, 10), index),
                             visible: this.isOptionDisplayed(parseInt(id, 10), index),
-                            value: this.inputs.options[id][index]
+                            value: this.inputs.options[id][index],
                         });
                     });
                 });
@@ -50,11 +48,11 @@ class TagExtractor {
         });
     }
     extractFromVariables() {
-        Object.keys(this.references.variables).forEach(id => {
+        Object.keys(this.references.variables).forEach((id) => {
             const { tags, label } = this.references.variables[id];
             if (Array.isArray(tags) && tags.length > 0 && this.inputs.variables[id]) {
                 this.inputs.variables[id].forEach((v, index) => {
-                    tags.forEach(tag => {
+                    tags.forEach((tag) => {
                         if (this.tags.variables[tag] === undefined)
                             this.tags.variables[tag] = [];
                         this.tags.variables[tag].push({
@@ -63,7 +61,7 @@ class TagExtractor {
                             label,
                             condition: this.getVariableCondition(parseInt(id, 10), index) !== false,
                             visible: this.isVariableDisplayed(parseInt(id, 10), index),
-                            value: this.inputs.variables[id][index]
+                            value: this.inputs.variables[id][index],
                         });
                     });
                 });
@@ -79,29 +77,25 @@ class TagExtractor {
         return ([
             variableCondition,
             parentOptionIsDisplayed,
-            parentOptionIsTruethful
-        ].filter(c => c !== true).length === 0);
+            parentOptionIsTruethful,
+        ].filter((c) => c !== true).length === 0);
     }
     isOptionDisplayed(id, index) {
         var _a;
         const optionCondition = this.getOptionCondition(id, index);
         const optionParents = ((_a = this.references.relations.options[id]) === null || _a === void 0 ? void 0 : _a.parents) || [];
-        const parentsConditions = optionParents.map(optionId => {
-            return this.getOptionCondition(optionId, index) !== false;
-        });
-        const parentsInputs = optionParents.map(optionId => {
-            return this.inputs.options[optionId]
-                ? this.inputs.options[optionId][index]
-                : false;
-        });
+        const parentsConditions = optionParents.map((optionId) => this.getOptionCondition(optionId, index) !== false);
+        const parentsInputs = optionParents.map((optionId) => this.inputs.options[optionId]
+            ? this.inputs.options[optionId][index]
+            : false);
         const parentSectionId = this.getOptionParentSection(id);
         const parentSectionCondition = this.getSectionCondition(parentSectionId) !== false;
         return ([
             optionCondition,
             parentSectionCondition,
             ...parentsConditions,
-            ...parentsInputs
-        ].filter(c => c !== true).length === 0);
+            ...parentsInputs,
+        ].filter((c) => c !== true).length === 0);
     }
     getVariableCondition(id, index) {
         const conditionObject = this.references.conditions.variables[id];

package/dist/libs/Extractor.test.js CHANGED Viewed

@@ -34,7 +34,7 @@ describe("TagsExtractor", () => {
         it("should return false when parent Option is not truthful", () => {
             const inputsWithParentsFalse = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options, "6": [false] }
+                options: { ...simpleInputs.options, "6": [false] },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithParentsFalse);
             expect(customTagExtractor.isVariableDisplayed(1, 0)).toBeFalsy();
@@ -42,7 +42,7 @@ describe("TagsExtractor", () => {
         it("should return true when all checks are okay", () => {
             const inputsWithAllChecks = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options, "8": [true] }
+                options: { ...simpleInputs.options, "8": [true] },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithAllChecks);
             expect(customTagExtractor.isVariableDisplayed(1, 0)).toBeTruthy();
@@ -51,9 +51,7 @@ describe("TagsExtractor", () => {
     describe("IsOptionDisplayed", () => {
         it("should return false when option condition is false", () => {
             const getOptionCondition = jest.spyOn(Extractor_1.default.prototype, "getOptionCondition");
-            getOptionCondition.mockImplementation((id, index) => {
-                return !(id === 24 && index === 0);
-            });
+            getOptionCondition.mockImplementation((id, index) => !(id === 24 && index === 0));
             expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
             expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
         });
@@ -65,16 +63,14 @@ describe("TagsExtractor", () => {
         });
         it("should return false when parentCondition contains false value", () => {
             const getOptionCondition = jest.spyOn(Extractor_1.default.prototype, "getOptionCondition");
-            getOptionCondition.mockImplementation((id, index) => {
-                return !(id === 6 && index === 0);
-            });
+            getOptionCondition.mockImplementation((id, index) => !(id === 6 && index === 0));
             expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
             expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
         });
         it("should return false when parentsInputs list contains false value", () => {
             const inputsWithParentsInputsFalse = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options, "6": [false] }
+                options: { ...simpleInputs.options, "6": [false] },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithParentsInputsFalse);
             expect(customTagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
@@ -82,7 +78,7 @@ describe("TagsExtractor", () => {
         it("should not return errors when parentsInputs is undefined", () => {
             const inputsWithParentsInputsUndefined = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options }
+                options: { ...simpleInputs.options },
             };
             delete inputsWithParentsInputsUndefined.options["6"];
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithParentsInputsUndefined);
@@ -116,9 +112,9 @@ describe("TagsExtractor", () => {
                     ...simpleReferences.options,
                     "7": {
                         ...simpleReferences.options["7"],
-                        meta: { ...simpleReferences.options["7"].meta, tags: undefined }
-                    }
-                }
+                        meta: { ...simpleReferences.options["7"].meta, tags: undefined },
+                    },
+                },
             };
             const customTagExtractor = new Extractor_1.default(referencesWithoutOptionTagArray, simpleInputs);
             expect(customTagExtractor.getTags.options).toMatchObject({});
@@ -130,9 +126,9 @@ describe("TagsExtractor", () => {
                     ...simpleReferences.options,
                     "7": {
                         ...simpleReferences.options["7"],
-                        meta: { ...simpleReferences.options["7"].meta, tags: [] }
-                    }
-                }
+                        meta: { ...simpleReferences.options["7"].meta, tags: [] },
+                    },
+                },
             };
             const customTagExtractor = new Extractor_1.default(referencesWithoutOptionTags, simpleInputs);
             expect(customTagExtractor.getTags.options).toMatchObject({});
@@ -140,7 +136,7 @@ describe("TagsExtractor", () => {
         it("should return empty tags when input's option is undefined", () => {
             const inputsWithoutOptionTaggedAnswer = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options }
+                options: { ...simpleInputs.options },
             };
             delete inputsWithoutOptionTaggedAnswer.options["7"];
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithoutOptionTaggedAnswer);
@@ -149,7 +145,7 @@ describe("TagsExtractor", () => {
         it("should return option tag when champ multiples", () => {
             const inputWithChampMultiple = {
                 ...simpleInputs,
-                options: { ...simpleInputs.options, "7": [true, false] }
+                options: { ...simpleInputs.options, "7": [true, false] },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputWithChampMultiple);
             const expectedOptionTags = {
@@ -160,7 +156,7 @@ describe("TagsExtractor", () => {
                         label: "Connaissiez-vous déjà LegalPlace ?",
                         condition: true,
                         visible: true,
-                        value: true
+                        value: true,
                     },
                     {
                         id: 7,
@@ -168,9 +164,9 @@ describe("TagsExtractor", () => {
                         label: "Connaissiez-vous déjà LegalPlace ?",
                         condition: true,
                         visible: true,
-                        value: false
-                    }
-                ]
+                        value: false,
+                    },
+                ],
             };
             expect(customTagExtractor.getTags.options).toMatchObject(expectedOptionTags);
         });
@@ -183,9 +179,9 @@ describe("TagsExtractor", () => {
                         label: "Connaissiez-vous déjà LegalPlace ?",
                         condition: true,
                         visible: true,
-                        value: true
-                    }
-                ]
+                        value: true,
+                    },
+                ],
             };
             expect(tagExtractor.getTags.options).toMatchObject(expectedOptionTags);
         });
@@ -196,8 +192,8 @@ describe("TagsExtractor", () => {
                 ...simpleReferences,
                 variables: {
                     ...simpleReferences.variables,
-                    "1": { ...simpleReferences.variables["1"], tags: undefined }
-                }
+                    "1": { ...simpleReferences.variables["1"], tags: undefined },
+                },
             };
             const customTagExtractor = new Extractor_1.default(referenceWithoutVariableTagArray, simpleInputs);
             expect(customTagExtractor.getTags.variables).toMatchObject({});
@@ -207,8 +203,8 @@ describe("TagsExtractor", () => {
                 ...simpleReferences,
                 variables: {
                     ...simpleReferences.variables,
-                    "1": { ...simpleReferences.variables["1"], tags: [] }
-                }
+                    "1": { ...simpleReferences.variables["1"], tags: [] },
+                },
             };
             const customTagExtractor = new Extractor_1.default(referenceWithoutTags, simpleInputs);
             expect(customTagExtractor.getTags.variables).toMatchObject({});
@@ -216,7 +212,7 @@ describe("TagsExtractor", () => {
         it("should return empty tags when input's variable is undefined", () => {
             const inputsWithoutVariableTaggedAnswer = {
                 ...simpleInputs,
-                variables: { ...simpleInputs.variables }
+                variables: { ...simpleInputs.variables },
             };
             delete inputsWithoutVariableTaggedAnswer.variables[1];
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputsWithoutVariableTaggedAnswer);
@@ -225,7 +221,7 @@ describe("TagsExtractor", () => {
         it("should not throw error when input's variable does not match any references variable", () => {
             const referenceWithoutMatchingVariable = {
                 ...simpleReferences,
-                variables: { ...simpleReferences.variables }
+                variables: { ...simpleReferences.variables },
             };
             delete referenceWithoutMatchingVariable.variables["2"];
             const customTagExtractor = new Extractor_1.default(referenceWithoutMatchingVariable, simpleInputs);
@@ -237,9 +233,9 @@ describe("TagsExtractor", () => {
                         label: "Nom de l'entreprise",
                         condition: false,
                         visible: false,
-                        value: "Company"
-                    }
-                ]
+                        value: "Company",
+                    },
+                ],
             };
             expect(customTagExtractor.getTags.variables).toMatchObject(expectedVariableTags);
         });
@@ -248,8 +244,8 @@ describe("TagsExtractor", () => {
                 ...simpleInputs,
                 variables: {
                     ...simpleInputs.variables,
-                    "1": ["Nom de la companie", "Testing Company"]
-                }
+                    "1": ["Nom de la companie", "Testing Company"],
+                },
             };
             const customTagExtractor = new Extractor_1.default(simpleReferences, inputVariableWithChampMultiple);
             const expectedVariableTags = {
@@ -260,7 +256,7 @@ describe("TagsExtractor", () => {
                         label: "Nom de l'entreprise",
                         condition: false,
                         visible: false,
-                        value: "Nom de la companie"
+                        value: "Nom de la companie",
                     },
                     {
                         id: 1,
@@ -268,9 +264,9 @@ describe("TagsExtractor", () => {
                         label: "Nom de l'entreprise",
                         condition: false,
                         visible: false,
-                        value: "Testing Company"
-                    }
-                ]
+                        value: "Testing Company",
+                    },
+                ],
             };
             expect(customTagExtractor.getTags.variables).toMatchObject(expectedVariableTags);
         });

package/jest.config.ts CHANGED Viewed

@@ -24,7 +24,7 @@ const jestConfig = {
     "src/**/*.ts",
     "src/**/*.tsx",
     "!**/node_modules/**",
-    "!src/**/*.d.ts"
+    "!src/**/*.d.ts",
   ],
   // The directory where Jest should output its coverage files
@@ -89,7 +89,7 @@ const jestConfig = {
   moduleNameMapper: {
     "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
       "<rootDir>__mocks__/fileMock.js",
-    "\\.(css|less|sass|scss)$": "identity-obj-proxy"
+    "\\.(css|less|sass|scss)$": "identity-obj-proxy",
   },
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -180,8 +180,8 @@ const jestConfig = {
   // A map from regular expressions to paths to transformers
   transform: {
-    "^.+\\.tsx?$": "@swc-node/jest"
-  }
+    "^.+\\.tsx?$": "@swc-node/jest",
+  },
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",
@@ -27,19 +27,20 @@
     "@legalplace/prettier-config": "^2.1.3",
     "@legalplace/types": "1.1.0",
     "@swc-node/jest": "^1.4.3",
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.0",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "eslint": "^8.5.0",
     "eslint-config-airbnb": "^19.0.2",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-react-app": "^7.0.0",
-    "jest": "27.2.4",
+    "jest": "27.4.7",
     "jest-fetch-mock": "^3.0.3",
     "jest-junit": "^13.0.0",
     "prettier": "^2.5.1",
-    "ts-jest": "27.0.5",
+    "ts-jest": "27.1.2",
     "ts-node": "^10.4.0",
     "typescript": "4.5.2"
   },
-  "prettier": "@legalplace/prettier-config"
+  "prettier": "@legalplace/prettier-config",
+  "gitHead": "b78de6625e6f2651aeb2bdb470ae4dfc6e4a8487"
 }

package/setupJest.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { GlobalWithFetchMock } from "jest-fetch-mock";
-const customGlobal: GlobalWithFetchMock = (global as unknown) as GlobalWithFetchMock;
+const customGlobal: GlobalWithFetchMock =
+  global as unknown as GlobalWithFetchMock;
 customGlobal.fetch = require("jest-fetch-mock");
 customGlobal.fetchMock = customGlobal.fetch;

package/src/index.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import TagExtractor from './libs/Extractor'
+import TagExtractor from "./libs/Extractor";
-import TagsType, { OptionTagType, VariableTagType } from './types/tags.type'
+import TagsType, { OptionTagType, VariableTagType } from "./types/tags.type";
-export type { TagsType, OptionTagType, VariableTagType }
-export default TagExtractor
+export type { TagsType, OptionTagType, VariableTagType };
+export default TagExtractor;

package/src/libs/Extractor.test.ts CHANGED Viewed

@@ -8,10 +8,10 @@ import inputsJson from "./fixtures/inputs.json";
 import referencesJson from "./fixtures/references.json";
 import modelJson from "./fixtures/model.json";
-const simpleReferences = (referencesJson as unknown) as ReferencesType;
-const simpleModel = (modelJson as unknown) as ModelV3;
-const simpleOvc = (ovcJson as unknown) as OvcType;
-const simpleInputs = (inputsJson as unknown) as InputsType;
+const simpleReferences = referencesJson as unknown as ReferencesType;
+const simpleModel = modelJson as unknown as ModelV3;
+const simpleOvc = ovcJson as unknown as OvcType;
+const simpleInputs = inputsJson as unknown as InputsType;
 describe("TagsExtractor", () => {
   const tagExtractor = new TagExtractor(simpleReferences, simpleInputs);
@@ -45,7 +45,7 @@ describe("TagsExtractor", () => {
     it("should return false when parent Option is not truthful", () => {
       const inputsWithParentsFalse = {
         ...simpleInputs,
-        options: { ...simpleInputs.options, "6": [false] }
+        options: { ...simpleInputs.options, "6": [false] },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
@@ -56,7 +56,7 @@ describe("TagsExtractor", () => {
     it("should return true when all checks are okay", () => {
       const inputsWithAllChecks = {
         ...simpleInputs,
-        options: { ...simpleInputs.options, "8": [true] }
+        options: { ...simpleInputs.options, "8": [true] },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
@@ -72,9 +72,9 @@ describe("TagsExtractor", () => {
         TagExtractor.prototype as any,
         "getOptionCondition"
       );
-      getOptionCondition.mockImplementation((id, index) => {
-        return !(id === 24 && index === 0);
-      });
+      getOptionCondition.mockImplementation(
+        (id, index) => !(id === 24 && index === 0)
+      );
       expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
       expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
@@ -94,9 +94,9 @@ describe("TagsExtractor", () => {
         TagExtractor.prototype as any,
         "getOptionCondition"
       );
-      getOptionCondition.mockImplementation((id, index) => {
-        return !(id === 6 && index === 0);
-      });
+      getOptionCondition.mockImplementation(
+        (id, index) => !(id === 6 && index === 0)
+      );
       expect(tagExtractor.isOptionDisplayed(24, 0)).toBeFalsy();
       expect(getOptionCondition).toHaveBeenCalledWith(24, 0);
@@ -104,7 +104,7 @@ describe("TagsExtractor", () => {
     it("should return false when parentsInputs list contains false value", () => {
       const inputsWithParentsInputsFalse = {
         ...simpleInputs,
-        options: { ...simpleInputs.options, "6": [false] }
+        options: { ...simpleInputs.options, "6": [false] },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
@@ -116,7 +116,7 @@ describe("TagsExtractor", () => {
     it("should not return errors when parentsInputs is undefined", () => {
       const inputsWithParentsInputsUndefined = {
         ...simpleInputs,
-        options: { ...simpleInputs.options }
+        options: { ...simpleInputs.options },
       };
       delete inputsWithParentsInputsUndefined.options["6"];
       const customTagExtractor = new TagExtractor(
@@ -156,9 +156,9 @@ describe("TagsExtractor", () => {
           ...simpleReferences.options,
           "7": {
             ...simpleReferences.options["7"],
-            meta: { ...simpleReferences.options["7"].meta, tags: undefined }
-          }
-        }
+            meta: { ...simpleReferences.options["7"].meta, tags: undefined },
+          },
+        },
       };
       const customTagExtractor = new TagExtractor(
         referencesWithoutOptionTagArray,
@@ -174,9 +174,9 @@ describe("TagsExtractor", () => {
           ...simpleReferences.options,
           "7": {
             ...simpleReferences.options["7"],
-            meta: { ...simpleReferences.options["7"].meta, tags: [] }
-          }
-        }
+            meta: { ...simpleReferences.options["7"].meta, tags: [] },
+          },
+        },
       };
       const customTagExtractor = new TagExtractor(
         referencesWithoutOptionTags,
@@ -188,7 +188,7 @@ describe("TagsExtractor", () => {
     it("should return empty tags when input's option is undefined", () => {
       const inputsWithoutOptionTaggedAnswer = {
         ...simpleInputs,
-        options: { ...simpleInputs.options }
+        options: { ...simpleInputs.options },
       };
       delete inputsWithoutOptionTaggedAnswer.options["7"];
       const customTagExtractor = new TagExtractor(
@@ -201,7 +201,7 @@ describe("TagsExtractor", () => {
     it("should return option tag when champ multiples", () => {
       const inputWithChampMultiple = {
         ...simpleInputs,
-        options: { ...simpleInputs.options, "7": [true, false] }
+        options: { ...simpleInputs.options, "7": [true, false] },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
@@ -215,7 +215,7 @@ describe("TagsExtractor", () => {
             label: "Connaissiez-vous déjà LegalPlace ?",
             condition: true,
             visible: true,
-            value: true
+            value: true,
           },
           {
             id: 7,
@@ -223,9 +223,9 @@ describe("TagsExtractor", () => {
             label: "Connaissiez-vous déjà LegalPlace ?",
             condition: true,
             visible: true,
-            value: false
-          }
-        ]
+            value: false,
+          },
+        ],
       };
       expect(customTagExtractor.getTags.options).toMatchObject(
         expectedOptionTags
@@ -240,9 +240,9 @@ describe("TagsExtractor", () => {
             label: "Connaissiez-vous déjà LegalPlace ?",
             condition: true,
             visible: true,
-            value: true
-          }
-        ]
+            value: true,
+          },
+        ],
       };
       expect(tagExtractor.getTags.options).toMatchObject(expectedOptionTags);
     });
@@ -253,8 +253,8 @@ describe("TagsExtractor", () => {
         ...simpleReferences,
         variables: {
           ...simpleReferences.variables,
-          "1": { ...simpleReferences.variables["1"], tags: undefined }
-        }
+          "1": { ...simpleReferences.variables["1"], tags: undefined },
+        },
       };
       const customTagExtractor = new TagExtractor(
         referenceWithoutVariableTagArray,
@@ -268,8 +268,8 @@ describe("TagsExtractor", () => {
         ...simpleReferences,
         variables: {
           ...simpleReferences.variables,
-          "1": { ...simpleReferences.variables["1"], tags: [] }
-        }
+          "1": { ...simpleReferences.variables["1"], tags: [] },
+        },
       };
       const customTagExtractor = new TagExtractor(
         referenceWithoutTags,
@@ -281,7 +281,7 @@ describe("TagsExtractor", () => {
     it("should return empty tags when input's variable is undefined", () => {
       const inputsWithoutVariableTaggedAnswer = {
         ...simpleInputs,
-        variables: { ...simpleInputs.variables }
+        variables: { ...simpleInputs.variables },
       };
       delete inputsWithoutVariableTaggedAnswer.variables[1];
       const customTagExtractor = new TagExtractor(
@@ -294,7 +294,7 @@ describe("TagsExtractor", () => {
     it("should not throw error when input's variable does not match any references variable", () => {
       const referenceWithoutMatchingVariable = {
         ...simpleReferences,
-        variables: { ...simpleReferences.variables }
+        variables: { ...simpleReferences.variables },
       };
       delete referenceWithoutMatchingVariable.variables["2"];
@@ -310,9 +310,9 @@ describe("TagsExtractor", () => {
             label: "Nom de l'entreprise",
             condition: false,
             visible: false,
-            value: "Company"
-          }
-        ]
+            value: "Company",
+          },
+        ],
       };
       expect(customTagExtractor.getTags.variables).toMatchObject(
@@ -324,8 +324,8 @@ describe("TagsExtractor", () => {
         ...simpleInputs,
         variables: {
           ...simpleInputs.variables,
-          "1": ["Nom de la companie", "Testing Company"]
-        }
+          "1": ["Nom de la companie", "Testing Company"],
+        },
       };
       const customTagExtractor = new TagExtractor(
         simpleReferences,
@@ -339,7 +339,7 @@ describe("TagsExtractor", () => {
             label: "Nom de l'entreprise",
             condition: false,
             visible: false,
-            value: "Nom de la companie"
+            value: "Nom de la companie",
           },
           {
             id: 1,
@@ -347,9 +347,9 @@ describe("TagsExtractor", () => {
             label: "Nom de l'entreprise",
             condition: false,
             visible: false,
-            value: "Testing Company"
-          }
-        ]
+            value: "Testing Company",
+          },
+        ],
       };
       expect(customTagExtractor.getTags.variables).toMatchObject(

package/src/libs/Extractor.ts CHANGED Viewed

@@ -3,8 +3,8 @@ import { ReferencesParser, Types } from "@legalplace/referencesparser";
 import { ReferencesType } from "@legalplace/referencesparser/dist/libs/References.type";
 import ConditionsRunner from "@legalplace/conditions-runner";
 import OvcConverter from "@legalplace/ovc-converter";
-import InputsType from "@legalplace/types/dist/inputs";
-import OvcType from "@legalplace/types/dist/ovc";
+import type InputsType from "@legalplace/types/dist/inputs";
+import type OvcType from "@legalplace/types/dist/ovc";
 import TagsType from "../types/tags.type";
 class TagExtractor {
@@ -16,15 +16,14 @@ class TagExtractor {
   private tags: TagsType = {
     options: {},
-    variables: {}
+    variables: {},
   };
   private isReferencesType = (
     _obj: ModelV3 | ReferencesType
-  ): _obj is ReferencesType => {
+  ): _obj is ReferencesType =>
     // We check if the object contains one of the fields only contained in ReferencesType
-    return Object.keys(_obj).some(key => key === "boxes");
-  };
+    Object.keys(_obj).some((key) => key === "boxes");
   constructor(
     modelOrReferences: ModelV3 | ReferencesType,
@@ -57,12 +56,12 @@ class TagExtractor {
    * Reads Options
    */
   private extractFromOptions() {
-    Object.keys(this.references.options).forEach(id => {
+    Object.keys(this.references.options).forEach((id) => {
       const { tags, label } = this.references.options[id].meta;
       if (Array.isArray(tags) && tags.length > 0 && this.inputs.options[id]) {
         this.inputs.options[id].forEach((v, index) => {
-          tags.forEach(tag => {
+          tags.forEach((tag) => {
             if (this.tags.options[tag] === undefined)
               this.tags.options[tag] = [];
             this.tags.options[tag].push({
@@ -71,7 +70,7 @@ class TagExtractor {
               label,
               condition: this.getOptionCondition(parseInt(id, 10), index),
               visible: this.isOptionDisplayed(parseInt(id, 10), index),
-              value: this.inputs.options[id][index]
+              value: this.inputs.options[id][index],
             });
           });
         });
@@ -83,12 +82,12 @@ class TagExtractor {
    * Reads Variables
    */
   private extractFromVariables() {
-    Object.keys(this.references.variables).forEach(id => {
+    Object.keys(this.references.variables).forEach((id) => {
       const { tags, label } = this.references.variables[id];
       if (Array.isArray(tags) && tags.length > 0 && this.inputs.variables[id]) {
         this.inputs.variables[id].forEach((v, index) => {
-          tags.forEach(tag => {
+          tags.forEach((tag) => {
             if (this.tags.variables[tag] === undefined)
               this.tags.variables[tag] = [];
             this.tags.variables[tag].push({
@@ -98,7 +97,7 @@ class TagExtractor {
               condition:
                 this.getVariableCondition(parseInt(id, 10), index) !== false,
               visible: this.isVariableDisplayed(parseInt(id, 10), index),
-              value: this.inputs.variables[id][index]
+              value: this.inputs.variables[id][index],
             });
           });
         });
@@ -127,8 +126,8 @@ class TagExtractor {
       [
         variableCondition,
         parentOptionIsDisplayed,
-        parentOptionIsTruethful
-      ].filter(c => c !== true).length === 0
+        parentOptionIsTruethful,
+      ].filter((c) => c !== true).length === 0
     );
   }
@@ -141,15 +140,15 @@ class TagExtractor {
     // Getting variable's conditions & executing it if any
     const optionCondition = this.getOptionCondition(id, index);
     const optionParents = this.references.relations.options[id]?.parents || [];
-    const parentsConditions = optionParents.map(optionId => {
-      return this.getOptionCondition(optionId, index) !== false;
-    });
-    const parentsInputs = optionParents.map(optionId => {
+    const parentsConditions = optionParents.map(
+      (optionId) => this.getOptionCondition(optionId, index) !== false
+    );
+    const parentsInputs = optionParents.map((optionId) =>
       // If the parent option is not already defined we set the displayed parameter to false
-      return this.inputs.options[optionId]
+      this.inputs.options[optionId]
         ? this.inputs.options[optionId][index]
-        : false;
-    });
+        : false
+    );
     const parentSectionId = this.getOptionParentSection(id);
     const parentSectionCondition =
       this.getSectionCondition(parentSectionId) !== false;
@@ -159,8 +158,8 @@ class TagExtractor {
         optionCondition,
         parentSectionCondition,
         ...parentsConditions,
-        ...parentsInputs
-      ].filter(c => c !== true).length === 0
+        ...parentsInputs,
+      ].filter((c) => c !== true).length === 0
     );
   }

package/src/types/tags.type.ts CHANGED Viewed

@@ -1,24 +1,24 @@
 interface TagsType {
-  options: Record<string, OptionTagType[]>
-  variables: Record<string, VariableTagType[]>
+  options: Record<string, OptionTagType[]>;
+  variables: Record<string, VariableTagType[]>;
 }
 export interface OptionTagType {
-  id: number
-  index: number
-  label: string
-  condition: boolean
-  visible: boolean
-  value: boolean
+  id: number;
+  index: number;
+  label: string;
+  condition: boolean;
+  visible: boolean;
+  value: boolean;
 }
 export interface VariableTagType {
-  id: number
-  index: number
-  label: string
-  condition: boolean
-  visible: boolean
-  value: string | number
+  id: number;
+  index: number;
+  label: string;
+  condition: boolean;
+  visible: boolean;
+  value: string | number;
 }
-export default TagsType
+export default TagsType;

package/tsconfig.json CHANGED Viewed

@@ -1,11 +1,12 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "es2019",
     "module": "commonjs",
     "outDir": "dist",
     "lib": ["dom", "dom.iterable", "esnext"],
     "strict": true,
-    "typeRoots": ["node_modules/@types"],
+    "typeRoots": ["node_modules/@types", "../../node_modules/@types"],
     "useUnknownInCatchVariables": false,
     "esModuleInterop": true,
     "removeComments": true,

package/.gitlab-ci.yml DELETED Viewed

@@ -1,44 +0,0 @@
-image: 148253454541.dkr.ecr.eu-west-1.amazonaws.com/deploydock:node14
-stages:
-  - setup
-  - publish
-before_script:
-  - export PATH=$PATH:./node_modules/.bin/
-variables:
-  DOCKER_DRIVER: overlay2
-setup:
-  stage: setup
-  artifacts:
-    paths:
-      - dist/
-  only:
-    changes:
-      - yarn.lock
-      - package.json
-      - .gitlab-ci.yml
-  script:
-    - echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc
-    - yarn -v
-    - node -v
-    - yarn install --frozen-lockfile  --check-files --silent
-    - yarn build
-publish:
-  stage: publish
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /skip-publish/
-  script:
-    - echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc
-    - npm publish
-  environment:
-    name: development
-  only:
-    refs:
-      - master
-    changes:
-      - package.json

package/.vscode/settings.json DELETED Viewed

@@ -1,25 +0,0 @@
-{
-  "eslint.enable": true,
-  "editor.tabSize": 2,
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
-  "eslint.options": {
-    "extensions": [".ts", ".tsx", ".js", ".jsx"]
-  },
-  "files.autoSave": "onFocusChange",
-  "editor.formatOnSave": true,
-  "editor.formatOnType": true,
-  "prettier.singleQuote": true,
-  "eslint.packageManager": "yarn",
-  "eslint.quiet": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnPaste": true,
-  "files.insertFinalNewline": true
-}