@vizabi/reader-ddfcsv 4.2.0 → 4.3.1
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/dist/reader-ddfcsv-polyfill.js +1 -1
- package/dist/reader-ddfcsv-polyfill.js.map +1 -1
- package/dist/reader-ddfcsv.js +7 -1
- package/dist/reader-ddfcsv.js.map +1 -1
- package/lib/src/ddf-csv.d.ts +1 -0
- package/lib/src/ddf-csv.js +20 -7
- package/lib/src/ddf-csv.js.map +1 -1
- package/lib/src/ddfcsv-reader.js +1 -1
- package/lib/src/interfaces.d.ts +1 -0
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +2 -2
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js +17 -42
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +1 -1
- package/lib/src/resource-selection-optimizer/index.d.ts +1 -1
- package/lib/src/resource-selection-optimizer/index.js +2 -2
- package/lib/src/resource-selection-optimizer/index.js.map +1 -1
- package/lib-web/src/ddf-csv.d.ts +1 -0
- package/lib-web/src/ddf-csv.js +277 -378
- package/lib-web/src/ddf-csv.js.map +1 -1
- package/lib-web/src/ddfcsv-error.js +8 -12
- package/lib-web/src/ddfcsv-error.js.map +1 -1
- package/lib-web/src/ddfcsv-reader.js +81 -123
- package/lib-web/src/ddfcsv-reader.js.map +1 -1
- package/lib-web/src/file-readers/frontend-file-reader.js +13 -16
- package/lib-web/src/file-readers/frontend-file-reader.js.map +1 -1
- package/lib-web/src/file-readers/github-path-adapter.js +5 -5
- package/lib-web/src/file-readers/github-path-adapter.js.map +1 -1
- package/lib-web/src/index-web.js +2 -2
- package/lib-web/src/index-web.js.map +1 -1
- package/lib-web/src/interfaces.d.ts +1 -0
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +2 -2
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js +164 -368
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +1 -1
- package/lib-web/src/resource-selection-optimizer/index.d.ts +1 -1
- package/lib-web/src/resource-selection-optimizer/index.js +6 -6
- package/lib-web/src/resource-selection-optimizer/index.js.map +1 -1
- package/package.json +3 -2
- package/src/ddf-csv.ts +22 -17
- package/src/interfaces.ts +1 -0
- package/src/resource-selection-optimizer/in-clause-under-conjunction.ts +16 -45
- package/src/resource-selection-optimizer/index.ts +2 -2
- package/tsconfig-web.json +1 -1
|
@@ -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,2 +1,2 @@
|
|
|
1
1
|
import { IBaseReaderOptions, IResourceSelectionOptimizer } from '../interfaces';
|
|
2
|
-
export declare function getAppropriatePlugin(queryParam: any, options: IBaseReaderOptions): IResourceSelectionOptimizer;
|
|
2
|
+
export declare function getAppropriatePlugin(parent: any, queryParam: any, options: IBaseReaderOptions): IResourceSelectionOptimizer;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getAppropriatePlugin = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
function getAppropriatePlugin(queryParam, options) {
|
|
7
|
-
|
|
8
|
-
new in_clause_under_conjunction_1.InClauseUnderConjunction(queryParam, options)
|
|
4
|
+
const in_clause_under_conjunction_1 = require("./in-clause-under-conjunction");
|
|
5
|
+
const head = require("lodash.head");
|
|
6
|
+
function getAppropriatePlugin(parent, queryParam, options) {
|
|
7
|
+
const plugins = [
|
|
8
|
+
new in_clause_under_conjunction_1.InClauseUnderConjunction(parent, queryParam, options)
|
|
9
9
|
];
|
|
10
|
-
return head(plugins.filter(
|
|
10
|
+
return head(plugins.filter(plugin => plugin.isMatched()));
|
|
11
11
|
}
|
|
12
12
|
exports.getAppropriatePlugin = getAppropriatePlugin;
|
|
13
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/index.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resource-selection-optimizer/index.ts"],"names":[],"mappings":";;;AAAA,+EAAyE;AACzE,oCAAoC;AAGpC,SAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,OAA2B;IAClF,MAAM,OAAO,GAAG;QACd,IAAI,sDAAwB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC;KAC1D,CAAC;IAEF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AAC5D,CAAC;AAND,oDAMC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vizabi/reader-ddfcsv",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.1",
|
|
4
4
|
"description": "Vizabi DDFcsv reader",
|
|
5
5
|
"author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
|
|
6
6
|
"license": "GPL-3.0",
|
|
7
7
|
"main": "lib/src/index.js",
|
|
8
|
+
"browser": "dist/reader-ddfcsv.js",
|
|
8
9
|
"publishConfig": {
|
|
9
10
|
"access": "public"
|
|
10
11
|
},
|
|
@@ -79,6 +80,7 @@
|
|
|
79
80
|
"lodash.isnil": "4.0.0",
|
|
80
81
|
"lodash.isobject": "3.0.2",
|
|
81
82
|
"lodash.isstring": "4.0.1",
|
|
83
|
+
"lodash.keys": "4.2.0",
|
|
82
84
|
"lodash.map": "4.6.0",
|
|
83
85
|
"lodash.set": "4.3.2",
|
|
84
86
|
"lodash.size": "4.2.0",
|
|
@@ -112,7 +114,6 @@
|
|
|
112
114
|
"conventional-github-releaser": "1.1.9",
|
|
113
115
|
"copy-webpack-plugin": "4.5.2",
|
|
114
116
|
"html-webpack-plugin": "3.2.0",
|
|
115
|
-
"lodash.keys": "4.2.0",
|
|
116
117
|
"mocha": "5.2.0",
|
|
117
118
|
"nyc": "12.0.2",
|
|
118
119
|
"rimraf": "2.6.2",
|
package/src/ddf-csv.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import * as includes from 'lodash.includes';
|
|
2
|
-
import * as cloneDeep from 'lodash.clonedeep';
|
|
3
2
|
import * as isEmpty from 'lodash.isempty';
|
|
4
3
|
import * as stripBom from 'strip-bom';
|
|
5
4
|
import { getAppropriatePlugin } from './resource-selection-optimizer';
|
|
@@ -41,6 +40,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
41
40
|
|
|
42
41
|
let optimalFilesSet = [];
|
|
43
42
|
let datapackage;
|
|
43
|
+
let datapackagePromise;
|
|
44
44
|
|
|
45
45
|
function loadDataPackage (baseOptions: IBaseReaderOptions): Promise<IDatapackage> {
|
|
46
46
|
const datapackagePath = getFilePath(baseOptions.basePath);
|
|
@@ -172,14 +172,15 @@ export function ddfCsvReader (logger?: any) {
|
|
|
172
172
|
|
|
173
173
|
try {
|
|
174
174
|
await validateQueryStructure(queryParam, baseOptions);
|
|
175
|
-
baseOptions.datapackage = await loadDataPackage(baseOptions);
|
|
175
|
+
baseOptions.datapackage = await (datapackagePromise || (datapackagePromise = loadDataPackage(baseOptions)));
|
|
176
|
+
baseOptions.resourcesLookup = resourcesLookup;
|
|
176
177
|
await loadConcepts(queryParam, baseOptions);
|
|
177
178
|
await validateQueryDefinitions(queryParam, baseOptions);
|
|
178
179
|
|
|
179
180
|
if (isSchemaQuery(queryParam)) {
|
|
180
181
|
data = await querySchema(queryParam, baseOptions);
|
|
181
182
|
} else {
|
|
182
|
-
const appropriatePlugin = getAppropriatePlugin(queryParam, baseOptions);
|
|
183
|
+
const appropriatePlugin = getAppropriatePlugin(this, queryParam, baseOptions);
|
|
183
184
|
|
|
184
185
|
if (appropriatePlugin) {
|
|
185
186
|
optimalFilesSet = [];
|
|
@@ -464,7 +465,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
464
465
|
select: { key: [ join.key ] },
|
|
465
466
|
where: join.where,
|
|
466
467
|
from: options.conceptsLookup.has(join.key) ? 'entities' : 'concepts'
|
|
467
|
-
}, Object.assign({ joinID },
|
|
468
|
+
}, Object.assign({ joinID }, options))
|
|
468
469
|
.then(result => ({
|
|
469
470
|
[ joinID ]: {
|
|
470
471
|
[ join.key ]: {
|
|
@@ -559,7 +560,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
559
560
|
.map(concept => query({
|
|
560
561
|
select: { key: [ concept.domain ], value: [ 'is--' + concept.concept ] },
|
|
561
562
|
from: 'entities'
|
|
562
|
-
}, Object.assign({},
|
|
563
|
+
}, Object.assign({}, options))
|
|
563
564
|
.then(result => ({
|
|
564
565
|
[ concept.concept ]:
|
|
565
566
|
{
|
|
@@ -803,17 +804,12 @@ export function ddfCsvReader (logger?: any) {
|
|
|
803
804
|
Papa.parse(stripBom(data), {
|
|
804
805
|
header: true,
|
|
805
806
|
skipEmptyLines: true,
|
|
806
|
-
dynamicTyping:
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
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
|
-
// },
|
|
807
|
+
dynamicTyping: (headerName) => {
|
|
808
|
+
// skip parsing time/string concept types
|
|
809
|
+
const concept: any = options.conceptsLookup.get(headerName) || {};
|
|
810
|
+
|
|
811
|
+
return !includes([ 'time', 'string' ], concept.concept_type);
|
|
812
|
+
},
|
|
817
813
|
complete: result => {
|
|
818
814
|
debug(`finish reading "${filePath}"`);
|
|
819
815
|
resolve(result);
|
|
@@ -837,6 +833,14 @@ export function ddfCsvReader (logger?: any) {
|
|
|
837
833
|
resource.schema.primaryKey = [ resource.schema.primaryKey ];
|
|
838
834
|
}
|
|
839
835
|
|
|
836
|
+
const constraints = resource.schema.fields.reduce((result, field) => {
|
|
837
|
+
if (field.constraints?.enum) {
|
|
838
|
+
result[field.name] = field.constraints.enum;
|
|
839
|
+
}
|
|
840
|
+
return result;
|
|
841
|
+
}, {});
|
|
842
|
+
resource.constraints = constraints;
|
|
843
|
+
|
|
840
844
|
resource.translations = {};
|
|
841
845
|
resourcesLookup.set(resource.name, resource);
|
|
842
846
|
});
|
|
@@ -868,6 +872,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
868
872
|
}
|
|
869
873
|
|
|
870
874
|
return {
|
|
871
|
-
query
|
|
875
|
+
query,
|
|
876
|
+
loadFile
|
|
872
877
|
};
|
|
873
878
|
}
|
package/src/interfaces.ts
CHANGED
|
@@ -33,7 +33,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
33
33
|
private datapackage: IDatapackage;
|
|
34
34
|
private conceptsLookup;
|
|
35
35
|
|
|
36
|
-
constructor(queryParam, private options: IBaseReaderOptions) {
|
|
36
|
+
constructor(private parent, queryParam, private options: IBaseReaderOptions) {
|
|
37
37
|
this.fileReader = options.fileReader;
|
|
38
38
|
this.datasetPath = options.basePath;
|
|
39
39
|
this.query = queryParam;
|
|
@@ -59,7 +59,6 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
59
59
|
|
|
60
60
|
let result;
|
|
61
61
|
try {
|
|
62
|
-
this.fillResourceToFileHash();
|
|
63
62
|
this.collectProcessableClauses();
|
|
64
63
|
this.collectEntityFilesNames();
|
|
65
64
|
const data = await this.collectEntities();
|
|
@@ -81,26 +80,6 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
81
80
|
}
|
|
82
81
|
}
|
|
83
82
|
|
|
84
|
-
private fillResourceToFileHash(): InClauseUnderConjunction {
|
|
85
|
-
this.flow.resourceToFile = get(this.datapackage, 'resources', []).reduce((hash, resource) => {
|
|
86
|
-
const constraints = resource.schema.fields.reduce((result, field) => {
|
|
87
|
-
if (field.constraints?.enum) {
|
|
88
|
-
result.set(field.name, field.constraints.enum);
|
|
89
|
-
}
|
|
90
|
-
return result;
|
|
91
|
-
}, new Map())
|
|
92
|
-
|
|
93
|
-
hash.set(resource.name, {
|
|
94
|
-
path: resource.path,
|
|
95
|
-
constraints
|
|
96
|
-
});
|
|
97
|
-
|
|
98
|
-
return hash;
|
|
99
|
-
}, new Map());
|
|
100
|
-
|
|
101
|
-
return this;
|
|
102
|
-
}
|
|
103
|
-
|
|
104
83
|
private collectProcessableClauses(): InClauseUnderConjunction {
|
|
105
84
|
const joinKeys = keys(this.flow.joinObject);
|
|
106
85
|
|
|
@@ -123,6 +102,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
123
102
|
|
|
124
103
|
private collectEntityFilesNames(): InClauseUnderConjunction {
|
|
125
104
|
this.flow.entityFilesNames = new Set();
|
|
105
|
+
this.flow.entityResources = new Set();
|
|
126
106
|
this.flow.fileNameToPrimaryKeyHash = new Map();
|
|
127
107
|
|
|
128
108
|
for (const schemaResourceRecord of this.datapackage.ddfSchema.entities) {
|
|
@@ -131,10 +111,11 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
131
111
|
|
|
132
112
|
if (head(schemaResourceRecord.primaryKey) === primaryKey) {
|
|
133
113
|
for (const resourceName of schemaResourceRecord.resources) {
|
|
134
|
-
const
|
|
114
|
+
const resource = this.options.resourcesLookup.get(resourceName);
|
|
135
115
|
|
|
136
|
-
this.flow.
|
|
137
|
-
this.flow.
|
|
116
|
+
this.flow.entityResources.add(resource);
|
|
117
|
+
this.flow.entityFilesNames.add(resource.path);
|
|
118
|
+
this.flow.fileNameToPrimaryKeyHash.set(resource.path, primaryKey);
|
|
138
119
|
}
|
|
139
120
|
}
|
|
140
121
|
}
|
|
@@ -145,27 +126,17 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
145
126
|
|
|
146
127
|
private collectEntities(): Promise<any> {
|
|
147
128
|
const self = this;
|
|
148
|
-
const actions = [...self.flow.
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
Papa.parse(text, {
|
|
155
|
-
header: true,
|
|
156
|
-
skipEmptyLines: true,
|
|
157
|
-
complete: result => actResolve({file, result}),
|
|
158
|
-
error: error => actReject(error)
|
|
159
|
-
});
|
|
160
|
-
});
|
|
161
|
-
}));
|
|
129
|
+
const actions = [...self.flow.entityResources].map(resource => {
|
|
130
|
+
return (resource.data || (resource.data = self.parent.loadFile(resource.path, self.options)))
|
|
131
|
+
.then(data => ({result: data, file: resource.path}));
|
|
132
|
+
});
|
|
162
133
|
|
|
163
134
|
return Promise.all(actions);
|
|
164
135
|
}
|
|
165
136
|
|
|
166
137
|
private fillEntityValuesHash(entitiesData): InClauseUnderConjunction {
|
|
167
138
|
const getSubdomainsFromRecord = record => compact(keys(record)
|
|
168
|
-
.filter(key => startsWith(key, 'is--') && (record[key] ===
|
|
139
|
+
.filter(key => startsWith(key, 'is--') && (record[key] === true))
|
|
169
140
|
.map(key => key.replace(/^is--/, '')));
|
|
170
141
|
|
|
171
142
|
this.flow.entityValueToFileHash = new Map();
|
|
@@ -221,16 +192,16 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
221
192
|
for (const entityByQuery of entitiesByQuery) {
|
|
222
193
|
for (const schemaResourceRecord of this.datapackage.ddfSchema.datapoints) {
|
|
223
194
|
for (const resourceName of schemaResourceRecord.resources) {
|
|
224
|
-
const file = this.flow.resourceToFile.get(resourceName);
|
|
225
195
|
if (includes(schemaResourceRecord.primaryKey, entityByQuery)) {
|
|
226
|
-
const
|
|
196
|
+
const resource = this.options.resourcesLookup.get(resourceName);
|
|
197
|
+
const constraint = resource.constraints[entityByQuery];
|
|
227
198
|
if ( constraint ) {
|
|
228
199
|
if (constraint.includes(entityValueFromClause)) {
|
|
229
|
-
filesGroupByClause.datapoints.add(
|
|
200
|
+
filesGroupByClause.datapoints.add(resource.path);
|
|
230
201
|
}
|
|
231
202
|
}
|
|
232
203
|
else {
|
|
233
|
-
filesGroupByClause.datapoints.add(
|
|
204
|
+
filesGroupByClause.datapoints.add(resource.path);
|
|
234
205
|
}
|
|
235
206
|
}
|
|
236
207
|
}
|
|
@@ -240,7 +211,7 @@ export class InClauseUnderConjunction implements IResourceSelectionOptimizer {
|
|
|
240
211
|
|
|
241
212
|
for (const schemaResourceRecord of this.datapackage.ddfSchema.concepts) {
|
|
242
213
|
for (const resourceName of schemaResourceRecord.resources) {
|
|
243
|
-
filesGroupByClause.concepts.add(this.
|
|
214
|
+
filesGroupByClause.concepts.add(this.options.resourcesLookup.get(resourceName).path);
|
|
244
215
|
}
|
|
245
216
|
}
|
|
246
217
|
|
|
@@ -2,9 +2,9 @@ import { InClauseUnderConjunction } from './in-clause-under-conjunction';
|
|
|
2
2
|
import * as head from 'lodash.head';
|
|
3
3
|
import { IBaseReaderOptions, IResourceSelectionOptimizer } from '../interfaces';
|
|
4
4
|
|
|
5
|
-
export function getAppropriatePlugin(queryParam, options: IBaseReaderOptions): IResourceSelectionOptimizer {
|
|
5
|
+
export function getAppropriatePlugin(parent, queryParam, options: IBaseReaderOptions): IResourceSelectionOptimizer {
|
|
6
6
|
const plugins = [
|
|
7
|
-
new InClauseUnderConjunction(queryParam, options)
|
|
7
|
+
new InClauseUnderConjunction(parent, queryParam, options)
|
|
8
8
|
];
|
|
9
9
|
|
|
10
10
|
return head(plugins.filter(plugin => plugin.isMatched()));
|