@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
package/dist/workspace/config.js
CHANGED
|
@@ -41,22 +41,15 @@ exports.findDirConflict = findDirConflict;
|
|
|
41
41
|
exports.relativeToRoot = relativeToRoot;
|
|
42
42
|
exports.describeConfigProblem = describeConfigProblem;
|
|
43
43
|
exports.loadWorkspace = loadWorkspace;
|
|
44
|
-
exports.isValidConfigFile = isValidConfigFile;
|
|
45
|
-
exports.legacyConfigIn = legacyConfigIn;
|
|
46
44
|
exports.createWorkspaceConfig = createWorkspaceConfig;
|
|
47
45
|
exports.appendProject = appendProject;
|
|
48
|
-
exports.unsupportedSchemaMessage = unsupportedSchemaMessage;
|
|
49
46
|
exports.findEnclosingWorkspace = findEnclosingWorkspace;
|
|
50
|
-
|
|
51
|
-
// `supersdk.json` v3 —— **工作空间写侧**(`supercli init` / `supercli add`)需要的那部分。
|
|
47
|
+
// `super.json` schema v5 —— **工作空间写侧**(init / add / register)。
|
|
52
48
|
//
|
|
53
|
-
// 一个 workspace = 一个 spid,`
|
|
49
|
+
// 一个 workspace = 一个 spid,`super.json` 所在目录即工作空间根。
|
|
54
50
|
//
|
|
55
|
-
// 🔴
|
|
56
|
-
//
|
|
57
|
-
// 互不为祖先、deploy[] 形状……)。写侧再写一份「差不多的」校验,等于给同一个文件准备了两套
|
|
58
|
-
// 判据:某天两边口径分岔时,就会出现「add 写得出去、publish-site 立刻拒绝」这种同一棵树上
|
|
59
|
-
// 两端打架的状态 —— 本轮统一配置要消灭的正是它。
|
|
51
|
+
// 🔴 这里**不再重写一遍校验**。读侧与写后自证都调用 `config/superConfig.ts`
|
|
52
|
+
// 的 strict parser/discovery;不再存在第二套 Python schema authority。
|
|
60
53
|
//
|
|
61
54
|
// 本模块只补写侧真正独有的三件事:
|
|
62
55
|
// 1. 一个**全项目**视角(parseConfig 的产物只暴露站点项目,登记新目录时要跟所有项目比对);
|
|
@@ -64,11 +57,10 @@ exports.legacyMigrationMessage = legacyMigrationMessage;
|
|
|
64
57
|
// 3. `projects[]` 的追加写入(加锁 → parse → 只改自己那段 → stringify)。
|
|
65
58
|
const fs = __importStar(require("node:fs"));
|
|
66
59
|
const path = __importStar(require("node:path"));
|
|
60
|
+
const node_crypto_1 = require("node:crypto");
|
|
67
61
|
const appConfig_1 = require("../config/appConfig");
|
|
68
|
-
const
|
|
62
|
+
const superConfig_1 = require("../config/superConfig");
|
|
69
63
|
const fsAtomic_1 = require("../util/fsAtomic");
|
|
70
|
-
const shell_1 = require("../util/shell");
|
|
71
|
-
const identity_1 = require("./identity");
|
|
72
64
|
exports.CONFIG_FILENAME = appConfig_1.APP_CONFIG_FILENAME;
|
|
73
65
|
exports.SCHEMA_VERSION = appConfig_1.APP_CONFIG_SCHEMA_VERSION;
|
|
74
66
|
class WorkspaceConfigError extends Error {
|
|
@@ -79,10 +71,10 @@ exports.WorkspaceConfigError = WorkspaceConfigError;
|
|
|
79
71
|
// ---------------------------------------------------------------------------
|
|
80
72
|
/**
|
|
81
73
|
* 归一化一个候选目录,失败时给出**可读的原因**(用于面向用户的报错)。
|
|
82
|
-
* 归一化规则本身来自
|
|
74
|
+
* 归一化规则本身来自 superConfig.normalizeProjectDir —— 这里只负责把 `undefined` 翻译成人话。
|
|
83
75
|
*/
|
|
84
76
|
function checkProjectDir(raw) {
|
|
85
|
-
const normalized = (0,
|
|
77
|
+
const normalized = (0, superConfig_1.normalizeProjectDir)(raw);
|
|
86
78
|
if (normalized === undefined) {
|
|
87
79
|
return {
|
|
88
80
|
error: 'must be a relative POSIX path inside the workspace (no leading "/", no drive letter, ' +
|
|
@@ -133,7 +125,7 @@ function projectsOf(document) {
|
|
|
133
125
|
continue;
|
|
134
126
|
if (typeof item.type !== 'string' || typeof item.dir !== 'string')
|
|
135
127
|
continue;
|
|
136
|
-
const normalized = (0,
|
|
128
|
+
const normalized = (0, superConfig_1.normalizeProjectDir)(item.dir);
|
|
137
129
|
if (normalized === undefined)
|
|
138
130
|
continue;
|
|
139
131
|
projects.push({ ...item, type: item.type, dir: normalized });
|
|
@@ -142,36 +134,15 @@ function projectsOf(document) {
|
|
|
142
134
|
}
|
|
143
135
|
/** parseConfig / findConfig 的失败结果 → 面向用户的一段话。成功时返回 undefined。 */
|
|
144
136
|
function describeConfigProblem(result, startDir) {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
return undefined;
|
|
148
|
-
case 'absent':
|
|
149
|
-
return (`no ${exports.CONFIG_FILENAME} found in ${startDir} or any parent directory ` +
|
|
150
|
-
`(searched: ${result.searched.join(', ')}).\n` +
|
|
151
|
-
'`supercli add` registers a project inside an existing workspace — create one first:\n\n' +
|
|
152
|
-
// 占位符必须带引号:裸 `<spid>` 粘进 bash 是 `syntax error near unexpected token 'newline'`,
|
|
153
|
-
// 引号版粘进去则会撞上 init 自己的 --spid 校验,那才是人需要看到的报错。
|
|
154
|
-
` supercli init . --spid ${(0, shell_1.shellQuote)(`<${identity_1.SPID_PATTERN_SOURCE}>`)}`);
|
|
155
|
-
case 'legacy-app-yaml':
|
|
156
|
-
case 'legacy-site-yml':
|
|
157
|
-
return legacyMigrationMessage(result.path, result.existingConfigPath !== undefined);
|
|
158
|
-
case 'unsupported-schema':
|
|
159
|
-
return unsupportedSchemaMessage(result.path, result.found);
|
|
160
|
-
case 'invalid':
|
|
161
|
-
return `${result.path}: ${result.reason}`;
|
|
162
|
-
default: {
|
|
163
|
-
// 穷尽性检查:ConfigReadResult 加了新分支而这里没跟上时,编译期就会失败。
|
|
164
|
-
const exhaustive = result;
|
|
165
|
-
return String(exhaustive);
|
|
166
|
-
}
|
|
167
|
-
}
|
|
137
|
+
void startDir;
|
|
138
|
+
return (0, superConfig_1.configProblem)(result);
|
|
168
139
|
}
|
|
169
140
|
/**
|
|
170
141
|
* 从 `startDir` 向上找到工作空间并读出全项目视角。
|
|
171
142
|
* 查找与校验都走 `findConfig`(发布侧同一份实现),这里只负责把结果翻译成写侧要的形状。
|
|
172
143
|
*/
|
|
173
|
-
function loadWorkspace(startDir) {
|
|
174
|
-
const found = (0,
|
|
144
|
+
function loadWorkspace(startDir, explicitPath) {
|
|
145
|
+
const found = (0, superConfig_1.findSuperConfig)(startDir, explicitPath);
|
|
175
146
|
const problem = describeConfigProblem(found, path.resolve(startDir));
|
|
176
147
|
if (problem !== undefined || found.kind !== 'valid') {
|
|
177
148
|
return { kind: 'error', message: problem ?? `cannot read ${exports.CONFIG_FILENAME}` };
|
|
@@ -203,27 +174,6 @@ function loadWorkspace(startDir) {
|
|
|
203
174
|
// ---------------------------------------------------------------------------
|
|
204
175
|
// 写
|
|
205
176
|
// ---------------------------------------------------------------------------
|
|
206
|
-
/**
|
|
207
|
-
* 这个路径上是不是一份**发布侧也认**的合法配置。只回答是/否 —— 调用方(迁移提示)只需要
|
|
208
|
-
* 知道「用户是不是已经有一份能用的配置了」,不需要诊断细节。
|
|
209
|
-
*/
|
|
210
|
-
function isValidConfigFile(configPath) {
|
|
211
|
-
try {
|
|
212
|
-
return (0, siteConfig_1.parseConfig)(fs.readFileSync(configPath, 'utf8'), configPath).kind === 'valid';
|
|
213
|
-
}
|
|
214
|
-
catch {
|
|
215
|
-
return false;
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
/** 目录里是否残留退役的 YAML 方言配置。 */
|
|
219
|
-
function legacyConfigIn(dir) {
|
|
220
|
-
for (const name of appConfig_1.LEGACY_APP_CONFIG_FILENAMES) {
|
|
221
|
-
const candidate = path.join(dir, name);
|
|
222
|
-
if (fs.existsSync(candidate))
|
|
223
|
-
return candidate;
|
|
224
|
-
}
|
|
225
|
-
return undefined;
|
|
226
|
-
}
|
|
227
177
|
/** 锁文件与配置同目录、以 `.` 开头 —— 与发布侧是同一把锁(同名文件即同一把锁)。 */
|
|
228
178
|
function lockPathFor(configPath) {
|
|
229
179
|
return path.join(path.dirname(configPath), `.${path.basename(configPath)}.lock`);
|
|
@@ -237,7 +187,7 @@ function writePreservingMode(filePath, content) {
|
|
|
237
187
|
mode = undefined;
|
|
238
188
|
}
|
|
239
189
|
(0, fsAtomic_1.atomicWriteFileSync)(filePath, content);
|
|
240
|
-
// atomicWriteFileSync 以 0600 建临时文件再 rename。
|
|
190
|
+
// atomicWriteFileSync 以 0600 建临时文件再 rename。super.json 是人机共写、通常入库的
|
|
241
191
|
// 普通配置,不该被一次机器写入悄悄收紧成 0600。
|
|
242
192
|
if (mode !== undefined) {
|
|
243
193
|
try {
|
|
@@ -248,28 +198,66 @@ function writePreservingMode(filePath, content) {
|
|
|
248
198
|
}
|
|
249
199
|
}
|
|
250
200
|
}
|
|
251
|
-
/**
|
|
201
|
+
/** 写出前自证:写出去的东西必须能被 strict parser 读回来。 */
|
|
252
202
|
function serializeVerified(configPath, document) {
|
|
253
203
|
const serialized = (0, appConfig_1.serializeAppConfig)(document);
|
|
254
|
-
const verified = (0,
|
|
204
|
+
const verified = (0, superConfig_1.parseSuperConfig)(serialized, configPath);
|
|
255
205
|
if (verified.kind !== 'valid') {
|
|
256
206
|
const detail = verified.kind === 'invalid' ? verified.reason : verified.kind;
|
|
257
207
|
throw new WorkspaceConfigError(`refusing to write an invalid ${exports.CONFIG_FILENAME}: ${detail}`);
|
|
258
208
|
}
|
|
259
209
|
return serialized;
|
|
260
210
|
}
|
|
211
|
+
function fsyncDirectory(directory) {
|
|
212
|
+
if (process.platform === 'win32')
|
|
213
|
+
return;
|
|
214
|
+
const fd = fs.openSync(directory, 'r');
|
|
215
|
+
try {
|
|
216
|
+
fs.fsyncSync(fd);
|
|
217
|
+
}
|
|
218
|
+
finally {
|
|
219
|
+
fs.closeSync(fd);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
261
222
|
/**
|
|
262
|
-
*
|
|
263
|
-
*
|
|
223
|
+
* 首次落盘:同目录临时文件完整写入并 fsync,再用 hard-link 做原子 no-clobber 安装。
|
|
224
|
+
* `link` 与目标已存在检查是同一个原子操作,因此并发创建也绝不覆盖已有 projects[] / orgId。
|
|
264
225
|
*/
|
|
265
|
-
function createWorkspaceConfig(configPath, document) {
|
|
226
|
+
function createWorkspaceConfig(configPath, document, hooks = {}) {
|
|
266
227
|
const serialized = serializeVerified(configPath, document);
|
|
267
|
-
|
|
268
|
-
fs.
|
|
228
|
+
const directory = path.dirname(configPath);
|
|
229
|
+
fs.mkdirSync(directory, { recursive: true });
|
|
230
|
+
const temporaryPath = path.join(directory, `.${path.basename(configPath)}.init.${process.pid}.${(0, node_crypto_1.randomUUID)()}.tmp`);
|
|
231
|
+
let fd;
|
|
232
|
+
try {
|
|
233
|
+
fd = fs.openSync(temporaryPath, 'wx', 0o666);
|
|
234
|
+
fs.writeFileSync(fd, serialized, { encoding: 'utf8' });
|
|
235
|
+
fs.fsyncSync(fd);
|
|
236
|
+
fs.closeSync(fd);
|
|
237
|
+
fd = undefined;
|
|
238
|
+
hooks.beforeInstall?.(temporaryPath);
|
|
239
|
+
fs.linkSync(temporaryPath, configPath);
|
|
240
|
+
fs.unlinkSync(temporaryPath);
|
|
241
|
+
fsyncDirectory(directory);
|
|
242
|
+
}
|
|
243
|
+
finally {
|
|
244
|
+
if (fd !== undefined) {
|
|
245
|
+
try {
|
|
246
|
+
fs.closeSync(fd);
|
|
247
|
+
}
|
|
248
|
+
catch { /* preserve the original write failure */ }
|
|
249
|
+
}
|
|
250
|
+
try {
|
|
251
|
+
fs.unlinkSync(temporaryPath);
|
|
252
|
+
}
|
|
253
|
+
catch (error) {
|
|
254
|
+
if (error.code !== 'ENOENT') { /* best-effort owned-temp cleanup */ }
|
|
255
|
+
}
|
|
256
|
+
}
|
|
269
257
|
}
|
|
270
258
|
/**
|
|
271
|
-
* `加锁 → parse → 只改 projects[] → stringify
|
|
272
|
-
*
|
|
259
|
+
* `加锁 → parse → 只改 projects[] → stringify`。整份文档在**锁内**从磁盘重新读取,
|
|
260
|
+
* 只有 projects 一处被触碰。
|
|
273
261
|
*
|
|
274
262
|
* 🔴 跨进程锁不是可选项:`readFileSync → 改 → atomicWriteFileSync` 里的 atomic rename 只保证
|
|
275
263
|
* 文件不撕裂,**不防 lost update**。两个 `supercli add` 并行时,后写者会把先写者刚落盘的条目
|
|
@@ -280,7 +268,7 @@ function appendProject(configPath, entry) {
|
|
|
280
268
|
try {
|
|
281
269
|
// 必须在锁内重读:锁外读到的可能已被其他进程改写。
|
|
282
270
|
const before = fs.readFileSync(configPath, 'utf8');
|
|
283
|
-
const gate = (0,
|
|
271
|
+
const gate = (0, superConfig_1.parseSuperConfig)(before, configPath);
|
|
284
272
|
if (gate.kind !== 'valid') {
|
|
285
273
|
const detail = gate.kind === 'invalid' ? gate.reason : gate.kind;
|
|
286
274
|
throw new WorkspaceConfigError(`refusing to write an unparseable ${exports.CONFIG_FILENAME}: ${detail}`);
|
|
@@ -301,73 +289,16 @@ function appendProject(configPath, entry) {
|
|
|
301
289
|
}
|
|
302
290
|
}
|
|
303
291
|
// ---------------------------------------------------------------------------
|
|
304
|
-
// v2 → v3 的迁移提示
|
|
305
|
-
// ---------------------------------------------------------------------------
|
|
306
|
-
/**
|
|
307
|
-
* schemaVersion 不是 3 时的 fail-closed 指引。
|
|
308
|
-
*
|
|
309
|
-
* 🔴 两条纪律,都是上一版这段文案违反过的:
|
|
310
|
-
*
|
|
311
|
-
* 1. **绝不让人重建工作空间**。`rm supersdk.json` + 重新 init/add 会丢掉 publish-site 回填的
|
|
312
|
-
* `orgId` 和全部 `sites[]`/`deploy[]` 绑定 —— 那些是服务端签发过的东西,重跑一遍拿不回来。
|
|
313
|
-
* 而仓库里 vendored 的引擎自带**无损**的 `migrate`(未知根键、orgId、每条发布绑定原样带过),
|
|
314
|
-
* 指引必须指向它。
|
|
315
|
-
* 2. **命令要能原样粘进 shell**。裸 `<spid>` 粘进 bash 是 `syntax error near unexpected token
|
|
316
|
-
* 'newline'`(退出码 2),人根本走不到「这条命令想干什么」那一步。所以这里唯一的可执行块
|
|
317
|
-
* 里没有占位符:路径全是运行时算出来的真值,剩下的说明一律是散文。
|
|
318
|
-
*
|
|
319
|
-
* 命令形态**不在这里自己拼**:单点在 `config/appConfig.ts` 的 `engineMigrateCommand()`
|
|
320
|
-
* (发布侧 publishSite.ts 用的是同一个函数)。`--config` 在权威侧是 `required=True`,
|
|
321
|
-
* 少这一个参数照抄下去就是 `error: the following arguments are required: --config`、退出码 2。
|
|
322
|
-
*/
|
|
323
|
-
function unsupportedSchemaMessage(configPath, found) {
|
|
324
|
-
const root = path.dirname(configPath);
|
|
325
|
-
const migrate = `cd ${(0, shell_1.shellQuote)(root)} && ${(0, appConfig_1.engineMigrateCommand)(path.basename(configPath))}`;
|
|
326
|
-
const head = `${configPath} has schemaVersion ${JSON.stringify(found)}; supercli only reads schemaVersion ${exports.SCHEMA_VERSION}.`;
|
|
327
|
-
if (typeof found === 'number' && found > exports.SCHEMA_VERSION) {
|
|
328
|
-
return [
|
|
329
|
-
head,
|
|
330
|
-
'this file was written by a newer supercli. do NOT hand-edit the version down — run `supercli update` and retry.',
|
|
331
|
-
].join('\n');
|
|
332
|
-
}
|
|
333
|
-
return [
|
|
334
|
-
head,
|
|
335
|
-
`v${exports.SCHEMA_VERSION} is a breaking change with no backward compatibility, but nothing has to be re-created: the ` +
|
|
336
|
-
'build engine vendored under scripts/ migrates this file in place and loses nothing — orgId, every publish ' +
|
|
337
|
-
'binding and every unknown key are carried over.',
|
|
338
|
-
'',
|
|
339
|
-
'Preview it, then apply it:',
|
|
340
|
-
'',
|
|
341
|
-
` ${migrate} --dry-run`,
|
|
342
|
-
` ${migrate}`,
|
|
343
|
-
'',
|
|
344
|
-
'What it changes: "android" / "ios" / "web" each become one entry in "projects" (keeping name/package/bundleId/' +
|
|
345
|
-
'spmMode); every "sites" entry moves unchanged, as {slug, name, env, dir}, into the "deploy" array of the site ' +
|
|
346
|
-
'project that owns it; "environment" is dropped because the SDK environment is a runtime argument of ' +
|
|
347
|
-
'SuperSDK.init() (omitting it means prod); "orgId", "version" and "sdk" stay exactly where they are.',
|
|
348
|
-
'',
|
|
349
|
-
`If \`migrate\` comes back as an unknown subcommand, the engine vendored at ${appConfig_1.ENGINE_SCRIPT_RELPATH} predates ` +
|
|
350
|
-
`v${exports.SCHEMA_VERSION}. Run \`supercli init\` in a new empty directory and copy that workspace's scripts/ and ` +
|
|
351
|
-
'super_build.sh over yours first — init and add never overwrite files that are already in place, so they ' +
|
|
352
|
-
'cannot refresh them for you.',
|
|
353
|
-
'',
|
|
354
|
-
`Migrating by hand instead? This is the complete v${exports.SCHEMA_VERSION} shape:`,
|
|
355
|
-
'',
|
|
356
|
-
(0, appConfig_1.appConfigSkeleton)(),
|
|
357
|
-
].join('\n');
|
|
358
|
-
}
|
|
359
|
-
// ---------------------------------------------------------------------------
|
|
360
292
|
// 工作空间嵌套
|
|
361
293
|
// ---------------------------------------------------------------------------
|
|
362
294
|
/**
|
|
363
295
|
* `target` **之上**是否已经有一份工作空间配置;有就返回最近的那份的路径。
|
|
364
296
|
*
|
|
365
|
-
* 🔴 为什么 `init`
|
|
366
|
-
*
|
|
367
|
-
* spid 上,两份配置各自漂移,全程零告警。`add` 早就把「项目目录不得互为祖先」当硬失败
|
|
297
|
+
* 🔴 为什么 `init` 必须查这个:嵌套的 `super.json` 会让不同 cwd 选中不同权威,之后每一次
|
|
298
|
+
* `add` / `build` / `deploy` 都可能绑到不同 spid。`add` 早就把「项目目录不得互为祖先」当硬失败
|
|
368
299
|
* (findDirConflict),`init` 不查就等于在同一棵树上给了两套判据。
|
|
369
300
|
*
|
|
370
|
-
* 判定复用 `
|
|
301
|
+
* 判定复用 `findSuperConfig` 而不是另写一次向上遍历:停止边界(.git 仓库根 / 家目录 / 文件系统根 /
|
|
371
302
|
* 深度上限)必须与真正会去读配置的那条路径逐字一致,否则「init 说不嵌套、add 却找到了外层」。
|
|
372
303
|
*/
|
|
373
304
|
function findEnclosingWorkspace(target) {
|
|
@@ -375,18 +306,15 @@ function findEnclosingWorkspace(target) {
|
|
|
375
306
|
const parent = path.dirname(resolved);
|
|
376
307
|
if (parent === resolved)
|
|
377
308
|
return undefined;
|
|
378
|
-
const found = (0,
|
|
309
|
+
const found = (0, superConfig_1.findSuperConfig)(parent);
|
|
379
310
|
switch (found.kind) {
|
|
380
311
|
case 'valid':
|
|
381
312
|
return found.config.path;
|
|
382
|
-
//
|
|
383
|
-
case 'unsupported-schema':
|
|
313
|
+
// 写坏的 super.json 一样会遮蔽外层工作空间。
|
|
384
314
|
case 'invalid':
|
|
385
315
|
return found.path;
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
case 'legacy-site-yml':
|
|
389
|
-
return found.existingConfigPath;
|
|
316
|
+
case 'ambiguous':
|
|
317
|
+
return found.paths[0];
|
|
390
318
|
case 'absent':
|
|
391
319
|
return undefined;
|
|
392
320
|
default: {
|
|
@@ -396,46 +324,4 @@ function findEnclosingWorkspace(target) {
|
|
|
396
324
|
}
|
|
397
325
|
}
|
|
398
326
|
}
|
|
399
|
-
// ---------------------------------------------------------------------------
|
|
400
|
-
// 退役 YAML 方言的迁移提示
|
|
401
|
-
// ---------------------------------------------------------------------------
|
|
402
|
-
/**
|
|
403
|
-
* Fail-closed diagnostic for a retired YAML config. The snippet is meant to be
|
|
404
|
-
* pasted into a shell verbatim — a migration hint that is missing even one
|
|
405
|
-
* required field is a dead end, so the skeleton carries the complete set.
|
|
406
|
-
*
|
|
407
|
-
* 两种情形,动作顺序不同(且不能反):
|
|
408
|
-
* - 目录里**已经有一份合法的 supersdk.json** → 没有任何字段需要搬运,只发 `rm <legacy>`。
|
|
409
|
-
* 再让人照抄一遍 `cat >` 会用占位值覆盖掉他已经写好的真配置。
|
|
410
|
-
* - 没有 → 先写新文件、**再**删旧文件:旧文件是字段的唯一来源,先删就没得抄了。
|
|
411
|
-
*/
|
|
412
|
-
function legacyMigrationMessage(yamlPath, jsonAlreadyValid = false) {
|
|
413
|
-
const legacyName = path.basename(yamlPath);
|
|
414
|
-
const dir = path.dirname(yamlPath);
|
|
415
|
-
const head = [
|
|
416
|
-
`${legacyName} (retired schema_version: 1 dialect) is no longer supported — supercli reads ` +
|
|
417
|
-
`${exports.CONFIG_FILENAME} (schemaVersion ${exports.SCHEMA_VERSION}) only, and there is no compatibility fallback.`,
|
|
418
|
-
`found: ${yamlPath}`,
|
|
419
|
-
'',
|
|
420
|
-
];
|
|
421
|
-
if (jsonAlreadyValid) {
|
|
422
|
-
return [
|
|
423
|
-
...head,
|
|
424
|
-
`your ${exports.CONFIG_FILENAME} is already in place — nothing to migrate, just delete the retired file:`,
|
|
425
|
-
'',
|
|
426
|
-
`cd ${(0, shell_1.shellQuote)(dir)}`,
|
|
427
|
-
`rm ${(0, shell_1.shellQuote)(legacyName)}`,
|
|
428
|
-
].join('\n');
|
|
429
|
-
}
|
|
430
|
-
return [
|
|
431
|
-
...head,
|
|
432
|
-
'Migrate it once — replace the placeholder values with the ones already in your YAML, then run:',
|
|
433
|
-
'',
|
|
434
|
-
`cd ${(0, shell_1.shellQuote)(dir)}`,
|
|
435
|
-
`cat > ${(0, shell_1.shellQuote)(exports.CONFIG_FILENAME)} <<'SUPERSDK_JSON'`,
|
|
436
|
-
(0, appConfig_1.appConfigSkeleton)(),
|
|
437
|
-
'SUPERSDK_JSON',
|
|
438
|
-
`rm ${(0, shell_1.shellQuote)(legacyName)}`,
|
|
439
|
-
].join('\n');
|
|
440
|
-
}
|
|
441
327
|
//# sourceMappingURL=config.js.map
|
|
@@ -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":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// 工作空间 / 项目身份字段的本地校验。SuperCLI 是 schema v5 的唯一校验权威;模板项目
|
|
3
|
+
// 只消费校验后的配置值,不再维护第二套 Python schema 或注入引擎。
|
|
2
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
5
|
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
6
|
exports.isValidSpid = isValidSpid;
|
|
@@ -10,24 +12,12 @@ exports.checkSpmMode = checkSpmMode;
|
|
|
10
12
|
exports.checkSiteName = checkSiteName;
|
|
11
13
|
exports.checkSlug = checkSlug;
|
|
12
14
|
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
15
|
exports.SPID_PATTERN_SOURCE = '[a-z0-9]{8}';
|
|
26
16
|
exports.ANDROID_PACKAGE_PATTERN_SOURCE = '[A-Za-z][A-Za-z0-9_]*(\\.[A-Za-z][A-Za-z0-9_]*)+';
|
|
27
17
|
exports.IOS_BUNDLE_ID_PATTERN_SOURCE = '[A-Za-z0-9][A-Za-z0-9-]*(\\.[A-Za-z0-9][A-Za-z0-9-]*)+';
|
|
28
|
-
/** Fixed Gradle namespace baked into the template's
|
|
18
|
+
/** Fixed Gradle namespace baked into the template's Android module. */
|
|
29
19
|
exports.ANDROID_NAMESPACE = 'com.supersdk.simple';
|
|
30
|
-
/**
|
|
20
|
+
/** iOS 模板支持的 SPM 接入模式。 */
|
|
31
21
|
exports.SPM_MODES = ['mock', 'real'];
|
|
32
22
|
/**
|
|
33
23
|
* The template's own SuperSDK identity. `supercli add` must never let any of these
|
|
@@ -49,14 +39,14 @@ function isValidSpid(spid) {
|
|
|
49
39
|
function checkSpid(value) {
|
|
50
40
|
return isValidSpid(value) ? undefined : `must match ^${exports.SPID_PATTERN_SOURCE}$ (8 lowercase letters or digits, issued by Console)`;
|
|
51
41
|
}
|
|
52
|
-
/** Android app label rules
|
|
42
|
+
/** Android app label rules: non-empty, no control chars, no surrounding whitespace. */
|
|
53
43
|
function checkName(value) {
|
|
54
44
|
if (value.trim() === '')
|
|
55
45
|
return 'must not be empty';
|
|
56
46
|
if (value !== value.trim())
|
|
57
47
|
return 'must not have leading or trailing whitespace';
|
|
58
48
|
for (const char of value) {
|
|
59
|
-
//
|
|
49
|
+
// Control characters are the Unicode code points below 32; deliberately no extra rules.
|
|
60
50
|
if ((char.codePointAt(0) ?? 0) < 32)
|
|
61
51
|
return 'must not contain control characters';
|
|
62
52
|
}
|
|
@@ -92,7 +82,9 @@ function checkSiteName(value) {
|
|
|
92
82
|
return Array.from(value).length > exports.SITE_NAME_MAX_LENGTH ? `must be at most ${exports.SITE_NAME_MAX_LENGTH} characters` : undefined;
|
|
93
83
|
}
|
|
94
84
|
function checkSlug(value) {
|
|
95
|
-
return
|
|
85
|
+
return /^[a-z0-9]{1,32}$/.test(value) && value !== 'stg' && value !== 'site'
|
|
86
|
+
? undefined
|
|
87
|
+
: 'must be 1-32 lowercase letters or digits, and must not be a reserved slug';
|
|
96
88
|
}
|
|
97
89
|
/**
|
|
98
90
|
* `deploy[].env` —— 站点发布到项目的哪个环境。
|
|
@@ -101,6 +93,6 @@ function checkSlug(value) {
|
|
|
101
93
|
* 编译期与配置里都不该再出现;前者是服务端站点实体的一部分,发布时必填。
|
|
102
94
|
*/
|
|
103
95
|
function checkSiteEnv(value) {
|
|
104
|
-
return
|
|
96
|
+
return /^[a-z0-9]{1,10}$/.test(value) ? undefined : 'must be 1-10 lowercase letters or digits (e.g. prod, staging)';
|
|
105
97
|
}
|
|
106
98
|
//# 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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"}
|
|
@@ -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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"}
|