@e-mc/module 0.10.11 → 0.10.12

package/README.md

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

package/index.js

@@ -627,7 +627,7 @@ function getCacheTotal() {
     return CACHE_READTEXT.size + CACHE_READBUFFER.size + CACHE_READCJS.size;
 }
 function isMatch(key, value) {
-    return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') });
+    return pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') && !value.includes('/') });
 }
 function listDir(src, paths, depth, include, exclude, excludeDir, outFiles) {
     const srcDir = path.join(src, ...paths);
@@ -960,7 +960,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.10.11";
+        return "0.10.12";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1533,22 +1533,28 @@ class Module extends EventEmitter {
             filename = undefined;
         }
         if (typeof value === 'string') {
-            let pathname = PLATFORM_WIN32 ? value.trim() : value, convert = true;
+            let pathname = PLATFORM_WIN32 ? value.trim() : value;
             if (normalize) {
                 pathname = path.normalize(pathname);
-                convert = PLATFORM_WIN32;
             }
-            if (convert) {
+            if (PLATFORM_WIN32) {
                 pathname = pathname.replace(/(?:^\\|\\+)/g, '/');
             }
-            if (pathname = pathname.replace(/\/+$/, '')) {
+            if (pathname) {
+                pathname = pathname.replace(/(?<!^)\/+$/, '');
                 if (normalize && PLATFORM_WIN32) {
                     const match = /^([A-Z]):\//.exec(pathname);
                     if (match) {
                         pathname = match[1].toLowerCase() + pathname.substring(1);
                     }
                 }
-                return pathname + (filename ? '/' + filename : '');
+                if (!filename) {
+                    return pathname;
+                }
+                if (pathname !== '/') {
+                    pathname += '/';
+                }
+                return pathname + filename;
             }
         }
         return filename || '';
@@ -1922,7 +1928,7 @@ class Module extends EventEmitter {
         if (!(outDir && this.isDir(outDir))) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
-        const pmOpts = { posixSlashes: true, windows: true, nocase: PLATFORM_WIN32 };
+        const pmOpts = PLATFORM_WIN32 ? { nocase: true, windows: true, posixSlashes: true } : {};
         let exclude, excludeDir, recursive;
         if ((0, types_1.isObject)(options)) {
             if (options.matchBase) {
@@ -1939,8 +1945,9 @@ class Module extends EventEmitter {
                 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));
+                    const dirEnd = value.endsWith('/') ? /^[^/][^*]+\/$/ : value.endsWith('\\') ? /^[^\\][^*]+\\$/ : null;
+                    if (dirEnd?.test(value) && !(0, types_1.hasGlob)(value)) {
+                        (excludeDir ||= []).push(this.toPosix(value, true));
                     }
                     else {
                         exclude.push(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "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.11",
+    "@e-mc/types": "0.10.12",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",