1.0.21

.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:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartcsv",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -279,9 +279,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 +304,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 +396,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": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartcsv",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "private": false,
   "description": "handle csv data | gitzone standard compliant",
   "main": "dist/index.js",
@@ -17,19 +17,20 @@
     "@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"
   },
   "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"

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 | **©** [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)

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;
     }