@vizabi/reader-ddfcsv 4.5.0 → 4.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizabi/reader-ddfcsv",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "description": "Vizabi DDFcsv reader",
   "author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
   "license": "GPL-3.0",
@@ -19,8 +19,7 @@
     "tsc-web": "tsc --project tsconfig-web.json && TARGET_DIR=lib-web npm run set-own-version",
     "submodules:init": "git submodule update --init -f",
     "coverage:clean": "rm -rf coverage && rm -rf .nyc_output && rm -rf coverage.lcov",
-    "remove-unneeded": "rm -rf test/fixtures/systema_globalis/master-HEAD/etl",
-    "pree2e": "npm run submodules:init && npm run remove-unneeded && npm run coverage:clean && npm run tslint && npm run tsc-node",
+    "pree2e": "npm run submodules:init && npm run coverage:clean && npm run tslint && npm run tsc-node",
     "e2e": "nyc mocha",
     "pree2e:doc": "npm run pree2e",
     "e2e:doc": "mocha --require ts-node/register -R markdown > API.SPECIFICATION.md --recursive test/*.spec.ts",
@@ -57,7 +56,6 @@
     "cross-project-diagnostics": "0.1.5",
     "d3-time-format": "^2.2.3",
     "ddf-query-validator": "1.4.1",
-    "fetch-polyfill": "0.8.2",
     "https": "1.0.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.compact": "3.0.1",
@@ -119,7 +117,7 @@
     "tslib": " 2.6.2",
     "tslint": "6.1.3",
     "tslint-no-unused-expression-chai": "0.1.4",
-    "typescript": "5.4.5",
+    "typescript": "5.5.4",
     "uglifyjs-webpack-plugin": "1.2.5",
     "webpack": "4.8.1",
     "webpack-bundle-analyzer": "^3.0.4",

package/src/ddf-csv.ts

@@ -405,8 +405,8 @@ export function ddfCsvReader (logger?: any) {
           where[key] = where[key].reduce((res, value) => {
             const valueKeys = Object.keys(value);
             if (valueKeys.length > 1) {
-              for (const key of valueKeys) {
-                res.push({ [key]: value[key] });
+              for (const vKey of valueKeys) {
+                res.push({ [vKey]: value[vKey] });
               }
             } else {
               res.push(value);
@@ -851,7 +851,10 @@ export function ddfCsvReader (logger?: any) {
             // skip parsing time/string concept types
             const concept: any = options.conceptsLookup.get(headerName) || {};
 
-            return !includes([ 'time', 'string', 'entity_domain', 'entity_set' ], concept.concept_type);
+            return !includes(['time', 'string', 'entity_domain', 'entity_set'], concept.concept_type);
+          },
+          transform: value => {
+            return value === '' ? null : value
           },
           complete: result => {
             debug(`finish reading "${filePath}"`);
@@ -879,7 +882,7 @@ export function ddfCsvReader (logger?: any) {
       const constraints = resource.schema.fields.reduce((result, field) => {
         if (field.constraints?.enum) {
           if (!datasetWithConstraints) datasetWithConstraints = true;
-          result[field.name] = field.constraints.enum.map(e => +e || e);
+          result[field.name] = field.constraints.enum;
         }
         return result;
       }, {});

package/src/file-readers/frontend-file-reader.ts

@@ -1,7 +1,5 @@
 import { IResourceRead } from '../interfaces';
 
-require('fetch-polyfill');
-
 declare var fetch;
 
 export class FrontendFileReader implements IResourceRead {

package/test/definition/datapoints-definition.spec.ts

@@ -232,7 +232,7 @@ describe('Datapoints definition errors in query', () => {
             where: {
               country_code: {
                 $in: [
-                  900
+                  '900'
                 ]
               }
             }

package/test/multi-instances.spec.ts

@@ -187,7 +187,7 @@ function parseYear(resultFixture, concepts = ['year', 'time']) {
   for (const row of resultFixture) {
     for (const concept of concepts) {
       if (row[concept] && typeof row[concept] === 'string') {
-        row[concept] = new Date(Date.UTC(row[concept], 0));
+        row[concept] = new Date(Date.UTC(+row[concept], 0));
       }
     }
   }