@pd4castr/cli 1.12.0 → 1.13.1

package/dist/index.js

@@ -339,7 +339,7 @@ __name(getEnv, "getEnv");
 // package.json
 var package_default = {
   name: "@pd4castr/cli",
-  version: "1.12.0",
+  version: "1.13.1",
   description: "CLI tool for creating, testing, and publishing pd4castr models",
   license: "MIT",
   main: "dist/index.js",
@@ -537,9 +537,10 @@ function registerFetchCommand(program2) {
 __name(registerFetchCommand, "registerFetchCommand");
 
 // src/commands/init/handle-action.ts
+import fs6 from "fs/promises";
+import os2 from "os";
 import path6 from "path";
 import * as inquirer from "@inquirer/prompts";
-import { ExecaError as ExecaError2 } from "execa";
 import ora2 from "ora";
 import tiged from "tiged";
 
@@ -592,16 +593,26 @@ async function handleAction2() {
     await fetchTemplate(template, projectName);
     spinner.succeed("Template fetched successfully");
   } catch (error) {
-    spinner.fail("Error fetching template");
-    if (error instanceof Error && error.cause instanceof ExecaError2) {
-      console.error(error.cause.shortMessage);
-    } else if (error instanceof Error && error.cause) {
-      console.error(error.cause);
+    if (isDegitError(error)) {
+      spinner.fail(formatErrorMessage(DEGIT_CODE_MAP[error.code]));
+    } else {
+      spinner.fail(formatErrorMessage("UNKNOWN_ERROR"));
+      if (error instanceof Error) {
+        console.error(error.stack ?? error.message);
+      }
     }
     process.exit(1);
   }
 }
 __name(handleAction2, "handleAction");
+var DEGIT_CODE_MAP = {
+  COULD_NOT_DOWNLOAD: "TEMPLATE_DOWNLOAD_FAILED",
+  COULD_NOT_FETCH: "TEMPLATE_DOWNLOAD_FAILED",
+  MISSING_REF: "TEMPLATE_NOT_FOUND",
+  BAD_SRC: "TEMPLATE_NOT_FOUND",
+  BAD_REF: "TEMPLATE_NOT_FOUND",
+  DEST_NOT_EMPTY: "DEST_NOT_EMPTY"
+};
 async function fetchTemplate(template, projectName) {
   const templatePath = getTemplatePath(templates[template]);
   const fetcher = tiged(templatePath, {
@@ -609,9 +620,48 @@ async function fetchTemplate(template, projectName) {
     force: true
   });
   const destination = path6.join(process.cwd(), projectName);
-  await fetcher.clone(destination);
+  const originalCwd = process.cwd();
+  let tmpDir;
+  try {
+    const tmpBase = os2.tmpdir();
+    await fs6.mkdir(tmpBase, {
+      recursive: true
+    });
+    tmpDir = await fs6.mkdtemp(path6.join(tmpBase, "pd4castr-init-"));
+    process.chdir(tmpDir);
+  } catch {
+  }
+  try {
+    await fetcher.clone(destination);
+  } finally {
+    try {
+      process.chdir(originalCwd);
+    } catch {
+    }
+    if (tmpDir) {
+      await fs6.rm(tmpDir, {
+        recursive: true,
+        force: true
+      }).catch(() => {
+      });
+    }
+  }
 }
 __name(fetchTemplate, "fetchTemplate");
+function isDegitError(error) {
+  return error instanceof Error && "code" in error && typeof error.code === "string" && error.code in DEGIT_CODE_MAP;
+}
+__name(isDegitError, "isDegitError");
+var ERROR_MESSAGES = {
+  TEMPLATE_DOWNLOAD_FAILED: "Failed to download template. Check your internet connection and try again.",
+  TEMPLATE_NOT_FOUND: "Failed to download template. Please try again or report this issue if it persists.",
+  DEST_NOT_EMPTY: "Destination directory is not empty.",
+  UNKNOWN_ERROR: "An unexpected error occurred. Please try again or report this issue if it persists."
+};
+function formatErrorMessage(code) {
+  return `${ERROR_MESSAGES[code]} [CODE:${code}]`;
+}
+__name(formatErrorMessage, "formatErrorMessage");
 
 // src/commands/init/index.ts
 function registerInitCommand(program2) {
@@ -620,20 +670,20 @@ function registerInitCommand(program2) {
 __name(registerInitCommand, "registerInitCommand");
 
 // src/commands/login/handle-action.ts
-import { ExecaError as ExecaError3 } from "execa";
+import { ExecaError as ExecaError2 } from "execa";
 import ora3 from "ora";
 import { ZodError as ZodError3 } from "zod";
 
 // src/config/update-global-config.ts
-import fs6 from "fs/promises";
-import os2 from "os";
+import fs7 from "fs/promises";
+import os3 from "os";
 import path7 from "path";
 import { produce } from "immer";
 async function updateGlobalConfig(updateFn) {
   const globalConfig = await loadGlobalConfig();
   const updatedConfig = produce(globalConfig, updateFn);
-  const configPath = path7.join(os2.homedir(), GLOBAL_CONFIG_FILE);
-  await fs6.writeFile(configPath, JSON.stringify(updatedConfig, void 0, 2));
+  const configPath = path7.join(os3.homedir(), GLOBAL_CONFIG_FILE);
+  await fs7.writeFile(configPath, JSON.stringify(updatedConfig, void 0, 2));
 }
 __name(updateGlobalConfig, "updateGlobalConfig");
 
@@ -736,7 +786,7 @@ async function handleAction3() {
     } else if (error instanceof Error) {
       spinner.fail(error.message);
     }
-    if (error instanceof Error && error.cause instanceof ExecaError3) {
+    if (error instanceof Error && error.cause instanceof ExecaError2) {
       console.error(error.cause.shortMessage);
     } else if (error instanceof Error && error.cause) {
       console.error(error.cause);
@@ -753,7 +803,7 @@ function registerLoginCommand(program2) {
 __name(registerLoginCommand, "registerLoginCommand");
 
 // src/commands/logout/handle-action.ts
-import { ExecaError as ExecaError4 } from "execa";
+import { ExecaError as ExecaError3 } from "execa";
 import ora4 from "ora";
 import { ZodError as ZodError4 } from "zod";
 async function handleAction4() {
@@ -776,7 +826,7 @@ async function handleAction4() {
     } else if (error instanceof Error) {
       spinner.fail(error.message);
     }
-    if (error instanceof Error && error.cause instanceof ExecaError4) {
+    if (error instanceof Error && error.cause instanceof ExecaError3) {
       console.error(error.cause.shortMessage);
     } else if (error instanceof Error && error.cause) {
       console.error(error.cause);
@@ -793,7 +843,7 @@ function registerLogoutCommand(program2) {
 __name(registerLogoutCommand, "registerLogoutCommand");
 
 // src/commands/publish/handle-action.ts
-import { ExecaError as ExecaError5 } from "execa";
+import { ExecaError as ExecaError4 } from "execa";
 import express2 from "express";
 import { HTTPError as HTTPError3 } from "ky";
 import ora5 from "ora";
@@ -856,14 +906,14 @@ async function triggerModelRun(modelId, authCtx) {
 __name(triggerModelRun, "triggerModelRun");
 
 // src/config/update-project-config.ts
-import fs7 from "fs/promises";
+import fs8 from "fs/promises";
 import path8 from "path";
 import { produce as produce2 } from "immer";
 async function updateProjectConfig(updateFn, configPath) {
   const projectConfig = await loadProjectContext(configPath);
   const updatedConfig = produce2(projectConfig.config, updateFn);
   const resolvedConfigPath = configPath ? path8.resolve(configPath) : path8.join(projectConfig.projectRoot, PROJECT_CONFIG_FILE);
-  await fs7.writeFile(resolvedConfigPath, JSON.stringify(updatedConfig, void 0, 2));
+  await fs8.writeFile(resolvedConfigPath, JSON.stringify(updatedConfig, void 0, 2));
 }
 __name(updateProjectConfig, "updateProjectConfig");
 
@@ -945,7 +995,7 @@ function getDockerImage(ctx) {
 __name(getDockerImage, "getDockerImage");
 
 // src/utils/get-model-config-from-project-config.ts
-import fs8 from "fs/promises";
+import fs9 from "fs/promises";
 import path9 from "path";
 async function getModelConfigFromProjectConfig(ctx) {
   const inputs = await getInputsWithInlinedSQL(ctx);
@@ -979,8 +1029,8 @@ async function getInputsWithInlinedSQL(ctx) {
     const fetchQueryPath = path9.resolve(ctx.projectRoot, input2.fetcher.config.fetchQuery);
     const checkQueryPath = path9.resolve(ctx.projectRoot, input2.fetcher.config.checkQuery);
     const [fetchQuerySQL, checkQuerySQL] = await Promise.all([
-      fs8.readFile(fetchQueryPath, "utf8"),
-      fs8.readFile(checkQueryPath, "utf8")
+      fs9.readFile(fetchQueryPath, "utf8"),
+      fs9.readFile(checkQueryPath, "utf8")
     ]);
     const inputWithSQL = {
       ...input2,
@@ -1004,7 +1054,7 @@ async function getSensitivitiesWithInlinedSQL(ctx) {
   for (const sensitivity of sensitivities) {
     const queryPath = path9.resolve(ctx.projectRoot, sensitivity.query);
     try {
-      const sql = await fs8.readFile(queryPath, "utf8");
+      const sql = await fs9.readFile(queryPath, "utf8");
       sensitivitiesWithSQL.push({
         ...sensitivity,
         query: sql
@@ -1021,7 +1071,7 @@ async function getInputAggregationsWithInlinedSQL(ctx) {
   for (const inputAggregation of ctx.config.inputAggregations) {
     const queryPath = path9.resolve(ctx.projectRoot, inputAggregation.query);
     try {
-      const sql = await fs8.readFile(queryPath, "utf8");
+      const sql = await fs9.readFile(queryPath, "utf8");
       inputAggregationsWithSQL.push({
         ...inputAggregation,
         query: sql
@@ -1039,7 +1089,7 @@ async function getrunDatetimeQuerySQL(ctx) {
   }
   const queryPath = path9.resolve(ctx.projectRoot, ctx.config.runDatetimeQuery);
   try {
-    const sql = await fs8.readFile(queryPath, "utf8");
+    const sql = await fs9.readFile(queryPath, "utf8");
     return sql;
   } catch {
     throw new Error(`Run datetime query file not found (${ctx.config.runDatetimeQuery})`);
@@ -1135,7 +1185,7 @@ function getInputType(input2) {
 __name(getInputType, "getInputType");
 
 // src/docker/run-model-container.ts
-import os3 from "os";
+import os4 from "os";
 import { execa as execa4 } from "execa";
 
 // src/docker/utils/get-input-env.ts
@@ -1187,7 +1237,7 @@ async function runModelContainer(dockerImage, webserverPort, ctx) {
 __name(runModelContainer, "runModelContainer");
 function getWSLMachineIP() {
   const env = getEnv();
-  const interfaces = os3.networkInterfaces();
+  const interfaces = os4.networkInterfaces();
   const interfaceInfo = interfaces[env.wslNetworkInterface]?.[0];
   if (!interfaceInfo) {
     throw new Error(`WSL machine IP not found for interface \`${env.wslNetworkInterface}\``);
@@ -1253,18 +1303,18 @@ function createInputHandler(inputFilesPath, modelIOChecks, ctx) {
 __name(createInputHandler, "createInputHandler");
 
 // src/model-io-checks/utils/create-output-handler.ts
-import fs9 from "fs/promises";
+import fs10 from "fs/promises";
 import path13 from "path";
 function createOutputHandler(modelIOChecks, ctx) {
   return async (req, res) => {
     modelIOChecks.trackOutputHandled();
     const outputPath = path13.join(ctx.projectRoot, TEST_OUTPUT_DATA_DIR);
-    await fs9.mkdir(outputPath, {
+    await fs10.mkdir(outputPath, {
       recursive: true
     });
     const outputFilePath = path13.join(outputPath, TEST_OUTPUT_FILENAME);
     const outputData = JSON.stringify(req.body, null, 2);
-    await fs9.writeFile(outputFilePath, outputData, "utf8");
+    await fs10.writeFile(outputFilePath, outputData, "utf8");
     return res.status(200).json({
       success: true
     });
@@ -1308,7 +1358,7 @@ async function runModelIOTests(dockerImage, options, app, ctx) {
 __name(runModelIOTests, "runModelIOTests");
 
 // src/commands/publish/utils/upload-static-inputs.ts
-import fs10 from "fs";
+import fs11 from "fs";
 import path15 from "path";
 import ky3, { isHTTPError } from "ky";
 import promiseRetry from "promise-retry";
@@ -1372,8 +1422,8 @@ var RETRY_LIMIT = 3;
 var RETRY_DELAY_MS = 250;
 async function uploadWithRetry(filePath, signedUploadURL) {
   const upload = /* @__PURE__ */ __name(async (retry) => {
-    const { size } = fs10.statSync(filePath);
-    const body = fs10.createReadStream(filePath);
+    const { size } = fs11.statSync(filePath);
+    const body = fs11.createReadStream(filePath);
     try {
       const response = await ky3.put(signedUploadURL, {
         body,
@@ -1518,7 +1568,7 @@ import * as inquirer3 from "@inquirer/prompts";
 import chalk4 from "chalk";
 
 // src/utils/migrate-config.ts
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 import invariant4 from "tiny-invariant";
 
 // src/migrations/01-backfill-output-variable-keys.ts
@@ -1630,7 +1680,7 @@ async function migrateConfig(ctx, migrationCtx) {
     $$configVersion: lastMigration.version
   };
   ctx.config = config;
-  await fs11.writeFile(ctx.configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+  await fs12.writeFile(ctx.configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
 }
 __name(migrateConfig, "migrateConfig");
 
@@ -1960,7 +2010,7 @@ async function handleAction5(options) {
       } else if (error instanceof Error) {
         spinner.fail(error.message);
       }
-      if (error instanceof Error && error.cause instanceof ExecaError5) {
+      if (error instanceof Error && error.cause instanceof ExecaError4) {
         console.error(error.cause.stderr);
       } else if (error instanceof Error && error.cause) {
         console.error(error.cause);
@@ -1984,7 +2034,7 @@ __name(registerPublishCommand, "registerPublishCommand");
 
 // src/commands/test/handle-action.ts
 import path16 from "path";
-import { ExecaError as ExecaError6 } from "execa";
+import { ExecaError as ExecaError5 } from "execa";
 import express3 from "express";
 import ora6 from "ora";
 import { ZodError as ZodError6 } from "zod";
@@ -2115,7 +2165,7 @@ ${clickHereLink} to view output (${fileLink})
       } else if (error instanceof Error) {
         spinner.fail(error.message);
       }
-      if (error instanceof Error && error.cause instanceof ExecaError6) {
+      if (error instanceof Error && error.cause instanceof ExecaError5) {
         console.error(error.cause.stderr);
       } else if (error instanceof Error && error.cause) {
         console.error(error.cause);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pd4castr/cli",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "CLI tool for creating, testing, and publishing pd4castr models",
   "license": "MIT",
   "main": "dist/index.js",