@e-mc/module 0.3.1 → 0.3.3

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2023 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/index.d.ts

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

package/index.js

@@ -117,8 +117,6 @@ const VALUES = {
     ["broadcast.out" /* KEY_NAME.BROADCAST_OUT */]: null,
     ["logger.level" /* KEY_NAME.LOGGER_LEVEL */]: -1
 };
-const REGEXP_SHELLOPT = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/;
-const REGEXP_SHELLVAL = /[^0-9a-z%+-./:=@_]/gi;
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
 let LOG_NEWLINE = true;
 let LOG_EMPTYLINE = false;
@@ -1003,7 +1001,7 @@ class Module extends EventEmitter {
                     }
                 }
             }
-            if (external && !pathname && VALUES["node.require.npm" /* KEY_NAME.NODE_REQUIRE_NPM */] && location.length <= 214 && /^(?:@(?:[a-z\d-*~][a-z\d-*._~]*\/)+)?[a-z\d-~][a-z\d-._~]*$/.test(location)) {
+            if (external && !pathname && VALUES["node.require.npm" /* KEY_NAME.NODE_REQUIRE_NPM */] && /^(?:@[a-z\d-*~][a-z\d-*._~]*\/)?[a-z\d-~][a-z\d-._~]*(?:\/.*)?$/.test(location)) {
                 try {
                     // @ts-ignore
                     result = checkFunction(require(types_1.IMPORT_MAP[location] || location));
@@ -1846,12 +1844,12 @@ class Module extends EventEmitter {
     }
     static sanitizeArgs(values, doubleQuote) {
         const result = typeof values === 'string' ? [values] : values;
-        const pattern = /^(["'])(.*)\1$/;
-        const sanitize = (value) => value.replace(REGEXP_SHELLVAL, capture => (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
+        const pattern = /[^0-9a-z%+-./:=@_]/gi;
+        const sanitize = (value) => value.replace(pattern, capture => (capture === '$' || capture === '`' ? '\\' : '') + '\\' + capture);
         for (let i = 0; i < result.length; ++i) {
             let value = result[i].trim(), leading = '';
             if (value !== '--') {
-                const opt = REGEXP_SHELLOPT.exec(value);
+                const opt = /^(-[^\s=]+|--[^-\s=][^\s=]*)(=)?\s*(.*)$/.exec(value);
                 if (opt) {
                     if (!opt[2] && !opt[3]) {
                         result[i] = opt[1];
@@ -1861,7 +1859,7 @@ class Module extends EventEmitter {
                     value = opt[3];
                 }
                 if (value) {
-                    const quoted = pattern.exec(value);
+                    const quoted = /^(["'])(.*)\1$/.exec(value);
                     if (PLATFORM_WIN32) {
                         if (quoted) {
                             if (quoted[1] === '"') {
@@ -1884,7 +1882,7 @@ class Module extends EventEmitter {
                             value = quoted[2];
                             type = true;
                         }
-                        if (REGEXP_SHELLVAL.test(value)) {
+                        if (pattern.test(value)) {
                             if (type) {
                                 value = '"' + sanitize(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 '../types/lib/compat-v4';
+
+declare const LibV4: IModuleLibV4;
+
 export = LibV4;

package/package.json

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