@e-mc/module 0.9.5 → 0.9.7

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.5/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.7/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -177,10 +177,8 @@ interface ModuleConstructor {
     parseFunction(value: unknown, options?: ParseFunctionOptions): ((...args: unknown[]) => Promise<unknown> | unknown) | null;
     parseFunction(value: unknown, absolute: boolean, sync?: boolean): ((...args: unknown[]) => Promise<unknown> | unknown) | null;
     asString(value: unknown, cacheKey?: boolean | "throws"): string;
-    asHash(data: BinaryLike, minLength: number): string;
-    asHash(data: BinaryLike, algorithm: string, minLength?: number): string;
-    asHash(data: BinaryLike, algorithm?: string, options?: AsHashOptions): string;
-    asHash(data: BinaryLike, options?: AsHashOptions): string;
+    asHash(data: BinaryLike, options: AsHashOptions): string;
+    asHash(data: BinaryLike, algorithm?: unknown, digest?: unknown): string;
     readHash(value: string | URL, options?: ReadHashOptions): Promise<string>;
     toPosix(value: unknown, normalize: boolean): string;
     toPosix(value: unknown, filename?: string, normalize?: boolean): string;
@@ -391,11 +389,11 @@ type ForegroundColor = typeof IForegroundColor | `#${string}`;
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.5/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.5/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.5/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.5/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.5/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.7/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.7/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.7/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.7/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.7/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -129,6 +129,25 @@ const MEMORY_CACHE_DISK = {
     exclude: null
 };
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
+const RESERVED_SHELL = [
+    'if',
+    'then',
+    'elif',
+    'else',
+    'fi',
+    'time',
+    'for',
+    'in',
+    'until',
+    'while',
+    'do',
+    'done',
+    'case',
+    'esac',
+    'coproc',
+    'select',
+    'function'
+];
 let LOG_NEWLINE = true;
 let LOG_EMPTYLINE = false;
 let TEMP_DIR = path.join(PROCESS_CWD, "tmp");
@@ -532,7 +551,7 @@ function addCacheItem(map, key, data, cache) {
 }
 function checkFunction(value) {
     if (typeof value === 'function') {
-        Object.defineProperty(value, "__cjs__", { value: true });
+        Object.defineProperty(value, "__cjs__", { value: true, writable: false, enumerable: false });
         return value;
     }
     return null;
@@ -645,9 +664,16 @@ function applyLogId(options) {
     }
     return options;
 }
-function withinDir(value, base) {
+function withinDir(value, base, override = false) {
     value = path.normalize(value);
-    return (PLATFORM_WIN32 ? value.toLowerCase() : value).startsWith(ensureDir(PLATFORM_WIN32 ? base.toLowerCase() : base));
+    if (PLATFORM_WIN32) {
+        value = value.toLowerCase();
+        base = ensureDir(base.toLowerCase());
+    }
+    else {
+        base = ensureDir(base);
+    }
+    return value.startsWith(base) && (value !== base || override);
 }
 function formatPercent(value, precision) {
     if (value <= 0) {
@@ -696,7 +722,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.9.5"; }
+    static get VERSION() { return "0.9.7"; }
     static get LOG_TYPE() { return types_1.LOG_TYPE; }
     static get STATUS_TYPE() { return types_1.STATUS_TYPE; }
     static get MAX_TIMEOUT() { return 2147483647; }
@@ -1164,13 +1190,16 @@ class Module extends EventEmitter {
         return null;
     }
     static asString(value, cacheKey) {
-        if ((0, types_1.isEmpty)(value)) {
+        if (value === undefined) {
             return '';
         }
         switch (typeof value) {
             case 'string':
                 return value;
             case 'object':
+                if (value === null) {
+                    return '';
+                }
                 if (value.constructor === Object || Object.getPrototypeOf(value) === null) {
                     if (Object.keys(value).length === 0) {
                         return '';
@@ -1211,40 +1240,34 @@ class Module extends EventEmitter {
         }
         return cacheKey ? (0, types_1.generateUUID)() : '';
     }
-    static asHash(data, algorithm, minLength = 0) {
-        if (!algorithm && !minLength) {
+    static asHash(data, algorithm, digest) {
+        if (!algorithm && !digest) {
             return crypto.createHash("sha256").update(data).digest("hex");
         }
-        let options, digest;
-        if (typeof minLength !== 'number') {
-            options = minLength;
-            minLength = 0;
-        }
-        if (typeof algorithm === 'number') {
-            minLength = algorithm;
-            algorithm = undefined;
-        }
-        else if ((0, types_1.isObject)(algorithm)) {
-            options = algorithm;
-            algorithm = undefined;
-        }
-        if (options) {
-            options = { ...options };
-            if ('minLength' in options) {
-                minLength = options.minLength;
-                delete options.minLength;
-            }
+        let options;
+        if ((0, types_1.isObject)(algorithm)) {
+            options = { ...algorithm };
             if ('algorithm' in options) {
                 algorithm = options.algorithm;
                 delete options.algorithm;
             }
+            else {
+                algorithm = undefined;
+            }
             if ('digest' in options) {
                 digest = options.digest;
                 delete options.digest;
             }
+            else {
+                digest = undefined;
+            }
+        }
+        else if ((0, types_1.isObject)(digest)) {
+            options = digest;
+            digest = undefined;
         }
-        if (minLength > 0 && typeof data === 'string' && data.length > minLength) {
-            return data;
+        else if (typeof digest !== 'string') {
+            digest = undefined;
         }
         try {
             return crypto.createHash(algorithm || "sha256", options).update(data).digest(digest || "hex");
@@ -2132,6 +2155,9 @@ class Module extends EventEmitter {
                                 value = "'" + value.replace(/'/g, "'\\''") + "'";
                             }
                         }
+                        else if (RESERVED_SHELL.includes(value)) {
+                            value = "'" + value + "'";
+                        }
                     }
                 }
                 else if (opt) {
@@ -2518,7 +2544,7 @@ class Module extends EventEmitter {
             }
         } while ((dir !== "tmp") && (dir = "tmp"));
         if (modified) {
-            this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writeable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
+            this.formatMessage(1, 'TEMP', ["Directory was modified", dir], TEMP_DIR + (VALUES["temp.write"] ? ' - writable' : ''), { ...this.LOG_STYLE_NOTICE, newline: true });
         }
         settings.temp_dir = dir;
         if ((0, types_1.isPlainObject)(temp)) {
@@ -2607,7 +2633,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCRead(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCRead() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskRead(uri) || ownPermissionOnly && !permission.getDiskRead()))) {
             return true;
         }
-        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["permission.home_read"] && withinDir(uri, OS_HOMEDIR, true);
     }
     canWrite(uri, options) {
         let permission = this.permission, ownPermissionOnly = false;
@@ -2631,7 +2657,7 @@ class Module extends EventEmitter {
         if (permission && (Module.isFile(uri, 'unc') ? permission.hasUNCWrite(path.normalize(uri)) || ownPermissionOnly && !permission.getUNCWrite() : path.isAbsolute(uri = path.resolve(uri)) && (permission.hasDiskWrite(uri) || ownPermissionOnly && !permission.getDiskWrite()))) {
             return true;
         }
-        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR);
+        return VALUES["temp.write"] && withinDir(uri, TEMP_DIR, true) || VALUES["permission.home_write"] && withinDir(uri, OS_HOMEDIR, true);
     }
     readFile(src, options = {}, callback) {
         let promises, outSrc;

package/package.json

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