@vizabi/reader-ddfcsv 4.5.3 → 4.5.4

package/test/features-service.spec.ts

@@ -1,95 +1,95 @@
-import * as chai from 'chai';
-import * as compact from 'lodash.compact';
-import { QueryFeature, featureDetectors } from '@vizabi/ddf-query-validator';
-
-const expect = chai.expect;
-const conceptsLookupStub = new Map();
-
-conceptsLookupStub.set('country', {concept: 'country', concept_type: 'entity_set', domain: 'geo'});
-conceptsLookupStub.set('geo', {concept: 'geo', concept_type: 'entity_domain', domain: ''});
-
-describe('Query features', () => {
-  it('when query is appropriate then WhereClauseBasedOnConjunction and ConjunctionPartFromWhereClauseCorrespondsToJoin should be detected', done => {
-    const query = {
-      from: 'datapoints',
-      select: {
-        key: [
-          'country',
-          'time'
-        ],
-        value: [
-          'income_per_person_gdppercapita_ppp_inflation_adjusted',
-          'life_expectancy_years',
-          'population_total'
-        ]
-      },
-      where: {
-        $and: [
-          {
-            country: '$country'
-          }
-        ]
-      },
-      join: {
-        $country: {
-          key: 'country',
-          where: {
-            country: {$in: ['afg']}
-          }
-        }
-      },
-      order_by: [
-        'time'
-      ]
-    };
-
-    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
-
-    expect(relatedFeatures).to.includes(QueryFeature.WhereClauseBasedOnConjunction);
-    expect(relatedFeatures).to.includes(QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
-
-    done();
-  });
-
-  it('when where section does NOT contain $and clause WhereClauseBasedOnConjunction should NOT be detected', done => {
-    const query = {
-      from: 'datapoints',
-      animatable: 'time',
-      select: {
-        key: ['geo', 'time'],
-        value: ['life_expectancy_years', 'income_per_person_gdppercapita_ppp_inflation_adjusted', 'population_total']
-      },
-      where: {
-        time: {$gt: 1800, $lt: 2016}
-      },
-      grouping: {},
-      order_by: ['time', 'geo']
-    };
-
-    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
-
-    expect(relatedFeatures).to.not.includes(QueryFeature.WhereClauseBasedOnConjunction);
-
-    done();
-  });
-
-  it('when query is NOT datapoint based then WhereClauseBasedOnConjunction and ConjunctionPartFromWhereClauseCorrespondsToJoin should NOT be detected', done => {
-    const query = {
-      from: 'entities',
-      animatable: 'time',
-      select: {
-        key: ['geo'],
-        value: ['name', 'world_4region', 'latitude', 'longitude']
-      },
-      where: {'is--country': true},
-      grouping: {},
-      orderBy: null
-    };
-
-    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
-
-    expect(relatedFeatures).to.not.includes(QueryFeature.WhereClauseBasedOnConjunction);
-
-    done();
-  });
-});
+import * as chai from 'chai';
+import compact from 'lodash-es/compact';
+import { QueryFeature, featureDetectors } from '@vizabi/ddf-query-validator';
+
+const expect = chai.expect;
+const conceptsLookupStub = new Map();
+
+conceptsLookupStub.set('country', {concept: 'country', concept_type: 'entity_set', domain: 'geo'});
+conceptsLookupStub.set('geo', {concept: 'geo', concept_type: 'entity_domain', domain: ''});
+
+describe('Query features', () => {
+  it('when query is appropriate then WhereClauseBasedOnConjunction and ConjunctionPartFromWhereClauseCorrespondsToJoin should be detected', done => {
+    const query = {
+      from: 'datapoints',
+      select: {
+        key: [
+          'country',
+          'time'
+        ],
+        value: [
+          'income_per_person_gdppercapita_ppp_inflation_adjusted',
+          'life_expectancy_years',
+          'population_total'
+        ]
+      },
+      where: {
+        $and: [
+          {
+            country: '$country'
+          }
+        ]
+      },
+      join: {
+        $country: {
+          key: 'country',
+          where: {
+            country: {$in: ['afg']}
+          }
+        }
+      },
+      order_by: [
+        'time'
+      ]
+    };
+
+    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
+
+    expect(relatedFeatures).to.includes(QueryFeature.WhereClauseBasedOnConjunction);
+    expect(relatedFeatures).to.includes(QueryFeature.ConjunctionPartFromWhereClauseCorrespondsToJoin);
+
+    done();
+  });
+
+  it('when where section does NOT contain $and clause WhereClauseBasedOnConjunction should NOT be detected', done => {
+    const query = {
+      from: 'datapoints',
+      animatable: 'time',
+      select: {
+        key: ['geo', 'time'],
+        value: ['life_expectancy_years', 'income_per_person_gdppercapita_ppp_inflation_adjusted', 'population_total']
+      },
+      where: {
+        time: {$gt: 1800, $lt: 2016}
+      },
+      grouping: {},
+      order_by: ['time', 'geo']
+    };
+
+    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
+
+    expect(relatedFeatures).to.not.includes(QueryFeature.WhereClauseBasedOnConjunction);
+
+    done();
+  });
+
+  it('when query is NOT datapoint based then WhereClauseBasedOnConjunction and ConjunctionPartFromWhereClauseCorrespondsToJoin should NOT be detected', done => {
+    const query = {
+      from: 'entities',
+      animatable: 'time',
+      select: {
+        key: ['geo'],
+        value: ['name', 'world_4region', 'latitude', 'longitude']
+      },
+      where: {'is--country': true},
+      grouping: {},
+      orderBy: null
+    };
+
+    const relatedFeatures = compact(featureDetectors.map(detector => detector(query, conceptsLookupStub)));
+
+    expect(relatedFeatures).to.not.includes(QueryFeature.WhereClauseBasedOnConjunction);
+
+    done();
+  });
+});

package/tsconfig-web.json

@@ -1,41 +1,41 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es2019",
-    "module": "commonjs",
-    "noImplicitAny": false,
-    "outDir": "./lib-web/src",
-    "preserveConstEnums": true,
-    "removeComments": true,
-    "typeRoots": ["node_modules/@types"],
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "alwaysStrict": true,
-    "sourceMap": true,
-    "noEmitHelpers": true,
-    "importHelpers": true,
-    "strictNullChecks": false,
-    "baseUrl": ".",
-    "paths": {
-      "tslib" : ["node_modules/tslib/tslib.d.ts"]
-    },
-    "lib": [
-      "es2020",
-      "dom"
-    ],
-    "downlevelIteration": true
-  },
-  "include": [
-    "src/index-web.ts"
-  ],
-  "exclude": [
-    "dist",
-    "lib",
-    "lib-web",
-    "node_modules",
-    "**/*.spec.ts",
-    "test/common.ts"
-  ]
-}
+{
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es2020",
+    "module": "ES2020",
+    "noImplicitAny": false,
+    "outDir": "./lib-web/src",
+    "preserveConstEnums": true,
+    "removeComments": true,
+    "typeRoots": ["node_modules/@types"],
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "alwaysStrict": true,
+    "sourceMap": true,
+    "noEmitHelpers": true,
+    "importHelpers": true,
+    "strictNullChecks": false,
+    "baseUrl": ".",
+    "paths": {
+      "tslib" : ["node_modules/tslib/tslib.d.ts"]
+    },
+    "lib": [
+      "es2020",
+      "dom"
+    ],
+    "downlevelIteration": true
+  },
+  "include": [
+    "src/index-web.ts"
+  ],
+  "exclude": [
+    "dist",
+    "lib",
+    "lib-web",
+    "node_modules",
+    "**/*.spec.ts",
+    "test/common.ts"
+  ]
+}

package/tsconfig.json

@@ -1,37 +1,40 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es2017",
-    "module": "commonjs",
-    "noImplicitAny": false,
-    "outDir": "./lib/src",
-    "preserveConstEnums": true,
-    "removeComments": true,
-    "typeRoots": ["node_modules/@types"],
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "alwaysStrict": true,
-    "sourceMap": true,
-    "noEmitHelpers": true,
-    "importHelpers": true,
-    "strictNullChecks": false,
-    "baseUrl": ".",
-    "lib": [
-      "es2020",
-      "dom"
-    ]
-  },
-  "include": [
-    "src/index.ts"
-  ],
-  "exclude": [
-    "dist",
-    "lib",
-    "lib-web",
-    "node_modules",
-    "**/*.spec.ts",
-    "test/common.ts"
-  ]
-}
+{
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es2020",
+    "module": "commonjs",
+    "noImplicitAny": false,
+    "outDir": "./lib/src",
+    "preserveConstEnums": true,
+    "removeComments": true,
+    "typeRoots": ["node_modules/@types"],
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "alwaysStrict": true,
+    "sourceMap": true,
+    "noEmitHelpers": true,
+    "importHelpers": true,
+    "strictNullChecks": false,
+    "baseUrl": ".",
+    "paths": {
+      "tslib" : ["node_modules/tslib/tslib.d.ts"]
+    },
+    "lib": [
+      "es2020",
+      "dom"
+    ]
+  },
+  "include": [
+    "src/index.ts"
+  ],
+  "exclude": [
+    "dist",
+    "lib",
+    "lib-web",
+    "node_modules",
+    "**/*.spec.ts",
+    "test/common.ts"
+  ]
+}

package/.travis.yml

@@ -1,37 +0,0 @@
-language: node_js
-sudo: true
-node_js:
-  - "8.11.2"
-addons:
-  apt:
-    packages:
-    - python-pip
-
-git:
-  submodules: false
-
-before_install:
-  - sudo pip install s3cmd
-  - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
-  - git submodule update --init --remote --recursive
-
-script:
-  - npm run-script test-travis
-  - npm run deploy
-
-deploy:
-  provider: npm
-  email: vyacheslav.chub@valor-software.com
-  api_key:
-    secure: $GITHUB_TOKEN
-  on:
-    branch: develop
-    node: 8.11.2
-    condition: "-e /tmp/deployment.flag"
-
-branches:
-  only:
-  - master
-  - develop
-  - development
-  - stage

package/deploy.js

@@ -1,87 +0,0 @@
-const shell = require('shelljs');
-const cv = require('compare-version');
-const fs = require('fs');
-const path = require('path');
-const rmrf = require('rimraf');
-
-const {
-  TRAVIS_BRANCH,
-  AWS_BUCKET,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_KEY,
-  AWS_SUBFOLDER
-} = process.env;
-
-const projectDir = process.cwd();
-const pjson = require(path.join(projectDir, 'package.json'));
-const oldPjson = JSON.parse(shell.exec("git show HEAD~1:package.json").stdout);
-const lastPublishedVersion = shell.exec("npm show " + pjson.name + " version").stdout.trim();
-const versionBump = cv(oldPjson.version, pjson.version) < 0;
-
-const bump = () => {
-  if (TRAVIS_BRANCH !== "develop") {
-    return console.log("--- Not publishing.");
-  }
-
-  const FLAGFILE = "/tmp/deployment.flag";
-  fs.writeFileSync(FLAGFILE);
-
-  console.log("--- Latest published version: ", lastPublishedVersion);
-  console.log("--- Previous package.json version: ", oldPjson.version);
-  console.log("--- Current package.json version: ", pjson.version);
-
-  console.log("===== Bumped version:", versionBump);
-
-  if (!versionBump) {
-    console.log("--- Publishing...");
-    pjson.version = lastPublishedVersion;
-    fs.writeFileSync(path.join(projectDir, 'package.json'), JSON.stringify(pjson, null, 2));
-    shell.exec("git add package.json");
-    shell.exec("git config --global user.name travis");
-    shell.exec("git config --global user.email travis@example.com");
-    shell.exec("git commit --amend -C $(git rev-parse --verify HEAD)");
-    shell.exec("npm version --no-git-tag-version prerelease");
-    shell.exec("git status");
-    shell.exec("git add package.json");
-    shell.exec("git commit --amend -C $(git rev-parse --verify HEAD)");
-    // need rebuild after version bump so that the published vizabi is self-aware of its version
-    shell.exec("npm run build");
-  }
-};
-
-const upload = (path) => {
-  shell.exec(
-    `s3cmd -v --config=/tmp/.${AWS_BUCKET}-s3.s3cfg` +
-    ` --acl-public` +
-    ` --recursive` +
-    ` --no-mime-magic` +
-    ` --guess-mime-type` +
-    ` sync dist/reader-ddfcsv.js "${path}"`
-  );
-
-  shell.exec(
-    `s3cmd -v --config=/tmp/.${AWS_BUCKET}-s3.s3cfg` +
-    ` --acl-public` +
-    ` --recursive` +
-    ` --no-mime-magic` +
-    ` --guess-mime-type` +
-    ` sync dist/reader-ddfcsv.js.map "${path}"`
-  );
-};
-
-const deploy = () => {
-  shell.ShellString([
-    '[default]',
-    `access_key = ${AWS_ACCESS_KEY_ID}`,
-    `secret_key = ${AWS_SECRET_KEY}`,
-    `acl_public = True`
-  ].join('\n')).to(`/tmp/.${AWS_BUCKET}-s3.s3cfg`);
-
-  upload(`s3://${AWS_BUCKET}/${AWS_SUBFOLDER}/${TRAVIS_BRANCH}/`);
-  versionBump && upload(`s3://${AWS_BUCKET}/`);
-
-  rmrf.sync('/.tmp');
-};
-
-deploy();
-bump();