4.1.9

fix smartfile.fs.fileTreeToObject

See merge request !1

.gitlab-ci.yml

@@ -1,4 +1,10 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
 
 stages:
 - test
@@ -10,6 +16,7 @@ testLEGACY:
   stage: test
   script:
     - npmci test legacy
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
   allow_failure: true
@@ -18,6 +25,7 @@ testLTS:
   stage: test
   script:
     - npmci test lts
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
     
@@ -25,6 +33,7 @@ testSTABLE:
   stage: test
   script:
     - npmci test stable
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
 

README.md

@@ -2,10 +2,10 @@
 make files easily accessible for processing in javascript.
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartfile)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/smartfile)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartfile)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartfile/)
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartfile)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/smartfile)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartfile)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartfile/)
 
 ## Status for master
 [![build status](https://gitlab.com/pushrocks/smartfile/badges/master/build.svg)](https://gitlab.com/pushrocks/smartfile/commits/master)
@@ -31,6 +31,8 @@ remote | gets data from remote locations to somewhere
 interpreter | (object) handles yaml and json
 smartfile | (class) a virtual representation of a file, alternative to vinyl file format
 
-For more information read the docs
+For further information read the linked docs at the top of this README.
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 const SmartfileFs = require("./smartfile.fs");
 const SmartfileInterpreter = require("./smartfile.interpreter");
@@ -11,4 +12,4 @@ exports.interpreter = SmartfileInterpreter;
 exports.memory = SmartfileMemory;
 exports.remote = SmartfileRemote;
 exports.requireReload = SmartfileFs.requireReload;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBR3ZCLDhDQUE2QztBQUM3QyxnRUFBK0Q7QUFDL0Qsc0RBQXFEO0FBQ3JELHNEQUFxRDtBQUVyRCw2RUFBdUQ7QUFBL0Msa0RBQUEsU0FBUyxDQUFBO0FBRU4sUUFBQSxFQUFFLEdBQUcsV0FBVyxDQUFBO0FBQ2hCLFFBQUEsV0FBVyxHQUFHLG9CQUFvQixDQUFBO0FBQ2xDLFFBQUEsTUFBTSxHQUFHLGVBQWUsQ0FBQTtBQUN4QixRQUFBLE1BQU0sR0FBRyxlQUFlLENBQUE7QUFDeEIsUUFBQSxhQUFhLEdBQUcsV0FBVyxDQUFDLGFBQWEsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUd2Qiw4Q0FBNkM7QUFDN0MsZ0VBQStEO0FBQy9ELHNEQUFxRDtBQUNyRCxzREFBcUQ7QUFFckQsNkVBQXVEO0FBQS9DLGtEQUFBLFNBQVMsQ0FBQTtBQUVOLFFBQUEsRUFBRSxHQUFHLFdBQVcsQ0FBQTtBQUNoQixRQUFBLFdBQVcsR0FBRyxvQkFBb0IsQ0FBQTtBQUNsQyxRQUFBLE1BQU0sR0FBRyxlQUFlLENBQUE7QUFDeEIsUUFBQSxNQUFNLEdBQUcsZUFBZSxDQUFBO0FBQ3hCLFFBQUEsYUFBYSxHQUFHLFdBQVcsQ0FBQyxhQUFhLENBQUEifQ==

dist/smartfile.classes.smartfile.d.ts

@@ -1,3 +1,16 @@
-export declare class Smartfile {
-    constructor();
+/// <reference types="node" />
+export interface ISmartfileConstructorOptions {
+    path?: string;
+    contentsString?: string;
+    contentBuffer?: Buffer;
+}
+export declare class Smartfile {
+    path: string;
+    contents: Buffer;
+    constructor(optionsArg: ISmartfileConstructorOptions);
+    /**
+     * set contents from string
+     * @param contentString
+     */
+    setContentFromString(contentString: string): void;
 }

dist/smartfile.classes.smartfile.js

@@ -1,7 +1,22 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Smartfile {
-    constructor() {
+    constructor(optionsArg) {
+        if (optionsArg.contentBuffer) {
+            this.contents = optionsArg.contentBuffer;
+        }
+        else if (optionsArg.contentsString) {
+            this.contents = new Buffer(optionsArg.contentsString);
+        }
+        this.path = optionsArg.path;
+    }
+    /**
+     * set contents from string
+     * @param contentString
+     */
+    setContentFromString(contentString) {
+        this.contents = new Buffer(contentString);
     }
 }
 exports.Smartfile = Smartfile;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtJQUNJO0lBRUEsQ0FBQztDQUNKO0FBSkQsOEJBSUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBUUE7SUFHRSxZQUFZLFVBQXdDO1FBQ2xELEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQTtRQUMxQyxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQSxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ3ZELENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUE7SUFDN0IsQ0FBQztJQUVEOzs7T0FHRztJQUNILG9CQUFvQixDQUFDLGFBQXFCO1FBQ3hDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDM0MsQ0FBQztDQUNGO0FBbkJELDhCQW1CQyJ9

dist/smartfile.fs.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="q" />
 import 'typings-global';
-import plugins = require('./smartfile.plugins');
+import { Smartfile } from './smartfile.classes.smartfile';
 /**
  *
  * @param filePath
@@ -12,7 +11,7 @@ export declare let fileExistsSync: (filePath: any) => boolean;
  * @param filePath
  * @returns {any}
  */
-export declare let fileExists: (filePath: any) => plugins.q.Promise<{}>;
+export declare let fileExists: (filePath: any) => Promise<{}>;
 /**
  * Checks if given path points to an existing directory
  */
@@ -24,7 +23,7 @@ export declare let isFile: (pathArg: any) => boolean;
 /**
  * copies a file from A to B on the local disk
  */
-export declare let copy: (fromArg: string, toArg: string) => plugins.q.Promise<{}>;
+export declare let copy: (fromArg: string, toArg: string) => Promise<{}>;
 /**
  * copies a file SYNCHRONOUSLY from A to B on the local disk
  */
@@ -32,7 +31,7 @@ export declare let copySync: (fromArg: string, toArg: string) => boolean;
 /**
  * ensures that a directory is in place
  */
-export declare let ensureDir: (dirPathArg: string) => plugins.q.Promise<{}>;
+export declare let ensureDir: (dirPathArg: string) => Promise<{}>;
 /**
  * ensures that a directory is in place
  */
@@ -41,7 +40,7 @@ export declare let ensureDirSync: (dirPathArg: string) => void;
  * ensure an empty directory
  * @executes ASYNC
  */
-export declare let ensureEmptyDir: (dirPathArg: string) => plugins.q.Promise<{}>;
+export declare let ensureEmptyDir: (dirPathArg: string) => Promise<{}>;
 /**
  * ensure an empty directory
  * @executes SYNC
@@ -54,7 +53,7 @@ export declare let ensureEmptyDirSync: (dirPathArg: string) => void;
  * @returns Promise<void>
  * @exec ASYNC
  */
-export declare let ensureFile: (filePathArg: any, initFileStringArg: any) => plugins.q.Promise<void>;
+export declare let ensureFile: (filePathArg: any, initFileStringArg: any) => Promise<void>;
 /**
  * ensures that a file is on disk
  * @param filePath the filePath to ensureDir
@@ -66,7 +65,7 @@ export declare let ensureFileSync: (filePathArg: string, initFileStringArg: stri
 /**
  * removes a file or folder from local disk
  */
-export declare let remove: (pathArg: string) => plugins.q.Promise<void>;
+export declare let remove: (pathArg: string) => Promise<void>;
 /**
  * removes a file SYNCHRONOUSLY from local disk
  */
@@ -74,7 +73,7 @@ export declare let removeSync: (pathArg: string) => boolean;
 /**
  * removes an array of filePaths from disk
  */
-export declare let removeMany: (filePathArrayArg: string[]) => plugins.q.Promise<void[]>;
+export declare let removeMany: (filePathArrayArg: string[]) => Promise<void[]>;
 /**
  * like removeFilePathArray but SYNCHRONOUSLY
  */
@@ -91,7 +90,8 @@ export declare let toObjectSync: (filePathArg: any, fileTypeArg?: any) => any;
  * @param filePath
  * @returns {string|Buffer|any}
  */
-export declare let toStringSync: (filePath: any) => any;
+export declare let toStringSync: (filePath: string) => string;
+export declare let fileTreeToObject: (dirPathArg: string, miniMatchFilter: string) => Promise<Smartfile[]>;
 /**
  *
  * @param filePathArg
@@ -109,7 +109,7 @@ export declare let requireReload: (path: string) => any;
  * lists Folders in a directory on local disk
  * @returns Promise
  */
-export declare let listFolders: (pathArg: string, regexFilter?: RegExp) => plugins.q.Promise<{}>;
+export declare let listFolders: (pathArg: string, regexFilter?: RegExp) => Promise<{}>;
 /**
  * lists Folders SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
@@ -119,7 +119,7 @@ export declare let listFoldersSync: (pathArg: string, regexFilter?: RegExp) => s
  * lists Files in a directory on local disk
  * @returns Promise
  */
-export declare let listFiles: (pathArg: string, regexFilter?: RegExp) => plugins.q.Promise<{}>;
+export declare let listFiles: (pathArg: string, regexFilter?: RegExp) => Promise<{}>;
 /**
  * lists Files SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
@@ -129,7 +129,7 @@ export declare let listFilesSync: (pathArg: string, regexFilter?: RegExp) => str
  * lists all items (folders AND files) in a directory on local disk
  * @returns Promise<string[]>
  */
-export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => plugins.q.Promise<string[]>;
+export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => Promise<string[]>;
 /**
  * lists all items (folders AND files) in a directory on local disk
  * @returns an array with the folder names as strings
@@ -141,4 +141,4 @@ export declare let listAllItemsSync: (pathArg: string, regexFilter?: RegExp) =>
  * note: if the miniMatch Filter is an absolute path, the cwdArg will be omitted
  * @returns Promise<string[]> string array with the absolute paths of all matching files
  */
-export declare let listFileTree: (dirPathArg: string, miniMatchFilter: string) => plugins.q.Promise<string[]>;
+export declare let listFileTree: (dirPathArg: string, miniMatchFilter: string) => Promise<string[]>;

dist/smartfile.interpreter.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 const plugins = require("./smartfile.plugins");
 exports.filetype = (pathArg) => {
@@ -14,8 +15,8 @@ exports.objectFile = (fileStringArg, fileTypeArg) => {
         case 'json':
             return JSON.parse(fileStringArg);
         default:
-            plugins.beautylog.error('file type ' + fileTypeArg.blue + ' not supported');
+            console.error('file type ' + fileTypeArg.blue + ' not supported');
             break;
     }
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmludGVycHJldGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmludGVycHJldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFFdkIsK0NBQStDO0FBRXBDLFFBQUEsUUFBUSxHQUFHLENBQUMsT0FBZTtJQUNsQyxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUMzQyxJQUFJLFFBQVEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBQyxJQUFJLENBQUMsQ0FBQSxDQUFDLHlCQUF5QjtJQUMzRSxNQUFNLENBQUMsUUFBUSxDQUFBO0FBQ25CLENBQUMsQ0FBQTtBQUVVLFFBQUEsVUFBVSxHQUFHLENBQUMsYUFBcUIsRUFBRSxXQUFXO0lBQ3ZELE1BQU0sQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDbEIsS0FBSyxLQUFLLENBQUU7UUFDWixLQUFLLE1BQU07WUFDUCxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDL0MsS0FBSyxNQUFNO1lBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7UUFDcEM7WUFDSSxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO1lBQzNFLEtBQUssQ0FBQTtJQUNiLENBQUM7QUFDTCxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmludGVycHJldGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmludGVycHJldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMEJBQXVCO0FBRXZCLCtDQUErQztBQUVwQyxRQUFBLFFBQVEsR0FBRyxDQUFDLE9BQWU7SUFDbEMsSUFBSSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyx5QkFBeUI7SUFDM0UsTUFBTSxDQUFDLFFBQVEsQ0FBQTtBQUNuQixDQUFDLENBQUE7QUFFVSxRQUFBLFVBQVUsR0FBRyxDQUFDLGFBQXFCLEVBQUUsV0FBVztJQUN2RCxNQUFNLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1FBQ2xCLEtBQUssS0FBSyxDQUFFO1FBQ1osS0FBSyxNQUFNO1lBQ1AsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQy9DLEtBQUssTUFBTTtZQUNQLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQ3BDO1lBQ0ksT0FBTyxDQUFDLEtBQUssQ0FBQyxZQUFZLEdBQUcsV0FBVyxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQyxDQUFBO1lBQ2pFLEtBQUssQ0FBQTtJQUNiLENBQUM7QUFDTCxDQUFDLENBQUEifQ==

dist/smartfile.memory.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="node" />
-/// <reference types="q" />
 import 'typings-global';
-import plugins = require('./smartfile.plugins');
-export interface vinyl {
+export interface IVinylFile {
     contents: Buffer;
     base: string;
     path: string;
@@ -14,7 +12,7 @@ export interface vinyl {
  * @returns stream.Readable
  * @TODO: make it async;
  */
-export declare let toGulpStream: (fileArg: string | string[] | vinyl | vinyl[], baseArg?: string) => any;
+export declare let toGulpStream: (fileArg: string | string[] | IVinylFile | IVinylFile[], baseArg?: string) => any;
 /**
  * converts file to Object
  * @param fileStringArg
@@ -45,12 +43,12 @@ export declare let toVinylArraySync: (arrayArg: string[], optionsArg?: {
 /**
  * takes a vinylFile object and converts it to String
  */
-export declare let vinylToStringSync: (fileArg: vinyl) => string;
+export declare let vinylToStringSync: (fileArg: IVinylFile) => string;
 /**
  * writes string or vinyl file to disk.
  * @param fileArg
  * @param fileNameArg
  * @param fileBaseArg
  */
-export declare let toFs: (fileContentArg: string | vinyl, filePathArg: any) => plugins.q.Promise<{}>;
+export declare let toFs: (fileContentArg: string | IVinylFile, filePathArg: any) => Promise<{}>;
 export declare let toFsSync: (fileArg: any, filePathArg: string) => void;

dist/smartfile.plugins.d.ts

@@ -1,11 +1,10 @@
 import 'typings-global';
-export import beautylog = require('beautylog');
 export import fs = require('fs');
 export import fsExtra = require('fs-extra');
 export declare let glob: any;
 export import path = require('path');
-export import q = require('q');
-export declare let request: any;
+export import q = require('smartq');
+export import smartrequest = require('smartrequest');
 export declare let requireReload: any;
 export import smartpath = require('smartpath');
 export declare let vinylFile: any;

dist/smartfile.plugins.js

@@ -1,14 +1,14 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
-exports.beautylog = require("beautylog");
 exports.fs = require("fs");
 exports.fsExtra = require("fs-extra");
 exports.glob = require('glob');
 exports.path = require("path");
-exports.q = require("q");
-exports.request = require('request');
+exports.q = require("smartq");
+exports.smartrequest = require("smartrequest");
 exports.requireReload = require('require-reload');
 exports.smartpath = require("smartpath");
 exports.vinylFile = require('vinyl-file');
 exports.yaml = require('js-yaml');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGZpbGUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHlDQUE4QztBQUM5QywyQkFBZ0M7QUFDaEMsc0NBQTJDO0FBQ2hDLFFBQUEsSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtBQUNqQywrQkFBb0M7QUFDcEMseUJBQThCO0FBQ25CLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUM1QixRQUFBLGFBQWEsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUNwRCx5Q0FBOEM7QUFDbkMsUUFBQSxTQUFTLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBQ2pDLFFBQUEsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGZpbGUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2QiwyQkFBZ0M7QUFDaEMsc0NBQTJDO0FBQ2hDLFFBQUEsSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtBQUNqQywrQkFBb0M7QUFDcEMsOEJBQW1DO0FBQ25DLCtDQUFvRDtBQUN6QyxRQUFBLGFBQWEsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUNwRCx5Q0FBOEM7QUFDbkMsUUFBQSxTQUFTLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBQ2pDLFFBQUEsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQSJ9

dist/smartfile.remote.d.ts

@@ -1,16 +1,13 @@
-/// <reference types="q" />
 import 'typings-global';
-import plugins = require('./smartfile.plugins');
-export declare let toFs: (from: string, toPath: string) => plugins.q.Promise<{}>;
 /**
  *
  * @param fromArg
  * @returns {any}
  */
-export declare let toObject: (fromArg: string) => plugins.q.Promise<{}>;
+export declare let toObject: (fromArg: string) => Promise<{}>;
 /**
  *
  * @param fromArg
  * @returns {any}
  */
-export declare let toString: (fromArg: string) => plugins.q.Promise<{}>;
+export declare let toString: (fromArg: string) => Promise<{}>;

dist/smartfile.remote.js

@@ -1,15 +1,15 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 const plugins = require("./smartfile.plugins");
-const SmartfileInterpreter = require("./smartfile.interpreter");
-exports.toFs = function (from, toPath) {
-    let done = plugins.q.defer();
-    let stream = plugins.request(from).pipe(plugins.fsExtra.createWriteStream(toPath));
+/* export let toFs = function (from: string, toPath: string) {
+  let done = plugins.q.defer()
+  let stream = plugins.smartrequest(from).pipe(plugins.fsExtra.createWriteStream(toPath))
   stream.on('finish', function () {
-        done.resolve(toPath);
-    });
-    return done.promise;
-};
+    done.resolve(toPath)
+  })
+  return done.promise
+} */
 /**
  *
  * @param fromArg
@@ -17,16 +17,15 @@ exports.toFs = function (from, toPath) {
  */
 exports.toObject = function (fromArg) {
     let done = plugins.q.defer();
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        let returnObject;
-        if (!error && response.statusCode === 200) {
-            returnObject = SmartfileInterpreter.objectFile(bodyString, SmartfileInterpreter.filetype(fromArg));
-            done.resolve(returnObject);
+    plugins.smartrequest.request(fromArg, {
+        method: 'get'
+    }).then((res) => {
+        if (res.statusCode === 200) {
+            done.resolve(res.body);
         }
         else {
             console.log('could not get remote file from ' + fromArg);
-            returnObject = undefined;
-            done.reject(returnObject);
+            done.reject(new Error('could not get remote file from ' + fromArg));
         }
     });
     return done.promise;
@@ -38,16 +37,15 @@ exports.toObject = function (fromArg) {
  */
 exports.toString = (fromArg) => {
     let done = plugins.q.defer();
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        if (!error && response.statusCode === 200) {
-            done.resolve(bodyString);
+    plugins.smartrequest.get(fromArg).then((res) => {
+        if (res.statusCode === 200) {
+            done.resolve(res.body);
         }
         else {
-            plugins.beautylog.error('could not get remote file from ' + fromArg);
-            bodyString = undefined;
-            done.reject(bodyString);
+            console.error('could not get remote file from ' + fromArg);
+            done.reject(new Error('could not get remote file from ' + fromArg));
         }
     });
     return done.promise;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnJlbW90ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZmlsZS5yZW1vdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwrQ0FBK0M7QUFDL0MsZ0VBQWdFO0FBRXJELFFBQUEsSUFBSSxHQUFHLFVBQVMsSUFBWSxFQUFDLE1BQWM7SUFDbEQsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUE7SUFDbEYsTUFBTSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUM7UUFDZixJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3hCLENBQUMsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQ7Ozs7R0FJRztBQUNRLFFBQUEsUUFBUSxHQUFHLFVBQVMsT0FBZTtJQUMxQyxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxVQUFVLEtBQUssRUFBRSxRQUFRLEVBQUUsVUFBVTtRQUM5RCxJQUFJLFlBQVksQ0FBQTtRQUNoQixFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssSUFBSSxRQUFRLENBQUMsVUFBVSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDeEMsWUFBWSxHQUFHLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7WUFDakcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLGlDQUFpQyxHQUFHLE9BQU8sQ0FBQyxDQUFBO1lBQ3hELFlBQVksR0FBRyxTQUFTLENBQUE7WUFDeEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUM3QixDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUE7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUE7QUFFRDs7OztHQUlHO0FBQ1EsUUFBQSxRQUFRLEdBQUcsQ0FBQyxPQUFlO0lBQ2xDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLFVBQVUsS0FBSyxFQUFFLFFBQVEsRUFBRSxVQUFVO1FBQzlELEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFJLFFBQVEsQ0FBQyxVQUFVLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQztZQUN4QyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQzVCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxHQUFHLE9BQU8sQ0FBQyxDQUFBO1lBQ3BFLFVBQVUsR0FBRyxTQUFTLENBQUE7WUFDdEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUMzQixDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUE7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnJlbW90ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZmlsZS5yZW1vdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwQkFBdUI7QUFDdkIsK0NBQStDO0FBRy9DOzs7Ozs7O0lBT0k7QUFFSjs7OztHQUlHO0FBQ1EsUUFBQSxRQUFRLEdBQUcsVUFBVSxPQUFlO0lBQzdDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDNUIsT0FBTyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFO1FBQ3BDLE1BQU0sRUFBRSxLQUFLO0tBQ2QsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQVE7UUFDZixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsVUFBVSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDeEIsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsR0FBRyxPQUFPLENBQUMsQ0FBQTtZQUN4RCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLGlDQUFpQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUE7UUFDckUsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDckIsQ0FBQyxDQUFBO0FBRUQ7Ozs7R0FJRztBQUNRLFFBQUEsUUFBUSxHQUFHLENBQUMsT0FBZTtJQUNwQyxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQVE7UUFDOUMsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQzNCLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3hCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLEdBQUcsT0FBTyxDQUFDLENBQUE7WUFDMUQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFBO1FBQ3JFLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3JCLENBQUMsQ0FBQSJ9

npmextra.json

@@ -5,5 +5,10 @@
   },
   "npmdocker":{
     
+  },
+  "npmci": {
+    "globalNpmTools": [
+      "npmts"
+    ]
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartfile",
-  "version": "4.1.2",
+  "version": "4.1.9",
   "description": "offers smart ways to work with files in nodejs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,25 +27,21 @@
   "homepage": "https://gitlab.com/pushrocks/smartfile",
   "dependencies": {
     "@types/fs-extra": "0.x.x",
-    "@types/q": "0.x.x",
     "@types/vinyl": "^2.0.0",
-    "beautylog": "^6.0.0",
-    "fs-extra": "^1.0.0",
+    "fs-extra": "^2.0.0",
     "glob": "^7.1.1",
-    "js-yaml": "^3.7.0",
-    "q": "^1.4.1",
-    "request": "^2.79.0",
+    "js-yaml": "^3.8.2",
     "require-reload": "0.2.2",
-    "smartpath": "^3.2.7",
+    "smartpath": "^3.2.8",
+    "smartq": "^1.1.1",
+    "smartrequest": "^1.0.4",
     "typings-global": "^1.0.14",
     "vinyl": "^2.0.1",
-    "vinyl-file": "^2.0.0"
+    "vinyl-file": "^3.0.0"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
     "gulp-function": "^2.2.3",
-    "npmts-g": "^5.2.10",
-    "should": "^11.1.2",
+    "smartchai": "^1.0.3",
     "typings-test": "^1.0.3"
   }
 }

test/test.ts

@@ -1,55 +1,56 @@
 import 'typings-test'
 import * as smartfile from '../dist/index'
-import beautylog = require('beautylog')
 import path = require('path')
-import * as should from 'should'
+
+import { expect } from 'smartchai'
+
 import * as vinyl from 'vinyl'
 
 describe('smartfile', function () {
   describe('.fs', function () {
     describe('.fileExistsSync', function () {
       it('should return an accurate boolean', function () {
-                should(smartfile.fs.fileExistsSync('./test/mytest.json')).be.true()
-                should(smartfile.fs.fileExistsSync('./test/notthere.json')).be.false()
+        expect(smartfile.fs.fileExistsSync('./test/mytest.json')).to.be.true
+        expect(smartfile.fs.fileExistsSync('./test/notthere.json')).be.false
       })
     })
     describe('.fileExists', function () {
       it('should return a working promise', function () {
-                should(smartfile.fs.fileExists('./test/mytest.json')).be.Promise()
-                should(smartfile.fs.fileExists('./test/mytest.json')).be.fulfilled()
-                should(smartfile.fs.fileExists('./test/notthere.json')).not.be.fulfilled()
+        expect(smartfile.fs.fileExists('./test/mytest.json')).to.be.a('promise')
+        expect(smartfile.fs.fileExists('./test/mytest.json')).to.be.fulfilled
+        expect(smartfile.fs.fileExists('./test/notthere.json')).to.not.be.fulfilled
       })
     })
     describe('.listFoldersSync()', function () {
       it('should get the file type from a string', function () {
-                should(smartfile.fs.listFoldersSync('./test/')).containDeep(['testfolder'])
-                should(smartfile.fs.listFoldersSync('./test/')).not.containDeep(['notExistentFolder'])
+        expect(smartfile.fs.listFoldersSync('./test/')).to.deep.include('testfolder')
+        expect(smartfile.fs.listFoldersSync('./test/')).to.not.deep.include('notExistentFolder')
       })
     })
     describe('.listFolders()', function () {
       it('should get the file type from a string', function (done) {
         smartfile.fs.listFolders('./test/')
           .then(function (folderArrayArg) {
-                        should(folderArrayArg).containDeep(['testfolder'])
-                        should(folderArrayArg).not.containDeep(['notExistentFolder'])
+            expect(folderArrayArg).to.deep.include('testfolder')
+            expect(folderArrayArg).to.not.deep.include('notExistentFolder')
             done()
           })
       })
     })
     describe('.listFilesSync()', function () {
       it('should get the file type from a string', function () {
-                should(smartfile.fs.listFilesSync('./test/')).containDeep(['mytest.json'])
-                should(smartfile.fs.listFilesSync('./test/')).not.containDeep(['notExistentFile'])
-                should(smartfile.fs.listFilesSync('./test/', /mytest\.json/)).containDeep(['mytest.json'])
-                should(smartfile.fs.listFilesSync('./test/', /mytests.json/)).not.containDeep(['mytest.json'])
+        expect(smartfile.fs.listFilesSync('./test/')).to.deep.include('mytest.json')
+        expect(smartfile.fs.listFilesSync('./test/')).to.not.deep.include('notExistentFile')
+        expect(smartfile.fs.listFilesSync('./test/', /mytest\.json/)).to.deep.include('mytest.json')
+        expect(smartfile.fs.listFilesSync('./test/', /mytests.json/)).to.not.deep.include('mytest.json')
       })
     })
     describe('.listFiles()', function () {
       it('should get the file type from a string', function (done) {
         smartfile.fs.listFiles('./test/')
           .then(function (folderArrayArg) {
-                        should(folderArrayArg).containDeep(['mytest.json'])
-                        should(folderArrayArg).not.containDeep(['notExistentFile'])
+            expect(folderArrayArg).to.deep.include('mytest.json')
+            expect(folderArrayArg).to.not.deep.include('notExistentFile')
             done()
           })
       })
@@ -58,12 +59,23 @@ describe('smartfile', function () {
       it('should get a file tree', function (done) {
         smartfile.fs.listFileTree(path.resolve('./test/'), '**/*.txt')
           .then(function (folderArrayArg) {
-                        should(folderArrayArg).containDeep(['testfolder/testfile1.txt'])
-                        should(folderArrayArg).not.containDeep(['mytest.json'])
+            expect(folderArrayArg).to.deep.include('testfolder/testfile1.txt')
+            expect(folderArrayArg).to.not.deep.include('mytest.json')
             done()
           })
       })
     })
+
+
+    describe('toObjectFromFileTree', function () {
+      it('should read a file tree into an Object', function () {
+        smartfile.fs.fileTreeToObject(path.resolve('./test/'), '**/*.txt')
+          .then((fileArrayArg) => {
+            // expect(fileArrayArg[1]).to.be.instanceof(smartfile.Smartfile)
+          })
+      })
+    })
+    
     describe('.copy()', function () {
       it('should copy a directory', function () {
         smartfile.fs.copy('./test/testfolder/', './test/temp/')
@@ -83,21 +95,21 @@ describe('smartfile', function () {
         smartfile.fs.remove('./test/temp/mytestRenamed.yaml')
           .then(() => { done() })
       })
-            it('smartfile.fs.removeSync -> should remove single files synchronouly',function() {
+      it('smartfile.fs.removeSync -> should remove single files synchronouly', function () {
         smartfile.fs.removeSync('./test/temp/testfile1.txt')
-                should(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).be.false()
+        expect(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).to.be.false
       })
-            it('smartfile.fs.removeMany -> should remove and array of files',function(done) {
-                smartfile.fs.removeMany(['./test/temp/testfile1.txt','./test/temp/testfile2.txt']).then(() => {
-                    should(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).be.false()
-                    should(smartfile.fs.fileExistsSync('./test/temp/testfile2.txt')).be.false()
+      it('smartfile.fs.removeMany -> should remove and array of files', function (done) {
+        smartfile.fs.removeMany([ './test/temp/testfile1.txt', './test/temp/testfile2.txt' ]).then(() => {
+          expect(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).to.be.false
+          expect(smartfile.fs.fileExistsSync('./test/temp/testfile2.txt')).to.be.false
           done()
         })
       })
-            it('smartfile.fs.removeManySync -> should remove and array of single files synchronouly',function() {
-                smartfile.fs.removeManySync(['./test/temp/testfile1.txt','./test/temp/testfile2.txt'])
-                should(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).be.false()
-                should(smartfile.fs.fileExistsSync('./test/temp/testfile2.txt')).be.false()
+      it('smartfile.fs.removeManySync -> should remove and array of single files synchronouly', function () {
+        smartfile.fs.removeManySync([ './test/temp/testfile1.txt', './test/temp/testfile2.txt' ])
+        expect(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).to.be.false
+        expect(smartfile.fs.fileExistsSync('./test/temp/testfile2.txt')).to.be.false
       })
     })
   })
@@ -105,7 +117,7 @@ describe('smartfile', function () {
   describe('.interpreter', function () {
     describe('.filetype()', function () {
       it('should get the file type from a string', function () {
-                should(smartfile.interpreter.filetype('./somefolder/data.json')).equal('json')
+        expect(smartfile.interpreter.filetype('./somefolder/data.json')).equal('json')
       })
     })
   })
@@ -114,8 +126,8 @@ describe('smartfile', function () {
     describe('.toObjectSync()', function () {
       it('should read an ' + '.yaml' + ' file to an object', function () {
         let testData = smartfile.fs.toObjectSync('./test/mytest.yaml')
-                should(testData).have.property('key1', 'this works')
-                should(testData).have.property('key2', 'this works too')
+        expect(testData).have.property('key1', 'this works')
+        expect(testData).have.property('key2', 'this works too')
 
       })
       it('should state unknown file type for unknown file types', function () {
@@ -123,23 +135,21 @@ describe('smartfile', function () {
       })
       it('should read an ' + '.json' + ' file to an object', function () {
         let testData = smartfile.fs.toObjectSync('./test/mytest.json')
-                should(testData).have.property('key1', 'this works')
-                should(testData).have.property('key2', 'this works too')
+        expect(testData).have.property('key1', 'this works')
+        expect(testData).have.property('key2', 'this works too')
 
       })
     })
     describe('.toStringSync()', function () {
       it('should read a file to a string', function () {
-                should.equal(
-                    smartfile.fs.toStringSync('./test/mytest.txt'),
-                    'Some TestString &&%$'
-                )
+        expect(smartfile.fs.toStringSync('./test/mytest.txt'))
+          .to.equal('Some TestString &&%$')
       })
     })
     describe('.toVinylSync', function () {
       it('should read an ' + '.json OR .yaml' + ' file to an ' + 'vinyl file object', function () {
         let testData = smartfile.fs.toVinylSync('./test/mytest.json')
-                should(vinyl.isVinyl(testData)).be.true()
+        expect(vinyl.isVinyl(testData)).to.be.true
       })
     })
   })
@@ -147,7 +157,7 @@ describe('smartfile', function () {
   describe('.memory', function () {
     describe('.toGulpStream()', function () {
       it('should produce a valid gulp stream', function () {
-                let localArray = ['test1', 'test2', 'test3']
+        let localArray = [ 'test1', 'test2', 'test3' ]
         smartfile.memory.toGulpStream(localArray)
       })
     })
@@ -155,18 +165,18 @@ describe('smartfile', function () {
       it('should produce a vinylFile', function () {
         let localString = 'myString'
         let localOptions = { filename: 'vinylfile2', base: '/someDir' }
-                should(smartfile.memory.toVinylFileSync(localString, localOptions) instanceof vinyl).be.true()
+        expect(smartfile.memory.toVinylFileSync(localString, localOptions) instanceof vinyl).to.be.true
       })
     })
     describe('toVinylArraySync()', function () {
       it('should produce a an array of vinylfiles', function () {
-                let localStringArray = ['string1', 'string2', 'string3']
+        let localStringArray = [ 'string1', 'string2', 'string3' ]
         let localOptions = { filename: 'vinylfile2', base: '/someDir' }
         let testResult = smartfile.memory.toVinylArraySync(localStringArray, localOptions)
-                should(testResult).be.Array()
-                should(testResult.length === 3).be.true()
+        expect(testResult).to.be.a('array')
+        expect(testResult.length === 3).to.be.true
         for (let myKey in testResult) {
-                    should(testResult[myKey] instanceof vinyl).be.true()
+          expect(testResult[ myKey ] instanceof vinyl).to.be.true
         }
       })
     })
@@ -177,7 +187,7 @@ describe('smartfile', function () {
           path: '/test.txt',
           contents: new Buffer('myString')
         }))
-                should(localString).equal('myString')
+        expect(localString).equal('myString')
       })
     })
     describe('toFs()', function () {
@@ -207,18 +217,21 @@ describe('smartfile', function () {
         smartfile.remote.toString(
           'https://raw.githubusercontent.com/pushrocks/smartfile/master/test/mytest.txt'
         ).then(function (responseString) {
-                    should.equal(responseString, 'Some TestString &&%$')
+          expect(responseString).to.equal('Some TestString &&%$')
           done()
         })
       })
       it('should reject a Promise when the link is false', function (done) {
         this.timeout(10000)
         smartfile.remote.toString('https://push.rocks/doesnotexist.txt')
-                    .then(function () {
+          .then(
+          function () {
             throw new Error('this test should not be resolved')
-                    }, function () {
+          },
+          function () {
             done()
-                    })
+          }
+          )
       })
     })
   })

ts/smartfile.classes.smartfile.ts

@@ -1,5 +1,28 @@
-export class Smartfile {
-    constructor() {
+import * as plugins from './smartfile.plugins'
 
+export interface ISmartfileConstructorOptions {
+  path?: string
+  contentsString?: string
+  contentBuffer?: Buffer
+}
+
+export class Smartfile {
+  path: string
+  contents: Buffer
+  constructor(optionsArg: ISmartfileConstructorOptions) {
+    if (optionsArg.contentBuffer) {
+      this.contents = optionsArg.contentBuffer
+    } else if(optionsArg.contentsString) {
+      this.contents = new Buffer(optionsArg.contentsString)
+    }
+    this.path = optionsArg.path
+  }
+
+  /**
+   * set contents from string
+   * @param contentString
+   */
+  setContentFromString(contentString: string) {
+    this.contents = new Buffer(contentString)
   }
 }

ts/smartfile.fs.ts

@@ -2,6 +2,9 @@ import 'typings-global'
 
 import plugins = require('./smartfile.plugins')
 import SmartfileInterpreter = require('./smartfile.interpreter')
+
+import { Smartfile } from './smartfile.classes.smartfile'
+
 import * as memory from './smartfile.memory'
 /*===============================================================
 ============================ Checks =============================
@@ -12,7 +15,7 @@ import * as memory from './smartfile.memory'
  * @param filePath
  * @returns {boolean}
  */
-export let fileExistsSync = function(filePath): boolean {
+export let fileExistsSync = function (filePath): boolean {
   let fileExistsBool: boolean = false
   try {
     plugins.fsExtra.readFileSync(filePath)
@@ -28,9 +31,9 @@ export let fileExistsSync = function(filePath): boolean {
  * @param filePath
  * @returns {any}
  */
-export let fileExists = function(filePath){
+export let fileExists = function (filePath) {
   let done = plugins.q.defer()
-    plugins.fs.access(filePath, plugins.fs.R_OK, function (err) {
+  plugins.fs.access(filePath, 4, function (err) {
     err ? done.reject(err) : done.resolve()
   })
   return done.promise
@@ -39,14 +42,14 @@ export let fileExists = function(filePath){
 /**
  * Checks if given path points to an existing directory
  */
-export let isDirectory = function(pathArg): boolean{
+export let isDirectory = function (pathArg): boolean {
   return plugins.fsExtra.statSync(pathArg).isDirectory()
 }
 
 /**
  * Checks if a given path points to an existing file
  */
-export let isFile = function(pathArg): boolean{
+export let isFile = function (pathArg): boolean {
   return plugins.fsExtra.statSync(pathArg).isFile()
 }
 
@@ -57,9 +60,9 @@ export let isFile = function(pathArg): boolean{
 /**
  * copies a file from A to B on the local disk
  */
-export let copy = function(fromArg: string, toArg: string){
+export let copy = function (fromArg: string, toArg: string) {
   let done = plugins.q.defer()
-    plugins.fsExtra.copy(fromArg,toArg,{},function(){
+  plugins.fsExtra.copy(fromArg, toArg, {}, function () {
     done.resolve()
   })
   return done.promise
@@ -68,8 +71,8 @@ export let copy = function(fromArg: string, toArg: string){
 /**
  * copies a file SYNCHRONOUSLY from A to B on the local disk
  */
-export let copySync = function(fromArg: string,toArg: string): boolean{
-    plugins.fsExtra.copySync(fromArg,toArg)
+export let copySync = function (fromArg: string, toArg: string): boolean {
+  plugins.fsExtra.copySync(fromArg, toArg)
   return true
 }
 
@@ -78,7 +81,7 @@ export let copySync = function(fromArg: string,toArg: string): boolean{
  */
 export let ensureDir = (dirPathArg: string) => {
   let done = plugins.q.defer()
-    plugins.fsExtra.ensureDir(dirPathArg,done.resolve)
+  plugins.fsExtra.ensureDir(dirPathArg, done.resolve)
   return done.promise
 }
 
@@ -95,7 +98,7 @@ export let ensureDirSync = (dirPathArg: string) => {
  */
 export let ensureEmptyDir = (dirPathArg: string) => {
   let done = plugins.q.defer()
-    plugins.fsExtra.ensureDir(dirPathArg,() => {
+  plugins.fsExtra.ensureDir(dirPathArg, () => {
     plugins.fsExtra.emptyDir(dirPathArg, done.resolve)
   })
   return done.promise
@@ -117,7 +120,7 @@ export let ensureEmptyDirSync = (dirPathArg: string) => {
  * @returns Promise<void>
  * @exec ASYNC
  */
-export let ensureFile = (filePathArg, initFileStringArg): plugins.q.Promise<void> => {
+export let ensureFile = (filePathArg, initFileStringArg): Promise<void> => {
   let done = plugins.q.defer<void>()
   ensureFileSync(filePathArg, initFileStringArg)
   done.resolve()
@@ -142,9 +145,9 @@ export let ensureFileSync = (filePathArg: string, initFileStringArg: string): vo
 /**
  * removes a file or folder from local disk
  */
-export let remove = function(pathArg: string): plugins.q.Promise<void> {
+export let remove = function (pathArg: string): Promise<void> {
   let done = plugins.q.defer<void>()
-    plugins.fsExtra.remove(pathArg,function(){
+  plugins.fsExtra.remove(pathArg, function () {
     done.resolve()
   })
   return done.promise
@@ -153,7 +156,7 @@ export let remove = function(pathArg: string): plugins.q.Promise<void> {
 /**
  * removes a file SYNCHRONOUSLY from local disk
  */
-export let removeSync = function(pathArg: string): boolean{
+export let removeSync = function (pathArg: string): boolean {
   plugins.fsExtra.removeSync(pathArg)
   return true
 }
@@ -161,18 +164,18 @@ export let removeSync = function(pathArg: string): boolean{
 /**
  * removes an array of filePaths from disk
  */
-export let removeMany = function(filePathArrayArg: string[]){
-    let promiseArray: plugins.q.Promise<void>[] = []
+export let removeMany = function (filePathArrayArg: string[]) {
+  let promiseArray: Promise<void>[] = []
   for (let filePath of filePathArrayArg) {
     promiseArray.push(remove(filePath))
   }
-    return plugins.q.all(promiseArray)
+  return Promise.all(promiseArray)
 }
 
 /**
  * like removeFilePathArray but SYNCHRONOUSLY
  */
-export let removeManySync = function(filePathArrayArg: string[]): void {
+export let removeManySync = function (filePathArrayArg: string[]): void {
   for (let filePath of filePathArrayArg) {
     removeSync(filePath)
   }
@@ -188,11 +191,11 @@ export let removeManySync = function(filePathArrayArg: string[]): void {
  * @param fileTypeArg
  * @returns {any}
  */
-export let toObjectSync = function(filePathArg,fileTypeArg?) {
+export let toObjectSync = function (filePathArg, fileTypeArg?) {
   let fileString = plugins.fsExtra.readFileSync(filePathArg, 'utf8')
   let fileType
   fileTypeArg ? fileType = fileTypeArg : fileType = SmartfileInterpreter.filetype(filePathArg)
-    return SmartfileInterpreter.objectFile(fileString,fileType)
+  return SmartfileInterpreter.objectFile(fileString, fileType)
 }
 
 /**
@@ -200,20 +203,33 @@ export let toObjectSync = function(filePathArg,fileTypeArg?) {
  * @param filePath
  * @returns {string|Buffer|any}
  */
-export let toStringSync = function(filePath) {
-    let fileString
-    fileString = plugins.fsExtra.readFileSync(filePath, 'utf8')
+export let toStringSync = function (filePath: string) {
+  let fileString = plugins.fsExtra.readFileSync(filePath, 'utf8')
   return fileString
 }
 
+export let fileTreeToObject = async (dirPathArg: string, miniMatchFilter: string) => {
+  let fileTree = await listFileTree(dirPathArg, miniMatchFilter)
+  let smartfileArray: Smartfile[] = []
+  for (let filePath of fileTree) {
+    smartfileArray.push(new Smartfile({
+      path: filePath,
+      contentBuffer: new Buffer(toStringSync(
+        plugins.path.join(dirPathArg, filePath)
+      ))
+    }))
+  }
+  return smartfileArray
+}
+
 /**
  *
  * @param filePathArg
  * @param options
  * @returns {number}
  */
-export let toVinylSync = function(filePathArg,options = {}) {
-    return plugins.vinylFile.readSync(filePathArg,options)
+export let toVinylSync = function (filePathArg, options = {}) {
+  return plugins.vinylFile.readSync(filePathArg, options)
 }
 
 /**
@@ -221,7 +237,7 @@ export let toVinylSync = function(filePathArg,options = {}) {
  * @param path
  * @returns {any}
  */
-export let requireReload = function(path: string){
+export let requireReload = function (path: string) {
   return plugins.requireReload(path)
 }
 
@@ -229,9 +245,9 @@ export let requireReload = function(path: string){
  * lists Folders in a directory on local disk
  * @returns Promise
  */
-export let listFolders = function(pathArg: string,regexFilter?: RegExp){
+export let listFolders = function (pathArg: string, regexFilter?: RegExp) {
   let done = plugins.q.defer()
-    let folderArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
+  let folderArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) {
     return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isDirectory()
   })
   if (regexFilter) {
@@ -247,8 +263,8 @@ export let listFolders = function(pathArg: string,regexFilter?: RegExp){
  * lists Folders SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
  */
-export let listFoldersSync = function(pathArg: string,regexFilter?: RegExp): string[]{
-    let folderArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
+export let listFoldersSync = function (pathArg: string, regexFilter?: RegExp): string[] {
+  let folderArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) {
     return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isDirectory()
   })
   if (regexFilter) {
@@ -263,9 +279,9 @@ export let listFoldersSync = function(pathArg: string,regexFilter?: RegExp): str
  * lists Files in a directory on local disk
  * @returns Promise
  */
-export let listFiles = function(pathArg: string, regexFilter?: RegExp){
+export let listFiles = function (pathArg: string, regexFilter?: RegExp) {
   let done = plugins.q.defer()
-    let fileArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
+  let fileArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) {
     return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isFile()
   })
   if (regexFilter) {
@@ -281,8 +297,8 @@ export let listFiles = function(pathArg: string, regexFilter?: RegExp){
  * lists Files SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
  */
-export let listFilesSync = function(pathArg: string, regexFilter?: RegExp): string[]{
-    let fileArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
+export let listFilesSync = function (pathArg: string, regexFilter?: RegExp): string[] {
+  let fileArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) {
     return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isFile()
   })
   if (regexFilter) {
@@ -297,7 +313,7 @@ export let listFilesSync = function(pathArg: string, regexFilter?: RegExp): stri
  * lists all items (folders AND files) in a directory on local disk
  * @returns Promise<string[]>
  */
-export let listAllItems = function(pathArg: string, regexFilter?: RegExp): plugins.q.Promise<string[]> {
+export let listAllItems = function (pathArg: string, regexFilter?: RegExp): Promise<string[]> {
   let done = plugins.q.defer<string[]>()
   let allItmesArray = plugins.fsExtra.readdirSync(pathArg)
   if (regexFilter) {
@@ -314,8 +330,8 @@ export let listAllItems = function(pathArg: string, regexFilter?: RegExp): plugi
  * @returns an array with the folder names as strings
  * @executes SYNC
  */
-export let listAllItemsSync = function(pathArg: string, regexFilter?: RegExp): string[]{
-    let allItmesArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
+export let listAllItemsSync = function (pathArg: string, regexFilter?: RegExp): string[] {
+  let allItmesArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) {
     return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isFile()
   })
   if (regexFilter) {
@@ -331,7 +347,7 @@ export let listAllItemsSync = function(pathArg: string, regexFilter?: RegExp): s
  * note: if the miniMatch Filter is an absolute path, the cwdArg will be omitted
  * @returns Promise<string[]> string array with the absolute paths of all matching files
  */
-export let listFileTree = (dirPathArg: string, miniMatchFilter: string): plugins.q.Promise<string[]> => {
+export let listFileTree = (dirPathArg: string, miniMatchFilter: string): Promise<string[]> => {
   let done = plugins.q.defer<string[]>()
 
   // handle absolute miniMatchFilter
@@ -345,7 +361,7 @@ export let listFileTree = (dirPathArg: string, miniMatchFilter: string): plugins
   let options = {
     cwd: dirPath
   }
-    plugins.glob(miniMatchFilter,options,(err,files: string[]) => {
+  plugins.glob(miniMatchFilter, options, (err, files: string[]) => {
     if (err) {
       console.log(err)
       done.reject(err)

ts/smartfile.interpreter.ts

@@ -16,7 +16,7 @@ export let objectFile = (fileStringArg: string, fileTypeArg) => {
         case 'json':
             return JSON.parse(fileStringArg)
         default:
-            plugins.beautylog.error('file type ' + fileTypeArg.blue + ' not supported')
+            console.error('file type ' + fileTypeArg.blue + ' not supported')
             break
     }
 }

ts/smartfile.memory.ts

@@ -4,7 +4,7 @@ import plugins = require('./smartfile.plugins')
 import SmartfileInterpreter = require('./smartfile.interpreter')
 let vinyl = require('vinyl')
 
-export interface vinyl {
+export interface IVinylFile {
     contents: Buffer
     base: string
     path: string,
@@ -19,10 +19,10 @@ let Readable = require('stream').Readable
  * @returns stream.Readable
  * @TODO: make it async;
  */
-export let toGulpStream = function(fileArg: string|string[]|vinyl|vinyl[],baseArg: string = '/'){
+export let toGulpStream = function(fileArg: string|string[]|IVinylFile|IVinylFile[],baseArg: string = '/'){
     let fileArray = []
 
-    if (typeof fileArg === 'string' || fileArg instanceof vinyl) { // make sure we work with an array later on
+    if (typeof fileArg === 'string' || vinyl.isVinyl(fileArg)) { // make sure we work with an array later on
         fileArray.push(fileArg)
     } else if (Array.isArray(fileArg)) {
         fileArray = fileArg
@@ -30,7 +30,7 @@ export let toGulpStream = function(fileArg: string|string[]|vinyl|vinyl[],baseAr
         throw new Error('fileArg has unknown format')
     }
 
-    let vinylFileArray: vinyl[] = [] // we want to have an array of vinylFiles
+    let vinylFileArray: IVinylFile[] = [] // we want to have an array of vinylFiles
 
     for (let fileIndexArg in fileArray) { // convert fileArray in vinylArray
         let file = fileArray[fileIndexArg]
@@ -100,7 +100,7 @@ export let toVinylArraySync = function(
 /**
  * takes a vinylFile object and converts it to String
  */
-export let vinylToStringSync = function(fileArg: vinyl){
+export let vinylToStringSync = function(fileArg: IVinylFile): string {
     return fileArg.contents.toString('utf8')
 }
 
@@ -110,7 +110,7 @@ export let vinylToStringSync = function(fileArg: vinyl){
  * @param fileNameArg
  * @param fileBaseArg
  */
-export let toFs = function(fileContentArg: string|vinyl,filePathArg){
+export let toFs = function(fileContentArg: string|IVinylFile,filePathArg){
     let done = plugins.q.defer()
 
     // function checks to abort if needed
@@ -121,8 +121,9 @@ export let toFs = function(fileContentArg: string|vinyl,filePathArg){
     // prepare actual write action
     let fileString: string
     let filePath: string = filePathArg
-    if (fileContentArg instanceof vinyl) {
-        fileString = vinylToStringSync(fileContentArg)
+    if (vinyl.isVinyl(fileContentArg)) {
+        let fileContentArg2: any = fileContentArg
+        fileString = vinylToStringSync(fileContentArg2)
     } else if (typeof fileContentArg === 'string') {
         fileString = fileContentArg
     }

ts/smartfile.plugins.ts

@@ -1,11 +1,10 @@
 import 'typings-global'
-export import beautylog = require('beautylog')
 export import fs = require('fs')
 export import fsExtra = require('fs-extra')
 export let glob = require('glob')
 export import path = require('path')
-export import q = require('q')
-export let request = require('request')
+export import q = require('smartq')
+export import smartrequest = require('smartrequest')
 export let requireReload = require('require-reload')
 export import smartpath = require('smartpath')
 export let vinylFile = require('vinyl-file')

ts/smartfile.remote.ts

@@ -2,31 +2,30 @@ import 'typings-global'
 import plugins = require('./smartfile.plugins')
 import SmartfileInterpreter = require('./smartfile.interpreter')
 
-export let toFs = function(from: string,toPath: string) {
+/* export let toFs = function (from: string, toPath: string) {
   let done = plugins.q.defer()
-    let stream = plugins.request(from).pipe(plugins.fsExtra.createWriteStream(toPath))
-    stream.on('finish',function(){
+  let stream = plugins.smartrequest(from).pipe(plugins.fsExtra.createWriteStream(toPath))
+  stream.on('finish', function () {
     done.resolve(toPath)
   })
   return done.promise
-}
+} */
 
 /**
  *
  * @param fromArg
  * @returns {any}
  */
-export let toObject = function(fromArg: string){
+export let toObject = function (fromArg: string) {
   let done = plugins.q.defer()
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        let returnObject
-        if (!error && response.statusCode === 200) {
-            returnObject = SmartfileInterpreter.objectFile(bodyString,SmartfileInterpreter.filetype(fromArg))
-            done.resolve(returnObject)
+  plugins.smartrequest.request(fromArg, {
+    method: 'get'
+  }).then((res: any) => {
+    if (res.statusCode === 200) {
+      done.resolve(res.body)
     } else {
       console.log('could not get remote file from ' + fromArg)
-            returnObject = undefined
-            done.reject(returnObject)
+      done.reject(new Error('could not get remote file from ' + fromArg))
     }
   })
   return done.promise
@@ -39,13 +38,12 @@ export let toObject = function(fromArg: string){
  */
 export let toString = (fromArg: string) => {
   let done = plugins.q.defer()
-    plugins.request.get(fromArg, function (error, response, bodyString) {
-        if (!error && response.statusCode === 200) {
-            done.resolve(bodyString)
+  plugins.smartrequest.get(fromArg).then((res: any) => {
+    if (res.statusCode === 200) {
+      done.resolve(res.body)
     } else {
-            plugins.beautylog.error('could not get remote file from ' + fromArg)
-            bodyString = undefined
-            done.reject(bodyString)
+      console.error('could not get remote file from ' + fromArg)
+      done.reject(new Error('could not get remote file from ' + fromArg))
     }
   })
   return done.promise

yarn.lock

@@ -0,0 +1,446 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/chai-as-promised@0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-0.0.29.tgz#43d52892aa998e185a3de3e2477edb8573be1d77"
+  dependencies:
+    "@types/chai" "*"
+    "@types/promises-a-plus" "*"
+
+"@types/chai-string@^1.1.30":
+  version "1.1.30"
+  resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.30.tgz#4d8744b31a5a2295fc01c981ed1e2d4c8a070f0a"
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^3.4.35":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.4.35.tgz#e8d65f83492d2944f816fc620741821c28a8c900"
+
+"@types/fs-extra@0.x.x":
+  version "0.0.37"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-0.0.37.tgz#195f11bcd9a1b97d9e412c6b66899b545471a1f7"
+  dependencies:
+    "@types/node" "*"
+
+"@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/promises-a-plus@*":
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780"
+
+"@types/q@0.0.32":
+  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/through2@^2.0.31":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.32.tgz#470024450f1ab7640f19f9ebf42d3da574c26129"
+  dependencies:
+    "@types/node" "*"
+
+"@types/vinyl@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.0.tgz#fd213bf7f4136dde21fe1895500b12c186f8c268"
+  dependencies:
+    "@types/node" "*"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
+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"
+
+chai-as-promised@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
+  dependencies:
+    check-error "^1.0.2"
+
+chai-string@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.3.0.tgz#df6139f294391b1035be5606f60a843b3a5041e7"
+
+chai@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+  dependencies:
+    assertion-error "^1.0.1"
+    deep-eql "^0.1.3"
+    type-detect "^1.0.0"
+
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
+clone-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+
+clone-stats@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+
+clone@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+cloneable-readable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  dependencies:
+    inherits "^2.0.1"
+    process-nextick-args "^1.0.6"
+    through2 "^2.0.1"
+
+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"
+
+deep-eql@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+  dependencies:
+    type-detect "0.1.1"
+
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+first-chunk-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
+  dependencies:
+    readable-stream "^2.0.2"
+
+fs-extra@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+
+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, glob@^7.1.1:
+  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"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+gulp-function@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/gulp-function/-/gulp-function-2.2.3.tgz#8f62de74ce74de3fa91c48ba247472c1f56873bd"
+  dependencies:
+    "@types/q" "0.0.32"
+    "@types/through2" "^2.0.31"
+    q "^1.4.1"
+    through2 "^2.0.1"
+    typings-global "^1.0.14"
+
+home@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/home/-/home-1.0.1.tgz#96a423ceb49b98378ff5ef3ceae059a557f9dd35"
+  dependencies:
+    os-homedir "^1.0.1"
+
+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, 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"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-utf8@^0.2.0, is-utf8@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+js-yaml@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+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"
+
+os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+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"
+
+pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+process-nextick-args@^1.0.6, 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.0.2, readable-stream@^2.1.5:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
+  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"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+replace-ext@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+
+require-reload@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42"
+
+resolve@^1.1.6:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
+
+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"
+
+smartchai@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f"
+  dependencies:
+    "@types/chai" "^3.4.35"
+    "@types/chai-as-promised" "0.0.29"
+    "@types/chai-string" "^1.1.30"
+    chai "^3.5.0"
+    chai-as-promised "^6.0.0"
+    chai-string "^1.3.0"
+
+smartpath@^3.2.8:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/smartpath/-/smartpath-3.2.8.tgz#4834bd3a8bae2295baacadba23c87a501952f940"
+  dependencies:
+    home "^1.0.1"
+    typings-global "^1.0.14"
+
+smartq@^1.1.0, smartq@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/smartq/-/smartq-1.1.1.tgz#efb358705260d41ae18aef7ffd815f7b6fe17dd3"
+  dependencies:
+    typed-promisify "^0.3.0"
+    typings-global "^1.0.14"
+
+smartrequest@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/smartrequest/-/smartrequest-1.0.4.tgz#86af2163ae28f1031b01c2d8ad8c429733920611"
+  dependencies:
+    smartq "^1.1.0"
+    typings-global "^1.0.14"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+strip-bom-buf@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  dependencies:
+    is-utf8 "^0.2.1"
+
+strip-bom-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
+  dependencies:
+    first-chunk-stream "^2.0.0"
+    strip-bom "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+through2@^2.0.1:
+  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"
+
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
+typed-promisify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/typed-promisify/-/typed-promisify-0.3.0.tgz#1ba0af5e444c87d8047406f18ce49092a1191853"
+
+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"
+
+vinyl-file@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.3.0"
+    strip-bom-buf "^1.0.0"
+    strip-bom-stream "^2.0.0"
+    vinyl "^2.0.1"
+
+vinyl@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6"
+  dependencies:
+    clone "^1.0.0"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    is-stream "^1.1.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
+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"