4.2.8

dist/smartfile.classes.smartfile.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 export interface ISmartfileConstructorOptions {
     path?: string;
-    contentsString?: string;
+    contentString?: string;
     contentBuffer?: Buffer;
+    base?: string;
 }
 /**
  * class Smartfile
@@ -14,13 +15,13 @@ export declare class Smartfile {
      */
     path: string;
     /**
-     * The contents of the file as Buffer
+     * the content of the file as Buffer
      */
-    contents: Buffer;
+    contentBuffer: Buffer;
     /**
      * The current working directory of the file
      */
-    cwd: string;
+    base: string;
     /**
      * sync the file with disk
      */
@@ -30,11 +31,6 @@ export declare class Smartfile {
      * @param optionsArg
      */
     constructor(optionsArg: ISmartfileConstructorOptions);
-    /**
-     * return relative path of file
-     * ->
-     */
-    readonly relative: string;
     /**
      * set contents from string
      * @param contentString
@@ -48,4 +44,27 @@ export declare class Smartfile {
      * read file from disk
      */
     read(): Promise<void>;
+    /**
+     * vinyl-compatibility: alias of this.contentBuffer
+     */
+    contents: Buffer;
+    /**
+     * vinyl-compatibility
+     */
+    readonly cwd: string;
+    /**
+     * return relative path of file
+     */
+    readonly relative: string;
+    /**
+     * return truw when the file has content
+     */
+    isNull(): boolean;
+    /**
+     * return true if contents are Buffer
+     */
+    isBuffer(): boolean;
+    isDirectory(): boolean;
+    isStream(): boolean;
+    isSymbolic(): boolean;
 }

dist/smartfile.classes.smartfile.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./smartfile.plugins");
 /**
  * class Smartfile
  * -> is vinyl file compatible
@@ -19,19 +20,16 @@ class Smartfile {
      */
     constructor(optionsArg) {
         if (optionsArg.contentBuffer) {
-            this.contents = optionsArg.contentBuffer;
+            this.contentBuffer = optionsArg.contentBuffer;
         }
-        else if (optionsArg.contentsString) {
+        else if (optionsArg.contentString) {
-            this.contents = new Buffer(optionsArg.contentsString);
+            this.setContentsFromString(optionsArg.contentString);
+        }
+        else {
+            console.log('created empty Smartfile?');
         }
         this.path = optionsArg.path;
-    }
+        this.base = optionsArg.base;
-    /**
-     * return relative path of file
-     * ->
-     */
-    get relative() {
-        return '';
     }
     /**
      * set contents from string
@@ -54,6 +52,57 @@ class Smartfile {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }
+    // -----------------------------------------------
+    // vinyl compatibility
+    // -----------------------------------------------
+    /**
+     * vinyl-compatibility: alias of this.contentBuffer
+     */
+    get contents() {
+        return this.contentBuffer;
+    }
+    set contents(contentsArg) {
+        this.contentBuffer = contentsArg;
+    }
+    /**
+     * vinyl-compatibility
+     */
+    get cwd() {
+        return process.cwd();
+    }
+    /**
+     * return relative path of file
+     */
+    get relative() {
+        return plugins.path.relative(this.base, this.path);
+    }
+    /**
+     * return truw when the file has content
+     */
+    isNull() {
+        if (!this.contentBuffer) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * return true if contents are Buffer
+     */
+    isBuffer() {
+        if (this.contents instanceof Buffer) {
+            return true;
+        }
+        return false;
+    }
+    isDirectory() {
+        return false;
+    }
+    isStream() {
+        return false;
+    }
+    isSymbolic() {
+        return false;
+    }
 }
 exports.Smartfile = Smartfile;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFRQTs7O0dBR0c7QUFDSDtJQXFCRTs7O09BR0c7SUFDSCxZQUFhLFVBQXdDO1FBQ25ELEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksQ0FBQyxRQUFRLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQTtRQUMxQyxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1lBQ3JDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ3ZELENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUE7SUFDN0IsQ0FBQztJQUVEOzs7T0FHRztJQUNILElBQUksUUFBUTtRQUNWLE1BQU0sQ0FBQyxFQUFFLENBQUE7SUFDWCxDQUFDO0lBR0Q7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsYUFBcUI7UUFDekMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUMzQyxDQUFDO0lBRUQ7O09BRUc7SUFDRyxLQUFLOztRQUVYLENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csSUFBSTs7UUFDVixDQUFDO0tBQUE7Q0FDRjtBQS9ERCw4QkErREMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRmaWxlLmNsYXNzZXMuc21hcnRmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSwrQ0FBOEM7QUFTOUM7OztHQUdHO0FBQ0g7SUFxQkU7OztPQUdHO0lBQ0gsWUFBYSxVQUF3QztRQUNuRCxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztZQUM3QixJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUE7UUFDL0MsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztZQUNwQyxJQUFJLENBQUMscUJBQXFCLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQ3RELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsMEJBQTBCLENBQUMsQ0FBQTtRQUN6QyxDQUFDO1FBQ0QsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFBO1FBQzNCLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQTtJQUM3QixDQUFDO0lBR0Q7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsYUFBcUI7UUFDekMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUMzQyxDQUFDO0lBRUQ7O09BRUc7SUFDRyxLQUFLOztRQUVYLENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csSUFBSTs7UUFDVixDQUFDO0tBQUE7SUFFRCxrREFBa0Q7SUFDbEQsc0JBQXNCO0lBQ3RCLGtEQUFrRDtJQUNsRDs7T0FFRztJQUNILElBQUksUUFBUTtRQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFBO0lBQzNCLENBQUM7SUFDRCxJQUFJLFFBQVEsQ0FBRSxXQUFXO1FBQ3ZCLElBQUksQ0FBQyxhQUFhLEdBQUcsV0FBVyxDQUFBO0lBQ2xDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksR0FBRztRQUNMLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUE7SUFDdEIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxRQUFRO1FBQ1YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3BELENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQ3hCLE1BQU0sQ0FBQyxJQUFJLENBQUE7UUFDYixDQUFDO1FBQ0QsTUFBTSxDQUFDLEtBQUssQ0FBQTtJQUNkLENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVE7UUFDTixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxZQUFZLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDcEMsTUFBTSxDQUFDLElBQUksQ0FBQTtRQUNiLENBQUM7UUFDRCxNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELFdBQVc7UUFDVCxNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELFFBQVE7UUFDTixNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2QsQ0FBQztJQUVELFVBQVU7UUFDUixNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2QsQ0FBQztDQUNGO0FBckhELDhCQXFIQyJ9

dist/smartfile.memory.d.ts

@@ -5,14 +5,6 @@ export interface IVinylFile {
     base: string;
     path: string;
 }
-/**
- * allows you to create a gulp stream
- * from String, from an Array of Strings, from Vinyl File, from an Array of VinylFiles
- * @param fileArg
- * @returns stream.Readable
- * @TODO: make it async;
- */
-export declare let toGulpStream: (fileArg: string | string[] | IVinylFile | IVinylFile[], baseArg?: string) => any;
 /**
  * converts file to Object
  * @param fileStringArg

docs/index.md

@@ -0,0 +1,38 @@
+# smartfile
+make files easily accessible for processing in javascript.
+
+## Availabililty
+[![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)
+[![coverage report](https://gitlab.com/pushrocks/smartfile/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartfile/commits/master)
+[![Dependency Status](https://david-dm.org/pushrocks/smartfile.svg)](https://david-dm.org/pushrocks/smartfile)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartfile/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartfile/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/smartfile/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartfile)
+[![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/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+smartfile is an approach of being one tool to handle files in diverse environments.
+
+### Smartfile Sections
+smartfile thinks in sections:
+
+section | description
+--- | ---
+fs | (object) gets data from fs to somewhere
+memory | gets data from memory to somewhere
+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 further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartfile",
-  "version": "4.1.10",
+  "version": "4.2.8",
   "description": "offers smart ways to work with files in nodejs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "vinyl-file": "^3.0.0"
   },
   "devDependencies": {
-    "gulp-function": "^2.2.3",
+    "gulp-function": "^2.2.9",
     "tapbundle": "^1.0.10"
   }
 }

test/test.ts

@@ -5,6 +5,10 @@ import { expect, tap } from 'tapbundle'
 
 import * as vinyl from 'vinyl'
 
+// ---------------------------
+// smartfile.fs
+// ---------------------------
+
 tap.test('.fs.fileExistsSync -> should return an accurate boolean', async () => {
   expect(smartfile.fs.fileExistsSync('./test/mytest.json')).to.be.true
   expect(smartfile.fs.fileExistsSync('./test/notthere.json')).be.false
@@ -47,9 +51,10 @@ tap.test('.fs.listFileTree() -> should get a file tree', async () => {
   expect(folderArrayArg).to.not.deep.include('mytest.json')
 })
 
-tap.test('.fstoObjectFromFileTree -> should read a file tree into an Object', async () => {
+tap.test('.fs.fileTreeToObject -> should read a file tree into an Object', async () => {
   let fileArrayArg = await smartfile.fs.fileTreeToObject(path.resolve('./test/'), '**/*.txt')
-  // expect(fileArrayArg[1]).to.be.instanceof(smartfile.Smartfile)
+  expect(fileArrayArg[0]).to.be.instanceof(smartfile.Smartfile)
+  expect(fileArrayArg[0].contents.toString()).to.equal(fileArrayArg[0].contentBuffer.toString())
 })
 
 tap.test('.fs.copy() -> should copy a directory', async () => {
@@ -68,36 +73,28 @@ tap.test('.fs.remove() -> should remove an entire directory', async () => {
 
 })
 
-tap.test('smartfile.fs.remove -> should remove single files', async () => {
+tap.test('.fs.remove -> should remove single files', async () => {
   await expect(smartfile.fs.remove('./test/temp/mytestRenamed.yaml')).to.eventually.be.fulfilled
 })
 
-tap.test('smartfile.fs.removeSync -> should remove single files synchronouly', async () => {
+tap.test('.fs.removeSync -> should remove single files synchronouly', async () => {
   smartfile.fs.removeSync('./test/temp/testfile1.txt')
   expect(smartfile.fs.fileExistsSync('./test/temp/testfile1.txt')).to.be.false
 })
 
-tap.test('smartfile.fs.removeMany -> should remove and array of files', async () => {
+tap.test('.fs.removeMany -> should remove and array of files', async () => {
   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
   })
 })
 
-tap.test('smartfile.fs.removeManySync -> should remove and array of single files synchronouly', async () => {
+tap.test('.fs.removeManySync -> should remove and array of single files synchronouly', async () => {
   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
 })
 
-// ---------------------------
-// .interpreter
-// ---------------------------
-
-tap.test('.interpreter.filetype() -> should get the file type from a string', async () => {
-  expect(smartfile.interpreter.filetype('./somefolder/data.json')).equal('json')
-})
-
 tap.test('.fs.toObjectSync() -> should read an ' + '.yaml' + ' file to an object', async () => {
   let testData = smartfile.fs.toObjectSync('./test/mytest.yaml')
   expect(testData).have.property('key1', 'this works')
@@ -125,11 +122,18 @@ tap.test('.fs.toVinylSync -> should read an ' + '.json OR .yaml' + ' file to an
   expect(vinyl.isVinyl(testData)).to.be.true
 })
 
-tap.test('.memory.toGulpStream() -> should produce a valid gulp stream', async () => {
+// ---------------------------
-  let localArray = [ 'test1', 'test2', 'test3' ]
+// smartfile.interpreter
-  smartfile.memory.toGulpStream(localArray)
+// ---------------------------
+
+tap.test('.interpreter.filetype() -> should get the file type from a string', async () => {
+  expect(smartfile.interpreter.filetype('./somefolder/data.json')).equal('json')
 })
 
+// ---------------------------
+// smartfile.memory
+// ---------------------------
+
 tap.test('.memory.toVinylFileSync() -> should produce a vinylFile', async () => {
   let localString = 'myString'
   let localOptions = { filename: 'vinylfile2', base: '/someDir' }
@@ -158,7 +162,7 @@ tap.test('.memory.vinylToStringSync() -> should produce a String from vinyl file
 
 tap.test('.memory.toFs() -> should write a file to disk and return a promise', async () => {
   let localString = 'myString'
-  smartfile.memory.toFs(
+  await smartfile.memory.toFs(
     localString,
     path.join(process.cwd(), './test/temp/testMemToFs.txt')
   )
@@ -184,4 +188,18 @@ tap.test('.remote.toString() -> should reject a Promise when the link is false',
     .to.eventually.be.rejected
 })
 
+// ---------------------------
+// smartfile.Smartfile
+// ---------------------------
+
+tap.test('.Smartfile -> should produce vinyl compatible files', async () => {
+  let smartfileArray = await smartfile.fs.fileTreeToObject(process.cwd(), './test/testfolder/**/*')
+  let localSmartfile = smartfileArray[0]
+  expect(localSmartfile).to.be.instanceof(smartfile.Smartfile)
+  expect(localSmartfile.contents).to.be.instanceof(Buffer)
+  expect(localSmartfile.isBuffer()).to.be.true
+  expect(localSmartfile.isDirectory()).to.be.false
+  expect(localSmartfile.isNull()).to.be.false
+})
+
 tap.start()

ts/smartfile.classes.smartfile.ts

@@ -2,8 +2,9 @@ import * as plugins from './smartfile.plugins'
 
 export interface ISmartfileConstructorOptions {
   path?: string
-  contentsString?: string
+  contentString?: string
   contentBuffer?: Buffer
+  base?: string
 }
 
 /**
@@ -17,14 +18,14 @@ export class Smartfile {
   path: string
 
   /**
-   * The contents of the file as Buffer
+   * the content of the file as Buffer
    */
-  contents: Buffer
+  contentBuffer: Buffer
 
   /**
    * The current working directory of the file
    */
-  cwd: string
+  base: string
 
   /**
    * sync the file with disk
@@ -37,19 +38,14 @@ export class Smartfile {
    */
   constructor (optionsArg: ISmartfileConstructorOptions) {
     if (optionsArg.contentBuffer) {
-      this.contents = optionsArg.contentBuffer
+      this.contentBuffer = optionsArg.contentBuffer
-    } else if (optionsArg.contentsString) {
+    } else if (optionsArg.contentString) {
-      this.contents = new Buffer(optionsArg.contentsString)
+      this.setContentsFromString(optionsArg.contentString)
+    } else {
+      console.log('created empty Smartfile?')
     }
     this.path = optionsArg.path
-  }
+    this.base = optionsArg.base
-
-  /**
-   * return relative path of file
-   * -> 
-   */
-  get relative () {
-    return ''
   }
 
 
@@ -73,4 +69,63 @@ export class Smartfile {
    */
   async read () {
   }
+
+  // -----------------------------------------------
+  // vinyl compatibility
+  // -----------------------------------------------
+  /**
+   * vinyl-compatibility: alias of this.contentBuffer
+   */
+  get contents (): Buffer {
+    return this.contentBuffer
+  }
+  set contents (contentsArg) {
+    this.contentBuffer = contentsArg
+  }
+
+  /**
+   * vinyl-compatibility
+   */
+  get cwd () {
+    return process.cwd()
+  }
+
+  /**
+   * return relative path of file
+   */
+  get relative (): string {
+    return plugins.path.relative(this.base, this.path)
+  }
+
+  /**
+   * return truw when the file has content
+   */
+  isNull (): boolean {
+    if (!this.contentBuffer) {
+      return true
+    }
+    return false
+  }
+
+  /**
+   * return true if contents are Buffer
+   */
+  isBuffer (): boolean {
+    if (this.contents instanceof Buffer) {
+      return true
+    }
+    return false
+  }
+
+  isDirectory () {
+    return false
+  }
+
+  isStream () {
+    return false
+  }
+
+  isSymbolic () {
+    return false
+  }
 }

ts/smartfile.fs.ts

@@ -203,20 +203,33 @@ export let toObjectSync = function (filePathArg, fileTypeArg?) {
  * @param filePath
  * @returns {string|Buffer|any}
  */
-export let toStringSync = function (filePath: string) {
+export let toStringSync = function (filePath: string): string {
-  let fileString = plugins.fsExtra.readFileSync(filePath, 'utf8')
+  let fileString: any = plugins.fsExtra.readFileSync(filePath, 'utf8')
+  fileString = `${fileString}`
   return fileString
 }
 
 export let fileTreeToObject = async (dirPathArg: string, miniMatchFilter: string) => {
-  let fileTree = await listFileTree(dirPathArg, miniMatchFilter)
+  // handle absolute miniMatchFilter
+  let dirPath: string
+  if (plugins.path.isAbsolute(miniMatchFilter)) {
+    dirPath = '/'
+  } else {
+    dirPath = dirPathArg
+  }
+
+  let fileTree = await listFileTree(dirPath, miniMatchFilter)
   let smartfileArray: Smartfile[] = []
   for (let filePath of fileTree) {
+    let fileContentString = toStringSync(
+      plugins.path.join(dirPath, filePath)
+    )
+
+    // push a read file as Smartfile 
     smartfileArray.push(new Smartfile({
-      path: filePath,
+      contentBuffer: new Buffer(fileContentString),
-      contentBuffer: new Buffer(toStringSync(
+      base: dirPath,
-        plugins.path.join(dirPathArg, filePath)
+      path: filePath
-      ))
     }))
   }
   return smartfileArray

ts/smartfile.memory.ts

@@ -5,47 +5,9 @@ import SmartfileInterpreter = require('./smartfile.interpreter')
 let vinyl = require('vinyl')
 
 export interface IVinylFile {
-    contents: Buffer
+  contents: Buffer
-    base: string
+  base: string
-    path: string,
+  path: string,
-}
-
-let Readable = require('stream').Readable
-
-/**
- * allows you to create a gulp stream
- * from String, from an Array of Strings, from Vinyl File, from an Array of VinylFiles
- * @param fileArg
- * @returns stream.Readable
- * @TODO: make it async;
- */
-export let toGulpStream = function(fileArg: string|string[]|IVinylFile|IVinylFile[],baseArg: string = '/'){
-    let fileArray = []
-
-    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
-    } else {
-        throw new Error('fileArg has unknown format')
-    }
-
-    let vinylFileArray: IVinylFile[] = [] // we want to have an array of vinylFiles
-
-    for (let fileIndexArg in fileArray) { // convert fileArray in vinylArray
-        let file = fileArray[fileIndexArg]
-        file instanceof vinyl ?
-            vinylFileArray.push(file) :
-            vinylFileArray.push(toVinylFileSync(file,{filename: fileIndexArg,base: baseArg}))
-    };
-
-    let stream = new Readable({ objectMode: true })
-    for (let vinylFileIndexArg in vinylFileArray) {
-        let vinylFile = vinylFileArray[vinylFileIndexArg]
-        stream.push(vinylFile)
-    };
-    stream.push(null) // signal end of stream;
-    return stream
 }
 
 /**
@@ -54,8 +16,8 @@ export let toGulpStream = function(fileArg: string|string[]|IVinylFile|IVinylFil
  * @param fileTypeArg
  * @returns {any|any}
  */
-export let toObject = function(fileStringArg: string,fileTypeArg: string){
+export let toObject = function (fileStringArg: string, fileTypeArg: string) {
-    return SmartfileInterpreter.objectFile(fileStringArg,fileTypeArg)
+  return SmartfileInterpreter.objectFile(fileStringArg, fileTypeArg)
 }
 
 /**
@@ -63,17 +25,17 @@ export let toObject = function(fileStringArg: string,fileTypeArg: string){
  * @param fileArg
  * @param optionsArg
  */
-export let toVinylFileSync = function(fileArg: string,optionsArg?: {filename?: string,base?: string,relPath?: string}) {
+export let toVinylFileSync = function (fileArg: string, optionsArg?: { filename?: string, base?: string, relPath?: string }) {
-    optionsArg ? void(0) : optionsArg = {filename: 'vinylfile', base: '/'}
+  optionsArg ? void (0) : optionsArg = { filename: 'vinylfile', base: '/' }
-    optionsArg.filename ? void(0) : optionsArg.filename = 'vinylfile'
+  optionsArg.filename ? void (0) : optionsArg.filename = 'vinylfile'
-    optionsArg.base ? void(0) : optionsArg.base = '/'
+  optionsArg.base ? void (0) : optionsArg.base = '/'
-    optionsArg.relPath ? void('0') : optionsArg.relPath = ''
+  optionsArg.relPath ? void ('0') : optionsArg.relPath = ''
-    let vinylFile = new vinyl({
+  let vinylFile = new vinyl({
-        base: optionsArg.base,
+    base: optionsArg.base,
-        path: plugins.path.join(optionsArg.base,optionsArg.relPath,optionsArg.filename),
+    path: plugins.path.join(optionsArg.base, optionsArg.relPath, optionsArg.filename),
-        contents: new Buffer(fileArg)
+    contents: new Buffer(fileArg)
-    })
+  })
-    return vinylFile
+  return vinylFile
 }
 
 /**
@@ -81,27 +43,27 @@ export let toVinylFileSync = function(fileArg: string,optionsArg?: {filename?: s
  * @param arrayArg
  * @param optionsArg
  */
-export let toVinylArraySync = function(
+export let toVinylArraySync = function (
-    arrayArg: string[],
+  arrayArg: string[],
-    optionsArg?: {
+  optionsArg?: {
-        filename?: string,
+    filename?: string,
-        base?: string,
+    base?: string,
-        relPath?: string
+    relPath?: string
-    }
+  }
-){
+) {
-    let vinylArray = []
+  let vinylArray = []
-    for (let stringIndexArg in arrayArg) {
+  for (let stringIndexArg in arrayArg) {
-        let myString = arrayArg[stringIndexArg]
+    let myString = arrayArg[ stringIndexArg ]
-        vinylArray.push(toVinylFileSync(myString,optionsArg))
+    vinylArray.push(toVinylFileSync(myString, optionsArg))
-    }
+  }
-    return vinylArray
+  return vinylArray
 }
 
 /**
  * takes a vinylFile object and converts it to String
  */
-export let vinylToStringSync = function(fileArg: IVinylFile): string {
+export let vinylToStringSync = function (fileArg: IVinylFile): string {
-    return fileArg.contents.toString('utf8')
+  return fileArg.contents.toString('utf8')
 }
 
 /**
@@ -110,41 +72,41 @@ export let vinylToStringSync = function(fileArg: IVinylFile): string {
  * @param fileNameArg
  * @param fileBaseArg
  */
-export let toFs = function(fileContentArg: string|IVinylFile,filePathArg){
+export let toFs = function (fileContentArg: string | IVinylFile, filePathArg) {
-    let done = plugins.q.defer()
+  let done = plugins.q.defer()
 
-    // function checks to abort if needed
+  // function checks to abort if needed
-    if (!fileContentArg || !filePathArg) {
+  if (!fileContentArg || !filePathArg) {
-        throw new Error('expected valid arguments')
+    throw new Error('expected valid arguments')
-    }
+  }
 
-    // prepare actual write action
+  // prepare actual write action
-    let fileString: string
+  let fileString: string
-    let filePath: string = filePathArg
+  let filePath: string = filePathArg
-    if (vinyl.isVinyl(fileContentArg)) {
+  if (vinyl.isVinyl(fileContentArg)) {
-        let fileContentArg2: any = fileContentArg
+    let fileContentArg2: any = fileContentArg
-        fileString = vinylToStringSync(fileContentArg2)
+    fileString = vinylToStringSync(fileContentArg2)
-    } else if (typeof fileContentArg === 'string') {
+  } else if (typeof fileContentArg === 'string') {
-        fileString = fileContentArg
+    fileString = fileContentArg
-    }
+  }
-    plugins.fsExtra.writeFile(filePath,fileString,'utf8',done.resolve)
+  plugins.fsExtra.writeFile(filePath, fileString, 'utf8', done.resolve)
-    return done.promise
+  return done.promise
 }
 
-export let toFsSync = function(fileArg,filePathArg: string){
+export let toFsSync = function (fileArg, filePathArg: string) {
-    // function checks to abort if needed
+  // function checks to abort if needed
-    if (!fileArg || !filePathArg) {
+  if (!fileArg || !filePathArg) {
-        throw new Error('expected a valid arguments')
+    throw new Error('expected a valid arguments')
-    }
+  }
 
-    // prepare actual write action
+  // prepare actual write action
-    let fileString: string
+  let fileString: string
-    let filePath: string = filePathArg
+  let filePath: string = filePathArg
 
-    if (typeof fileArg !== 'string') {
+  if (typeof fileArg !== 'string') {
-        fileString = vinylToStringSync(fileArg)
+    fileString = vinylToStringSync(fileArg)
-    } else if (typeof fileArg === 'string') {
+  } else if (typeof fileArg === 'string') {
-        fileString = fileArg
+    fileString = fileArg
-    }
+  }
-    plugins.fsExtra.writeFileSync(filePath,fileString,'utf8')
+  plugins.fsExtra.writeFileSync(filePath, fileString, 'utf8')
 }

yarn.lock

@@ -16,8 +16,8 @@
     "@types/chai" "*"
 
 "@types/chai@*", "@types/chai@^3.4.35":
-  version "3.5.1"
+  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.1.tgz#9bd77fe12503ae00648b0945b38eab666adffe2e"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e"
 
 "@types/fs-extra@2.x.x":
   version "2.1.0"
@@ -33,11 +33,7 @@
   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":
+"@types/through2@^2.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-
-"@types/through2@^2.0.31":
   version "2.0.32"
   resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.32.tgz#470024450f1ab7640f19f9ebf42d3da574c26129"
   dependencies:
@@ -190,15 +186,14 @@ 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:
+gulp-function@^2.2.9:
-  version "2.2.3"
+  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/gulp-function/-/gulp-function-2.2.3.tgz#8f62de74ce74de3fa91c48ba247472c1f56873bd"
+  resolved "https://registry.yarnpkg.com/gulp-function/-/gulp-function-2.2.9.tgz#de513103db9d817e94bb8aab45f30bf286f19ae5"
   dependencies:
-    "@types/q" "0.0.32"
+    "@types/through2" "^2.0.32"
-    "@types/through2" "^2.0.31"
+    smartq "^1.1.1"
-    q "^1.4.1"
+    through2 "^2.0.3"
-    through2 "^2.0.1"
+    typings-global "^1.0.16"
-    typings-global "^1.0.14"
 
 home@^1.0.1:
   version "1.0.1"
@@ -310,10 +305,6 @@ 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.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
 readable-stream@^2.0.2, readable-stream@^2.1.5:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
@@ -440,7 +431,7 @@ tapbundle@^1.0.10:
     smartq "^1.1.1"
     typings-global "^1.0.16"
 
-through2@^2.0.1:
+through2@^2.0.1, through2@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies: