@e-mc/file-manager 0.9.15 → 0.9.16

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.15/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.16/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.15/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.15/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.16/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -7,6 +7,7 @@ const pm = require("picomatch");
 const chalk = require("chalk");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
+const module_1 = require("@e-mc/types/lib/module");
 const util_1 = require("@e-mc/request/util");
 const asset_1 = require("@e-mc/document/asset");
 const util_2 = require("@e-mc/document/util");
@@ -112,7 +113,7 @@ function unsetContent(item) {
         item.buffer = null;
     }
     if ('sourceUTF8' in item) {
-        item.sourceUTF8 = '';
+        item.sourceUTF8 = undefined;
     }
 }
 function bundleTorrent(files, mimeType, encoding) {
@@ -152,7 +153,7 @@ function recurseDir(output, subDirs, options) {
     for (const item of items) {
         if (!item.isDirectory()) {
             const pathname = path.join(baseDir, item.name);
-            if (!ignore.includes(pathname)) {
+            if (!ignore.includes(pathname) && !(item.isSymbolicLink() && core_1.Host.isDir(pathname))) {
                 output.push(pathname);
             }
         }
@@ -193,24 +194,33 @@ function checkHash(localUri, output, options, data) {
     }
     return true;
 }
-function validatePaths(values, patterns, include, dot) {
-    const items = patterns.map(value => !value.startsWith('*') && /[\\/]/.test(value) ? [core_1.Permission.toPosix(path.resolve(value)), { nocase: PLATFORM_WIN32, dot }] : [value.replace(/(?:^\\|\\+)/g, '/'), { matchBase: true, nocase: PLATFORM_WIN32, dot }]);
+function validatePaths(rootDir, values, patterns, include, dot) {
+    const items = patterns.map(value => {
+        let invert = false;
+        if (!include && value.startsWith('!')) {
+            value = value.substring(1);
+            invert = true;
+        }
+        const matchBase = !isMatchRoot(value = core_1.Permission.toPosix(value));
+        return [pm(value, { posixSlashes: true, windows: true, nocase: PLATFORM_WIN32, dot, matchBase }), path.isAbsolute(value), invert];
+    });
     return values.filter(value => {
-        for (const [pattern, options] of items) {
-            if (pm.isMatch(core_1.Permission.toPosix(value), pattern, options)) {
-                return include;
+        for (const [pattern, absolute, invert] of items) {
+            if (pattern(absolute ? value : value.substring(rootDir.length))) {
+                return invert ? !include : include;
             }
         }
         return !include;
     });
 }
-function filterPaths(values, include, exclude, dot) {
+function filterPaths(rootDir, values, include, exclude, dot) {
+    rootDir = core_1.Host.normalizePath(rootDir, module_1.NORMALIZE_FLAGS.ENSURE_DIR);
     if (include) {
         if ((0, types_1.isString)(include)) {
             include = [include];
         }
         if ((0, types_1.isArray)(include)) {
-            return validatePaths(values, include, true, dot);
+            values = validatePaths(rootDir, values, include, true, dot);
         }
     }
     if (exclude) {
@@ -218,7 +228,7 @@ function filterPaths(values, include, exclude, dot) {
             exclude = [exclude];
         }
         if ((0, types_1.isArray)(exclude)) {
-            return validatePaths(values, exclude, false, dot);
+            return validatePaths(rootDir, values, exclude, false, dot);
         }
     }
     return values;
@@ -313,6 +323,7 @@ function rejectModule(err, type, hint) {
 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"})`);
+const isMatchRoot = (value) => !value.startsWith('*') && value.includes('/');
 const isFunction = (value) => typeof value === 'function';
 const ignoreAsset = (item, exists) => item.invalid || (0, types_1.hasBit)(item.flags, 1 | (!exists ? 128 : 0));
 class Scheduler {
@@ -741,10 +752,11 @@ class FileManager extends core_1.Host {
         let result = [];
         try {
             const filename = path.basename(to);
+            const output = [];
             to = joinRoot ? path.join(root, to) : path.resolve(to);
             recurseDir(result, [root], { ignore: [...ignore, to], sortBy, recursive });
-            const output = [];
-            for (const pathname of result = filterPaths(result, include, exclude, options.dot)) {
+            result = filterPaths(root, result, include, exclude, options.dot);
+            for (const pathname of result) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
                     continue;
                 }
@@ -812,7 +824,7 @@ class FileManager extends core_1.Host {
                 const index = item.indexOf(' ');
                 return [item.substring(0, index), path.join(root, item.substring(index + 1))];
             });
-            const checked = include || exclude ? filterPaths(items.map(item => item[1]), include, exclude, options.dot) : null;
+            const checked = include || exclude ? filterPaths(root, items.map(item => item[1]), include, exclude, options.dot) : null;
             let valid;
             for (const [previous, pathname] of items) {
                 if (checked !== null && !checked.includes(pathname) || recursive === 1 && path.basename(pathname) === filename) {

package/package.json

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