1.0.14

fix(structure): cleanup
1.0.13
2019-02-20 23:18:21 +01:00 · 2019-02-20 23:18:20 +01:00 · 2019-02-20 00:40:32 +01:00 · 2019-02-20 00:40:31 +01:00 · 2019-02-19 01:10:56 +01:00 · 2019-02-19 01:10:56 +01:00
16 changed files with 1905 additions and 509 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,63 +1,150 @@
 # gitzone standard
-image: hosttoday/ht-docker-node:npmts
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"

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

-testLEGACY:
-  stage: test
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
  script:
-    - npmci test legacy
-  coverage: /\d+.?\d+?\%\s*coverage/
+  - npmci git mirror
  tags:
-    - docker
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
+# ====================
+# test stage
+# ====================

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

 release:
  stage: release
  script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
  only:
-    - tags
+  - tags
  tags:
-    - docker
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv

 trigger:
-  stage: trigger
+  stage: metadata
  script:
-    - npmci trigger
+  - npmci trigger
  only:
-    - tags
+  - tags
  tags:
-    - docker
+  - docker
+  - notpriv

 pages:
-  image: hosttoday/ht-docker-node:npmpage
-  stage: pages
+  image: hosttoday/ht-docker-node:npmci
+  stage: metadata
  script:
-    - npmci command npmpage --publish gitlab
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+  tags:
+    - docker
+    - notpriv
  only:
    - tags
  artifacts:
    expire_in: 1 week
    paths:
    - public
+  allow_failure: true
--- a/README.md
+++ b/README.md
@ -1,24 +1,24 @@
-# smartstream
-simplifies access to node streams, TypeScript ready!
+# @pushrocks/smartstream
+simplifies access to node streams

-## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartstream)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/smartstream)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartstream)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartstream/gitbook)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartstream)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartstream)
+* [github.com (source mirror)](https://github.com/pushrocks/smartstream)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartstream/)

 ## Status for master
 [![build status](https://gitlab.com/pushrocks/smartstream/badges/master/build.svg)](https://gitlab.com/pushrocks/smartstream/commits/master)
 [![coverage report](https://gitlab.com/pushrocks/smartstream/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartstream/commits/master)
-[![Dependency Status](https://david-dm.org/pushrocks/smartstream.svg)](https://david-dm.org/pushrocks/smartstream)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartstream/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartstream/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartstream/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartstream)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartstream.svg)](https://www.npmjs.com/package/@pushrocks/smartstream)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartstream/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartstream)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)

 ## Usage
-We recommend the use of TypeScript for best in class intellisense support.
+
+Use TypeScript for best in class instellisense.

 ```typescript
 import { Smartstream } from 'smartstream'
@ -35,3 +35,9 @@ myStream.onCustomEvent('myeventname', (args...) => { /* Do something */ }) // em
 mySmartstream.run().then(() => {/* do something when stream is finished */})
 ```

+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)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@ -1,38 +0,0 @@
-/// <reference types="q" />
-import * as plugins from './smartstream.plugins';
-export interface IErrorFunction {
-    (err: any): any;
-}
-export interface ICustomEventFunction {
-    (): any;
-}
-export interface ICustomEventObject {
-    eventName: string;
-    eventFunction: ICustomEventFunction;
-}
-/**
- * class Smartstream handles
- */
-export declare class Smartstream {
-    private streamArray;
-    private customEventObjectArray;
-    private streamStartedDeferred;
-    /**
-     * constructor
-     */
-    constructor(streamArrayArg: any[]);
-    /**
-     * make something with the stream itself
-     */
-    streamStarted(): plugins.q.Promise<any>;
-    /**
-     * attach listener to custom event
-     */
-    onCustomEvent(eventNameArg: string, eventFunctionArg: ICustomEventFunction): void;
-    /**
-     * run the stream
-     * @returns Promise
-     */
-    run(): plugins.q.Promise<void>;
-}
-export declare let cleanPipe: () => void;
--- a/dist/index.js
+++ b/dist/index.js
@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartstream.plugins");
-/**
- * class Smartstream handles
- */
-class Smartstream {
-    /**
-     * constructor
-     */
-    constructor(streamArrayArg) {
-        this.streamArray = [];
-        this.customEventObjectArray = [];
-        this.streamStartedDeferred = plugins.q.defer();
-        this.streamArray = streamArrayArg;
-    }
-    /**
-     * make something with the stream itself
-     */
-    streamStarted() {
-        return this.streamStartedDeferred.promise;
-    }
-    /**
-     * attach listener to custom event
-     */
-    onCustomEvent(eventNameArg, eventFunctionArg) {
-        this.customEventObjectArray.push({
-            eventName: eventNameArg,
-            eventFunction: eventFunctionArg
-        });
-    }
-    /**
-     * run the stream
-     * @returns Promise
-     */
-    run() {
-        let done = plugins.q.defer();
-        // clone Array
-        let streamExecutionArray = [];
-        for (let streamItem of this.streamArray) {
-            streamExecutionArray.push(streamItem);
-        }
-        // combine the stream
-        let finalStream = null;
-        let firstIteration = true;
-        for (let stream of streamExecutionArray) {
-            if (firstIteration === true) {
-                finalStream = stream;
-            }
-            stream.on('error', (err) => {
-                done.reject(err);
-            });
-            for (let customEventObject of this.customEventObjectArray) {
-                stream.on(customEventObject.eventName, customEventObject.eventFunction);
-            }
-            if (!firstIteration) {
-                finalStream = finalStream.pipe(stream);
-            }
-            firstIteration = false;
-        }
-        this.streamStartedDeferred.resolve();
-        finalStream.on('end', function () {
-            done.resolve();
-        });
-        finalStream.on('close', function () {
-            done.resolve();
-        });
-        finalStream.on('finish', function () {
-            done.resolve();
-        });
-        return done.promise;
-    }
-}
-exports.Smartstream = Smartstream;
-exports.cleanPipe = () => {
-    plugins.through2.obj((file, enc, cb) => {
-        cb();
-    }, (cb) => {
-        cb();
-    });
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlEQUFnRDtBQWVoRDs7R0FFRztBQUNIO0lBS0U7O09BRUc7SUFDSCxZQUFZLGNBQXFCO1FBUHpCLGdCQUFXLEdBQUcsRUFBRSxDQUFBO1FBQ2hCLDJCQUFzQixHQUF5QixFQUFFLENBQUE7UUFDakQsMEJBQXFCLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQU0vQyxJQUFJLENBQUMsV0FBVyxHQUFHLGNBQWMsQ0FBQTtJQUNuQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxhQUFhO1FBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUE7SUFDM0MsQ0FBQztJQUVEOztPQUVHO0lBQ0gsYUFBYSxDQUFDLFlBQW9CLEVBQUUsZ0JBQXNDO1FBQ3hFLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLENBQUM7WUFDL0IsU0FBUyxFQUFFLFlBQVk7WUFDdkIsYUFBYSxFQUFFLGdCQUFnQjtTQUNoQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsR0FBRztRQUNELElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUE7UUFFbEMsY0FBYztRQUNkLElBQUksb0JBQW9CLEdBQUcsRUFBRSxDQUFBO1FBQzdCLEdBQUcsQ0FBQyxDQUFDLElBQUksVUFBVSxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQUMsQ0FBQztRQUVsRixxQkFBcUI7UUFDckIsSUFBSSxXQUFXLEdBQUcsSUFBSSxDQUFBO1FBQ3RCLElBQUksY0FBYyxHQUFZLElBQUksQ0FBQTtRQUNsQyxHQUFHLENBQUMsQ0FBQyxJQUFJLE1BQU0sSUFBSSxvQkFBb0IsQ0FBQyxDQUFDLENBQUM7WUFDeEMsRUFBRSxDQUFDLENBQUMsY0FBYyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQzVCLFdBQVcsR0FBRyxNQUFNLENBQUE7WUFDdEIsQ0FBQztZQUNELE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBRztnQkFDckIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNsQixDQUFDLENBQUMsQ0FBQTtZQUNGLEdBQUcsQ0FBQyxDQUFDLElBQUksaUJBQWlCLElBQUksSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQztnQkFDMUQsTUFBTSxDQUFDLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUMsYUFBYSxDQUFDLENBQUE7WUFDekUsQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDcEIsV0FBVyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDeEMsQ0FBQztZQUNELGNBQWMsR0FBRyxLQUFLLENBQUE7UUFDeEIsQ0FBQztRQUVELElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUVwQyxXQUFXLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRTtZQUNwQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7UUFDRixXQUFXLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRTtZQUN0QixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7UUFDRixXQUFXLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUN2QixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0NBQ0Y7QUF4RUQsa0NBd0VDO0FBRVUsUUFBQSxTQUFTLEdBQUc7SUFDckIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQ2xCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osRUFBRSxFQUFFLENBQUE7SUFDTixDQUFDLEVBQ0QsQ0FBQyxFQUFFO1FBQ0QsRUFBRSxFQUFFLENBQUE7SUFDTixDQUFDLENBQ0YsQ0FBQTtBQUNILENBQUMsQ0FBQSJ9
--- a/dist/smartstream.plugins.d.ts
+++ b/dist/smartstream.plugins.d.ts
@ -1,3 +0,0 @@
-import 'typings-global';
-export import q = require('q');
-export import through2 = require('through2');
--- a/dist/smartstream.plugins.js
+++ b/dist/smartstream.plugins.js
@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-global");
-exports.q = require("q");
-exports.through2 = require("through2");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJlYW0ucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c3RyZWFtLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwQkFBdUI7QUFDdkIseUJBQThCO0FBQzlCLHVDQUE0QyJ9
--- a/npmextra.json
+++ b/npmextra.json
@ -1,7 +1,16 @@
 {
  "npmci": {
-    "globalNpmTools": [
-      "npmts"
-    ]
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartstream",
+      "shortDescription": "simplifies access to node streams",
+      "npmPackagename": "@pushrocks/smartstream",
+      "license": "MIT"
+    }
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,11 +1,13 @@
 {
-  "name": "smartstream",
-  "version": "1.0.7",
-  "description": "simplifies access to node streams, TypeScript ready!",
+  "name": "@pushrocks/smartstream",
+  "version": "1.0.14",
+  "private": false,
+  "description": "simplifies access to node streams",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
  },
  "repository": {
    "type": "git",
@ -18,16 +20,15 @@
  },
  "homepage": "https://gitlab.com/pushrocks/smartstream#README",
  "devDependencies": {
-    "@types/should": "^8.1.30",
-    "npmts-g": "^6.0.0",
-    "should": "^11.2.0",
-    "typings-test": "^1.0.3"
+    "@gitzone/tsbuild": "^2.1.8",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "tslint": "^5.12.1",
+    "tslint-config-prettier": "^1.18.0"
  },
  "dependencies": {
-    "@types/q": "0.x.x",
-    "@types/through2": "^2.0.32",
-    "q": "^1.4.1",
-    "through2": "^2.0.3",
-    "typings-global": "^1.0.14"
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@types/through2": "^2.0.34",
+    "through2": "^3.0.0"
  }
 }
--- a/test/test.d.ts
+++ b/test/test.d.ts
@ -1 +0,0 @@
-import 'typings-test';
--- a/test/test.js
+++ b/test/test.js
@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-test");
-const fs = require("fs");
-const smartstream = require("../dist/index");
-let testSmartstream;
-describe('smartstream', function () {
-    it('should combine a stream', function (done) {
-        this.timeout(5000);
-        testSmartstream = new smartstream.Smartstream([
-            fs.createReadStream('./test/assets/test.md'),
-            fs.createWriteStream('./test/assets/testCopy.md')
-        ]);
-        testSmartstream.run().then(() => {
-            done();
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFDckIseUJBQXlCO0FBR3pCLDZDQUE0QztBQUU1QyxJQUFJLGVBQXdDLENBQUE7QUFFNUMsUUFBUSxDQUFDLGFBQWEsRUFBRTtJQUNwQixFQUFFLENBQUMseUJBQXlCLEVBQUUsVUFBUyxJQUFJO1FBQ3ZDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDbEIsZUFBZSxHQUFHLElBQUksV0FBVyxDQUFDLFdBQVcsQ0FBQztZQUMxQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsdUJBQXVCLENBQUM7WUFDNUMsRUFBRSxDQUFDLGlCQUFpQixDQUFDLDJCQUEyQixDQUFDO1NBQ3BELENBQUMsQ0FBQTtRQUNGLGVBQWUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdkIsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==
--- a/test/test.ts
+++ b/test/test.ts
@ -1,20 +1,15 @@
-import 'typings-test'
-import fs = require('fs')
-import * as should from 'should'
+import fs = require('fs');
+import { expect, tap } from '@pushrocks/tapbundle';

-import * as smartstream from '../dist/index'
+import * as smartstream from '../ts/index';

-let testSmartstream: smartstream.Smartstream
+let testSmartstream: smartstream.Smartstream;
+tap.test('should combine a stream', async () => {
+  testSmartstream = new smartstream.Smartstream([
+    fs.createReadStream('./test/assets/test.md'),
+    fs.createWriteStream('./test/assets/testCopy.md')
+  ]);
+  await testSmartstream.run();
+});

-describe('smartstream', function() {
-    it('should combine a stream', function(done){
-        this.timeout(5000)
-        testSmartstream = new smartstream.Smartstream([
-            fs.createReadStream('./test/assets/test.md'),
-            fs.createWriteStream('./test/assets/testCopy.md')
-        ])
-        testSmartstream.run().then(() => {
-            done()
-        })
-    })
-})
+tap.start();
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,38 +1,41 @@
-import * as plugins from './smartstream.plugins'
+import * as plugins from './smartstream.plugins';
+
+// interfaces
+import { Transform } from 'stream';

 export interface IErrorFunction {
-  (err): any
+  (err): any;
 }

 export interface ICustomEventFunction {
-  (): any
+  (): any;
 }

 export interface ICustomEventObject {
-  eventName: string
-  eventFunction: ICustomEventFunction
+  eventName: string;
+  eventFunction: ICustomEventFunction;
 }

 /**
- * class Smartstream handles 
+ * class Smartstream handles
 */
 export class Smartstream {
-  private streamArray = []
-  private customEventObjectArray: ICustomEventObject[] = []
-  private streamStartedDeferred = plugins.q.defer()
+  private streamArray = [];
+  private customEventObjectArray: ICustomEventObject[] = [];
+  private streamStartedDeferred = plugins.smartpromise.defer();

  /**
   * constructor
   */
  constructor(streamArrayArg: any[]) {
-    this.streamArray = streamArrayArg
+    this.streamArray = streamArrayArg;
  }

  /**
   * make something with the stream itself
   */
-  streamStarted(): plugins.q.Promise<any> {
-    return this.streamStartedDeferred.promise
+  streamStarted(): Promise<any> {
+    return this.streamStartedDeferred.promise;
  }

  /**
@ -42,61 +45,63 @@ export class Smartstream {
    this.customEventObjectArray.push({
      eventName: eventNameArg,
      eventFunction: eventFunctionArg
-    })
+    });
  }

  /**
   * run the stream
   * @returns Promise
   */
-  run(): plugins.q.Promise<void> {
-    let done = plugins.q.defer<void>()
+  run(): Promise<void> {
+    const done = plugins.smartpromise.defer<void>();

    // clone Array
-    let streamExecutionArray = []
-    for (let streamItem of this.streamArray) { streamExecutionArray.push(streamItem) }
-
-    // combine the stream
-    let finalStream = null
-    let firstIteration: boolean = true
-    for (let stream of streamExecutionArray) {
-      if (firstIteration === true) {
-        finalStream = stream
-      }
-      stream.on('error', (err) => {
-        done.reject(err)
-      })
-      for (let customEventObject of this.customEventObjectArray) {
-        stream.on(customEventObject.eventName, customEventObject.eventFunction)
-      }
-      if (!firstIteration) {
-        finalStream = finalStream.pipe(stream)
-      }
-      firstIteration = false
+    const streamExecutionArray = [];
+    for (const streamItem of this.streamArray) {
+      streamExecutionArray.push(streamItem);
    }

-    this.streamStartedDeferred.resolve()
+    // combine the stream
+    let finalStream = null;
+    let firstIteration: boolean = true;
+    for (const stream of streamExecutionArray) {
+      if (firstIteration === true) {
+        finalStream = stream;
+      }
+      stream.on('error', err => {
+        done.reject(err);
+      });
+      for (const customEventObject of this.customEventObjectArray) {
+        stream.on(customEventObject.eventName, customEventObject.eventFunction);
+      }
+      if (!firstIteration) {
+        finalStream = finalStream.pipe(stream);
+      }
+      firstIteration = false;
+    }

-    finalStream.on('end', function () {
-      done.resolve()
-    })
-    finalStream.on('close', function () {
-      done.resolve()
-    })
-    finalStream.on('finish', function () {
-      done.resolve()
-    })
-    return done.promise
+    this.streamStartedDeferred.resolve();
+
+    finalStream.on('end', () => {
+      done.resolve();
+    });
+    finalStream.on('close', () => {
+      done.resolve();
+    });
+    finalStream.on('finish', () => {
+      done.resolve();
+    });
+    return done.promise;
  }
 }

 export let cleanPipe = () => {
-  plugins.through2.obj(
+  return plugins.through2.obj(
    (file, enc, cb) => {
-      cb()
+      cb();
    },
-    (cb) => {
-      cb()
+    cb => {
+      cb();
    }
-  )
-}
+  );
+};
--- a/ts/smartstream.plugins.ts
+++ b/ts/smartstream.plugins.ts
@ -1,3 +1,4 @@
-import 'typings-global'
-export import q = require('q')
-export import through2 = require('through2')
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as through2 from 'through2';
+
+export { smartpromise, through2 };
--- a/tslint.json
+++ b/tslint.json
@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -1,236 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/mocha@^2.2.31":
-  version "2.2.39"
-  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829"
-
-"@types/node@*":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7"
-
-"@types/q@0.x.x":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-
-"@types/shelljs@^0.3.33":
-  version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.3.33.tgz#df613bddb88225ed09ce5c835f620dcaaf155e6b"
-  dependencies:
-    "@types/node" "*"
-
-"@types/should@^8.1.30":
-  version "8.1.30"
-  resolved "https://registry.yarnpkg.com/@types/should/-/should-8.1.30.tgz#e6b4f3ca4fb0799f6ce3303f3a8c003df6585aa3"
-
-"@types/through2@^2.0.32":
-  version "2.0.32"
-  resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.32.tgz#470024450f1ab7640f19f9ebf42d3da574c26129"
-  dependencies:
-    "@types/node" "*"
-
-balanced-match@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-glob@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-npmts-g@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/npmts-g/-/npmts-g-6.0.0.tgz#491fd50f110967f1b68f14237e7ea5157bf4ddb3"
-  dependencies:
-    "@types/shelljs" "^0.3.33"
-    semver "^5.3.0"
-    shelljs "^0.7.5"
-    typings-global "^1.0.14"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-q@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
-readable-stream@^2.1.5:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-resolve@^1.1.6:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
-  dependencies:
-    path-parse "^1.0.5"
-
-semver@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-shelljs@^0.7.4, shelljs@^0.7.5:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-should-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-1.0.1.tgz#0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"
-  dependencies:
-    should-type "^1.0.0"
-
-should-format@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1"
-  dependencies:
-    should-type "^1.3.0"
-    should-type-adaptors "^1.0.1"
-
-should-type-adaptors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz#efe5553cdf68cff66e5c5f51b712dc351c77beaa"
-  dependencies:
-    should-type "^1.3.0"
-    should-util "^1.0.0"
-
-should-type@^1.0.0, should-type@^1.3.0, should-type@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3"
-
-should-util@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.0.tgz#c98cda374aa6b190df8ba87c9889c2b4db620063"
-
-should@^11.2.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/should/-/should-11.2.0.tgz#7afca3182c234781d786d2278a87805b5ecf0409"
-  dependencies:
-    should-equal "^1.0.0"
-    should-format "^3.0.2"
-    should-type "^1.4.0"
-    should-type-adaptors "^1.0.1"
-    should-util "^1.0.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-through2@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-typings-global@*, typings-global@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.14.tgz#ab682720a03d6b9278869fb5c30c30d7dc61d12c"
-  dependencies:
-    semver "^5.3.0"
-    shelljs "^0.7.4"
-
-typings-test@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typings-test/-/typings-test-1.0.3.tgz#fbab895eb3f0c44842e73db059f65946b971e369"
-  dependencies:
-    "@types/mocha" "^2.2.31"
-    typings-global "*"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
Author	SHA1	Message	Date
Phil Kunz	01f4a53b5b	1.0.14	2019-02-20 23:18:21 +01:00
Phil Kunz	f42b77986f	fix(structure): cleanup	2019-02-20 23:18:20 +01:00
Phil Kunz	b7ef295757	1.0.13	2019-02-20 00:40:32 +01:00
Phil Kunz	2818420ee9	fix(docs): update	2019-02-20 00:40:31 +01:00
Phil Kunz	d759e2a562	1.0.12	2019-02-19 01:10:56 +01:00
Phil Kunz	65a97c9ee0	fix(core): update	2019-02-19 01:10:56 +01:00
Phil Kunz	b036bfcb92	1.0.11	2017-07-07 02:46:22 +02:00
Phil Kunz	c0304d1d10	update README	2017-07-07 02:46:20 +02:00
Phil Kunz	26880f9b71	1.0.10	2017-06-30 18:37:51 +02:00
Phil Kunz	aa7c30a096	update ci	2017-06-30 18:37:48 +02:00
Phil Kunz	083673f02c	1.0.9	2017-06-30 18:32:34 +02:00
Phil Kunz	93bcc03e72	update smartstream	2017-06-30 18:32:32 +02:00
Phil Kunz	f8b79710be	1.0.8	2017-03-04 14:26:10 +01:00
Phil Kunz	addf20995a	fix cleanPipe()	2017-03-04 14:26:10 +01:00