@deot/dev-shared 1.0.0 → 1.0.2

package/dist/index.d.ts

@@ -8,6 +8,8 @@ export declare interface AnyFunction<T = void> {
 
 declare const autoCatch: (impl: any, options?: Options) => Promise<any>;
 
+declare const command: (command$: string, args?: string[]) => RegExpMatchArray | [];
+
 export declare type Customized<Origin = any, Extend = any> = Origin & Extend;
 
 declare const error: {
@@ -15,7 +17,10 @@ declare const error: {
     (message?: any, ...optionalParams: any[]): void;
 };
 
-declare const exec: typeof childProcess.exec.__promisify__;
+declare const exec: (command$: string, args?: string[]) => childProcess.PromiseWithChild<{
+    stdout: string;
+    stderr: string;
+}>;
 
 declare const formatBytes: (size: number, suffix?: number) => string;
 
@@ -55,13 +60,14 @@ export declare type Options<T = {}> = Indexable & T;
 declare namespace Shell {
     export {
         LOCAL_COMMAND_MAP,
+        command,
         exec,
         spawn
     }
 }
 export { Shell }
 
-declare const spawn: (command: string, args?: string[]) => Promise<unknown>;
+declare const spawn: (command$: string, args?: string[], options?: any) => Promise<unknown>;
 
 export declare type TimeoutHandle = ReturnType<typeof global.setTimeout>;
 

package/dist/index.js

@@ -1,8 +1,8 @@
 import os from 'node:os';
-import path from 'node:path';
+import * as path from 'node:path';
 import * as childProcess from 'node:child_process';
-import util from 'node:util';
-import fs from 'node:fs';
+import * as util from 'node:util';
+import * as fs from 'node:fs';
 
 const getHost = () => {
     const ips = [];
@@ -71,16 +71,21 @@ const LOCAL_COMMAND_MAP = fs.existsSync(binDirectory)
         return pre;
     }, {})
     : {};
-const exec = util.promisify(childProcess.exec);
-const spawn = (command, args = []) => {
-    const [command$, ...args$] = (command + SPACE + args.join(SPACE))
-        .replace(/\s+/g, SPACE)
-        .split(SPACE)
-        .filter(i => !!i)
-        .map(i => LOCAL_COMMAND_MAP[i] || i);
+const command = (command$, args) => {
+    const v = (command$ + SPACE + (args || []).join(SPACE))
+        .match(/[^\s'"]+|'[^']*'|"[^"]*"/g);
+    return v || [];
+};
+const exec = (command$, args) => {
+    return util.promisify(childProcess.exec)(command(command$, args).join(SPACE));
+};
+const spawn = (command$, args, options) => {
+    let [command$$, ...args$] = command(command$, args).map((i) => LOCAL_COMMAND_MAP[i] || i);
+    args$ = args$.map((i) => i.replace(/^['"]|['"]$/g, ''));
     return new Promise((resolve, reject) => {
-        const emit = childProcess.spawn(command$, args$, {
-            stdio: 'inherit'
+        const emit = childProcess.spawn(command$$, args$, {
+            stdio: 'inherit',
+            ...options
         });
         emit.on('close', (code) => {
             if (code === 0) {
@@ -100,6 +105,7 @@ const spawn = (command, args = []) => {
 var shell = /*#__PURE__*/Object.freeze({
     __proto__: null,
     LOCAL_COMMAND_MAP: LOCAL_COMMAND_MAP,
+    command: command,
     exec: exec,
     spawn: spawn
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-shared",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -10,6 +10,5 @@
   "license": "MIT",
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "f960c31945e60a492e50e835cbf0c987a9fc3d5c"
-}
+  }
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 deot
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.