@vizabi/reader-ddfcsv 4.1.1 → 4.2.0

package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InClauseUnderConjunction = void 0;
 var tslib_1 = require("tslib");
 var path = require("path");
 var head = require("lodash.head");
@@ -19,6 +20,7 @@ var JOIN_KEYWORD = 'join';
 var KEY_IN = '$in';
 var KEY_NIN = '$nin';
 var KEY_AND = '$and';
+var KEY_OR = '$or';
 var getFirstConditionClause = function (clause) { return head(values(clause)); };
 var getFirstKey = function (obj) { return head(keys(obj)); };
 var isOneKeyBased = function (obj) { return keys(obj).length === 1; };
@@ -36,8 +38,7 @@ var InClauseUnderConjunction = (function () {
         var _this = this;
         this.flow.joinObject = get(this.query, JOIN_KEYWORD);
         var relatedFeatures = compact(ddf_query_validator_1.featureDetectors.map(function (detector) { return detector(_this.query, _this.conceptsLookup); }));
-        return includes(relatedFeatures, ddf_query_validator_1.QueryFeature.WhereClauseBasedOnConjunction) &&
-            includes(relatedFeatures, ddf_query_validator_1.QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
+        return this.query.from === "datapoints";
     };
     InClauseUnderConjunction.prototype.getRecommendedFilesSet = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -79,25 +80,38 @@ var InClauseUnderConjunction = (function () {
     };
     InClauseUnderConjunction.prototype.fillResourceToFileHash = function () {
         this.flow.resourceToFile = get(this.datapackage, 'resources', []).reduce(function (hash, resource) {
-            hash.set(resource.name, resource.path);
+            var constraints = resource.schema.fields.reduce(function (result, field) {
+                var _a;
+                if ((_a = field.constraints) === null || _a === void 0 ? void 0 : _a.enum) {
+                    result.set(field.name, field.constraints.enum);
+                }
+                return result;
+            }, new Map());
+            hash.set(resource.name, {
+                path: resource.path,
+                constraints: constraints
+            });
             return hash;
         }, new Map());
         return this;
     };
     InClauseUnderConjunction.prototype.collectProcessableClauses = function () {
+        var e_1, _a, _b, _c, _d;
         var _this = this;
-        var e_1, _a, _b, _c;
         var joinKeys = keys(this.flow.joinObject);
         this.flow.processableClauses = [];
         try {
             for (var joinKeys_1 = tslib_1.__values(joinKeys), joinKeys_1_1 = joinKeys_1.next(); !joinKeys_1_1.done; joinKeys_1_1 = joinKeys_1.next()) {
                 var joinKey = joinKeys_1_1.value;
-                var where = get(this.flow.joinObject, joinKey + "." + WHERE_KEYWORD, {});
+                var where = get(this.flow.joinObject, "".concat(joinKey, ".").concat(WHERE_KEYWORD), {});
                 if (this.singleAndField(where)) {
-                    (_b = this.flow.processableClauses).push.apply(_b, tslib_1.__spread(flattenDeep(where[KEY_AND].map(function (el) { return _this.getProcessableClauses(el); }))));
+                    (_b = this.flow.processableClauses).push.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(flattenDeep(where[KEY_AND].map(function (el) { return _this.getProcessableClauses(el); }))), false));
+                }
+                else if (this.singleOrField(where)) {
+                    (_c = this.flow.processableClauses).push.apply(_c, tslib_1.__spreadArray([], tslib_1.__read(flattenDeep(where[KEY_OR].map(function (el) { return _this.getProcessableClauses(el); }))), false));
                 }
                 else {
-                    (_c = this.flow.processableClauses).push.apply(_c, tslib_1.__spread(this.getProcessableClauses(where)));
+                    (_d = this.flow.processableClauses).push.apply(_d, tslib_1.__spreadArray([], tslib_1.__read(this.getProcessableClauses(where)), false));
                 }
             }
         }
@@ -112,21 +126,21 @@ var InClauseUnderConjunction = (function () {
     };
     InClauseUnderConjunction.prototype.collectEntityFilesNames = function () {
         var e_2, _a, e_3, _b, e_4, _c;
-        this.flow.entityFilesNames = [];
+        this.flow.entityFilesNames = new Set();
         this.flow.fileNameToPrimaryKeyHash = new Map();
         try {
             for (var _d = tslib_1.__values(this.datapackage.ddfSchema.entities), _e = _d.next(); !_e.done; _e = _d.next()) {
                 var schemaResourceRecord = _e.value;
                 try {
-                    for (var _f = tslib_1.__values(this.flow.processableClauses), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    for (var _f = (e_3 = void 0, tslib_1.__values(this.flow.processableClauses)), _g = _f.next(); !_g.done; _g = _f.next()) {
                         var clause = _g.value;
                         var primaryKey = getFirstKey(clause);
                         if (head(schemaResourceRecord.primaryKey) === primaryKey) {
                             try {
-                                for (var _h = tslib_1.__values(schemaResourceRecord.resources), _j = _h.next(); !_j.done; _j = _h.next()) {
+                                for (var _h = (e_4 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _j = _h.next(); !_j.done; _j = _h.next()) {
                                     var resourceName = _j.value;
-                                    var file = this.flow.resourceToFile.get(resourceName);
-                                    this.flow.entityFilesNames.push(file);
+                                    var file = this.flow.resourceToFile.get(resourceName).path;
+                                    this.flow.entityFilesNames.add(file);
                                     this.flow.fileNameToPrimaryKeyHash.set(file, primaryKey);
                                 }
                             }
@@ -160,7 +174,7 @@ var InClauseUnderConjunction = (function () {
     };
     InClauseUnderConjunction.prototype.collectEntities = function () {
         var self = this;
-        var actions = self.flow.entityFilesNames.map(function (file) { return new Promise(function (actResolve, actReject) {
+        var actions = tslib_1.__spreadArray([], tslib_1.__read(self.flow.entityFilesNames), false).map(function (file) { return new Promise(function (actResolve, actReject) {
             self.fileReader.readText(path.join(self.datasetPath, file), function (err, text) {
                 if (err) {
                     return actReject(err);
@@ -186,14 +200,14 @@ var InClauseUnderConjunction = (function () {
             for (var entitiesData_1 = tslib_1.__values(entitiesData), entitiesData_1_1 = entitiesData_1.next(); !entitiesData_1_1.done; entitiesData_1_1 = entitiesData_1.next()) {
                 var entityFileDescriptor = entitiesData_1_1.value;
                 try {
-                    for (var _c = tslib_1.__values(entityFileDescriptor.result.data), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    for (var _c = (e_6 = void 0, tslib_1.__values(entityFileDescriptor.result.data)), _d = _c.next(); !_d.done; _d = _c.next()) {
                         var entityRecord = _d.value;
                         var primaryKeyForThisFile = this.flow.fileNameToPrimaryKeyHash.get(entityFileDescriptor.file);
-                        var primaryKeyCellValue = entityRecord[primaryKeyForThisFile];
-                        var domainsForCurrentRecord = tslib_1.__spread(getSubdomainsFromRecord(entityRecord));
+                        var domainsForCurrentRecord = tslib_1.__spreadArray([], tslib_1.__read(getSubdomainsFromRecord(entityRecord)), false);
                         if (isEmpty(domainsForCurrentRecord)) {
                             domainsForCurrentRecord.push(primaryKeyForThisFile);
                         }
+                        var primaryKeyCellValue = entityRecord[primaryKeyForThisFile] || entityRecord[domainsForCurrentRecord[0]];
                         this.flow.entityValueToDomainHash.set(primaryKeyCellValue, domainsForCurrentRecord);
                         this.flow.entityValueToFileHash.set(primaryKeyCellValue, entityFileDescriptor.file);
                     }
@@ -217,8 +231,8 @@ var InClauseUnderConjunction = (function () {
         return this;
     };
     InClauseUnderConjunction.prototype.getFilesGroupsQueryClause = function () {
-        var _this = this;
         var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e, e_12, _f, e_13, _g;
+        var _this = this;
         var getEntitiesExcept = function (entityValuesToExclude) {
             var e_14, _a;
             var result = [];
@@ -244,28 +258,36 @@ var InClauseUnderConjunction = (function () {
             for (var _h = tslib_1.__values(this.flow.processableClauses), _j = _h.next(); !_j.done; _j = _h.next()) {
                 var clause = _j.value;
                 var filesGroupByClause = {
-                    entities: new Set(),
+                    entities: this.flow.entityFilesNames,
                     datapoints: new Set(),
                     concepts: new Set()
                 };
                 var firstConditionClause = getFirstConditionClause(clause);
                 var entityValuesFromClause = firstConditionClause[KEY_IN] || getEntitiesExcept(firstConditionClause[KEY_NIN]);
                 try {
-                    for (var entityValuesFromClause_1 = tslib_1.__values(entityValuesFromClause), entityValuesFromClause_1_1 = entityValuesFromClause_1.next(); !entityValuesFromClause_1_1.done; entityValuesFromClause_1_1 = entityValuesFromClause_1.next()) {
+                    for (var entityValuesFromClause_1 = (e_8 = void 0, tslib_1.__values(entityValuesFromClause)), entityValuesFromClause_1_1 = entityValuesFromClause_1.next(); !entityValuesFromClause_1_1.done; entityValuesFromClause_1_1 = entityValuesFromClause_1.next()) {
                         var entityValueFromClause = entityValuesFromClause_1_1.value;
-                        filesGroupByClause.entities.add(this.flow.entityValueToFileHash.get(entityValueFromClause));
                         var entitiesByQuery = this.flow.entityValueToDomainHash.get(entityValueFromClause);
                         try {
-                            for (var entitiesByQuery_1 = tslib_1.__values(entitiesByQuery), entitiesByQuery_1_1 = entitiesByQuery_1.next(); !entitiesByQuery_1_1.done; entitiesByQuery_1_1 = entitiesByQuery_1.next()) {
+                            for (var entitiesByQuery_1 = (e_9 = void 0, tslib_1.__values(entitiesByQuery)), entitiesByQuery_1_1 = entitiesByQuery_1.next(); !entitiesByQuery_1_1.done; entitiesByQuery_1_1 = entitiesByQuery_1.next()) {
                                 var entityByQuery = entitiesByQuery_1_1.value;
                                 try {
-                                    for (var _k = tslib_1.__values(this.datapackage.ddfSchema.datapoints), _l = _k.next(); !_l.done; _l = _k.next()) {
+                                    for (var _k = (e_10 = void 0, tslib_1.__values(this.datapackage.ddfSchema.datapoints)), _l = _k.next(); !_l.done; _l = _k.next()) {
                                         var schemaResourceRecord = _l.value;
                                         try {
-                                            for (var _m = tslib_1.__values(schemaResourceRecord.resources), _o = _m.next(); !_o.done; _o = _m.next()) {
+                                            for (var _m = (e_11 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _o = _m.next(); !_o.done; _o = _m.next()) {
                                                 var resourceName = _o.value;
+                                                var file = this.flow.resourceToFile.get(resourceName);
                                                 if (includes(schemaResourceRecord.primaryKey, entityByQuery)) {
-                                                    filesGroupByClause.datapoints.add(this.flow.resourceToFile.get(resourceName));
+                                                    var constraint = file.constraints.get(entityByQuery);
+                                                    if (constraint) {
+                                                        if (constraint.includes(entityValueFromClause)) {
+                                                            filesGroupByClause.datapoints.add(file.path);
+                                                        }
+                                                    }
+                                                    else {
+                                                        filesGroupByClause.datapoints.add(file.path);
+                                                    }
                                                 }
                                             }
                                         }
@@ -304,12 +326,12 @@ var InClauseUnderConjunction = (function () {
                     finally { if (e_8) throw e_8.error; }
                 }
                 try {
-                    for (var _p = tslib_1.__values(this.datapackage.ddfSchema.concepts), _q = _p.next(); !_q.done; _q = _p.next()) {
+                    for (var _p = (e_12 = void 0, tslib_1.__values(this.datapackage.ddfSchema.concepts)), _q = _p.next(); !_q.done; _q = _p.next()) {
                         var schemaResourceRecord = _q.value;
                         try {
-                            for (var _r = tslib_1.__values(schemaResourceRecord.resources), _s = _r.next(); !_s.done; _s = _r.next()) {
+                            for (var _r = (e_13 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _s = _r.next(); !_s.done; _s = _r.next()) {
                                 var resourceName = _s.value;
-                                filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName));
+                                filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName).path);
                             }
                         }
                         catch (e_13_1) { e_13 = { error: e_13_1 }; }
@@ -368,7 +390,7 @@ var InClauseUnderConjunction = (function () {
         if (!this.flow.filesGroupsByClause.get(appropriateClauseKey)) {
             return [];
         }
-        return tslib_1.__spread(Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).concepts), Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).entities), Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).datapoints));
+        return tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).concepts)), false), tslib_1.__read(Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).entities)), false), tslib_1.__read(Array.from(this.flow.filesGroupsByClause.get(appropriateClauseKey).datapoints)), false);
     };
     InClauseUnderConjunction.prototype.getProcessableClauses = function (clause) {
         var e_16, _a;
@@ -397,6 +419,9 @@ var InClauseUnderConjunction = (function () {
     InClauseUnderConjunction.prototype.singleAndField = function (clause) {
         return isOneKeyBased(clause) && !!get(clause, KEY_AND);
     };
+    InClauseUnderConjunction.prototype.singleOrField = function (clause) {
+        return isOneKeyBased(clause) && !!get(clause, KEY_OR);
+    };
     return InClauseUnderConjunction;
 }());
 exports.InClauseUnderConjunction = InClauseUnderConjunction;

package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js.map

@@ -1 +1 @@
-{"version":3,"file":"in-clause-under-conjunction.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/in-clause-under-conjunction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"in-clause-under-conjunction.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/in-clause-under-conjunction.ts"],"names":[],"mappings":"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"}

package/lib-web/src/resource-selection-optimizer/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAppropriatePlugin = void 0;
 var in_clause_under_conjunction_1 = require("./in-clause-under-conjunction");
 var head = require("lodash.head");
 function getAppropriatePlugin(queryParam, options) {

package/lib-web/src/resource-selection-optimizer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/index.ts"],"names":[],"mappings":";;AAAA,6EAAyE;AACzE,kCAAoC;AAGpC,SAAgB,oBAAoB,CAAC,UAAU,EAAE,OAA2B;IAC1E,IAAM,OAAO,GAAG;QACd,IAAI,sDAAwB,CAAC,UAAU,EAAE,OAAO,CAAC;KAClD,CAAC;IAEF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,SAAS,EAAE,EAAlB,CAAkB,CAAC,CAAC,CAAC;AAC5D,CAAC;AAND,oDAMC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/index.ts"],"names":[],"mappings":";;;AAAA,6EAAyE;AACzE,kCAAoC;AAGpC,SAAgB,oBAAoB,CAAC,UAAU,EAAE,OAA2B;IAC1E,IAAM,OAAO,GAAG;QACd,IAAI,sDAAwB,CAAC,UAAU,EAAE,OAAO,CAAC;KAClD,CAAC;IAEF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,SAAS,EAAE,EAAlB,CAAkB,CAAC,CAAC,CAAC;AAC5D,CAAC;AAND,oDAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizabi/reader-ddfcsv",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Vizabi DDFcsv reader",
   "author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
   "license": "GPL-3.0",
@@ -95,7 +95,7 @@
     "@types/core-js": "2.5.0",
     "@types/lodash": "4.14.116",
     "@types/mocha": "5.2.5",
-    "@types/node": "10.5.7",
+    "@types/node": "20.12.12",
     "babel-core": "6.26.3",
     "babel-loader": "7.1.5",
     "babel-plugin-transform-object-rest-spread": "6.26.0",
@@ -121,10 +121,11 @@
     "source-map-loader": "0.2.3",
     "source-map-support": "0.5.6",
     "ts-loader": "4.3.0",
-    "ts-node": "7.0.0",
+    "ts-node": "10.9.2",
+    "tslib": " 2.6.2",
     "tslint": "5.11.0",
     "tslint-no-unused-expression-chai": "0.1.3",
-    "typescript": "3.2.2",
+    "typescript": "5.4.5",
     "uglifyjs-webpack-plugin": "1.2.5",
     "webpack": "4.8.1",
     "webpack-bundle-analyzer": "^3.0.4",

package/src/ddf-csv.ts

@@ -803,16 +803,17 @@ export function ddfCsvReader (logger?: any) {
         Papa.parse(stripBom(data), {
           header: true,
           skipEmptyLines: true,
-          dynamicTyping: (headerName) => {
-            // parsing to number/boolean based on concept type
-            //
-            // can't do dynamic typing without concept types loaded.
-            // concept properties are not parsed in first concept query
-            // reparsing of concepts resource is done in conceptLookup building
-            const concept: any = options.conceptsLookup.get(headerName) || {};
-
-            return includes([ 'boolean', 'measure' ], concept.concept_type);
-          },
+          dynamicTyping: true,
+          // dynamicTyping: (headerName) => {
+          //     // parsing to number/boolean based on concept type
+          //   //
+          //   // can't do dynamic typing without concept types loaded.
+          //   // concept properties are not parsed in first concept query
+          //   // reparsing of concepts resource is done in conceptLookup building
+          //   const concept: any = options.conceptsLookup.get(headerName) || {};
+
+          //   return includes([ 'boolean', 'measure' ], concept.concept_type);
+          // },
           complete: result => {
             debug(`finish reading "${filePath}"`);
             resolve(result);

package/src/resource-selection-optimizer/in-clause-under-conjunction.ts

@@ -19,6 +19,7 @@ const JOIN_KEYWORD = 'join';
 const KEY_IN = '$in';
 const KEY_NIN = '$nin';
 const KEY_AND = '$and';
+const KEY_OR = '$or';
 
 const getFirstConditionClause = clause => head(values(clause));
 const getFirstKey = obj => head(keys(obj));
@@ -45,8 +46,9 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
     const relatedFeatures = compact(featureDetectors.map(detector => detector(this.query, this.conceptsLookup)));
 
-    return includes(relatedFeatures, QueryFeature.WhereClauseBasedOnConjunction) &&
-      includes(relatedFeatures, QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
+    return this.query.from === "datapoints";
+    // return includes(relatedFeatures, QueryFeature.WhereClauseBasedOnConjunction) &&
+    //   includes(relatedFeatures, QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
   }
 
   async getRecommendedFilesSet(): Promise<string[]> {
@@ -81,7 +83,17 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
   private fillResourceToFileHash(): InClauseUnderConjunction {
     this.flow.resourceToFile = get(this.datapackage, 'resources', []).reduce((hash, resource) => {
-      hash.set(resource.name, resource.path);
+      const constraints = resource.schema.fields.reduce((result, field) => {
+        if (field.constraints?.enum) {
+          result.set(field.name, field.constraints.enum);
+        }
+        return result;
+      }, new Map())
+      
+      hash.set(resource.name, {
+        path: resource.path,
+        constraints
+      });
 
       return hash;
     }, new Map());
@@ -99,6 +111,8 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
       if (this.singleAndField(where)) {
         this.flow.processableClauses.push(...flattenDeep(where[KEY_AND].map(el => this.getProcessableClauses(el))));
+      } else if (this.singleOrField(where)) {
+        this.flow.processableClauses.push(...flattenDeep(where[KEY_OR].map(el => this.getProcessableClauses(el))));
       } else {
         this.flow.processableClauses.push(...this.getProcessableClauses(where));
       }
@@ -108,7 +122,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
   }
 
   private collectEntityFilesNames(): InClauseUnderConjunction {
-    this.flow.entityFilesNames = [];
+    this.flow.entityFilesNames = new Set();
     this.flow.fileNameToPrimaryKeyHash = new Map();
 
     for (const schemaResourceRecord of this.datapackage.ddfSchema.entities) {
@@ -117,9 +131,9 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
         if (head(schemaResourceRecord.primaryKey) === primaryKey) {
           for (const resourceName of schemaResourceRecord.resources) {
-            const file = this.flow.resourceToFile.get(resourceName);
+            const file = this.flow.resourceToFile.get(resourceName).path;
 
-            this.flow.entityFilesNames.push(file);
+            this.flow.entityFilesNames.add(file);
             this.flow.fileNameToPrimaryKeyHash.set(file, primaryKey);
           }
         }
@@ -131,7 +145,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
   private collectEntities(): Promise<any> {
     const self = this;
-    const actions = self.flow.entityFilesNames.map(file => new Promise((actResolve, actReject) => {
+    const actions = [...self.flow.entityFilesNames].map(file => new Promise((actResolve, actReject) => {
       self.fileReader.readText(path.join(self.datasetPath, file), (err, text) => {
         if (err) {
           return actReject(err);
@@ -160,13 +174,14 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
     for (const entityFileDescriptor of entitiesData) {
       for (const entityRecord of entityFileDescriptor.result.data) {
         const primaryKeyForThisFile = this.flow.fileNameToPrimaryKeyHash.get(entityFileDescriptor.file);
-        const primaryKeyCellValue = entityRecord[primaryKeyForThisFile];
         const domainsForCurrentRecord = [...getSubdomainsFromRecord(entityRecord)];
 
         if (isEmpty(domainsForCurrentRecord)) {
           domainsForCurrentRecord.push(primaryKeyForThisFile);
         }
 
+        const primaryKeyCellValue = entityRecord[primaryKeyForThisFile] || entityRecord[domainsForCurrentRecord[0]];
+
         this.flow.entityValueToDomainHash.set(primaryKeyCellValue, domainsForCurrentRecord);
         this.flow.entityValueToFileHash.set(primaryKeyCellValue, entityFileDescriptor.file);
       }
@@ -191,7 +206,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
     for (const clause of this.flow.processableClauses) {
       const filesGroupByClause = {
-        entities: new Set(),
+        entities: this.flow.entityFilesNames,
         datapoints: new Set(),
         concepts: new Set()
       };
@@ -199,15 +214,24 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
       const entityValuesFromClause = firstConditionClause[KEY_IN] || getEntitiesExcept(firstConditionClause[KEY_NIN]);
 
       for (const entityValueFromClause of entityValuesFromClause) {
-        filesGroupByClause.entities.add(this.flow.entityValueToFileHash.get(entityValueFromClause));
+        //filesGroupByClause.entities.add(this.flow.entityValueToFileHash.get(entityValueFromClause));
 
         const entitiesByQuery = this.flow.entityValueToDomainHash.get(entityValueFromClause);
 
         for (const entityByQuery of entitiesByQuery) {
           for (const schemaResourceRecord of this.datapackage.ddfSchema.datapoints) {
             for (const resourceName of schemaResourceRecord.resources) {
+              const file = this.flow.resourceToFile.get(resourceName);
               if (includes(schemaResourceRecord.primaryKey, entityByQuery)) {
-                filesGroupByClause.datapoints.add(this.flow.resourceToFile.get(resourceName));
+                const constraint = file.constraints.get(entityByQuery);
+                if ( constraint ) {
+                  if (constraint.includes(entityValueFromClause)) {
+                    filesGroupByClause.datapoints.add(file.path);
+                  }
+                }                
+                else {
+                  filesGroupByClause.datapoints.add(file.path);
+                }
               }
             }
           }
@@ -216,7 +240,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
 
       for (const schemaResourceRecord of this.datapackage.ddfSchema.concepts) {
         for (const resourceName of schemaResourceRecord.resources) {
-          filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName));
+          filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName).path);
         }
       }
 
@@ -280,4 +304,8 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
   private singleAndField(clause): boolean {
     return isOneKeyBased(clause) && !!get(clause, KEY_AND);
   }
+
+  private singleOrField(clause): boolean {
+    return isOneKeyBased(clause) && !!get(clause, KEY_OR);
+  }
 }

package/tsconfig-web.json

@@ -18,8 +18,11 @@
     "importHelpers": true,
     "strictNullChecks": false,
     "baseUrl": ".",
+    "paths": {
+      "tslib" : ["node_modules/tslib/tslib.d.ts"]
+    },
     "lib": [
-      "es2017",
+      "es2020",
       "dom"
     ],
     "downlevelIteration": true

package/tsconfig.json

@@ -19,7 +19,7 @@
     "strictNullChecks": false,
     "baseUrl": ".",
     "lib": [
-      "es2018",
+      "es2020",
       "dom"
     ]
   },