@e-mc/module 0.10.3 → 0.10.5

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.3/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.5/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -407,11 +407,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.3/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.3/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.3/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.3/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.3/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.5/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.5/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.5/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.5/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.5/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -629,17 +629,21 @@ function getCacheTotal() {
 function isMatch(key, value) {
     return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') });
 }
-function listDir(src, paths, depth, include, exclude, outFiles) {
+function listDir(src, paths, depth, include, exclude, excludeDir, outFiles) {
     const srcDir = path.join(src, ...paths);
     fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
         if (file.isFile()) {
             const pathname = path.join(srcDir, file.name);
-            if (include(pathname) && !exclude?.(pathname)) {
+            const pathglob = pathname.substring(src.length);
+            if (include(pathglob) && !exclude?.(pathglob)) {
                 outFiles.push(pathname);
             }
         }
         else if (depth > 0 && file.isDirectory()) {
-            listDir(src, paths.concat(file.name), depth - 1, include, exclude, outFiles);
+            const subDirs = paths.concat(file.name);
+            if (!excludeDir?.includes(subDirs.join('/') + '/')) {
+                listDir(src, subDirs, depth - 1, include, exclude, excludeDir, outFiles);
+            }
         }
     });
 }
@@ -957,7 +961,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.3";
+        return "0.10.5";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1924,7 +1928,7 @@ class Module extends EventEmitter {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
         const pmOpts = { posixSlashes: true, windows: true, nocase: PLATFORM_WIN32 };
-        let exclude, recursive;
+        let exclude, excludeDir, recursive;
         if ((0, types_1.isObject)(options)) {
             if (options.matchBase) {
                 pmOpts.matchBase = true;
@@ -1936,13 +1940,25 @@ class Module extends EventEmitter {
                 pmOpts.dot = true;
             }
             ({ exclude, recursive } = options);
+            if (exclude) {
+                const items = Array.isArray(exclude) ? exclude : [exclude];
+                exclude = [];
+                for (const value of items) {
+                    if (/^[^\\/][^*]+[\\/]$/.test(value) && !(0, types_1.hasGlob)(value)) {
+                        (excludeDir ||= []).push(this.normalizePath(value, 4));
+                    }
+                    else {
+                        exclude.push(value);
+                    }
+                }
+            }
         }
         else {
             recursive = options;
         }
         recursive ??= true;
         const result = [];
-        listDir(outDir, [], !recursive ? 0 : typeof recursive === 'number' ? recursive : Infinity, pm(pattern, pmOpts), exclude ? pm(exclude, pmOpts) : undefined, result);
+        listDir(ensureDir(outDir), [], !recursive ? 0 : typeof recursive === 'number' ? recursive : Infinity, pm(pattern, pmOpts), exclude?.length ? pm(exclude, pmOpts) : undefined, excludeDir, result);
         return result;
     }
     static renameFile(src, dest, throws = true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,7 +20,7 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.10.3",
+    "@e-mc/types": "0.10.5",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",