@e-mc/file-manager 0.9.22 → 0.9.24

package/README.md

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

package/index.js

@@ -153,9 +153,10 @@ function recurseDir(output, subDirs, options) {
     for (const item of items) {
         if (!item.isDirectory()) {
             const pathname = path.join(baseDir, item.name);
-            if (!ignore.includes(pathname) && !(item.isSymbolicLink() && core_1.Host.isDir(pathname))) {
-                output.push(pathname);
+            if (item.isSymbolicLink() && core_1.Host.isDir(pathname) || ignore.length > 0 && (PLATFORM_WIN32 ? ignore.includes(pathname.toLowerCase()) : ignore.includes(pathname))) {
+                continue;
             }
+            output.push(pathname);
         }
         else if (recursive) {
             recurseDir(output, subDirs.concat(item.name), options);
@@ -320,6 +321,7 @@ function collectErrors() {
 function rejectModule(err, type, hint) {
     this.writeFail(["Handled rejection", this.moduleName + (hint ? ': ' + hint : '')], err, type);
 }
+const mapLower = (values) => PLATFORM_WIN32 ? values.map(value => value.toLowerCase()) : values;
 const padStart = (value, char) => value > 9 ? value.toString() : char + value;
 const checksumFile = (algorithm) => "checksum" + '.' + ((0, types_1.isString)(algorithm) ? algorithm.toLowerCase() : "sha256");
 const checksumError = (algorithm) => new Error("Invalid parameters" + ` (${algorithm || "sha256"})`);
@@ -754,7 +756,7 @@ class FileManager extends core_1.Host {
             const filename = path.basename(to);
             const output = [];
             to = joinRoot ? path.join(root, to) : path.resolve(to);
-            recurseDir(result, [root], { ignore: [...ignore, to], sortBy, recursive });
+            recurseDir(result, [root], { ignore: mapLower([...ignore, to]), sortBy, recursive });
             result = filterPaths(root, result, include, exclude, options.dot);
             for (const pathname of result) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
@@ -819,7 +821,7 @@ class FileManager extends core_1.Host {
             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: mapLower([...ignore, from]), sortBy, recursive });
             const items = fs.readFileSync(from, 'utf-8').split('\n').map(item => {
                 const index = item.indexOf(' ');
                 return [item.substring(0, index), path.join(root, item.substring(index + 1))];
@@ -1577,12 +1579,9 @@ class FileManager extends core_1.Host {
     }
     removeCwd(value) {
         if (typeof value === 'string') {
-            let baseDir = this.baseDirectory + path.sep, leading = value.substring(0, baseDir.length);
-            if (PLATFORM_WIN32) {
-                baseDir = baseDir.toLowerCase();
-                leading = leading.toLowerCase();
-            }
-            if (leading === baseDir) {
+            const baseDir = this.baseDirectory + path.sep;
+            const leading = value.substring(0, baseDir.length);
+            if (leading === baseDir || PLATFORM_WIN32 && leading.toLowerCase() === baseDir.toLowerCase()) {
                 return value.substring(baseDir.length);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.9.22",
+  "version": "0.9.24",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,16 +20,16 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.9.22",
-    "@e-mc/compress": "0.9.22",
-    "@e-mc/core": "0.9.22",
-    "@e-mc/document": "0.9.22",
-    "@e-mc/image": "0.9.22",
-    "@e-mc/request": "0.9.22",
-    "@e-mc/task": "0.9.22",
-    "@e-mc/types": "0.9.22",
-    "@e-mc/watch": "0.9.22",
+    "@e-mc/cloud": "0.9.24",
+    "@e-mc/compress": "0.9.24",
+    "@e-mc/core": "0.9.24",
+    "@e-mc/document": "0.9.24",
+    "@e-mc/image": "0.9.24",
+    "@e-mc/request": "0.9.24",
+    "@e-mc/task": "0.9.24",
+    "@e-mc/types": "0.9.24",
+    "@e-mc/watch": "0.9.24",
     "chalk": "4.1.2",
-    "picomatch": "^4.0.2"
+    "picomatch": "^4.0.3"
   }
 }