@pd4castr/cli 0.0.6 → 0.0.8

package/dist/index.js

@@ -63,6 +63,7 @@ var WSL_NETWORK_INTERFACE_DEFAULT = "eth0";
 
 // src/commands/fetch/handle-action.ts
 import path5 from "path";
+import { ExecaError } from "execa";
 import { HTTPError } from "ky";
 import ora from "ora";
 import { ZodError as ZodError2 } from "zod";
@@ -347,9 +348,11 @@ ${link} to view fetched data
       spinner.fail(formatNestErrorMessage(errorResponse));
     } else if (error instanceof Error) {
       spinner.fail(error.message);
-      if (error.cause) {
-        console.error(error.cause);
-      }
+    }
+    if (error instanceof Error && error.cause instanceof ExecaError) {
+      console.error(error.cause.shortMessage);
+    } else if (error instanceof Error && error.cause) {
+      console.error(error.cause);
     }
     process.exit(1);
   }
@@ -367,6 +370,7 @@ function registerFetchCommand(program2) {
 // src/commands/init/handle-action.ts
 import path6 from "path";
 import * as inquirer from "@inquirer/prompts";
+import { ExecaError as ExecaError2 } from "execa";
 import ora2 from "ora";
 import tiged from "tiged";
 
@@ -418,7 +422,9 @@ async function handleAction2() {
     spinner.succeed("Template fetched successfully");
   } catch (error) {
     spinner.fail("Error fetching template");
-    if (error instanceof Error && error.cause) {
+    if (error instanceof Error && error.cause instanceof ExecaError2) {
+      console.error(error.cause.shortMessage);
+    } else if (error instanceof Error && error.cause) {
       console.error(error.cause);
     }
     process.exit(1);
@@ -440,6 +446,7 @@ function registerInitCommand(program2) {
 }
 
 // src/commands/login/handle-action.ts
+import { ExecaError as ExecaError3 } from "execa";
 import ora3 from "ora";
 import { ZodError as ZodError3 } from "zod";
 
@@ -545,9 +552,11 @@ async function handleAction3() {
       logZodIssues(error);
     } else if (error instanceof Error) {
       spinner.fail(error.message);
-      if (error.cause) {
-        console.error(error.cause);
-      }
+    }
+    if (error instanceof Error && error.cause instanceof ExecaError3) {
+      console.error(error.cause.shortMessage);
+    } else if (error instanceof Error && error.cause) {
+      console.error(error.cause);
     }
     process.exit(1);
   }
@@ -559,6 +568,7 @@ function registerLoginCommand(program2) {
 }
 
 // src/commands/logout/handle-action.ts
+import { ExecaError as ExecaError4 } from "execa";
 import ora4 from "ora";
 import { ZodError as ZodError4 } from "zod";
 async function handleAction4() {
@@ -580,9 +590,11 @@ async function handleAction4() {
       logZodIssues(error);
     } else if (error instanceof Error) {
       spinner.fail(error.message);
-      if (error.cause) {
-        console.error(error.cause);
-      }
+    }
+    if (error instanceof Error && error.cause instanceof ExecaError4) {
+      console.error(error.cause.shortMessage);
+    } else if (error instanceof Error && error.cause) {
+      console.error(error.cause);
     }
     process.exit(1);
   }
@@ -594,6 +606,7 @@ function registerLogoutCommand(program2) {
 }
 
 // src/commands/publish/handle-action.ts
+import { ExecaError as ExecaError5 } from "execa";
 import express2 from "express";
 import { HTTPError as HTTPError3 } from "ky";
 import ora5 from "ora";
@@ -798,16 +811,18 @@ async function runModelContainer(dockerImage, webserverPort, ctx) {
   const outputEnv = `OUTPUT_URL=${webserverURL}/output`;
   const envs = [...inputEnvs, outputEnv];
   try {
+    const extraRunArgs = [];
+    if (env.isWSL) {
+      const ip = getWSLMachineIP();
+      extraRunArgs.push("--add-host", `${DOCKER_HOSTNAME_WSL}:${ip}`);
+    }
     const args = [
       "run",
       "--rm",
+      ...extraRunArgs,
       ...envs.flatMap((env2) => ["--env", env2]),
       dockerImage
     ];
-    if (env.isWSL) {
-      const ip = getWSLMachineIP();
-      args.push("--add-host", `${DOCKER_HOSTNAME_WSL}:${ip}`);
-    }
     await execa4("docker", args, {
       cwd: ctx.projectRoot,
       stdio: "pipe"
@@ -968,7 +983,7 @@ async function handleCreateModelFlow(options, app, spinner, ctx, authCtx) {
     await runModelIOTests(dockerImage, options, app, ctx);
     spinner.succeed("Model I/O test passed");
   }
-  spinner.start("Publishing model...");
+  spinner.start("Publishing new model...");
   const modelConfig = await getModelConfigFromProjectConfig(ctx);
   const model = await createModel(modelConfig, authCtx);
   await updateProjectConfig((config) => {
@@ -1047,6 +1062,7 @@ async function handleModelRevisionCreateFlow(options, app, spinner, ctx, authCtx
     await runModelIOTests(dockerImage, options, app, ctx);
     spinner.succeed("Model I/O test passed");
   }
+  spinner.start("Publishing new model revision...");
   const modelConfig = await getModelConfigFromProjectConfig(ctx);
   const model = await createModel(modelConfig, authCtx);
   await updateProjectConfig((config) => {
@@ -1104,6 +1120,7 @@ async function handleModelRevisionUpdateFlow(options, app, spinner, ctx, authCtx
     await runModelIOTests(dockerImage, options, app, ctx);
     spinner.succeed("Model I/O test passed");
   }
+  spinner.start("Updating model revision...");
   const modelConfig = await getModelConfigFromProjectConfig(ctx);
   const model = await updateModel(modelConfig, authCtx);
   await updateProjectConfig((config) => {
@@ -1175,9 +1192,11 @@ async function handleAction5(options) {
         spinner.fail(formatNestErrorMessage(errorResponse));
       } else if (error instanceof Error) {
         spinner.fail(error.message);
-        if (error.cause) {
-          console.error(error.cause);
-        }
+      }
+      if (error instanceof Error && error.cause instanceof ExecaError5) {
+        console.error(error.cause.shortMessage);
+      } else if (error instanceof Error && error.cause) {
+        console.error(error.cause);
       }
       process.exit(1);
     }
@@ -1203,6 +1222,7 @@ function registerPublishCommand(program2) {
 
 // src/commands/test/handle-action.ts
 import path14 from "path";
+import { ExecaError as ExecaError6 } from "execa";
 import express3 from "express";
 import ora6 from "ora";
 import { ZodError as ZodError6 } from "zod";
@@ -1262,9 +1282,11 @@ ${clickHereLink} to view output (${fileLink})
         logZodIssues(error);
       } else if (error instanceof Error) {
         spinner.fail(error.message);
-        if (error.cause) {
-          console.error(error.cause);
-        }
+      }
+      if (error instanceof Error && error.cause instanceof ExecaError6) {
+        console.error(error.cause.shortMessage);
+      } else if (error instanceof Error && error.cause) {
+        console.error(error.cause);
       }
       process.exit(1);
     }
@@ -1296,7 +1318,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@pd4castr/cli",
-  version: "0.0.6",
+  version: "0.0.8",
   description: "CLI tool for creating, testing, and publishing pd4castr models",
   main: "dist/index.js",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pd4castr/cli",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "CLI tool for creating, testing, and publishing pd4castr models",
   "main": "dist/index.js",
   "type": "module",