4.0.16

.gitignore

@@ -1,12 +1,7 @@
 node_modules/
-.settings/
-.idea/
 coverage/
-docs/
+pages/
 
-ts/*.js
-ts/*.js.map
-ts/typings/
 
 test/temp/
 

dist/smartfile.fs.d.ts

@@ -12,7 +12,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) => plugins.q.Promise<{}>;
 /**
  * Checks if given path points to an existing directory
  */
@@ -24,7 +24,7 @@ export declare let isFile: (pathArg: any) => boolean;
 /**
  * ensures that a directory is in place
  */
-export declare let ensureDir: (dirPathArg: string) => plugins.Q.Promise<{}>;
+export declare let ensureDir: (dirPathArg: string) => plugins.q.Promise<{}>;
 /**
  * ensures that a directory is in place
  */
@@ -32,7 +32,7 @@ export declare let ensureDirSync: (dirPathArg: string) => void;
 /**
  * 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) => plugins.q.Promise<{}>;
 /**
  * copies a file SYNCHRONOUSLY from A to B on the local disk
  */
@@ -40,7 +40,7 @@ export declare let copySync: (fromArg: string, toArg: string) => boolean;
 /**
  * removes a file or folder from local disk
  */
-export declare let remove: (pathArg: string) => plugins.Q.Promise<{}>;
+export declare let remove: (pathArg: string) => plugins.q.Promise<{}>;
 /**
  * removes a file SYNCHRONOUSLY from local disk
  */
@@ -82,7 +82,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) => plugins.q.Promise<{}>;
 /**
  * lists Folders SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
@@ -92,7 +92,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) => plugins.q.Promise<{}>;
 /**
  * lists Files SYNCHRONOUSLY in a directory on local disk
  * @returns an array with the folder names as strings
@@ -100,12 +100,17 @@ export declare let listFiles: (pathArg: string, regexFilter?: RegExp) => plugins
 export declare let listFilesSync: (pathArg: string, regexFilter?: RegExp) => string[];
 /**
  * lists all items (folders AND files) in a directory on local disk
- * @returns Promise
+ * @returns Promise<string[]>
  */
-export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => plugins.Q.Promise<{}>;
+export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => plugins.q.Promise<string[]>;
 /**
- * lists all items (folders AND files) SYNCHRONOUSLY in a directory on local disk
+ * lists all items (folders AND files) in a directory on local disk
  * @returns an array with the folder names as strings
+ * @executes SYNC
  */
 export declare let listAllItemsSync: (pathArg: string, regexFilter?: RegExp) => string[];
-export declare let listFileTree: (dirPath: string, miniMatchFilter: string) => plugins.Q.Promise<{}>;
+/**
+ * lists a file tree using a miniMatch filter
+ * @returns Promise<string[]> string array with the absolute paths of all matching files
+ */
+export declare let listFileTree: (dirPath: string, miniMatchFilter: string) => plugins.q.Promise<string[]>;

dist/smartfile.memory.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="vinyl" />
 /// <reference types="q" />
 import "typings-global";
 import plugins = require("./smartfile.plugins");
@@ -9,7 +8,7 @@ import plugins = require("./smartfile.plugins");
  * @returns stream.Readable
  * @TODO: make it async;
  */
-export declare let toGulpStream: (fileArg: string | string[] | plugins.vinyl | plugins.vinyl[], baseArg?: string) => any;
+export declare let toGulpStream: (fileArg: any, baseArg?: string) => any;
 /**
  * converts file to Object
  * @param fileStringArg
@@ -26,7 +25,7 @@ export declare let toVinylFileSync: (fileArg: string, optionsArg?: {
     filename?: string;
     base?: string;
     relPath?: string;
-}) => plugins.vinyl;
+}) => any;
 /**
  * takes a string array and some options and returns a vinylfile array
  * @param arrayArg
@@ -40,12 +39,12 @@ export declare let toVinylArraySync: (arrayArg: string[], optionsArg?: {
 /**
  * takes a vinylFile object and converts it to String
  */
-export declare let toStringSync: (fileArg: plugins.vinyl) => string;
+export declare let toStringSync: (fileArg: any) => any;
 /**
  * writes string or vinyl file to disk.
  * @param fileArg
  * @param fileNameArg
  * @param fileBaseArg
  */
-export declare let toFs: (fileContentArg: string | plugins.vinyl, filePathArg: any) => plugins.Q.Promise<{}>;
+export declare let toFs: (fileContentArg: any, filePathArg: any) => plugins.q.Promise<{}>;
 export declare let toFsSync: (fileArg: any, filePathArg: string) => void;

dist/smartfile.memory.js

@@ -90,7 +90,7 @@ exports.toStringSync = function (fileArg) {
  * @param fileBaseArg
  */
 exports.toFs = function (fileContentArg, filePathArg) {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     //function checks to abort if needed
     if (!fileContentArg || !filePathArg)
         throw new Error("expected valid arguments");

dist/smartfile.plugins.d.ts

@@ -3,13 +3,13 @@ export import beautylog = require("beautylog");
 export import fs = require("fs");
 export import fsExtra = require("fs-extra");
 export declare let gulp: any;
-export import glob = require("glob");
+export declare let glob: any;
 export declare let g: {
     remoteSrc: any;
 };
 export import path = require("path");
-export import Q = require("q");
+export import q = require("q");
-export import vinyl = require("vinyl");
+export declare let vinyl: any;
 export declare let vinylFile: any;
 export declare let yaml: any;
 export declare let request: any;

dist/smartfile.plugins.js

@@ -9,10 +9,10 @@ exports.g = {
     remoteSrc: require("gulp-remote-src")
 };
 exports.path = require("path");
-exports.Q = require("q");
+exports.q = require("q");
 exports.vinyl = require("vinyl");
 exports.vinylFile = require("vinyl-file");
 exports.yaml = require("js-yaml");
 exports.request = require("request");
 exports.requireReload = require("require-reload");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGZpbGUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxVQUFFLFdBQVcsSUFBSSxDQUFDLENBQUM7QUFDbkIsZUFBTyxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQ2pDLFlBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDcEIsWUFBSSxXQUFXLE1BQU0sQ0FBQyxDQUFDO0FBQzFCLFNBQUMsR0FBRztJQUNYLFNBQVMsRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUM7Q0FDeEMsQ0FBQztBQUNZLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDakIsYUFBSyxXQUFXLE9BQU8sQ0FBQyxDQUFDO0FBQzVCLGlCQUFTLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ2xDLFlBQUksR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZUFBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUM3QixxQkFBYSxHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRmaWxlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGZpbGUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxVQUFFLFdBQVcsSUFBSSxDQUFDLENBQUM7QUFDbkIsZUFBTyxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQ2pDLFlBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDdkIsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixTQUFDLEdBQUc7SUFDWCxTQUFTLEVBQUUsT0FBTyxDQUFDLGlCQUFpQixDQUFDO0NBQ3hDLENBQUM7QUFDWSxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDdkIsU0FBQyxXQUFXLEdBQUcsQ0FBQyxDQUFDO0FBQ3BCLGFBQUssR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDekIsaUJBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDbEMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUMxQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLHFCQUFhLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUMifQ==

dist/smartfile.remote.d.ts

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

dist/smartfile.remote.js

@@ -3,7 +3,7 @@ require("typings-global");
 const plugins = require("./smartfile.plugins");
 const SmartfileInterpreter = require("./smartfile.interpreter");
 exports.toFs = function (from, toPath) {
-    var done = plugins.Q.defer();
+    var done = plugins.q.defer();
     var stream = plugins.request(from).pipe(plugins.fsExtra.createWriteStream(toPath));
     stream.on('finish', function () {
         done.resolve(toPath);
@@ -27,7 +27,7 @@ exports.toGulpStreamSync = function (filePathArg, baseArg) {
  * @returns {any}
  */
 exports.toObject = function (fromArg) {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.request.get(fromArg, function (error, response, bodyString) {
         let returnObject;
         if (!error && response.statusCode == 200) {
@@ -49,7 +49,7 @@ exports.toObject = function (fromArg) {
  * @returns {any}
  */
 exports.toString = (fromArg) => {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.request.get(fromArg, function (error, response, bodyString) {
         if (!error && response.statusCode == 200) {
             done.resolve(bodyString);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartfile",
-  "version": "4.0.13",
+  "version": "4.0.16",
   "description": "offers smart ways to work with files in nodejs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,25 +27,25 @@
   "homepage": "https://gitlab.com/pushrocks/smartfile",
   "dependencies": {
     "@types/fs-extra": "0.x.x",
-    "@types/glob": "5.x.x",
     "@types/q": "0.x.x",
-    "beautylog": "^5.0.14",
+    "beautylog": "^5.0.23",
     "fs-extra": "^0.30.0",
-    "glob": "^7.0.5",
+    "glob": "^7.0.6",
     "gulp": "^3.9.1",
     "gulp-remote-src": "^0.4.1",
     "js-yaml": "^3.6.1",
     "q": "^1.4.1",
-    "request": "^2.73.0",
+    "request": "^2.74.0",
     "require-reload": "0.2.2",
-    "typings-global": "^1.0.6",
+    "typings-global": "^1.0.14",
-    "vinyl": "^1.1.1",
+    "vinyl": "^1.2.0",
     "vinyl-file": "^2.0.0"
   },
   "devDependencies": {
+    "@types/should": "^8.1.29",
     "gulp-function": "^1.3.6",
-    "npmts-g": "^5.2.6",
+    "npmts-g": "^5.2.8",
-    "should": "^10.0.0",
+    "should": "^11.1.0",
-    "typings-test": "^1.0.1"
+    "typings-test": "^1.0.3"
   }
 }

ts/smartfile.fs.ts

@@ -30,7 +30,7 @@ export let fileExistsSync = function(filePath):boolean {
  * @returns {any}
  */
 export let fileExists = function(filePath){
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.fs.access(filePath, plugins.fs.R_OK, function (err) {
         err ? done.reject(err) : done.resolve();
     });
@@ -59,7 +59,7 @@ export let isFile = function(pathArg):boolean{
  * ensures that a directory is in place
  */
 export let ensureDir = (dirPathArg:string) => {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.fsExtra.ensureDir(dirPathArg,done.resolve);
     return done.promise;
 }
@@ -75,7 +75,7 @@ export let ensureDirSync = (dirPathArg:string) => {
  * copies a file from A to B on the local disk
  */
 export let copy = function(fromArg:string, toArg:string){
-    var done = plugins.Q.defer();
+    var done = plugins.q.defer();
     plugins.fsExtra.copy(fromArg,toArg,{},function(){
         done.resolve();
     });
@@ -94,7 +94,7 @@ export let copySync = function(fromArg:string,toArg:string):boolean{
   * removes a file or folder from local disk
   */
 export let remove = function(pathArg:string){
-    var done = plugins.Q.defer();
+    var done = plugins.q.defer();
     plugins.fsExtra.remove(pathArg,function(){
         done.resolve();
     });
@@ -176,7 +176,7 @@ export let requireReload = function(path:string){
  * @returns Promise
  */
 export let listFolders = function(pathArg:string,regexFilter?:RegExp){
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     let folderArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
         return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isDirectory();
     });
@@ -211,7 +211,7 @@ export let listFoldersSync = function(pathArg:string,regexFilter?:RegExp):string
  * @returns Promise
  */
 export let listFiles = function(pathArg:string, regexFilter?:RegExp){
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     let fileArray = plugins.fsExtra.readdirSync(pathArg).filter(function(file) {
         return plugins.fsExtra.statSync(plugins.path.join(pathArg, file)).isFile();
     });
@@ -242,10 +242,10 @@ export let listFilesSync = function(pathArg:string, regexFilter?:RegExp):string[
 
 /**
  * lists all items (folders AND files) in a directory on local disk
- * @returns Promise
+ * @returns Promise<string[]>
  */
-export let listAllItems = function(pathArg:string, regexFilter?:RegExp){
+export let listAllItems = function(pathArg:string, regexFilter?:RegExp): plugins.q.Promise<string[]> {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer<string[]>();
     let allItmesArray = plugins.fsExtra.readdirSync(pathArg);
     if(regexFilter){
         allItmesArray = allItmesArray.filter((fileItem) => {
@@ -257,8 +257,9 @@ export let listAllItems = function(pathArg:string, regexFilter?:RegExp){
 };
 
 /**
- * lists all items (folders AND files) SYNCHRONOUSLY in a directory on local disk
+ * lists all items (folders AND files) in a directory on local disk
  * @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) {
@@ -272,8 +273,12 @@ export let listAllItemsSync = function(pathArg:string, regexFilter?:RegExp):stri
     return allItmesArray;
 };
 
-export let listFileTree = (dirPath:string, miniMatchFilter:string) => {
+/**
-    let done = plugins.Q.defer();
+ * lists a file tree using a miniMatch filter
+ * @returns Promise<string[]> string array with the absolute paths of all matching files
+ */
+export let listFileTree = (dirPath:string, miniMatchFilter:string): plugins.q.Promise<string[]> => {
+    let done = plugins.q.defer<string[]>();
     let options = {
         cwd:dirPath
     }

ts/smartfile.memory.ts

@@ -98,7 +98,7 @@ export let toStringSync = function(fileArg:plugins.vinyl){
  * @param fileBaseArg
  */
 export let toFs = function(fileContentArg:string|vinyl,filePathArg){
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
 
     //function checks to abort if needed
     if (!fileContentArg || !filePathArg) throw new Error("expected valid arguments");

ts/smartfile.plugins.ts

@@ -3,13 +3,13 @@ export import beautylog = require("beautylog");
 export import fs = require("fs");
 export import fsExtra = require("fs-extra");
 export let gulp = require("gulp");
-export import glob = require("glob");
+export let glob = require("glob");
 export let g = {
     remoteSrc: require("gulp-remote-src")
 };
 export import path = require("path");
-export import Q = require("q");
+export import q = require("q");
-export import vinyl = require("vinyl");
+export let vinyl = require("vinyl");
 export let vinylFile = require("vinyl-file");
 export let yaml = require("js-yaml");
 export let request = require("request");

ts/smartfile.remote.ts

@@ -3,7 +3,7 @@ import plugins = require("./smartfile.plugins");
 import SmartfileInterpreter = require("./smartfile.interpreter");
 
 export let toFs = function(from:string,toPath:string) {
-    var done = plugins.Q.defer();
+    var done = plugins.q.defer();
     var stream = plugins.request(from).pipe(plugins.fsExtra.createWriteStream(toPath));
     stream.on('finish',function(){
         done.resolve(toPath);
@@ -29,7 +29,7 @@ export let toGulpStreamSync = function(filePathArg:string,baseArg:string){
  * @returns {any}
  */
 export let toObject = function(fromArg:string){
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.request.get(fromArg, function (error, response, bodyString) {
         let returnObject;
         if (!error && response.statusCode == 200) {
@@ -50,7 +50,7 @@ export let toObject = function(fromArg:string){
  * @returns {any}
  */
 export let toString = (fromArg:string) => {
-    let done = plugins.Q.defer();
+    let done = plugins.q.defer();
     plugins.request.get(fromArg, function (error, response, bodyString) {
         if (!error && response.statusCode == 200) {
             done.resolve(bodyString);