@supatype/cli 0.1.0-alpha.9 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +2 -2
- package/.turbo/turbo-test.log +285 -69
- package/.turbo/turbo-typecheck.log +1 -1
- package/assets/supatype-logo-wordmark.ascii.txt +6 -0
- package/bin/dev-entry.ts +2 -1
- package/dist/app/framework.js +1 -3
- package/dist/app/framework.js.map +1 -1
- package/dist/app/proxy-dev-app.d.ts +14 -0
- package/dist/app/proxy-dev-app.d.ts.map +1 -1
- package/dist/app/proxy-dev-app.js +110 -6
- package/dist/app/proxy-dev-app.js.map +1 -1
- package/dist/app-config.d.ts +10 -0
- package/dist/app-config.d.ts.map +1 -1
- package/dist/app-config.js +72 -0
- package/dist/app-config.js.map +1 -1
- package/dist/assets/supatype-logo-wordmark.ascii.txt +6 -0
- package/dist/binary-cache.d.ts +19 -7
- package/dist/binary-cache.d.ts.map +1 -1
- package/dist/binary-cache.js +92 -46
- package/dist/binary-cache.js.map +1 -1
- package/dist/cli.d.ts +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +17 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.d.ts +3 -0
- package/dist/commands/add.d.ts.map +1 -0
- package/dist/commands/add.js +86 -0
- package/dist/commands/add.js.map +1 -0
- package/dist/commands/admin.d.ts +28 -1
- package/dist/commands/admin.d.ts.map +1 -1
- package/dist/commands/admin.js +297 -149
- package/dist/commands/admin.js.map +1 -1
- package/dist/commands/adopt.d.ts +3 -0
- package/dist/commands/adopt.d.ts.map +1 -0
- package/dist/commands/adopt.js +55 -0
- package/dist/commands/adopt.js.map +1 -0
- package/dist/commands/app.d.ts.map +1 -1
- package/dist/commands/app.js +20 -17
- package/dist/commands/app.js.map +1 -1
- package/dist/commands/cache.d.ts.map +1 -1
- package/dist/commands/cache.js +11 -10
- package/dist/commands/cache.js.map +1 -1
- package/dist/commands/cloud.d.ts +4 -9
- package/dist/commands/cloud.d.ts.map +1 -1
- package/dist/commands/cloud.js +75 -125
- package/dist/commands/cloud.js.map +1 -1
- package/dist/commands/db.d.ts.map +1 -1
- package/dist/commands/db.js +37 -58
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +140 -96
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +74 -39
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/diff.d.ts.map +1 -1
- package/dist/commands/diff.js +39 -39
- package/dist/commands/diff.js.map +1 -1
- package/dist/commands/doctor.d.ts +3 -0
- package/dist/commands/doctor.d.ts.map +1 -0
- package/dist/commands/doctor.js +78 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/engine.d.ts.map +1 -1
- package/dist/commands/engine.js +5 -4
- package/dist/commands/engine.js.map +1 -1
- package/dist/commands/functions.d.ts.map +1 -1
- package/dist/commands/functions.js +172 -119
- package/dist/commands/functions.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +5 -4
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/init.d.ts +35 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +883 -107
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/introspect.d.ts +3 -0
- package/dist/commands/introspect.d.ts.map +1 -0
- package/dist/commands/introspect.js +35 -0
- package/dist/commands/introspect.js.map +1 -0
- package/dist/commands/keys.d.ts +15 -1
- package/dist/commands/keys.d.ts.map +1 -1
- package/dist/commands/keys.js +46 -10
- package/dist/commands/keys.js.map +1 -1
- package/dist/commands/link-helpers.d.ts +15 -0
- package/dist/commands/link-helpers.d.ts.map +1 -0
- package/dist/commands/link-helpers.js +225 -0
- package/dist/commands/link-helpers.js.map +1 -0
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +5 -4
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/migrate-from-v1.d.ts.map +1 -1
- package/dist/commands/migrate-from-v1.js +3 -2
- package/dist/commands/migrate-from-v1.js.map +1 -1
- package/dist/commands/migrate.d.ts.map +1 -1
- package/dist/commands/migrate.js +119 -26
- package/dist/commands/migrate.js.map +1 -1
- package/dist/commands/pg.d.ts.map +1 -1
- package/dist/commands/pg.js +11 -12
- package/dist/commands/pg.js.map +1 -1
- package/dist/commands/plugins.d.ts.map +1 -1
- package/dist/commands/plugins.js +55 -46
- package/dist/commands/plugins.js.map +1 -1
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +33 -5
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +111 -138
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/seed.d.ts.map +1 -1
- package/dist/commands/seed.js +4 -3
- package/dist/commands/seed.js.map +1 -1
- package/dist/commands/self-host.d.ts +2 -2
- package/dist/commands/self-host.d.ts.map +1 -1
- package/dist/commands/self-host.js +65 -50
- package/dist/commands/self-host.js.map +1 -1
- package/dist/commands/self-update.d.ts.map +1 -1
- package/dist/commands/self-update.js +3 -2
- package/dist/commands/self-update.js.map +1 -1
- package/dist/commands/status.d.ts +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +95 -29
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/types.d.ts.map +1 -1
- package/dist/commands/types.js +3 -2
- package/dist/commands/types.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +54 -21
- package/dist/commands/update.js.map +1 -1
- package/dist/compose-rename.d.ts +10 -0
- package/dist/compose-rename.d.ts.map +1 -0
- package/dist/compose-rename.js +67 -0
- package/dist/compose-rename.js.map +1 -0
- package/dist/config.d.ts +2 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js.map +1 -1
- package/dist/dev-compose.d.ts +26 -0
- package/dist/dev-compose.d.ts.map +1 -1
- package/dist/dev-compose.js +357 -79
- package/dist/dev-compose.js.map +1 -1
- package/dist/dev-log-bus.d.ts +30 -0
- package/dist/dev-log-bus.d.ts.map +1 -0
- package/dist/dev-log-bus.js +87 -0
- package/dist/dev-log-bus.js.map +1 -0
- package/dist/dev-log-filter.d.ts +10 -0
- package/dist/dev-log-filter.d.ts.map +1 -0
- package/dist/dev-log-filter.js +36 -0
- package/dist/dev-log-filter.js.map +1 -0
- package/dist/dev-logo.d.ts +12 -0
- package/dist/dev-logo.d.ts.map +1 -0
- package/dist/dev-logo.js +56 -0
- package/dist/dev-logo.js.map +1 -0
- package/dist/dev-ports.d.ts +27 -0
- package/dist/dev-ports.d.ts.map +1 -0
- package/dist/dev-ports.js +171 -0
- package/dist/dev-ports.js.map +1 -0
- package/dist/dev-session-lock.d.ts +25 -0
- package/dist/dev-session-lock.d.ts.map +1 -0
- package/dist/dev-session-lock.js +81 -0
- package/dist/dev-session-lock.js.map +1 -0
- package/dist/dev-session.d.ts +26 -0
- package/dist/dev-session.d.ts.map +1 -0
- package/dist/dev-session.js +106 -0
- package/dist/dev-session.js.map +1 -0
- package/dist/dev-shutdown.d.ts +25 -0
- package/dist/dev-shutdown.d.ts.map +1 -0
- package/dist/dev-shutdown.js +114 -0
- package/dist/dev-shutdown.js.map +1 -0
- package/dist/dev-task-colors.d.ts +13 -0
- package/dist/dev-task-colors.d.ts.map +1 -0
- package/dist/dev-task-colors.js +43 -0
- package/dist/dev-task-colors.js.map +1 -0
- package/dist/dev-tui.d.ts +24 -0
- package/dist/dev-tui.d.ts.map +1 -0
- package/dist/dev-tui.js +188 -0
- package/dist/dev-tui.js.map +1 -0
- package/dist/diff-output.d.ts +5 -1
- package/dist/diff-output.d.ts.map +1 -1
- package/dist/diff-output.js +69 -0
- package/dist/diff-output.js.map +1 -1
- package/dist/docker-runtime.d.ts +30 -0
- package/dist/docker-runtime.d.ts.map +1 -0
- package/dist/docker-runtime.js +118 -0
- package/dist/docker-runtime.js.map +1 -0
- package/dist/engine-client.d.ts +10 -1
- package/dist/engine-client.d.ts.map +1 -1
- package/dist/engine-client.js +76 -17
- package/dist/engine-client.js.map +1 -1
- package/dist/engine-push-output.d.ts +17 -0
- package/dist/engine-push-output.d.ts.map +1 -0
- package/dist/engine-push-output.js +64 -0
- package/dist/engine-push-output.js.map +1 -0
- package/dist/ensure-binary.js +2 -2
- package/dist/ensure-binary.js.map +1 -1
- package/dist/env-file.d.ts +5 -0
- package/dist/env-file.d.ts.map +1 -0
- package/dist/env-file.js +33 -0
- package/dist/env-file.js.map +1 -0
- package/dist/gitignore.d.ts +8 -0
- package/dist/gitignore.d.ts.map +1 -0
- package/dist/gitignore.js +41 -0
- package/dist/gitignore.js.map +1 -0
- package/dist/kong-config.d.ts +9 -0
- package/dist/kong-config.d.ts.map +1 -1
- package/dist/kong-config.js +18 -1
- package/dist/kong-config.js.map +1 -1
- package/dist/link.d.ts +66 -0
- package/dist/link.d.ts.map +1 -0
- package/dist/link.js +160 -0
- package/dist/link.js.map +1 -0
- package/dist/process-manager.d.ts +8 -0
- package/dist/process-manager.d.ts.map +1 -1
- package/dist/process-manager.js +53 -9
- package/dist/process-manager.js.map +1 -1
- package/dist/project-config.d.ts +30 -3
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +37 -4
- package/dist/project-config.js.map +1 -1
- package/dist/prompts.d.ts +3 -0
- package/dist/prompts.d.ts.map +1 -0
- package/dist/prompts.js +3 -0
- package/dist/prompts.js.map +1 -0
- package/dist/pull-utils.d.ts +50 -14
- package/dist/pull-utils.d.ts.map +1 -1
- package/dist/pull-utils.js +152 -12
- package/dist/pull-utils.js.map +1 -1
- package/dist/resolve-target.d.ts +86 -0
- package/dist/resolve-target.d.ts.map +1 -0
- package/dist/resolve-target.js +291 -0
- package/dist/resolve-target.js.map +1 -0
- package/dist/restore-system-relation-targets.d.ts +3 -0
- package/dist/restore-system-relation-targets.d.ts.map +1 -0
- package/dist/restore-system-relation-targets.js +45 -0
- package/dist/restore-system-relation-targets.js.map +1 -0
- package/dist/runtime-routes.d.ts.map +1 -1
- package/dist/runtime-routes.js +7 -0
- package/dist/runtime-routes.js.map +1 -1
- package/dist/schema-ast-v2.d.ts +1 -1
- package/dist/schema-ast-v2.d.ts.map +1 -1
- package/dist/schema-ast-v2.js +2 -2
- package/dist/schema-ast-v2.js.map +1 -1
- package/dist/schema-sources.d.ts +40 -0
- package/dist/schema-sources.d.ts.map +1 -0
- package/dist/schema-sources.js +183 -0
- package/dist/schema-sources.js.map +1 -0
- package/dist/scripts/postinstall.js +5 -1
- package/dist/scripts/postinstall.js.map +1 -1
- package/dist/self-host-compose.d.ts +37 -1
- package/dist/self-host-compose.d.ts.map +1 -1
- package/dist/self-host-compose.js +234 -43
- package/dist/self-host-compose.js.map +1 -1
- package/dist/storage-provision.d.ts +4 -0
- package/dist/storage-provision.d.ts.map +1 -1
- package/dist/storage-provision.js +24 -2
- package/dist/storage-provision.js.map +1 -1
- package/dist/supatype-eval-1781522769253.d.mts +2 -0
- package/dist/supatype-eval-1781522769253.d.mts.map +1 -0
- package/dist/supatype-eval-1781522769253.mjs +3 -0
- package/dist/supatype-eval-1781522769253.mjs.map +1 -0
- package/dist/systemd.js +2 -2
- package/dist/systemd.js.map +1 -1
- package/dist/target-client.d.ts +10 -0
- package/dist/target-client.d.ts.map +1 -0
- package/dist/target-client.js +22 -0
- package/dist/target-client.js.map +1 -0
- package/dist/type-extractor.d.ts +11 -0
- package/dist/type-extractor.d.ts.map +1 -1
- package/dist/type-extractor.js +95 -8
- package/dist/type-extractor.js.map +1 -1
- package/dist/ui/brand.d.ts +9 -0
- package/dist/ui/brand.d.ts.map +1 -0
- package/dist/ui/brand.js +11 -0
- package/dist/ui/brand.js.map +1 -0
- package/dist/ui/confirm.d.ts +12 -0
- package/dist/ui/confirm.d.ts.map +1 -0
- package/dist/ui/confirm.js +28 -0
- package/dist/ui/confirm.js.map +1 -0
- package/dist/ui/fatal.d.ts +10 -0
- package/dist/ui/fatal.d.ts.map +1 -0
- package/dist/ui/fatal.js +34 -0
- package/dist/ui/fatal.js.map +1 -0
- package/dist/ui/index.d.ts +9 -0
- package/dist/ui/index.d.ts.map +1 -0
- package/dist/ui/index.js +9 -0
- package/dist/ui/index.js.map +1 -0
- package/dist/ui/interactive.d.ts +3 -0
- package/dist/ui/interactive.d.ts.map +1 -0
- package/dist/ui/interactive.js +5 -0
- package/dist/ui/interactive.js.map +1 -0
- package/dist/ui/messages.d.ts +10 -0
- package/dist/ui/messages.d.ts.map +1 -0
- package/dist/ui/messages.js +35 -0
- package/dist/ui/messages.js.map +1 -0
- package/dist/ui/next-steps.d.ts +3 -0
- package/dist/ui/next-steps.d.ts.map +1 -0
- package/dist/ui/next-steps.js +10 -0
- package/dist/ui/next-steps.js.map +1 -0
- package/dist/ui/progress.d.ts +5 -0
- package/dist/ui/progress.d.ts.map +1 -0
- package/dist/ui/progress.js +24 -0
- package/dist/ui/progress.js.map +1 -0
- package/dist/ui/prompts.d.ts +14 -0
- package/dist/ui/prompts.d.ts.map +1 -0
- package/dist/ui/prompts.js +34 -0
- package/dist/ui/prompts.js.map +1 -0
- package/package.json +5 -2
- package/src/app/framework.ts +1 -3
- package/src/app/proxy-dev-app.ts +114 -6
- package/src/app-config.ts +80 -0
- package/src/binary-cache.ts +102 -52
- package/src/cli.ts +16 -2
- package/src/commands/add.ts +97 -0
- package/src/commands/admin.ts +381 -190
- package/src/commands/adopt.ts +82 -0
- package/src/commands/app.ts +20 -17
- package/src/commands/cache.ts +11 -10
- package/src/commands/cloud.ts +91 -142
- package/src/commands/db.ts +40 -63
- package/src/commands/deploy.ts +186 -126
- package/src/commands/dev.ts +98 -55
- package/src/commands/diff.ts +52 -43
- package/src/commands/doctor.ts +103 -0
- package/src/commands/engine.ts +5 -4
- package/src/commands/functions.ts +187 -123
- package/src/commands/generate.ts +5 -4
- package/src/commands/init.ts +1087 -104
- package/src/commands/introspect.ts +48 -0
- package/src/commands/keys.ts +56 -14
- package/src/commands/link-helpers.ts +273 -0
- package/src/commands/logs.ts +5 -4
- package/src/commands/migrate-from-v1.ts +3 -2
- package/src/commands/migrate.ts +167 -27
- package/src/commands/pg.ts +13 -18
- package/src/commands/plugins.ts +55 -46
- package/src/commands/pull.ts +38 -9
- package/src/commands/push.ts +148 -175
- package/src/commands/seed.ts +5 -4
- package/src/commands/self-host.ts +85 -54
- package/src/commands/self-update.ts +3 -2
- package/src/commands/status.ts +102 -33
- package/src/commands/types.ts +3 -2
- package/src/commands/update.ts +59 -23
- package/src/compose-rename.ts +76 -0
- package/src/config.ts +2 -1
- package/src/dev-compose.ts +462 -76
- package/src/dev-log-bus.ts +101 -0
- package/src/dev-log-filter.ts +32 -0
- package/src/dev-logo.ts +61 -0
- package/src/dev-ports.ts +212 -0
- package/src/dev-session-lock.ts +101 -0
- package/src/dev-session.ts +130 -0
- package/src/dev-shutdown.ts +147 -0
- package/src/dev-task-colors.ts +47 -0
- package/src/dev-tui.ts +232 -0
- package/src/diff-output.ts +79 -1
- package/src/docker-runtime.ts +151 -0
- package/src/engine-client.ts +81 -17
- package/src/engine-push-output.ts +75 -0
- package/src/ensure-binary.ts +2 -2
- package/src/env-file.ts +37 -0
- package/src/gitignore.ts +48 -0
- package/src/kong-config.ts +24 -1
- package/src/link.ts +243 -0
- package/src/process-manager.ts +66 -10
- package/src/project-config.ts +62 -7
- package/src/prompts.ts +2 -0
- package/src/pull-utils.ts +217 -23
- package/src/resolve-target.ts +419 -0
- package/src/restore-system-relation-targets.ts +45 -0
- package/src/runtime-routes.ts +7 -0
- package/src/schema-ast-v2.ts +2 -1
- package/src/schema-sources.ts +248 -0
- package/src/scripts/postinstall.ts +7 -1
- package/src/self-host-compose.ts +262 -46
- package/src/storage-provision.ts +33 -1
- package/src/supatype-eval-1781522769253.mts +1 -0
- package/src/systemd.ts +2 -2
- package/src/target-client.ts +40 -0
- package/src/type-extractor.ts +124 -11
- package/src/ui/README.md +17 -0
- package/src/ui/brand.ts +12 -0
- package/src/ui/confirm.ts +38 -0
- package/src/ui/fatal.ts +43 -0
- package/src/ui/index.ts +8 -0
- package/src/ui/interactive.ts +4 -0
- package/src/ui/messages.ts +43 -0
- package/src/ui/next-steps.ts +10 -0
- package/src/ui/progress.ts +28 -0
- package/src/ui/prompts.ts +40 -0
- package/tests/admin-ensure.test.ts +59 -0
- package/tests/cli-help.test.ts +27 -2
- package/tests/config.test.ts +29 -2
- package/tests/dev-ports.test.ts +41 -0
- package/tests/dev-session-lock.test.ts +54 -0
- package/tests/dev-ui.test.ts +162 -0
- package/tests/docker-runtime.test.ts +236 -0
- package/tests/engine-push-output.test.ts +67 -0
- package/tests/init.test.ts +197 -18
- package/tests/link.test.ts +148 -0
- package/tests/minisign.test.ts +102 -0
- package/tests/proxy-dev-app.test.ts +45 -1
- package/tests/pull-utils.test.ts +5 -4
- package/tests/runtime-contract.test.ts +186 -2
- package/tests/schema-sources.test.ts +119 -0
- package/tests/storage-provision.test.ts +100 -0
- package/tests/ui-confirm.test.ts +41 -0
- package/tests/ui-messages.test.ts +66 -0
- package/tsconfig.tsbuildinfo +1 -1
package/dist/link.js
ADDED
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { resolve } from "node:path";
|
|
3
|
+
import { warn } from "./ui/messages.js";
|
|
4
|
+
export const LINK_VERSION = 1;
|
|
5
|
+
export const LINK_FILE = ".supatype/link.json";
|
|
6
|
+
export const LEGACY_CLOUD_FILE = ".supatype/cloud.json";
|
|
7
|
+
export const LEGACY_LINKED_FILE = ".supatype/linked.json";
|
|
8
|
+
export function writeLocalEnvironment(cwd, env) {
|
|
9
|
+
const dir = resolve(cwd, ".supatype");
|
|
10
|
+
mkdirSync(dir, { recursive: true });
|
|
11
|
+
writeFileSync(resolve(dir, "environment.json"), `${JSON.stringify(env, null, 2)}\n`, "utf8");
|
|
12
|
+
}
|
|
13
|
+
export function loadLocalEnvironment(cwd) {
|
|
14
|
+
const path = resolve(cwd, ".supatype/environment.json");
|
|
15
|
+
if (!existsSync(path))
|
|
16
|
+
return null;
|
|
17
|
+
return JSON.parse(readFileSync(path, "utf8"));
|
|
18
|
+
}
|
|
19
|
+
export function linkPath(cwd) {
|
|
20
|
+
return resolve(cwd, LINK_FILE);
|
|
21
|
+
}
|
|
22
|
+
export function loadProjectLink(cwd) {
|
|
23
|
+
migrateLegacyLinkFiles(cwd);
|
|
24
|
+
const path = linkPath(cwd);
|
|
25
|
+
if (!existsSync(path))
|
|
26
|
+
return null;
|
|
27
|
+
return JSON.parse(readFileSync(path, "utf8"));
|
|
28
|
+
}
|
|
29
|
+
export function saveProjectLink(cwd, link) {
|
|
30
|
+
const dir = resolve(cwd, ".supatype");
|
|
31
|
+
mkdirSync(dir, { recursive: true });
|
|
32
|
+
writeFileSync(linkPath(cwd), `${JSON.stringify(link, null, 2)}\n`, "utf8");
|
|
33
|
+
}
|
|
34
|
+
export function isProjectLinked(cwd) {
|
|
35
|
+
const link = loadProjectLink(cwd);
|
|
36
|
+
return Boolean(link?.projectRef && Object.keys(link.environments).length > 0);
|
|
37
|
+
}
|
|
38
|
+
export function resolveEnvironmentName(link, envFlag) {
|
|
39
|
+
if (envFlag?.trim())
|
|
40
|
+
return envFlag.trim();
|
|
41
|
+
return link.defaultEnvironment || "production";
|
|
42
|
+
}
|
|
43
|
+
export function getEnvironmentTarget(link, envName) {
|
|
44
|
+
return link.environments[envName] ?? null;
|
|
45
|
+
}
|
|
46
|
+
export function resolveEnvironmentToken(link, env) {
|
|
47
|
+
return env.token ?? link.token;
|
|
48
|
+
}
|
|
49
|
+
let migrationWarned = false;
|
|
50
|
+
/** Merge legacy cloud.json + linked.json into link.json once. */
|
|
51
|
+
export function migrateLegacyLinkFiles(cwd) {
|
|
52
|
+
const target = linkPath(cwd);
|
|
53
|
+
if (existsSync(target))
|
|
54
|
+
return;
|
|
55
|
+
const cloudPath = resolve(cwd, LEGACY_CLOUD_FILE);
|
|
56
|
+
const linkedPath = resolve(cwd, LEGACY_LINKED_FILE);
|
|
57
|
+
const hasCloud = existsSync(cloudPath);
|
|
58
|
+
const hasLinked = existsSync(linkedPath);
|
|
59
|
+
if (!hasCloud && !hasLinked)
|
|
60
|
+
return;
|
|
61
|
+
let cloud = null;
|
|
62
|
+
let linked = null;
|
|
63
|
+
if (hasCloud) {
|
|
64
|
+
cloud = JSON.parse(readFileSync(cloudPath, "utf8"));
|
|
65
|
+
}
|
|
66
|
+
if (hasLinked) {
|
|
67
|
+
linked = JSON.parse(readFileSync(linkedPath, "utf8"));
|
|
68
|
+
}
|
|
69
|
+
const projectRef = cloud?.projectSlug ?? linked?.ref;
|
|
70
|
+
if (!projectRef || !cloud?.token) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const now = new Date().toISOString();
|
|
74
|
+
const link = {
|
|
75
|
+
version: LINK_VERSION,
|
|
76
|
+
kind: "cloud",
|
|
77
|
+
projectRef,
|
|
78
|
+
defaultEnvironment: "production",
|
|
79
|
+
token: cloud.token,
|
|
80
|
+
cloudApiUrl: cloud.apiUrl ?? "https://api.supatype.com",
|
|
81
|
+
linkedAt: now,
|
|
82
|
+
environments: {
|
|
83
|
+
production: {
|
|
84
|
+
name: "production",
|
|
85
|
+
apiUrl: cloud.apiUrl ?? "https://api.supatype.com",
|
|
86
|
+
linkedAt: now,
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
...(cloud.orgId !== undefined
|
|
90
|
+
? { orgId: cloud.orgId }
|
|
91
|
+
: linked?.orgId !== undefined
|
|
92
|
+
? { orgId: linked.orgId }
|
|
93
|
+
: {}),
|
|
94
|
+
};
|
|
95
|
+
saveProjectLink(cwd, link);
|
|
96
|
+
if (!migrationWarned) {
|
|
97
|
+
migrationWarned = true;
|
|
98
|
+
warn("Migrated .supatype/cloud.json → .supatype/link.json (legacy files kept; remove manually when ready).");
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
export function createSelfHostLink(params) {
|
|
102
|
+
const envName = params.envName ?? "production";
|
|
103
|
+
const now = new Date().toISOString();
|
|
104
|
+
const env = {
|
|
105
|
+
name: envName,
|
|
106
|
+
apiUrl: params.apiUrl.replace(/\/$/, ""),
|
|
107
|
+
token: params.token,
|
|
108
|
+
linkedAt: now,
|
|
109
|
+
};
|
|
110
|
+
if (params.existing) {
|
|
111
|
+
return {
|
|
112
|
+
...params.existing,
|
|
113
|
+
kind: params.existing.kind === "cloud" ? "self-host" : params.existing.kind,
|
|
114
|
+
projectRef: params.projectRef,
|
|
115
|
+
defaultEnvironment: params.existing.defaultEnvironment || envName,
|
|
116
|
+
linkedAt: now,
|
|
117
|
+
environments: {
|
|
118
|
+
...params.existing.environments,
|
|
119
|
+
[envName]: env,
|
|
120
|
+
},
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
return {
|
|
124
|
+
version: LINK_VERSION,
|
|
125
|
+
kind: "self-host",
|
|
126
|
+
projectRef: params.projectRef,
|
|
127
|
+
defaultEnvironment: envName,
|
|
128
|
+
token: params.token,
|
|
129
|
+
linkedAt: now,
|
|
130
|
+
environments: { [envName]: env },
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
export function createCloudLink(params) {
|
|
134
|
+
const now = new Date().toISOString();
|
|
135
|
+
const envMap = {};
|
|
136
|
+
const envs = params.environments?.length
|
|
137
|
+
? params.environments
|
|
138
|
+
: [{ name: "production", apiUrl: params.cloudApiUrl }];
|
|
139
|
+
for (const e of envs) {
|
|
140
|
+
envMap[e.name] = {
|
|
141
|
+
name: e.name,
|
|
142
|
+
apiUrl: e.apiUrl.replace(/\/$/, ""),
|
|
143
|
+
linkedAt: now,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
return {
|
|
147
|
+
version: LINK_VERSION,
|
|
148
|
+
kind: "cloud",
|
|
149
|
+
projectRef: params.projectRef,
|
|
150
|
+
defaultEnvironment: "production",
|
|
151
|
+
token: params.token,
|
|
152
|
+
cloudApiUrl: params.cloudApiUrl.replace(/\/$/, ""),
|
|
153
|
+
linkedAt: now,
|
|
154
|
+
environments: params.existing
|
|
155
|
+
? { ...params.existing.environments, ...envMap }
|
|
156
|
+
: envMap,
|
|
157
|
+
...(params.orgId !== undefined ? { orgId: params.orgId } : {}),
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
//# sourceMappingURL=link.js.map
|
package/dist/link.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../src/link.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,12 @@ export interface ProcessOptions {
|
|
|
21
21
|
onExit?: () => void;
|
|
22
22
|
/** Use shell to spawn (required for pnpm/npm/yarn .cmd shims on Windows). */
|
|
23
23
|
shell?: boolean;
|
|
24
|
+
/** When set (TUI mode), receive log lines instead of writing to stdout/stderr. */
|
|
25
|
+
onLine?: (line: string, stream: "stdout" | "stderr") => void;
|
|
26
|
+
/** Return false to drop a line before logging. */
|
|
27
|
+
shouldLogLine?: (line: string) => boolean;
|
|
28
|
+
/** Called before auto-restart after a non-zero exit (e.g. free a stale port). */
|
|
29
|
+
beforeRestart?: () => void;
|
|
24
30
|
}
|
|
25
31
|
export declare class ProcessManager {
|
|
26
32
|
private readonly bin;
|
|
@@ -29,6 +35,8 @@ export declare class ProcessManager {
|
|
|
29
35
|
private stopped;
|
|
30
36
|
private backoffMs;
|
|
31
37
|
private opts;
|
|
38
|
+
/** Skip immediate duplicate lines (npm prints script banners to both streams). */
|
|
39
|
+
private lastLoggedLine;
|
|
32
40
|
constructor(bin: string, args: string[], opts: ProcessOptions);
|
|
33
41
|
/** Start the process. Returns immediately — the process runs in the background. */
|
|
34
42
|
start(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAA;IACb,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,kFAAkF;IAClF,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,KAAK,IAAI,CAAA;IAC5D,kDAAkD;IAClD,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IACzC,iFAAiF;IACjF,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;CAC3B;AAID,qBAAa,cAAc;IAiBvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAjBvB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,IAAI,CAQX;IACD,kFAAkF;IAClF,OAAO,CAAC,cAAc,CAAK;gBAGR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EAC/B,IAAI,EAAE,cAAc;IAgBtB,mFAAmF;IACnF,KAAK,IAAI,IAAI;IAKb,+CAA+C;IACzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC3B,OAAO,CAAC,KAAK;IAoFb,OAAO,CAAC,QAAQ;YASF,QAAQ;CAOvB;AAED,mEAAmE;AACnE,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMpE"}
|
package/dist/process-manager.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* ProcessManager — spawn a child process, write its PID, stream logs with a
|
|
3
3
|
* colored prefix, and restart on crash with exponential backoff.
|
|
4
4
|
*/
|
|
5
|
-
import { spawn } from "node:child_process";
|
|
5
|
+
import { spawn, spawnSync } from "node:child_process";
|
|
6
6
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
7
7
|
import { unlink } from "node:fs/promises";
|
|
8
8
|
import { join } from "node:path";
|
|
9
|
+
import { enhanceProcessOptions } from "./dev-session.js";
|
|
9
10
|
const RESET = "\x1b[0m";
|
|
10
11
|
export class ProcessManager {
|
|
11
12
|
bin;
|
|
@@ -14,9 +15,12 @@ export class ProcessManager {
|
|
|
14
15
|
stopped = false;
|
|
15
16
|
backoffMs;
|
|
16
17
|
opts;
|
|
18
|
+
/** Skip immediate duplicate lines (npm prints script banners to both streams). */
|
|
19
|
+
lastLoggedLine = "";
|
|
17
20
|
constructor(bin, args, opts) {
|
|
18
21
|
this.bin = bin;
|
|
19
22
|
this.args = args;
|
|
23
|
+
const merged = enhanceProcessOptions(opts.label, opts);
|
|
20
24
|
this.opts = {
|
|
21
25
|
colour: "\x1b[36m",
|
|
22
26
|
cwd: process.cwd(),
|
|
@@ -25,7 +29,7 @@ export class ProcessManager {
|
|
|
25
29
|
maxBackoffMs: 30_000,
|
|
26
30
|
onExit: () => { },
|
|
27
31
|
shell: false,
|
|
28
|
-
...
|
|
32
|
+
...merged,
|
|
29
33
|
};
|
|
30
34
|
this.backoffMs = this.opts.initialBackoffMs;
|
|
31
35
|
}
|
|
@@ -37,7 +41,18 @@ export class ProcessManager {
|
|
|
37
41
|
/** Stop the process and clear the PID file. */
|
|
38
42
|
async stop() {
|
|
39
43
|
this.stopped = true;
|
|
40
|
-
if (this.child
|
|
44
|
+
if (!this.child || this.child.killed) {
|
|
45
|
+
await this.clearPid();
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const pid = this.child.pid;
|
|
49
|
+
if (process.platform === "win32" && this.opts.shell && pid) {
|
|
50
|
+
spawnSync("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore" });
|
|
51
|
+
this.child = null;
|
|
52
|
+
await this.clearPid();
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
if (!this.child.killed) {
|
|
41
56
|
this.child.kill("SIGTERM");
|
|
42
57
|
// Give it 5s to exit gracefully, then SIGKILL.
|
|
43
58
|
await new Promise((resolve) => {
|
|
@@ -69,23 +84,45 @@ export class ProcessManager {
|
|
|
69
84
|
const prefix = this.opts.colour
|
|
70
85
|
? `${this.opts.colour}[${this.opts.label}]${RESET} `
|
|
71
86
|
: `[${this.opts.label}] `;
|
|
87
|
+
const logLine = (line, stream) => {
|
|
88
|
+
if (!line)
|
|
89
|
+
return;
|
|
90
|
+
if (this.opts.shouldLogLine && !this.opts.shouldLogLine(line))
|
|
91
|
+
return;
|
|
92
|
+
if (this.opts.onLine) {
|
|
93
|
+
if (line !== this.lastLoggedLine) {
|
|
94
|
+
this.lastLoggedLine = line;
|
|
95
|
+
this.opts.onLine(line, stream === process.stderr ? "stderr" : "stdout");
|
|
96
|
+
}
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
if (line === this.lastLoggedLine)
|
|
100
|
+
return;
|
|
101
|
+
this.lastLoggedLine = line;
|
|
102
|
+
stream.write(prefix + line + "\n");
|
|
103
|
+
};
|
|
72
104
|
this.child.stdout?.on("data", (chunk) => {
|
|
73
105
|
for (const line of chunk.toString().split("\n")) {
|
|
74
|
-
|
|
75
|
-
process.stdout.write(prefix + line + "\n");
|
|
106
|
+
logLine(line, process.stdout);
|
|
76
107
|
}
|
|
77
108
|
});
|
|
78
109
|
this.child.stderr?.on("data", (chunk) => {
|
|
79
110
|
for (const line of chunk.toString().split("\n")) {
|
|
80
|
-
|
|
81
|
-
process.stderr.write(prefix + line + "\n");
|
|
111
|
+
logLine(line, process.stderr);
|
|
82
112
|
}
|
|
83
113
|
});
|
|
84
114
|
this.child.once("error", (err) => {
|
|
85
115
|
if (this.stopped)
|
|
86
116
|
return;
|
|
87
|
-
|
|
117
|
+
const message = `${prefix}failed to start: ${err.message}\n`;
|
|
118
|
+
if (this.opts.onLine) {
|
|
119
|
+
this.opts.onLine(`failed to start: ${err.message}`, "stderr");
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
process.stderr.write(message);
|
|
123
|
+
}
|
|
88
124
|
setTimeout(() => {
|
|
125
|
+
this.opts.beforeRestart?.();
|
|
89
126
|
this.backoffMs = Math.min(this.backoffMs * 2, this.opts.maxBackoffMs);
|
|
90
127
|
this.spawn();
|
|
91
128
|
}, this.backoffMs);
|
|
@@ -98,8 +135,15 @@ export class ProcessManager {
|
|
|
98
135
|
return;
|
|
99
136
|
}
|
|
100
137
|
const reason = signal ? `signal ${signal}` : `code ${code}`;
|
|
101
|
-
|
|
138
|
+
const restartMsg = `${prefix}process exited (${reason}), restarting in ${this.backoffMs}ms\n`;
|
|
139
|
+
if (this.opts.onLine) {
|
|
140
|
+
this.opts.onLine(`process exited (${reason}), restarting in ${this.backoffMs}ms`, "stderr");
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
process.stderr.write(restartMsg);
|
|
144
|
+
}
|
|
102
145
|
setTimeout(() => {
|
|
146
|
+
this.opts.beforeRestart?.();
|
|
103
147
|
this.backoffMs = Math.min(this.backoffMs * 2, this.opts.maxBackoffMs);
|
|
104
148
|
this.spawn();
|
|
105
149
|
}, this.backoffMs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.js","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAqB,KAAK,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"process-manager.js","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/project-config.d.ts
CHANGED
|
@@ -52,6 +52,16 @@ export interface SupatypeProjectConfig {
|
|
|
52
52
|
postgrestPort?: number;
|
|
53
53
|
/** Domain for ACME TLS certificate (mode=standalone). */
|
|
54
54
|
domain?: string;
|
|
55
|
+
/**
|
|
56
|
+
* TLS for self-host HTTPS (Kong ACME / Let's Encrypt).
|
|
57
|
+
* Requires `mode: "standalone"` and a non-empty `domain`.
|
|
58
|
+
*/
|
|
59
|
+
tls?: {
|
|
60
|
+
/** ACME contact email for Let's Encrypt (required to enable HTTPS). */
|
|
61
|
+
email?: string;
|
|
62
|
+
/** "kong" (default) = Kong acme plugin; "none" = stay HTTP even with a domain. */
|
|
63
|
+
provider?: "kong" | "none";
|
|
64
|
+
};
|
|
55
65
|
};
|
|
56
66
|
app: {
|
|
57
67
|
/**
|
|
@@ -78,10 +88,13 @@ export interface SupatypeProjectConfig {
|
|
|
78
88
|
start?: string;
|
|
79
89
|
};
|
|
80
90
|
/**
|
|
81
|
-
*
|
|
82
|
-
*
|
|
91
|
+
* Optional pins for engine, server, postgres, and deno.
|
|
92
|
+
* Omitted = resolve latest from CDN at runtime (native) or use Docker :latest.
|
|
93
|
+
* When set, native binaries cache under ~/.supatype/cache/{component}/{version}/
|
|
94
|
+
* and Docker image tags are synced to `.env` on `supatype dev` / `supatype push`.
|
|
95
|
+
* Use **`"local"`** with the matching **`overrides.*`** entry for contributor builds.
|
|
83
96
|
*/
|
|
84
|
-
versions
|
|
97
|
+
versions?: Partial<ComponentVersions>;
|
|
85
98
|
/**
|
|
86
99
|
* Override component binaries with local build paths.
|
|
87
100
|
* Intended for supatype contributors testing local changes.
|
|
@@ -191,6 +204,14 @@ export interface SupatypeProjectConfig {
|
|
|
191
204
|
/** Custom response headers for the deployed static site. */
|
|
192
205
|
headers?: Record<string, string>;
|
|
193
206
|
};
|
|
207
|
+
/**
|
|
208
|
+
* Persistent environment defaults for `resolveTarget()` when `--env` is omitted.
|
|
209
|
+
* Ephemeral schema branches (Phase 22) use `.supatype/branch.json`, not this block.
|
|
210
|
+
*/
|
|
211
|
+
environments?: {
|
|
212
|
+
default?: string;
|
|
213
|
+
branchDefaults?: Record<string, string>;
|
|
214
|
+
};
|
|
194
215
|
/**
|
|
195
216
|
* Optional Postgres URL for CLI commands that talk to the DB (`push`, `migrate`, …).
|
|
196
217
|
* When omitted, `DATABASE_URL` from the environment is used, then a local default DSN.
|
|
@@ -221,6 +242,12 @@ export declare function preferredFunctionsPathFromProject(cfg: SupatypeProjectCo
|
|
|
221
242
|
* Returns undefined if the mode is "managed" (cloud controls the URL).
|
|
222
243
|
*/
|
|
223
244
|
export declare function serverBaseUrl(cfg: SupatypeProjectConfig): string | undefined;
|
|
245
|
+
/**
|
|
246
|
+
* True when `supatype self-host compose` should render Kong ACME TLS (Let's Encrypt).
|
|
247
|
+
* Gated on a real self-host render (not `supatype dev`), standalone mode, a non-empty
|
|
248
|
+
* domain, an ACME contact email, and `tls.provider !== "none"`.
|
|
249
|
+
*/
|
|
250
|
+
export declare function selfHostTlsEnabled(cfg: SupatypeProjectConfig, devLocal?: boolean): boolean;
|
|
224
251
|
/** Resolved runtime provider (`config.provider` ?? `database.provider` ?? native). */
|
|
225
252
|
export declare function resolveRuntimeProvider(cfg: SupatypeProjectConfig): "native" | "docker";
|
|
226
253
|
/** Kong gateway port when `provider: docker` (self-host compose dev). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../src/project-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAMxD,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC9B,QAAQ,CAAC,EAAE;QACT;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,OAAO,EAAE;QACP,kEAAkE;QAClE,IAAI,EAAE,MAAM,CAAA;QACZ,wDAAwD;QACxD,GAAG,CAAC,EAAE,MAAM,CAAA;KACb,CAAA;IACD,QAAQ,EAAE;QACR;;;;WAIG;QACH,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAA;QAC7B;;;WAGG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB;;;;WAIG;QACH,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;IACD,MAAM,EAAE;QACN;;;;;WAKG;QACH,IAAI,EAAE,KAAK,GAAG,YAAY,GAAG,SAAS,CAAA;QACtC,wDAAwD;QACxD,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,8DAA8D;QAC9D,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,yDAAyD;QACzD,MAAM,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../src/project-config.ts"],"names":[],"mappings":"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"}
|
package/dist/project-config.js
CHANGED
|
@@ -19,7 +19,9 @@ export function mergeProjectConfig(base, override) {
|
|
|
19
19
|
database: { ...base.database, ...override.database },
|
|
20
20
|
server: { ...base.server, ...override.server },
|
|
21
21
|
app: { ...base.app, ...override.app },
|
|
22
|
-
|
|
22
|
+
...(base.versions !== undefined || override.versions !== undefined
|
|
23
|
+
? { versions: { ...base.versions, ...override.versions } }
|
|
24
|
+
: {}),
|
|
23
25
|
...(base.overrides !== undefined || override.overrides !== undefined
|
|
24
26
|
? {
|
|
25
27
|
overrides: {
|
|
@@ -70,6 +72,22 @@ export function mergeProjectConfig(base, override) {
|
|
|
70
72
|
...(base.admin !== undefined || override.admin !== undefined
|
|
71
73
|
? { admin: { ...base.admin, ...override.admin } }
|
|
72
74
|
: {}),
|
|
75
|
+
...(base.environments !== undefined || override.environments !== undefined
|
|
76
|
+
? (() => {
|
|
77
|
+
const b = base.environments;
|
|
78
|
+
const o = override.environments;
|
|
79
|
+
const mergedBranchDefaults = b?.branchDefaults !== undefined || o?.branchDefaults !== undefined
|
|
80
|
+
? { ...(b?.branchDefaults ?? {}), ...(o?.branchDefaults ?? {}) }
|
|
81
|
+
: undefined;
|
|
82
|
+
return {
|
|
83
|
+
environments: {
|
|
84
|
+
...b,
|
|
85
|
+
...o,
|
|
86
|
+
...(mergedBranchDefaults !== undefined ? { branchDefaults: mergedBranchDefaults } : {}),
|
|
87
|
+
},
|
|
88
|
+
};
|
|
89
|
+
})()
|
|
90
|
+
: {}),
|
|
73
91
|
};
|
|
74
92
|
}
|
|
75
93
|
export function validateProjectConfig(raw, filename) {
|
|
@@ -89,9 +107,6 @@ export function validateProjectConfig(raw, filename) {
|
|
|
89
107
|
if (!cfg["app"]) {
|
|
90
108
|
throw new Error(`${filename}: app section is required`);
|
|
91
109
|
}
|
|
92
|
-
if (!cfg["versions"]) {
|
|
93
|
-
throw new Error(`${filename}: versions section is required`);
|
|
94
|
-
}
|
|
95
110
|
return raw;
|
|
96
111
|
}
|
|
97
112
|
/** Schema entry path (with fallback). */
|
|
@@ -139,6 +154,24 @@ export function serverBaseUrl(cfg) {
|
|
|
139
154
|
return undefined;
|
|
140
155
|
}
|
|
141
156
|
}
|
|
157
|
+
/**
|
|
158
|
+
* True when `supatype self-host compose` should render Kong ACME TLS (Let's Encrypt).
|
|
159
|
+
* Gated on a real self-host render (not `supatype dev`), standalone mode, a non-empty
|
|
160
|
+
* domain, an ACME contact email, and `tls.provider !== "none"`.
|
|
161
|
+
*/
|
|
162
|
+
export function selfHostTlsEnabled(cfg, devLocal = false) {
|
|
163
|
+
if (devLocal)
|
|
164
|
+
return false;
|
|
165
|
+
if (cfg.server.mode !== "standalone")
|
|
166
|
+
return false;
|
|
167
|
+
const domain = cfg.server.domain?.trim();
|
|
168
|
+
if (!domain)
|
|
169
|
+
return false;
|
|
170
|
+
const tls = cfg.server.tls;
|
|
171
|
+
if (!tls || tls.provider === "none")
|
|
172
|
+
return false;
|
|
173
|
+
return Boolean(tls.email?.trim());
|
|
174
|
+
}
|
|
142
175
|
/** Resolved runtime provider (`config.provider` ?? `database.provider` ?? native). */
|
|
143
176
|
export function resolveRuntimeProvider(cfg) {
|
|
144
177
|
return cfg.provider ?? cfg.database.provider ?? "native";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../src/project-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../src/project-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA"}
|
package/dist/prompts.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA"}
|
package/dist/pull-utils.d.ts
CHANGED
|
@@ -1,6 +1,43 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Utilities for
|
|
2
|
+
* Utilities for `pull` and `introspect` — map engine DatabaseState to Model<> scaffold.
|
|
3
3
|
*/
|
|
4
|
+
export interface DbColumnState {
|
|
5
|
+
name: string;
|
|
6
|
+
dataType: string;
|
|
7
|
+
udtName: string;
|
|
8
|
+
nullable: boolean;
|
|
9
|
+
default?: string | null;
|
|
10
|
+
ordinalPosition?: number;
|
|
11
|
+
}
|
|
12
|
+
export interface DbTableState {
|
|
13
|
+
schema?: string;
|
|
14
|
+
name: string;
|
|
15
|
+
columns: DbColumnState[];
|
|
16
|
+
}
|
|
17
|
+
export interface DbConstraintState {
|
|
18
|
+
table: string;
|
|
19
|
+
name: string;
|
|
20
|
+
constraintType: string;
|
|
21
|
+
columns: string[];
|
|
22
|
+
foreignTable?: string | null;
|
|
23
|
+
foreignColumns?: string[] | null;
|
|
24
|
+
comment?: string | null;
|
|
25
|
+
}
|
|
26
|
+
export interface DbIndexState {
|
|
27
|
+
table: string;
|
|
28
|
+
name: string;
|
|
29
|
+
columns: string[];
|
|
30
|
+
unique: boolean;
|
|
31
|
+
method: string;
|
|
32
|
+
isPrimary: boolean;
|
|
33
|
+
comment?: string | null;
|
|
34
|
+
}
|
|
35
|
+
export interface DatabaseStateJson {
|
|
36
|
+
schema?: string;
|
|
37
|
+
tables: DbTableState[];
|
|
38
|
+
constraints?: DbConstraintState[];
|
|
39
|
+
indexes?: DbIndexState[];
|
|
40
|
+
}
|
|
4
41
|
export interface ColumnInfo {
|
|
5
42
|
name: string;
|
|
6
43
|
pgType: string;
|
|
@@ -8,24 +45,23 @@ export interface ColumnInfo {
|
|
|
8
45
|
isPrimary: boolean;
|
|
9
46
|
isUnique: boolean;
|
|
10
47
|
hasDefault: boolean;
|
|
11
|
-
}
|
|
12
|
-
/** Engine `/introspect` column shape (see {@link IntrospectResult} in engine-client). */
|
|
13
|
-
export interface IntrospectColumn {
|
|
14
|
-
name: string;
|
|
15
|
-
type: string;
|
|
16
|
-
nullable: boolean;
|
|
17
|
-
default?: string;
|
|
18
|
-
primaryKey?: boolean;
|
|
19
|
-
unique?: boolean;
|
|
20
48
|
references?: {
|
|
21
49
|
table: string;
|
|
22
50
|
column: string;
|
|
23
51
|
};
|
|
24
52
|
}
|
|
25
|
-
/** Map engine introspection
|
|
26
|
-
export declare function introspectColumnToColumnInfo(col:
|
|
27
|
-
/** Map a Postgres column
|
|
28
|
-
export declare function
|
|
53
|
+
/** Map engine introspection column to {@link ColumnInfo}. */
|
|
54
|
+
export declare function introspectColumnToColumnInfo(col: DbColumnState): ColumnInfo;
|
|
55
|
+
/** Map a Postgres column to a Model<> field type string (draft). */
|
|
56
|
+
export declare function pgTypeToModelField(col: ColumnInfo): string;
|
|
29
57
|
/** Convert snake_case table name to PascalCase model export name. */
|
|
58
|
+
export declare function toModelName(s: string): string;
|
|
59
|
+
/** Generate draft schema/index.ts content from introspected DatabaseState. */
|
|
60
|
+
export declare function databaseStateToSchemaScaffold(state: DatabaseStateJson): string;
|
|
61
|
+
/** Human-readable introspection summary for `supatype introspect`. */
|
|
62
|
+
export declare function printIntrospectSummary(state: DatabaseStateJson): void;
|
|
63
|
+
/** @deprecated Legacy pull helper — use {@link pgTypeToModelField}. */
|
|
64
|
+
export declare function pgTypeToField(col: ColumnInfo): string;
|
|
65
|
+
/** @deprecated Use {@link toModelName}. */
|
|
30
66
|
export declare function toCamelCase(s: string): string;
|
|
31
67
|
//# sourceMappingURL=pull-utils.d.ts.map
|