@supatype/cli 0.1.0-alpha.7 → 0.1.0-alpha.8
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 +1 -1
- package/.turbo/turbo-test.log +67 -62
- package/.turbo/turbo-typecheck.log +1 -1
- package/dist/app/proxy-dev-app.d.ts +13 -0
- package/dist/app/proxy-dev-app.d.ts.map +1 -0
- package/dist/app/proxy-dev-app.js +53 -0
- package/dist/app/proxy-dev-app.js.map +1 -0
- package/dist/binary-cache.d.ts +5 -0
- package/dist/binary-cache.d.ts.map +1 -1
- package/dist/binary-cache.js +13 -0
- package/dist/binary-cache.js.map +1 -1
- package/dist/commands/cloud.d.ts +11 -3
- package/dist/commands/cloud.d.ts.map +1 -1
- package/dist/commands/cloud.js +33 -25
- package/dist/commands/cloud.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +3 -17
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/dev.d.ts +3 -3
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +66 -59
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/diff.d.ts.map +1 -1
- package/dist/commands/diff.js +11 -1
- package/dist/commands/diff.js.map +1 -1
- package/dist/commands/init.js +16 -3
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +42 -12
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +16 -0
- package/dist/commands/update.js.map +1 -1
- package/dist/dev-compose.d.ts +17 -0
- package/dist/dev-compose.d.ts.map +1 -0
- package/dist/dev-compose.js +374 -0
- package/dist/dev-compose.js.map +1 -0
- package/dist/diff-output.d.ts +4 -0
- package/dist/diff-output.d.ts.map +1 -0
- package/dist/diff-output.js +12 -0
- package/dist/diff-output.js.map +1 -0
- package/dist/docker-postgres.d.ts +21 -3
- package/dist/docker-postgres.d.ts.map +1 -1
- package/dist/docker-postgres.js +130 -18
- package/dist/docker-postgres.js.map +1 -1
- package/dist/engine-client.d.ts +5 -3
- package/dist/engine-client.d.ts.map +1 -1
- package/dist/engine-client.js +2 -1
- package/dist/engine-client.js.map +1 -1
- package/dist/kong-config.d.ts +4 -0
- package/dist/kong-config.d.ts.map +1 -1
- package/dist/kong-config.js +12 -1
- package/dist/kong-config.js.map +1 -1
- package/dist/process-manager.d.ts +2 -0
- package/dist/process-manager.d.ts.map +1 -1
- package/dist/process-manager.js +16 -1
- package/dist/process-manager.js.map +1 -1
- package/dist/project-config.d.ts +21 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +15 -0
- package/dist/project-config.js.map +1 -1
- package/dist/runtime-routes.d.ts +9 -0
- package/dist/runtime-routes.d.ts.map +1 -1
- package/dist/runtime-routes.js +75 -12
- package/dist/runtime-routes.js.map +1 -1
- package/dist/schema-ast-v2.d.ts +127 -0
- package/dist/schema-ast-v2.d.ts.map +1 -0
- package/dist/schema-ast-v2.js +226 -0
- package/dist/schema-ast-v2.js.map +1 -0
- package/dist/self-host-compose.d.ts +12 -4
- package/dist/self-host-compose.d.ts.map +1 -1
- package/dist/self-host-compose.js +146 -35
- package/dist/self-host-compose.js.map +1 -1
- package/dist/studio-admin-roles.d.ts +7 -0
- package/dist/studio-admin-roles.d.ts.map +1 -0
- package/dist/studio-admin-roles.js +14 -0
- package/dist/studio-admin-roles.js.map +1 -0
- package/dist/studio-dev-server.d.ts +22 -0
- package/dist/studio-dev-server.d.ts.map +1 -0
- package/dist/studio-dev-server.js +28 -0
- package/dist/studio-dev-server.js.map +1 -0
- package/dist/type-extractor.d.ts +3 -30
- package/dist/type-extractor.d.ts.map +1 -1
- package/dist/type-extractor.js +485 -148
- package/dist/type-extractor.js.map +1 -1
- package/dist/type-resolver.d.ts +33 -0
- package/dist/type-resolver.d.ts.map +1 -0
- package/dist/type-resolver.js +338 -0
- package/dist/type-resolver.js.map +1 -0
- package/package.json +1 -1
- package/src/TYPE-RESOLUTION.md +294 -0
- package/src/app/proxy-dev-app.ts +67 -0
- package/src/binary-cache.ts +20 -0
- package/src/commands/cloud.ts +40 -30
- package/src/commands/deploy.ts +3 -18
- package/src/commands/dev.ts +72 -69
- package/src/commands/diff.ts +11 -1
- package/src/commands/init.ts +16 -3
- package/src/commands/push.ts +49 -13
- package/src/commands/update.ts +17 -0
- package/src/dev-compose.ts +455 -0
- package/src/diff-output.ts +12 -0
- package/src/docker-postgres.ts +184 -27
- package/src/engine-client.ts +9 -4
- package/src/kong-config.ts +16 -1
- package/src/process-manager.ts +18 -1
- package/src/project-config.ts +34 -1
- package/src/runtime-routes.ts +87 -12
- package/src/schema-ast-v2.ts +324 -0
- package/src/self-host-compose.ts +168 -36
- package/src/studio-admin-roles.ts +16 -0
- package/src/studio-dev-server.ts +53 -0
- package/src/type-extractor.ts +649 -186
- package/src/type-resolver.ts +457 -0
- package/tests/config.test.ts +34 -3
- package/tests/docker-postgres.test.ts +39 -0
- package/tests/normalize-admin-config.test.ts +48 -0
- package/tests/proxy-dev-app.test.ts +33 -0
- package/tests/runtime-contract.test.ts +119 -4
- package/tests/studio-admin-roles.test.ts +27 -0
- package/tests/type-extractor.test.ts +607 -23
- package/tests/type-resolver.test.ts +59 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-compose.js","sourceRoot":"","sources":["../src/dev-compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-output.d.ts","sourceRoot":"","sources":["../src/diff-output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAEpD,4DAA4D;AAC5D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAQxD"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Print engine diff warnings before the operation list. */
|
|
2
|
+
export function printDiffWarnings(diff) {
|
|
3
|
+
const warnings = diff.warnings ?? [];
|
|
4
|
+
if (warnings.length === 0)
|
|
5
|
+
return;
|
|
6
|
+
console.log(`\n${warnings.length} warning(s):\n`);
|
|
7
|
+
for (const w of warnings) {
|
|
8
|
+
console.log(` [!] ${w}`);
|
|
9
|
+
}
|
|
10
|
+
console.log();
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=diff-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-output.js","sourceRoot":"","sources":["../src/diff-output.ts"],"names":[],"mappings":"AAEA,4DAA4D;AAC5D,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAM;IACjC,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,MAAM,gBAAgB,CAAC,CAAA;IACjD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAC3B,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,CAAA;AACf,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* named Docker volume (supatype-{projectName}-data) across restarts.
|
|
7
7
|
*/
|
|
8
8
|
export interface DockerPgOptions {
|
|
9
|
-
/** Docker image to run. Defaults to supatype/postgres:
|
|
9
|
+
/** Docker image to run. Defaults to supatype/postgres:latest. */
|
|
10
10
|
image: string;
|
|
11
11
|
/** Project name — used to derive the container and volume names. */
|
|
12
12
|
projectName: string;
|
|
@@ -28,12 +28,30 @@ export declare function dockerPgStart(opts: DockerPgOptions): void;
|
|
|
28
28
|
* Safe to call even if the container is not running.
|
|
29
29
|
*/
|
|
30
30
|
export declare function dockerPgStop(projectName: string): void;
|
|
31
|
+
/** True when the final post-init Postgres process is accepting connections. */
|
|
32
|
+
export declare function dockerPgPostInitServing(logs: string): boolean;
|
|
31
33
|
/**
|
|
32
34
|
* Poll until Postgres accepts connections and the image entrypoint init has
|
|
33
35
|
* finished (anon/authenticated/service_role come from supatype-postgres
|
|
34
36
|
* migrations/db/init-scripts/00000000000000-initial-schema.sql via migrate.sh).
|
|
35
37
|
*/
|
|
36
|
-
export declare function dockerPgWaitReady(projectName: string, timeoutMs?: number): Promise<void>;
|
|
38
|
+
export declare function dockerPgWaitReady(projectName: string, timeoutMs?: number, password?: string): Promise<void>;
|
|
37
39
|
/** Connection string for the Docker container (local dev credentials). */
|
|
38
|
-
export declare function dockerDbUrl(projectName: string, port: number): string;
|
|
40
|
+
export declare function dockerDbUrl(projectName: string, port: number, password?: string): string;
|
|
41
|
+
/**
|
|
42
|
+
* DB URL for processes sharing the Postgres container network namespace
|
|
43
|
+
* (supatype-server migrate in a one-shot container). Uses loopback inside the
|
|
44
|
+
* container where pg_hba grants trust — avoids host-published-port SCRAM/SSL issues.
|
|
45
|
+
*/
|
|
46
|
+
export declare function dockerPgLoopbackDbUrl(projectName: string, password?: string): string;
|
|
47
|
+
/**
|
|
48
|
+
* Published Hub tag for local dev when CDN server version is not on Docker Hub yet.
|
|
49
|
+
* Keep in sync with tests/integration/scripts/compose-smoke.sh.
|
|
50
|
+
*/
|
|
51
|
+
export declare const DEFAULT_SERVER_DOCKER_IMAGE = "supatype/server:latest";
|
|
52
|
+
/**
|
|
53
|
+
* Run `supatype-server migrate` on the Postgres container network (loopback trust).
|
|
54
|
+
* Used on Windows + database.provider docker — host-published :5432 breaks libpq TLS there.
|
|
55
|
+
*/
|
|
56
|
+
export declare function runGotrueMigrationsViaDocker(pgContainerName: string, serverImage: string, migrateEnv: Record<string, string>): void;
|
|
39
57
|
//# sourceMappingURL=docker-postgres.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-postgres.d.ts","sourceRoot":"","sources":["../src/docker-postgres.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,WAAW,eAAe;IAC9B,
|
|
1
|
+
{"version":3,"file":"docker-postgres.d.ts","sourceRoot":"","sources":["../src/docker-postgres.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAA;IACb,oEAAoE;IACpE,WAAW,EAAE,MAAM,CAAA;IACnB,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAwBD,4CAA4C;AAC5C,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA+BzD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAEtD;AAsBD,+EAA+E;AAC/E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAW7D;AAkCD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,SAAS,SAAU,EACnB,QAAQ,SAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqDf;AAWD,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,SAAuB,GAAG,MAAM,CAGtG;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,SAAuB,GAAG,MAAM,CAElG;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,2BAA2B,CAAA;AAEnE;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,IAAI,CAoBN"}
|
package/dist/docker-postgres.js
CHANGED
|
@@ -7,6 +7,16 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { spawnSync } from "node:child_process";
|
|
9
9
|
const PG_USER = "supatype_admin";
|
|
10
|
+
/** Must match `dockerPgStart` default `POSTGRES_PASSWORD`. */
|
|
11
|
+
const DEFAULT_DEV_PASSWORD = "postgres";
|
|
12
|
+
function dockerPgPsql(name, db, sql, password = DEFAULT_DEV_PASSWORD) {
|
|
13
|
+
return spawnSync("docker", [
|
|
14
|
+
"exec",
|
|
15
|
+
"-e", `PGPASSWORD=${password}`,
|
|
16
|
+
name,
|
|
17
|
+
"psql", "--no-password", "-U", PG_USER, "-d", db, "-tAc", sql,
|
|
18
|
+
], { encoding: "utf8", stdio: "pipe" });
|
|
19
|
+
}
|
|
10
20
|
/** Derived container name for a project. */
|
|
11
21
|
export function containerName(projectName) {
|
|
12
22
|
return `supatype-${projectName}`;
|
|
@@ -46,42 +56,144 @@ export function dockerPgStart(opts) {
|
|
|
46
56
|
export function dockerPgStop(projectName) {
|
|
47
57
|
spawnSync("docker", ["stop", containerName(projectName)], { encoding: "utf8" });
|
|
48
58
|
}
|
|
59
|
+
function dockerPgLogsTail(name, tail = 120) {
|
|
60
|
+
const logs = spawnSync("docker", ["logs", "--tail", String(tail), name], { encoding: "utf8" });
|
|
61
|
+
return `${logs.stdout ?? ""}${logs.stderr ?? ""}`;
|
|
62
|
+
}
|
|
63
|
+
function dockerPgHealthStatus(name) {
|
|
64
|
+
const inspect = spawnSync("docker", ["inspect", "-f", "{{if .State.Health}}{{.State.Health.Status}}{{end}}", name], { encoding: "utf8", stdio: "pipe" });
|
|
65
|
+
if (inspect.status !== 0)
|
|
66
|
+
return undefined;
|
|
67
|
+
const status = inspect.stdout?.trim();
|
|
68
|
+
return status === "" ? undefined : status;
|
|
69
|
+
}
|
|
70
|
+
/** True when the final post-init Postgres process is accepting connections. */
|
|
71
|
+
export function dockerPgPostInitServing(logs) {
|
|
72
|
+
const ready = "database system is ready to accept connections";
|
|
73
|
+
const lastReady = logs.lastIndexOf(ready);
|
|
74
|
+
if (lastReady === -1)
|
|
75
|
+
return false;
|
|
76
|
+
const initDone = logs.lastIndexOf("PostgreSQL init process complete");
|
|
77
|
+
if (initDone === -1) {
|
|
78
|
+
// Reused data volume — this run did not re-run entrypoint init.
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
return initDone < lastReady;
|
|
82
|
+
}
|
|
83
|
+
function migrateStillRunning(logs) {
|
|
84
|
+
return /99-supatype-migrate\.sh: running .+\.sql/.test(logs);
|
|
85
|
+
}
|
|
86
|
+
function psqlTruthy(stdout) {
|
|
87
|
+
const v = (stdout ?? "").replace(/\r/g, "").trim().toLowerCase();
|
|
88
|
+
return v === "t" || v === "true";
|
|
89
|
+
}
|
|
90
|
+
const ANON_ROLE_SQL = "SELECT EXISTS (SELECT FROM pg_roles WHERE rolname = 'anon')";
|
|
91
|
+
function dockerPgHasAnonRole(name, projectName, password = DEFAULT_DEV_PASSWORD) {
|
|
92
|
+
for (const db of [projectName, "postgres"]) {
|
|
93
|
+
const result = dockerPgPsql(name, db, ANON_ROLE_SQL, password);
|
|
94
|
+
if (result.status === 0 && psqlTruthy(result.stdout))
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
function dockerPgExecReady(name) {
|
|
100
|
+
const ready = spawnSync("docker", ["exec", name, "pg_isready", "-U", PG_USER, "-q"], { encoding: "utf8", stdio: "pipe" });
|
|
101
|
+
return ready.status === 0;
|
|
102
|
+
}
|
|
49
103
|
/**
|
|
50
104
|
* Poll until Postgres accepts connections and the image entrypoint init has
|
|
51
105
|
* finished (anon/authenticated/service_role come from supatype-postgres
|
|
52
106
|
* migrations/db/init-scripts/00000000000000-initial-schema.sql via migrate.sh).
|
|
53
107
|
*/
|
|
54
|
-
export async function dockerPgWaitReady(projectName, timeoutMs =
|
|
108
|
+
export async function dockerPgWaitReady(projectName, timeoutMs = 180_000, password = DEFAULT_DEV_PASSWORD) {
|
|
55
109
|
const name = containerName(projectName);
|
|
56
110
|
const deadline = Date.now() + timeoutMs;
|
|
111
|
+
let servingWithoutAnonMs = 0;
|
|
112
|
+
let lastPsqlDetail = "";
|
|
57
113
|
while (Date.now() < deadline) {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (initDone.status === 0 && initDone.stdout?.trim() === "t")
|
|
114
|
+
const health = dockerPgHealthStatus(name);
|
|
115
|
+
const logs = dockerPgLogsTail(name);
|
|
116
|
+
const serving = health === "healthy" ||
|
|
117
|
+
dockerPgPostInitServing(logs) ||
|
|
118
|
+
dockerPgExecReady(name);
|
|
119
|
+
if (serving && !migrateStillRunning(logs)) {
|
|
120
|
+
if (dockerPgHasAnonRole(name, projectName, password))
|
|
66
121
|
return;
|
|
122
|
+
const probe = dockerPgPsql(name, projectName, ANON_ROLE_SQL, password);
|
|
123
|
+
lastPsqlDetail = [
|
|
124
|
+
probe.status !== 0 ? `psql exit ${probe.status}` : "",
|
|
125
|
+
probe.stderr?.trim(),
|
|
126
|
+
probe.stdout?.trim() ? `stdout=${probe.stdout.trim()}` : "",
|
|
127
|
+
]
|
|
128
|
+
.filter(Boolean)
|
|
129
|
+
.join("; ");
|
|
130
|
+
const reusedVolume = logs.includes("database system is ready to accept connections") &&
|
|
131
|
+
!logs.includes("PostgreSQL init process complete");
|
|
132
|
+
if (reusedVolume) {
|
|
133
|
+
servingWithoutAnonMs += 500;
|
|
134
|
+
if (servingWithoutAnonMs >= 5_000)
|
|
135
|
+
throw staleVolumeError(name);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
servingWithoutAnonMs = 0;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
servingWithoutAnonMs = 0;
|
|
67
143
|
}
|
|
68
|
-
await sleep(
|
|
144
|
+
await sleep(500);
|
|
69
145
|
}
|
|
70
|
-
const logs =
|
|
71
|
-
encoding: "utf8",
|
|
72
|
-
});
|
|
146
|
+
const logs = dockerPgLogsTail(name, 80);
|
|
73
147
|
throw new Error(`Docker Postgres "${name}" did not finish image init within ${timeoutMs}ms.\n` +
|
|
74
148
|
" API roles (anon, authenticated, service_role) are created by the supatype/postgres\n" +
|
|
75
149
|
" entrypoint (99-supatype-migrate.sh), not by the CLI.\n" +
|
|
76
150
|
" If you upgraded the image, remove the stale volume:\n" +
|
|
77
151
|
` docker volume rm ${name}-data\n` +
|
|
78
|
-
(
|
|
79
|
-
(logs
|
|
152
|
+
(lastPsqlDetail ? ` Last anon probe: ${lastPsqlDetail}\n` : "") +
|
|
153
|
+
(logs ? ` logs (tail):\n${indent(logs)}\n` : ""));
|
|
154
|
+
}
|
|
155
|
+
function staleVolumeError(name) {
|
|
156
|
+
return new Error(`Docker Postgres "${name}" is up but API roles are missing.\n` +
|
|
157
|
+
" The data volume was initialised without supatype/postgres migrations (stale or wrong image).\n" +
|
|
158
|
+
" Remove the volume so first-boot 99-supatype-migrate.sh runs again:\n" +
|
|
159
|
+
` docker volume rm ${name}-data`);
|
|
80
160
|
}
|
|
81
161
|
/** Connection string for the Docker container (local dev credentials). */
|
|
82
|
-
export function dockerDbUrl(projectName, port) {
|
|
83
|
-
//
|
|
84
|
-
return `postgres://${PG_USER}
|
|
162
|
+
export function dockerDbUrl(projectName, port, password = DEFAULT_DEV_PASSWORD) {
|
|
163
|
+
// Host → published port. sqlx/libpq "prefer" can mis-handle SSL on some hosts (e.g. Docker Desktop on Windows).
|
|
164
|
+
return `postgres://${PG_USER}:${password}@127.0.0.1:${port}/${projectName}?sslmode=disable`;
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* DB URL for processes sharing the Postgres container network namespace
|
|
168
|
+
* (supatype-server migrate in a one-shot container). Uses loopback inside the
|
|
169
|
+
* container where pg_hba grants trust — avoids host-published-port SCRAM/SSL issues.
|
|
170
|
+
*/
|
|
171
|
+
export function dockerPgLoopbackDbUrl(projectName, password = DEFAULT_DEV_PASSWORD) {
|
|
172
|
+
return `postgres://${PG_USER}:${password}@127.0.0.1:5432/${projectName}?sslmode=disable`;
|
|
173
|
+
}
|
|
174
|
+
/**
|
|
175
|
+
* Published Hub tag for local dev when CDN server version is not on Docker Hub yet.
|
|
176
|
+
* Keep in sync with tests/integration/scripts/compose-smoke.sh.
|
|
177
|
+
*/
|
|
178
|
+
export const DEFAULT_SERVER_DOCKER_IMAGE = "supatype/server:latest";
|
|
179
|
+
/**
|
|
180
|
+
* Run `supatype-server migrate` on the Postgres container network (loopback trust).
|
|
181
|
+
* Used on Windows + database.provider docker — host-published :5432 breaks libpq TLS there.
|
|
182
|
+
*/
|
|
183
|
+
export function runGotrueMigrationsViaDocker(pgContainerName, serverImage, migrateEnv) {
|
|
184
|
+
const envArgs = Object.entries(migrateEnv).flatMap(([k, v]) => ["-e", `${k}=${v}`]);
|
|
185
|
+
const result = spawnSync("docker", [
|
|
186
|
+
"run", "--rm",
|
|
187
|
+
"--network", `container:${pgContainerName}`,
|
|
188
|
+
...envArgs,
|
|
189
|
+
serverImage,
|
|
190
|
+
"migrate",
|
|
191
|
+
], { encoding: "utf8", stdio: "pipe" });
|
|
192
|
+
if (result.status !== 0) {
|
|
193
|
+
const detail = (result.stderr ?? result.stdout ?? "").trim();
|
|
194
|
+
throw new Error(`GoTrue migrations failed in Docker (exit ${result.status ?? "unknown"})` +
|
|
195
|
+
(detail ? `:\n${detail}` : ""));
|
|
196
|
+
}
|
|
85
197
|
}
|
|
86
198
|
function sleep(ms) {
|
|
87
199
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-postgres.js","sourceRoot":"","sources":["../src/docker-postgres.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAa9C,MAAM,OAAO,GAAG,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"docker-postgres.js","sourceRoot":"","sources":["../src/docker-postgres.ts"],"names":[],"mappings":"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"}
|
package/dist/engine-client.d.ts
CHANGED
|
@@ -8,9 +8,11 @@
|
|
|
8
8
|
* writes a response JSON to stdout.
|
|
9
9
|
*/
|
|
10
10
|
export interface Operation {
|
|
11
|
-
kind: "create_table" | "alter_table" | "drop_table" | "create_index" | "drop_index" | "create_policy" | "drop_policy" | "add_column" | "drop_column" | "alter_column";
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
kind: "create_table" | "alter_table" | "drop_table" | "create_index" | "drop_index" | "create_policy" | "drop_policy" | "add_column" | "drop_column" | "alter_column" | "recreate_column";
|
|
12
|
+
type?: string;
|
|
13
|
+
description?: string;
|
|
14
|
+
risk?: "safe" | "warn" | "danger" | "cautious" | "destructive";
|
|
15
|
+
warning?: string;
|
|
14
16
|
sql?: string;
|
|
15
17
|
}
|
|
16
18
|
export interface DiffResult {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine-client.d.ts","sourceRoot":"","sources":["../src/engine-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,cAAc,GAAG,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,YAAY,GAC7E,eAAe,GAAG,aAAa,GAAG,YAAY,GAAG,aAAa,GAAG,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"engine-client.d.ts","sourceRoot":"","sources":["../src/engine-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,cAAc,GAAG,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,YAAY,GAC7E,eAAe,GAAG,aAAa,GAAG,YAAY,GAAG,aAAa,GAAG,cAAc,GAC/E,iBAAiB,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,GAAG,aAAa,CAAA;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,SAAS,EAAE,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,KAAK,CAAC;YACb,IAAI,EAAE,MAAM,CAAA;YACZ,IAAI,EAAE,MAAM,CAAA;YACZ,QAAQ,EAAE,OAAO,CAAA;YACjB,OAAO,CAAC,EAAE,MAAM,CAAA;YAChB,UAAU,CAAC,EAAE,OAAO,CAAA;YACpB,MAAM,CAAC,EAAE,OAAO,CAAA;YAChB,UAAU,CAAC,EAAE;gBAAE,KAAK,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAA;SAC/C,CAAC,CAAA;KACH,CAAC,CAAA;CACH;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,OAAO;IACvC,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,WAAY,SAAQ,KAAK;aAGlB,QAAQ,EAAE,MAAM;aAChB,QAAQ,EAAE,MAAM,GAAG,IAAI;gBAFvC,OAAO,EAAE,MAAM,EACC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,IAAI;CAK1C;AA4CD,mEAAmE;AACnE,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAElD;AAED,8DAA8D;AAC9D,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAQrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,CAAC,GAAG,OAAO,EAC7C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,CAAC,CAAC,CA0CZ"}
|
package/dist/engine-client.js
CHANGED
|
@@ -128,11 +128,12 @@ function endpointToArgs(endpoint, body, reqFile) {
|
|
|
128
128
|
const dbUrl = body["database_url"] ?? "";
|
|
129
129
|
const schema = body["schema"] ?? "public";
|
|
130
130
|
const force = body["force"] ? ["--force"] : [];
|
|
131
|
+
const nonInteractive = body["non_interactive"] === true || body["force"] === true ? ["--non-interactive"] : [];
|
|
131
132
|
switch (endpoint) {
|
|
132
133
|
case "/diff":
|
|
133
134
|
return ["diff", "--input", reqFile, "--database-url", dbUrl, "--schema", schema];
|
|
134
135
|
case "/push":
|
|
135
|
-
return ["push", "--input", reqFile, "--database-url", dbUrl, "--schema", schema, ...force];
|
|
136
|
+
return ["push", "--input", reqFile, "--database-url", dbUrl, "--schema", schema, ...force, ...nonInteractive];
|
|
136
137
|
case "/parse":
|
|
137
138
|
return ["parse", "--input", reqFile];
|
|
138
139
|
case "/generate": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine-client.js","sourceRoot":"","sources":["../src/engine-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACvF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"engine-client.js","sourceRoot":"","sources":["../src/engine-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACvF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AA8C7E,MAAM,OAAO,WAAY,SAAQ,KAAK;IAGlB;IACA;IAHlB,YACE,OAAe,EACC,QAAgB,EAChB,QAAuB;QAEvC,KAAK,CAAC,OAAO,CAAC,CAAA;QAHE,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAe;QAGvC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAC3B,CAAC;CACF;AAED,8EAA8E;AAC9E,2BAA2B;AAC3B,8EAA8E;AAE9E,IAAI,UAAU,GAAkB,IAAI,CAAA;AAEpC,KAAK,UAAU,YAAY;IACzB,IAAI,UAAU;QAAE,OAAO,UAAU,CAAA;IAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAEzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC9B,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAClD,OAAO,UAAU,CAAA;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,gEAAgE;IAClE,CAAC;IAED,oEAAoE;IACpE,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAA;IAClC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtE,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAA;QACzD,KAAK,MAAM,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,mBAAmB,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;YACjG,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,UAAU,GAAG,GAAG,CAAA;gBAChB,OAAO,UAAU,CAAA;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,6BAA6B,CAAC,CAAC;IAEzC,MAAM,IAAI,KAAK,CACb,+CAA+C,CAChD,CAAA;AACH,CAAC;AAED,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E,mEAAmE;AACnE,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,YAAY,EAAE,CAAA;AACtB,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QAClE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,IAA6B;IAE7B,MAAM,GAAG,GAAG,MAAM,YAAY,EAAE,CAAA;IAEhC,gCAAgC;IAChC,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAA;IAChD,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACnE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAA;IAEpD,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEpD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE;QAClC,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;KACnB,CAAC,CAAA;IAEF,sBAAsB;IACtB,IAAI,CAAC;QAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAElD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,aAAa,CAAA;QACrD,MAAM,IAAI,WAAW,CACnB,UAAU,QAAQ,iBAAiB,MAAM,CAAC,MAAM,MAAM,MAAM,EAAE,EAC9D,QAAQ,EACR,MAAM,CAAC,MAAM,CACd,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAC3B,6CAA6C;QAC7C,OAAO,EAAO,CAAA;IAChB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAM,CAAA;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,uCAAuC;QACvC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAO,CAAA;IAC/C,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,8BAA8B;AAC9B,8EAA8E;AAE9E,SAAS,cAAc,CACrB,QAAgB,EAChB,IAA6B,EAC7B,OAAe;IAEf,MAAM,KAAK,GAAI,IAAI,CAAC,cAAc,CAAwB,IAAI,EAAE,CAAA;IAChE,MAAM,MAAM,GAAI,IAAI,CAAC,QAAQ,CAAwB,IAAI,QAAQ,CAAA;IACjE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9C,MAAM,cAAc,GAClB,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEzF,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;QAElF,KAAK,OAAO;YACV,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,cAAc,CAAC,CAAA;QAE/G,KAAK,QAAQ;YACX,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAEtC,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,IAAI,GAAI,IAAI,CAAC,MAAM,CAAwB,IAAI,YAAY,CAAA;YACjE,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;QACzD,CAAC;QAED,KAAK,aAAa;YAChB,OAAO,CAAC,YAAY,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;QAEpE,KAAK,WAAW;YACd,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAEzC,KAAK,QAAQ;YACX,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAEtC;YACE,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBACvC,MAAM,MAAM,GAAI,IAAI,CAAC,QAAQ,CAAwB,IAAI,MAAM,CAAA;gBAC/D,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;YACxD,CAAC;YACD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,CAAC;AACH,CAAC"}
|
package/dist/kong-config.d.ts
CHANGED
|
@@ -13,6 +13,10 @@ export interface KongDeclarativeOptions {
|
|
|
13
13
|
functionsServiceUrl?: string | undefined;
|
|
14
14
|
/** Self-host: route API paths through supatype-server (see runtime-routes). */
|
|
15
15
|
unifiedGateway?: boolean | undefined;
|
|
16
|
+
/** Studio UI upstream (default: in-compose `studio:3002`). */
|
|
17
|
+
studioServiceUrl?: string | undefined;
|
|
18
|
+
/** See {@link RuntimeRouteOptions.studioStripPath}. */
|
|
19
|
+
studioStripPath?: boolean | undefined;
|
|
16
20
|
}
|
|
17
21
|
/**
|
|
18
22
|
* Build full `kong.yml` content. Single source of truth for CLI `dev` and `self-host setup`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kong-config.d.ts","sourceRoot":"","sources":["../src/kong-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"kong-config.d.ts","sourceRoot":"","sources":["../src/kong-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACpC,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACrC,uDAAuD;IACvD,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACtC;AASD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,GAAE,sBAA2B,GAAG,MAAM,CA4D9E"}
|
package/dist/kong-config.js
CHANGED
|
@@ -19,6 +19,8 @@ export function buildKongDeclarative(opts = {}) {
|
|
|
19
19
|
...(opts.unifiedGateway !== true &&
|
|
20
20
|
opts.staticAppServiceUrl !== undefined && { staticAppServiceUrl: opts.staticAppServiceUrl }),
|
|
21
21
|
...(opts.functionsServiceUrl !== undefined && { functionsServiceUrl: opts.functionsServiceUrl }),
|
|
22
|
+
...(opts.studioServiceUrl !== undefined && { studioServiceUrl: opts.studioServiceUrl }),
|
|
23
|
+
...(opts.studioStripPath === false && { studioStripPath: false }),
|
|
22
24
|
});
|
|
23
25
|
const consumersBlock = secured
|
|
24
26
|
? `
|
|
@@ -42,6 +44,15 @@ consumers:
|
|
|
42
44
|
? ` protocols:\n${route.protocols.map((p) => ` - ${p}`).join("\n")}\n`
|
|
43
45
|
: "";
|
|
44
46
|
const stripPath = route.stripPath ?? false;
|
|
47
|
+
const graphqlPlugins = route.graphqlPostgrest
|
|
48
|
+
? ` plugins:
|
|
49
|
+
- name: request-transformer
|
|
50
|
+
config:
|
|
51
|
+
add:
|
|
52
|
+
headers:
|
|
53
|
+
- Content-Profile:graphql_public
|
|
54
|
+
`
|
|
55
|
+
: "";
|
|
45
56
|
return ` - name: ${route.serviceName}
|
|
46
57
|
url: ${route.serviceUrl}
|
|
47
58
|
routes:
|
|
@@ -49,7 +60,7 @@ consumers:
|
|
|
49
60
|
strip_path: ${stripPath}
|
|
50
61
|
paths:
|
|
51
62
|
${route.paths.map((path) => ` - ${path}`).join("\n")}
|
|
52
|
-
${protocols}${routePlugins}`;
|
|
63
|
+
${protocols}${routePlugins}${graphqlPlugins}`;
|
|
53
64
|
}).join("\n");
|
|
54
65
|
return `_format_version: "3.0"
|
|
55
66
|
${consumersBlock}
|
package/dist/kong-config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kong-config.js","sourceRoot":"","sources":["../src/kong-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"kong-config.js","sourceRoot":"","sources":["../src/kong-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmBH,yDAAyD;AACzD,SAAS,gBAAgB,CAAC,CAAS;IACjC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAC1B,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEtD;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAA+B,EAAE;IACpE,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAA;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,gBAAgB,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,cAAc,KAAK,IAAI,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,cAAc,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;QACxG,GAAG,CAAC,IAAI,CAAC,cAAc,KAAK,IAAI;YAC9B,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,EAAE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9F,GAAG,CAAC,IAAI,CAAC,mBAAmB,KAAK,SAAS,IAAI,EAAE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChG,GAAG,CAAC,IAAI,CAAC,gBAAgB,KAAK,SAAS,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvF,GAAG,CAAC,IAAI,CAAC,eAAe,KAAK,KAAK,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;KAClE,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,OAAO;QAC5B,CAAC,CAAC;;;;eAIS,gBAAgB,CAAC,UAAW,CAAC;CAC3C;QACG,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,IAAI,OAAO;YACnD,CAAC,CAAC;;;;;;CAMP;YACK,CAAC,CAAC,EAAE,CAAA;QACN,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAC7D,CAAC,CAAC,uBAAuB,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACtF,CAAC,CAAC,EAAE,CAAA;QACN,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAA;QAC1C,MAAM,cAAc,GAAG,KAAK,CAAC,gBAAgB;YAC3C,CAAC,CAAC;;;;;;CAMP;YACK,CAAC,CAAC,EAAE,CAAA;QACN,OAAO,aAAa,KAAK,CAAC,WAAW;WAC9B,KAAK,CAAC,UAAU;;gBAEX,KAAK,CAAC,IAAI;sBACJ,SAAS;;EAE7B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;EAC3D,SAAS,GAAG,YAAY,GAAG,cAAc,EAAE,CAAA;IAC3C,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,OAAO;EACP,cAAc;;EAEd,aAAa;CACd,CAAA;AACD,CAAC"}
|
|
@@ -19,6 +19,8 @@ export interface ProcessOptions {
|
|
|
19
19
|
maxBackoffMs?: number;
|
|
20
20
|
/** Called when the process exits cleanly (code 0). */
|
|
21
21
|
onExit?: () => void;
|
|
22
|
+
/** Use shell to spawn (required for pnpm/npm/yarn .cmd shims on Windows). */
|
|
23
|
+
shell?: boolean;
|
|
22
24
|
}
|
|
23
25
|
export declare class ProcessManager {
|
|
24
26
|
private readonly bin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,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;
|
|
1
|
+
{"version":3,"file":"process-manager.d.ts","sourceRoot":"","sources":["../src/process-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,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;CAChB;AAID,qBAAa,cAAc;IAOvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAPvB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,IAAI,CAA0B;gBAGnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EAC/B,IAAI,EAAE,cAAc;IAetB,mFAAmF;IACnF,KAAK,IAAI,IAAI;IAKb,+CAA+C;IACzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,OAAO,CAAC,KAAK;IA2Db,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
|
@@ -24,6 +24,7 @@ export class ProcessManager {
|
|
|
24
24
|
initialBackoffMs: 1_000,
|
|
25
25
|
maxBackoffMs: 30_000,
|
|
26
26
|
onExit: () => { },
|
|
27
|
+
shell: false,
|
|
27
28
|
...opts,
|
|
28
29
|
};
|
|
29
30
|
this.backoffMs = this.opts.initialBackoffMs;
|
|
@@ -56,7 +57,12 @@ export class ProcessManager {
|
|
|
56
57
|
if (this.stopped)
|
|
57
58
|
return;
|
|
58
59
|
const env = { ...process.env, ...this.opts.env };
|
|
59
|
-
this.child = spawn(this.bin, this.args, {
|
|
60
|
+
this.child = spawn(this.bin, this.args, {
|
|
61
|
+
env,
|
|
62
|
+
cwd: this.opts.cwd,
|
|
63
|
+
stdio: "pipe",
|
|
64
|
+
...(this.opts.shell ? { shell: true } : {}),
|
|
65
|
+
});
|
|
60
66
|
const pid = this.child.pid;
|
|
61
67
|
if (pid)
|
|
62
68
|
this.writePid(pid);
|
|
@@ -75,6 +81,15 @@ export class ProcessManager {
|
|
|
75
81
|
process.stderr.write(prefix + line + "\n");
|
|
76
82
|
}
|
|
77
83
|
});
|
|
84
|
+
this.child.once("error", (err) => {
|
|
85
|
+
if (this.stopped)
|
|
86
|
+
return;
|
|
87
|
+
process.stderr.write(`${prefix}failed to start: ${err.message}\n`);
|
|
88
|
+
setTimeout(() => {
|
|
89
|
+
this.backoffMs = Math.min(this.backoffMs * 2, this.opts.maxBackoffMs);
|
|
90
|
+
this.spawn();
|
|
91
|
+
}, this.backoffMs);
|
|
92
|
+
});
|
|
78
93
|
this.child.once("exit", (code, signal) => {
|
|
79
94
|
if (this.stopped)
|
|
80
95
|
return;
|
|
@@ -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;AAC7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,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
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import type { ComponentVersions } from "./components.js";
|
|
2
2
|
export interface SupatypeProjectConfig {
|
|
3
|
+
/**
|
|
4
|
+
* Runtime stack for local dev and `supatype update`.
|
|
5
|
+
* "native" = host binaries (default). "docker" = self-host Compose stack.
|
|
6
|
+
* Falls back to `database.provider` when omitted (deprecated).
|
|
7
|
+
*/
|
|
8
|
+
provider?: "native" | "docker";
|
|
3
9
|
supatype?: {
|
|
4
10
|
/**
|
|
5
11
|
* Base directory for Supatype project assets (schema, functions, etc).
|
|
@@ -27,7 +33,7 @@ export interface SupatypeProjectConfig {
|
|
|
27
33
|
data_dir?: string;
|
|
28
34
|
/**
|
|
29
35
|
* Docker image to use (provider=docker).
|
|
30
|
-
* Defaults to supatype/postgres:
|
|
36
|
+
* Defaults to supatype/postgres:latest.
|
|
31
37
|
* Override in supatype.local.config.ts for local builds.
|
|
32
38
|
*/
|
|
33
39
|
image?: string;
|
|
@@ -65,6 +71,11 @@ export interface SupatypeProjectConfig {
|
|
|
65
71
|
* When omitted, dev still falls back to `SUPATYPE_APP_UPSTREAM` for non-proxy app modes.
|
|
66
72
|
*/
|
|
67
73
|
vite_dev_url?: string;
|
|
74
|
+
/**
|
|
75
|
+
* package.json script name for `supatype dev` to run when mode is proxy.
|
|
76
|
+
* Default: `"start"`. Ignored for static/none modes.
|
|
77
|
+
*/
|
|
78
|
+
start?: string;
|
|
68
79
|
};
|
|
69
80
|
/**
|
|
70
81
|
* Pinned binary versions per component. Use **`"local"`** with the matching **`overrides.*`**
|
|
@@ -185,6 +196,11 @@ export interface SupatypeProjectConfig {
|
|
|
185
196
|
* When omitted, `DATABASE_URL` from the environment is used, then a local default DSN.
|
|
186
197
|
*/
|
|
187
198
|
connection?: string;
|
|
199
|
+
/** Studio admin panel access (Gap Appendices task 47). */
|
|
200
|
+
admin?: {
|
|
201
|
+
/** JWT `app_metadata.role` values allowed to use Studio. Default: admin, supatype_admin */
|
|
202
|
+
roles?: string[];
|
|
203
|
+
};
|
|
188
204
|
}
|
|
189
205
|
/**
|
|
190
206
|
* Merge each top-level section from `override` on top of `base`.
|
|
@@ -205,6 +221,10 @@ export declare function preferredFunctionsPathFromProject(cfg: SupatypeProjectCo
|
|
|
205
221
|
* Returns undefined if the mode is "managed" (cloud controls the URL).
|
|
206
222
|
*/
|
|
207
223
|
export declare function serverBaseUrl(cfg: SupatypeProjectConfig): string | undefined;
|
|
224
|
+
/** Resolved runtime provider (`config.provider` ?? `database.provider` ?? native). */
|
|
225
|
+
export declare function resolveRuntimeProvider(cfg: SupatypeProjectConfig): "native" | "docker";
|
|
226
|
+
/** Kong gateway port when `provider: docker` (self-host compose dev). */
|
|
227
|
+
export declare const COMPOSE_DEV_KONG_PORT = 18473;
|
|
208
228
|
/** The local Postgres DSN derived from project name (dev default). */
|
|
209
229
|
export declare function localDSN(cfg: SupatypeProjectConfig): string;
|
|
210
230
|
/**
|
|
@@ -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,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;KAChB,CAAA;IACD,GAAG,EAAE;QACH;;;;;WAKG;QACH,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAA;QACjC,0DAA0D;QAC1D,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,6CAA6C;QAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB;;;;WAIG;QACH,YAAY,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../src/project-config.ts"],"names":[],"mappings":"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"}
|