@supersdk/supercli 0.3.2 → 0.3.3-staging.47
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/build/artifactIntegrity.js +275 -0
- package/dist/build/artifactIntegrity.js.map +1 -0
- package/dist/build/projectBuild.js +335 -0
- package/dist/build/projectBuild.js.map +1 -0
- package/dist/cli.js +20 -11
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +111 -57
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/analytics.js +15 -9
- package/dist/commands/analytics.js.map +1 -1
- package/dist/commands/build.js +533 -0
- package/dist/commands/build.js.map +1 -0
- package/dist/commands/db.js +24 -19
- package/dist/commands/db.js.map +1 -1
- package/dist/commands/deploy.js +434 -751
- 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 +31 -20
- package/dist/commands/image.js.map +1 -1
- package/dist/commands/init.js +81 -57
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/logs.js +16 -7
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/publishSite.js +28 -943
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/register.js +84 -218
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/settings.js +10 -6
- package/dist/commands/settings.js.map +1 -1
- package/dist/config/appConfig.js +48 -171
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/superConfig.js +457 -0
- package/dist/config/superConfig.js.map +1 -0
- package/dist/deploy/adapterTypes.js +3 -0
- package/dist/deploy/adapterTypes.js.map +1 -0
- package/dist/deploy/manifest.js +403 -0
- package/dist/deploy/manifest.js.map +1 -0
- package/dist/deploy/preflight.js +201 -0
- package/dist/deploy/preflight.js.map +1 -0
- package/dist/deploy/resultWriter.js +178 -0
- package/dist/deploy/resultWriter.js.map +1 -0
- package/dist/deploy/runAdapter.js +302 -0
- package/dist/deploy/runAdapter.js.map +1 -0
- package/dist/deploy/siteAdapter.js +182 -0
- package/dist/deploy/siteAdapter.js.map +1 -0
- package/dist/docker/dockerCli.js +110 -53
- package/dist/docker/dockerCli.js.map +1 -1
- package/dist/output/envelope.js +5 -1
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +3 -0
- 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/siteZip.js +4 -5
- package/dist/publish/siteZip.js.map +1 -1
- package/dist/template/README.md +26 -257
- 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 +13 -61
- package/dist/template/android/scripts/build.sh +11 -0
- package/dist/template/android/supersdk-default.config.json +3 -2
- package/dist/template/ios/Sources/App/AppDelegate.swift +1 -1
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +1 -1
- package/dist/template/ios/project.yml +1 -1
- package/dist/template/ios/scripts/build.sh +19 -0
- package/dist/template/ios/scripts/render_project.py +60 -0
- package/dist/template/ios/supersdk-default.config.json +6 -0
- package/dist/template/service/Dockerfile +2 -0
- package/dist/template/service/scripts/build.sh +11 -0
- package/dist/template/super.json +62 -0
- package/dist/template/template_manifest.json +6 -9
- package/dist/template/web/package.json +8 -0
- package/dist/template/web/scripts/build.sh +8 -0
- package/dist/template/web/scripts/web_package.py +490 -0
- package/dist/template/web/src/js/app.js +2 -2
- package/dist/util/shell.js +3 -3
- package/dist/workspace/config.js +69 -183
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +10 -18
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/projectContext.js +93 -0
- package/dist/workspace/projectContext.js.map +1 -0
- package/dist/workspace/projectIdentity.js +50 -98
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +208 -83
- package/dist/workspace/template.js.map +1 -1
- package/package.json +4 -2
- package/dist/publish/siteConfig.js +0 -649
- package/dist/publish/siteConfig.js.map +0 -1
- package/dist/template/scripts/android_snapshot_canary.py +0 -145
- package/dist/template/scripts/build_android.sh +0 -366
- package/dist/template/scripts/build_ios.sh +0 -299
- package/dist/template/scripts/build_site.sh +0 -43
- package/dist/template/scripts/lib/workspace.sh +0 -43
- package/dist/template/scripts/serve_web.py +0 -80
- package/dist/template/scripts/super_build_orchestrator.py +0 -421
- package/dist/template/scripts/supersdk_template.py +0 -1161
- package/dist/template/scripts/web_host_validator.py +0 -103
- package/dist/template/scripts/web_package.py +0 -295
- package/dist/template/scripts/ws03_shared_schema_merge_guard.py +0 -73
- package/dist/template/super_build.sh +0 -144
- package/dist/template/supersdk.json +0 -35
- package/dist/workspace/inspect.js +0 -274
- package/dist/workspace/inspect.js.map +0 -1
|
@@ -50,6 +50,7 @@ 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");
|
|
53
54
|
function storedToken(account) {
|
|
54
55
|
return (0, credentialStore_1.backendForAccount)(account.backend, {
|
|
55
56
|
passphraseProvider: account.backend === 'encrypted-file'
|
|
@@ -102,11 +103,14 @@ function resolveSettingsAuth(deps) {
|
|
|
102
103
|
return { token, apiOrigin: account.apiOrigin };
|
|
103
104
|
}
|
|
104
105
|
function scope(opts) {
|
|
105
|
-
const
|
|
106
|
+
const context = (0, projectContext_1.resolveWorkspaceContext)(process.cwd(), opts.config);
|
|
107
|
+
if (isCommandOutcome(context))
|
|
108
|
+
return context;
|
|
109
|
+
const spid = context.spid;
|
|
106
110
|
const env = value(opts.env);
|
|
107
111
|
if (!spid || !env)
|
|
108
|
-
return { ok: false, kind: 'usage_error', message: '--
|
|
109
|
-
return { spid, env };
|
|
112
|
+
return { ok: false, kind: 'usage_error', message: '--env is required and SPID is read from super.json' };
|
|
113
|
+
return { configPath: context.configPath, spid, env };
|
|
110
114
|
}
|
|
111
115
|
function nameOf(opts) {
|
|
112
116
|
const name = value(opts.name);
|
|
@@ -280,19 +284,19 @@ function registerSettingsCommand(program) {
|
|
|
280
284
|
const settings = program.command('settings').description('Read or publish scoped Settings through the CLI-only Console API.');
|
|
281
285
|
addLeafOutputOptions(settings.command('list')
|
|
282
286
|
.description('List Settings summaries in one project environment.')
|
|
283
|
-
.
|
|
287
|
+
.option('--config <path>', 'explicit super.json path')
|
|
284
288
|
.requiredOption('--env <env>', 'project environment')
|
|
285
289
|
.action(async (opts, cmd) => emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsList(opts))));
|
|
286
290
|
addLeafOutputOptions(settings.command('get <name>')
|
|
287
291
|
.description('Read one Setting, including its original JavaScript content.')
|
|
288
|
-
.
|
|
292
|
+
.option('--config <path>', 'explicit super.json path')
|
|
289
293
|
.requiredOption('--env <env>', 'project environment')
|
|
290
294
|
.action(async (name, opts, cmd) => {
|
|
291
295
|
emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsGet({ ...opts, name }));
|
|
292
296
|
}));
|
|
293
297
|
addLeafOutputOptions(settings.command('set <name>')
|
|
294
298
|
.description('Create or update one Setting. Choose exactly one of --content or --file; direct content may be recorded in shell history.')
|
|
295
|
-
.
|
|
299
|
+
.option('--config <path>', 'explicit super.json path')
|
|
296
300
|
.requiredOption('--env <env>', 'project environment')
|
|
297
301
|
.option('--content <js>', 'direct JavaScript content (may be recorded in shell history)')
|
|
298
302
|
.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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoFA,4CAEC;AAED,kDAmBC;AAkBD,sDAiBC;AA4DD,0CAcC;AAED,wCAgBC;AAED,wCAkCC;AAgBD,0DAiCC;AA/TD,4CAA8B;AAE9B,0DAM+B;AAE/B,iDAAoD;AACpD,yDAA0D;AAC1D,2DAA8F;AAC9F,wDAAqG;AACrG,8DAA6D;AAC7D,qCAAkC;AAClC,2CAAkD;AAClD,gEAA2F;AAoC3F,SAAS,WAAW,CAAC,OAAsB;IACzC,OAAO,IAAA,mCAAiB,EAAC,OAAO,CAAC,OAAO,EAAE;QACxC,kBAAkB,EAAE,OAAO,CAAC,OAAO,KAAK,gBAAgB;YACtD,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,yBAAgB,EAAC,6BAA6B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;YAC9F,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC;AAC5C,CAAC;AAEY,QAAA,mBAAmB,GAAiB;IAC/C,iBAAiB,EAAjB,gCAAiB;IACjB,cAAc,EAAE,WAAW;IAC3B,cAAc,EAAE,oCAAqB;IACrC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,+BAAc,CAAC,SAAS,CAAC;IAC1D,4EAA4E;IAC5E,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,wBAAwB,GAAG;IAC/B,oBAAoB;IACpB,2BAA2B;IAC3B,gBAAgB;IAChB,sBAAsB;IACtB,uBAAuB;IACvB,0BAA0B;CAClB,CAAC;AAEX,SAAS,KAAK,CAAC,IAAwB;IACrC,MAAM,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED,SAAgB,gBAAgB,CAAC,YAAqB;IACpD,OAAO,YAAY,KAAK,IAAI,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,IAAI,YAAY,CAAC;AAC3F,CAAC;AAED,SAAgB,mBAAmB,CAAC,IAAkB;IACpD,MAAM,QAAQ,GAAG,IAAA,2BAAe,GAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAA,+BAAgB,GAAE,CAAC,SAAS,EAAE,CAAC;IAElF,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,4EAA4E,EAAE,CAAC;IACnI,CAAC;IACD,IAAI,KAAoB,CAAC;IACzB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,uFAAuF,EAAE,CAAC;IAC9I,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,sFAAsF,EAAE,CAAC;IAC7I,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,KAAK,CAAC,IAA0B;IACvC,MAAM,OAAO,GAAG,IAAA,wCAAuB,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpE,IAAI,gBAAgB,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oDAAoD,EAAE,CAAC;IAC5H,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,MAAM,CAAC,IAAwB;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC;IAC9F,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iFAAiF;AACjF,SAAgB,qBAAqB,CACnC,IAAkD,EAClD,IAAoC;IAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IACxC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oEAAoE,EAAE,CAAC;IAC3H,CAAC;IACD,IAAI,UAAU;QAAE,OAAO,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,IAAI,CAAC;QACH,4EAA4E;QAC5E,8DAA8D;QAC9D,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,2FAA2F,EAAE,CAAC;IAClJ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAI,OAAyB;IACnD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gBAAgB;YACnB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAE,OAAO,CAAC,IAAI;gBACxB,sEAAsE;gBACtE,kEAAkE;gBAClE,6CAA6C;gBAC7C,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,kCAAkC,OAAO,CAAC,IAAI,GAAG;aAC9E,CAAC;QACJ,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,uFAAuF,EAAE,CAAC;QAC/I,KAAK,WAAW;YACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,yEAAyE,EAAE,CAAC;QAC9H,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC;QACzG,KAAK,aAAa;YAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,+EAA+E,EAAE,CAAC;QACtI,KAAK,SAAS;YACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC7F,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAqB;IAC3C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB;IACzC,OAAO;QACL,GAAG,cAAc,CAAC,KAAK,CAAC;QACxB,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB;IAC3C,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KAC/C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,IAA0B,EAAE,OAAqB,2BAAmB;IACxG,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5F,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;IACzE,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,qBAAqB,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;KAC5D,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAwB,EAAE,OAAqB,2BAAmB;IACrG,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjG,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IACnE,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,qBAAqB,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAwB,EAAE,OAAqB,2BAAmB;IACrG,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,gBAAgB,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1G,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG;QACb,GAAG,MAAM;QACT,IAAI;QACJ,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;SACjD;QACD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC;IACF,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,sEAAsE;QACtE,2EAA2E;QAC3E,qBAAqB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KACpD,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,OAAQ,GAAG,CAAC,eAAe,EAAE,EAA0B,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAChG,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,OAAO,OAAO;SACX,MAAM,CAAC,iBAAiB,EAAE,wEAAwE,CAAC;SACnG,MAAM,CAAC,YAAY,EAAE,0EAA0E,CAAC,CAAC;AACtG,CAAC;AAED,SAAS,IAAI,CAAC,OAAsB,EAAE,OAAuB;IAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAgB;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,mEAAmE,CAAC,CAAC;IAC9H,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;SACrB,WAAW,CAAC,qDAAqD,CAAC;SAClE,MAAM,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;SACrD,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,IAA0B,EAAE,GAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CACvI,CAAC;IACF,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;SAC3B,WAAW,CAAC,8DAA8D,CAAC;SAC3E,MAAM,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;SACrD,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAA0B,EAAE,GAAY,EAAE,EAAE;QACvE,IAAI,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,cAAc,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC,CAAC,CACL,CAAC;IACF,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;SAC3B,WAAW,CAAC,2HAA2H,CAAC;SACxI,MAAM,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;SACrD,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,gBAAgB,EAAE,8DAA8D,CAAC;SACxF,MAAM,CAAC,eAAe,EAAE,2CAA2C,CAAC;SACpE,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAAwB,EAAE,GAAY,EAAE,EAAE;QACrE,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACnD,SAAG,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;QAC3H,CAAC;QACD,IAAI,CAAC,IAAI,6BAAa,CAAC,IAAI,CAAC,EAAE,MAAM,cAAc,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}
|
package/dist/config/appConfig.js
CHANGED
|
@@ -1,221 +1,117 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.APP_CONFIG_SKELETON = exports.
|
|
4
|
-
exports.engineMigrateCommand = engineMigrateCommand;
|
|
3
|
+
exports.APP_CONFIG_SKELETON = exports.APP_CONFIG_KEY_ORDER = exports.ENV_REFERENCE_KEY_ORDER = exports.OFFLINE_KEY_ORDER = exports.VERSION_KEY_ORDER = exports.DEPLOY_KEY_ORDER = exports.ARTIFACT_KEY_ORDER = exports.BUILD_KEY_ORDER = exports.PROJECT_KEY_ORDER = exports.ROOT_KEY_ORDER = exports.APP_CONFIG_SCHEMA_VERSION = exports.APP_CONFIG_FILENAME = void 0;
|
|
5
4
|
exports.hasOwn = hasOwn;
|
|
6
5
|
exports.orderRootKeys = orderRootKeys;
|
|
7
6
|
exports.serializeAppConfig = serializeAppConfig;
|
|
8
7
|
exports.findDuplicateKey = findDuplicateKey;
|
|
9
8
|
exports.appConfigSkeleton = appConfigSkeleton;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
// 都要读写同一个文件。两边各写一份常量时,「今天碰巧一致」不构成任何保证 —— 一旦哪边先
|
|
14
|
-
// 改了键序或 schemaVersion,另一边就会把同一份文档写成另一种字节形态,git diff 里出现整
|
|
15
|
-
// 文件重排,甚至一边认为合法另一边 fail-closed。
|
|
16
|
-
//
|
|
17
|
-
// 权威规则本身在 Python 侧(supersimples/app_repo_example/scripts/supersdk_template.py):
|
|
18
|
-
// CONFIG_FILENAME / CONFIG_SCHEMA_VERSION / LEGACY_CONFIG_FILENAMES / RETIRED_ROOT_KEYS /
|
|
19
|
-
// reject_duplicate_keys。本模块是它在 TypeScript 侧的镜像,改动一律以 Python 为准。
|
|
20
|
-
//
|
|
21
|
-
// ---------------------------------------------------------------------------
|
|
22
|
-
// schemaVersion 3:工作空间模型
|
|
23
|
-
// ---------------------------------------------------------------------------
|
|
24
|
-
// 一个 workspace = 一个 spid,`supersdk.json` 所在目录就是工作空间根。App 与站点都是
|
|
25
|
-
// `projects[]` 里的一条,靠 `type` 区分(首批 android / ios / site,`type` 是预留字段,
|
|
26
|
-
// 加新类型不需要改 schema)。
|
|
27
|
-
//
|
|
28
|
-
// 🔴 environment 不再是配置字段。已核实 SDK 签名 `SuperSDK.init(context, spid, provider)`
|
|
29
|
-
// 与 `init(context, spid, environment, provider)`,CHANGELOG 写明「省略环境时默认为 prod」
|
|
30
|
-
// —— 环境是**运行时 init 参数**,编译期不需要。一条规则贯穿三层:
|
|
31
|
-
// 配置说「这是什么」· 发布说「发到哪儿」(publish-site --env)· 运行时说「连哪个环境」。
|
|
32
|
-
//
|
|
33
|
-
// v2 → v3 是破坏性变更,**不做向后兼容**:读到 schemaVersion 2 一律 fail-closed,由调用方
|
|
34
|
-
// 给出可照抄执行的迁移路径(配置那半边给命令,引擎那半边跑 supersdk_template.py migrate)。
|
|
35
|
-
const shell_1 = require("../util/shell");
|
|
36
|
-
exports.APP_CONFIG_FILENAME = 'supersdk.json';
|
|
37
|
-
exports.APP_CONFIG_SCHEMA_VERSION = 3;
|
|
38
|
-
/**
|
|
39
|
-
* vendored 引擎脚本在工作空间里的相对路径(`init` / `add` 的 ensureWorkspaceShared 会把
|
|
40
|
-
* `scripts/` 整个铺进工作空间)。
|
|
41
|
-
*/
|
|
42
|
-
exports.ENGINE_SCRIPT_RELPATH = 'scripts/supersdk_template.py';
|
|
43
|
-
/**
|
|
44
|
-
* v2 → v3 迁移命令的**唯一权威形式**。
|
|
45
|
-
*
|
|
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 真的把它跑一遍。
|
|
51
|
-
*
|
|
52
|
-
* 只回「命令本身」,不带 `cd`:调用方决定是先 cd 过去(提示里更短),还是直接给绝对路径。
|
|
53
|
-
*/
|
|
54
|
-
function engineMigrateCommand(configFilename = exports.APP_CONFIG_FILENAME) {
|
|
55
|
-
return `python3 ${exports.ENGINE_SCRIPT_RELPATH} migrate --config ${(0, shell_1.shellQuote)(configFilename)}`;
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* 已退役的配置文件名,与 supersdk_template.py 的 LEGACY_CONFIG_FILENAMES **逐字一致**。
|
|
59
|
-
* 三端(Python / 工作空间命令 / publish-site)必须认同一套:任何一端漏认一个文件名,就会
|
|
60
|
-
* 出现「这一端生成/发布成功、另一端立刻 fail-closed」的撕裂。
|
|
61
|
-
*
|
|
62
|
-
* - supersdk.yaml / supersdk.yml:schema_version: 1 的受限 YAML 方言,位于仓库根
|
|
63
|
-
* - super-site.yml:手写行解析器时代的站点绑定,位于发布目录内
|
|
64
|
-
*/
|
|
65
|
-
exports.LEGACY_APP_CONFIG_FILENAMES = ['supersdk.yaml', 'supersdk.yml', 'super-site.yml'];
|
|
66
|
-
/** 固定根键序。未知键按原有相对顺序追加在末尾(未知键必须原样保留,见 orderRootKeys)。 */
|
|
9
|
+
/** Canonical `super.json` schema-v5 constants and serializer. */
|
|
10
|
+
exports.APP_CONFIG_FILENAME = 'super.json';
|
|
11
|
+
exports.APP_CONFIG_SCHEMA_VERSION = 5;
|
|
67
12
|
exports.ROOT_KEY_ORDER = [
|
|
68
13
|
'schemaVersion',
|
|
69
14
|
'spid',
|
|
70
15
|
'orgId',
|
|
71
16
|
'name',
|
|
72
17
|
'version',
|
|
73
|
-
'sdk',
|
|
74
18
|
'projects',
|
|
75
19
|
];
|
|
76
|
-
/**
|
|
77
|
-
* `projects[]` 单条的固定键序:先身份(type/dir/name),再平台身份字段,再站点侧的
|
|
78
|
-
* deploy/offline,最后是可覆盖的默认值(version/sdk)。
|
|
79
|
-
*
|
|
80
|
-
* 🔴 顺序**逐字抄自** supersdk_template.py 的 PROJECT_KEY_ORDER,不是自己排的 —— 两边写出
|
|
81
|
-
* 的字节形态必须一致,否则同一份文档被两个写者轮流写过之后,git diff 里会出现整块重排。
|
|
82
|
-
* 这里曾经把 version/sdk 排在 deploy/offline 之前,与 Python 侧不一致;这类漂移单靠注释拦
|
|
83
|
-
* 不住,所以 test/integration/engine-config-parity.test.ts 会把 Python 的元组读出来逐项比对。
|
|
84
|
-
*
|
|
85
|
-
* 🔴 `spmMode` 平铺在 ios 条目上、**不进 sdk**:build_ios.sh 读的是 platform_config.spmMode。
|
|
86
|
-
*/
|
|
87
20
|
exports.PROJECT_KEY_ORDER = [
|
|
21
|
+
'projectId',
|
|
88
22
|
'type',
|
|
89
23
|
'dir',
|
|
90
24
|
'name',
|
|
91
25
|
'package',
|
|
92
26
|
'bundleId',
|
|
93
27
|
'spmMode',
|
|
28
|
+
'build',
|
|
94
29
|
'deploy',
|
|
95
30
|
'offline',
|
|
96
31
|
'version',
|
|
97
|
-
'sdk',
|
|
98
32
|
];
|
|
99
|
-
|
|
100
|
-
exports.
|
|
33
|
+
exports.BUILD_KEY_ORDER = ['entry', 'args', 'artifacts'];
|
|
34
|
+
exports.ARTIFACT_KEY_ORDER = ['id', 'kind', 'path'];
|
|
35
|
+
exports.DEPLOY_KEY_ORDER = [
|
|
36
|
+
'envTarget',
|
|
37
|
+
'slug',
|
|
38
|
+
'name',
|
|
39
|
+
'env',
|
|
40
|
+
'port',
|
|
41
|
+
'cpuMilli',
|
|
42
|
+
'memoryMiB',
|
|
43
|
+
'maxScale',
|
|
44
|
+
'databaseConnection',
|
|
45
|
+
'runtimeEnvFromEnv',
|
|
46
|
+
'secretsFromEnv',
|
|
47
|
+
];
|
|
101
48
|
exports.VERSION_KEY_ORDER = ['name', 'code'];
|
|
102
|
-
exports.SDK_KEY_ORDER = ['androidVersion', 'iosPackageUrl', 'iosVersion'];
|
|
103
49
|
exports.OFFLINE_KEY_ORDER = ['host'];
|
|
50
|
+
exports.ENV_REFERENCE_KEY_ORDER = ['name', 'sourceEnv'];
|
|
104
51
|
exports.APP_CONFIG_KEY_ORDER = {
|
|
105
52
|
order: exports.ROOT_KEY_ORDER,
|
|
106
53
|
children: {
|
|
107
54
|
version: { order: exports.VERSION_KEY_ORDER },
|
|
108
|
-
sdk: { order: exports.SDK_KEY_ORDER },
|
|
109
55
|
projects: {
|
|
110
56
|
order: exports.PROJECT_KEY_ORDER,
|
|
111
57
|
children: {
|
|
112
|
-
// 项目级 version/sdk 是**整值替换**的覆盖(浅合并会让 {"version":{"code":2}} 丢掉
|
|
113
|
-
// name),但键序规则与 workspace 级完全相同。
|
|
114
58
|
version: { order: exports.VERSION_KEY_ORDER },
|
|
115
|
-
|
|
116
|
-
|
|
59
|
+
build: {
|
|
60
|
+
order: exports.BUILD_KEY_ORDER,
|
|
61
|
+
children: { artifacts: { order: exports.ARTIFACT_KEY_ORDER } },
|
|
62
|
+
},
|
|
63
|
+
deploy: {
|
|
64
|
+
order: exports.DEPLOY_KEY_ORDER,
|
|
65
|
+
children: {
|
|
66
|
+
runtimeEnvFromEnv: { order: exports.ENV_REFERENCE_KEY_ORDER },
|
|
67
|
+
secretsFromEnv: { order: exports.ENV_REFERENCE_KEY_ORDER },
|
|
68
|
+
},
|
|
69
|
+
},
|
|
117
70
|
offline: { order: exports.OFFLINE_KEY_ORDER },
|
|
118
71
|
},
|
|
119
72
|
},
|
|
120
73
|
},
|
|
121
74
|
};
|
|
122
|
-
/**
|
|
123
|
-
* 镜像 supersdk_template.py 的 RETIRED_ROOT_KEYS:给定向诊断,而不是当作「未知键」带过去。
|
|
124
|
-
*
|
|
125
|
-
* 🔴 v3 把 android/ios/web/sites/environment 全部从根上移走了。这些键留在一份
|
|
126
|
-
* `"schemaVersion": 3` 的文档里是**最危险的一种状态** —— 手工迁移的人只改了版本号,
|
|
127
|
-
* 而读侧「未知键原样保留」的纪律会让它们安静地躺着不起作用:App 拿模板自带的包名照常构建、
|
|
128
|
-
* 站点绑定不再被比对,全程零告警。所以它们必须是硬失败 + 指名道姓的迁移指引。
|
|
129
|
-
*/
|
|
130
|
-
exports.RETIRED_ROOT_KEYS = {
|
|
131
|
-
schema_version: `is a retired schema v1 key; use camelCase "schemaVersion": ${exports.APP_CONFIG_SCHEMA_VERSION}`,
|
|
132
|
-
app_id: 'is a retired key; rename it to "spid"',
|
|
133
|
-
environment: 'is no longer part of the config: the SDK environment is a runtime argument of SuperSDK.init() ' +
|
|
134
|
-
'(omitting it means prod), so nothing at build time needs it — delete the key',
|
|
135
|
-
android: 'is no longer a root section: an Android app is one entry in "projects" with "type": "android" ' +
|
|
136
|
-
'(add it with `supercli add android <dir>`), and its "name"/"package" live on that entry',
|
|
137
|
-
ios: 'is no longer a root section: an iOS app is one entry in "projects" with "type": "ios" ' +
|
|
138
|
-
'(add it with `supercli add ios <dir>`), and its "name"/"bundleId"/"spmMode" live on that entry',
|
|
139
|
-
web: 'is no longer a root section: a web project is one entry in "projects" with "type": "site" ' +
|
|
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',
|
|
142
|
-
sites: 'is no longer a root section: publish targets live in the "deploy" array of the "type": "site" ' +
|
|
143
|
-
'project that owns them, and each entry keeps the very same {slug, name, env, dir} shape',
|
|
144
|
-
};
|
|
145
75
|
function hasOwn(value, key) {
|
|
146
76
|
return Object.prototype.hasOwnProperty.call(value, key);
|
|
147
77
|
}
|
|
148
|
-
/**
|
|
149
|
-
* 只按 order 排键,未知键原序追加。
|
|
150
|
-
*
|
|
151
|
-
* 累加器用 `Object.create(null)`:`JSON.parse('{"__proto__":1}')` 会产生一个**自有**
|
|
152
|
-
* `__proto__` 属性,写进普通 `{}` 会走 [[Set]] 触发原型 setter 而被静默丢弃 —— 那就违反了
|
|
153
|
-
* 「未知键必须原样保留」。
|
|
154
|
-
*/
|
|
155
78
|
function orderRootKeys(document, order = exports.ROOT_KEY_ORDER) {
|
|
156
79
|
const ordered = Object.create(null);
|
|
157
|
-
for (const key of order)
|
|
80
|
+
for (const key of order)
|
|
158
81
|
if (hasOwn(document, key))
|
|
159
82
|
ordered[key] = document[key];
|
|
160
|
-
|
|
161
|
-
for (const key of Object.keys(document)) {
|
|
83
|
+
for (const key of Object.keys(document))
|
|
162
84
|
if (!order.includes(key))
|
|
163
85
|
ordered[key] = document[key];
|
|
164
|
-
}
|
|
165
86
|
return ordered;
|
|
166
87
|
}
|
|
167
88
|
function isPlainObject(value) {
|
|
168
89
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
169
90
|
}
|
|
170
|
-
/**
|
|
171
|
-
* 按规则树递归重排。输入永不被修改(全部新建对象/数组)—— 调用方拿到的还是同一批值引用,
|
|
172
|
-
* 未知键、未知类型的值原样带过去。
|
|
173
|
-
*
|
|
174
|
-
* `children` 必须用 hasOwn 取:裸 `children[key]` 在键名叫 `constructor` / `toString` 时会
|
|
175
|
-
* 取到 Object.prototype 上的函数,随后 `for (const k of node.order)` 直接抛
|
|
176
|
-
* `TypeError: order is not iterable`。
|
|
177
|
-
*/
|
|
178
91
|
function orderByNode(document, node) {
|
|
179
92
|
const ordered = orderRootKeys(document, node.order);
|
|
180
|
-
|
|
181
|
-
if (!children)
|
|
93
|
+
if (!node.children)
|
|
182
94
|
return ordered;
|
|
183
95
|
const out = Object.create(null);
|
|
184
96
|
for (const key of Object.keys(ordered)) {
|
|
185
97
|
const value = ordered[key];
|
|
186
|
-
const child = hasOwn(children, key) ? children[key] : undefined;
|
|
187
|
-
if (!child)
|
|
98
|
+
const child = hasOwn(node.children, key) ? node.children[key] : undefined;
|
|
99
|
+
if (!child)
|
|
188
100
|
out[key] = value;
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
out[key] = value.map((item) => (isPlainObject(item) ? orderByNode(item, child) : item));
|
|
193
|
-
}
|
|
194
|
-
else if (isPlainObject(value)) {
|
|
101
|
+
else if (Array.isArray(value))
|
|
102
|
+
out[key] = value.map((item) => isPlainObject(item) ? orderByNode(item, child) : item);
|
|
103
|
+
else if (isPlainObject(value))
|
|
195
104
|
out[key] = orderByNode(value, child);
|
|
196
|
-
|
|
197
|
-
else {
|
|
105
|
+
else
|
|
198
106
|
out[key] = value;
|
|
199
|
-
}
|
|
200
107
|
}
|
|
201
108
|
return out;
|
|
202
109
|
}
|
|
203
|
-
/**
|
|
204
|
-
* 固定键序(根 + 项目 + 站点绑定)、2 空格缩进、结尾换行 —— 让 git diff 里只出现真实变更。
|
|
205
|
-
*/
|
|
110
|
+
/** Fixed key order, two-space indentation and a trailing newline. */
|
|
206
111
|
function serializeAppConfig(document) {
|
|
207
112
|
return `${JSON.stringify(orderByNode(document, exports.APP_CONFIG_KEY_ORDER), null, 2)}\n`;
|
|
208
113
|
}
|
|
209
|
-
/**
|
|
210
|
-
* 在**已经通过 JSON.parse 的文本**上扫描重复键,返回第一个重复的键名。
|
|
211
|
-
*
|
|
212
|
-
* 🔴 权威侧 supersdk_template.py 用 `object_pairs_hook=reject_duplicate_keys` 对重复键硬失败。
|
|
213
|
-
* `JSON.parse` 则静默取最后一个 —— 若两边不一致,CLI 会把一份 Python 认定非法的文件「洗」成
|
|
214
|
-
* 合法文件并丢掉数据。这里只做检测,不做解析,所以可以假定输入是合法 JSON。
|
|
215
|
-
*
|
|
216
|
-
* 🔴 它对**数组里的对象**同样照查不误(`projects[]` / `deploy[]` 每一条都是独立作用域)——
|
|
217
|
-
* v3 把大量内容挪进了数组,这条能力从「顺带」变成了刚需,重构时不要顺手优化掉。
|
|
218
|
-
*/
|
|
114
|
+
/** Return the first duplicate object key in already-valid JSON source. */
|
|
219
115
|
function findDuplicateKey(raw) {
|
|
220
116
|
const stack = [];
|
|
221
117
|
let i = 0;
|
|
@@ -239,7 +135,6 @@ function findDuplicateKey(raw) {
|
|
|
239
135
|
if (top && top.expectKey) {
|
|
240
136
|
let key;
|
|
241
137
|
try {
|
|
242
|
-
// 用 JSON.parse 还原转义,"a" 与 "a" 对 JSON.parse 是同一个键。
|
|
243
138
|
key = JSON.parse(raw.slice(start, i));
|
|
244
139
|
}
|
|
245
140
|
catch {
|
|
@@ -251,15 +146,12 @@ function findDuplicateKey(raw) {
|
|
|
251
146
|
}
|
|
252
147
|
continue;
|
|
253
148
|
}
|
|
254
|
-
if (ch === '{')
|
|
149
|
+
if (ch === '{')
|
|
255
150
|
stack.push({ keys: new Set(), expectKey: true });
|
|
256
|
-
|
|
257
|
-
else if (ch === '[') {
|
|
151
|
+
else if (ch === '[')
|
|
258
152
|
stack.push(null);
|
|
259
|
-
}
|
|
260
|
-
else if (ch === '}' || ch === ']') {
|
|
153
|
+
else if (ch === '}' || ch === ']')
|
|
261
154
|
stack.pop();
|
|
262
|
-
}
|
|
263
155
|
else if (ch === ',') {
|
|
264
156
|
const top = stack[stack.length - 1];
|
|
265
157
|
if (top)
|
|
@@ -274,28 +166,13 @@ function findDuplicateKey(raw) {
|
|
|
274
166
|
}
|
|
275
167
|
return undefined;
|
|
276
168
|
}
|
|
277
|
-
/**
|
|
278
|
-
* 可照抄落盘的完整骨架:workspace 身份 + 三种首批项目各一条。
|
|
279
|
-
*
|
|
280
|
-
* 少一个字段的迁移提示对照抄的人就是死路 —— 本仓刚因为同类问题修过一次。所以这里要能自证:
|
|
281
|
-
* - `name` 在 workspace 级是**纯描述、永不投影**;android/ios 的 `name` 才是真身份
|
|
282
|
-
* (App label / display name),必填且不继承;
|
|
283
|
-
* - `package` / `bundleId` / `slug` 是身份字段,永不继承、永不推导;
|
|
284
|
-
* - 站点项目的 `deploy[]` 由 `supercli publish-site` 首次发布后回填,`offline.host` 由服务端
|
|
285
|
-
* 返回的域名回填 —— CLI 绝不自己拼域名,所以骨架里两者都不预置。
|
|
286
|
-
*/
|
|
287
169
|
function appConfigSkeleton(spid = 'a1b2c3d4') {
|
|
288
170
|
return `{
|
|
289
171
|
"schemaVersion": ${exports.APP_CONFIG_SCHEMA_VERSION},
|
|
290
172
|
"spid": ${JSON.stringify(spid)},
|
|
291
173
|
"name": "My Workspace",
|
|
292
174
|
"version": { "name": "1.0.0", "code": 1 },
|
|
293
|
-
"
|
|
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
|
-
]
|
|
175
|
+
"projects": []
|
|
299
176
|
}`;
|
|
300
177
|
}
|
|
301
178
|
exports.APP_CONFIG_SKELETON = appConfigSkeleton();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/config/appConfig.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/config/appConfig.ts"],"names":[],"mappings":"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"}
|