@e-mc/module 0.9.19 → 0.9.20

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.19/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.20/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -394,11 +394,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.19/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.19/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.19/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.19/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.19/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.20/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.20/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.20/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.20/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.20/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -535,7 +535,7 @@ function addCacheItem(map, key, data, cache) {
     key = Module.toPosix(key, true);
     if (!cache) {
         if (MEMORY_CACHE_DISK.include) {
-            if (!MEMORY_CACHE_DISK.include.some(value => pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') }))) {
+            if (!MEMORY_CACHE_DISK.include.some(value => isMatch(key, value))) {
                 return;
             }
         }
@@ -543,13 +543,16 @@ function addCacheItem(map, key, data, cache) {
             cache = true;
         }
     }
-    if (!(cache && MEMORY_CACHE_DISK.exclude?.some(value => pm.isMatch(key, value, { nocase: PLATFORM_WIN32, matchBase: value.startsWith('*') })))) {
+    if (!(cache && MEMORY_CACHE_DISK.exclude?.some(value => isMatch(key, value)))) {
         if (!map.has(key)) {
             ++CACHE_TOTAL;
         }
         map.set(key, [Date.now(), data]);
     }
 }
+function isMatch(key, value) {
+    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);
     fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
@@ -741,7 +744,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.19"; }
+    static get VERSION() { return "0.9.20"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1333,22 +1336,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 || '';

package/package.json

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