@xylex-group/athena 2.12.1 → 2.13.0

package/dist/cli/index.cjs

@@ -2004,7 +2004,7 @@ var getSessionCookie = (request2, config) => {
 
 // src/utils/athena-request-headers.ts
 var NO_CACHE_HEADER_VALUE = "no-cache";
-var API_KEY_HEADER_CANDIDATES = ["X-Api-Key", "x-api-key", "apikey"];
+var API_KEY_HEADER_CANDIDATES = ["X-Athena-Key", "x-athena-key", "X-Api-Key", "x-api-key", "apikey"];
 var ATHENA_KEY_HEADER_CANDIDATES = ["X-Athena-Key", "x-athena-key"];
 var SESSION_TOKEN_HEADER_CANDIDATES = ["X-Athena-Auth-Session-Token"];
 var BEARER_MIRROR_HEADER_CANDIDATES = ["X-Athena-Auth-Bearer-Token"];
@@ -2106,17 +2106,6 @@ function buildServiceRequestHeaders(profile, sdkHeaderValue, config, options, ex
   });
 }
 function applyAthenaApiKeyHeaders(headers, apiKey, athenaKey) {
-  if (apiKey) {
-    if (!hasHeaderIgnoreCase(headers, "apikey")) {
-      headers.apikey = apiKey;
-    }
-    if (!Object.hasOwn(headers, "x-api-key")) {
-      headers["x-api-key"] = apiKey;
-    }
-    if (!Object.hasOwn(headers, "X-Api-Key")) {
-      headers["X-Api-Key"] = apiKey;
-    }
-  }
   const resolvedAthenaKey = normalizeHeaderValue(athenaKey) ?? normalizeHeaderValue(apiKey);
   if (resolvedAthenaKey && !hasHeaderIgnoreCase(headers, "X-Athena-Key")) {
     headers["X-Athena-Key"] = resolvedAthenaKey;
@@ -2242,7 +2231,7 @@ function buildAthenaRequestHeaders(input) {
 
 // package.json
 var package_default = {
-  version: "2.12.1"
+  version: "2.13.0"
 };
 
 // src/sdk-version.ts
@@ -4335,38 +4324,6 @@ function createAuthClient(config = {}) {
   };
 }
 
-// src/db/module.ts
-function createDbModule(input) {
-  const db = {
-    from: input.from,
-    select(table, first, second) {
-      if (first && typeof first === "object" && !Array.isArray(first)) {
-        return input.from(table).select(void 0, first);
-      }
-      return input.from(table).select(first, second);
-    },
-    insert(table, values, options) {
-      return Array.isArray(values) ? input.from(table).insert(values, options) : input.from(table).insert(values, options);
-    },
-    upsert(table, values, options) {
-      return Array.isArray(values) ? input.from(table).upsert(values, options) : input.from(table).upsert(values, options);
-    },
-    update(table, values, options) {
-      return input.from(table).update(values, options);
-    },
-    delete(table, options) {
-      return input.from(table).delete(options);
-    },
-    rpc(fn, args, options) {
-      return input.rpc(fn, args, options);
-    },
-    query(query, options) {
-      return input.query(query, options);
-    }
-  };
-  return db;
-}
-
 // src/storage/file.ts
 function createStorageFileModule(base, config = {}) {
   const upload = async (input, options) => {
@@ -9714,7 +9671,30 @@ function createClientFromConfig(config, sourceConfig) {
     config.experimental,
     queryTracer
   );
-  const db = createDbModule({ from, rpc, query });
+  const untypedDbFrom = from;
+  const db = {
+    from,
+    select(table, first, second) {
+      if (first && typeof first === "object" && !Array.isArray(first)) {
+        return untypedDbFrom(table).select(void 0, first);
+      }
+      return untypedDbFrom(table).select(first, second);
+    },
+    insert(table, values, options) {
+      return Array.isArray(values) ? untypedDbFrom(table).insert(values, options) : untypedDbFrom(table).insert(values, options);
+    },
+    upsert(table, values, options) {
+      return Array.isArray(values) ? untypedDbFrom(table).upsert(values, options) : untypedDbFrom(table).upsert(values, options);
+    },
+    update(table, values, options) {
+      return untypedDbFrom(table).update(values, options);
+    },
+    delete(table, options) {
+      return untypedDbFrom(table).delete(options);
+    },
+    rpc,
+    query
+  };
   const chat = createChatModule({
     baseUrl: config.chatUrl,
     apiKey: config.apiKey,
@@ -9862,7 +9842,8 @@ function createClientFromConfig(config, sourceConfig) {
   }
   return sdkClient;
 }
-function createClient(configOrUrl, apiKey, options) {
+function createClient(...args) {
+  const [configOrUrl, apiKey, options] = args;
   if (typeof configOrUrl === "string" || configOrUrl === null || configOrUrl === void 0) {
     return createClientFromInput({
       url: configOrUrl,
@@ -10469,6 +10450,10 @@ async function runSchemaGenerator(options = {}) {
 }
 
 // src/cli/index.ts
+function isDebugEnabled() {
+  const value = globalThis.process?.env?.ATHENA_JS_DEBUG;
+  return value === "1" || value === "true";
+}
 function rootUsage() {
   return [
     "athena-js CLI",
@@ -10632,7 +10617,61 @@ function extractMissingDatabaseName(message) {
 function isErrorWithCode(error) {
   return typeof error === "object" && error !== null && "code" in error;
 }
+function isNetworkConnectionError(error) {
+  if (!isErrorWithCode(error)) {
+    return false;
+  }
+  const code = typeof error.code === "string" ? error.code : "";
+  if (code === "ECONNRESET" || code === "ECONNREFUSED" || code === "ETIMEDOUT" || code === "ENOTFOUND" || code === "EAI_AGAIN" || code === "EPIPE" || code === "EHOSTUNREACH" || code === "ENETUNREACH") {
+    return true;
+  }
+  const message = normalizeErrorMessage(error).toLowerCase();
+  return message.includes("econnreset") || message.includes("econnrefused") || message.includes("etimedout") || message.includes("connection terminated") || message.includes("connection refused") || message.includes("timeout expired");
+}
+function collectErrorDiagnostics(error) {
+  const lines = [];
+  if (!isErrorWithCode(error) && !(error instanceof Error)) {
+    return lines;
+  }
+  const code = isErrorWithCode(error) && error.code !== void 0 ? String(error.code) : void 0;
+  if (code) {
+    lines.push(`  code: ${code}`);
+  }
+  const errno = isErrorWithCode(error) && error.errno !== void 0 ? String(error.errno) : void 0;
+  if (errno) {
+    lines.push(`  errno: ${errno}`);
+  }
+  const syscall = isErrorWithCode(error) && typeof error.syscall === "string" ? error.syscall : void 0;
+  if (syscall) {
+    lines.push(`  syscall: ${syscall}`);
+  }
+  const address = isErrorWithCode(error) && typeof error.address === "string" ? error.address : void 0;
+  const port = isErrorWithCode(error) && error.port !== void 0 ? String(error.port) : void 0;
+  if (address || port) {
+    lines.push(
+      `  remote: ${address ?? "?"}${port ? `:${port}` : ""}`
+    );
+  }
+  const hostname = isErrorWithCode(error) && typeof error.hostname === "string" ? error.hostname : void 0;
+  if (hostname) {
+    lines.push(`  hostname: ${hostname}`);
+  }
+  let cause = error instanceof Error ? error.cause : isErrorWithCode(error) ? error.cause : void 0;
+  let depth = 0;
+  while (cause && depth < 4) {
+    const causeMessage = normalizeErrorMessage(cause);
+    const causeCode = isErrorWithCode(cause) && cause.code !== void 0 ? String(cause.code) : void 0;
+    lines.push(
+      `  cause[${depth}]: ${causeCode ? `${causeCode} \u2014 ` : ""}${causeMessage}`
+    );
+    cause = cause instanceof Error ? cause.cause : isErrorWithCode(cause) ? cause.cause : void 0;
+    depth += 1;
+  }
+  return lines;
+}
 function formatGeneratorError(error, configPath) {
+  const diagnostics = collectErrorDiagnostics(error);
+  const diagnosticsBlock = diagnostics.length > 0 ? ["", "Diagnostics:", ...diagnostics] : [];
   if (isErrorWithCode(error) && error.code === "3D000") {
     const message = normalizeErrorMessage(error);
     const databaseName = extractMissingDatabaseName(message);
@@ -10641,15 +10680,58 @@ function formatGeneratorError(error, configPath) {
     return new Error(
       [
         `${databaseLabel} (code 3D000).`,
-        `Update provider.connectionString (and provider.database, if set) in ${configLabel}, or create that database before running generate.`
+        `Update provider.connectionString (and provider.database, if set) in ${configLabel}, or create that database before running generate.`,
+        ...diagnosticsBlock,
+        "",
+        "Hint: ATHENA_JS_DEBUG=1 pnpm exec athena-js generate"
+      ].join("\n")
+    );
+  }
+  if (isNetworkConnectionError(error)) {
+    const message = normalizeErrorMessage(error);
+    const configLabel = configPath ? `config "${configPath}"` : "the resolved athena config";
+    const code = isErrorWithCode(error) && typeof error.code === "string" ? error.code : "network";
+    return new Error(
+      [
+        `Schema introspection failed: database connection was reset or unreachable (${code}: ${message}).`,
+        `The CLI started correctly; generate could not finish talking to Postgres for ${configLabel}.`,
+        ...diagnosticsBlock,
+        "",
+        "Check:",
+        "  1. DATABASE_URL / provider.connectionString is reachable from this machine (VPN, Railway proxy, firewall).",
+        '  2. The database is running and accepts connections (try `psql "$DATABASE_URL" -c "select 1"`).',
+        "  3. SSL settings match the host (Railway/public proxy often needs `?sslmode=require`).",
+        "  4. Retry once \u2014 ECONNRESET is often a transient proxy drop mid-introspection.",
+        "",
+        "For a full stack: ATHENA_JS_DEBUG=1 pnpm exec athena-js generate"
       ].join("\n")
     );
   }
   if (error instanceof Error) {
-    return error;
+    if (diagnostics.length === 0 && !isDebugEnabled()) {
+      return error;
+    }
+    const base = error.message || normalizeErrorMessage(error);
+    return new Error(
+      [
+        base,
+        ...diagnosticsBlock,
+        ...isDebugEnabled() && error.stack ? ["", "Stack:", error.stack] : ["", "Hint: ATHENA_JS_DEBUG=1 pnpm exec athena-js generate"]
+      ].join("\n")
+    );
   }
   return new Error(normalizeErrorMessage(error));
 }
+function logCliError(error, errorLog = console.error) {
+  const message = error instanceof Error ? error.message : normalizeErrorMessage(error);
+  errorLog(message);
+  if (isDebugEnabled() && error instanceof Error && error.stack) {
+    const stackOnly = error.stack.startsWith(error.message) ? error.stack.slice(error.message.length).replace(/^\n/, "") : error.stack;
+    if (stackOnly) {
+      errorLog(stackOnly);
+    }
+  }
+}
 function formatSkippedArtifactLine(artifact) {
   if (artifact.reason === "protected-existing-file") {
     return ` [skip] ${artifact.path} (existing ${artifact.kind} artifacts are protected from overwrite; delete or retarget the file to regenerate it)`;
@@ -10658,20 +10740,36 @@ function formatSkippedArtifactLine(artifact) {
 }
 async function runCLI(argv, runtime = {}) {
   const log = runtime.log ?? console.log;
+  const errorLog = runtime.errorLog ?? console.error;
   const runGenerator = runtime.runGenerator ?? runSchemaGenerator;
-  const parsed = parseCommand(argv);
+  let parsed;
+  try {
+    parsed = parseCommand(argv);
+  } catch (error) {
+    logCliError(formatGeneratorError(error), errorLog);
+    process.exitCode = 1;
+    return;
+  }
   if (parsed.command === "help") {
     log(usage(parsed.topic));
     return;
   }
   let result;
   try {
+    if (isDebugEnabled()) {
+      errorLog(
+        `[athena-js] generate starting (dryRun=${parsed.dryRun}${parsed.configPath ? ` config=${parsed.configPath}` : ""})`
+      );
+    }
     result = await runGenerator({
       configPath: parsed.configPath,
       dryRun: parsed.dryRun
     });
   } catch (error) {
-    throw formatGeneratorError(error, parsed.configPath);
+    const formatted = formatGeneratorError(error, parsed.configPath);
+    logCliError(formatted, errorLog);
+    process.exitCode = 1;
+    return;
   }
   if (parsed.dryRun) {
     log(`[dry-run] Generated ${result.files.length} files from ${result.configPath}`);
@@ -10695,6 +10793,7 @@ async function runCLI(argv, runtime = {}) {
   }
 }
 
+exports.logCliError = logCliError;
 exports.parseCommand = parseCommand;
 exports.runCLI = runCLI;
 exports.usage = usage;