@vizabi/reader-ddfcsv 4.1.0 → 4.2.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.
- package/.nyc_output/795caf0b3acca8aacbd9d932d086ab81.json +1 -0
- package/.nyc_output/b4e1a7f86ae858c85e0528842263588d.json +1 -0
- package/CHANGELOG.md +5 -0
- package/coverage/base.css +223 -0
- package/coverage/block-navigation.js +63 -0
- package/coverage/index.html +136 -0
- package/coverage/prettify.css +1 -0
- package/coverage/prettify.js +1 -0
- package/coverage/sort-arrow-sprite.png +0 -0
- package/coverage/sorter.js +158 -0
- package/coverage/src/ddf-csv.ts.html +2685 -0
- package/coverage/src/ddfcsv-error.ts.html +132 -0
- package/coverage/src/ddfcsv-reader.ts.html +489 -0
- package/coverage/src/file-readers/backend-file-reader.ts.html +159 -0
- package/coverage/src/file-readers/github-path-adapter.ts.html +228 -0
- package/coverage/src/file-readers/index.html +110 -0
- package/coverage/src/index.html +136 -0
- package/coverage/src/index.ts.html +114 -0
- package/coverage/src/resource-selection-optimizer/in-clause-under-conjunction.ts.html +918 -0
- package/coverage/src/resource-selection-optimizer/index.html +110 -0
- package/coverage/src/resource-selection-optimizer/index.ts.html +102 -0
- package/coverage/src/test-cases/concepts.ts.html +150 -0
- package/coverage/src/test-cases/entities.ts.html +225 -0
- package/coverage/src/test-cases/index.html +110 -0
- package/dist/reader-ddfcsv-polyfill.js +1 -16
- package/dist/reader-ddfcsv-polyfill.js.map +1 -1
- package/dist/reader-ddfcsv.js +1 -16
- package/dist/reader-ddfcsv.js.map +1 -1
- package/lib/src/ddf-csv.js +16 -18
- package/lib/src/ddf-csv.js.map +1 -1
- package/lib/src/ddfcsv-error.js +1 -0
- package/lib/src/ddfcsv-error.js.map +1 -1
- package/lib/src/ddfcsv-reader.d.ts +1 -0
- package/lib/src/ddfcsv-reader.js +10 -5
- package/lib/src/ddfcsv-reader.js.map +1 -1
- package/lib/src/file-readers/backend-file-reader.d.ts +1 -1
- package/lib/src/file-readers/backend-file-reader.js +3 -2
- package/lib/src/file-readers/backend-file-reader.js.map +1 -1
- package/lib/src/file-readers/github-path-adapter.d.ts +1 -0
- package/lib/src/file-readers/github-path-adapter.js +46 -0
- package/lib/src/file-readers/github-path-adapter.js.map +1 -0
- package/lib/src/index.d.ts +0 -2
- package/lib/src/index.js +5 -8
- package/lib/src/index.js.map +1 -1
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +1 -0
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js +37 -12
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +1 -1
- package/lib/src/resource-selection-optimizer/index.js +1 -0
- package/lib/src/resource-selection-optimizer/index.js.map +1 -1
- package/lib-web/src/ddf-csv.js +39 -41
- package/lib-web/src/ddf-csv.js.map +1 -1
- package/lib-web/src/ddfcsv-error.js +2 -1
- package/lib-web/src/ddfcsv-error.js.map +1 -1
- package/lib-web/src/ddfcsv-reader.d.ts +1 -0
- package/lib-web/src/ddfcsv-reader.js +17 -12
- package/lib-web/src/ddfcsv-reader.js.map +1 -1
- package/lib-web/src/file-readers/frontend-file-reader.js +3 -2
- package/lib-web/src/file-readers/frontend-file-reader.js.map +1 -1
- package/lib-web/src/file-readers/github-path-adapter.d.ts +1 -0
- package/lib-web/src/file-readers/github-path-adapter.js +46 -0
- package/lib-web/src/file-readers/github-path-adapter.js.map +1 -0
- package/lib-web/src/index-web.js +4 -3
- package/lib-web/src/index-web.js.map +1 -1
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +1 -0
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js +53 -28
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +1 -1
- package/lib-web/src/resource-selection-optimizer/index.js +1 -0
- package/lib-web/src/resource-selection-optimizer/index.js.map +1 -1
- package/package.json +5 -4
- package/src/ddf-csv.ts +11 -10
- package/src/ddfcsv-reader.ts +7 -3
- package/src/file-readers/backend-file-reader.ts +2 -2
- package/src/file-readers/frontend-file-reader.ts +3 -3
- package/src/file-readers/github-path-adapter.ts +53 -0
- package/src/index.ts +0 -5
- package/src/resource-selection-optimizer/in-clause-under-conjunction.ts +40 -12
- package/tsconfig-web.json +4 -1
- package/tsconfig.json +1 -1
- package/lib/src/file-readers/github-file-reader.d.ts +0 -7
- package/lib/src/file-readers/github-file-reader.js +0 -13
- package/lib/src/file-readers/github-file-reader.js.map +0 -1
- package/src/file-readers/github-file-reader.ts +0 -36
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function githubPathAdapter(path: string): string;
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.githubPathAdapter = void 0;
|
|
4
|
+
function githubPathAdapter(path) {
|
|
5
|
+
var githubusercontent = 'https://raw.githubusercontent.com/';
|
|
6
|
+
var githubcom = 'https://github.com/';
|
|
7
|
+
var datapackage = '/datapackage.json';
|
|
8
|
+
var dotgit = '.git';
|
|
9
|
+
var howManySlashes = function (str) { return (str.match(/\//g) || []).length; };
|
|
10
|
+
if (path.startsWith(githubusercontent)) {
|
|
11
|
+
if (path.endsWith(datapackage)) {
|
|
12
|
+
path = path.replace(datapackage, '');
|
|
13
|
+
}
|
|
14
|
+
if (path.endsWith('/')) {
|
|
15
|
+
path = path.replace(/.$/, '');
|
|
16
|
+
}
|
|
17
|
+
if (howManySlashes(path) === 4) {
|
|
18
|
+
path = path + '/master';
|
|
19
|
+
}
|
|
20
|
+
return path;
|
|
21
|
+
}
|
|
22
|
+
else if (path.startsWith(githubcom)) {
|
|
23
|
+
if (path.endsWith(dotgit)) {
|
|
24
|
+
path = path.replace(dotgit, '');
|
|
25
|
+
}
|
|
26
|
+
if (path.endsWith(datapackage)) {
|
|
27
|
+
path = path.replace(datapackage, '');
|
|
28
|
+
}
|
|
29
|
+
if (path.endsWith('/')) {
|
|
30
|
+
path = path.replace(/.$/, '');
|
|
31
|
+
}
|
|
32
|
+
path = path.replace(githubcom, githubusercontent);
|
|
33
|
+
if (path.includes('/blob')) {
|
|
34
|
+
path = path.replace('/blob', '');
|
|
35
|
+
}
|
|
36
|
+
if (howManySlashes(path) === 4) {
|
|
37
|
+
path = path + '/master';
|
|
38
|
+
}
|
|
39
|
+
return path;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
return path;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
exports.githubPathAdapter = githubPathAdapter;
|
|
46
|
+
//# sourceMappingURL=github-path-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github-path-adapter.js","sourceRoot":"","sources":["../../../src/file-readers/github-path-adapter.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,IAAY;IAU5C,IAAM,iBAAiB,GAAG,oCAAoC,CAAC;IAC/D,IAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,IAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,IAAM,MAAM,GAAG,MAAM,CAAC;IACtB,IAAM,cAAc,GAAG,UAAC,GAAW,IAAK,OAAA,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAA/B,CAA+B,CAAC;IAExE,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAElD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AApDD,8CAoDC"}
|
package/lib-web/src/index-web.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDDFCsvReaderObject = exports.DdfCsvError = exports.FrontendFileReader = void 0;
|
|
3
4
|
var frontend_file_reader_1 = require("./file-readers/frontend-file-reader");
|
|
4
5
|
var frontend_file_reader_2 = require("./file-readers/frontend-file-reader");
|
|
5
|
-
exports
|
|
6
|
+
Object.defineProperty(exports, "FrontendFileReader", { enumerable: true, get: function () { return frontend_file_reader_2.FrontendFileReader; } });
|
|
6
7
|
var ddfcsv_error_1 = require("./ddfcsv-error");
|
|
7
|
-
exports
|
|
8
|
+
Object.defineProperty(exports, "DdfCsvError", { enumerable: true, get: function () { return ddfcsv_error_1.DdfCsvError; } });
|
|
8
9
|
var ddfcsv_reader_1 = require("./ddfcsv-reader");
|
|
9
|
-
exports.getDDFCsvReaderObject = ddfcsv_reader_1.prepareDDFCsvReaderObject(new frontend_file_reader_1.FrontendFileReader());
|
|
10
|
+
exports.getDDFCsvReaderObject = (0, ddfcsv_reader_1.prepareDDFCsvReaderObject)(new frontend_file_reader_1.FrontendFileReader());
|
|
10
11
|
//# sourceMappingURL=index-web.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-web.js","sourceRoot":"","sources":["../../src/index-web.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index-web.js","sourceRoot":"","sources":["../../src/index-web.ts"],"names":[],"mappings":";;;AAEA,4EAAyE;AAEzE,4EAAyE;AAAhE,0HAAA,kBAAkB,OAAA;AAG3B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,iDAA4D;AAE/C,QAAA,qBAAqB,GAAa,IAAA,yCAAyB,EAAC,IAAI,yCAAkB,EAAE,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.InClauseUnderConjunction = void 0;
|
|
3
4
|
var tslib_1 = require("tslib");
|
|
4
5
|
var path = require("path");
|
|
5
6
|
var head = require("lodash.head");
|
|
@@ -19,6 +20,7 @@ var JOIN_KEYWORD = 'join';
|
|
|
19
20
|
var KEY_IN = '$in';
|
|
20
21
|
var KEY_NIN = '$nin';
|
|
21
22
|
var KEY_AND = '$and';
|
|
23
|
+
var KEY_OR = '$or';
|
|
22
24
|
var getFirstConditionClause = function (clause) { return head(values(clause)); };
|
|
23
25
|
var getFirstKey = function (obj) { return head(keys(obj)); };
|
|
24
26
|
var isOneKeyBased = function (obj) { return keys(obj).length === 1; };
|
|
@@ -36,8 +38,7 @@ var InClauseUnderConjunction = (function () {
|
|
|
36
38
|
var _this = this;
|
|
37
39
|
this.flow.joinObject = get(this.query, JOIN_KEYWORD);
|
|
38
40
|
var relatedFeatures = compact(ddf_query_validator_1.featureDetectors.map(function (detector) { return detector(_this.query, _this.conceptsLookup); }));
|
|
39
|
-
return
|
|
40
|
-
includes(relatedFeatures, ddf_query_validator_1.QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
|
|
41
|
+
return this.query.from === "datapoints";
|
|
41
42
|
};
|
|
42
43
|
InClauseUnderConjunction.prototype.getRecommendedFilesSet = function () {
|
|
43
44
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -79,25 +80,38 @@ var InClauseUnderConjunction = (function () {
|
|
|
79
80
|
};
|
|
80
81
|
InClauseUnderConjunction.prototype.fillResourceToFileHash = function () {
|
|
81
82
|
this.flow.resourceToFile = get(this.datapackage, 'resources', []).reduce(function (hash, resource) {
|
|
82
|
-
|
|
83
|
+
var constraints = resource.schema.fields.reduce(function (result, field) {
|
|
84
|
+
var _a;
|
|
85
|
+
if ((_a = field.constraints) === null || _a === void 0 ? void 0 : _a.enum) {
|
|
86
|
+
result.set(field.name, field.constraints.enum);
|
|
87
|
+
}
|
|
88
|
+
return result;
|
|
89
|
+
}, new Map());
|
|
90
|
+
hash.set(resource.name, {
|
|
91
|
+
path: resource.path,
|
|
92
|
+
constraints: constraints
|
|
93
|
+
});
|
|
83
94
|
return hash;
|
|
84
95
|
}, new Map());
|
|
85
96
|
return this;
|
|
86
97
|
};
|
|
87
98
|
InClauseUnderConjunction.prototype.collectProcessableClauses = function () {
|
|
99
|
+
var e_1, _a, _b, _c, _d;
|
|
88
100
|
var _this = this;
|
|
89
|
-
var e_1, _a, _b, _c;
|
|
90
101
|
var joinKeys = keys(this.flow.joinObject);
|
|
91
102
|
this.flow.processableClauses = [];
|
|
92
103
|
try {
|
|
93
104
|
for (var joinKeys_1 = tslib_1.__values(joinKeys), joinKeys_1_1 = joinKeys_1.next(); !joinKeys_1_1.done; joinKeys_1_1 = joinKeys_1.next()) {
|
|
94
105
|
var joinKey = joinKeys_1_1.value;
|
|
95
|
-
var where = get(this.flow.joinObject, joinKey
|
|
106
|
+
var where = get(this.flow.joinObject, "".concat(joinKey, ".").concat(WHERE_KEYWORD), {});
|
|
96
107
|
if (this.singleAndField(where)) {
|
|
97
|
-
(_b = this.flow.processableClauses).push.apply(_b, tslib_1.
|
|
108
|
+
(_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));
|
|
109
|
+
}
|
|
110
|
+
else if (this.singleOrField(where)) {
|
|
111
|
+
(_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));
|
|
98
112
|
}
|
|
99
113
|
else {
|
|
100
|
-
(
|
|
114
|
+
(_d = this.flow.processableClauses).push.apply(_d, tslib_1.__spreadArray([], tslib_1.__read(this.getProcessableClauses(where)), false));
|
|
101
115
|
}
|
|
102
116
|
}
|
|
103
117
|
}
|
|
@@ -112,21 +126,21 @@ var InClauseUnderConjunction = (function () {
|
|
|
112
126
|
};
|
|
113
127
|
InClauseUnderConjunction.prototype.collectEntityFilesNames = function () {
|
|
114
128
|
var e_2, _a, e_3, _b, e_4, _c;
|
|
115
|
-
this.flow.entityFilesNames =
|
|
129
|
+
this.flow.entityFilesNames = new Set();
|
|
116
130
|
this.flow.fileNameToPrimaryKeyHash = new Map();
|
|
117
131
|
try {
|
|
118
132
|
for (var _d = tslib_1.__values(this.datapackage.ddfSchema.entities), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
119
133
|
var schemaResourceRecord = _e.value;
|
|
120
134
|
try {
|
|
121
|
-
for (var _f = tslib_1.__values(this.flow.processableClauses), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
135
|
+
for (var _f = (e_3 = void 0, tslib_1.__values(this.flow.processableClauses)), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
122
136
|
var clause = _g.value;
|
|
123
137
|
var primaryKey = getFirstKey(clause);
|
|
124
138
|
if (head(schemaResourceRecord.primaryKey) === primaryKey) {
|
|
125
139
|
try {
|
|
126
|
-
for (var _h = tslib_1.__values(schemaResourceRecord.resources), _j = _h.next(); !_j.done; _j = _h.next()) {
|
|
140
|
+
for (var _h = (e_4 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _j = _h.next(); !_j.done; _j = _h.next()) {
|
|
127
141
|
var resourceName = _j.value;
|
|
128
|
-
var file = this.flow.resourceToFile.get(resourceName);
|
|
129
|
-
this.flow.entityFilesNames.
|
|
142
|
+
var file = this.flow.resourceToFile.get(resourceName).path;
|
|
143
|
+
this.flow.entityFilesNames.add(file);
|
|
130
144
|
this.flow.fileNameToPrimaryKeyHash.set(file, primaryKey);
|
|
131
145
|
}
|
|
132
146
|
}
|
|
@@ -160,7 +174,7 @@ var InClauseUnderConjunction = (function () {
|
|
|
160
174
|
};
|
|
161
175
|
InClauseUnderConjunction.prototype.collectEntities = function () {
|
|
162
176
|
var self = this;
|
|
163
|
-
var actions = self.flow.entityFilesNames.map(function (file) { return new Promise(function (actResolve, actReject) {
|
|
177
|
+
var actions = tslib_1.__spreadArray([], tslib_1.__read(self.flow.entityFilesNames), false).map(function (file) { return new Promise(function (actResolve, actReject) {
|
|
164
178
|
self.fileReader.readText(path.join(self.datasetPath, file), function (err, text) {
|
|
165
179
|
if (err) {
|
|
166
180
|
return actReject(err);
|
|
@@ -186,14 +200,14 @@ var InClauseUnderConjunction = (function () {
|
|
|
186
200
|
for (var entitiesData_1 = tslib_1.__values(entitiesData), entitiesData_1_1 = entitiesData_1.next(); !entitiesData_1_1.done; entitiesData_1_1 = entitiesData_1.next()) {
|
|
187
201
|
var entityFileDescriptor = entitiesData_1_1.value;
|
|
188
202
|
try {
|
|
189
|
-
for (var _c = tslib_1.__values(entityFileDescriptor.result.data), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
203
|
+
for (var _c = (e_6 = void 0, tslib_1.__values(entityFileDescriptor.result.data)), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
190
204
|
var entityRecord = _d.value;
|
|
191
205
|
var primaryKeyForThisFile = this.flow.fileNameToPrimaryKeyHash.get(entityFileDescriptor.file);
|
|
192
|
-
var
|
|
193
|
-
var domainsForCurrentRecord = tslib_1.__spread(getSubdomainsFromRecord(entityRecord));
|
|
206
|
+
var domainsForCurrentRecord = tslib_1.__spreadArray([], tslib_1.__read(getSubdomainsFromRecord(entityRecord)), false);
|
|
194
207
|
if (isEmpty(domainsForCurrentRecord)) {
|
|
195
208
|
domainsForCurrentRecord.push(primaryKeyForThisFile);
|
|
196
209
|
}
|
|
210
|
+
var primaryKeyCellValue = entityRecord[primaryKeyForThisFile] || entityRecord[domainsForCurrentRecord[0]];
|
|
197
211
|
this.flow.entityValueToDomainHash.set(primaryKeyCellValue, domainsForCurrentRecord);
|
|
198
212
|
this.flow.entityValueToFileHash.set(primaryKeyCellValue, entityFileDescriptor.file);
|
|
199
213
|
}
|
|
@@ -217,8 +231,8 @@ var InClauseUnderConjunction = (function () {
|
|
|
217
231
|
return this;
|
|
218
232
|
};
|
|
219
233
|
InClauseUnderConjunction.prototype.getFilesGroupsQueryClause = function () {
|
|
220
|
-
var _this = this;
|
|
221
234
|
var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e, e_12, _f, e_13, _g;
|
|
235
|
+
var _this = this;
|
|
222
236
|
var getEntitiesExcept = function (entityValuesToExclude) {
|
|
223
237
|
var e_14, _a;
|
|
224
238
|
var result = [];
|
|
@@ -244,28 +258,36 @@ var InClauseUnderConjunction = (function () {
|
|
|
244
258
|
for (var _h = tslib_1.__values(this.flow.processableClauses), _j = _h.next(); !_j.done; _j = _h.next()) {
|
|
245
259
|
var clause = _j.value;
|
|
246
260
|
var filesGroupByClause = {
|
|
247
|
-
entities:
|
|
261
|
+
entities: this.flow.entityFilesNames,
|
|
248
262
|
datapoints: new Set(),
|
|
249
263
|
concepts: new Set()
|
|
250
264
|
};
|
|
251
265
|
var firstConditionClause = getFirstConditionClause(clause);
|
|
252
266
|
var entityValuesFromClause = firstConditionClause[KEY_IN] || getEntitiesExcept(firstConditionClause[KEY_NIN]);
|
|
253
267
|
try {
|
|
254
|
-
for (var entityValuesFromClause_1 = tslib_1.__values(entityValuesFromClause), entityValuesFromClause_1_1 = entityValuesFromClause_1.next(); !entityValuesFromClause_1_1.done; entityValuesFromClause_1_1 = entityValuesFromClause_1.next()) {
|
|
268
|
+
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()) {
|
|
255
269
|
var entityValueFromClause = entityValuesFromClause_1_1.value;
|
|
256
|
-
filesGroupByClause.entities.add(this.flow.entityValueToFileHash.get(entityValueFromClause));
|
|
257
270
|
var entitiesByQuery = this.flow.entityValueToDomainHash.get(entityValueFromClause);
|
|
258
271
|
try {
|
|
259
|
-
for (var entitiesByQuery_1 = tslib_1.__values(entitiesByQuery), entitiesByQuery_1_1 = entitiesByQuery_1.next(); !entitiesByQuery_1_1.done; entitiesByQuery_1_1 = entitiesByQuery_1.next()) {
|
|
272
|
+
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()) {
|
|
260
273
|
var entityByQuery = entitiesByQuery_1_1.value;
|
|
261
274
|
try {
|
|
262
|
-
for (var _k = tslib_1.__values(this.datapackage.ddfSchema.datapoints), _l = _k.next(); !_l.done; _l = _k.next()) {
|
|
275
|
+
for (var _k = (e_10 = void 0, tslib_1.__values(this.datapackage.ddfSchema.datapoints)), _l = _k.next(); !_l.done; _l = _k.next()) {
|
|
263
276
|
var schemaResourceRecord = _l.value;
|
|
264
277
|
try {
|
|
265
|
-
for (var _m = tslib_1.__values(schemaResourceRecord.resources), _o = _m.next(); !_o.done; _o = _m.next()) {
|
|
278
|
+
for (var _m = (e_11 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _o = _m.next(); !_o.done; _o = _m.next()) {
|
|
266
279
|
var resourceName = _o.value;
|
|
280
|
+
var file = this.flow.resourceToFile.get(resourceName);
|
|
267
281
|
if (includes(schemaResourceRecord.primaryKey, entityByQuery)) {
|
|
268
|
-
|
|
282
|
+
var constraint = file.constraints.get(entityByQuery);
|
|
283
|
+
if (constraint) {
|
|
284
|
+
if (constraint.includes(entityValueFromClause)) {
|
|
285
|
+
filesGroupByClause.datapoints.add(file.path);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
else {
|
|
289
|
+
filesGroupByClause.datapoints.add(file.path);
|
|
290
|
+
}
|
|
269
291
|
}
|
|
270
292
|
}
|
|
271
293
|
}
|
|
@@ -304,12 +326,12 @@ var InClauseUnderConjunction = (function () {
|
|
|
304
326
|
finally { if (e_8) throw e_8.error; }
|
|
305
327
|
}
|
|
306
328
|
try {
|
|
307
|
-
for (var _p = tslib_1.__values(this.datapackage.ddfSchema.concepts), _q = _p.next(); !_q.done; _q = _p.next()) {
|
|
329
|
+
for (var _p = (e_12 = void 0, tslib_1.__values(this.datapackage.ddfSchema.concepts)), _q = _p.next(); !_q.done; _q = _p.next()) {
|
|
308
330
|
var schemaResourceRecord = _q.value;
|
|
309
331
|
try {
|
|
310
|
-
for (var _r = tslib_1.__values(schemaResourceRecord.resources), _s = _r.next(); !_s.done; _s = _r.next()) {
|
|
332
|
+
for (var _r = (e_13 = void 0, tslib_1.__values(schemaResourceRecord.resources)), _s = _r.next(); !_s.done; _s = _r.next()) {
|
|
311
333
|
var resourceName = _s.value;
|
|
312
|
-
filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName));
|
|
334
|
+
filesGroupByClause.concepts.add(this.flow.resourceToFile.get(resourceName).path);
|
|
313
335
|
}
|
|
314
336
|
}
|
|
315
337
|
catch (e_13_1) { e_13 = { error: e_13_1 }; }
|
|
@@ -368,7 +390,7 @@ var InClauseUnderConjunction = (function () {
|
|
|
368
390
|
if (!this.flow.filesGroupsByClause.get(appropriateClauseKey)) {
|
|
369
391
|
return [];
|
|
370
392
|
}
|
|
371
|
-
return tslib_1.
|
|
393
|
+
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);
|
|
372
394
|
};
|
|
373
395
|
InClauseUnderConjunction.prototype.getProcessableClauses = function (clause) {
|
|
374
396
|
var e_16, _a;
|
|
@@ -397,6 +419,9 @@ var InClauseUnderConjunction = (function () {
|
|
|
397
419
|
InClauseUnderConjunction.prototype.singleAndField = function (clause) {
|
|
398
420
|
return isOneKeyBased(clause) && !!get(clause, KEY_AND);
|
|
399
421
|
};
|
|
422
|
+
InClauseUnderConjunction.prototype.singleOrField = function (clause) {
|
|
423
|
+
return isOneKeyBased(clause) && !!get(clause, KEY_OR);
|
|
424
|
+
};
|
|
400
425
|
return InClauseUnderConjunction;
|
|
401
426
|
}());
|
|
402
427
|
exports.InClauseUnderConjunction = InClauseUnderConjunction;
|
|
@@ -1 +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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"}
|
|
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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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAppropriatePlugin = void 0;
|
|
3
4
|
var in_clause_under_conjunction_1 = require("./in-clause-under-conjunction");
|
|
4
5
|
var head = require("lodash.head");
|
|
5
6
|
function getAppropriatePlugin(queryParam, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/index.ts"],"names":[],"mappings":"
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vizabi/reader-ddfcsv",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"description": "Vizabi DDFcsv reader",
|
|
5
5
|
"author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
|
|
6
6
|
"license": "GPL-3.0",
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
"@types/core-js": "2.5.0",
|
|
96
96
|
"@types/lodash": "4.14.116",
|
|
97
97
|
"@types/mocha": "5.2.5",
|
|
98
|
-
"@types/node": "
|
|
98
|
+
"@types/node": "20.12.12",
|
|
99
99
|
"babel-core": "6.26.3",
|
|
100
100
|
"babel-loader": "7.1.5",
|
|
101
101
|
"babel-plugin-transform-object-rest-spread": "6.26.0",
|
|
@@ -121,10 +121,11 @@
|
|
|
121
121
|
"source-map-loader": "0.2.3",
|
|
122
122
|
"source-map-support": "0.5.6",
|
|
123
123
|
"ts-loader": "4.3.0",
|
|
124
|
-
"ts-node": "
|
|
124
|
+
"ts-node": "10.9.2",
|
|
125
|
+
"tslib": " 2.6.2",
|
|
125
126
|
"tslint": "5.11.0",
|
|
126
127
|
"tslint-no-unused-expression-chai": "0.1.3",
|
|
127
|
-
"typescript": "
|
|
128
|
+
"typescript": "5.4.5",
|
|
128
129
|
"uglifyjs-webpack-plugin": "1.2.5",
|
|
129
130
|
"webpack": "4.8.1",
|
|
130
131
|
"webpack-bundle-analyzer": "^3.0.4",
|
package/src/ddf-csv.ts
CHANGED
|
@@ -803,16 +803,17 @@ export function ddfCsvReader (logger?: any) {
|
|
|
803
803
|
Papa.parse(stripBom(data), {
|
|
804
804
|
header: true,
|
|
805
805
|
skipEmptyLines: true,
|
|
806
|
-
dynamicTyping:
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
806
|
+
dynamicTyping: true,
|
|
807
|
+
// dynamicTyping: (headerName) => {
|
|
808
|
+
// // parsing to number/boolean based on concept type
|
|
809
|
+
// //
|
|
810
|
+
// // can't do dynamic typing without concept types loaded.
|
|
811
|
+
// // concept properties are not parsed in first concept query
|
|
812
|
+
// // reparsing of concepts resource is done in conceptLookup building
|
|
813
|
+
// const concept: any = options.conceptsLookup.get(headerName) || {};
|
|
814
|
+
|
|
815
|
+
// return includes([ 'boolean', 'measure' ], concept.concept_type);
|
|
816
|
+
// },
|
|
816
817
|
complete: result => {
|
|
817
818
|
debug(`finish reading "${filePath}"`);
|
|
818
819
|
resolve(result);
|
package/src/ddfcsv-reader.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { getRepositoryPath } from 'ddf-query-validator';
|
|
|
5
5
|
import { DdfCsvError } from './ddfcsv-error';
|
|
6
6
|
import { createDiagnosticManagerOn, EndpointDiagnosticManager, getLevelByLabel } from 'cross-project-diagnostics';
|
|
7
7
|
import { DiagnosticManager, Level } from 'cross-project-diagnostics/lib';
|
|
8
|
+
import { githubPathAdapter } from './file-readers/github-path-adapter';
|
|
8
9
|
|
|
9
10
|
const myName = '';
|
|
10
11
|
const myVersion = '';
|
|
@@ -14,7 +15,7 @@ export function prepareDDFCsvReaderObject (defaultResourceReader?: IResourceRead
|
|
|
14
15
|
return {
|
|
15
16
|
init (readerInfo) {
|
|
16
17
|
// TODO: check validity of base path
|
|
17
|
-
this._basePath = readerInfo.path;
|
|
18
|
+
this._basePath = githubPathAdapter(readerInfo.path);
|
|
18
19
|
|
|
19
20
|
this._lastModified = readerInfo._lastModified;
|
|
20
21
|
this.fileReader = externalResourceReader || defaultResourceReader;
|
|
@@ -30,7 +31,11 @@ export function prepareDDFCsvReaderObject (defaultResourceReader?: IResourceRead
|
|
|
30
31
|
this.reader = ddfCsvReader(this.logger);
|
|
31
32
|
},
|
|
32
33
|
|
|
33
|
-
|
|
34
|
+
getDatasetInfo(): Object {
|
|
35
|
+
return {name: this._basePath.slice(this._basePath.indexOf('ddf--'))};
|
|
36
|
+
},
|
|
37
|
+
|
|
38
|
+
async checkFile(path: string): Promise<any> {
|
|
34
39
|
return new Promise((resolve, reject) => {
|
|
35
40
|
const status = this.fileReader.checkFile(path);
|
|
36
41
|
return resolve({status, url: path});
|
|
@@ -57,7 +62,6 @@ export function prepareDDFCsvReaderObject (defaultResourceReader?: IResourceRead
|
|
|
57
62
|
});
|
|
58
63
|
},
|
|
59
64
|
|
|
60
|
-
|
|
61
65
|
async checkIfAssetExists (filePath: string, repositoryPath: string = ''): Promise<any> {
|
|
62
66
|
if (isEmpty(repositoryPath) && isEmpty(this._basePath)) {
|
|
63
67
|
throw new DdfCsvError(`Neither initial 'path' nor 'repositoryPath' as a second param were found.`, `Happens in 'checkIfAssetExists' function`, filePath);
|
|
@@ -9,8 +9,8 @@ export class BackendFileReader implements IResourceRead {
|
|
|
9
9
|
this.recordTransformer = recordTransformer;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
checkFile(
|
|
13
|
-
return fs.existsSync(
|
|
12
|
+
checkFile(filePath: string) {
|
|
13
|
+
return fs.existsSync(filePath) ? 200 : 404;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
readText(filePath, onFileRead, options: object) {
|
|
@@ -12,10 +12,10 @@ export class FrontendFileReader implements IResourceRead {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
checkFile(path: string) {
|
|
15
|
-
fetch(path, { method:
|
|
15
|
+
fetch(path, { method: 'HEAD', credentials: 'same-origin', redirect: 'follow'})
|
|
16
16
|
.then((response) => {
|
|
17
|
-
//the client should then look into response.ok, response.status and response.url
|
|
18
|
-
return Promise.resolve(response)
|
|
17
|
+
// the client should then look into response.ok, response.status and response.url
|
|
18
|
+
return Promise.resolve(response);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
export function githubPathAdapter(path: string) {
|
|
2
|
+
// examples of supported cases
|
|
3
|
+
// https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master
|
|
4
|
+
// https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master/
|
|
5
|
+
// https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master/datapackage.json
|
|
6
|
+
|
|
7
|
+
// assumes master branch
|
|
8
|
+
// https://github.com/open-numbers/ddf--open_numbers--world_development_indicators
|
|
9
|
+
// https://github.com/open-numbers/ddf--open_numbers--world_development_indicators.git
|
|
10
|
+
// https://github.com/open-numbers/ddf--open_numbers--world_development_indicators/blob/master/datapackage.json
|
|
11
|
+
const githubusercontent = 'https://raw.githubusercontent.com/';
|
|
12
|
+
const githubcom = 'https://github.com/';
|
|
13
|
+
const datapackage = '/datapackage.json';
|
|
14
|
+
const dotgit = '.git';
|
|
15
|
+
const howManySlashes = (str: string) => (str.match(/\//g) || []).length;
|
|
16
|
+
|
|
17
|
+
if (path.startsWith(githubusercontent)) {
|
|
18
|
+
if (path.endsWith(datapackage)) {
|
|
19
|
+
path = path.replace(datapackage, '');
|
|
20
|
+
}
|
|
21
|
+
if (path.endsWith('/')) {
|
|
22
|
+
path = path.replace(/.$/, ''); // remove trailing slash
|
|
23
|
+
}
|
|
24
|
+
if (howManySlashes(path) === 4) {
|
|
25
|
+
path = path + '/master';
|
|
26
|
+
}
|
|
27
|
+
return path;
|
|
28
|
+
|
|
29
|
+
} else if (path.startsWith(githubcom)) {
|
|
30
|
+
if (path.endsWith(dotgit)) {
|
|
31
|
+
path = path.replace(dotgit, '');
|
|
32
|
+
}
|
|
33
|
+
if (path.endsWith(datapackage)) {
|
|
34
|
+
path = path.replace(datapackage, '');
|
|
35
|
+
}
|
|
36
|
+
if (path.endsWith('/')) {
|
|
37
|
+
path = path.replace(/.$/, ''); // remove trailing slash
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
path = path.replace(githubcom, githubusercontent);
|
|
41
|
+
|
|
42
|
+
if (path.includes('/blob')) {
|
|
43
|
+
path = path.replace('/blob', '');
|
|
44
|
+
}
|
|
45
|
+
if (howManySlashes(path) === 4) {
|
|
46
|
+
path = path + '/master';
|
|
47
|
+
}
|
|
48
|
+
return path;
|
|
49
|
+
|
|
50
|
+
} else {
|
|
51
|
+
return path;
|
|
52
|
+
}
|
|
53
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -2,10 +2,6 @@ import { BackendFileReader } from './file-readers/backend-file-reader';
|
|
|
2
2
|
|
|
3
3
|
export { BackendFileReader } from './file-readers/backend-file-reader';
|
|
4
4
|
|
|
5
|
-
import { GithubFileReader } from './file-readers/github-file-reader';
|
|
6
|
-
|
|
7
|
-
export { GithubFileReader } from './file-readers/github-file-reader';
|
|
8
|
-
|
|
9
5
|
export { DdfCsvError } from './ddfcsv-error';
|
|
10
6
|
|
|
11
7
|
import { IResourceRead } from './interfaces';
|
|
@@ -17,4 +13,3 @@ import { prepareDDFCsvReaderObject } from './ddfcsv-reader';
|
|
|
17
13
|
export { prepareDDFCsvReaderObject } from './ddfcsv-reader';
|
|
18
14
|
|
|
19
15
|
export const getDDFCsvReaderObject: Function = prepareDDFCsvReaderObject(new BackendFileReader());
|
|
20
|
-
export const getGithubDDFCsvReaderObject: Function = prepareDDFCsvReaderObject(new GithubFileReader());
|