@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.
- package/dist/cli.js +11 -22
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +31 -79
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +9 -15
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/db.js +19 -24
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +751 -434
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/env.js +8 -8
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/image.js +20 -31
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +37 -68
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +7 -16
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +943 -28
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +30 -51
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +6 -10
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +36 -40
- package/dist/config/appConfig.js.map +1 -1
- package/dist/docker/dockerCli.js +1 -63
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +1 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +0 -3
- package/dist/output/resultPrinter.js.map +1 -1
- package/dist/publish/responseClassifier.js +4 -4
- package/dist/publish/responseClassifier.js.map +1 -1
- package/dist/publish/runClient.js +11 -11
- package/dist/publish/runClient.js.map +1 -1
- package/dist/publish/siteConfig.js +649 -0
- package/dist/publish/siteConfig.js.map +1 -0
- package/dist/publish/siteZip.js +5 -4
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +227 -64
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +1 -1
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +2 -2
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -6
- package/dist/template/android/supersdk-default.config.json +2 -3
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/scripts/build_android.sh +10 -26
- package/dist/template/scripts/build_ios.sh +9 -41
- package/dist/template/scripts/build_site.sh +26 -40
- package/dist/template/scripts/lib/workspace.sh +4 -4
- package/dist/template/scripts/serve_web.py +4 -2
- package/dist/template/scripts/super_build_orchestrator.py +355 -278
- package/dist/template/scripts/supersdk_template.py +181 -414
- package/dist/template/scripts/web_package.py +8 -9
- package/dist/template/super_build.sh +113 -39
- package/dist/template/{super.json → supersdk.json} +1 -20
- package/dist/template/template_manifest.json +4 -5
- package/dist/workspace/config.js +119 -81
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +14 -15
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/inspect.js +0 -1
- package/dist/workspace/inspect.js.map +1 -1
- package/dist/workspace/projectIdentity.js +96 -53
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +8 -5
- package/dist/workspace/template.js.map +1 -1
- package/package.json +2 -2
- package/dist/build/artifactIntegrity.js +0 -119
- package/dist/build/artifactIntegrity.js.map +0 -1
- package/dist/commands/build.js +0 -231
- package/dist/commands/build.js.map +0 -1
- package/dist/commands/config.js +0 -170
- package/dist/commands/config.js.map +0 -1
- package/dist/config/superConfig.js +0 -429
- package/dist/config/superConfig.js.map +0 -1
- package/dist/deploy/adapterTypes.js +0 -3
- package/dist/deploy/adapterTypes.js.map +0 -1
- package/dist/deploy/manifest.js +0 -381
- package/dist/deploy/manifest.js.map +0 -1
- package/dist/deploy/preflight.js +0 -202
- package/dist/deploy/preflight.js.map +0 -1
- package/dist/deploy/resultWriter.js +0 -178
- package/dist/deploy/resultWriter.js.map +0 -1
- package/dist/deploy/runAdapter.js +0 -299
- package/dist/deploy/runAdapter.js.map +0 -1
- package/dist/deploy/siteAdapter.js +0 -182
- package/dist/deploy/siteAdapter.js.map +0 -1
- package/dist/template/scripts/build_service.sh +0 -89
- package/dist/template/service/Dockerfile +0 -2
- package/dist/workspace/projectContext.js +0 -93
- package/dist/workspace/projectContext.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishSite.js","sourceRoot":"","sources":["../../src/commands/publishSite.ts"],"names":[],"mappings":";;;AAaA,4DAaC;AAMD,gEAeC;AA7CD,qCAA0H;AAM7G,QAAA,gCAAgC,GAA8B;IACzE,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,yBAAgB,EAAC,QAAQ,EAAE,OAAO,CAAC;CACnE,CAAC;AAEF,oHAAoH;AAC7G,KAAK,UAAU,wBAAwB,CAC5C,OAA6B,EAC7B,OAAkC,wCAAgC;IAElE,0EAA0E;IAC1E,wEAAwE;IACxE,0EAA0E;IAC1E,iEAAiE;IACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC,CAAC;IACxF,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE,sHAAsH,MAAM,CAAC,OAAO,EAAE;KAChJ,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,OAAgB;IAClC,OAAQ,OAAO,CAAC,eAAe,EAAE,EAA0B,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AACpG,CAAC;AAED,SAAgB,0BAA0B,CAAC,OAAgB;IACzD,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;SAC5B,WAAW,CAAC,6DAA6D,CAAC;SAC1E,cAAc,CAAC,uBAAuB,EAAE,uCAAuC,CAAC;SAChF,cAAc,CAAC,qBAAqB,EAAE,2CAA2C,CAAC;SAClF,cAAc,CAAC,mBAAmB,EAAE,+DAA+D,CAAC;SACpG,MAAM,CAAC,iBAAiB,EAAE,4CAA4C,CAAC;SACvE,MAAM,CAAC,YAAY,EAAE,0DAA0D,CAAC;SAChF,MAAM,CAAC,6BAA6B,EAAE,oBAAoB,CAAC;SAC3D,MAAM,CAAC,WAAW,EAAE,oEAAoE,CAAC;SACzF,MAAM,CAAC,yBAAyB,EAAE,wBAAwB,CAAC;SAC3D,MAAM,CAAC,KAAK,EAAE,OAA6B,EAAE,OAAgB,EAAE,EAAE;QAChE,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACvD,IAAA,gCAAuB,EAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
1
|
+
{"version":3,"file":"publishSite.js","sourceRoot":"","sources":["../../src/commands/publishSite.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,7 @@ exports.registerRegisterCommand = registerRegisterCommand;
|
|
|
40
40
|
const fs = __importStar(require("node:fs"));
|
|
41
41
|
const path = __importStar(require("node:path"));
|
|
42
42
|
const resultPrinter_1 = require("../output/resultPrinter");
|
|
43
|
+
const siteConfig_1 = require("../publish/siteConfig");
|
|
43
44
|
const prompt_1 = require("../util/prompt");
|
|
44
45
|
const shell_1 = require("../util/shell");
|
|
45
46
|
const config_1 = require("../workspace/config");
|
|
@@ -47,7 +48,7 @@ const projectIdentity_1 = require("../workspace/projectIdentity");
|
|
|
47
48
|
const inspect_1 = require("../workspace/inspect");
|
|
48
49
|
const template_1 = require("../workspace/template");
|
|
49
50
|
/** register 接管的类型集合。ios 刻意不在其中 —— 见 IOS_UNSUPPORTED_MESSAGE。 */
|
|
50
|
-
exports.REGISTERABLE_TYPES = ['android', 'site'
|
|
51
|
+
exports.REGISTERABLE_TYPES = ['android', 'site'];
|
|
51
52
|
function isRegisterableType(value) {
|
|
52
53
|
return exports.REGISTERABLE_TYPES.includes(value);
|
|
53
54
|
}
|
|
@@ -74,12 +75,12 @@ exports.IOS_UNSUPPORTED_MESSAGE = [
|
|
|
74
75
|
'outcome.',
|
|
75
76
|
'',
|
|
76
77
|
'What does work:',
|
|
77
|
-
" supercli add ios <empty-dir> --
|
|
78
|
-
' supercli register android <dir> --
|
|
79
|
-
' supercli register site <dir> --
|
|
78
|
+
" supercli add ios <empty-dir> --bundle-id com.acme.myapp --name 'My App' # a NEW iOS project from the template",
|
|
79
|
+
' supercli register android <dir> --package com.acme.myapp --name <label> # adopt an existing Android project',
|
|
80
|
+
' supercli register site <dir> --slug <slug> # adopt an existing site project',
|
|
80
81
|
'',
|
|
81
82
|
'To bring SuperSDK into an existing iOS app without this command, add the SDK to that app directly (SPM) and ' +
|
|
82
|
-
'keep it out of
|
|
83
|
+
'keep it out of supersdk.json — the workspace build pipeline only drives generated iOS projects.',
|
|
83
84
|
].join('\n');
|
|
84
85
|
function statTarget(target) {
|
|
85
86
|
let stat;
|
|
@@ -114,21 +115,17 @@ function summary(args) {
|
|
|
114
115
|
`registered existing ${type} project at ${target}`,
|
|
115
116
|
`dir: ${entry.dir}`,
|
|
116
117
|
`registered in: ${workspace.configPath}`,
|
|
117
|
-
`SPID: ${workspace.spid}`,
|
|
118
|
-
`projectId: ${String(entry.projectId)}`,
|
|
119
118
|
];
|
|
120
119
|
if (type === 'android')
|
|
121
120
|
lines.push(`name: ${String(entry.name)}`, `package: ${String(entry.package)}`);
|
|
122
|
-
if (type === 'site'
|
|
123
|
-
const deploy = entry.deploy
|
|
121
|
+
if (type === 'site') {
|
|
122
|
+
const deploy = entry.deploy[0];
|
|
124
123
|
lines.push(entry.name === undefined
|
|
125
|
-
?
|
|
126
|
-
: `name: ${String(entry.name)}`
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
: 'build: context=., dockerfile=Dockerfile, platform=linux/amd64; deploy: [] (add --env-target/--slug/--env together to declare a target)')
|
|
131
|
-
: `deploy[0]: envTarget=${deploy.envTarget} slug=${deploy.slug} env=${deploy.env}`);
|
|
124
|
+
? `name: (unset) — resolves to the slug "${deploy.slug}"; pass --name here, or --name to \`supercli publish-site\`, to set a different one`
|
|
125
|
+
: `name: ${String(entry.name)}`, `deploy[0]: slug=${deploy.slug} env=${deploy.env} dir=${deploy.dir}`,
|
|
126
|
+
// 🔴 显式打印,不静默:没有 offline.host 就没有离线包。域名是服务端签发的,CLI 绝不自己拼。
|
|
127
|
+
'offline.host: (unset) — offline packaging is skipped until the first successful ' +
|
|
128
|
+
'`supercli publish-site`, which records the domain the server issued. supercli never composes a domain itself.');
|
|
132
129
|
}
|
|
133
130
|
// 「什么都没动」必须说出来:它是 register 与 add 的分界线,也是用户敢在自己工程上跑它的理由。
|
|
134
131
|
lines.push(`files written inside ${entry.dir}: none — \`register\` only records the directory`);
|
|
@@ -139,7 +136,7 @@ function summary(args) {
|
|
|
139
136
|
}
|
|
140
137
|
if (guidance.length > 0)
|
|
141
138
|
lines.push('', ...guidance);
|
|
142
|
-
lines.push('', `next: cd ${(0, shell_1.shellQuote)(workspace.root)} &&
|
|
139
|
+
lines.push('', `next: cd ${(0, shell_1.shellQuote)(workspace.root)} && ./super_build.sh --platform ${type} --project ${entry.dir} --plan`);
|
|
143
140
|
return lines.join('\n');
|
|
144
141
|
}
|
|
145
142
|
/**
|
|
@@ -162,7 +159,7 @@ async function runRegister(typeArg, dirArg, opts, deps = {}) {
|
|
|
162
159
|
}
|
|
163
160
|
const type = typeArg;
|
|
164
161
|
const cwd = path.resolve(deps.cwd ?? process.cwd());
|
|
165
|
-
const loaded = (0, config_1.loadWorkspace)(cwd
|
|
162
|
+
const loaded = (0, config_1.loadWorkspace)(cwd);
|
|
166
163
|
if (loaded.kind !== 'ok')
|
|
167
164
|
return { ok: false, kind: 'business_error', message: loaded.message };
|
|
168
165
|
const workspace = loaded.workspace;
|
|
@@ -211,7 +208,7 @@ async function runRegister(typeArg, dirArg, opts, deps = {}) {
|
|
|
211
208
|
kind: 'business_error',
|
|
212
209
|
message: `"${target}" ${reason}. \`supercli register\` adopts a directory that is already there — it never creates ` +
|
|
213
210
|
'one, and it never writes into one.\n' +
|
|
214
|
-
`Create the project first (\`supercli add ${type} ${(0, shell_1.shellQuote)(dirArg)}
|
|
211
|
+
`Create the project first (\`supercli add ${type} ${(0, shell_1.shellQuote)(dirArg)} ...\` scaffolds a new one from the ` +
|
|
215
212
|
'built-in template), or fix the path.',
|
|
216
213
|
};
|
|
217
214
|
}
|
|
@@ -242,32 +239,26 @@ async function runRegister(typeArg, dirArg, opts, deps = {}) {
|
|
|
242
239
|
}),
|
|
243
240
|
};
|
|
244
241
|
}
|
|
245
|
-
// 🔴
|
|
242
|
+
// 🔴 站点的 (slug, env) 在**整个工作空间**内唯一 —— 判定复用发布侧的 findDeployTarget,
|
|
246
243
|
// 不在这里另写一次遍历。不查的话,冲突要等到 appendProject 写出后再解析时才被拒(错误
|
|
247
244
|
// 措辞完全指不到是哪两条撞了),而两条同 (slug, env) 指向的其实是同一个线上站点。
|
|
248
|
-
if (
|
|
245
|
+
if (type === 'site') {
|
|
249
246
|
const slug = identity.resolved.slug;
|
|
250
247
|
const env = identity.resolved.env;
|
|
251
|
-
const taken = workspace.config
|
|
252
|
-
.filter((project) => project.type === 'site' || project.type === 'service')
|
|
253
|
-
.map((project) => ({ project, entry: project.deploy?.find((target) => target.slug === slug && target.env === env) }))
|
|
254
|
-
.find((candidate) => candidate.entry !== undefined);
|
|
248
|
+
const taken = (0, siteConfig_1.findDeployTarget)(workspace.config, slug, env);
|
|
255
249
|
if (taken) {
|
|
256
250
|
return {
|
|
257
251
|
ok: false,
|
|
258
252
|
kind: 'business_error',
|
|
259
|
-
message: `refusing to register "${projectDir}": the
|
|
253
|
+
message: `refusing to register "${projectDir}": the site project at "${taken.project.dir}" already deploys ` +
|
|
260
254
|
`slug=${slug} env=${env} (${config_1.CONFIG_FILENAME} keeps every (slug, env) pair unique across the whole ` +
|
|
261
|
-
'workspace — the pair identifies one live
|
|
262
|
-
`
|
|
255
|
+
'workspace — the pair identifies one live site). Pick a different --slug, or a different --env, or ' +
|
|
256
|
+
`publish the existing project instead: supercli publish-site ${(0, shell_1.shellQuote)(taken.entry.dir || taken.project.dir)} ` +
|
|
257
|
+
`--spid ${workspace.spid} --slug ${slug} --env ${env}`,
|
|
263
258
|
};
|
|
264
259
|
}
|
|
265
260
|
}
|
|
266
|
-
const
|
|
267
|
-
if (!projectId || !/^[a-z][a-z0-9-]{0,63}$/.test(projectId) || workspace.projects.some((project) => project.projectId === projectId)) {
|
|
268
|
-
return { ok: false, kind: 'business_error', message: '--project is required and must be a unique stable projectId' };
|
|
269
|
-
}
|
|
270
|
-
const entry = (0, projectIdentity_1.buildEntry)(type, projectDir, identity.resolved, projectId);
|
|
261
|
+
const entry = (0, projectIdentity_1.buildEntry)(type, projectDir, identity.resolved);
|
|
271
262
|
try {
|
|
272
263
|
(0, config_1.appendProject)(workspace.configPath, entry);
|
|
273
264
|
}
|
|
@@ -307,8 +298,6 @@ async function runRegister(typeArg, dirArg, opts, deps = {}) {
|
|
|
307
298
|
dir: projectDir,
|
|
308
299
|
projectDir: target,
|
|
309
300
|
configPath: workspace.configPath,
|
|
310
|
-
spid: workspace.spid,
|
|
311
|
-
projectId: String(entry.projectId),
|
|
312
301
|
entry,
|
|
313
302
|
warnings,
|
|
314
303
|
guidance,
|
|
@@ -352,27 +341,17 @@ function registerRegisterCommand(program) {
|
|
|
352
341
|
'copies nothing and edits nothing.');
|
|
353
342
|
withGlobalOptions(register
|
|
354
343
|
.command('android <dir>')
|
|
355
|
-
.description('Register an existing Android project directory in
|
|
356
|
-
.requiredOption('--project <id>', 'stable projectId')
|
|
357
|
-
.option('--config <path>', 'explicit super.json path')
|
|
344
|
+
.description('Register an existing Android project directory in supersdk.json (no files are written).')
|
|
358
345
|
.option('--name <name>', 'Android app label (required; never derived from the project or the workspace name)')
|
|
359
346
|
.option('--package <package>', 'Java package / applicationId, e.g. com.acme.myapp (required)')).action(action('android'));
|
|
360
347
|
withGlobalOptions(register
|
|
361
348
|
.command('site <dir>')
|
|
362
|
-
.description('Register an existing site (web) project directory in
|
|
363
|
-
.
|
|
364
|
-
.option('--config <path>', 'explicit super.json path')
|
|
365
|
-
.option('--env-target <name>', 'named deployment target; requires --slug and --env')
|
|
366
|
-
.option('--slug <slug>', 'site slug; requires --env-target and --env')
|
|
349
|
+
.description('Register an existing site (web) project directory in supersdk.json (no files are written).')
|
|
350
|
+
.option('--slug <slug>', 'site slug, 1-32 lowercase letters/digits (required)')
|
|
367
351
|
.option('--name <name>', 'site name; omitted, nothing is recorded and it resolves to the slug')
|
|
368
|
-
.option('--env <env>',
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
.option('--config <path>', 'explicit super.json path')
|
|
372
|
-
.option('--env-target <name>', 'named deployment target; requires --slug and --env')
|
|
373
|
-
.option('--slug <slug>', 'deployment slug; requires --env-target and --env')
|
|
374
|
-
.option('--name <name>', 'service name (optional)')
|
|
375
|
-
.option('--env <env>', 'project environment; requires --env-target and --slug')).action(action('service'));
|
|
352
|
+
.option('--env <env>', `project environment this site deploys to (default: ${projectIdentity_1.DEFAULT_SITE_ENV})`)
|
|
353
|
+
.option('--deploy-dir <dir>', `directory published by publish-site, relative to the workspace root (not to <dir>) and inside <dir> ` +
|
|
354
|
+
`(default: <dir>/${projectIdentity_1.SITE_DIST_DIRNAME})`)).action(action('site'));
|
|
376
355
|
// 🔴 ios 必须是一个**真实存在**的子命令,而不是靠 commander 的 "unknown command" 兜底:
|
|
377
356
|
// 「不支持」和「你打错了」是两件完全不同的事,后者的报错不会告诉任何人为什么。
|
|
378
357
|
withGlobalOptions(register
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/commands/register.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/commands/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,6 @@ const accountStore_1 = require("../store/accountStore");
|
|
|
50
50
|
const credentialStore_1 = require("../store/credentialStore");
|
|
51
51
|
const log_1 = require("../util/log");
|
|
52
52
|
const prompt_1 = require("../util/prompt");
|
|
53
|
-
const projectContext_1 = require("../workspace/projectContext");
|
|
54
53
|
function storedToken(account) {
|
|
55
54
|
return (0, credentialStore_1.backendForAccount)(account.backend, {
|
|
56
55
|
passphraseProvider: account.backend === 'encrypted-file'
|
|
@@ -103,14 +102,11 @@ function resolveSettingsAuth(deps) {
|
|
|
103
102
|
return { token, apiOrigin: account.apiOrigin };
|
|
104
103
|
}
|
|
105
104
|
function scope(opts) {
|
|
106
|
-
const
|
|
107
|
-
if (isCommandOutcome(context))
|
|
108
|
-
return context;
|
|
109
|
-
const spid = context.spid;
|
|
105
|
+
const spid = value(opts.spid);
|
|
110
106
|
const env = value(opts.env);
|
|
111
107
|
if (!spid || !env)
|
|
112
|
-
return { ok: false, kind: 'usage_error', message: '--
|
|
113
|
-
return {
|
|
108
|
+
return { ok: false, kind: 'usage_error', message: '--spid and --env are both required' };
|
|
109
|
+
return { spid, env };
|
|
114
110
|
}
|
|
115
111
|
function nameOf(opts) {
|
|
116
112
|
const name = value(opts.name);
|
|
@@ -284,19 +280,19 @@ function registerSettingsCommand(program) {
|
|
|
284
280
|
const settings = program.command('settings').description('Read or publish scoped Settings through the CLI-only Console API.');
|
|
285
281
|
addLeafOutputOptions(settings.command('list')
|
|
286
282
|
.description('List Settings summaries in one project environment.')
|
|
287
|
-
.
|
|
283
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
288
284
|
.requiredOption('--env <env>', 'project environment')
|
|
289
285
|
.action(async (opts, cmd) => emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsList(opts))));
|
|
290
286
|
addLeafOutputOptions(settings.command('get <name>')
|
|
291
287
|
.description('Read one Setting, including its original JavaScript content.')
|
|
292
|
-
.
|
|
288
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
293
289
|
.requiredOption('--env <env>', 'project environment')
|
|
294
290
|
.action(async (name, opts, cmd) => {
|
|
295
291
|
emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsGet({ ...opts, name }));
|
|
296
292
|
}));
|
|
297
293
|
addLeafOutputOptions(settings.command('set <name>')
|
|
298
294
|
.description('Create or update one Setting. Choose exactly one of --content or --file; direct content may be recorded in shell history.')
|
|
299
|
-
.
|
|
295
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
300
296
|
.requiredOption('--env <env>', 'project environment')
|
|
301
297
|
.option('--content <js>', 'direct JavaScript content (may be recorded in shell history)')
|
|
302
298
|
.option('--file <path>', 'read UTF-8 JavaScript content from a file')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/commands/settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/commands/settings.ts"],"names":[],"mappings":"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"}
|
package/dist/config/appConfig.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.APP_CONFIG_SKELETON = exports.RETIRED_ROOT_KEYS = exports.APP_CONFIG_KEY_ORDER = exports.
|
|
3
|
+
exports.APP_CONFIG_SKELETON = exports.RETIRED_ROOT_KEYS = exports.APP_CONFIG_KEY_ORDER = exports.OFFLINE_KEY_ORDER = exports.SDK_KEY_ORDER = exports.VERSION_KEY_ORDER = exports.DEPLOY_KEY_ORDER = exports.PROJECT_KEY_ORDER = exports.ROOT_KEY_ORDER = exports.LEGACY_APP_CONFIG_FILENAMES = exports.ENGINE_SCRIPT_RELPATH = exports.APP_CONFIG_SCHEMA_VERSION = exports.APP_CONFIG_FILENAME = void 0;
|
|
4
4
|
exports.engineMigrateCommand = engineMigrateCommand;
|
|
5
5
|
exports.hasOwn = hasOwn;
|
|
6
6
|
exports.orderRootKeys = orderRootKeys;
|
|
7
7
|
exports.serializeAppConfig = serializeAppConfig;
|
|
8
8
|
exports.findDuplicateKey = findDuplicateKey;
|
|
9
9
|
exports.appConfigSkeleton = appConfigSkeleton;
|
|
10
|
-
//
|
|
10
|
+
// supersdk.json 的 **单一信源**:文件名、schemaVersion、退役键/文件集、键序、写盘纪律。
|
|
11
11
|
//
|
|
12
|
-
// 🔴
|
|
12
|
+
// 🔴 为什么必须只有一份:工作空间侧(init / add)与发布侧(src/publish/siteConfig.ts)
|
|
13
13
|
// 都要读写同一个文件。两边各写一份常量时,「今天碰巧一致」不构成任何保证 —— 一旦哪边先
|
|
14
14
|
// 改了键序或 schemaVersion,另一边就会把同一份文档写成另一种字节形态,git diff 里出现整
|
|
15
15
|
// 文件重排,甚至一边认为合法另一边 fail-closed。
|
|
@@ -19,47 +19,50 @@ exports.appConfigSkeleton = appConfigSkeleton;
|
|
|
19
19
|
// reject_duplicate_keys。本模块是它在 TypeScript 侧的镜像,改动一律以 Python 为准。
|
|
20
20
|
//
|
|
21
21
|
// ---------------------------------------------------------------------------
|
|
22
|
-
// schemaVersion
|
|
22
|
+
// schemaVersion 3:工作空间模型
|
|
23
23
|
// ---------------------------------------------------------------------------
|
|
24
|
-
// 一个 workspace = 一个 spid,`
|
|
25
|
-
//
|
|
24
|
+
// 一个 workspace = 一个 spid,`supersdk.json` 所在目录就是工作空间根。App 与站点都是
|
|
25
|
+
// `projects[]` 里的一条,靠 `type` 区分(首批 android / ios / site,`type` 是预留字段,
|
|
26
|
+
// 加新类型不需要改 schema)。
|
|
26
27
|
//
|
|
27
28
|
// 🔴 environment 不再是配置字段。已核实 SDK 签名 `SuperSDK.init(context, spid, provider)`
|
|
28
29
|
// 与 `init(context, spid, environment, provider)`,CHANGELOG 写明「省略环境时默认为 prod」
|
|
29
30
|
// —— 环境是**运行时 init 参数**,编译期不需要。一条规则贯穿三层:
|
|
30
|
-
// 配置说「这是什么」·
|
|
31
|
+
// 配置说「这是什么」· 发布说「发到哪儿」(publish-site --env)· 运行时说「连哪个环境」。
|
|
31
32
|
//
|
|
32
|
-
//
|
|
33
|
-
//
|
|
33
|
+
// v2 → v3 是破坏性变更,**不做向后兼容**:读到 schemaVersion 2 一律 fail-closed,由调用方
|
|
34
|
+
// 给出可照抄执行的迁移路径(配置那半边给命令,引擎那半边跑 supersdk_template.py migrate)。
|
|
34
35
|
const shell_1 = require("../util/shell");
|
|
35
|
-
|
|
36
|
-
exports.
|
|
37
|
-
exports.APP_CONFIG_SCHEMA_VERSION = 4;
|
|
36
|
+
exports.APP_CONFIG_FILENAME = 'supersdk.json';
|
|
37
|
+
exports.APP_CONFIG_SCHEMA_VERSION = 3;
|
|
38
38
|
/**
|
|
39
39
|
* vendored 引擎脚本在工作空间里的相对路径(`init` / `add` 的 ensureWorkspaceShared 会把
|
|
40
40
|
* `scripts/` 整个铺进工作空间)。
|
|
41
41
|
*/
|
|
42
42
|
exports.ENGINE_SCRIPT_RELPATH = 'scripts/supersdk_template.py';
|
|
43
43
|
/**
|
|
44
|
-
*
|
|
44
|
+
* v2 → v3 迁移命令的**唯一权威形式**。
|
|
45
45
|
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
46
|
+
* 🔴 它必须能被照抄进 shell 直接跑起来。权威侧 `supersdk_template.py` 的 migrate 子命令把
|
|
47
|
+
* `--config` 声明成 `required=True`,少这一个参数的命令会被 argparse 直接拦下(exit 2)——
|
|
48
|
+
* 用户在「按提示做 → 撞回同一句提示」之间死循环。Python 侧自己也有一份 `migrate_command()`
|
|
49
|
+
* 干同样的事、并且**总是**带 `--config`;两处各写一遍的写法已经漂移过一次,所以 TS 这边收
|
|
50
|
+
* 敛到这一个函数,并由 test/integration/engine-config-parity.test.ts 真的把它跑一遍。
|
|
48
51
|
*
|
|
49
52
|
* 只回「命令本身」,不带 `cd`:调用方决定是先 cd 过去(提示里更短),还是直接给绝对路径。
|
|
50
53
|
*/
|
|
51
|
-
function engineMigrateCommand(
|
|
52
|
-
return `python3 ${exports.ENGINE_SCRIPT_RELPATH} migrate --
|
|
54
|
+
function engineMigrateCommand(configFilename = exports.APP_CONFIG_FILENAME) {
|
|
55
|
+
return `python3 ${exports.ENGINE_SCRIPT_RELPATH} migrate --config ${(0, shell_1.shellQuote)(configFilename)}`;
|
|
53
56
|
}
|
|
54
57
|
/**
|
|
55
58
|
* 已退役的配置文件名,与 supersdk_template.py 的 LEGACY_CONFIG_FILENAMES **逐字一致**。
|
|
56
|
-
* 三端(Python / 工作空间命令 /
|
|
59
|
+
* 三端(Python / 工作空间命令 / publish-site)必须认同一套:任何一端漏认一个文件名,就会
|
|
57
60
|
* 出现「这一端生成/发布成功、另一端立刻 fail-closed」的撕裂。
|
|
58
61
|
*
|
|
59
62
|
* - supersdk.yaml / supersdk.yml:schema_version: 1 的受限 YAML 方言,位于仓库根
|
|
60
63
|
* - super-site.yml:手写行解析器时代的站点绑定,位于发布目录内
|
|
61
64
|
*/
|
|
62
|
-
exports.LEGACY_APP_CONFIG_FILENAMES = ['supersdk.
|
|
65
|
+
exports.LEGACY_APP_CONFIG_FILENAMES = ['supersdk.yaml', 'supersdk.yml', 'super-site.yml'];
|
|
63
66
|
/** 固定根键序。未知键按原有相对顺序追加在末尾(未知键必须原样保留,见 orderRootKeys)。 */
|
|
64
67
|
exports.ROOT_KEY_ORDER = [
|
|
65
68
|
'schemaVersion',
|
|
@@ -82,26 +85,22 @@ exports.ROOT_KEY_ORDER = [
|
|
|
82
85
|
* 🔴 `spmMode` 平铺在 ios 条目上、**不进 sdk**:build_ios.sh 读的是 platform_config.spmMode。
|
|
83
86
|
*/
|
|
84
87
|
exports.PROJECT_KEY_ORDER = [
|
|
85
|
-
'projectId',
|
|
86
88
|
'type',
|
|
87
89
|
'dir',
|
|
88
90
|
'name',
|
|
89
91
|
'package',
|
|
90
92
|
'bundleId',
|
|
91
93
|
'spmMode',
|
|
92
|
-
'build',
|
|
93
94
|
'deploy',
|
|
94
95
|
'offline',
|
|
95
96
|
'version',
|
|
96
97
|
'sdk',
|
|
97
98
|
];
|
|
98
99
|
/** 站点项目 `deploy[]` 单条的键序 —— 逐字等于 v2 `sites[]` 条目。 */
|
|
99
|
-
exports.DEPLOY_KEY_ORDER = ['
|
|
100
|
+
exports.DEPLOY_KEY_ORDER = ['slug', 'name', 'env', 'dir'];
|
|
100
101
|
exports.VERSION_KEY_ORDER = ['name', 'code'];
|
|
101
102
|
exports.SDK_KEY_ORDER = ['androidVersion', 'iosPackageUrl', 'iosVersion'];
|
|
102
103
|
exports.OFFLINE_KEY_ORDER = ['host'];
|
|
103
|
-
exports.BUILD_KEY_ORDER = ['outputDir', 'context', 'dockerfile', 'platform', 'argsFromEnv'];
|
|
104
|
-
exports.ENV_REFERENCE_KEY_ORDER = ['name', 'sourceEnv'];
|
|
105
104
|
exports.APP_CONFIG_KEY_ORDER = {
|
|
106
105
|
order: exports.ROOT_KEY_ORDER,
|
|
107
106
|
children: {
|
|
@@ -114,14 +113,7 @@ exports.APP_CONFIG_KEY_ORDER = {
|
|
|
114
113
|
// name),但键序规则与 workspace 级完全相同。
|
|
115
114
|
version: { order: exports.VERSION_KEY_ORDER },
|
|
116
115
|
sdk: { order: exports.SDK_KEY_ORDER },
|
|
117
|
-
|
|
118
|
-
deploy: {
|
|
119
|
-
order: exports.DEPLOY_KEY_ORDER,
|
|
120
|
-
children: {
|
|
121
|
-
runtimeEnvFromEnv: { order: exports.ENV_REFERENCE_KEY_ORDER },
|
|
122
|
-
secretsFromEnv: { order: exports.ENV_REFERENCE_KEY_ORDER },
|
|
123
|
-
},
|
|
124
|
-
},
|
|
116
|
+
deploy: { order: exports.DEPLOY_KEY_ORDER },
|
|
125
117
|
offline: { order: exports.OFFLINE_KEY_ORDER },
|
|
126
118
|
},
|
|
127
119
|
},
|
|
@@ -141,14 +133,14 @@ exports.RETIRED_ROOT_KEYS = {
|
|
|
141
133
|
environment: 'is no longer part of the config: the SDK environment is a runtime argument of SuperSDK.init() ' +
|
|
142
134
|
'(omitting it means prod), so nothing at build time needs it — delete the key',
|
|
143
135
|
android: 'is no longer a root section: an Android app is one entry in "projects" with "type": "android" ' +
|
|
144
|
-
'(add it with `supercli add android <dir
|
|
136
|
+
'(add it with `supercli add android <dir>`), and its "name"/"package" live on that entry',
|
|
145
137
|
ios: 'is no longer a root section: an iOS app is one entry in "projects" with "type": "ios" ' +
|
|
146
|
-
'(add it with `supercli add ios <dir
|
|
138
|
+
'(add it with `supercli add ios <dir>`), and its "name"/"bundleId"/"spmMode" live on that entry',
|
|
147
139
|
web: 'is no longer a root section: a web project is one entry in "projects" with "type": "site" ' +
|
|
148
|
-
'(add it with `supercli add site <dir
|
|
149
|
-
'
|
|
140
|
+
'(add it with `supercli add site <dir>`); its offline host is filled in as "offline": { "host": … } ' +
|
|
141
|
+
'by the CLI after the first successful publish',
|
|
150
142
|
sites: 'is no longer a root section: publish targets live in the "deploy" array of the "type": "site" ' +
|
|
151
|
-
'project that owns them, and each entry
|
|
143
|
+
'project that owns them, and each entry keeps the very same {slug, name, env, dir} shape',
|
|
152
144
|
};
|
|
153
145
|
function hasOwn(value, key) {
|
|
154
146
|
return Object.prototype.hasOwnProperty.call(value, key);
|
|
@@ -289,8 +281,8 @@ function findDuplicateKey(raw) {
|
|
|
289
281
|
* - `name` 在 workspace 级是**纯描述、永不投影**;android/ios 的 `name` 才是真身份
|
|
290
282
|
* (App label / display name),必填且不继承;
|
|
291
283
|
* - `package` / `bundleId` / `slug` 是身份字段,永不继承、永不推导;
|
|
292
|
-
* - `deploy[]`
|
|
293
|
-
*
|
|
284
|
+
* - 站点项目的 `deploy[]` 由 `supercli publish-site` 首次发布后回填,`offline.host` 由服务端
|
|
285
|
+
* 返回的域名回填 —— CLI 绝不自己拼域名,所以骨架里两者都不预置。
|
|
294
286
|
*/
|
|
295
287
|
function appConfigSkeleton(spid = 'a1b2c3d4') {
|
|
296
288
|
return `{
|
|
@@ -299,7 +291,11 @@ function appConfigSkeleton(spid = 'a1b2c3d4') {
|
|
|
299
291
|
"name": "My Workspace",
|
|
300
292
|
"version": { "name": "1.0.0", "code": 1 },
|
|
301
293
|
"sdk": { "androidVersion": "1.0.0.54-SNAPSHOT" },
|
|
302
|
-
"projects": [
|
|
294
|
+
"projects": [
|
|
295
|
+
{ "type": "android", "dir": "apps/android", "name": "My App", "package": "com.acme.myapp" },
|
|
296
|
+
{ "type": "ios", "dir": "apps/ios", "name": "My App", "bundleId": "com.acme.myapp", "spmMode": "mock" },
|
|
297
|
+
{ "type": "site", "dir": "apps/web", "name": "My App Web" }
|
|
298
|
+
]
|
|
303
299
|
}`;
|
|
304
300
|
}
|
|
305
301
|
exports.APP_CONFIG_SKELETON = appConfigSkeleton();
|