@supersdk/supercli 0.3.2 → 0.3.3
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 +119 -0
- package/dist/build/artifactIntegrity.js.map +1 -0
- package/dist/cli.js +22 -11
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.js +79 -31
- 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 +231 -0
- package/dist/commands/build.js.map +1 -0
- package/dist/commands/config.js +170 -0
- package/dist/commands/config.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 +68 -37
- 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 +51 -30
- 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 +40 -36
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/superConfig.js +429 -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 +381 -0
- package/dist/deploy/manifest.js.map +1 -0
- package/dist/deploy/preflight.js +202 -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 +299 -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 +63 -1
- 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 +64 -227
- 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 +6 -5
- 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/scripts/build_android.sh +26 -10
- package/dist/template/scripts/build_ios.sh +41 -9
- package/dist/template/scripts/build_service.sh +89 -0
- package/dist/template/scripts/build_site.sh +40 -26
- package/dist/template/scripts/lib/workspace.sh +4 -4
- package/dist/template/scripts/serve_web.py +2 -4
- package/dist/template/scripts/super_build_orchestrator.py +278 -355
- package/dist/template/scripts/supersdk_template.py +414 -181
- package/dist/template/scripts/web_package.py +9 -8
- package/dist/template/service/Dockerfile +2 -0
- package/dist/template/{supersdk.json → super.json} +20 -1
- package/dist/template/super_build.sh +39 -113
- package/dist/template/template_manifest.json +5 -4
- package/dist/workspace/config.js +81 -119
- package/dist/workspace/config.js.map +1 -1
- package/dist/workspace/identity.js +15 -14
- package/dist/workspace/identity.js.map +1 -1
- package/dist/workspace/inspect.js +1 -0
- package/dist/workspace/inspect.js.map +1 -1
- package/dist/workspace/projectContext.js +93 -0
- package/dist/workspace/projectContext.js.map +1 -0
- package/dist/workspace/projectIdentity.js +53 -96
- package/dist/workspace/projectIdentity.js.map +1 -1
- package/dist/workspace/template.js +5 -8
- package/dist/workspace/template.js.map +1 -1
- package/package.json +2 -2
- package/dist/publish/siteConfig.js +0 -649
- package/dist/publish/siteConfig.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/workspace/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/workspace/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsEA,0CAUC;AAGD,8BAIC;AAGD,oCAEC;AAGD,0CAEC;AAGD,wCAIC;AA4BD,sDAGC;AAQD,sCA6BC;AAUD,8CAMC;AAGD,wCAMC;AAoDD,sDAwBC;AAUD,sCA4BC;AAgBD,wDAsBC;AAgBD,wDAqCC;AAlZD,+DAA+D;AAC/D,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,uDAAuD;AACvD,+DAA+D;AAC/D,EAAE;AACF,mBAAmB;AACnB,0DAA0D;AAC1D,gCAAgC;AAChC,2DAA2D;AAC3D,4CAA8B;AAC9B,gDAAkC;AAClC,6CAAyC;AACzC,mDAQ6B;AAC7B,uDAO+B;AAC/B,+CAAwE;AACxE,yCAA2C;AAE9B,QAAA,eAAe,GAAG,+BAAmB,CAAC;AACtC,QAAA,cAAc,GAAG,qCAAyB,CAAC;AAyBxD,MAAa,oBAAqB,SAAQ,KAAK;CAAG;AAAlD,oDAAkD;AAElD,8EAA8E;AAC9E,mBAAmB;AACnB,8EAA8E;AAE9E;;;GAGG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,UAAU,GAAG,IAAA,iCAAmB,EAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO;YACL,KAAK,EACH,uFAAuF;gBACvF,gEAAgE;SACnE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;AAC7B,CAAC;AAED,mDAAmD;AACnD,SAAgB,SAAS,CAAC,CAAS,EAAE,CAAS;IAC5C,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,CAAC,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAC3B,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,4BAA4B;AAC5B,SAAgB,YAAY,CAAC,CAAS,EAAE,CAAS;IAC/C,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,4BAA4B;AAC5B,SAAgB,eAAe,CAAC,QAAiC,EAAE,GAAW;IAC5E,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,wEAAwE;AACxE,SAAgB,cAAc,CAAC,IAAY,EAAE,MAAc;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC;IAChC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,8EAA8E;AAC9E,IAAI;AACJ,8EAA8E;AAE9E,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED;;;GAGG;AACH,SAAS,UAAU,CAAC,QAAoB;IACtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,QAAqB,EAAE,CAAC;QAClD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAAE,SAAS;QACnC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;YAAE,SAAS;QAC5E,MAAM,UAAU,GAAG,IAAA,iCAAmB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,UAAU,KAAK,SAAS;YAAE,SAAS;QACvC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,iEAAiE;AACjE,SAAgB,qBAAqB,CAAC,MAAwB,EAAE,QAAgB;IAC9E,KAAK,QAAQ,CAAC;IACd,OAAO,IAAA,2BAAa,EAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAID;;;GAGG;AACH,SAAgB,aAAa,CAAC,QAAgB,EAAE,YAAqB;IACnE,MAAM,KAAK,GAAG,IAAA,6BAAe,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACpD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,eAAe,uBAAe,EAAE,EAAE,CAAC;IACjF,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;IACrC,IAAI,QAAoB,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,uCAAuC,EAAE,CAAC;QACpH,QAAQ,GAAG,MAAM,CAAC;IACpB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,oBAAqB,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC;IAC/F,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI;QACV,SAAS,EAAE;YACT,UAAU;YACV,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9B,QAAQ;YACR,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YACvB,GAAG,CAAC,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;YAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB;KACF,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,IAAI;AACJ,8EAA8E;AAE9E;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,UAAkB;IAClD,IAAI,CAAC;QACH,OAAO,IAAA,8BAAgB,EAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;IAC5F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,4BAA4B;AAC5B,SAAgB,cAAc,CAAC,GAAW;IACxC,KAAK,MAAM,IAAI,IAAI,uCAA2B,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;IACjD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,kDAAkD;AAClD,SAAS,WAAW,CAAC,UAAkB;IACrC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB,EAAE,OAAe;IAC5D,IAAI,IAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,SAAS,CAAC;IACnB,CAAC;IACD,IAAA,8BAAmB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACvC,kEAAkE;IAClE,4BAA4B;IAC5B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,0BAA0B;QAC5B,CAAC;IACH,CAAC;AACH,CAAC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,UAAkB,EAAE,QAAoB;IACjE,MAAM,UAAU,GAAG,IAAA,8BAAkB,EAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAA,8BAAgB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC1D,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC7E,MAAM,IAAI,oBAAoB,CAAC,gCAAgC,uBAAe,KAAK,MAAM,EAAE,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAOD,SAAS,cAAc,CAAC,SAAiB;IACvC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO;IACzC,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,CAAC;QAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAAC,CAAC;YAAS,CAAC;QAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAAC,CAAC;AACzD,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,QAAoB,EAAE,QAAoC,EAAE;IACpH,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3C,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,OAAO,CAAC,GAAG,IAAI,IAAA,wBAAU,GAAE,MAAM,CAAC,CAAC;IACpH,IAAI,EAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjB,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACjB,EAAE,GAAG,SAAS,CAAC;QACf,KAAK,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC;QACrC,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QACvC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC7B,cAAc,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;YAAS,CAAC;QACT,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC;gBAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,yCAAyC,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC;YAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAAC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACnD,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC,CAAC,oCAAoC,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,aAAa,CAAC,UAAkB,EAAE,KAAmB;IACnE,MAAM,OAAO,GAAG,IAAA,0BAAe,EAAC,WAAW,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,uBAAe,EAAE,CAAC,CAAC;IACrF,IAAI,CAAC;QACH,2BAA2B;QAC3B,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,IAAA,8BAAgB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAClD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACjE,MAAM,IAAI,oBAAoB,CAAC,oCAAoC,uBAAe,KAAK,MAAM,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAe,CAAC;QAElD,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,oBAAoB,CAC5B,yBAAyB,KAAK,CAAC,GAAG,UAAU,QAAQ,CAAC,IAAI,gBAAgB,QAAQ,CAAC,GAAG,YAAY;gBAC/F,iFAAiF,CACpF,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,IAAA,kBAAM,EAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAI,QAAQ,CAAC,QAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3H,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEzB,mBAAmB,CAAC,UAAU,EAAE,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3E,CAAC;YAAS,CAAC;QACT,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,SAAS;AACT,8EAA8E;AAE9E;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAAC,MAAc;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE1C,MAAM,KAAK,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;QAC3B,8CAA8C;QAC9C,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,KAAK,WAAW;YACd,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,UAAU,GAAU,KAAK,CAAC;YAChC,KAAK,UAAU,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAAC,QAAgB,EAAE,gBAAgB,GAAG,KAAK;IAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG;QACX,GAAG,UAAU,qEAAqE;YAChF,GAAG,uBAAe,mBAAmB,sBAAc,iDAAiD;QACtG,UAAU,QAAQ,EAAE;QACpB,EAAE;KACH,CAAC;IACF,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;YACL,GAAG,IAAI;YACP,QAAQ,uBAAe,0EAA0E;YACjG,EAAE;YACF,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;YACvB,MAAM,IAAA,kBAAU,EAAC,UAAU,CAAC,EAAE;SAC/B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,IAAI,UAAU,KAAK,eAAe,EAAE,CAAC;QACnC,OAAO;YACL,GAAG,IAAI;YACP,6FAA6F;YAC7F,EAAE;YACF,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;YACvB,kCAAkC,IAAA,kBAAU,EAAC,UAAU,CAAC,SAAS,IAAA,kBAAU,EAAC,uBAAe,CAAC,EAAE;SAC/F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,gGAAgG;QAChG,EAAE;QACF,MAAM,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;QACvB,SAAS,IAAA,kBAAU,EAAC,uBAAe,CAAC,oBAAoB;QACxD,IAAA,6BAAiB,GAAE;QACnB,eAAe;QACf,MAAM,IAAA,kBAAU,EAAC,UAAU,CAAC,EAAE;KAC/B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// 工作空间 / 项目身份字段的本地校验 —— 从退役的 `src/createApp/copyTemplate.ts` 原样搬来。
|
|
3
|
+
//
|
|
4
|
+
// 🔴 权威在 Python 侧,不在这里:
|
|
5
|
+
// supersimples/app_repo_example/scripts/supersdk_template.py
|
|
6
|
+
// - SPID_PATTERN / BUNDLE_ID_PATTERN
|
|
7
|
+
// - ANDROID_NAMESPACE + require_android_config()(Java 包名、label 规则)
|
|
8
|
+
// 下面这些函数只是把「build 期才会炸的错误」提前到 `supercli init` / `supercli add` 暴露的
|
|
9
|
+
// 镜像实现。Python 侧规则一旦改动,必须以 Python 为准同步到这里。
|
|
10
|
+
//
|
|
11
|
+
// Deploy identity is schema-v4 data, so its local preflight lives beside the
|
|
12
|
+
// other workspace identity validators rather than the retired publish-site reader.
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.SITE_NAME_MAX_LENGTH = exports.TEMPLATE_DEFAULTS = exports.SPM_MODES = exports.ANDROID_NAMESPACE = exports.IOS_BUNDLE_ID_PATTERN_SOURCE = exports.ANDROID_PACKAGE_PATTERN_SOURCE = exports.SPID_PATTERN_SOURCE = void 0;
|
|
4
15
|
exports.isValidSpid = isValidSpid;
|
|
@@ -10,18 +21,6 @@ exports.checkSpmMode = checkSpmMode;
|
|
|
10
21
|
exports.checkSiteName = checkSiteName;
|
|
11
22
|
exports.checkSlug = checkSlug;
|
|
12
23
|
exports.checkSiteEnv = checkSiteEnv;
|
|
13
|
-
// 工作空间 / 项目身份字段的本地校验 —— 从退役的 `src/createApp/copyTemplate.ts` 原样搬来。
|
|
14
|
-
//
|
|
15
|
-
// 🔴 权威在 Python 侧,不在这里:
|
|
16
|
-
// supersimples/app_repo_example/scripts/supersdk_template.py
|
|
17
|
-
// - SPID_PATTERN / BUNDLE_ID_PATTERN
|
|
18
|
-
// - ANDROID_NAMESPACE + require_android_config()(Java 包名、label 规则)
|
|
19
|
-
// 下面这些函数只是把「build 期才会炸的错误」提前到 `supercli init` / `supercli add` 暴露的
|
|
20
|
-
// 镜像实现。Python 侧规则一旦改动,必须以 Python 为准同步到这里。
|
|
21
|
-
//
|
|
22
|
-
// slug / env 两条规则不在这里重写:它们归发布侧所有(deploy[] 条目逐字等于 v2 的 sites[]),
|
|
23
|
-
// 单一信源是 `src/publish/siteConfig.ts`,这里只做包装以统一「返回原因字符串」的调用形态。
|
|
24
|
-
const siteConfig_1 = require("../publish/siteConfig");
|
|
25
24
|
exports.SPID_PATTERN_SOURCE = '[a-z0-9]{8}';
|
|
26
25
|
exports.ANDROID_PACKAGE_PATTERN_SOURCE = '[A-Za-z][A-Za-z0-9_]*(\\.[A-Za-z][A-Za-z0-9_]*)+';
|
|
27
26
|
exports.IOS_BUNDLE_ID_PATTERN_SOURCE = '[A-Za-z0-9][A-Za-z0-9-]*(\\.[A-Za-z0-9][A-Za-z0-9-]*)+';
|
|
@@ -92,7 +91,9 @@ function checkSiteName(value) {
|
|
|
92
91
|
return Array.from(value).length > exports.SITE_NAME_MAX_LENGTH ? `must be at most ${exports.SITE_NAME_MAX_LENGTH} characters` : undefined;
|
|
93
92
|
}
|
|
94
93
|
function checkSlug(value) {
|
|
95
|
-
return
|
|
94
|
+
return /^[a-z0-9]{1,32}$/.test(value) && value !== 'stg' && value !== 'site'
|
|
95
|
+
? undefined
|
|
96
|
+
: 'must be 1-32 lowercase letters or digits, and must not be a reserved slug';
|
|
96
97
|
}
|
|
97
98
|
/**
|
|
98
99
|
* `deploy[].env` —— 站点发布到项目的哪个环境。
|
|
@@ -101,6 +102,6 @@ function checkSlug(value) {
|
|
|
101
102
|
* 编译期与配置里都不该再出现;前者是服务端站点实体的一部分,发布时必填。
|
|
102
103
|
*/
|
|
103
104
|
function checkSiteEnv(value) {
|
|
104
|
-
return
|
|
105
|
+
return /^[a-z0-9]{1,10}$/.test(value) ? undefined : 'must be 1-10 lowercase letters or digits (e.g. prod, staging)';
|
|
105
106
|
}
|
|
106
107
|
//# sourceMappingURL=identity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/workspace/identity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/workspace/identity.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,6 +69,7 @@ exports.CONFIG_READER_RELPATH = `gradle/${exports.CONFIG_READER_FILENAME}`;
|
|
|
69
69
|
* 直接从真模板的 reader 里抓 `ext.xxx =` 来比对这张表,模板改名时编译不出错、测试会红。
|
|
70
70
|
*/
|
|
71
71
|
exports.CONFIG_READER_EXTRAS = [
|
|
72
|
+
{ key: 'supersdkProjectId', kotlinType: 'String', use: 'the stable super.json projectId' },
|
|
72
73
|
{ key: 'supersdkSpid', kotlinType: 'String', use: 'the Console-issued project spid' },
|
|
73
74
|
{ key: 'supersdkAppName', kotlinType: 'String', use: 'the app label (string resource app_name)' },
|
|
74
75
|
{ key: 'supersdkApplicationId', kotlinType: 'String', use: 'defaultConfig.applicationId' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/workspace/inspect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/workspace/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,93 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectContext.js","sourceRoot":"","sources":["../../src/workspace/projectContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SITE_DIST_DIRNAME =
|
|
4
|
-
exports.defaultDeployDir = defaultDeployDir;
|
|
5
|
-
exports.checkDeployDir = checkDeployDir;
|
|
3
|
+
exports.SITE_DIST_DIRNAME = void 0;
|
|
6
4
|
exports.resolveIdentity = resolveIdentity;
|
|
7
5
|
exports.buildEntry = buildEntry;
|
|
8
6
|
exports.suggestedCommand = suggestedCommand;
|
|
@@ -23,89 +21,40 @@ const config_1 = require("./config");
|
|
|
23
21
|
const shell_1 = require("../util/shell");
|
|
24
22
|
const identity_1 = require("./identity");
|
|
25
23
|
const interactive_1 = require("./interactive");
|
|
26
|
-
/** `deploy[].env` 的默认值 —— 站点发布到项目的哪个环境(不是 SDK 运行环境)。 */
|
|
27
|
-
exports.DEFAULT_SITE_ENV = 'prod';
|
|
28
24
|
/** `web_package.py` 的 DIST_DIRNAME —— 站点的唯一可发布构建产物目录。 */
|
|
29
25
|
exports.SITE_DIST_DIRNAME = 'dist';
|
|
30
|
-
/** `<dir>/dist`(`<dir>` 是工作空间根时就是 `dist`)—— `--deploy-dir` 的派生默认值。 */
|
|
31
|
-
function defaultDeployDir(projectDir) {
|
|
32
|
-
return projectDir === '.' ? exports.SITE_DIST_DIRNAME : `${projectDir}/${exports.SITE_DIST_DIRNAME}`;
|
|
33
|
-
}
|
|
34
|
-
/**
|
|
35
|
-
* `--deploy-dir` 的锚点是**工作空间根**,和 `projects[].dir` / `deploy[].dir` 完全一致 ——
|
|
36
|
-
* 不是 `<dir>`。`<dir>` 是 cwd 相对的(命令行参数),`--deploy-dir` 是根相对的(配置字段),
|
|
37
|
-
* 两个 flag 两个锚点,不说清楚就会写出 `cd apps && add site web --deploy-dir dist` → 记下
|
|
38
|
-
* `<root>/dist` 这种指向一个根本不存在的目录的条目。
|
|
39
|
-
*
|
|
40
|
-
* 🔴 再加一道包含性检查:发布目录必须落在这个站点项目自己的目录里。发布侧的回填是**只增不改**,
|
|
41
|
-
* `deploy[].dir` 记错之后没有任何代码路径会去纠正它(publishSite.ts 的注释已经写明这一点),
|
|
42
|
-
* 所以唯一的机会就是写进去之前。
|
|
43
|
-
*
|
|
44
|
-
* 不查「目录是否存在」是刻意的:`dist/` 是构建产物,登记之后、第一次构建之前它本来就不该在。
|
|
45
|
-
* (register 要求 `<dir>` 本身必须已存在,那是另一条规则 —— 打错项目路径要当场知道;发布
|
|
46
|
-
* 产物目录还没构建出来则完全正常。)
|
|
47
|
-
*/
|
|
48
|
-
function checkDeployDir(projectDir, value) {
|
|
49
|
-
const outcome = (0, config_1.checkProjectDir)(value);
|
|
50
|
-
if ('error' in outcome)
|
|
51
|
-
return outcome.error;
|
|
52
|
-
if (!(0, config_1.dirCovers)(projectDir, outcome.dir)) {
|
|
53
|
-
return (`"${outcome.dir}" is outside the project directory "${projectDir}". --deploy-dir is relative to the ` +
|
|
54
|
-
`workspace root (like every dir in ${config_1.CONFIG_FILENAME}), not to <dir>, and the published build output must ` +
|
|
55
|
-
`live inside the site project that owns it — e.g. --deploy-dir ${defaultDeployDir(projectDir)}`);
|
|
56
|
-
}
|
|
57
|
-
return undefined;
|
|
58
|
-
}
|
|
59
26
|
function resolveIdentity(type, projectDir, opts, interactive, prompt) {
|
|
27
|
+
void projectDir;
|
|
60
28
|
const resolution = (0, interactive_1.newResolution)();
|
|
61
29
|
const resolved = {};
|
|
62
|
-
if (type === 'site') {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
30
|
+
if (type === 'site' || type === 'service') {
|
|
31
|
+
const targetRequested = [opts.envTarget, opts.slug, opts.env].some((value) => (0, interactive_1.trimFlag)(value) !== undefined);
|
|
32
|
+
if (targetRequested) {
|
|
33
|
+
resolved.envTarget = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
34
|
+
flag: '--env-target', question: 'Named deployment target', provided: (0, interactive_1.trimFlag)(opts.envTarget),
|
|
35
|
+
check: (value) => /^[a-z][a-z0-9-]{0,31}$/.test(value) ? undefined : 'must be lowercase letters/digits/hyphens', required: true,
|
|
36
|
+
});
|
|
37
|
+
resolved.slug = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
38
|
+
flag: '--slug', question: 'Deployment slug (1-32 lowercase letters/digits, unique inside the workspace)',
|
|
39
|
+
provided: (0, interactive_1.trimFlag)(opts.slug), check: identity_1.checkSlug, required: true,
|
|
40
|
+
});
|
|
41
|
+
resolved.env = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
42
|
+
flag: '--env', question: 'Project environment this target deploys to', provided: (0, interactive_1.trimFlag)(opts.env), check: identity_1.checkSiteEnv, required: true,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
71
45
|
// 🔴 `--name` 没给就**什么都不写**,绝不把「默认等于 slug」materialize 进配置。
|
|
72
46
|
// 「默认等于 slug」是一条**解析规则**,不是用户已经作出的决定;一旦落盘,它就变成一条
|
|
73
|
-
//
|
|
74
|
-
// 会被这条我们自己编出来的记录静默压掉。v2 时代 sites[] 是发布成功后才有的,所以首次
|
|
75
|
-
// 发布的 --name 一直是生效的;v3 由 add/register 预写条目之后,这条默认值就成了静默覆盖
|
|
76
|
-
// 用户输入的源头。配套的另一半在发布侧(publishSite.ts 取 siteName 的那行,优先级必须是
|
|
77
|
-
// 「显式 --name > 已记录的 deploy[].name > slug」)—— 这里先保证配置只记录用户真说过的话。
|
|
47
|
+
// 记录。deploy adapter 在 name 缺省时以 slug 作展示名;配置只保存用户真正声明的值。
|
|
78
48
|
resolved.name = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
79
49
|
flag: '--name',
|
|
80
|
-
question:
|
|
50
|
+
question: type === 'site'
|
|
51
|
+
? 'Site name (optional — leave blank to let it resolve to the slug)'
|
|
52
|
+
: 'Service name (optional)',
|
|
81
53
|
provided: (0, interactive_1.trimFlag)(opts.name),
|
|
82
54
|
check: identity_1.checkSiteName,
|
|
83
55
|
required: false,
|
|
84
56
|
askWhenOptional: true,
|
|
85
57
|
});
|
|
86
|
-
resolved.env = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
87
|
-
flag: '--env',
|
|
88
|
-
question: 'Project environment this site deploys to',
|
|
89
|
-
provided: (0, interactive_1.trimFlag)(opts.env),
|
|
90
|
-
fallback: exports.DEFAULT_SITE_ENV,
|
|
91
|
-
check: identity_1.checkSiteEnv,
|
|
92
|
-
required: false,
|
|
93
|
-
});
|
|
94
|
-
resolved.deployDir = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
|
|
95
|
-
flag: '--deploy-dir',
|
|
96
|
-
question: `Directory published by publish-site (relative to the workspace root, inside "${projectDir}")`,
|
|
97
|
-
provided: (0, interactive_1.trimFlag)(opts.deployDir),
|
|
98
|
-
fallback: defaultDeployDir(projectDir),
|
|
99
|
-
check: (value) => checkDeployDir(projectDir, value),
|
|
100
|
-
required: false,
|
|
101
|
-
});
|
|
102
|
-
// 落盘的必须是**归一化后**的那个值:包含性是按归一化结果判的,存原样(`./apps/web/dist/`)
|
|
103
|
-
// 会让配置里的字符串与刚刚通过检查的路径不是同一个东西。
|
|
104
|
-
if (resolved.deployDir !== undefined) {
|
|
105
|
-
const normalized = (0, config_1.checkProjectDir)(resolved.deployDir);
|
|
106
|
-
if (!('error' in normalized))
|
|
107
|
-
resolved.deployDir = normalized.dir;
|
|
108
|
-
}
|
|
109
58
|
}
|
|
110
59
|
else {
|
|
111
60
|
// 🔴 android/ios 的 name 没有 fallback:目录名("android")当 App label 是荒谬的,
|
|
@@ -144,33 +93,39 @@ function resolveIdentity(type, projectDir, opts, interactive, prompt) {
|
|
|
144
93
|
});
|
|
145
94
|
}
|
|
146
95
|
}
|
|
147
|
-
const required = type === 'site'
|
|
96
|
+
const required = type === 'site' || type === 'service'
|
|
97
|
+
? ([resolved.envTarget, resolved.slug, resolved.env].some((value) => value !== undefined) ? ['envTarget', 'slug', 'env'] : [])
|
|
98
|
+
: type === 'android' ? ['name', 'package'] : ['name', 'bundleId', 'spmMode'];
|
|
148
99
|
const ok = resolution.errors.length === 0 &&
|
|
149
100
|
resolution.missingFlags.length === 0 &&
|
|
150
101
|
required.every((key) => resolved[key] !== undefined);
|
|
151
102
|
return { ok, resolved, resolution };
|
|
152
103
|
}
|
|
153
|
-
function buildEntry(type, dir, resolved) {
|
|
104
|
+
function buildEntry(type, dir, resolved, projectId) {
|
|
154
105
|
if (type === 'android') {
|
|
155
|
-
return { type, dir, name: resolved.name, package: resolved.package };
|
|
106
|
+
return { projectId, type, dir, name: resolved.name, package: resolved.package };
|
|
156
107
|
}
|
|
157
108
|
if (type === 'ios') {
|
|
158
|
-
return { type, dir, name: resolved.name, bundleId: resolved.bundleId, spmMode: resolved.spmMode };
|
|
109
|
+
return { projectId, type, dir, name: resolved.name, bundleId: resolved.bundleId, spmMode: resolved.spmMode };
|
|
110
|
+
}
|
|
111
|
+
// 🔴 name 只在用户真的给了 --name 时才写。site/service 的 name 在权威侧本来就是可选的,
|
|
112
|
+
// 只有 android/ios 才 require_project_name —— 所以这里留空是合法终态,不是半成品。
|
|
113
|
+
const name = resolved.name;
|
|
114
|
+
const named = name !== undefined ? { name } : {};
|
|
115
|
+
const hasTarget = resolved.envTarget !== undefined && resolved.slug !== undefined && resolved.env !== undefined;
|
|
116
|
+
if (type === 'service') {
|
|
117
|
+
return {
|
|
118
|
+
projectId, type, dir, ...named,
|
|
119
|
+
build: { context: '.', dockerfile: 'Dockerfile', platform: 'linux/amd64' },
|
|
120
|
+
deploy: hasTarget ? [{ envTarget: resolved.envTarget, slug: resolved.slug, ...named, env: resolved.env }] : [],
|
|
121
|
+
};
|
|
159
122
|
}
|
|
160
|
-
// 🔴 name 只在用户真的给了 --name 时才写。site 的 name 在权威侧(supersdk_template.py 的
|
|
161
|
-
// validate_project)本来就是可选的,只有 android/ios 才 require_project_name —— 所以这里
|
|
162
|
-
// 留空是合法终态,不是半成品。
|
|
163
|
-
const siteName = resolved.name;
|
|
164
|
-
const named = siteName !== undefined ? { name: siteName } : {};
|
|
165
123
|
return {
|
|
166
|
-
type,
|
|
124
|
+
projectId, type,
|
|
167
125
|
dir,
|
|
168
126
|
...named,
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
deploy: [{ slug: resolved.slug, ...named, env: resolved.env, dir: resolved.deployDir }],
|
|
172
|
-
// offline.host 由服务端回填:首次 publish-site 成功后 CLI 才把服务端返回的域名记进来。
|
|
173
|
-
// CLI 绝不自己拼域名。
|
|
127
|
+
build: { outputDir: exports.SITE_DIST_DIRNAME },
|
|
128
|
+
deploy: hasTarget ? [{ envTarget: resolved.envTarget, slug: resolved.slug, ...named, env: resolved.env }] : [],
|
|
174
129
|
};
|
|
175
130
|
}
|
|
176
131
|
/**
|
|
@@ -181,6 +136,7 @@ function buildEntry(type, dir, resolved) {
|
|
|
181
136
|
* command's own validation instead of on a shell redirect.
|
|
182
137
|
*/
|
|
183
138
|
function suggestedCommand(commandLabel, type, dirArg, projectDir, opts, resolved) {
|
|
139
|
+
void projectDir;
|
|
184
140
|
const placeholder = (hint) => (0, shell_1.shellQuote)(`<${hint}>`);
|
|
185
141
|
const parts = [commandLabel, (0, shell_1.shellQuote)(dirArg)];
|
|
186
142
|
const push = (flag, value, hint) => {
|
|
@@ -195,12 +151,14 @@ function suggestedCommand(commandLabel, type, dirArg, projectDir, opts, resolved
|
|
|
195
151
|
return;
|
|
196
152
|
parts.push(flag, (0, shell_1.shellQuote)(value ?? fallback));
|
|
197
153
|
};
|
|
198
|
-
if (type === 'site') {
|
|
199
|
-
|
|
154
|
+
if (type === 'site' || type === 'service') {
|
|
155
|
+
if (resolved.envTarget !== undefined || resolved.slug !== undefined || resolved.env !== undefined) {
|
|
156
|
+
push('--env-target', resolved.envTarget, 'prod');
|
|
157
|
+
push('--slug', resolved.slug, 'myapp');
|
|
158
|
+
push('--env', resolved.env, 'prod');
|
|
159
|
+
}
|
|
200
160
|
if (resolved.name)
|
|
201
161
|
parts.push('--name', (0, shell_1.shellQuote)(resolved.name));
|
|
202
|
-
echoOptional('--env', opts.env, resolved.env, exports.DEFAULT_SITE_ENV);
|
|
203
|
-
echoOptional('--deploy-dir', opts.deployDir, resolved.deployDir, defaultDeployDir(projectDir));
|
|
204
162
|
return parts.join(' ');
|
|
205
163
|
}
|
|
206
164
|
push('--name', resolved.name, 'App label');
|
|
@@ -220,12 +178,11 @@ function flagReference(type) {
|
|
|
220
178
|
else if (type === 'ios') {
|
|
221
179
|
lines.push(' --name <label> required, the iOS display name. Never derived, never inherited.', ' --bundle-id <id> required, the bundle identifier (e.g. com.acme.myapp).', ` --spm-mode <m> optional, ${identity_1.SPM_MODES.join('|')} (default: ${identity_1.SPM_MODES[0]}).`);
|
|
222
180
|
}
|
|
181
|
+
else if (type === 'site') {
|
|
182
|
+
lines.push(' --env-target/--slug/--env optional deployment target identity; provide all three or none.', ' --name <label> optional. Left out, nothing is recorded and the display name resolves to the slug.', ` build.outputDir is recorded as ${exports.SITE_DIST_DIRNAME} relative to the site project.`);
|
|
183
|
+
}
|
|
223
184
|
else {
|
|
224
|
-
lines.push(' --slug
|
|
225
|
-
'later `supercli publish-site --name <label>` still decides it.', ` --env <env> optional, the project environment this site deploys to (default: ${exports.DEFAULT_SITE_ENV}). ` +
|
|
226
|
-
'This is the site environment, not an SDK runtime environment.', ` --deploy-dir <d> optional, the build output published by \`supercli publish-site\`. Like every dir in ` +
|
|
227
|
-
`${config_1.CONFIG_FILENAME} it is relative to the WORKSPACE ROOT — not to <dir> — and it must sit inside <dir>. ` +
|
|
228
|
-
`Default: <dir>/${exports.SITE_DIST_DIRNAME}.`);
|
|
185
|
+
lines.push(' --env-target/--slug/--env optional deployment target identity; provide all three or none.', ' --name <label> optional. Left out, no service name is recorded.', ' build defaults to context=., dockerfile=Dockerfile, platform=linux/amd64.');
|
|
229
186
|
}
|
|
230
187
|
return lines;
|
|
231
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectIdentity.js","sourceRoot":"","sources":["../../src/workspace/projectIdentity.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"projectIdentity.js","sourceRoot":"","sources":["../../src/workspace/projectIdentity.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ exports.copyDirInto = copyDirInto;
|
|
|
42
42
|
exports.ensureWorkspaceShared = ensureWorkspaceShared;
|
|
43
43
|
exports.readTemplateDefaults = readTemplateDefaults;
|
|
44
44
|
exports.applyAndroidDefaultConfigIdentity = applyAndroidDefaultConfigIdentity;
|
|
45
|
-
// 模板发现与拷贝 —— 从退役的 `src/createApp/copyTemplate.ts` 搬来,按
|
|
45
|
+
// 模板发现与拷贝 —— 从退役的 `src/createApp/copyTemplate.ts` 搬来,按 v4 工作空间模型重切:
|
|
46
46
|
//
|
|
47
47
|
// * 模板根不再整棵拷进一个目标目录。`supercli init` 只落 **workspace 级共享物**,
|
|
48
48
|
// `supercli add <type> <dir>` 只落该类型的那一棵子树。谁属于哪一边由模板自带的
|
|
@@ -282,7 +282,7 @@ function isPlainObject(value) {
|
|
|
282
282
|
* 不允许静默。
|
|
283
283
|
*/
|
|
284
284
|
function readTemplateDefaults(templateRoot) {
|
|
285
|
-
const configPath = path.join(templateRoot,
|
|
285
|
+
const configPath = path.join(templateRoot, appConfig_1.APP_CONFIG_FILENAME);
|
|
286
286
|
let parsed;
|
|
287
287
|
try {
|
|
288
288
|
parsed = JSON.parse(fs.readFileSync(configPath, 'utf8'));
|
|
@@ -309,17 +309,14 @@ function readTemplateDefaults(templateRoot) {
|
|
|
309
309
|
* applicationId `com.supersdk.simple.host`、label「SuperSDK Simple」、spid `demo0001`,
|
|
310
310
|
* 而且**静默成功、退出码 0、零告警**。
|
|
311
311
|
*
|
|
312
|
-
*
|
|
313
|
-
* 照着提示走完的工程正好停在这个状态。
|
|
314
|
-
*
|
|
315
|
-
* 这与「绝不沿用模板自带的 SuperSDK 身份」是同一条纪律 —— supersdk.json 那条路已经堵上,
|
|
312
|
+
* 这与「绝不沿用模板自带的 SuperSDK 身份」是同一条纪律 —— super.json 那条路已经堵上,
|
|
316
313
|
* 这条 fallback 路不能漏。
|
|
317
314
|
*
|
|
318
|
-
* 🔴 不写 `environment`:
|
|
315
|
+
* 🔴 不写 `environment`:v4 不把它放在配置与构建里(它是运行时 `SuperSDK.init` 的参数)。
|
|
319
316
|
* 模板文件里原有的那一行原样留着,由模板侧决定去留;这里绝不再从配置投影一个不存在的字段。
|
|
320
317
|
*
|
|
321
318
|
* 缺失/损坏一律静默跳过:它是可选的便利文件,不该让脚手架整体失败;真正的单源始终是
|
|
322
|
-
* 工作空间根的
|
|
319
|
+
* 工作空间根的 super.json,`supercli build` 会用它重新投影出 managed config。
|
|
323
320
|
*/
|
|
324
321
|
function applyAndroidDefaultConfigIdentity(projectDir, identity) {
|
|
325
322
|
const defaultConfigPath = path.join(projectDir, 'supersdk-default.config.json');
|