codify-plugin-lib 1.0.27 → 1.0.28

package/dist/utils/utils.d.ts

@@ -12,7 +12,7 @@ type CodifySpawnOptions = {
     cwd?: string;
     stdioString?: boolean;
 } & SpawnOptions;
-export declare function codifySpawn(cmd: string, args?: string[], opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'> & {
+export declare function codifySpawn(cmd: string, args?: string[], opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString'> & {
     throws?: boolean;
 }, extras?: Record<any, any>): Promise<SpawnResult>;
 export declare function isDebug(): boolean;

package/dist/utils/utils.js

@@ -12,7 +12,7 @@ var SpawnStatus;
 })(SpawnStatus || (exports.SpawnStatus = SpawnStatus = {}));
 async function codifySpawn(cmd, args, opts, extras) {
     try {
-        const result = await (0, promise_spawn_1.default)(cmd, args ?? [], { ...opts, stdio: 'pipe', stdioString: true, shell: true }, extras);
+        const result = await (0, promise_spawn_1.default)(cmd, args ?? [], { ...opts, stdio: 'pipe', stdioString: true, shell: opts?.shell ?? process.env.SHELL }, extras);
         if (isDebug()) {
             console.log(`codifySpawn result for: ${cmd}`);
             console.log(JSON.stringify(result, null, 2));
@@ -26,10 +26,11 @@ async function codifySpawn(cmd, args, opts, extras) {
         };
     }
     catch (error) {
-        if (isDebug()) {
+        const shouldThrow = opts?.throws ?? true;
+        if (isDebug() || shouldThrow) {
             console.error(`CodifySpawn Error for command ${cmd} ${args}`, error);
         }
-        if (opts?.throws ?? true) {
+        if (shouldThrow) {
             throw error;
         }
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/utils/utils.ts

@@ -32,14 +32,16 @@ type CodifySpawnOptions = {
 export async function codifySpawn(
   cmd: string,
   args?: string[],
-  opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString' | 'shell'> & { throws?: boolean },
+  opts?: Omit<CodifySpawnOptions, 'stdio' | 'stdioString'> & { throws?: boolean },
   extras?: Record<any, any>,
 ): Promise<SpawnResult> {
   try {
+    // TODO: Need to benchmark the effects of using sh vs zsh for shell.
+    //  Seems like zsh shells run slower
     const result = await promiseSpawn(
       cmd,
       args ?? [],
-      { ...opts, stdio: 'pipe', stdioString: true, shell: true },
+      { ...opts, stdio: 'pipe', stdioString: true, shell: opts?.shell ?? process.env.SHELL },
       extras,
     );
 
@@ -57,11 +59,12 @@ export async function codifySpawn(
       data: status === SpawnStatus.SUCCESS ? result.stdout : result.stderr
     }
   } catch (error) {
-    if (isDebug()) {
+    const shouldThrow = opts?.throws ?? true;
+    if (isDebug() || shouldThrow) {
       console.error(`CodifySpawn Error for command ${cmd} ${args}`, error);
     }
 
-    if (opts?.throws ?? true) {
+    if (shouldThrow) {
       throw error;
     }