@e-mc/file-manager 0.13.0 → 0.13.1

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.1/lib/index.d.ts)
 
 ```typescript
 import type { ChecksumValue, DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -296,15 +296,15 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.1/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -132,7 +132,7 @@ function bundleTorrent(host, files, mimeType, encoding) {
     return output;
 }
 function recurseDir(output, subDirs, options) {
-    const { ignore, sortBy, recursive } = options;
+    const { ignore, ignoreRoot, sortBy, recursive } = options;
     const baseDir = path.join(...subDirs);
     const items = fs.readdirSync(baseDir, { withFileTypes: true })
         .filter(item => item.name)
@@ -154,7 +154,7 @@ function recurseDir(output, subDirs, options) {
                 output.push(pathname);
             }
         }
-        else if (recursive) {
+        else if (recursive && (subDirs.length > 0 || !ignoreRoot.includes(item.name))) {
             recurseDir(output, subDirs.concat(item.name), options);
         }
     }
@@ -196,7 +196,7 @@ function filterPaths(rootDir, values, options = {}) {
             const [glob, globAbs] = createMatchNegate(include, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (!isMatch(value, glob) && !isMatch(value.substring(rootDir.length), globAbs)) {
+                if (!isMatch(value, globAbs) && !isMatch(value.substring(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
@@ -210,7 +210,7 @@ function filterPaths(rootDir, values, options = {}) {
             const [glob, globAbs] = createMatchNegate(exclude, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (isMatch(value, glob) || isMatch(value.substring(rootDir.length), globAbs)) {
+                if (isMatch(value, globAbs) || isMatch(value.substring(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
@@ -321,7 +321,7 @@ function setBufferTarget(item, buffer) {
     }
 }
 async function doVerifyChecksum(root, from, options, nested) {
-    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = true, joinRoot } = options;
+    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = true, joinRoot } = options;
     const parent = recursive === 1 && typeof verbose !== 'number';
     let algorithm = options.algorithm;
     from ||= checksumFile(algorithm);
@@ -349,7 +349,7 @@ async function doVerifyChecksum(root, from, options, nested) {
         const filename = path.basename(from);
         const files = [];
         from = joinRoot ? path.join(root, filename) : path.resolve(from);
-        recurseDir(files, [root], { ignore: [...ignore, from], sortBy, recursive });
+        recurseDir(files, [root], { ignore: [...ignore, from], ignoreRoot, sortBy, recursive });
         const items = fs.readFileSync(from, 'utf8').split('\n').map(item => {
             const index = item.indexOf(' ');
             return [item.substring(0, index), path.join(root, item.substring(index + 1))];
@@ -1448,13 +1448,13 @@ class FileManager extends core_1.Host {
         else {
             options ||= {};
         }
-        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = false, joinRoot } = options;
+        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = false, joinRoot } = options;
         to ||= checksumFile(algorithm);
         let result = [];
         try {
             const filename = path.basename(to);
             to = joinRoot ? path.join(root, to) : path.resolve(to);
-            recurseDir(result, [root], { ignore: [...ignore, to], sortBy, recursive });
+            recurseDir(result, [root], { ignore: [...ignore, to], ignoreRoot, sortBy, recursive });
             const output = [];
             for (const pathname of result = filterPaths(root, result, options)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,15 +19,15 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.13.0",
-    "@e-mc/compress": "0.13.0",
-    "@e-mc/core": "0.13.0",
-    "@e-mc/document": "0.13.0",
-    "@e-mc/image": "0.13.0",
-    "@e-mc/request": "0.13.0",
-    "@e-mc/task": "0.13.0",
-    "@e-mc/types": "0.13.0",
-    "@e-mc/watch": "0.13.0",
+    "@e-mc/cloud": "0.13.1",
+    "@e-mc/compress": "0.13.1",
+    "@e-mc/core": "0.13.1",
+    "@e-mc/document": "0.13.1",
+    "@e-mc/image": "0.13.1",
+    "@e-mc/request": "0.13.1",
+    "@e-mc/task": "0.13.1",
+    "@e-mc/types": "0.13.1",
+    "@e-mc/watch": "0.13.1",
     "chalk": "4.1.2",
     "diff": "^8.0.2",
     "picomatch": "^4.0.3"