@supatype/cli 0.1.5 → 0.1.7
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 +143 -93
- package/.turbo/turbo-typecheck.log +1 -1
- package/deno.d.ts +52 -0
- package/dist/augmentation-generator.d.ts +22 -0
- package/dist/augmentation-generator.d.ts.map +1 -1
- package/dist/augmentation-generator.js +43 -7
- package/dist/augmentation-generator.js.map +1 -1
- package/dist/binary-cache.d.ts +14 -0
- package/dist/binary-cache.d.ts.map +1 -1
- package/dist/binary-cache.js +33 -13
- package/dist/binary-cache.js.map +1 -1
- package/dist/cache-clean.d.ts +15 -0
- package/dist/cache-clean.d.ts.map +1 -0
- package/dist/cache-clean.js +76 -0
- package/dist/cache-clean.js.map +1 -0
- package/dist/cache-pins.d.ts +51 -0
- package/dist/cache-pins.d.ts.map +1 -0
- package/dist/cache-pins.js +184 -0
- package/dist/cache-pins.js.map +1 -0
- package/dist/cli-install-method.d.ts +19 -0
- package/dist/cli-install-method.d.ts.map +1 -0
- package/dist/cli-install-method.js +60 -0
- package/dist/cli-install-method.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +6 -0
- package/dist/cli.js.map +1 -1
- package/dist/cloud-credentials.d.ts +34 -0
- package/dist/cloud-credentials.d.ts.map +1 -0
- package/dist/cloud-credentials.js +139 -0
- package/dist/cloud-credentials.js.map +1 -0
- package/dist/commands/admin.d.ts +11 -0
- package/dist/commands/admin.d.ts.map +1 -1
- package/dist/commands/admin.js +131 -22
- package/dist/commands/admin.js.map +1 -1
- package/dist/commands/cache.d.ts.map +1 -1
- package/dist/commands/cache.js +67 -71
- package/dist/commands/cache.js.map +1 -1
- package/dist/commands/cloud.d.ts.map +1 -1
- package/dist/commands/cloud.js +32 -8
- package/dist/commands/cloud.js.map +1 -1
- package/dist/commands/db.d.ts +1 -0
- package/dist/commands/db.d.ts.map +1 -1
- package/dist/commands/db.js +147 -1
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +50 -10
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/doctor.d.ts +28 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +60 -3
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/functions.d.ts +7 -0
- package/dist/commands/functions.d.ts.map +1 -1
- package/dist/commands/functions.js +40 -6
- package/dist/commands/functions.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +5 -1
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/hooks.d.ts +12 -0
- package/dist/commands/hooks.d.ts.map +1 -0
- package/dist/commands/hooks.js +118 -0
- package/dist/commands/hooks.js.map +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +41 -7
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/internal.d.ts +6 -0
- package/dist/commands/internal.d.ts.map +1 -0
- package/dist/commands/internal.js +22 -0
- package/dist/commands/internal.js.map +1 -0
- package/dist/commands/keys.d.ts.map +1 -1
- package/dist/commands/keys.js +2 -0
- package/dist/commands/keys.js.map +1 -1
- package/dist/commands/link-helpers.d.ts.map +1 -1
- package/dist/commands/link-helpers.js +8 -2
- package/dist/commands/link-helpers.js.map +1 -1
- package/dist/commands/login.d.ts +7 -0
- package/dist/commands/login.d.ts.map +1 -0
- package/dist/commands/login.js +110 -0
- package/dist/commands/login.js.map +1 -0
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +110 -7
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/self-update.d.ts +7 -0
- package/dist/commands/self-update.d.ts.map +1 -1
- package/dist/commands/self-update.js +18 -11
- package/dist/commands/self-update.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +18 -3
- package/dist/config.js.map +1 -1
- package/dist/db-preflight.d.ts +78 -0
- package/dist/db-preflight.d.ts.map +1 -0
- package/dist/db-preflight.js +452 -0
- package/dist/db-preflight.js.map +1 -0
- package/dist/dev-compose.d.ts +1 -1
- package/dist/dev-compose.d.ts.map +1 -1
- package/dist/dev-compose.js +129 -72
- package/dist/dev-compose.js.map +1 -1
- package/dist/env-file.d.ts +40 -2
- package/dist/env-file.d.ts.map +1 -1
- package/dist/env-file.js +132 -11
- package/dist/env-file.js.map +1 -1
- package/dist/field-masking-tier.d.ts +50 -0
- package/dist/field-masking-tier.d.ts.map +1 -0
- package/dist/field-masking-tier.js +91 -0
- package/dist/field-masking-tier.js.map +1 -0
- package/dist/functions-deno-types.d.ts +24 -0
- package/dist/functions-deno-types.d.ts.map +1 -0
- package/dist/functions-deno-types.js +155 -0
- package/dist/functions-deno-types.js.map +1 -0
- package/dist/hook-upload.d.ts +30 -0
- package/dist/hook-upload.d.ts.map +1 -0
- package/dist/hook-upload.js +86 -0
- package/dist/hook-upload.js.map +1 -0
- package/dist/hooks-generator.d.ts +8 -0
- package/dist/hooks-generator.d.ts.map +1 -0
- package/dist/hooks-generator.js +332 -0
- package/dist/hooks-generator.js.map +1 -0
- package/dist/link.d.ts +4 -0
- package/dist/link.d.ts.map +1 -1
- package/dist/link.js +2 -0
- package/dist/link.js.map +1 -1
- package/dist/local-secrets.d.ts +71 -0
- package/dist/local-secrets.d.ts.map +1 -0
- package/dist/local-secrets.js +100 -0
- package/dist/local-secrets.js.map +1 -0
- package/dist/model-hooks.d.ts +73 -0
- package/dist/model-hooks.d.ts.map +1 -0
- package/dist/model-hooks.js +211 -0
- package/dist/model-hooks.js.map +1 -0
- package/dist/postgres-ctl.d.ts +11 -0
- package/dist/postgres-ctl.d.ts.map +1 -1
- package/dist/postgres-ctl.js +25 -2
- package/dist/postgres-ctl.js.map +1 -1
- package/dist/project-config.d.ts +121 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +150 -1
- package/dist/project-config.js.map +1 -1
- package/dist/resolve-target.d.ts +4 -0
- package/dist/resolve-target.d.ts.map +1 -1
- package/dist/resolve-target.js +69 -73
- package/dist/resolve-target.js.map +1 -1
- package/dist/schema-ast-v2.d.ts +2 -1
- package/dist/schema-ast-v2.d.ts.map +1 -1
- package/dist/schema-ast-v2.js +4 -2
- package/dist/schema-ast-v2.js.map +1 -1
- package/dist/schema-push-lock.d.ts.map +1 -1
- package/dist/schema-push-lock.js +43 -16
- package/dist/schema-push-lock.js.map +1 -1
- package/dist/self-host-compose.d.ts +24 -0
- package/dist/self-host-compose.d.ts.map +1 -1
- package/dist/self-host-compose.js +301 -69
- package/dist/self-host-compose.js.map +1 -1
- package/dist/service-role-check.d.ts +21 -0
- package/dist/service-role-check.d.ts.map +1 -0
- package/dist/service-role-check.js +85 -0
- package/dist/service-role-check.js.map +1 -0
- package/dist/target-client.d.ts +17 -0
- package/dist/target-client.d.ts.map +1 -1
- package/dist/target-client.js +69 -17
- package/dist/target-client.js.map +1 -1
- package/dist/type-extractor.d.ts.map +1 -1
- package/dist/type-extractor.js +736 -32
- package/dist/type-extractor.js.map +1 -1
- package/dist/ui/runtime/command-chrome.js +1 -1
- package/dist/ui/runtime/command-chrome.js.map +1 -1
- package/dist/ui/runtime/stdin-after-ink.d.ts.map +1 -1
- package/dist/ui/runtime/stdin-after-ink.js +3 -1
- package/dist/ui/runtime/stdin-after-ink.js.map +1 -1
- package/package.json +4 -1
- package/scripts/generate-homebrew-formula.mjs +121 -0
- package/src/augmentation-generator.ts +46 -9
- package/src/binary-cache.ts +47 -15
- package/src/cache-clean.ts +81 -0
- package/src/cache-pins.ts +243 -0
- package/src/cli-install-method.ts +67 -0
- package/src/cli.ts +6 -0
- package/src/cloud-credentials.ts +183 -0
- package/src/commands/admin.ts +153 -28
- package/src/commands/cache.ts +90 -75
- package/src/commands/cloud.ts +32 -8
- package/src/commands/db.ts +162 -1
- package/src/commands/dev.ts +57 -8
- package/src/commands/doctor.ts +69 -3
- package/src/commands/functions.ts +42 -5
- package/src/commands/generate.ts +5 -1
- package/src/commands/hooks.ts +138 -0
- package/src/commands/init.ts +42 -8
- package/src/commands/internal.ts +23 -0
- package/src/commands/keys.ts +2 -0
- package/src/commands/link-helpers.ts +9 -2
- package/src/commands/login.ts +127 -0
- package/src/commands/push.ts +124 -7
- package/src/commands/self-update.ts +85 -13
- package/src/config.ts +22 -3
- package/src/db-preflight.ts +575 -0
- package/src/dev-compose.ts +144 -73
- package/src/env-file.ts +157 -11
- package/src/field-masking-tier.ts +107 -0
- package/src/functions-deno-types.ts +188 -0
- package/src/hook-upload.ts +107 -0
- package/src/hooks-generator.ts +352 -0
- package/src/link.ts +7 -0
- package/src/local-secrets.ts +104 -0
- package/src/model-hooks.ts +260 -0
- package/src/postgres-ctl.ts +29 -2
- package/src/project-config.ts +236 -2
- package/src/resolve-target.ts +113 -68
- package/src/schema-ast-v2.ts +5 -2
- package/src/schema-push-lock.ts +56 -17
- package/src/self-host-compose.ts +344 -68
- package/src/service-role-check.ts +111 -0
- package/src/target-client.ts +105 -18
- package/src/type-extractor.ts +883 -28
- package/src/ui/runtime/command-chrome.ts +1 -1
- package/src/ui/runtime/stdin-after-ink.ts +3 -1
- package/tests/access-composition.test.ts +667 -0
- package/tests/admin-studio-membership.test.ts +121 -0
- package/tests/api-schemas.test.ts +83 -0
- package/tests/archive-name-alias.test.ts +42 -0
- package/tests/augmentation-generator.test.ts +72 -4
- package/tests/cache-clean.test.ts +206 -0
- package/tests/cli-help.test.ts +3 -0
- package/tests/cli-install-method.test.ts +66 -0
- package/tests/command-chrome-coverage.test.ts +31 -26
- package/tests/command-chrome-wrap.test.ts +1 -0
- package/tests/db-preflight.test.ts +72 -0
- package/tests/doctor-render.test.ts +62 -0
- package/tests/doctor-service-role.test.ts +55 -0
- package/tests/env-file.test.ts +121 -0
- package/tests/external-database-compose.test.ts +184 -0
- package/tests/external-database-config.test.ts +154 -0
- package/tests/field-masking-tier.test.ts +184 -0
- package/tests/functions-deno-types.test.ts +197 -0
- package/tests/homebrew-formula.test.ts +58 -0
- package/tests/hook-upload.test.ts +125 -0
- package/tests/hooks-generator.test.ts +212 -0
- package/tests/init.test.ts +3 -0
- package/tests/local-secrets.test.ts +92 -0
- package/tests/model-hooks.test.ts +322 -0
- package/tests/runtime-contract.test.ts +113 -1
- package/tests/service-role-check.test.ts +109 -0
- package/tests/service-role-routes.test.ts +51 -0
- package/tests/target-client-refresh.test.ts +94 -0
- package/tests/type-extractor.test.ts +187 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/tests/engine-distribution.test.ts +0 -418
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Check that every name in `functions.serviceRole` is a function that exists.
|
|
3
|
+
*
|
|
4
|
+
* The grant fails **closed**: a typo, or a function that has since been renamed, means that function
|
|
5
|
+
* quietly does not receive the service-role key. Nothing breaks loudly — the handler simply reads
|
|
6
|
+
* `undefined` and whatever it does with the key stops working, at runtime, in a deploy that reported
|
|
7
|
+
* success. So the name is checked where it is declared, against the directory it must match.
|
|
8
|
+
*
|
|
9
|
+
* `serviceRoleRoutes()` claimed this was already true. It was not: nothing read the list except the two
|
|
10
|
+
* places that turn it into an env var.
|
|
11
|
+
*/
|
|
12
|
+
import { existsSync, readdirSync, statSync } from "node:fs";
|
|
13
|
+
import { join, relative } from "node:path";
|
|
14
|
+
import { functionsPathCandidatesFromProject, serviceRoleRoutes, } from "./project-config.js";
|
|
15
|
+
/** Function directory names, matching how the worker discovers routes. */
|
|
16
|
+
function availableFunctions(dirs) {
|
|
17
|
+
const names = new Set();
|
|
18
|
+
for (const dir of dirs) {
|
|
19
|
+
if (!existsSync(dir))
|
|
20
|
+
continue;
|
|
21
|
+
for (const entry of readdirSync(dir)) {
|
|
22
|
+
if (entry.startsWith("_") || entry.startsWith("."))
|
|
23
|
+
continue;
|
|
24
|
+
const full = join(dir, entry);
|
|
25
|
+
if (statSync(full).isDirectory()) {
|
|
26
|
+
if (existsSync(join(full, "index.ts")))
|
|
27
|
+
names.add(entry);
|
|
28
|
+
}
|
|
29
|
+
else if (entry.endsWith(".ts") && !entry.endsWith(".d.ts")) {
|
|
30
|
+
names.add(entry.replace(/\.ts$/, ""));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return [...names].sort();
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Resolve the declared grants against what is on disk.
|
|
38
|
+
*
|
|
39
|
+
* Returns the problems rather than throwing, so `push` can refuse while `doctor` reports alongside
|
|
40
|
+
* everything else it found.
|
|
41
|
+
*/
|
|
42
|
+
export function checkServiceRoleRoutes(cfg, cwd) {
|
|
43
|
+
const declared = serviceRoleRoutes(cfg);
|
|
44
|
+
if (declared.length === 0)
|
|
45
|
+
return { errors: [], missing: [], warnings: [], available: [] };
|
|
46
|
+
const dirs = functionsPathCandidatesFromProject(cfg, cwd);
|
|
47
|
+
const available = availableFunctions(dirs);
|
|
48
|
+
const known = new Set(available);
|
|
49
|
+
// Forward slashes and the candidates listed separately: joining them into one path produced
|
|
50
|
+
// "no functions or supatype\functions/send-email/index.ts", which reads as neither a path nor a list.
|
|
51
|
+
const searched = dirs.map((dir) => (relative(cwd, dir) || dir).replace(/\\/g, "/"));
|
|
52
|
+
const primary = searched[0] ?? "functions";
|
|
53
|
+
const errors = [];
|
|
54
|
+
const missing = [];
|
|
55
|
+
const warnings = [];
|
|
56
|
+
for (const name of declared) {
|
|
57
|
+
if (name.startsWith("hooks/")) {
|
|
58
|
+
// Not an error: it was the documented form once, and the worker grants hooks whatever this says.
|
|
59
|
+
// Still worth saying, because a reader would reasonably assume the line is what does the granting.
|
|
60
|
+
warnings.push(` "${name}" is not needed — a hook receives the service-role key because only the API server ` +
|
|
61
|
+
`can reach it`);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
if (!known.has(name)) {
|
|
65
|
+
const where = searched.length > 1 ? ` (searched ${searched.join(", ")})` : "";
|
|
66
|
+
errors.push(` "${name}" — no ${primary}/${name}/index.ts${where}`);
|
|
67
|
+
missing.push(name);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return { errors, missing, warnings, available };
|
|
71
|
+
}
|
|
72
|
+
/** The full message for a refusal, including what *is* available to name. */
|
|
73
|
+
export function serviceRoleProblemLines(problems) {
|
|
74
|
+
if (problems.errors.length === 0)
|
|
75
|
+
return [];
|
|
76
|
+
const lines = [...problems.errors, ""];
|
|
77
|
+
lines.push(problems.available.length > 0
|
|
78
|
+
? `Functions found: ${problems.available.join(", ")}`
|
|
79
|
+
: "No functions found. Create one with: supatype functions new <name>");
|
|
80
|
+
lines.push("");
|
|
81
|
+
lines.push("A name that matches nothing grants nothing, and says so nowhere: the function reads no key at " +
|
|
82
|
+
"runtime, in a deploy that reported success.");
|
|
83
|
+
return lines;
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=service-role-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service-role-check.js","sourceRoot":"","sources":["../src/service-role-check.ts"],"names":[],"mappings":"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"}
|
package/dist/target-client.d.ts
CHANGED
|
@@ -5,6 +5,23 @@ export interface TargetFetchOptions {
|
|
|
5
5
|
token: string;
|
|
6
6
|
orgId?: string | undefined;
|
|
7
7
|
environment?: string | undefined;
|
|
8
|
+
/**
|
|
9
|
+
* Cloud-only: renew short-lived access JWT via control-plane `/auth/refresh`.
|
|
10
|
+
* Self-host SERVICE_ROLE_KEY links omit this.
|
|
11
|
+
*/
|
|
12
|
+
authRefresh?: {
|
|
13
|
+
cloudApiUrl: string;
|
|
14
|
+
refreshToken: string;
|
|
15
|
+
onRefreshed: (tokens: {
|
|
16
|
+
accessToken: string;
|
|
17
|
+
refreshToken?: string;
|
|
18
|
+
}) => void;
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
export declare class TargetApiError extends Error {
|
|
22
|
+
readonly status: number;
|
|
23
|
+
readonly code?: string;
|
|
24
|
+
constructor(message: string, status: number, code?: string);
|
|
8
25
|
}
|
|
9
26
|
export declare function targetFetch<T>(baseUrl: string, apiPrefix: "/api/v1" | "/platform/v1", opts: TargetFetchOptions): Promise<T>;
|
|
10
27
|
//# sourceMappingURL=target-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-client.d.ts","sourceRoot":"","sources":["../src/target-client.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"target-client.d.ts","sourceRoot":"","sources":["../src/target-client.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC;;;OAGG;IACH,WAAW,CAAC,EAAE;QACZ,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;QACpB,WAAW,EAAE,CAAC,MAAM,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,IAAI,CAAA;KAC9E,CAAA;CACF;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;gBAEV,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;CAM3D;AAoCD,wBAAsB,WAAW,CAAC,CAAC,EACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,GAAG,cAAc,EACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,CAAC,CAAC,CA0DZ"}
|
package/dist/target-client.js
CHANGED
|
@@ -1,22 +1,74 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
export class TargetApiError extends Error {
|
|
2
|
+
status;
|
|
3
|
+
code;
|
|
4
|
+
constructor(message, status, code) {
|
|
5
|
+
super(message);
|
|
6
|
+
this.name = "TargetApiError";
|
|
7
|
+
this.status = status;
|
|
8
|
+
if (code !== undefined)
|
|
9
|
+
this.code = code;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
function isAuthExpiry(status, code, message) {
|
|
13
|
+
if (status !== 401)
|
|
14
|
+
return false;
|
|
15
|
+
if (code === "TOKEN_EXPIRED" || code === "NO_SESSION" || code === "INVALID_TOKEN")
|
|
16
|
+
return true;
|
|
17
|
+
const m = (message ?? "").toLowerCase();
|
|
18
|
+
return m.includes("token expired") || m.includes("authentication required");
|
|
19
|
+
}
|
|
20
|
+
async function refreshAccessToken(authRefresh) {
|
|
21
|
+
const base = authRefresh.cloudApiUrl.replace(/\/$/, "");
|
|
22
|
+
const res = await fetch(`${base}/auth/refresh`, {
|
|
23
|
+
method: "POST",
|
|
24
|
+
headers: { "Content-Type": "application/json" },
|
|
25
|
+
body: JSON.stringify({ refresh_token: authRefresh.refreshToken }),
|
|
15
26
|
});
|
|
16
27
|
const json = (await res.json().catch(() => ({})));
|
|
17
|
-
if (!res.ok) {
|
|
18
|
-
throw new Error(json.message ?? json.error ??
|
|
28
|
+
if (!res.ok || !json.access_token) {
|
|
29
|
+
throw new Error(`${json.message ?? json.error ?? "Token refresh failed"}. Run: supatype login`);
|
|
30
|
+
}
|
|
31
|
+
authRefresh.onRefreshed({
|
|
32
|
+
accessToken: json.access_token,
|
|
33
|
+
...(json.refresh_token !== undefined ? { refreshToken: json.refresh_token } : {}),
|
|
34
|
+
});
|
|
35
|
+
return json.access_token;
|
|
36
|
+
}
|
|
37
|
+
export async function targetFetch(baseUrl, apiPrefix, opts) {
|
|
38
|
+
const url = `${baseUrl.replace(/\/$/, "")}${apiPrefix}${opts.path}`;
|
|
39
|
+
const doFetch = async (token) => {
|
|
40
|
+
const headers = {
|
|
41
|
+
"Content-Type": "application/json",
|
|
42
|
+
Authorization: `Bearer ${token}`,
|
|
43
|
+
};
|
|
44
|
+
if (opts.orgId)
|
|
45
|
+
headers["X-Org-Id"] = opts.orgId;
|
|
46
|
+
if (opts.environment)
|
|
47
|
+
headers["X-Supatype-Environment"] = opts.environment;
|
|
48
|
+
const res = await fetch(url, {
|
|
49
|
+
method: opts.method,
|
|
50
|
+
headers,
|
|
51
|
+
...(opts.body !== undefined ? { body: JSON.stringify(opts.body) } : {}),
|
|
52
|
+
});
|
|
53
|
+
const json = (await res.json().catch(() => ({})));
|
|
54
|
+
return { ok: res.ok, status: res.status, json };
|
|
55
|
+
};
|
|
56
|
+
let token = opts.token;
|
|
57
|
+
let result = await doFetch(token);
|
|
58
|
+
if (!result.ok &&
|
|
59
|
+
opts.authRefresh &&
|
|
60
|
+
isAuthExpiry(result.status, result.json.code, result.json.message ?? result.json.error)) {
|
|
61
|
+
token = await refreshAccessToken(opts.authRefresh);
|
|
62
|
+
result = await doFetch(token);
|
|
63
|
+
}
|
|
64
|
+
if (!result.ok) {
|
|
65
|
+
const message = result.json.message ?? result.json.error ?? `API error: ${result.status} ${url}`;
|
|
66
|
+
if (isAuthExpiry(result.status, result.json.code, message) &&
|
|
67
|
+
!opts.authRefresh) {
|
|
68
|
+
throw new TargetApiError(`${message}. Session expired — run: supatype login`, result.status, result.json.code);
|
|
69
|
+
}
|
|
70
|
+
throw new TargetApiError(message, result.status, result.json.code);
|
|
19
71
|
}
|
|
20
|
-
return (json.data !== undefined ? json.data : json);
|
|
72
|
+
return (result.json.data !== undefined ? result.json.data : result.json);
|
|
21
73
|
}
|
|
22
74
|
//# sourceMappingURL=target-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-client.js","sourceRoot":"","sources":["../src/target-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"target-client.js","sourceRoot":"","sources":["../src/target-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-extractor.d.ts","sourceRoot":"","sources":["../src/type-extractor.ts"],"names":[],"mappings":"AAcA,OAAO,EAOL,KAAK,oBAAoB,EAK1B,MAAM,oBAAoB,CAAA;AAE3B,YAAY,EAAE,oBAAoB,IAAI,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAM/G,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAsB,GAC1B,oBAAoB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"type-extractor.d.ts","sourceRoot":"","sources":["../src/type-extractor.ts"],"names":[],"mappings":"AAcA,OAAO,EAOL,KAAK,oBAAoB,EAK1B,MAAM,oBAAoB,CAAA;AAE3B,YAAY,EAAE,oBAAoB,IAAI,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AAM/G,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAsB,GAC1B,oBAAoB,GAAG,IAAI,CA6G7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,gBAAgB,EAAE,CAAA;CAC1B;AAED,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,iBAAiB,CA4BrG"}
|