ph-utils 0.9.14 → 0.9.15

package/lib/server.d.ts

@@ -5,9 +5,18 @@ import type { SpawnOptions } from "node:child_process";
  * @param command 待执行的命令
  * @param args    命令参数
  */
-export declare function exec(command: string, args?: string[]): Promise<string>;
-export declare function exec(command: string, options?: SpawnOptions): Promise<string>;
-export declare function exec(command: string, args?: string[], options?: SpawnOptions): Promise<string>;
+export declare function exec(command: string, args?: string[]): Promise<{
+    stdout: string;
+    stderr: string;
+}>;
+export declare function exec(command: string, options?: SpawnOptions): Promise<{
+    stdout: string;
+    stderr: string;
+}>;
+export declare function exec(command: string, args?: string[], options?: SpawnOptions): Promise<{
+    stdout: string;
+    stderr: string;
+}>;
 /**
  * 解析环境变量;
  * 同时读取多个环境变量文件: .env, .env.local, .env.[development|test|production];

package/lib/server.js

@@ -1,48 +1,32 @@
 import { execFile } from "node:child_process";
-import { parseEnv, parseArgs } from "node:util";
+import { parseEnv, parseArgs, promisify } from "node:util";
 import { readFileSync } from "node:fs";
+const execFilePromise = promisify(execFile);
 /**
  * 执行命令
  * @param cmd 执行的命令
  * @returns
  */
 export function exec(command, ...params) {
-  let argvs = [];
-  const commandItems = command.split(" ");
-  const cmd = commandItems.shift();
-  if (commandItems.length > 0) {
-    argvs = commandItems;
-  }
-  let opts = {};
-  if (params[0] != null) {
-    if (params[0] instanceof Array) {
-      argvs.push(...params[0]);
-      if (params[1] != null) {
-        opts = params[1];
-      }
-    } else {
-      opts = params[0];
+    let argvs = [];
+    const commandItems = command.split(" ");
+    const cmd = commandItems.shift();
+    if (commandItems.length > 0) {
+        argvs = commandItems;
     }
-  }
-  return new Promise((resolve, reject) => {
-    execFile(cmd, argvs, opts || {}, (err, stdout, stderr) => {
-      if (err) {
-        reject(err);
-      } else {
-        let msg = stdout || stderr;
-        if (
-          stderr != null &&
-          (stderr.includes("error") || stderr.includes("Error"))
-        ) {
-          const error = new Error(stderr);
-          error.type = "StdErr";
-          reject(error);
-        } else {
-          resolve(msg);
+    let opts = { shell: true };
+    if (params[0] != null) {
+        if (params[0] instanceof Array) {
+            argvs.push(...params[0]);
+            if (params[1] != null) {
+                opts = params[1];
+            }
         }
-      }
-    });
-  });
+        else {
+            opts = params[0];
+        }
+    }
+    return execFilePromise(cmd, argvs, opts);
 }
 /**
  * 解析环境变量;
@@ -64,37 +48,39 @@ export function exec(command, ...params) {
  * @returns
  */
 export function parseEnvs() {
-  // development, test, production
-  const files = [".env", ".env.local"];
-  let nodeEnv = process.env.NODE_ENV;
-  const { values } = parseArgs({
-    options: {
-      NODE_ENV: {
-        type: "string",
-        short: "n",
-      },
-    },
-    strict: false,
-  });
-  if (values.NODE_ENV != null && typeof values.NODE_ENV === "string") {
-    nodeEnv = values.NODE_ENV;
-  }
-  if (nodeEnv == null) {
-    nodeEnv = "production";
-  }
-  process.env.NODE_ENV = nodeEnv;
-  files.push(`.env.${nodeEnv}`);
-  let envParsed = {};
-  for (let i = 0, len = files.length; i < len; i++) {
-    const file = files[i];
-    try {
-      const envContent = readFileSync(file, { encoding: "utf-8" });
-      const envValue = parseEnv(envContent);
-      envParsed = { ...envParsed, ...envValue };
-    } catch (err) {}
-  }
-  for (const key in envParsed) {
-    process.env[key] = envParsed[key];
-  }
-  return envParsed;
+    // development, test, production
+    const files = [".env", ".env.local"];
+    let nodeEnv = process.env.NODE_ENV;
+    const { values } = parseArgs({
+        options: {
+            NODE_ENV: {
+                type: "string",
+                short: "n",
+            },
+        },
+        strict: false,
+    });
+    if (values.NODE_ENV != null && typeof values.NODE_ENV === "string") {
+        nodeEnv = values.NODE_ENV;
+    }
+    if (nodeEnv == null) {
+        nodeEnv = "production";
+    }
+    process.env.NODE_ENV = nodeEnv;
+    files.push(`.env.${nodeEnv}`);
+    let envParsed = {};
+    for (let i = 0, len = files.length; i < len; i++) {
+        const file = files[i];
+        try {
+            const envContent = readFileSync(file, { encoding: "utf-8" });
+            const envValue = parseEnv(envContent);
+            envParsed = { ...envParsed, ...envValue };
+            // eslint-disable-next-line
+        }
+        catch (err) { }
+    }
+    for (const key in envParsed) {
+        process.env[key] = envParsed[key];
+    }
+    return envParsed;
 }

package/package.json

@@ -68,7 +68,7 @@
     },
     "./*": "./lib/*"
   },
-  "version": "0.9.14",
+  "version": "0.9.15",
   "type": "module",
   "repository": {
     "type": "git",
@@ -82,7 +82,7 @@
   },
   "homepage": "https://gitee.com/towardly/ph/tree/master/packages/utils",
   "devDependencies": {
-    "@types/node": "^22.7.9",
+    "@types/node": "^22.8.2",
     "typescript": "^5.6.3"
   },
   "files": [