@legalplace/tagextractor 1.1.7 → 1.2.0

package/dist/libs/Extractor.d.ts

@@ -1,4 +1,5 @@
 import { ModelV3 } from '@legalplace/models-v3-types';
+import { ReferencesType } from '@legalplace/referencesparser/dist/libs/References.type';
 import InputsType from '../types/inputs.type';
 import OvcType from '../types/ovc.type';
 import TagsType from '../types/tags.type';
@@ -7,7 +8,8 @@ declare class TagExtractor {
     private inputs;
     private conditionsRunner;
     private tags;
-    constructor(model: ModelV3, ovc: OvcType | InputsType);
+    private isReferencesType;
+    constructor(modelOrReferences: ModelV3 | ReferencesType, ovc: OvcType | InputsType);
     get getTags(): TagsType;
     private extractFromOptions;
     private extractFromVariables;

package/dist/libs/Extractor.js

@@ -14,12 +14,15 @@ var referencesparser_1 = require("@legalplace/referencesparser");
 var ConditionsRunner_1 = __importDefault(require("./ConditionsRunner"));
 var OvcConverter_1 = __importDefault(require("./OvcConverter"));
 var TagExtractor = (function () {
-    function TagExtractor(model, ovc) {
+    function TagExtractor(modelOrReferences, ovc) {
         this.tags = {
             options: {},
             variables: {}
         };
-        this.references = new referencesparser_1.ReferencesParser(model).references;
+        this.isReferencesType = function (_obj) {
+            return Object.keys(_obj).some(function (key) { return key === 'boxes'; });
+        };
+        this.references = this.isReferencesType(modelOrReferences) ? modelOrReferences : new referencesparser_1.ReferencesParser(modelOrReferences).references;
         this.inputs = OvcConverter_1.default.isOptionsVariables(ovc) ? ovc : OvcConverter_1.default.convertToOptionsVariables(ovc, this.references);
         this.conditionsRunner = new ConditionsRunner_1.default(this.references, this.inputs);
         this.extractFromOptions();
@@ -36,7 +39,7 @@ var TagExtractor = (function () {
         var _this = this;
         Object.keys(this.references.options).forEach(function (id) {
             var _a = _this.references.options[id].meta, tags = _a.tags, label = _a.label;
-            if (Array.isArray(tags) && tags.length > 0) {
+            if (Array.isArray(tags) && tags.length > 0 && _this.inputs.options[id]) {
                 _this.inputs.options[id].forEach(function (v, index) {
                     tags.forEach(function (tag) {
                         if (_this.tags.options[tag] === undefined)
@@ -58,7 +61,7 @@ var TagExtractor = (function () {
         var _this = this;
         Object.keys(this.references.variables).forEach(function (id) {
             var _a = _this.references.variables[id], tags = _a.tags, label = _a.label;
-            if (Array.isArray(tags) && tags.length > 0) {
+            if (Array.isArray(tags) && tags.length > 0 && _this.inputs.variables[id]) {
                 _this.inputs.variables[id].forEach(function (v, index) {
                     tags.forEach(function (tag) {
                         if (_this.tags.variables[tag] === undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/tagextractor",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "description": "TagExtractor",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/tagextractor",
@@ -38,4 +38,4 @@
     "redux-mock-store": "^1.5.3",
     "ts-jest": "^24.0.2"
   }
-}
+}

package/src/libs/Extractor.ts

@@ -1,5 +1,6 @@
 import { ModelV3 } from '@legalplace/models-v3-types'
 import { ReferencesParser, Types } from '@legalplace/referencesparser'
+import { ReferencesType } from '@legalplace/referencesparser/dist/libs/References.type'
 import InputsType from '../types/inputs.type'
 import OvcType from '../types/ovc.type'
 import TagsType from '../types/tags.type'
@@ -18,9 +19,13 @@ class TagExtractor {
     variables: {}
   }
 
-  constructor(model: ModelV3, ovc: OvcType | InputsType) {
-    // Parsing references
-    this.references = new ReferencesParser(model).references
+  private isReferencesType = (_obj: ModelV3 | 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')
+  }
+
+  constructor(modelOrReferences: ModelV3 | ReferencesType, ovc: OvcType | InputsType) {
+    this.references = this.isReferencesType(modelOrReferences) ? modelOrReferences : new ReferencesParser(modelOrReferences).references
 
     // Converting inputs if needed
     this.inputs = OvcConverter.isOptionsVariables(ovc) ? ovc : OvcConverter.convertToOptionsVariables(ovc, this.references)
@@ -46,7 +51,7 @@ class TagExtractor {
     Object.keys(this.references.options).forEach(id => {
       const { tags, label } = this.references.options[id].meta
 
-      if (Array.isArray(tags) && tags.length > 0) {
+      if (Array.isArray(tags) && tags.length > 0 && this.inputs.options[id]) {
         this.inputs.options[id].forEach((v, index) => {
           tags.forEach(tag => {
             if (this.tags.options[tag] === undefined) this.tags.options[tag] = []
@@ -71,7 +76,7 @@ class TagExtractor {
     Object.keys(this.references.variables).forEach(id => {
       const { tags, label } = this.references.variables[id]
 
-      if (Array.isArray(tags) && tags.length > 0) {
+      if (Array.isArray(tags) && tags.length > 0 && this.inputs.variables[id]) {
         this.inputs.variables[id].forEach((v, index) => {
           tags.forEach(tag => {
             if (this.tags.variables[tag] === undefined) this.tags.variables[tag] = []