@vizabi/reader-ddfcsv 4.3.11 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizabi/reader-ddfcsv",
-  "version": "4.3.11",
+  "version": "4.5.0",
   "description": "Vizabi DDFcsv reader",
   "author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
   "license": "GPL-3.0",
@@ -28,14 +28,9 @@
     "test-travis": "npm run e2e && nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "test-schema": "mocha --require ts-node/register --recursive test/schema.spec.ts",
     "set-own-version": "cd scripts && node ./set-own-version.js",
-    "changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
-    "github-release": "conventional-github-releaser -p angular",
     "build": "npm run build:web && rimraf lib && npm run build:node",
     "build:node": "npm run tsc-node",
     "build:web": "npm run tsc-web && npm run webpack",
-    "preversion": "npm run build",
-    "version": "npm run changelog && git add CHANGELOG.md",
-    "postversion": "git push origin master && git push --tags && npm run github-release",
     "prepublish": "npm run build",
     "deploy": "node deploy.js"
   },
@@ -110,9 +105,6 @@
     "codecov": "3.0.4",
     "compare-version": "0.1.2",
     "compression-webpack-plugin": "1.1.11",
-    "conventional-changelog": "1.1.3",
-    "conventional-changelog-cli": "1.3.1",
-    "conventional-github-releaser": "1.1.9",
     "copy-webpack-plugin": "4.5.2",
     "html-webpack-plugin": "3.2.0",
     "mocha": "5.2.0",

package/src/ddf-csv.ts

@@ -43,6 +43,10 @@ export function ddfCsvReader (logger?: any) {
   let datapackagePromise;
   let datasetWithConstraints = false;
 
+  function getDatasetInfo(baseOptions: IBaseReaderOptions) : Promise<Object> {
+    return (datapackagePromise || loadDataPackage(baseOptions));
+  }
+
   function loadDataPackage (baseOptions: IBaseReaderOptions): Promise<IDatapackage> {
     const datapackagePath = getFilePath(baseOptions.basePath);
     const { debug, error } = baseOptions.diagnostic.prepareDiagnosticFor('loadDataPackage');
@@ -847,7 +851,7 @@ export function ddfCsvReader (logger?: any) {
             // skip parsing time/string concept types
             const concept: any = options.conceptsLookup.get(headerName) || {};
 
-            return !includes([ 'time', 'string' ], concept.concept_type);
+            return !includes([ 'time', 'string', 'entity_domain', 'entity_set' ], concept.concept_type);
           },
           complete: result => {
             debug(`finish reading "${filePath}"`);
@@ -914,6 +918,7 @@ export function ddfCsvReader (logger?: any) {
   return {
     query,
     queryData,
-    loadFile
+    loadFile,
+    getDatasetInfo
   };
 }

package/src/ddfcsv-reader.ts

@@ -31,8 +31,15 @@ export function prepareDDFCsvReaderObject (defaultResourceReader?: IResourceRead
         this.reader = ddfCsvReader(this.logger);
       },
 
-      getDatasetInfo(): Object {
-        return {name: this._basePath.slice(this._basePath.indexOf('ddf--'))};
+      async getDatasetInfo(): Promise<Object> {
+        const diagnostic = createDiagnosticManagerOn(myName, myVersion).forRequest('').withSeverityLevel(Level.OFF);
+        const baseOptions = Object.assign({}, this.readerOptions, { diagnostic });
+        return this.reader.getDatasetInfo(baseOptions).then(dataPackage => {
+          const datasetInfo = Object.assign({}, dataPackage);
+          delete datasetInfo.ddfSchema;
+          delete datasetInfo.resources;
+          return datasetInfo;
+        });
       },
 
       async checkFile(path: string): Promise<any> {