pwd-fs 3.2.3 → 3.3.0

package/dist/src/recurse-io.js

@@ -3,16 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mkdir = exports.remove = exports.copy = exports.chown = exports.chmod = void 0;
+exports.chmod = chmod;
+exports.chown = chown;
+exports.copy = copy;
+exports.remove = remove;
+exports.mkdir = mkdir;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const { sep } = node_path_1.default;
 function chmod(src, mode, callback) {
     let reduce = 0;
     node_fs_1.default.stat(src, (err, stats) => {
-        if (err) {
+        if (err)
             return callback(err);
-        }
         if (stats.isDirectory()) {
             node_fs_1.default.readdir(src, (err, list) => {
                 if (err) {
@@ -21,9 +23,9 @@ function chmod(src, mode, callback) {
                 if (list.length === 0) {
                     return node_fs_1.default.chmod(src, mode, callback);
                 }
-                reduce += list.length;
+                reduce = list.length;
                 for (const loc of list) {
-                    chmod(`${src}${sep}${loc}`, mode, (err) => {
+                    chmod(node_path_1.default.join(src, loc), mode, (err) => {
                         if (err) {
                             return callback(err);
                         }
@@ -39,7 +41,6 @@ function chmod(src, mode, callback) {
         }
     });
 }
-exports.chmod = chmod;
 function chown(src, uid, gid, callback) {
     let reduce = 0;
     node_fs_1.default.stat(src, (err, stats) => {
@@ -60,9 +61,9 @@ function chown(src, uid, gid, callback) {
                 if (list.length === 0) {
                     return node_fs_1.default.chown(src, uid, gid, callback);
                 }
-                reduce += list.length;
+                reduce = list.length;
                 for (const loc of list) {
-                    chown(`${src}${sep}${loc}`, uid, gid, (err) => {
+                    chown(node_path_1.default.join(src, loc), uid, gid, (err) => {
                         if (err) {
                             return callback(err);
                         }
@@ -78,9 +79,7 @@ function chown(src, uid, gid, callback) {
         }
     });
 }
-exports.chown = chown;
 function copy(src, dir, umask, callback) {
-    let reduce = 0;
     node_fs_1.default.stat(src, (err, stat) => {
         if (err) {
             return callback(err);
@@ -90,20 +89,22 @@ function copy(src, dir, umask, callback) {
                 if (err) {
                     return callback(err);
                 }
-                reduce += list.length;
-                const paths = src.split(sep);
-                const loc = paths[paths.length - 1];
+                const loc = node_path_1.default.basename(src);
+                const destDir = node_path_1.default.join(dir, loc);
                 const mode = 0o777 - umask;
-                dir = `${dir}${sep}${loc}`;
-                node_fs_1.default.mkdir(dir, { mode }, (err) => {
+                node_fs_1.default.mkdir(destDir, { mode }, (err) => {
                     if (err) {
+                        if (err.code === 'EEXIST') {
+                            err = new Error(`Target already exists: ${destDir}`);
+                        }
                         return callback(err);
                     }
-                    if (reduce === 0) {
+                    if (list.length === 0) {
                         return callback(null);
                     }
-                    for (const loc of list) {
-                        copy(`${src}${sep}${loc}`, dir, umask, (err) => {
+                    let reduce = list.length;
+                    for (const item of list) {
+                        copy(node_path_1.default.join(src, item), destDir, umask, (err) => {
                             if (err) {
                                 return callback(err);
                             }
@@ -116,22 +117,18 @@ function copy(src, dir, umask, callback) {
             });
         }
         else {
-            const mode = 0o666 - umask;
             const loc = node_path_1.default.basename(src);
+            const dest = node_path_1.default.join(dir, loc);
+            const mode = 0o666 - umask;
             const readStream = node_fs_1.default.createReadStream(src);
-            const writeStream = node_fs_1.default.createWriteStream(`${dir}${sep}${loc}`, {
-                mode
-            });
+            const writeStream = node_fs_1.default.createWriteStream(dest, { mode });
             readStream.on('error', callback);
             writeStream.on('error', callback);
-            writeStream.on('close', () => {
-                callback(null);
-            });
+            writeStream.on('close', () => callback(null));
             readStream.pipe(writeStream);
         }
     });
 }
-exports.copy = copy;
 function remove(src, callback) {
     node_fs_1.default.stat(src, (err, stat) => {
         if (err) {
@@ -142,12 +139,12 @@ function remove(src, callback) {
                 if (err) {
                     return callback(err);
                 }
-                let reduce = list.length;
-                if (reduce === 0) {
+                if (list.length === 0) {
                     return node_fs_1.default.rmdir(src, callback);
                 }
+                let reduce = list.length;
                 for (const loc of list) {
-                    remove(`${src}${sep}${loc}`, (err) => {
+                    remove(node_path_1.default.join(src, loc), (err) => {
                         if (err) {
                             return callback(err);
                         }
@@ -163,35 +160,30 @@ function remove(src, callback) {
         }
     });
 }
-exports.remove = remove;
 function mkdir(dir, umask, callback) {
     const cwd = process.cwd();
     if (dir === cwd) {
         return callback(null);
     }
-    const sequence = function* (dir, files, mode) {
-        const iter = yield;
-        for (const item of files) {
-            dir += `${sep}${item}`;
-            node_fs_1.default.mkdir(dir, { mode }, (err) => {
-                if (err && err.errno !== -17) {
-                    return callback(err);
-                }
-                iter.next();
-            });
-            yield;
+    let base = '';
+    const mode = 0o777 - umask;
+    if (dir.startsWith(cwd)) {
+        base = cwd;
+        dir = dir.slice(cwd.length);
+    }
+    const parts = dir.split(node_path_1.default.sep).filter(Boolean);
+    function next(index) {
+        if (index >= parts.length) {
+            return callback(null);
         }
-        callback(null);
-    };
-    let use = '';
-    if (dir.indexOf(cwd) === 0) {
-        use = cwd;
-        dir = dir.substring(cwd.length);
+        base = node_path_1.default.join(base, parts[index]);
+        node_fs_1.default.mkdir(base, { mode }, (err) => {
+            if (err && err.code !== 'EEXIST') {
+                return callback(err);
+            }
+            next(index + 1);
+        });
     }
-    const files = dir.split(sep);
-    const mode = 0o777 - umask;
-    const iter = sequence(use, files, mode);
-    iter.next();
-    iter.next(iter);
+    next(0);
 }
-exports.mkdir = mkdir;
+//# sourceMappingURL=recurse-io.js.map

package/dist/src/recurse-io.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recurse-io.js","sourceRoot":"","sources":["../../src/recurse-io.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pwd-fs",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "Extend the file system the capabilities of declaring the present working directory and recursive execution",
   "keywords": [
     "umask",
@@ -36,11 +36,12 @@
     "test": "mocha ./dist/test"
   },
   "devDependencies": {
-    "@types/chance": "^1.1.6",
-    "@types/mocha": "^10.0.6",
-    "chance": "^1.1.11",
-    "expect": "^29.7.0",
-    "mocha": "^10.4.0",
-    "typescript": "^5.4.5"
+    "@types/chance": "^1.1.7",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.5.1",
+    "chance": "^1.1.13",
+    "expect": "^30.1.2",
+    "mocha": "^11.7.2",
+    "typescript": "^5.9.2"
   }
 }

package/src/bitmask.ts

@@ -1,20 +1,13 @@
-export function bitmask(mode: number) {
-  const type = typeof mode;
-
-  if (type !== 'number') {
-    throw new Error(
-      `Argument of type '${type}' is not assignable to parameter of type 'number'.`
-    );
+export function bitmask(mode: number): number {
+  if (typeof mode !== 'number') {
+    throw new TypeError(`Expected 'number', got '${typeof mode}'`);
   }
 
-  const permissions: number[] = [ 0o400, 0o200, 0o100, 0o040, 0o020, 0o010, 0o004, 0o002, 0o001 ];
-  let umask = 0o000;
-
-  for (const flag of permissions) {
-    if (mode & flag) {
-      umask += flag;
-    }
-  }
+  const permissions: number[] = [
+    0o400, 0o200, 0o100, 0o040, 0o020, 0o010, 0o004, 0o002, 0o001
+  ];
 
-  return umask;
-}
+  return permissions.reduce((umask, flag) => {
+    return (mode & flag) ? umask + flag : umask;
+  }, 0);
+}

package/src/index.ts

@@ -1,7 +1,5 @@
 import { PoweredFileSystem } from './powered-file-system';
 
 export const pfs = new PoweredFileSystem();
-
 export default PoweredFileSystem;
-
 export * from './powered-file-system';