@e-mc/file-manager 0.11.10 → 0.11.12

package/README.md

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

package/index.js

@@ -175,9 +175,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 && (core_1.Host.PLATFORM_WIN32 ? ignore.includes(pathname.toLowerCase()) : ignore.includes(pathname))) {
+                continue;
             }
+            output.push(pathname);
         }
         else if (recursive) {
             recurseDir(output, subDirs.concat(item.name), options);
@@ -547,7 +548,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: 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))];
@@ -682,6 +683,7 @@ const isCacheable = (item) => item.initialValue?.cacheable !== false;
 const getPmOptions = (value, { matchBase = value.startsWith('*') && !value.includes('/'), dot = false } = {}) => ({ matchBase, nocase: core_1.Host.PLATFORM_WIN32, dot });
 const hasIncremental = (value) => value === "etag" || value === "exists";
 const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
+const mapLower = (values) => core_1.Host.PLATFORM_WIN32 ? values.map(value => value.toLowerCase()) : values;
 const equalAddress = (value, other) => value === other || decodeURIComponent(value) === decodeURIComponent(other);
 const formatPercent = (value) => Math.round(value).toString().padStart(3) + '%';
 const checkEOF = (value) => /\n$/.test(value) ? value : value + '\n';
@@ -1608,7 +1610,7 @@ class FileManager extends core_1.Host {
         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: mapLower([...ignore, to]), sortBy, recursive });
             const output = [];
             for (const pathname of result = filterPaths(root, result, include, exclude, options)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
@@ -2272,12 +2274,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 (core_1.Host.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 || core_1.Host.PLATFORM_WIN32 && leading.toLowerCase() === baseDir.toLowerCase()) {
                 return value.substring(baseDir.length);
             }
         }
@@ -3982,11 +3981,11 @@ class FileManager extends core_1.Host {
                     if (cleared) {
                         last = item;
                     }
+                    else if (!redraw && scroll[i] === item) {
+                        PROCESS_STDOUT.moveCursor(0, 1);
+                        continue;
+                    }
                     else {
-                        if (!redraw && scroll[i] === item) {
-                            PROCESS_STDOUT.moveCursor(0, 1);
-                            continue;
-                        }
                         const options = { ...item[4], messageTextWrap, broadcastId: '' };
                         if (!useColor) {
                             options.useColor = false;

package/package.json

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