@e-mc/module 0.8.18 → 0.8.20

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.18/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.20/lib/index.d.ts
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -231,10 +231,10 @@ interface ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.18/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.18/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.18/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.18/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.20/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.20/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.20/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.20/lib/node.d.ts
 
 ## LICENSE
 

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { ModuleConstructor } from '../types/lib';
-
-declare const Module: ModuleConstructor;
-
+import type { ModuleConstructor } from '@e-mc/types/lib';
+
+declare const Module: ModuleConstructor;
+
 export = Module;

package/index.js

@@ -106,6 +106,7 @@ const VALUES = {
     ["node.process.cpu_usage"]: true,
     ["node.process.memory_usage"]: true,
     ["node.process.inline"]: true,
+    ["node.settings.package_manager"]: '',
     ["temp.dir"]: "tmp",
     ["temp.write"]: false,
     ["process.password"]: '',
@@ -171,12 +172,12 @@ function setPnpmVer() {
                     return false;
                 }
                 const addPackage = (value) => {
-                    let index = value.indexOf('(');
+                    let index = (value = value.replace(/^\//, '')).indexOf('(');
                     if (index !== -1) {
                         value = value.substring(0, index);
                     }
-                    index = value.lastIndexOf(value.indexOf('@', 2) !== -1 ? '@' : '/');
-                    const name = value.substring(1, index);
+                    index = value.lastIndexOf(value.indexOf('@', 1) !== -1 ? '@' : '/');
+                    const name = value.substring(0, index);
                     const version = value.substring(index + 1);
                     if (!items.find(item => item[0] === name && item[1] === version)) {
                         items.push([name, version]);
@@ -714,7 +715,7 @@ class Module extends EventEmitter {
         this[_f] = new AbortController();
         this[_g] = null;
     }
-    static get VERSION() { return "0.8.18"; }
+    static get VERSION() { return "0.8.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; }
@@ -756,6 +757,7 @@ class Module extends EventEmitter {
             case "error.fatal":
                 return VALUES[key];
             case "node.require.ext":
+            case "node.settings.package_manager":
             case "process.password":
             case "process.cipher.algorithm":
                 return VALUES[key] !== '';
@@ -2090,8 +2092,8 @@ class Module extends EventEmitter {
     }
     static sanitizeArgs(values, doubleQuote) {
         const result = typeof values === 'string' ? [values] : values;
-        const pattern = /[^0-9a-z%+-./:=@_]/gi;
-        const sanitize = (value) => value.replace(pattern, capture => (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
+        const pattern = /[^\w+-.,/:@]/g;
+        const sanitize = (value) => value.replace(pattern, capture => capture === '\n' ? "'\n'" : (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
         for (let i = 0; i < result.length; ++i) {
             let value = result[i].trim(), leading = '';
             if (value !== '--') {
@@ -2204,8 +2206,8 @@ class Module extends EventEmitter {
         }
     }
     static loadSettings(settings, password) {
-        var _h;
-        var _j;
+        var _h, _j;
+        var _k;
         const current = VALUES["process.password"];
         if (current) {
             const proc = settings.process || {};
@@ -2260,6 +2262,17 @@ class Module extends EventEmitter {
                     VALUES["node.require.inline"] = inline;
                 }
             }
+            const manager = (_j = node.settings) === null || _j === void 0 ? void 0 : _j.package_manager;
+            switch (manager) {
+                case 'npm':
+                case 'yarn':
+                case 'pnpm':
+                    VALUES["node.settings.package_manager"] = manager;
+                    break;
+                default:
+                    VALUES["node.settings.package_manager"] = '';
+                    break;
+            }
         }
         if ((0, types_1.isPlainObject)(settings.process)) {
             const { env, cipher, password: pwd } = settings.process;
@@ -2267,7 +2280,7 @@ class Module extends EventEmitter {
                 VALUES["process.env.apply"] = env.apply;
             }
             if ((0, types_1.isString)(pwd)) {
-                VALUES[_j = "process.password"] || (VALUES[_j] = encryptMessage(pwd, cipher));
+                VALUES[_k = "process.password"] || (VALUES[_k] = encryptMessage(pwd, cipher));
             }
         }
         if ((0, types_1.isPlainObject)(memory === null || memory === void 0 ? void 0 : memory.settings)) {
@@ -3347,7 +3360,7 @@ class Module extends EventEmitter {
             if (typeof options === 'number') {
                 options = undefined;
             }
-            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: 'npm', args: ['i', name] } });
+            this.writeFail("Unknown", err, { ...options, type: types_1.LOG_TYPE.SYSTEM, code: types_1.ERR_CODE.MODULE_NOT_FOUND, exec: { command: VALUES["node.settings.package_manager"] || (setPnpmVer() ? 'pnpm' : setYarnVer() ? 'yarn' : 'npm'), args: ['install', name] } });
             return true;
         }
         if (value) {

package/lib-v4.d.ts

@@ -1,5 +1,5 @@
-import type { IModuleLibV4 } from '../types/lib/compat-v4';
-
-declare const LibV4: IModuleLibV4;
-
+import type { IModuleLibV4 } from '@e-mc/types/lib/compat-v4';
+
+declare const LibV4: IModuleLibV4;
+
 export = LibV4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.8.18",
+  "version": "0.8.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.8.18",
+    "@e-mc/types": "0.8.20",
     "abort-controller": "^3.0.0",
     "chalk": "4.1.2",
     "event-target-shim": "^5.0.1",