@supatype/cli 0.1.6 → 0.1.7

package/src/commands/self-update.ts

@@ -1,67 +1,139 @@
 /**
+
  * supatype self-update — Phase 10.6C8.
+
  *
+
  * npm-installed CLI: instruct to use `npm update -g`.
+
+ * Homebrew: instruct to use `brew upgrade supatype`.
+
  * Standalone curl|sh installs: replace binary from releases.supatype.com/cli/.
+
  */
 
+
+
 import type { Command } from "commander"
+
 import { copyFileSync, renameSync } from "node:fs"
-import { sep } from "node:path"
+
+import { detectCliInstallMethod } from "../cli-install-method.js"
+
 import { downloadStandaloneCli, fetchStandaloneCliLatestVersion } from "../cli-standalone.js"
+
 import { error, info, plain } from "../ui/messages.js"
 
-function looksLikeNpmOrWorkspaceCLI(): boolean {
-  const main = process.argv[1] ?? ""
-  return (
-    main.includes("node_modules") ||
-    main.includes(`${sep}dist${sep}cli`) ||
-    main.includes(`${sep}bin${sep}supatype.js`) ||
-    Boolean(process.env["npm_execpath"]) ||
-    Boolean(process.env["npm_lifecycle_event"])
-  )
-}
+
 
 export function registerSelfUpdate(program: Command): void {
+
   program
+
     .command("self-update")
+
     .description("Update the supatype CLI (npm or standalone CDN binary)")
+
     .action(async () => {
-      if (looksLikeNpmOrWorkspaceCLI()) {
+
+      const method = detectCliInstallMethod()
+
+
+
+      if (method === "npm") {
+
         plain(
+
           "This CLI was installed via npm (or runs from the package workspace).\n" +
+
             "Update with:\n\n  npm update -g @supatype/cli\n\n" +
+
             "To bump engine/server/postgres/deno/realtime pinned in supatype.config.ts, use:\n\n  supatype update\n",
+
+        )
+
+        return
+
+      }
+
+
+
+      if (method === "homebrew") {
+
+        plain(
+
+          "This CLI was installed via Homebrew.\n" +
+
+            "Update with:\n\n  brew update && brew upgrade supatype\n\n" +
+
+            "To bump component binaries pinned in supatype.config.ts, use:\n\n  supatype update\n",
+
         )
+
         return
+
       }
 
+
+
       const currentPath = process.argv[1]
+
       if (!currentPath) {
+
         error("Could not determine current CLI path.")
+
         process.exit(1)
+
       }
 
+
+
       try {
+
         const latest = await fetchStandaloneCliLatestVersion()
+
         info(`Downloading supatype CLI v${latest}...`)
+
         const downloaded = await downloadStandaloneCli(latest)
+
         const backup = `${currentPath}.bak`
+
         copyFileSync(currentPath, backup)
+
         try {
+
           renameSync(downloaded, currentPath)
-        } catch (err) {
+
+        } catch {
+
           copyFileSync(downloaded, currentPath)
+
         }
+
         info(`Updated to v${latest}.`)
+
         plain("Run `supatype --version` to verify.")
+
       } catch (err) {
+
         error(
+
           `Standalone CLI self-update failed: ${(err as Error).message}\n\n` +
+
             "Install or upgrade via npm:\n  npm install -g @supatype/cli\n\n" +
+
+            "Or Homebrew:\n  brew upgrade supatype\n\n" +
+
             "Component binaries (engine, server, postgres, deno, realtime):\n  supatype update\n",
+
         )
+
         process.exit(1)
+
       }
+
     })
+
 }
+
+

package/src/config.ts

@@ -3,6 +3,7 @@ import { resolve } from "node:path"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
 import { evalTsSnippet } from "./tsx-runner.js"
+import { readEnvFile } from "./env-file.js"
 import {
   mergeProjectConfig,
   validateProjectConfig,
@@ -135,7 +136,25 @@ export function loadConfig(cwd: string = process.cwd()): SupatypeProjectConfig {
   if (localRaw === null) return base
 
   const localNorm = normalizeProjectJson(localRaw) as Partial<SupatypeProjectConfig>
-  return mergeProjectConfig(base, localNorm)
+  // Re-validated after merging: the local override can reintroduce a combination the base file was
+  // rejected for — `database.provider` beside an inherited `database.external`, say — and merging
+  // has no opinion about that.
+  return validateProjectConfig(
+    mergeProjectConfig(base, localNorm),
+    "supatype.local.config.ts (merged with supatype.config.ts)",
+  )
+}
+
+/**
+ * Environment for the child process that imports the config module.
+ *
+ * `supatype.config.ts` is TypeScript, so the natural way to keep a database password out of version
+ * control is `process.env.DATABASE_URL` — which only works if the project's `.env` is visible to the
+ * process doing the import. A real environment variable still wins over the file, matching how every
+ * other dotenv reader behaves and how Compose itself resolves the same names.
+ */
+function configLoadEnv(cwd: string): NodeJS.ProcessEnv {
+  return { ...readEnvFile(cwd), ...process.env }
 }
 
 function loadFirstTsConfig(
@@ -152,7 +171,7 @@ const mod = await import(${JSON.stringify(urlPath)})
 const config = mod.default ?? mod
 process.stdout.write(JSON.stringify(config))
 `
-    const result = evalTsSnippet(snippet, { cwd })
+    const result = evalTsSnippet(snippet, { cwd, env: configLoadEnv(cwd) })
     if (result.exitCode === 0) {
       return JSON.parse(result.stdout) as Record<string, unknown>
     }
@@ -203,7 +222,7 @@ const mod = await import(${JSON.stringify(urlPath)})
 const config = mod.default ?? mod
 process.stdout.write(JSON.stringify(config))
 `
-    const result = evalTsSnippet(snippet, { cwd })
+    const result = evalTsSnippet(snippet, { cwd, env: configLoadEnv(cwd) })
     if (result.exitCode !== 0) return null
     return JSON.parse(result.stdout) as Record<string, unknown>
   } finally {