@supersdk/supercli 0.3.2-staging.44 → 0.3.2

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.
Files changed (93) hide show
  1. package/dist/cli.js +11 -22
  2. package/dist/cli.js.map +1 -1
  3. package/dist/commands/add.js +31 -79
  4. package/dist/commands/add.js.map +1 -1
  5. package/dist/commands/analytics.js +9 -15
  6. package/dist/commands/analytics.js.map +1 -1
  7. package/dist/commands/db.js +19 -24
  8. package/dist/commands/db.js.map +1 -1
  9. package/dist/commands/deploy.js +751 -434
  10. package/dist/commands/deploy.js.map +1 -1
  11. package/dist/commands/env.js +8 -8
  12. package/dist/commands/env.js.map +1 -1
  13. package/dist/commands/image.js +20 -31
  14. package/dist/commands/image.js.map +1 -1
  15. package/dist/commands/init.js +37 -68
  16. package/dist/commands/init.js.map +1 -1
  17. package/dist/commands/logs.js +7 -16
  18. package/dist/commands/logs.js.map +1 -1
  19. package/dist/commands/publishSite.js +943 -28
  20. package/dist/commands/publishSite.js.map +1 -1
  21. package/dist/commands/register.js +30 -51
  22. package/dist/commands/register.js.map +1 -1
  23. package/dist/commands/settings.js +6 -10
  24. package/dist/commands/settings.js.map +1 -1
  25. package/dist/config/appConfig.js +36 -40
  26. package/dist/config/appConfig.js.map +1 -1
  27. package/dist/docker/dockerCli.js +1 -63
  28. package/dist/docker/dockerCli.js.map +1 -1
  29. package/dist/output/envelope.js +1 -5
  30. package/dist/output/envelope.js.map +1 -1
  31. package/dist/output/resultPrinter.js +0 -3
  32. package/dist/output/resultPrinter.js.map +1 -1
  33. package/dist/publish/responseClassifier.js +4 -4
  34. package/dist/publish/responseClassifier.js.map +1 -1
  35. package/dist/publish/runClient.js +11 -11
  36. package/dist/publish/runClient.js.map +1 -1
  37. package/dist/publish/siteConfig.js +649 -0
  38. package/dist/publish/siteConfig.js.map +1 -0
  39. package/dist/publish/siteZip.js +5 -4
  40. package/dist/publish/siteZip.js.map +1 -1
  41. package/dist/template/README.md +227 -64
  42. package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
  43. package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
  44. package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -6
  45. package/dist/template/android/supersdk-default.config.json +2 -3
  46. package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
  47. package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
  48. package/dist/template/scripts/build_android.sh +10 -26
  49. package/dist/template/scripts/build_ios.sh +9 -41
  50. package/dist/template/scripts/build_site.sh +26 -40
  51. package/dist/template/scripts/lib/workspace.sh +4 -4
  52. package/dist/template/scripts/serve_web.py +4 -2
  53. package/dist/template/scripts/super_build_orchestrator.py +355 -278
  54. package/dist/template/scripts/supersdk_template.py +181 -414
  55. package/dist/template/scripts/web_package.py +8 -9
  56. package/dist/template/super_build.sh +113 -39
  57. package/dist/template/{super.json → supersdk.json} +1 -20
  58. package/dist/template/template_manifest.json +4 -5
  59. package/dist/workspace/config.js +119 -81
  60. package/dist/workspace/config.js.map +1 -1
  61. package/dist/workspace/identity.js +14 -15
  62. package/dist/workspace/identity.js.map +1 -1
  63. package/dist/workspace/inspect.js +0 -1
  64. package/dist/workspace/inspect.js.map +1 -1
  65. package/dist/workspace/projectIdentity.js +96 -53
  66. package/dist/workspace/projectIdentity.js.map +1 -1
  67. package/dist/workspace/template.js +8 -5
  68. package/dist/workspace/template.js.map +1 -1
  69. package/package.json +2 -2
  70. package/dist/build/artifactIntegrity.js +0 -119
  71. package/dist/build/artifactIntegrity.js.map +0 -1
  72. package/dist/commands/build.js +0 -231
  73. package/dist/commands/build.js.map +0 -1
  74. package/dist/commands/config.js +0 -170
  75. package/dist/commands/config.js.map +0 -1
  76. package/dist/config/superConfig.js +0 -429
  77. package/dist/config/superConfig.js.map +0 -1
  78. package/dist/deploy/adapterTypes.js +0 -3
  79. package/dist/deploy/adapterTypes.js.map +0 -1
  80. package/dist/deploy/manifest.js +0 -381
  81. package/dist/deploy/manifest.js.map +0 -1
  82. package/dist/deploy/preflight.js +0 -202
  83. package/dist/deploy/preflight.js.map +0 -1
  84. package/dist/deploy/resultWriter.js +0 -178
  85. package/dist/deploy/resultWriter.js.map +0 -1
  86. package/dist/deploy/runAdapter.js +0 -299
  87. package/dist/deploy/runAdapter.js.map +0 -1
  88. package/dist/deploy/siteAdapter.js +0 -182
  89. package/dist/deploy/siteAdapter.js.map +0 -1
  90. package/dist/template/scripts/build_service.sh +0 -89
  91. package/dist/template/service/Dockerfile +0 -2
  92. package/dist/workspace/projectContext.js +0 -93
  93. package/dist/workspace/projectContext.js.map +0 -1
@@ -1,182 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
- Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.defaultSiteAdapterDeps = void 0;
37
- exports.deploySite = deploySite;
38
- const crypto = __importStar(require("node:crypto"));
39
- const log_1 = require("../util/log");
40
- const siteZip_1 = require("../publish/siteZip");
41
- const siteClient_1 = require("../publish/siteClient");
42
- const responseClassifier_1 = require("../publish/responseClassifier");
43
- exports.defaultSiteAdapterDeps = {
44
- createClient: (apiOrigin) => new siteClient_1.SiteClient(apiOrigin),
45
- buildZip: siteZip_1.buildSiteZip,
46
- randomId: crypto.randomUUID,
47
- };
48
- function object(value) {
49
- return value !== null && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
50
- }
51
- function data(outcome) {
52
- return outcome.kind === 'success' ? outcome.data : outcome.kind === 'soft_success' ? outcome.resource : undefined;
53
- }
54
- function id(value) {
55
- const candidate = object(value)?.id;
56
- return typeof candidate === 'number' && Number.isSafeInteger(candidate) && candidate > 0 ? candidate : undefined;
57
- }
58
- function domain(value) {
59
- const candidate = object(value)?.domain;
60
- return typeof candidate === 'string' && candidate.length > 0 ? candidate : undefined;
61
- }
62
- function environmentExists(value, env) {
63
- return Array.isArray(value) && value.some((entry) => object(entry)?.name === env);
64
- }
65
- function redact(message, values) {
66
- return values.reduce((safe, value) => value.length > 0 ? safe.split(value).join('[REDACTED]') : safe, message);
67
- }
68
- function failure(outcome, operation, input, started) {
69
- const retryable = outcome.kind === 'rate_limited' || outcome.kind === 'infra_error'
70
- || (outcome.kind === 'business_error' && outcome.retryable);
71
- const code = outcome.kind === 'business_error' ? outcome.code
72
- : outcome.kind === 'forbidden' ? 'FORBIDDEN'
73
- : outcome.kind === 'auth_invalid' ? 'AUTH_INVALID'
74
- : outcome.kind === 'rate_limited' ? 'RATE_LIMITED' : outcome.code ?? 'INFRA_ERROR';
75
- const classifiedMessage = outcome.kind === 'business_error' ? (0, responseClassifier_1.describeSiteError)(outcome.code, outcome.message)
76
- : outcome.kind === 'auth_invalid' ? 'credentials are no longer valid — run `supercli login` again'
77
- : outcome.message;
78
- const message = redact(classifiedMessage, [input.token]);
79
- log_1.log.error(`SuperSite ${operation} failed: ${message}`, {
80
- target: 'SuperSite',
81
- projectId: input.projectId,
82
- envTarget: input.target.envTarget,
83
- request_summary: `${input.spid}/${input.target.slug}/${input.target.env}`,
84
- response_summary: code,
85
- duration_ms: Date.now() - started,
86
- retry: retryable,
87
- });
88
- return {
89
- ok: false,
90
- kind: outcome.kind === 'auth_invalid' ? 'auth_invalid'
91
- : outcome.kind === 'forbidden' ? 'forbidden'
92
- : outcome.kind === 'rate_limited' ? 'rate_limited'
93
- : outcome.kind === 'infra_error' ? 'infra_error' : 'business_error',
94
- code,
95
- message,
96
- retryable,
97
- };
98
- }
99
- async function call(operation, input, fn) {
100
- const started = Date.now();
101
- const outcome = await fn();
102
- return outcome.kind === 'success' || outcome.kind === 'soft_success'
103
- ? outcome
104
- : failure(outcome, operation, input, started);
105
- }
106
- function isFailure(value) {
107
- return 'ok' in value && value.ok === false;
108
- }
109
- async function deploySite(input, deps = exports.defaultSiteAdapterDeps) {
110
- let zip;
111
- try {
112
- zip = await deps.buildZip(input.directory);
113
- }
114
- catch (error) {
115
- return { ok: false, kind: 'business_error', code: 'ARTIFACT_NOT_DEPLOYABLE', message: `cannot package site artifact: ${error.message}`, retryable: false };
116
- }
117
- const client = deps.createClient(input.apiOrigin);
118
- const context = { accessToken: input.token, orgId: input.orgId };
119
- let siteId = 0;
120
- const existing = await call('get site', input, () => client.getSite(context, input.spid, input.target.slug));
121
- if (isFailure(existing)) {
122
- if (existing.code !== 'NOT_FOUND')
123
- return existing;
124
- }
125
- else {
126
- siteId = id(data(existing)) ?? 0;
127
- if (siteId === 0)
128
- return { ok: false, kind: 'infra_error', code: 'SITE_RESPONSE_INVALID', message: 'SuperSite returned an invalid site identity', retryable: true };
129
- }
130
- if (input.dryRun) {
131
- const outcome = await call('dry-run deploy', input, () => client.deploy(context, input.spid, input.target.slug, input.target.env, {
132
- zip: zip.buffer,
133
- expectedSiteId: siteId,
134
- version: input.version,
135
- ...(input.description ? { description: input.description } : {}),
136
- idempotencyKey: input.idempotencyKey ?? deps.randomId(),
137
- dryRun: true,
138
- }));
139
- if (isFailure(outcome))
140
- return outcome;
141
- return { ok: true, message: `validated site ${input.spid}/${input.target.slug}/${input.target.env}`, resource: { ...(siteId ? { id: siteId } : {}) } };
142
- }
143
- const environments = await call('list environments', input, () => client.listEnvironments(context, input.spid));
144
- if (isFailure(environments))
145
- return environments;
146
- if (!environmentExists(data(environments), input.target.env)) {
147
- const createdEnvironment = await call('create environment', input, () => client.createEnvironment(context, input.spid, { name: input.target.env }));
148
- if (isFailure(createdEnvironment))
149
- return createdEnvironment;
150
- }
151
- if (siteId === 0) {
152
- const createdSite = await call('create site', input, () => client.createSite(context, input.spid, {
153
- name: input.target.name ?? input.target.slug,
154
- slug: input.target.slug,
155
- }));
156
- if (isFailure(createdSite))
157
- return createdSite;
158
- siteId = id(data(createdSite)) ?? 0;
159
- if (siteId === 0)
160
- return { ok: false, kind: 'infra_error', code: 'SITE_RESPONSE_INVALID', message: 'SuperSite create returned no valid site id', retryable: true };
161
- }
162
- const deployed = await call('deploy', input, () => client.deploy(context, input.spid, input.target.slug, input.target.env, {
163
- zip: zip.buffer,
164
- expectedSiteId: siteId,
165
- version: input.version,
166
- ...(input.description ? { description: input.description } : {}),
167
- idempotencyKey: input.idempotencyKey ?? deps.randomId(),
168
- }));
169
- if (isFailure(deployed))
170
- return deployed;
171
- // POINTER_SYNC_PENDING is committed success. Preserve it as success so retries
172
- // reuse the server idempotency record instead of behaving like an abort (GO-015).
173
- const soft = deployed.kind === 'soft_success';
174
- const resource = data(deployed);
175
- return {
176
- ok: true,
177
- soft,
178
- message: soft ? `site deployed; edge pointer is still converging` : `deployed site ${input.spid}/${input.target.slug}/${input.target.env}`,
179
- resource: { id: id(resource) ?? siteId, ...(domain(resource) ? { domain: domain(resource) } : {}), ...(soft ? { pending: true } : {}) },
180
- };
181
- }
182
- //# sourceMappingURL=siteAdapter.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"siteAdapter.js","sourceRoot":"","sources":["../../src/deploy/siteAdapter.ts"],"names":[],"mappings":"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"}
@@ -1,89 +0,0 @@
1
- #!/usr/bin/env bash
2
- set -euo pipefail
3
-
4
- SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
5
- # shellcheck source=lib/workspace.sh
6
- . "$SCRIPT_DIR/lib/workspace.sh"
7
- WORKSPACE_ROOT="$(supersdk_require_workspace_root "$SCRIPT_DIR")"
8
- PYTHON_BIN="${PYTHON_BIN:-python3}"
9
- HELPER="$WORKSPACE_ROOT/scripts/supersdk_template.py"
10
- CONFIG="$WORKSPACE_ROOT/super.json"
11
- PROJECT_ID=""
12
- OUTPUT_DIR=""
13
- EVIDENCE_PATH=""
14
-
15
- usage() { echo "Usage: scripts/build_service.sh --build --config PATH --project-id ID --output-dir DIR --evidence FILE" >&2; }
16
- build_seen=false
17
- while [ "$#" -gt 0 ]; do
18
- case "$1" in
19
- --build) if [ "$build_seen" = true ]; then usage; exit 2; fi; build_seen=true; shift ;;
20
- --config) if [ "$#" -lt 2 ]; then usage; exit 2; fi; CONFIG="$2"; shift 2 ;;
21
- --project-id) if [ "$#" -lt 2 ]; then usage; exit 2; fi; PROJECT_ID="$2"; shift 2 ;;
22
- --output-dir) if [ "$#" -lt 2 ]; then usage; exit 2; fi; OUTPUT_DIR="$2"; shift 2 ;;
23
- --evidence) if [ "$#" -lt 2 ]; then usage; exit 2; fi; EVIDENCE_PATH="$2"; shift 2 ;;
24
- *) usage; exit 2 ;;
25
- esac
26
- done
27
- if [ "$build_seen" = false ] || [ -z "$PROJECT_ID" ] || [ -z "$OUTPUT_DIR" ] || [ -z "$EVIDENCE_PATH" ]; then usage; exit 2; fi
28
- if ! command -v docker >/dev/null 2>&1; then echo "Docker is required for service builds" >&2; exit 1; fi
29
-
30
- project_json="$("$PYTHON_BIN" "$HELPER" validate --config "$CONFIG" --platform service --project "$PROJECT_ID")"
31
- eval "$("$PYTHON_BIN" - "$project_json" <<'PY'
32
- import json
33
- import shlex
34
- import sys
35
-
36
- project = json.loads(sys.argv[1])["projects"][0]
37
- build = project["platformConfig"]
38
- for key, value in {
39
- "PROJECT_DIR": project["dir"],
40
- "BUILD_CONTEXT": build["context"],
41
- "DOCKERFILE": build["dockerfile"],
42
- "PLATFORM": build["platform"],
43
- }.items():
44
- print(f"{key}={shlex.quote(str(value))}")
45
- print("BUILD_ARG_NAMES=" + shlex.quote("\n".join(build["argsFromEnv"])))
46
- PY
47
- )"
48
-
49
- context_path="$WORKSPACE_ROOT/$PROJECT_DIR/$BUILD_CONTEXT"
50
- dockerfile_path="$context_path/$DOCKERFILE"
51
- if [ ! -f "$dockerfile_path" ] || [ -L "$dockerfile_path" ]; then echo "service Dockerfile must be a regular file inside build context" >&2; exit 1; fi
52
- project_real="$(cd "$WORKSPACE_ROOT/$PROJECT_DIR" && pwd -P)"
53
- context_real="$(cd "$context_path" && pwd -P)"
54
- dockerfile_real="$(cd "$(dirname "$dockerfile_path")" && pwd -P)/$(basename "$dockerfile_path")"
55
- case "$context_real/" in "$project_real/"*) ;; *) echo "service build context escapes project directory" >&2; exit 1 ;; esac
56
- case "$dockerfile_real" in "$context_real/"*) ;; *) echo "service Dockerfile escapes build context" >&2; exit 1 ;; esac
57
-
58
- tag="super-local/$PROJECT_ID:build-$(date +%s)-$$"
59
- set --
60
- while IFS= read -r name; do
61
- [ -n "$name" ] || continue
62
- eval "present=\${$name+x}"
63
- if [ "$present" != x ]; then echo "service build input missing: $name" >&2; exit 1; fi
64
- set -- "$@" --build-arg "$name"
65
- done <<EOF
66
- $BUILD_ARG_NAMES
67
- EOF
68
-
69
- docker build --platform "$PLATFORM" --file "$dockerfile_path" --tag "$tag" "$@" "$context_path"
70
- image_id="$(docker image inspect --format '{{.Id}}' "$tag")"
71
- mkdir -p "$OUTPUT_DIR" "$(dirname "$EVIDENCE_PATH")"
72
- archive="$OUTPUT_DIR/image.tar"
73
- docker save --output "$archive" "$tag"
74
- "$PYTHON_BIN" - "$EVIDENCE_PATH" "$PROJECT_ID" "$tag" "$image_id" "$PLATFORM" <<'PY'
75
- import json
76
- import sys
77
- from pathlib import Path
78
-
79
- path, project_id, tag, image_id, platform = sys.argv[1:]
80
- Path(path).write_text(json.dumps({
81
- "schemaVersion": 1,
82
- "projectId": project_id,
83
- "type": "service",
84
- "status": "success",
85
- "localImageTag": tag,
86
- "localImageId": image_id,
87
- "platform": platform,
88
- }, indent=2, sort_keys=True) + "\n", encoding="utf-8")
89
- PY
@@ -1,2 +0,0 @@
1
- FROM scratch
2
- LABEL org.opencontainers.image.title="supersdk-simple-service"
@@ -1,93 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
- Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.withConfigIdentity = withConfigIdentity;
37
- exports.withConfigIdentityMessage = withConfigIdentityMessage;
38
- exports.resolveWorkspaceContext = resolveWorkspaceContext;
39
- exports.resolveProjectContext = resolveProjectContext;
40
- exports.resolveDeployTarget = resolveDeployTarget;
41
- exports.resolveConfigPath = resolveConfigPath;
42
- const path = __importStar(require("node:path"));
43
- const superConfig_1 = require("../config/superConfig");
44
- /** Attach the selected configuration authority without hiding the command payload. */
45
- function withConfigIdentity(context, payload, extra = {}) {
46
- const data = payload !== null && typeof payload === 'object' && !Array.isArray(payload)
47
- ? payload
48
- : { data: payload };
49
- return { ...data, configPath: context.configPath, spid: context.spid, ...extra };
50
- }
51
- function withConfigIdentityMessage(context, message) {
52
- const prefix = message ? `${message}\n` : '';
53
- return `${prefix}Config: ${context.configPath}\nSPID: ${context.spid}`;
54
- }
55
- function resolveWorkspaceContext(startDir = process.cwd(), explicitPath) {
56
- const resolved = (0, superConfig_1.resolveSuperConfig)(startDir, explicitPath);
57
- if (resolved.kind !== 'valid')
58
- return {
59
- ok: false,
60
- kind: 'business_error',
61
- publicCode: resolved.kind === 'ambiguous' ? 'CONFIG_AMBIGUOUS' : 'CONFIG_INVALID',
62
- message: (0, superConfig_1.configProblem)(resolved) ?? 'invalid super.json',
63
- };
64
- return { configPath: resolved.config.path, root: resolved.config.root, config: resolved.config, spid: resolved.config.spid };
65
- }
66
- function resolveProjectContext(projectId, startDir = process.cwd(), explicitPath) {
67
- const workspace = resolveWorkspaceContext(startDir, explicitPath);
68
- if ('ok' in workspace)
69
- return workspace;
70
- const value = projectId?.trim();
71
- if (!value)
72
- return { ok: false, kind: 'usage_error', message: '--project is required' };
73
- const project = workspace.config.projects.find((candidate) => candidate.projectId === value);
74
- if (!project)
75
- return { ok: false, kind: 'business_error', publicCode: 'PROJECT_NOT_FOUND', message: `projectId ${value} is not present in ${workspace.configPath}` };
76
- return { ...workspace, project };
77
- }
78
- function resolveDeployTarget(projectId, envTarget, startDir = process.cwd(), explicitPath) {
79
- const project = resolveProjectContext(projectId, startDir, explicitPath);
80
- if ('ok' in project)
81
- return project;
82
- const targetName = envTarget?.trim();
83
- if (!targetName)
84
- return { ok: false, kind: 'usage_error', message: '--env-target is required' };
85
- const target = project.project.deploy?.find((candidate) => candidate.envTarget === targetName);
86
- if (!target)
87
- return { ok: false, kind: 'business_error', publicCode: 'TARGET_NOT_CONFIGURED', message: `envTarget ${targetName} is not configured for ${project.project.projectId}` };
88
- return { ...project, target };
89
- }
90
- function resolveConfigPath(explicitPath, cwd = process.cwd()) {
91
- return explicitPath === undefined ? undefined : path.resolve(cwd, explicitPath);
92
- }
93
- //# sourceMappingURL=projectContext.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"projectContext.js","sourceRoot":"","sources":["../../src/workspace/projectContext.ts"],"names":[],"mappings":"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"}