@meteor-it/fs - npm Package Compare versions

Comparing version 1.2.14 to 1.2.16

index.d.ts

@@ -33,9 +33,11 @@ /// <reference types="node" />
 export declare function writeFile(filename: string, text: string | Buffer): Promise<void>;
+export declare function walkDirArray(dir: string, options?: IWalkOptions): Promise<string[]>;
 /**
  * Walk directory
- * @param dir Directory to walk
- * @param cb If provided, found files will returned realtime. If not - function will return all found files
+ * @param dir directory to walk
+ * @param cb found files will returned realtime
  */
-export declare function walkDir(dir: string, options?: IWalkOptions, cb?: (file: string) => void): Promise<string[] | null>;
-export declare function walkDirStruct(dir: string, options?: IWalkOptions, cb?: (dir: string) => void): Promise<string[] | null>;
+export declare function walkDir(dir: string, cb?: (file: string) => void, options?: IWalkOptions): Promise<void>;
+export declare function walkDirStructArray(dir: string, options?: IWalkOptions): Promise<string[]>;
+export declare function walkDirStruct(dir: string, cb: (dir: string) => void, options?: IWalkOptions): Promise<void>;
 /**
@@ -42,0 +44,0 @@ * Check if file exists

index.js

 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const utils_1 = require("@meteor-it/utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
 /**
@@ -59,3 +56,3 @@ * Returns true if path is a valid data url
     if ((await isDirectory(from))) {
-        const dirStruct = (await walkDirStruct(from)).map(e => e.replace(from, to));
+        const dirStruct = (await walkDirStructArray(from)).map(e => e.replace(from, to));
         try {
@@ -66,3 +63,3 @@ await utils_1.asyncEach(dirStruct, dir => mkdir(dir, true));
         try {
-            await utils_1.asyncEach(await walkDir(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) || copy(f, f.replace(from, to)));
+            await utils_1.asyncEach(await walkDirArray(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) || copy(f, f.replace(from, to)));
         }
@@ -118,3 +115,3 @@ catch (e) {
         // Empty all dirs
-        await walkDir(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));
+        await walkDirArray(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));
         await unlinkDirectoryStructure(pathStr);
@@ -137,20 +134,15 @@ }
 exports.writeFile = writeFile;
+function walkDirArray(dir, options) {
+    return utils_1.collectCallbacks(collector => walkDir(dir, collector, options));
+}
+exports.walkDirArray = walkDirArray;
 /**
  * Walk directory
- * @param dir Directory to walk
- * @param cb If provided, found files will returned realtime. If not - function will return all found files
+ * @param dir directory to walk
+ * @param cb found files will returned realtime
  */
-async function walkDir(dir, options, cb) {
+async function walkDir(dir, cb, options) {
     if (!await exists(dir)) {
-        throw new Error('No such file or directory: ' + dir);
+        throw new Error('no such file or directory: ' + dir);
     }
-    let returnValue;
-    let shouldReturn = false;
-    if (!cb) {
-        returnValue = [];
-        shouldReturn = true;
-        cb = (file) => {
-            returnValue.push(path_1.default.resolve(dir, file));
-        };
-    }
     let dirList = [];
@@ -160,5 +152,5 @@ await utils_1.asyncEach(await readDir(dir), async (file) => {
         if (await isFile(pathStr)) {
-            if (options && options.filter && !options.filter(pathStr))
+            if (options?.filter && !options.filter(pathStr))
                 return;
-            cb(pathStr);
+            cb?.(pathStr);
         }
@@ -170,23 +162,14 @@ else if (await isDirectory(pathStr)) {
     await utils_1.asyncEach(dirList, async (dirLevelDown) => {
-        await walkDir(dir + path_1.default.sep + dirLevelDown, options, cb);
+        await walkDir(dir + path_1.default.sep + dirLevelDown, cb, options);
     });
-    if (shouldReturn) {
-        return returnValue.sort();
-    }
-    return null;
 }
 exports.walkDir = walkDir;
-async function walkDirStruct(dir, options, cb) {
+function walkDirStructArray(dir, options) {
+    return utils_1.collectCallbacks(collector => walkDirStruct(dir, collector, options));
+}
+exports.walkDirStructArray = walkDirStructArray;
+async function walkDirStruct(dir, cb, options) {
     if (!await exists(dir)) {
-        throw new Error('No such file or directory: ' + dir);
+        throw new Error('no such file or directory: ' + dir);
     }
-    let returnValue;
-    let shouldReturn = false;
-    if (!cb) {
-        returnValue = [];
-        shouldReturn = true;
-        cb = (dir) => {
-            returnValue.push(dir);
-        };
-    }
     let dirList = [];
@@ -201,11 +184,7 @@ await utils_1.asyncEach(await readDir(dir), async (file) => {
         const dirPath = path_1.default.resolve(dir, dirLevelDown);
-        await walkDirStruct(dirPath, options, cb);
-        if (options && options.filter && !options.filter(dirPath))
+        await walkDirStruct(dirPath, cb, options);
+        if (options?.filter && !options.filter(dirPath))
             return;
-        cb(dirPath);
+        cb?.(dirPath);
     });
-    if (shouldReturn) {
-        return returnValue.sort();
-    }
-    return null;
 }
@@ -257,2 +236,2 @@ exports.walkDirStruct = walkDirStruct;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["xrest/node_modules/@meteor-it/fs/index.ts"],"names":[],"mappings":"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","file":"xrest/node_modules/@meteor-it/fs/index.js","sourcesContent":["import fsNative, { Stats } from 'fs';\nimport path from 'path';\nimport { asyncEach } from '@meteor-it/utils';\n\ntype FileHandle = fsNative.promises.FileHandle;\n/**\n * Returns true if path is a valid data url\n * @param path path\n */\nfunction isDataUrl(path: string): boolean {\n\treturn /^data:.+\\/.+;base64,/.test(path.substr(0, 268))\n}\n\nexport interface IParsedDataUrl {\n\tmime: string,\n\tdata: Buffer\n}\n/**\n * Returns mime and data of dataurl\n * @param path Data url\n */\nfunction parseDataUrl(path: string): IParsedDataUrl {\n\treturn {\n\t\tmime: path.slice(5, path.indexOf(';')),\n\t\tdata: Buffer.from(path.slice(path.indexOf(',') + 1), 'base64')\n\t}\n}\n\n/**\n * Get all files in directory\n */\nexport async function readDir(dir: string) {\n\treturn await fsNative.promises.readdir(dir);\n}\n/**\n * Read file or parse data url\n * @param file Path to file to read\n */\nexport async function readFile(file: string): Promise<Buffer> {\n\tif (isDataUrl(file))\n\t\treturn parseDataUrl(file).data;\n\treturn await fsNative.promises.readFile(file);\n}\n\nexport async function stat(file: string): Promise<Stats> {\n\treturn await fsNative.promises.stat(file);\n}\n\nexport async function open(file: string, mode: string, access: string): Promise<FileHandle> {\n\treturn await fsNative.promises.open(file, mode, access);\n}\n\nexport async function read(fd: FileHandle, buffer: Buffer, offset: number, length: number, position: number) {\n\treturn await fsNative.promises.read(fd, buffer, offset, length, position);\n}\n\ntype IWalkOptions = {\n\tfilter?: (name: string) => boolean;\n}\n\nexport async function copy(from: string, to: string, options?: IWalkOptions) {\n\tfrom = path.resolve(from);\n\tto = path.resolve(to);\n\tif ((await isDirectory(from))) {\n\t\tconst dirStruct = (await walkDirStruct(from)).map(e => e.replace(from, to));\n\t\ttry {\n\t\t\tawait asyncEach(dirStruct, dir => mkdir(dir, true));\n\t\t} catch (e) { }\n\t\ttry {\n\t\t\tawait asyncEach(await walkDir(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) as any as Promise<void> || copy(f, f.replace(from, to)));\n\t\t} catch (e) {\n\t\t\tif (e.code !== 'ENOENT') throw e;\n\t\t}\n\t\treturn;\n\t}\n\tawait fsNative.promises.copyFile(from, to);\n}\n\nexport async function mkdir(pathStr: string, recursive: boolean = false): Promise<void> {\n\tpathStr = path.resolve(pathStr);\n\tif (recursive) {\n\t\t// TODO: there is recursive option in new versions of node.js,\n\t\t// check for availability of them\n\t\ttry {\n\t\t\treturn await mkdir(pathStr);\n\t\t} catch (e) {\n\t\t\tif (e.code === 'ENOENT') {\n\t\t\t\tawait mkdir(path.dirname(pathStr), true);\n\t\t\t\treturn await mkdir(pathStr);\n\t\t\t} else if (!(await exists(pathStr))) {\n\t\t\t\tthrow e;\n\t\t\t} else {\n\t\t\t\t// Success\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t} else {\n\t\treturn await fsNative.promises.mkdir(pathStr);\n\t}\n}\n\nasync function unlinkDirectoryStructure(pathStr: string) {\n\tpathStr = path.resolve(pathStr);\n\tconst dirs = await readDir(pathStr);\n\tawait asyncEach(dirs, async dir => {\n\t\tconst dirPath = path.resolve(pathStr, dir);\n\t\tawait unlinkDirectoryStructure(dirPath);\n\t\tawait unlink(dirPath);\n\t});\n}\nexport async function unlink(pathStr: string, recursive: boolean = false, options?: IWalkOptions) {\n\tpathStr = path.resolve(pathStr);\n\tif (recursive) {\n\t\t// Empty all dirs\n\t\tawait walkDir(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));\n\t\tawait unlinkDirectoryStructure(pathStr);\n\t} else {\n\t\tif (await isDirectory(pathStr)) {\n\t\t\treturn await fsNative.promises.rmdir(pathStr);\n\t\t}\n\t\tawait fsNative.promises.unlink(pathStr);\n\t}\n}\n\n/**\n * Write text to file\n */\nexport async function writeFile(filename: string, text: string | Buffer) {\n\treturn await fsNative.promises.writeFile(filename, text);\n}\n\n/**\n * Walk directory\n * @param dir Directory to walk\n * @param cb If provided, found files will returned realtime. If not - function will return all found files\n */\nexport async function walkDir(dir: string, options?: IWalkOptions, cb?: (file: string) => void): Promise<string[] | null> {\n\tif (!await exists(dir)) { throw new Error('No such file or directory: ' + dir); }\n\tlet returnValue: string[];\n\tlet shouldReturn = false;\n\tif (!cb) {\n\t\treturnValue = [];\n\t\tshouldReturn = true;\n\t\tcb = (file: string) => {\n\t\t\treturnValue.push(path.resolve(dir, file));\n\t\t};\n\t}\n\tlet dirList: string[] = [];\n\tawait asyncEach(await readDir(dir), async (file: string) => {\n\t\tlet pathStr = dir + path.sep + file;\n\t\tif (await isFile(pathStr)) {\n\t\t\tif (options && options.filter && !options.filter(pathStr)) return;\n\t\t\tcb(pathStr);\n\t\t} else if (await isDirectory(pathStr)) {\n\t\t\tdirList.push(file);\n\t\t}\n\t});\n\tawait asyncEach(dirList, async (dirLevelDown: string) => {\n\t\tawait walkDir(dir + path.sep + dirLevelDown, options, cb);\n\t});\n\tif (shouldReturn) {\n\t\treturn returnValue.sort();\n\t}\n\treturn null;\n}\n\nexport async function walkDirStruct(dir: string, options?: IWalkOptions, cb?: (dir: string) => void): Promise<string[] | null> {\n\tif (!await exists(dir)) { throw new Error('No such file or directory: ' + dir); }\n\tlet returnValue: string[];\n\tlet shouldReturn = false;\n\tif (!cb) {\n\t\treturnValue = [];\n\t\tshouldReturn = true;\n\t\tcb = (dir: string) => {\n\t\t\treturnValue.push(dir);\n\t\t};\n\t}\n\tlet dirList: string[] = [];\n\tawait asyncEach(await readDir(dir), async (file: string) => {\n\t\tlet pathStr = path.resolve(dir, file);\n\t\tif (await isDirectory(pathStr)) {\n\t\t\tdirList.push(pathStr);\n\t\t}\n\t});\n\tawait asyncEach(dirList, async (dirLevelDown: string) => {\n\t\tconst dirPath = path.resolve(dir, dirLevelDown);\n\t\tawait walkDirStruct(dirPath, options, cb);\n\t\tif (options && options.filter && !options.filter(dirPath)) return;\n\t\tcb(dirPath);\n\t});\n\tif (shouldReturn) {\n\t\treturn returnValue.sort();\n\t}\n\treturn null;\n}\n\n/**\n * Check if file exists\n */\nexport async function exists(file: string): Promise<boolean> {\n\ttry {\n\t\tlet result = await fsNative.promises.access(file, fsNative.constants.F_OK);\n\t\treturn result === undefined;\n\t} catch (e) {\n\t\t// Because only \"err\" field is returned if not exists\n\t\treturn false;\n\t}\n}\n\n/**\n * Is path a file\n * @param path path to test\n */\nexport async function isFile(path: string): Promise<boolean> {\n\treturn (await stat(path)).isFile();\n}\n/**\n * Is path a directory\n */\nexport async function isDirectory(path: string): Promise<boolean> {\n\treturn (await stat(path)).isDirectory();\n}\n\n/**\n * Wrapper to fs function\n */\nexport function getReadStream(path: string, options = {}) {\n\treturn fsNative.createReadStream(path, options);\n}\n\n/**\n * Wrapper to fs function\n */\nexport function getWriteStream(path: string, options = {}) {\n\treturn fsNative.createWriteStream(path, options);\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["xrest/node_modules/@meteor-it/fs/index.ts"],"names":[],"mappings":"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","file":"xrest/node_modules/@meteor-it/fs/index.js","sourcesContent":["import { asyncEach, collectCallbacks } from '@meteor-it/utils';\nimport fsNative, { Stats } from 'fs';\nimport path from 'path';\n\ntype FileHandle = fsNative.promises.FileHandle;\n/**\n * Returns true if path is a valid data url\n * @param path path\n */\nfunction isDataUrl(path: string): boolean {\n\treturn /^data:.+\\/.+;base64,/.test(path.substr(0, 268))\n}\n\nexport interface IParsedDataUrl {\n\tmime: string,\n\tdata: Buffer\n}\n/**\n * Returns mime and data of dataurl\n * @param path Data url\n */\nfunction parseDataUrl(path: string): IParsedDataUrl {\n\treturn {\n\t\tmime: path.slice(5, path.indexOf(';')),\n\t\tdata: Buffer.from(path.slice(path.indexOf(',') + 1), 'base64')\n\t}\n}\n\n/**\n * Get all files in directory\n */\nexport async function readDir(dir: string) {\n\treturn await fsNative.promises.readdir(dir);\n}\n/**\n * Read file or parse data url\n * @param file Path to file to read\n */\nexport async function readFile(file: string): Promise<Buffer> {\n\tif (isDataUrl(file))\n\t\treturn parseDataUrl(file).data;\n\treturn await fsNative.promises.readFile(file);\n}\n\nexport async function stat(file: string): Promise<Stats> {\n\treturn await fsNative.promises.stat(file);\n}\n\nexport async function open(file: string, mode: string, access: string): Promise<FileHandle> {\n\treturn await fsNative.promises.open(file, mode, access);\n}\n\nexport async function read(fd: FileHandle, buffer: Buffer, offset: number, length: number, position: number) {\n\treturn await fsNative.promises.read(fd, buffer, offset, length, position);\n}\n\ntype IWalkOptions = {\n\tfilter?: (name: string) => boolean;\n}\n\nexport async function copy(from: string, to: string, options?: IWalkOptions) {\n\tfrom = path.resolve(from);\n\tto = path.resolve(to);\n\tif ((await isDirectory(from))) {\n\t\tconst dirStruct = (await walkDirStructArray(from)).map(e => e.replace(from, to));\n\t\ttry {\n\t\t\tawait asyncEach(dirStruct, dir => mkdir(dir, true));\n\t\t} catch (e) { }\n\t\ttry {\n\t\t\tawait asyncEach(await walkDirArray(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) as any as Promise<void> || copy(f, f.replace(from, to)));\n\t\t} catch (e) {\n\t\t\tif (e.code !== 'ENOENT') throw e;\n\t\t}\n\t\treturn;\n\t}\n\tawait fsNative.promises.copyFile(from, to);\n}\n\nexport async function mkdir(pathStr: string, recursive: boolean = false): Promise<void> {\n\tpathStr = path.resolve(pathStr);\n\tif (recursive) {\n\t\t// TODO: there is recursive option in new versions of node.js,\n\t\t// check for availability of them\n\t\ttry {\n\t\t\treturn await mkdir(pathStr);\n\t\t} catch (e) {\n\t\t\tif (e.code === 'ENOENT') {\n\t\t\t\tawait mkdir(path.dirname(pathStr), true);\n\t\t\t\treturn await mkdir(pathStr);\n\t\t\t} else if (!(await exists(pathStr))) {\n\t\t\t\tthrow e;\n\t\t\t} else {\n\t\t\t\t// Success\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t} else {\n\t\treturn await fsNative.promises.mkdir(pathStr);\n\t}\n}\n\nasync function unlinkDirectoryStructure(pathStr: string) {\n\tpathStr = path.resolve(pathStr);\n\tconst dirs = await readDir(pathStr);\n\tawait asyncEach(dirs, async dir => {\n\t\tconst dirPath = path.resolve(pathStr, dir);\n\t\tawait unlinkDirectoryStructure(dirPath);\n\t\tawait unlink(dirPath);\n\t});\n}\nexport async function unlink(pathStr: string, recursive: boolean = false, options?: IWalkOptions) {\n\tpathStr = path.resolve(pathStr);\n\tif (recursive) {\n\t\t// Empty all dirs\n\t\tawait walkDirArray(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));\n\t\tawait unlinkDirectoryStructure(pathStr);\n\t} else {\n\t\tif (await isDirectory(pathStr)) {\n\t\t\treturn await fsNative.promises.rmdir(pathStr);\n\t\t}\n\t\tawait fsNative.promises.unlink(pathStr);\n\t}\n}\n\n/**\n * Write text to file\n */\nexport async function writeFile(filename: string, text: string | Buffer) {\n\treturn await fsNative.promises.writeFile(filename, text);\n}\n\n\nexport function walkDirArray(dir: string, options?: IWalkOptions): Promise<string[]> {\n\treturn collectCallbacks(collector => walkDir(dir, collector, options));\n}\n\n/**\n * Walk directory\n * @param dir directory to walk\n * @param cb found files will returned realtime\n */\nexport async function walkDir(dir: string, cb?: (file: string) => void, options?: IWalkOptions): Promise<void> {\n\tif (!await exists(dir)) { throw new Error('no such file or directory: ' + dir); }\n\tlet dirList: string[] = [];\n\tawait asyncEach(await readDir(dir), async (file: string) => {\n\t\tlet pathStr = dir + path.sep + file;\n\t\tif (await isFile(pathStr)) {\n\t\t\tif (options?.filter && !options.filter(pathStr)) return;\n\t\t\tcb?.(pathStr);\n\t\t} else if (await isDirectory(pathStr)) {\n\t\t\tdirList.push(file);\n\t\t}\n\t});\n\tawait asyncEach(dirList, async (dirLevelDown: string) => {\n\t\tawait walkDir(dir + path.sep + dirLevelDown, cb, options);\n\t});\n}\n\nexport function walkDirStructArray(dir: string, options?: IWalkOptions): Promise<string[]> {\n\treturn collectCallbacks(collector => walkDirStruct(dir, collector, options));\n}\nexport async function walkDirStruct(dir: string, cb: (dir: string) => void, options?: IWalkOptions): Promise<void> {\n\tif (!await exists(dir)) { throw new Error('no such file or directory: ' + dir); }\n\tlet dirList: string[] = [];\n\tawait asyncEach(await readDir(dir), async (file: string) => {\n\t\tlet pathStr = path.resolve(dir, file);\n\t\tif (await isDirectory(pathStr)) {\n\t\t\tdirList.push(pathStr);\n\t\t}\n\t});\n\tawait asyncEach(dirList, async (dirLevelDown: string) => {\n\t\tconst dirPath = path.resolve(dir, dirLevelDown);\n\t\tawait walkDirStruct(dirPath, cb, options);\n\t\tif (options?.filter && !options.filter(dirPath)) return;\n\t\tcb?.(dirPath);\n\t});\n}\n\n/**\n * Check if file exists\n */\nexport async function exists(file: string): Promise<boolean> {\n\ttry {\n\t\tlet result = await fsNative.promises.access(file, fsNative.constants.F_OK);\n\t\treturn result === undefined;\n\t} catch (e) {\n\t\t// Because only \"err\" field is returned if not exists\n\t\treturn false;\n\t}\n}\n\n/**\n * Is path a file\n * @param path path to test\n */\nexport async function isFile(path: string): Promise<boolean> {\n\treturn (await stat(path)).isFile();\n}\n/**\n * Is path a directory\n */\nexport async function isDirectory(path: string): Promise<boolean> {\n\treturn (await stat(path)).isDirectory();\n}\n\n/**\n * Wrapper to fs function\n */\nexport function getReadStream(path: string, options = {}) {\n\treturn fsNative.createReadStream(path, options);\n}\n\n/**\n * Wrapper to fs function\n */\nexport function getWriteStream(path: string, options = {}) {\n\treturn fsNative.createWriteStream(path, options);\n}\n"]}

index.ts

@@ -0,4 +1,4 @@
+import { asyncEach, collectCallbacks } from '@meteor-it/utils';
 import fsNative, { Stats } from 'fs';
 import path from 'path';
-import { asyncEach } from '@meteor-it/utils';
 
@@ -65,3 +65,3 @@ type FileHandle = fsNative.promises.FileHandle;
 	if ((await isDirectory(from))) {
-		const dirStruct = (await walkDirStruct(from)).map(e => e.replace(from, to));
+		const dirStruct = (await walkDirStructArray(from)).map(e => e.replace(from, to));
 		try {
@@ -71,3 +71,3 @@ await asyncEach(dirStruct, dir => mkdir(dir, true));
 		try {
-			await asyncEach(await walkDir(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) as any as Promise<void> || copy(f, f.replace(from, to)));
+			await asyncEach(await walkDirArray(from), f => options && options.filter && !options.filter(f) && Promise.resolve(true) as any as Promise<void> || copy(f, f.replace(from, to)));
 		} catch (e) {
@@ -117,3 +117,3 @@ if (e.code !== 'ENOENT') throw e;
 		// Empty all dirs
-		await walkDir(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));
+		await walkDirArray(pathStr, options).then(files => Promise.all(files.map((n) => unlink(n))));
 		await unlinkDirectoryStructure(pathStr);
@@ -135,18 +135,14 @@ } else {
 
+
+export function walkDirArray(dir: string, options?: IWalkOptions): Promise<string[]> {
+	return collectCallbacks(collector => walkDir(dir, collector, options));
+}
+
 /**
  * Walk directory
- * @param dir Directory to walk
- * @param cb If provided, found files will returned realtime. If not - function will return all found files
+ * @param dir directory to walk
+ * @param cb found files will returned realtime
  */
-export async function walkDir(dir: string, options?: IWalkOptions, cb?: (file: string) => void): Promise<string[] | null> {
-	if (!await exists(dir)) { throw new Error('No such file or directory: ' + dir); }
-	let returnValue: string[];
-	let shouldReturn = false;
-	if (!cb) {
-		returnValue = [];
-		shouldReturn = true;
-		cb = (file: string) => {
-			returnValue.push(path.resolve(dir, file));
-		};
-	}
+export async function walkDir(dir: string, cb?: (file: string) => void, options?: IWalkOptions): Promise<void> {
+	if (!await exists(dir)) { throw new Error('no such file or directory: ' + dir); }
 	let dirList: string[] = [];
@@ -156,4 +152,4 @@ await asyncEach(await readDir(dir), async (file: string) => {
 		if (await isFile(pathStr)) {
-			if (options && options.filter && !options.filter(pathStr)) return;
-			cb(pathStr);
+			if (options?.filter && !options.filter(pathStr)) return;
+			cb?.(pathStr);
 		} else if (await isDirectory(pathStr)) {
@@ -164,21 +160,11 @@ dirList.push(file);
 	await asyncEach(dirList, async (dirLevelDown: string) => {
-		await walkDir(dir + path.sep + dirLevelDown, options, cb);
+		await walkDir(dir + path.sep + dirLevelDown, cb, options);
 	});
-	if (shouldReturn) {
-		return returnValue.sort();
-	}
-	return null;
 }
 
-export async function walkDirStruct(dir: string, options?: IWalkOptions, cb?: (dir: string) => void): Promise<string[] | null> {
-	if (!await exists(dir)) { throw new Error('No such file or directory: ' + dir); }
-	let returnValue: string[];
-	let shouldReturn = false;
-	if (!cb) {
-		returnValue = [];
-		shouldReturn = true;
-		cb = (dir: string) => {
-			returnValue.push(dir);
-		};
-	}
+export function walkDirStructArray(dir: string, options?: IWalkOptions): Promise<string[]> {
+	return collectCallbacks(collector => walkDirStruct(dir, collector, options));
+}
+export async function walkDirStruct(dir: string, cb: (dir: string) => void, options?: IWalkOptions): Promise<void> {
+	if (!await exists(dir)) { throw new Error('no such file or directory: ' + dir); }
 	let dirList: string[] = [];
@@ -193,10 +179,6 @@ await asyncEach(await readDir(dir), async (file: string) => {
 		const dirPath = path.resolve(dir, dirLevelDown);
-		await walkDirStruct(dirPath, options, cb);
-		if (options && options.filter && !options.filter(dirPath)) return;
-		cb(dirPath);
+		await walkDirStruct(dirPath, cb, options);
+		if (options?.filter && !options.filter(dirPath)) return;
+		cb?.(dirPath);
 	});
-	if (shouldReturn) {
-		return returnValue.sort();
-	}
-	return null;
 }
@@ -203,0 +185,0 @@

package.json

 {
   "name": "@meteor-it/fs",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "description": "Wrappers for native fs module",
@@ -14,3 +14,3 @@ "module": "index.mjs",
   "dependencies": {
-    "@meteor-it/utils": "^1.3.27"
+    "@meteor-it/utils": "^1.3.29"
   },
@@ -21,3 +21,3 @@ "sideEffects": false,
   },
-  "gitHead": "7b240cacfacfe9f46c45796028c518753cc6f6b1"
+  "gitHead": "45ae37da49e836f0d90dc0a0a395e500fc2f6f1b"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

59904

decreased by-4.24%

Lines of code

837

decreased by-7.31%

Dependency changes

• Updated@meteor-it/utils@^1.3.29