@e-mc/module 0.11.7 → 0.11.9

package/README.md

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

package/index.js

@@ -140,7 +140,6 @@ const MEMORY_CACHE_DISK = {
     include: null,
     exclude: null
 };
-const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supported)(18, 17, true);
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
 const REGEXP_PROTOCOL = /^([a-z][a-z\d+-.]*):\/\/[^@:[\]\\^<>|\s]/i;
 const REGEXP_CLIESCAPE = /[^\w+-.,/:@]/g;
@@ -647,7 +646,7 @@ function getCacheTotal() {
     return CACHE_READTEXT.size + CACHE_READBUFFER.size + CACHE_READCJS.size;
 }
 function isMatch(key, value) {
-    return pm.isMatch(key, value, { posixSlashes: true, windows: true, 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);
@@ -984,7 +983,7 @@ class Module extends EventEmitter {
         this[_g] = null;
     }
     static get VERSION() {
-        return "0.11.7";
+        return "0.11.9";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1559,30 +1558,33 @@ 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 || '';
     }
     static isURL(value, ...exclude) {
-        if (exclude.length === 0 && SUPPORTED_CANPARSE) {
-            return URL.canParse(value);
-        }
         const match = REGEXP_PROTOCOL.exec(value);
         return !!match && !exclude.includes(match[1].toLowerCase());
     }
@@ -1950,7 +1952,7 @@ class Module extends EventEmitter {
         if (!(outDir && this.isDir(outDir))) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
-        const pmOpts = { posixSlashes: true, windows: true, nocase: Module.PLATFORM_WIN32 };
+        const pmOpts = PLATFORM_WIN32 ? { nocase: true, posixSlashes: true, windows: true } : {};
         let exclude, excludeDir, recursive;
         if ((0, types_1.isObject)(options)) {
             if (options.matchBase) {
@@ -1969,7 +1971,7 @@ class Module extends EventEmitter {
                 for (const value of items) {
                     const dirEnd = value.endsWith('/') ? /^[^/][^*]+\/$/ : value.endsWith('\\') ? /^[^\\][^*]+\\$/ : null;
                     if (dirEnd?.test(value) && !(0, types_1.hasGlob)(value)) {
-                        (excludeDir ||= []).push(this.normalizePath(value, 4));
+                        (excludeDir ||= []).push(this.toPosix(value, true));
                     }
                     else {
                         exclude.push(value);
@@ -2806,7 +2808,7 @@ class Module extends EventEmitter {
                     dir = dir.substring(ensureDir(PROCESS_CWD).length);
                 }
                 else {
-                    this.formatMessage(1, "WARN!", 'Temp directory can only be relative', dir, { ...this.LOG_STYLE_WARN, newline: true });
+                    this.formatMessage(1, "WARN!", "Not permitted to set absolute path", dir, { ...this.LOG_STYLE_WARN, newline: true });
                     dir = VALUES["temp.dir"];
                 }
             }

package/package.json

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

package/lib-v4.js

@@ -1,158 +0,0 @@
-"use strict";
-exports.validateUUID = exports.renameExt = exports.isString = exports.isPlainObject = exports.isObject = exports.formatSize = exports.escapePattern = exports.toTimeMs = exports.coerceObject = exports.cloneObject = exports.asFunction = void 0;
-exports.hasSize = hasSize;
-exports.getSize = getSize;
-exports.hasSameStat = hasSameStat;
-exports.byteLength = byteLength;
-exports.cleanupStream = cleanupStream;
-exports.generateUUID = generateUUID;
-exports.existsSafe = existsSafe;
-exports.isFileHTTP = isFileHTTP;
-exports.isFileUNC = isFileUNC;
-exports.isPathUNC = isPathUNC;
-exports.readFileSafe = readFileSafe;
-exports.getFunctions = getFunctions;
-exports.allSettled = allSettled;
-const path = require("path");
-const fs = require("fs");
-const types_1 = require("@e-mc/types");
-Object.defineProperty(exports, "asFunction", { enumerable: true, get: function () { return types_1.asFunction; } });
-Object.defineProperty(exports, "cloneObject", { enumerable: true, get: function () { return types_1.cloneObject; } });
-Object.defineProperty(exports, "coerceObject", { enumerable: true, get: function () { return types_1.coerceObject; } });
-Object.defineProperty(exports, "toTimeMs", { enumerable: true, get: function () { return types_1.convertTime; } });
-Object.defineProperty(exports, "escapePattern", { enumerable: true, get: function () { return types_1.escapePattern; } });
-Object.defineProperty(exports, "formatSize", { enumerable: true, get: function () { return types_1.formatSize; } });
-Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
-Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return types_1.isPlainObject; } });
-Object.defineProperty(exports, "isString", { enumerable: true, get: function () { return types_1.isString; } });
-Object.defineProperty(exports, "renameExt", { enumerable: true, get: function () { return types_1.renameExt; } });
-Object.defineProperty(exports, "validateUUID", { enumerable: true, get: function () { return types_1.validateUUID; } });
-const index_1 = require("@e-mc/module");
-function hasSize(value, keepEmpty) {
-    try {
-        const statSrc = fs.statSync(value);
-        if (statSrc.size > 0) {
-            return true;
-        }
-        if (!keepEmpty) {
-            fs.unlinkSync(value);
-        }
-    }
-    catch {
-    }
-    return false;
-}
-function getSize(value, diskUsed) {
-    try {
-        return fs[diskUsed ? 'lstatSync' : 'statSync'](value).size;
-    }
-    catch {
-        return 0;
-    }
-}
-function hasSameStat(src, dest, keepEmpty) {
-    try {
-        if (fs.existsSync(dest)) {
-            const { size, mtimeMs } = fs.statSync(src);
-            if (size > 0) {
-                const statDest = fs.statSync(dest);
-                return size === statDest.size && mtimeMs === statDest.mtimeMs;
-            }
-            if (!keepEmpty) {
-                fs.unlinkSync(src);
-            }
-        }
-    }
-    catch {
-    }
-    return false;
-}
-function byteLength(value, encoding) {
-    return typeof value === 'string' && (path.isAbsolute(value) || index_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
-}
-function cleanupStream(stream, uri) {
-    stream.removeAllListeners();
-    stream.destroy();
-    try {
-        if (uri && fs.existsSync(uri)) {
-            fs.unlinkSync(uri);
-        }
-    }
-    catch (err) {
-        if (!index_1.isErrorCode(err, 'ENOENT')) {
-            index_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
-        }
-    }
-}
-function generateUUID(format, dictionary) {
-    return format ? (0, types_1.randomString)(format, dictionary) : (0, types_1.generateUUID)();
-}
-function existsSafe(value, isFile) {
-    return index_1.isPath(value, isFile);
-}
-function isFileHTTP(value) {
-    return index_1.isFile(value, 'http/s');
-}
-function isFileUNC(value) {
-    return index_1.isFile(value, 'unc');
-}
-function isPathUNC(value) {
-    return index_1.isPath(value, 'unc');
-}
-async function readFileSafe(value, encoding, cache) {
-    return encoding === 'buffer' ? index_1.readBuffer(value, cache) : index_1.readText(value, encoding, cache);
-}
-function getFunctions(values, absolute, sync = true, outFailed) {
-    let options, context;
-    if ((0, types_1.isObject)(absolute)) {
-        options = absolute;
-        ({ context, outFailed } = absolute);
-        if (options.external === undefined) {
-            options.external = true;
-        }
-    }
-    else {
-        options = { external: true, absolute, sync };
-    }
-    const result = [];
-    for (const value of values) {
-        let method = null;
-        if (typeof value === 'string') {
-            method = index_1.parseFunction(value, options);
-        }
-        else if (typeof value === 'function') {
-            method = value;
-            if (context !== undefined) {
-                method.bind(context);
-            }
-        }
-        if (method) {
-            result.push(method);
-        }
-        else if (outFailed) {
-            outFailed.push(index_1.asString(value) || "Unknown");
-        }
-    }
-    return result;
-}
-async function allSettled(tasks, rejected, options) {
-    if (rejected) {
-        return Promise.allSettled(tasks).then(result => {
-            const items = [];
-            for (const item of result) {
-                if (item.status === 'fulfilled') {
-                    items.push(item);
-                }
-                else if (item.reason) {
-                    index_1.writeFail(rejected, item.reason, options);
-                }
-            }
-            return items;
-        })
-            .catch((err) => {
-            index_1.writeFail(rejected, err, options);
-            return [];
-        });
-    }
-    return Promise.allSettled(tasks);
-}