1.0.22

fix(core): update
1.0.21
2019-12-15 18:30:47 +00:00 · 2019-12-15 18:30:46 +00:00 · 2019-12-15 18:18:40 +00:00 · 2019-12-15 18:18:39 +00:00 · 2019-12-15 18:15:04 +00:00 · 2019-12-15 18:15:03 +00:00
5 changed files with 203 additions and 68 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
  paths:
    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'

 stages:
- security
- test
- release
- metadata
+  - security
+  - test
+  - release
+  - metadata

 # ====================
 # security stage
@@ -20,17 +20,19 @@ mirror:
  script:
    - npmci git mirror
  tags:
+    - lossless
    - docker
    - notpriv

 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
  stage: security
  script:
    - npmci npm prepare
-    - npmci command npm install -g snyk
    - npmci command npm install --ignore-scripts
    - npmci command snyk test
  tags:
+    - lossless
    - docker
    - notpriv

@@ -38,38 +40,41 @@ snyk:
 # test stage
 # ====================

-testLTS:
+testStable:
  stage: test
  script:
    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm install
    - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
+    - lossless
    - docker
-  - notpriv
+    - priv

 testBuild:
  stage: test
  script:
    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm install
    - npmci command npm run build
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
+    - lossless
    - docker
    - notpriv

 release:
  stage: release
  script:
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm publish
  only:
    - tags
  tags:
+    - lossless
    - docker
    - notpriv

@@ -81,9 +86,11 @@ codequality:
  allow_failure: true
  script:
    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
    - npmci npm install
    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
+    - lossless
    - docker
    - priv

@@ -94,18 +101,20 @@ trigger:
  only:
    - tags
  tags:
+    - lossless
    - docker
    - notpriv

 pages:
-  image: hosttoday/ht-docker-node:npmci
  stage: metadata
  script:
+    - npmci node install lts
    - npmci command npm install -g @gitzone/tsdoc
    - npmci npm prepare
    - npmci npm install
    - npmci command tsdoc
  tags:
+    - lossless
    - docker
    - notpriv
  only:
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,9 +1,29 @@
 {
  "name": "@pushrocks/smartcsv",
-  "version": "1.0.18",
+  "version": "1.0.22",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://verdaccio.lossless.one/@babel%2fcode-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://verdaccio.lossless.one/@babel%2fhighlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
    "@gitzone/tsbuild": {
      "version": "2.1.17",
      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbuild/-/tsbuild-2.1.17.tgz",
@@ -279,9 +299,9 @@
      }
    },
    "@pushrocks/smartstring": {
-      "version": "3.0.14",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.14.tgz",
-      "integrity": "sha512-hN3IwTb5VBUis8Z5U5U6dDCnap6zBmkc9/IVx8lxAbsxl5TYQ4RiYlJ2JM4tih7EdE80ZeSdpprzChYrWmSwDg==",
+      "version": "3.0.17",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.17.tgz",
+      "integrity": "sha512-60JQptpgw+PjxoC5Gx+Y9m3/dtMstHC5ElpdJhIlbJ7dQV7LkCGSonLAG+NZhPbvrhow2KZ3fob8stW0Iuy3JQ==",
      "requires": {
        "crypto-random-string": "^3.0.1",
        "js-base64": "^2.5.1",
@@ -304,21 +324,22 @@
      }
    },
    "@pushrocks/tapbundle": {
-      "version": "3.0.13",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.0.13.tgz",
-      "integrity": "sha512-23O4UMBafCuD+RnUlXNvtT9DGbL1HMD+xZE1Zcr7Ll7WvgxUgRQQfk9kq6qbLLbjaRe1J2Ijsgh1HuZbBaucLQ==",
+      "version": "3.2.0",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.0.tgz",
+      "integrity": "sha512-xnKIGe7NJqxWBaFeKIEXShDjV2wap1XJqmlp3m1MKqmIF62vRpZnkzpyE1ZAoNwiYQmIsXIpvP/PDv+iPevPfw==",
      "dev": true,
      "requires": {
        "@pushrocks/early": "^3.0.3",
        "@pushrocks/smartdelay": "^2.0.3",
+        "@pushrocks/smartfile": "^7.0.6",
        "@pushrocks/smartpromise": "^3.0.2",
        "smartchai": "^2.0.1"
      }
    },
    "@types/chai": {
-      "version": "4.2.3",
-      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.3.tgz",
-      "integrity": "sha512-VRw2xEGbll3ZiTQ4J02/hUjNqZoue1bMhoo2dgM2LXjDdyaq4q80HgBDHwpI0/VKlo4Eg+BavyQMv/NYgTetzA==",
+      "version": "4.2.7",
+      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.7.tgz",
+      "integrity": "sha512-luq8meHGYwvky0O7u0eQZdA7B4Wd9owUCqvbw2m3XCrCU8mplYOujMBbvyS547AxJkC+pGnd0Cm15eNxEUNU8g==",
      "dev": true
    },
    "@types/chai-as-promised": {
@@ -395,9 +416,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "12.7.12",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.7.12.tgz",
-      "integrity": "sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==",
+      "version": "12.12.17",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.12.17.tgz",
+      "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==",
      "dev": true
    },
    "@types/through2": {
@@ -502,6 +523,12 @@
      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
      "dev": true
    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://verdaccio.lossless.one/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
    "camelcase": {
      "version": "5.3.1",
      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -616,6 +643,12 @@
        "delayed-stream": "~1.0.0"
      }
    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://verdaccio.lossless.one/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -724,6 +757,12 @@
      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
      "dev": true
    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://verdaccio.lossless.one/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
    "execa": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -903,6 +942,12 @@
      "resolved": "https://verdaccio.lossless.one/js-base64/-/js-base64-2.5.1.tgz",
      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
    "js-yaml": {
      "version": "3.13.1",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -1033,6 +1078,21 @@
        "brace-expansion": "^1.1.7"
      }
    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://verdaccio.lossless.one/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
    "moment": {
      "version": "2.24.0",
      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
@@ -1208,6 +1268,12 @@
      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
      "dev": true
    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://verdaccio.lossless.one/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
    "pathval": {
      "version": "1.1.0",
      "resolved": "https://verdaccio.lossless.one/pathval/-/pathval-1.1.0.tgz",
@@ -1257,6 +1323,15 @@
      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
      "dev": true
    },
+    "resolve": {
+      "version": "1.13.1",
+      "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.13.1.tgz",
+      "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
    "restore-cursor": {
      "version": "2.0.0",
      "resolved": "https://verdaccio.lossless.one/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -1436,6 +1511,42 @@
      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
      "dev": true
    },
+    "tslint": {
+      "version": "6.0.0-beta0",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-6.0.0-beta0.tgz",
+      "integrity": "sha512-BpLIOM7+as9FLOPmQuTvzZVH6MIZUN1OHh2nD7uh8rOPpidLfNHg4qrdxMBWL9AoTamNftEvafvWzUwuGOo4bw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^4.0.1",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.10.0",
+        "tsutils": "^2.29.0"
+      }
+    },
+    "tslint-config-prettier": {
+      "version": "1.18.0",
+      "resolved": "https://verdaccio.lossless.one/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
+      "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
+      "dev": true
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://verdaccio.lossless.one/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
    "type-detect": {
      "version": "4.0.8",
      "resolved": "https://verdaccio.lossless.one/type-detect/-/type-detect-4.0.8.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartcsv",
-  "version": "1.0.18",
+  "version": "1.0.22",
  "private": false,
  "description": "handle csv data | gitzone standard compliant",
  "main": "dist/index.js",
@@ -17,19 +17,22 @@
    "@gitzone/tsrun": "^1.2.8",
    "@gitzone/tstest": "^1.0.28",
    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.12"
+    "@pushrocks/tapbundle": "^3.2.0",
+    "@types/node": "^12.12.17",
+    "tslint": "^6.0.0-beta0",
+    "tslint-config-prettier": "^1.18.0"
  },
  "dependencies": {
    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartstring": "^3.0.14"
+    "@pushrocks/smartstring": "^3.0.17"
  },
  "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
    "cli.js",
    "npmextra.json",
    "readme.md"
--- a/readme.md
+++ b/readme.md
@@ -18,9 +18,14 @@ handle csv data | gitzone standard compliant

 ## Usage

+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.

 > MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -2,7 +2,7 @@ import * as plugins from './smartcsv.plugins';

 export interface ICsvConstructorOptions {
  headers: boolean;
-  unquote: boolean;
+  unquote?: boolean;
 }

 export class Csv {
@@ -55,6 +55,8 @@ export class Csv {
  public keyFrame: string = null;
  public data: any[];

+  private base64RecognitionPrefix = '####12345####';
+
  public options: ICsvConstructorOptions = {
    headers: true,
    unquote: true
@@ -71,7 +73,7 @@ export class Csv {
      csvStringToParse = csvStringToParse.replace(
        /"(.*?)"/gi,
        (match, p1, offset, originalString) => {
-          return plugins.smartstring.base64.encode(match);
+          return this.base64RecognitionPrefix + plugins.smartstring.base64.encode(match);
        }
      );
    }
@@ -137,8 +139,9 @@ export class Csv {
      this.headers = headerRow.split(this.keyFrame);
      if (this.options.unquote) {
        const unquotedHeaders: string[] = [];
-        for (const header of this.headers) {
-          if (plugins.smartstring.type.isBase64(header)) {
+        for (let header of this.headers) {
+          if (header.startsWith(this.base64RecognitionPrefix)) {
+            header = header.replace(this.base64RecognitionPrefix, '');
            unquotedHeaders.push(plugins.smartstring.base64.decode(header).replace(/['"]+/g, ''));
          } else {
            unquotedHeaders.push(header);
@@ -155,8 +158,12 @@ export class Csv {
    let resultJson: any = {};
    for (let i = 0; i < neededIterations; i++) {
      let value = dataArray[i];
-      if (this.options.unquote && plugins.smartstring.type.isBase64(value)) {
-        value = plugins.smartstring.base64.decode(value).replace(/['"]+/g, '').replace(/['"]+/g, '');
+      if (this.options.unquote && value.startsWith(this.base64RecognitionPrefix)) {
+        value = value.replace(this.base64RecognitionPrefix, '');
+        value = plugins.smartstring.base64
+          .decode(value)
+          .replace(/['"]+/g, '')
+          .replace(/['"]+/g, '');
      }
      resultJson[this.headers[i]] = value;
    }
Author	SHA1	Message	Date
Phil Kunz	ab1c84f41f	1.0.22	2019-12-15 18:30:47 +00:00
Phil Kunz	6f575e8516	fix(core): update	2019-12-15 18:30:46 +00:00
Phil Kunz	d11f237221	1.0.21	2019-12-15 18:18:40 +00:00
Phil Kunz	16826ed337	fix(core): update	2019-12-15 18:18:39 +00:00
Phil Kunz	c49b518b8a	1.0.20	2019-12-15 18:15:04 +00:00
Phil Kunz	5f49532fc2	fix(core): update	2019-12-15 18:15:03 +00:00
Phil Kunz	e7f06a7f44	1.0.19	2019-10-11 15:48:23 +02:00
Phil Kunz	491477da82	fix(core): update	2019-10-11 15:48:23 +02:00