soda-nodejs 0.1.6 → 0.2.0

package/README.md

@@ -1,23 +1,23 @@
-# soda-node
-
-[![NPM version](https://img.shields.io/npm/v/soda-node.svg?style=flat)](https://npmjs.com/package/soda-node)
-[![NPM downloads](http://img.shields.io/npm/dm/soda-node.svg?style=flat)](https://npmjs.com/package/soda-node)
-
-## Install
-
-```bash
-$ pnpm install
-```
-
-```bash
-$ npm run dev
-$ npm run build
-```
-
-## Options
-
-TODO
-
-## LICENSE
-
-MIT
+# soda-node
+
+[![NPM version](https://img.shields.io/npm/v/soda-node.svg?style=flat)](https://npmjs.com/package/soda-node)
+[![NPM downloads](http://img.shields.io/npm/dm/soda-node.svg?style=flat)](https://npmjs.com/package/soda-node)
+
+## Install
+
+```bash
+$ pnpm install
+```
+
+```bash
+$ npm run dev
+$ npm run build
+```
+
+## Options
+
+TODO
+
+## LICENSE
+
+MIT

package/dist/cjs/index.d.ts

@@ -1,6 +1,4 @@
-export * from "./utils/check7zip";
 export * from "./utils/execAsync";
-export * from "./utils/install7zip";
 export * from "./utils/saveFile";
 export * from "./utils/spawnAsync";
 export * from "./utils/unzip";

package/dist/cjs/index.js

@@ -16,18 +16,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("./utils/check7zip"), module.exports);
 __reExport(src_exports, require("./utils/execAsync"), module.exports);
-__reExport(src_exports, require("./utils/install7zip"), module.exports);
 __reExport(src_exports, require("./utils/saveFile"), module.exports);
 __reExport(src_exports, require("./utils/spawnAsync"), module.exports);
 __reExport(src_exports, require("./utils/unzip"), module.exports);
 __reExport(src_exports, require("./utils/zip"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./utils/check7zip"),
   ...require("./utils/execAsync"),
-  ...require("./utils/install7zip"),
   ...require("./utils/saveFile"),
   ...require("./utils/spawnAsync"),
   ...require("./utils/unzip"),

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["export * from \"@utils/check7zip\"\nexport * from \"@utils/execAsync\"\nexport * from \"@utils/install7zip\"\nexport * from \"@utils/saveFile\"\nexport * from \"@utils/spawnAsync\"\nexport * from \"@utils/unzip\"\nexport * from \"@utils/zip\"\n"],
-  "mappings": ";;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,wBAAc,8BAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,gCAFd;AAGA,wBAAc,6BAHd;AAIA,wBAAc,+BAJd;AAKA,wBAAc,0BALd;AAMA,wBAAc,wBANd;",
+  "sourcesContent": ["export * from \"@utils/execAsync\"\nexport * from \"@utils/saveFile\"\nexport * from \"@utils/spawnAsync\"\nexport * from \"@utils/unzip\"\nexport * from \"@utils/zip\"\n"],
+  "mappings": ";;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,wBAAc,8BAAd;AACA,wBAAc,6BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,wBAJd;",
   "names": []
 }

package/dist/cjs/utils/execAsync.d.ts

@@ -3,19 +3,33 @@
 /// <reference types="node" />
 import { ExecOptions } from "child_process";
 import { ObjectEncodingOptions } from "fs";
-export type ExecResult<T> = {
-    stdout: T;
-    stderr: T;
+import { Options } from "iconv-lite";
+export type IconvDecodeOptions = {
+    encoding: string;
+    options?: Options;
 };
-export declare function execAsync(command: string): Promise<ExecResult<string>>;
+export declare function execAsync(command: string): Promise<string>;
 export declare function execAsync(command: string, options: {
     encoding: "buffer" | null;
-} & ExecOptions): Promise<ExecResult<Buffer>>;
+} & ExecOptions): Promise<Buffer>;
+export declare function execAsync(command: string, options: {
+    encoding: "buffer" | null;
+} & ExecOptions & {
+    decode: IconvDecodeOptions;
+}): Promise<string>;
+export declare function execAsync(command: string, options: {
+    encoding: BufferEncoding;
+} & ExecOptions): Promise<string>;
 export declare function execAsync(command: string, options: {
     encoding: BufferEncoding;
-} & ExecOptions): Promise<ExecResult<string>>;
+} & ExecOptions): Promise<string | Buffer>;
 export declare function execAsync(command: string, options: {
     encoding: BufferEncoding;
-} & ExecOptions): Promise<ExecResult<string | Buffer>>;
-export declare function execAsync(command: string, options: ExecOptions): Promise<ExecResult<string>>;
-export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<ExecResult<string | Buffer>>;
+} & ExecOptions & {
+    decode: IconvDecodeOptions;
+}): Promise<string>;
+export declare function execAsync(command: string, options: ExecOptions): Promise<string>;
+export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<string | Buffer>;
+export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions & {
+    decode: IconvDecodeOptions;
+}) | undefined | null): Promise<string>;

package/dist/cjs/utils/execAsync.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/utils/execAsync.ts
@@ -23,14 +33,20 @@ __export(execAsync_exports, {
 });
 module.exports = __toCommonJS(execAsync_exports);
 var import_child_process = require("child_process");
+var import_iconv_lite = __toESM(require("iconv-lite"));
 async function execAsync(command, options) {
+  const decode = options?.decode;
+  if (typeof options === "object" && options !== null && options.decode) {
+    const { decode: decode2, ...rest } = options;
+    options = rest;
+  }
   return await new Promise((resolve, reject) => {
     (0, import_child_process.exec)(command, options, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve({ stdout, stderr });
+      if (error)
+        return reject(error);
+      if (decode && stdout instanceof Buffer)
+        return resolve(import_iconv_lite.default.decode(stdout, decode.encoding, decode.options));
+      resolve(stdout);
     });
   });
 }

package/dist/cjs/utils/execAsync.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/execAsync.ts"],
-  "sourcesContent": ["import { exec, ExecOptions } from \"child_process\"\r\nimport { ObjectEncodingOptions } from \"fs\"\r\n\r\nexport type ExecResult<T> = {\r\n    stdout: T\r\n    stderr: T\r\n}\r\n\r\nexport async function execAsync(command: string): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions): Promise<ExecResult<Buffer>>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string | Buffer>>\r\nexport async function execAsync(command: string, options: ExecOptions): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<ExecResult<string | Buffer>>\r\nexport async function execAsync(command: string, options?: any) {\r\n    return await new Promise<ExecResult<string | Buffer>>((resolve, reject) => {\r\n        exec(command, options, (error, stdout, stderr) => {\r\n            if (error) {\r\n                reject(error)\r\n                return\r\n            }\r\n            resolve({ stdout, stderr })\r\n        })\r\n    })\r\n}\r\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAkC;AAclC,eAAsB,UAAU,SAAiB,SAAe;AAC5D,SAAO,MAAM,IAAI,QAAqC,CAAC,SAAS,WAAW;AACvE,mCAAK,SAAS,SAAS,CAAC,OAAO,QAAQ,WAAW;AAC9C,UAAI,OAAO;AACP,eAAO,KAAK;AACZ;AAAA,MACJ;AACA,cAAQ,EAAE,QAAQ,OAAO,CAAC;AAAA,IAC9B,CAAC;AAAA,EACL,CAAC;AACL;",
-  "names": []
+  "sourcesContent": ["import { exec, ExecOptions } from \"child_process\"\r\nimport { ObjectEncodingOptions } from \"fs\"\r\nimport iconv, { Options } from \"iconv-lite\"\r\n\r\nexport type IconvDecodeOptions = {\r\n    encoding: string\r\n    options?: Options\r\n}\r\n\r\nexport async function execAsync(command: string): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions): Promise<Buffer>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string | Buffer>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>\r\nexport async function execAsync(command: string, options: ExecOptions): Promise<string>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<string | Buffer>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions & { decode: IconvDecodeOptions }) | undefined | null): Promise<string>\r\nexport async function execAsync(command: string, options?: any) {\r\n    const decode = options?.decode as IconvDecodeOptions | undefined\r\n    if (typeof options === \"object\" && options !== null && options.decode) {\r\n        const { decode, ...rest } = options as { decode: IconvDecodeOptions }\r\n        options = rest\r\n    }\r\n    return await new Promise<string | Buffer>((resolve, reject) => {\r\n        exec(command, options, (error, stdout, stderr) => {\r\n            if (error) return reject(error)\r\n            // if (stderr) console.warn(stderr)\r\n            if (decode && stdout instanceof Buffer) return resolve(iconv.decode(stdout, decode.encoding, decode.options))\r\n            resolve(stdout)\r\n        })\r\n    })\r\n}\r\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAkC;AAElC,wBAA+B;AAgB/B,eAAsB,UAAU,SAAiB,SAAe;AAC5D,QAAM,SAAS,SAAS;AACxB,MAAI,OAAO,YAAY,YAAY,YAAY,QAAQ,QAAQ,QAAQ;AACnE,UAAM,EAAE,QAAAA,SAAQ,GAAG,KAAK,IAAI;AAC5B,cAAU;AAAA,EACd;AACA,SAAO,MAAM,IAAI,QAAyB,CAAC,SAAS,WAAW;AAC3D,mCAAK,SAAS,SAAS,CAAC,OAAO,QAAQ,WAAW;AAC9C,UAAI;AAAO,eAAO,OAAO,KAAK;AAE9B,UAAI,UAAU,kBAAkB;AAAQ,eAAO,QAAQ,kBAAAC,QAAM,OAAO,QAAQ,OAAO,UAAU,OAAO,OAAO,CAAC;AAC5G,cAAQ,MAAM;AAAA,IAClB,CAAC;AAAA,EACL,CAAC;AACL;",
+  "names": ["decode", "iconv"]
 }

package/dist/cjs/utils/unzip.d.ts

@@ -23,4 +23,4 @@ export type UnzipOptions = {
  * 4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功
  * 5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确
  */
-export declare function unzip({ input, output, cwd }: UnzipOptions): Promise<import("./execAsync").ExecResult<string>>;
+export declare function unzip({ input, output, cwd }: UnzipOptions): Promise<string>;

package/dist/cjs/utils/zip.d.ts

@@ -35,4 +35,4 @@ export type ZipOptions = {
  * 4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功
  * 5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确
  */
-export declare function zip({ input, output, thread, level, password, cwd }: ZipOptions): Promise<import("./execAsync").ExecResult<string>>;
+export declare function zip({ input, output, thread, level, password, cwd }: ZipOptions): Promise<string>;

package/dist/esm/index.d.ts

@@ -1,6 +1,4 @@
-export * from "./utils/check7zip";
 export * from "./utils/execAsync";
-export * from "./utils/install7zip";
 export * from "./utils/saveFile";
 export * from "./utils/spawnAsync";
 export * from "./utils/unzip";

package/dist/esm/index.js

@@ -1,6 +1,4 @@
-export * from "./utils/check7zip";
 export * from "./utils/execAsync";
-export * from "./utils/install7zip";
 export * from "./utils/saveFile";
 export * from "./utils/spawnAsync";
 export * from "./utils/unzip";

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":["export * from \"@utils/check7zip\"\nexport * from \"@utils/execAsync\"\nexport * from \"@utils/install7zip\"\nexport * from \"@utils/saveFile\"\nexport * from \"@utils/spawnAsync\"\nexport * from \"@utils/unzip\"\nexport * from \"@utils/zip\"\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA"}
+{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":["export * from \"@utils/execAsync\"\nexport * from \"@utils/saveFile\"\nexport * from \"@utils/spawnAsync\"\nexport * from \"@utils/unzip\"\nexport * from \"@utils/zip\"\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA"}

package/dist/esm/utils/execAsync.d.ts

@@ -3,19 +3,33 @@
 /// <reference types="node" />
 import { ExecOptions } from "child_process";
 import { ObjectEncodingOptions } from "fs";
-export type ExecResult<T> = {
-    stdout: T;
-    stderr: T;
+import { Options } from "iconv-lite";
+export type IconvDecodeOptions = {
+    encoding: string;
+    options?: Options;
 };
-export declare function execAsync(command: string): Promise<ExecResult<string>>;
+export declare function execAsync(command: string): Promise<string>;
 export declare function execAsync(command: string, options: {
     encoding: "buffer" | null;
-} & ExecOptions): Promise<ExecResult<Buffer>>;
+} & ExecOptions): Promise<Buffer>;
+export declare function execAsync(command: string, options: {
+    encoding: "buffer" | null;
+} & ExecOptions & {
+    decode: IconvDecodeOptions;
+}): Promise<string>;
+export declare function execAsync(command: string, options: {
+    encoding: BufferEncoding;
+} & ExecOptions): Promise<string>;
 export declare function execAsync(command: string, options: {
     encoding: BufferEncoding;
-} & ExecOptions): Promise<ExecResult<string>>;
+} & ExecOptions): Promise<string | Buffer>;
 export declare function execAsync(command: string, options: {
     encoding: BufferEncoding;
-} & ExecOptions): Promise<ExecResult<string | Buffer>>;
-export declare function execAsync(command: string, options: ExecOptions): Promise<ExecResult<string>>;
-export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<ExecResult<string | Buffer>>;
+} & ExecOptions & {
+    decode: IconvDecodeOptions;
+}): Promise<string>;
+export declare function execAsync(command: string, options: ExecOptions): Promise<string>;
+export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<string | Buffer>;
+export declare function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions & {
+    decode: IconvDecodeOptions;
+}) | undefined | null): Promise<string>;

package/dist/esm/utils/execAsync.js

@@ -1,15 +1,20 @@
 import { exec } from "child_process";
+import iconv from "iconv-lite";
 export async function execAsync(command, options) {
+  const decode = options?.decode;
+  if (typeof options === "object" && options !== null && options.decode) {
+    const {
+      decode,
+      ...rest
+    } = options;
+    options = rest;
+  }
   return await new Promise((resolve, reject) => {
     exec(command, options, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve({
-        stdout,
-        stderr
-      });
+      if (error) return reject(error);
+      // if (stderr) console.warn(stderr)
+      if (decode && stdout instanceof Buffer) return resolve(iconv.decode(stdout, decode.encoding, decode.options));
+      resolve(stdout);
     });
   });
 }

package/dist/esm/utils/execAsync.js.map

@@ -1 +1 @@
-{"version":3,"names":["exec","execAsync","command","options","Promise","resolve","reject","error","stdout","stderr"],"sources":["../../../src/utils/execAsync.ts"],"sourcesContent":["import { exec, ExecOptions } from \"child_process\"\r\nimport { ObjectEncodingOptions } from \"fs\"\r\n\r\nexport type ExecResult<T> = {\r\n    stdout: T\r\n    stderr: T\r\n}\r\n\r\nexport async function execAsync(command: string): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions): Promise<ExecResult<Buffer>>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string | Buffer>>\r\nexport async function execAsync(command: string, options: ExecOptions): Promise<ExecResult<string>>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<ExecResult<string | Buffer>>\r\nexport async function execAsync(command: string, options?: any) {\r\n    return await new Promise<ExecResult<string | Buffer>>((resolve, reject) => {\r\n        exec(command, options, (error, stdout, stderr) => {\r\n            if (error) {\r\n                reject(error)\r\n                return\r\n            }\r\n            resolve({ stdout, stderr })\r\n        })\r\n    })\r\n}\r\n"],"mappings":"AAAA,SAASA,IAAI,QAAqB,eAAe;AAcjD,OAAO,eAAeC,SAASA,CAACC,OAAe,EAAEC,OAAa,EAAE;EAC5D,OAAO,MAAM,IAAIC,OAAO,CAA8B,CAACC,OAAO,EAAEC,MAAM,KAAK;IACvEN,IAAI,CAACE,OAAO,EAAEC,OAAO,EAAE,CAACI,KAAK,EAAEC,MAAM,EAAEC,MAAM,KAAK;MAC9C,IAAIF,KAAK,EAAE;QACPD,MAAM,CAACC,KAAK,CAAC;QACb;MACJ;MACAF,OAAO,CAAC;QAAEG,MAAM;QAAEC;MAAO,CAAC,CAAC;IAC/B,CAAC,CAAC;EACN,CAAC,CAAC;AACN"}
+{"version":3,"names":["exec","iconv","execAsync","command","options","decode","rest","Promise","resolve","reject","error","stdout","stderr","Buffer","encoding"],"sources":["../../../src/utils/execAsync.ts"],"sourcesContent":["import { exec, ExecOptions } from \"child_process\"\r\nimport { ObjectEncodingOptions } from \"fs\"\r\nimport iconv, { Options } from \"iconv-lite\"\r\n\r\nexport type IconvDecodeOptions = {\r\n    encoding: string\r\n    options?: Options\r\n}\r\n\r\nexport async function execAsync(command: string): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions): Promise<Buffer>\r\nexport async function execAsync(command: string, options: { encoding: \"buffer\" | null } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string | Buffer>\r\nexport async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>\r\nexport async function execAsync(command: string, options: ExecOptions): Promise<string>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<string | Buffer>\r\nexport async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions & { decode: IconvDecodeOptions }) | undefined | null): Promise<string>\r\nexport async function execAsync(command: string, options?: any) {\r\n    const decode = options?.decode as IconvDecodeOptions | undefined\r\n    if (typeof options === \"object\" && options !== null && options.decode) {\r\n        const { decode, ...rest } = options as { decode: IconvDecodeOptions }\r\n        options = rest\r\n    }\r\n    return await new Promise<string | Buffer>((resolve, reject) => {\r\n        exec(command, options, (error, stdout, stderr) => {\r\n            if (error) return reject(error)\r\n            // if (stderr) console.warn(stderr)\r\n            if (decode && stdout instanceof Buffer) return resolve(iconv.decode(stdout, decode.encoding, decode.options))\r\n            resolve(stdout)\r\n        })\r\n    })\r\n}\r\n"],"mappings":"AAAA,SAASA,IAAI,QAAqB,eAAe;AAEjD,OAAOC,KAAK,MAAmB,YAAY;AAgB3C,OAAO,eAAeC,SAASA,CAACC,OAAe,EAAEC,OAAa,EAAE;EAC5D,MAAMC,MAAM,GAAGD,OAAO,EAAEC,MAAwC;EAChE,IAAI,OAAOD,OAAO,KAAK,QAAQ,IAAIA,OAAO,KAAK,IAAI,IAAIA,OAAO,CAACC,MAAM,EAAE;IACnE,MAAM;MAAEA,MAAM;MAAE,GAAGC;IAAK,CAAC,GAAGF,OAAyC;IACrEA,OAAO,GAAGE,IAAI;EAClB;EACA,OAAO,MAAM,IAAIC,OAAO,CAAkB,CAACC,OAAO,EAAEC,MAAM,KAAK;IAC3DT,IAAI,CAACG,OAAO,EAAEC,OAAO,EAAE,CAACM,KAAK,EAAEC,MAAM,EAAEC,MAAM,KAAK;MAC9C,IAAIF,KAAK,EAAE,OAAOD,MAAM,CAACC,KAAK,CAAC;MAC/B;MACA,IAAIL,MAAM,IAAIM,MAAM,YAAYE,MAAM,EAAE,OAAOL,OAAO,CAACP,KAAK,CAACI,MAAM,CAACM,MAAM,EAAEN,MAAM,CAACS,QAAQ,EAAET,MAAM,CAACD,OAAO,CAAC,CAAC;MAC7GI,OAAO,CAACG,MAAM,CAAC;IACnB,CAAC,CAAC;EACN,CAAC,CAAC;AACN"}

package/dist/esm/utils/unzip.d.ts

@@ -23,4 +23,4 @@ export type UnzipOptions = {
  * 4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功
  * 5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确
  */
-export declare function unzip({ input, output, cwd }: UnzipOptions): Promise<import("./execAsync").ExecResult<string>>;
+export declare function unzip({ input, output, cwd }: UnzipOptions): Promise<string>;

package/dist/esm/utils/zip.d.ts

@@ -35,4 +35,4 @@ export type ZipOptions = {
  * 4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功
  * 5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确
  */
-export declare function zip({ input, output, thread, level, password, cwd }: ZipOptions): Promise<import("./execAsync").ExecResult<string>>;
+export declare function zip({ input, output, thread, level, password, cwd }: ZipOptions): Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soda-nodejs",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,6 +28,7 @@
     "father": "^4.5.0-rc.2"
   },
   "dependencies": {
+    "iconv-lite": "^0.6.3",
     "which": "^4.0.0"
   },
   "scripts": {

package/src/index.ts

@@ -1,6 +1,4 @@
-export * from "@utils/check7zip"
 export * from "@utils/execAsync"
-export * from "@utils/install7zip"
 export * from "@utils/saveFile"
 export * from "@utils/spawnAsync"
 export * from "@utils/unzip"

package/src/utils/execAsync.ts

@@ -1,25 +1,33 @@
 import { exec, ExecOptions } from "child_process"
 import { ObjectEncodingOptions } from "fs"
+import iconv, { Options } from "iconv-lite"
 
-export type ExecResult<T> = {
-    stdout: T
-    stderr: T
+export type IconvDecodeOptions = {
+    encoding: string
+    options?: Options
 }
 
-export async function execAsync(command: string): Promise<ExecResult<string>>
-export async function execAsync(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<ExecResult<Buffer>>
-export async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string>>
-export async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<ExecResult<string | Buffer>>
-export async function execAsync(command: string, options: ExecOptions): Promise<ExecResult<string>>
-export async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<ExecResult<string | Buffer>>
+export async function execAsync(command: string): Promise<string>
+export async function execAsync(command: string, options: { encoding: "buffer" | null } & ExecOptions): Promise<Buffer>
+export async function execAsync(command: string, options: { encoding: "buffer" | null } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>
+export async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string>
+export async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions): Promise<string | Buffer>
+export async function execAsync(command: string, options: { encoding: BufferEncoding } & ExecOptions & { decode: IconvDecodeOptions }): Promise<string>
+export async function execAsync(command: string, options: ExecOptions): Promise<string>
+export async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions) | undefined | null): Promise<string | Buffer>
+export async function execAsync(command: string, options: (ObjectEncodingOptions & ExecOptions & { decode: IconvDecodeOptions }) | undefined | null): Promise<string>
 export async function execAsync(command: string, options?: any) {
-    return await new Promise<ExecResult<string | Buffer>>((resolve, reject) => {
+    const decode = options?.decode as IconvDecodeOptions | undefined
+    if (typeof options === "object" && options !== null && options.decode) {
+        const { decode, ...rest } = options as { decode: IconvDecodeOptions }
+        options = rest
+    }
+    return await new Promise<string | Buffer>((resolve, reject) => {
         exec(command, options, (error, stdout, stderr) => {
-            if (error) {
-                reject(error)
-                return
-            }
-            resolve({ stdout, stderr })
+            if (error) return reject(error)
+            // if (stderr) console.warn(stderr)
+            if (decode && stdout instanceof Buffer) return resolve(iconv.decode(stdout, decode.encoding, decode.options))
+            resolve(stdout)
         })
     })
 }

package/dist/cjs/utils/check7zip.d.ts

@@ -1,4 +0,0 @@
-/**
- * 检测 7z 命令是否存在
- */
-export declare function check7zip(): Promise<boolean>;

package/dist/cjs/utils/check7zip.js

@@ -1,48 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/utils/check7zip.ts
-var check7zip_exports = {};
-__export(check7zip_exports, {
-  check7zip: () => check7zip
-});
-module.exports = __toCommonJS(check7zip_exports);
-var import_which = __toESM(require("which"));
-async function check7zip() {
-  try {
-    await (0, import_which.default)("7z");
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  check7zip
-});
-//# sourceMappingURL=check7zip.js.map

package/dist/cjs/utils/check7zip.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/utils/check7zip.ts"],
-  "sourcesContent": ["import which from \"which\"\r\n\r\n/**\r\n * 检测 7z 命令是否存在\r\n */\r\nexport async function check7zip() {\r\n    try {\r\n        await which(\"7z\")\r\n        return true\r\n    } catch (error) {\r\n        return false\r\n    }\r\n}\r\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAKlB,eAAsB,YAAY;AAC9B,MAAI;AACA,cAAM,aAAAA,SAAM,IAAI;AAChB,WAAO;AAAA,EACX,SAAS,OAAP;AACE,WAAO;AAAA,EACX;AACJ;",
-  "names": ["which"]
-}

package/dist/cjs/utils/install7zip.d.ts

@@ -1,4 +0,0 @@
-/**
- * 检测到没有安装 7z 时的提示信息
- */
-export declare function install7zip(): void;

package/dist/cjs/utils/install7zip.js

@@ -1,39 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/utils/install7zip.ts
-var install7zip_exports = {};
-__export(install7zip_exports, {
-  install7zip: () => install7zip
-});
-module.exports = __toCommonJS(install7zip_exports);
-function install7zip() {
-  console.log("检测到您的系统没有安装 7z，请先安装 7z 后再执行");
-  console.log("下载地址：https://www.7-zip.org/download.html");
-  console.log("如果已经安装，请按照以下步骤将 7z 添加到环境变量中");
-  console.log("1. 设置 → 系统 → 右侧系统信息 → 高级系统设置 → 环境变量");
-  console.log("2. 在系统变量中找到并选中 Path，点击编辑");
-  console.log("3. 点击新建，输入 7z 的安装路径（默认是 C:\\Program Files\\7-Zip），点击确定");
-  console.log("4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功");
-  console.log("5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确");
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  install7zip
-});
-//# sourceMappingURL=install7zip.js.map

package/dist/cjs/utils/install7zip.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/utils/install7zip.ts"],
-  "sourcesContent": ["/**\r\n * 检测到没有安装 7z 时的提示信息\r\n */\r\nexport function install7zip() {\r\n    console.log(\"检测到您的系统没有安装 7z，请先安装 7z 后再执行\")\r\n    console.log(\"下载地址：https://www.7-zip.org/download.html\")\r\n    console.log(\"如果已经安装，请按照以下步骤将 7z 添加到环境变量中\")\r\n    console.log(\"1. 设置 → 系统 → 右侧系统信息 → 高级系统设置 → 环境变量\")\r\n    console.log(\"2. 在系统变量中找到并选中 Path，点击编辑\")\r\n    console.log(\"3. 点击新建，输入 7z 的安装路径（默认是 C:\\\\Program Files\\\\7-Zip），点击确定\")\r\n    console.log(\"4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功\")\r\n    console.log(\"5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确\")\r\n}\r\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,SAAS,cAAc;AAC1B,UAAQ,IAAI,6BAA6B;AACzC,UAAQ,IAAI,0CAA0C;AACtD,UAAQ,IAAI,6BAA6B;AACzC,UAAQ,IAAI,qCAAqC;AACjD,UAAQ,IAAI,0BAA0B;AACtC,UAAQ,IAAI,wDAAwD;AACpE,UAAQ,IAAI,mCAAmC;AAC/C,UAAQ,IAAI,uCAAuC;AACvD;",
-  "names": []
-}

package/dist/esm/utils/check7zip.d.ts

@@ -1,4 +0,0 @@
-/**
- * 检测 7z 命令是否存在
- */
-export declare function check7zip(): Promise<boolean>;

package/dist/esm/utils/check7zip.js

@@ -1,14 +0,0 @@
-import which from "which";
-
-/**
- * 检测 7z 命令是否存在
- */
-export async function check7zip() {
-  try {
-    await which("7z");
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
-//# sourceMappingURL=check7zip.js.map

package/dist/esm/utils/check7zip.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["which","check7zip","error"],"sources":["../../../src/utils/check7zip.ts"],"sourcesContent":["import which from \"which\"\r\n\r\n/**\r\n * 检测 7z 命令是否存在\r\n */\r\nexport async function check7zip() {\r\n    try {\r\n        await which(\"7z\")\r\n        return true\r\n    } catch (error) {\r\n        return false\r\n    }\r\n}\r\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;;AAEzB;AACA;AACA;AACA,OAAO,eAAeC,SAASA,CAAA,EAAG;EAC9B,IAAI;IACA,MAAMD,KAAK,CAAC,IAAI,CAAC;IACjB,OAAO,IAAI;EACf,CAAC,CAAC,OAAOE,KAAK,EAAE;IACZ,OAAO,KAAK;EAChB;AACJ"}

package/dist/esm/utils/install7zip.d.ts

@@ -1,4 +0,0 @@
-/**
- * 检测到没有安装 7z 时的提示信息
- */
-export declare function install7zip(): void;

package/dist/esm/utils/install7zip.js

@@ -1,14 +0,0 @@
-/**
- * 检测到没有安装 7z 时的提示信息
- */
-export function install7zip() {
-  console.log("检测到您的系统没有安装 7z，请先安装 7z 后再执行");
-  console.log("下载地址：https://www.7-zip.org/download.html");
-  console.log("如果已经安装，请按照以下步骤将 7z 添加到环境变量中");
-  console.log("1. 设置 → 系统 → 右侧系统信息 → 高级系统设置 → 环境变量");
-  console.log("2. 在系统变量中找到并选中 Path，点击编辑");
-  console.log("3. 点击新建，输入 7z 的安装路径（默认是 C:\\Program Files\\7-Zip），点击确定");
-  console.log("4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功");
-  console.log("5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确");
-}
-//# sourceMappingURL=install7zip.js.map

package/dist/esm/utils/install7zip.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["install7zip","console","log"],"sources":["../../../src/utils/install7zip.ts"],"sourcesContent":["/**\r\n * 检测到没有安装 7z 时的提示信息\r\n */\r\nexport function install7zip() {\r\n    console.log(\"检测到您的系统没有安装 7z，请先安装 7z 后再执行\")\r\n    console.log(\"下载地址：https://www.7-zip.org/download.html\")\r\n    console.log(\"如果已经安装，请按照以下步骤将 7z 添加到环境变量中\")\r\n    console.log(\"1. 设置 → 系统 → 右侧系统信息 → 高级系统设置 → 环境变量\")\r\n    console.log(\"2. 在系统变量中找到并选中 Path，点击编辑\")\r\n    console.log(\"3. 点击新建，输入 7z 的安装路径（默认是 C:\\\\Program Files\\\\7-Zip），点击确定\")\r\n    console.log(\"4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功\")\r\n    console.log(\"5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确\")\r\n}\r\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAO,SAASA,WAAWA,CAAA,EAAG;EAC1BC,OAAO,CAACC,GAAG,CAAC,6BAA6B,CAAC;EAC1CD,OAAO,CAACC,GAAG,CAAC,0CAA0C,CAAC;EACvDD,OAAO,CAACC,GAAG,CAAC,6BAA6B,CAAC;EAC1CD,OAAO,CAACC,GAAG,CAAC,qCAAqC,CAAC;EAClDD,OAAO,CAACC,GAAG,CAAC,0BAA0B,CAAC;EACvCD,OAAO,CAACC,GAAG,CAAC,wDAAwD,CAAC;EACrED,OAAO,CAACC,GAAG,CAAC,mCAAmC,CAAC;EAChDD,OAAO,CAACC,GAAG,CAAC,uCAAuC,CAAC;AACxD"}

package/src/utils/check7zip.ts

@@ -1,13 +0,0 @@
-import which from "which"
-
-/**
- * 检测 7z 命令是否存在
- */
-export async function check7zip() {
-    try {
-        await which("7z")
-        return true
-    } catch (error) {
-        return false
-    }
-}

package/src/utils/install7zip.ts

@@ -1,13 +0,0 @@
-/**
- * 检测到没有安装 7z 时的提示信息
- */
-export function install7zip() {
-    console.log("检测到您的系统没有安装 7z，请先安装 7z 后再执行")
-    console.log("下载地址：https://www.7-zip.org/download.html")
-    console.log("如果已经安装，请按照以下步骤将 7z 添加到环境变量中")
-    console.log("1. 设置 → 系统 → 右侧系统信息 → 高级系统设置 → 环境变量")
-    console.log("2. 在系统变量中找到并选中 Path，点击编辑")
-    console.log("3. 点击新建，输入 7z 的安装路径（默认是 C:\\Program Files\\7-Zip），点击确定")
-    console.log("4. 重启终端，输入 7z，如果出现 7z 的版本信息，则安装成功")
-    console.log("5. 如果没有出现版本信息，请重启电脑，或者检查 7z 的安装路径是否正确")
-}