From d732d1ba9781035baaf2ec8efb8f6f64b291bb54 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sat, 17 Sep 2016 23:11:44 +0200 Subject: [PATCH] 4.0.16 --- .gitignore | 2 +- dist/smartfile.fs.d.ts | 25 +++++++++++++++---------- dist/smartfile.fs.js | 27 ++++++++++++++++----------- dist/smartfile.memory.d.ts | 2 +- dist/smartfile.memory.js | 2 +- dist/smartfile.plugins.d.ts | 2 +- dist/smartfile.plugins.js | 2 +- dist/smartfile.remote.d.ts | 6 +++--- dist/smartfile.remote.js | 6 +++--- package.json | 6 +++--- ts/smartfile.fs.ts | 29 +++++++++++++++++------------ ts/smartfile.memory.ts | 2 +- ts/smartfile.plugins.ts | 2 +- ts/smartfile.remote.ts | 6 +++--- 14 files changed, 67 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 56ea3f0..9d4ae5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules/ coverage/ pages/ - +public/ test/temp/ diff --git a/dist/smartfile.fs.d.ts b/dist/smartfile.fs.d.ts index bf0ff09..513674f 100644 --- a/dist/smartfile.fs.d.ts +++ b/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 */ -export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => plugins.Q.Promise<{}>; +export declare let listAllItems: (pathArg: string, regexFilter?: RegExp) => plugins.q.Promise; /** - * 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 array with the absolute paths of all matching files + */ +export declare let listFileTree: (dirPath: string, miniMatchFilter: string) => plugins.q.Promise; diff --git a/dist/smartfile.fs.js b/dist/smartfile.fs.js index b0fb052..e02aa55 100644 --- a/dist/smartfile.fs.js +++ b/dist/smartfile.fs.js @@ -27,7 +27,7 @@ exports.fileExistsSync = function (filePath) { * @returns {any} */ exports.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(); }); @@ -52,7 +52,7 @@ exports.isFile = function (pathArg) { * ensures that a directory is in place */ exports.ensureDir = (dirPathArg) => { - let done = plugins.Q.defer(); + let done = plugins.q.defer(); plugins.fsExtra.ensureDir(dirPathArg, done.resolve); return done.promise; }; @@ -66,7 +66,7 @@ exports.ensureDirSync = (dirPathArg) => { * copies a file from A to B on the local disk */ exports.copy = function (fromArg, toArg) { - var done = plugins.Q.defer(); + var done = plugins.q.defer(); plugins.fsExtra.copy(fromArg, toArg, {}, function () { done.resolve(); }); @@ -83,7 +83,7 @@ exports.copySync = function (fromArg, toArg) { * removes a file or folder from local disk */ exports.remove = function (pathArg) { - var done = plugins.Q.defer(); + var done = plugins.q.defer(); plugins.fsExtra.remove(pathArg, function () { done.resolve(); }); @@ -155,7 +155,7 @@ exports.requireReload = function (path) { * @returns Promise */ exports.listFolders = function (pathArg, regexFilter) { - 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(); }); @@ -188,7 +188,7 @@ exports.listFoldersSync = function (pathArg, regexFilter) { * @returns Promise */ exports.listFiles = function (pathArg, regexFilter) { - 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(); }); @@ -219,10 +219,10 @@ exports.listFilesSync = function (pathArg, regexFilter) { }; /** * lists all items (folders AND files) in a directory on local disk - * @returns Promise + * @returns Promise */ exports.listAllItems = function (pathArg, regexFilter) { - let done = plugins.Q.defer(); + let done = plugins.q.defer(); let allItmesArray = plugins.fsExtra.readdirSync(pathArg); if (regexFilter) { allItmesArray = allItmesArray.filter((fileItem) => { @@ -234,8 +234,9 @@ exports.listAllItems = function (pathArg, regexFilter) { return done.promise; }; /** - * 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 */ exports.listAllItemsSync = function (pathArg, regexFilter) { let allItmesArray = plugins.fsExtra.readdirSync(pathArg).filter(function (file) { @@ -249,8 +250,12 @@ exports.listAllItemsSync = function (pathArg, regexFilter) { ; return allItmesArray; }; +/** + * lists a file tree using a miniMatch filter + * @returns Promise string array with the absolute paths of all matching files + */ exports.listFileTree = (dirPath, miniMatchFilter) => { - let done = plugins.Q.defer(); + let done = plugins.q.defer(); let options = { cwd: dirPath }; @@ -264,4 +269,4 @@ exports.listFileTree = (dirPath, miniMatchFilter) => { }); return done.promise; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartfile.fs.js","sourceRoot":"","sources":["../ts/smartfile.fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartfile.fs.js","sourceRoot":"","sources":["../ts/smartfile.fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/smartfile.memory.d.ts b/dist/smartfile.memory.d.ts index 164d7cb..f4cb47c 100644 --- a/dist/smartfile.memory.d.ts +++ b/dist/smartfile.memory.d.ts @@ -46,5 +46,5 @@ export declare let toStringSync: (fileArg: any) => any; * @param fileNameArg * @param fileBaseArg */ -export declare let toFs: (fileContentArg: any, 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; diff --git a/dist/smartfile.memory.js b/dist/smartfile.memory.js index d41fc4e..66c4fda 100644 --- a/dist/smartfile.memory.js +++ b/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"); diff --git a/dist/smartfile.plugins.d.ts b/dist/smartfile.plugins.d.ts index 8dcfe87..fb4276e 100644 --- a/dist/smartfile.plugins.d.ts +++ b/dist/smartfile.plugins.d.ts @@ -8,7 +8,7 @@ export declare let g: { remoteSrc: any; }; export import path = require("path"); -export import Q = require("q"); +export import q = require("q"); export declare let vinyl: any; export declare let vinylFile: any; export declare let yaml: any; diff --git a/dist/smartfile.plugins.js b/dist/smartfile.plugins.js index 740b44b..fce59d5 100644 --- a/dist/smartfile.plugins.js +++ b/dist/smartfile.plugins.js @@ -9,7 +9,7 @@ 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"); diff --git a/dist/smartfile.remote.d.ts b/dist/smartfile.remote.d.ts index 93ed216..b0d8afe 100644 --- a/dist/smartfile.remote.d.ts +++ b/dist/smartfile.remote.d.ts @@ -1,7 +1,7 @@ /// 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<{}>; diff --git a/dist/smartfile.remote.js b/dist/smartfile.remote.js index 1d0973e..0ade80d 100644 --- a/dist/smartfile.remote.js +++ b/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); diff --git a/package.json b/package.json index cd3a0d5..3cb79a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smartfile", - "version": "4.0.15", + "version": "4.0.16", "description": "offers smart ways to work with files in nodejs", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -28,7 +28,7 @@ "dependencies": { "@types/fs-extra": "0.x.x", "@types/q": "0.x.x", - "beautylog": "^5.0.22", + "beautylog": "^5.0.23", "fs-extra": "^0.30.0", "glob": "^7.0.6", "gulp": "^3.9.1", @@ -46,6 +46,6 @@ "gulp-function": "^1.3.6", "npmts-g": "^5.2.8", "should": "^11.1.0", - "typings-test": "^1.0.2" + "typings-test": "^1.0.3" } } diff --git a/ts/smartfile.fs.ts b/ts/smartfile.fs.ts index 36d2f2a..cc27660 100644 --- a/ts/smartfile.fs.ts +++ b/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 */ -export let listAllItems = function(pathArg:string, regexFilter?:RegExp){ - let done = plugins.Q.defer(); +export let listAllItems = function(pathArg:string, regexFilter?:RegExp): plugins.q.Promise { + let done = plugins.q.defer(); 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 array with the absolute paths of all matching files + */ +export let listFileTree = (dirPath:string, miniMatchFilter:string): plugins.q.Promise => { + let done = plugins.q.defer(); let options = { cwd:dirPath } diff --git a/ts/smartfile.memory.ts b/ts/smartfile.memory.ts index 3c990ca..8278c1e 100644 --- a/ts/smartfile.memory.ts +++ b/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"); diff --git a/ts/smartfile.plugins.ts b/ts/smartfile.plugins.ts index 1e5366d..6f32ff4 100644 --- a/ts/smartfile.plugins.ts +++ b/ts/smartfile.plugins.ts @@ -8,7 +8,7 @@ export let g = { remoteSrc: require("gulp-remote-src") }; export import path = require("path"); -export import Q = require("q"); +export import q = require("q"); export let vinyl = require("vinyl"); export let vinylFile = require("vinyl-file"); export let yaml = require("js-yaml"); diff --git a/ts/smartfile.remote.ts b/ts/smartfile.remote.ts index 4c59cb6..846d830 100644 --- a/ts/smartfile.remote.ts +++ b/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);