@supersdk/supercli 0.2.1-staging.20 → 0.3.0-staging.22
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/api/consoleClient.js +17 -12
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/auth/browserAuth.js +42 -44
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/tokenAuth.js +46 -0
- package/dist/auth/tokenAuth.js.map +1 -0
- package/dist/cli.js +70 -8
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +89 -31
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/add.js +519 -0
- package/dist/commands/add.js.map +1 -0
- package/dist/commands/init.js +234 -0
- package/dist/commands/init.js.map +1 -0
- package/dist/commands/login.js +75 -48
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +20 -25
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/publishSite.js +491 -149
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/switchaccount.js +36 -24
- package/dist/commands/switchaccount.js.map +1 -1
- package/dist/config/appConfig.js +160 -45
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/environments.js +17 -1
- package/dist/config/environments.js.map +1 -1
- package/dist/exit/exitCodes.js +55 -0
- package/dist/exit/exitCodes.js.map +1 -0
- package/dist/output/envelope.js +104 -0
- package/dist/output/envelope.js.map +1 -0
- package/dist/output/resultPrinter.js +70 -0
- package/dist/output/resultPrinter.js.map +1 -0
- package/dist/publish/siteClient.js +14 -4
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/publish/siteConfig.js +278 -63
- package/dist/publish/siteConfig.js.map +1 -1
- package/dist/store/accountStore.js +2 -2
- package/dist/store/accountStore.js.map +1 -1
- package/dist/store/backends/encryptedFile.js +4 -1
- package/dist/store/backends/encryptedFile.js.map +1 -1
- package/dist/store/backends/osKeyring.js +4 -8
- package/dist/store/backends/osKeyring.js.map +1 -1
- package/dist/store/credentialStore.js +22 -0
- package/dist/store/credentialStore.js.map +1 -1
- package/dist/template/README.md +144 -85
- package/dist/template/android/app/build.gradle.kts +0 -3
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +41 -0
- package/dist/template/android/app/src/main/java/com/supersdk/simple/MainActivity.java +57 -4
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +3 -1
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -3
- package/dist/template/android/supersdk-default.config.json +4 -3
- package/dist/template/ios/Sources/App/EnvironmentStore.swift +35 -0
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +2 -1
- package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +15 -0
- package/dist/template/ios/Sources/App/SimpleViewController.swift +52 -8
- package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +12 -1
- package/dist/template/scripts/android_snapshot_canary.py +17 -8
- package/dist/template/scripts/build_android.sh +36 -9
- package/dist/template/scripts/build_ios.sh +63 -24
- package/dist/template/scripts/build_site.sh +43 -0
- package/dist/template/scripts/lib/workspace.sh +43 -0
- package/dist/template/scripts/serve_web.py +26 -9
- package/dist/template/scripts/super_build_orchestrator.py +49 -28
- package/dist/template/scripts/supersdk_template.py +759 -240
- package/dist/template/scripts/web_package.py +44 -20
- package/dist/template/super_build.sh +40 -12
- package/dist/template/supersdk.json +25 -13
- package/dist/template/template_manifest.json +25 -0
- package/dist/template/web/src/css/style.css +28 -0
- package/dist/template/web/src/index.html +8 -0
- package/dist/template/web/src/js/app.js +92 -19
- package/dist/util/log.js +10 -1
- package/dist/util/log.js.map +1 -1
- package/dist/util/prompt.js +25 -0
- package/dist/util/prompt.js.map +1 -1
- package/dist/workspace/config.js +440 -0
- package/dist/workspace/config.js.map +1 -0
- package/dist/workspace/identity.js +106 -0
- package/dist/workspace/identity.js.map +1 -0
- package/dist/workspace/interactive.js +96 -0
- package/dist/workspace/interactive.js.map +1 -0
- package/dist/workspace/template.js +357 -0
- package/dist/workspace/template.js.map +1 -0
- package/package.json +1 -1
- package/dist/auth/refresh.js +0 -32
- package/dist/auth/refresh.js.map +0 -1
- package/dist/commands/createApp.js +0 -448
- package/dist/commands/createApp.js.map +0 -1
- package/dist/createApp/copyTemplate.js +0 -561
- package/dist/createApp/copyTemplate.js.map +0 -1
- package/dist/template/scripts/build_web.sh +0 -12
|
@@ -0,0 +1,440 @@
|
|
|
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.WorkspaceConfigError = exports.SCHEMA_VERSION = exports.CONFIG_FILENAME = void 0;
|
|
37
|
+
exports.checkProjectDir = checkProjectDir;
|
|
38
|
+
exports.dirCovers = dirCovers;
|
|
39
|
+
exports.dirsConflict = dirsConflict;
|
|
40
|
+
exports.findDirConflict = findDirConflict;
|
|
41
|
+
exports.relativeToRoot = relativeToRoot;
|
|
42
|
+
exports.describeConfigProblem = describeConfigProblem;
|
|
43
|
+
exports.loadWorkspace = loadWorkspace;
|
|
44
|
+
exports.isValidConfigFile = isValidConfigFile;
|
|
45
|
+
exports.legacyConfigIn = legacyConfigIn;
|
|
46
|
+
exports.createWorkspaceConfig = createWorkspaceConfig;
|
|
47
|
+
exports.appendProject = appendProject;
|
|
48
|
+
exports.unsupportedSchemaMessage = unsupportedSchemaMessage;
|
|
49
|
+
exports.findEnclosingWorkspace = findEnclosingWorkspace;
|
|
50
|
+
exports.legacyMigrationMessage = legacyMigrationMessage;
|
|
51
|
+
// `supersdk.json` v3 —— **工作空间写侧**(`supercli init` / `supercli add`)需要的那部分。
|
|
52
|
+
//
|
|
53
|
+
// 一个 workspace = 一个 spid,`supersdk.json` 所在目录即工作空间根。
|
|
54
|
+
//
|
|
55
|
+
// 🔴 这里**不再重写一遍校验**。文件的合法性判定只有一份,在 `src/publish/siteConfig.ts` 的
|
|
56
|
+
// `parseConfig` / `findConfig`(schemaVersion、退役根键、重复键、spid、projects[].dir 唯一且
|
|
57
|
+
// 互不为祖先、deploy[] 形状……)。写侧再写一份「差不多的」校验,等于给同一个文件准备了两套
|
|
58
|
+
// 判据:某天两边口径分岔时,就会出现「add 写得出去、publish-site 立刻拒绝」这种同一棵树上
|
|
59
|
+
// 两端打架的状态 —— 本轮统一配置要消灭的正是它。
|
|
60
|
+
//
|
|
61
|
+
// 本模块只补写侧真正独有的三件事:
|
|
62
|
+
// 1. 一个**全项目**视角(parseConfig 的产物只暴露站点项目,登记新目录时要跟所有项目比对);
|
|
63
|
+
// 2. dir 冲突判定(相等或互为祖先)与相对路径换算;
|
|
64
|
+
// 3. `projects[]` 的追加写入(加锁 → parse → 只改自己那段 → stringify)。
|
|
65
|
+
const fs = __importStar(require("node:fs"));
|
|
66
|
+
const path = __importStar(require("node:path"));
|
|
67
|
+
const appConfig_1 = require("../config/appConfig");
|
|
68
|
+
const siteConfig_1 = require("../publish/siteConfig");
|
|
69
|
+
const fsAtomic_1 = require("../util/fsAtomic");
|
|
70
|
+
const shell_1 = require("../util/shell");
|
|
71
|
+
const identity_1 = require("./identity");
|
|
72
|
+
exports.CONFIG_FILENAME = appConfig_1.APP_CONFIG_FILENAME;
|
|
73
|
+
exports.SCHEMA_VERSION = appConfig_1.APP_CONFIG_SCHEMA_VERSION;
|
|
74
|
+
class WorkspaceConfigError extends Error {
|
|
75
|
+
}
|
|
76
|
+
exports.WorkspaceConfigError = WorkspaceConfigError;
|
|
77
|
+
// ---------------------------------------------------------------------------
|
|
78
|
+
// dir:全局唯一,且不得互为祖先
|
|
79
|
+
// ---------------------------------------------------------------------------
|
|
80
|
+
/**
|
|
81
|
+
* 归一化一个候选目录,失败时给出**可读的原因**(用于面向用户的报错)。
|
|
82
|
+
* 归一化规则本身来自 siteConfig.normalizeProjectDir —— 这里只负责把 `undefined` 翻译成人话。
|
|
83
|
+
*/
|
|
84
|
+
function checkProjectDir(raw) {
|
|
85
|
+
const normalized = (0, siteConfig_1.normalizeProjectDir)(raw);
|
|
86
|
+
if (normalized === undefined) {
|
|
87
|
+
return {
|
|
88
|
+
error: 'must be a relative POSIX path inside the workspace (no leading "/", no drive letter, ' +
|
|
89
|
+
'no "\\" separator, no ".." segment, no surrounding whitespace)',
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
return { dir: normalized };
|
|
93
|
+
}
|
|
94
|
+
/** `a` 是否就是 `b`、或 `b` 的祖先目录。`.`(工作空间根)是所有目录的祖先。 */
|
|
95
|
+
function dirCovers(a, b) {
|
|
96
|
+
if (a === b)
|
|
97
|
+
return true;
|
|
98
|
+
if (a === '.')
|
|
99
|
+
return true;
|
|
100
|
+
return b.startsWith(`${a}/`);
|
|
101
|
+
}
|
|
102
|
+
/** 两个 dir 是否冲突(相等或互为祖先)。 */
|
|
103
|
+
function dirsConflict(a, b) {
|
|
104
|
+
return dirCovers(a, b) || dirCovers(b, a);
|
|
105
|
+
}
|
|
106
|
+
/** 已登记条目里第一条与 `dir` 冲突的。 */
|
|
107
|
+
function findDirConflict(projects, dir) {
|
|
108
|
+
return projects.find((project) => dirsConflict(project.dir, dir));
|
|
109
|
+
}
|
|
110
|
+
/** 把任意路径换算成相对工作空间根的 POSIX 路径(`projects[].dir` / `deploy[].dir` 都用它)。 */
|
|
111
|
+
function relativeToRoot(root, target) {
|
|
112
|
+
const relative = path.relative(root, path.resolve(target));
|
|
113
|
+
if (relative === '')
|
|
114
|
+
return '.';
|
|
115
|
+
return relative.split(path.sep).join('/');
|
|
116
|
+
}
|
|
117
|
+
// ---------------------------------------------------------------------------
|
|
118
|
+
// 读
|
|
119
|
+
// ---------------------------------------------------------------------------
|
|
120
|
+
function isPlainObject(value) {
|
|
121
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* 从一份**已经通过 parseConfig 校验**的文本里取出全项目视角。
|
|
125
|
+
* 这里的形状检查只是防御性的(校验的权威在 parseConfig),不重复给诊断。
|
|
126
|
+
*/
|
|
127
|
+
function projectsOf(document) {
|
|
128
|
+
if (!Array.isArray(document.projects))
|
|
129
|
+
return [];
|
|
130
|
+
const projects = [];
|
|
131
|
+
for (const item of document.projects) {
|
|
132
|
+
if (!isPlainObject(item))
|
|
133
|
+
continue;
|
|
134
|
+
if (typeof item.type !== 'string' || typeof item.dir !== 'string')
|
|
135
|
+
continue;
|
|
136
|
+
const normalized = (0, siteConfig_1.normalizeProjectDir)(item.dir);
|
|
137
|
+
if (normalized === undefined)
|
|
138
|
+
continue;
|
|
139
|
+
projects.push({ ...item, type: item.type, dir: normalized });
|
|
140
|
+
}
|
|
141
|
+
return projects;
|
|
142
|
+
}
|
|
143
|
+
/** parseConfig / findConfig 的失败结果 → 面向用户的一段话。成功时返回 undefined。 */
|
|
144
|
+
function describeConfigProblem(result, startDir) {
|
|
145
|
+
switch (result.kind) {
|
|
146
|
+
case 'valid':
|
|
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
|
+
}
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* 从 `startDir` 向上找到工作空间并读出全项目视角。
|
|
171
|
+
* 查找与校验都走 `findConfig`(发布侧同一份实现),这里只负责把结果翻译成写侧要的形状。
|
|
172
|
+
*/
|
|
173
|
+
function loadWorkspace(startDir) {
|
|
174
|
+
const found = (0, siteConfig_1.findConfig)(startDir);
|
|
175
|
+
const problem = describeConfigProblem(found, path.resolve(startDir));
|
|
176
|
+
if (problem !== undefined || found.kind !== 'valid') {
|
|
177
|
+
return { kind: 'error', message: problem ?? `cannot read ${exports.CONFIG_FILENAME}` };
|
|
178
|
+
}
|
|
179
|
+
const configPath = found.config.path;
|
|
180
|
+
let document;
|
|
181
|
+
try {
|
|
182
|
+
const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8'));
|
|
183
|
+
if (!isPlainObject(parsed))
|
|
184
|
+
return { kind: 'error', message: `${configPath}: the top level must be a JSON object` };
|
|
185
|
+
document = parsed;
|
|
186
|
+
}
|
|
187
|
+
catch (err) {
|
|
188
|
+
return { kind: 'error', message: `${configPath} cannot be read: ${err.message}` };
|
|
189
|
+
}
|
|
190
|
+
return {
|
|
191
|
+
kind: 'ok',
|
|
192
|
+
workspace: {
|
|
193
|
+
configPath,
|
|
194
|
+
root: path.dirname(configPath),
|
|
195
|
+
document,
|
|
196
|
+
spid: found.config.spid,
|
|
197
|
+
...(typeof document.name === 'string' ? { name: document.name } : {}),
|
|
198
|
+
projects: projectsOf(document),
|
|
199
|
+
},
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
// ---------------------------------------------------------------------------
|
|
203
|
+
// 写
|
|
204
|
+
// ---------------------------------------------------------------------------
|
|
205
|
+
/**
|
|
206
|
+
* 这个路径上是不是一份**发布侧也认**的合法配置。只回答是/否 —— 调用方(迁移提示)只需要
|
|
207
|
+
* 知道「用户是不是已经有一份能用的配置了」,不需要诊断细节。
|
|
208
|
+
*/
|
|
209
|
+
function isValidConfigFile(configPath) {
|
|
210
|
+
try {
|
|
211
|
+
return (0, siteConfig_1.parseConfig)(fs.readFileSync(configPath, 'utf8'), configPath).kind === 'valid';
|
|
212
|
+
}
|
|
213
|
+
catch {
|
|
214
|
+
return false;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
/** 目录里是否残留退役的 YAML 方言配置。 */
|
|
218
|
+
function legacyConfigIn(dir) {
|
|
219
|
+
for (const name of appConfig_1.LEGACY_APP_CONFIG_FILENAMES) {
|
|
220
|
+
const candidate = path.join(dir, name);
|
|
221
|
+
if (fs.existsSync(candidate))
|
|
222
|
+
return candidate;
|
|
223
|
+
}
|
|
224
|
+
return undefined;
|
|
225
|
+
}
|
|
226
|
+
/** 锁文件与配置同目录、以 `.` 开头 —— 与发布侧是同一把锁(同名文件即同一把锁)。 */
|
|
227
|
+
function lockPathFor(configPath) {
|
|
228
|
+
return path.join(path.dirname(configPath), `.${path.basename(configPath)}.lock`);
|
|
229
|
+
}
|
|
230
|
+
function writePreservingMode(filePath, content) {
|
|
231
|
+
let mode;
|
|
232
|
+
try {
|
|
233
|
+
mode = fs.statSync(filePath).mode & 0o777;
|
|
234
|
+
}
|
|
235
|
+
catch {
|
|
236
|
+
mode = undefined;
|
|
237
|
+
}
|
|
238
|
+
(0, fsAtomic_1.atomicWriteFileSync)(filePath, content);
|
|
239
|
+
// atomicWriteFileSync 以 0600 建临时文件再 rename。supersdk.json 是人机共写、通常入库的
|
|
240
|
+
// 普通配置,不该被一次机器写入悄悄收紧成 0600。
|
|
241
|
+
if (mode !== undefined) {
|
|
242
|
+
try {
|
|
243
|
+
fs.chmodSync(filePath, mode);
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
// 权限保持是尽力而为,失败不影响内容已正确落盘。
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
/** 写出前自证:写出去的东西必须能被**发布侧同一个解析器**读回来。 */
|
|
251
|
+
function serializeVerified(configPath, document) {
|
|
252
|
+
const serialized = (0, appConfig_1.serializeAppConfig)(document);
|
|
253
|
+
const verified = (0, siteConfig_1.parseConfig)(serialized, configPath);
|
|
254
|
+
if (verified.kind !== 'valid') {
|
|
255
|
+
const detail = verified.kind === 'invalid' ? verified.reason : verified.kind;
|
|
256
|
+
throw new WorkspaceConfigError(`refusing to write an invalid ${exports.CONFIG_FILENAME}: ${detail}`);
|
|
257
|
+
}
|
|
258
|
+
return serialized;
|
|
259
|
+
}
|
|
260
|
+
/**
|
|
261
|
+
* 首次落盘。用 `wx` 独占创建:`supersdk.json` 已存在时**必须**失败而不是覆盖 ——
|
|
262
|
+
* 覆盖会把一个已有工作空间的 projects[] / orgId 整份抹掉。
|
|
263
|
+
*/
|
|
264
|
+
function createWorkspaceConfig(configPath, document) {
|
|
265
|
+
const serialized = serializeVerified(configPath, document);
|
|
266
|
+
fs.mkdirSync(path.dirname(configPath), { recursive: true });
|
|
267
|
+
fs.writeFileSync(configPath, serialized, { encoding: 'utf8', flag: 'wx' });
|
|
268
|
+
}
|
|
269
|
+
/**
|
|
270
|
+
* `加锁 → parse → 只改 projects[] → stringify`。整份文档在**锁内**从磁盘重新读取,未知键随
|
|
271
|
+
* 对象一并带回,只有 projects 一处被触碰。
|
|
272
|
+
*
|
|
273
|
+
* 🔴 跨进程锁不是可选项:`readFileSync → 改 → atomicWriteFileSync` 里的 atomic rename 只保证
|
|
274
|
+
* 文件不撕裂,**不防 lost update**。两个 `supercli add` 并行时,后写者会把先写者刚落盘的条目
|
|
275
|
+
* 整条抹掉。dir 冲突检查也必须在锁内**再做一次**:锁外那次只是为了尽早失败。
|
|
276
|
+
*/
|
|
277
|
+
function appendProject(configPath, entry) {
|
|
278
|
+
const release = (0, fsAtomic_1.acquireLockSync)(lockPathFor(configPath), { label: exports.CONFIG_FILENAME });
|
|
279
|
+
try {
|
|
280
|
+
// 必须在锁内重读:锁外读到的可能已被其他进程改写。
|
|
281
|
+
const before = fs.readFileSync(configPath, 'utf8');
|
|
282
|
+
const gate = (0, siteConfig_1.parseConfig)(before, configPath);
|
|
283
|
+
if (gate.kind !== 'valid') {
|
|
284
|
+
const detail = gate.kind === 'invalid' ? gate.reason : gate.kind;
|
|
285
|
+
throw new WorkspaceConfigError(`refusing to write an unparseable ${exports.CONFIG_FILENAME}: ${detail}`);
|
|
286
|
+
}
|
|
287
|
+
const document = JSON.parse(before);
|
|
288
|
+
const conflict = findDirConflict(projectsOf(document), entry.dir);
|
|
289
|
+
if (conflict) {
|
|
290
|
+
throw new WorkspaceConfigError(`refusing to register "${entry.dir}": the ${conflict.type} project at "${conflict.dir}" already ` +
|
|
291
|
+
'covers it — project directories must be unique and must not contain one another');
|
|
292
|
+
}
|
|
293
|
+
const list = (0, appConfig_1.hasOwn)(document, 'projects') && Array.isArray(document.projects) ? [...document.projects] : [];
|
|
294
|
+
list.push(entry);
|
|
295
|
+
document.projects = list;
|
|
296
|
+
writePreservingMode(configPath, serializeVerified(configPath, document));
|
|
297
|
+
}
|
|
298
|
+
finally {
|
|
299
|
+
release();
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
// ---------------------------------------------------------------------------
|
|
303
|
+
// v2 → v3 的迁移提示
|
|
304
|
+
// ---------------------------------------------------------------------------
|
|
305
|
+
/**
|
|
306
|
+
* schemaVersion 不是 3 时的 fail-closed 指引。
|
|
307
|
+
*
|
|
308
|
+
* 🔴 两条纪律,都是上一版这段文案违反过的:
|
|
309
|
+
*
|
|
310
|
+
* 1. **绝不让人重建工作空间**。`rm supersdk.json` + 重新 init/add 会丢掉 publish-site 回填的
|
|
311
|
+
* `orgId` 和全部 `sites[]`/`deploy[]` 绑定 —— 那些是服务端签发过的东西,重跑一遍拿不回来。
|
|
312
|
+
* 而仓库里 vendored 的引擎自带**无损**的 `migrate`(未知根键、orgId、每条发布绑定原样带过),
|
|
313
|
+
* 指引必须指向它。
|
|
314
|
+
* 2. **命令要能原样粘进 shell**。裸 `<spid>` 粘进 bash 是 `syntax error near unexpected token
|
|
315
|
+
* 'newline'`(退出码 2),人根本走不到「这条命令想干什么」那一步。所以这里唯一的可执行块
|
|
316
|
+
* 里没有占位符:路径全是运行时算出来的真值,剩下的说明一律是散文。
|
|
317
|
+
*
|
|
318
|
+
* 命令形态**不在这里自己拼**:单点在 `config/appConfig.ts` 的 `engineMigrateCommand()`
|
|
319
|
+
* (发布侧 publishSite.ts 用的是同一个函数)。`--config` 在权威侧是 `required=True`,
|
|
320
|
+
* 少这一个参数照抄下去就是 `error: the following arguments are required: --config`、退出码 2。
|
|
321
|
+
*/
|
|
322
|
+
function unsupportedSchemaMessage(configPath, found) {
|
|
323
|
+
const root = path.dirname(configPath);
|
|
324
|
+
const migrate = `cd ${(0, shell_1.shellQuote)(root)} && ${(0, appConfig_1.engineMigrateCommand)(path.basename(configPath))}`;
|
|
325
|
+
const head = `${configPath} has schemaVersion ${JSON.stringify(found)}; supercli only reads schemaVersion ${exports.SCHEMA_VERSION}.`;
|
|
326
|
+
if (typeof found === 'number' && found > exports.SCHEMA_VERSION) {
|
|
327
|
+
return [
|
|
328
|
+
head,
|
|
329
|
+
'this file was written by a newer supercli. do NOT hand-edit the version down — run `supercli update` and retry.',
|
|
330
|
+
].join('\n');
|
|
331
|
+
}
|
|
332
|
+
return [
|
|
333
|
+
head,
|
|
334
|
+
`v${exports.SCHEMA_VERSION} is a breaking change with no backward compatibility, but nothing has to be re-created: the ` +
|
|
335
|
+
'build engine vendored under scripts/ migrates this file in place and loses nothing — orgId, every publish ' +
|
|
336
|
+
'binding and every unknown key are carried over.',
|
|
337
|
+
'',
|
|
338
|
+
'Preview it, then apply it:',
|
|
339
|
+
'',
|
|
340
|
+
` ${migrate} --dry-run`,
|
|
341
|
+
` ${migrate}`,
|
|
342
|
+
'',
|
|
343
|
+
'What it changes: "android" / "ios" / "web" each become one entry in "projects" (keeping name/package/bundleId/' +
|
|
344
|
+
'spmMode); every "sites" entry moves unchanged, as {slug, name, env, dir}, into the "deploy" array of the site ' +
|
|
345
|
+
'project that owns it; "environment" is dropped because the SDK environment is a runtime argument of ' +
|
|
346
|
+
'SuperSDK.init() (omitting it means prod); "orgId", "version" and "sdk" stay exactly where they are.',
|
|
347
|
+
'',
|
|
348
|
+
`If \`migrate\` comes back as an unknown subcommand, the engine vendored at ${appConfig_1.ENGINE_SCRIPT_RELPATH} predates ` +
|
|
349
|
+
`v${exports.SCHEMA_VERSION}. Run \`supercli init\` in a new empty directory and copy that workspace's scripts/ and ` +
|
|
350
|
+
'super_build.sh over yours first — init and add never overwrite files that are already in place, so they ' +
|
|
351
|
+
'cannot refresh them for you.',
|
|
352
|
+
'',
|
|
353
|
+
`Migrating by hand instead? This is the complete v${exports.SCHEMA_VERSION} shape:`,
|
|
354
|
+
'',
|
|
355
|
+
(0, appConfig_1.appConfigSkeleton)(),
|
|
356
|
+
].join('\n');
|
|
357
|
+
}
|
|
358
|
+
// ---------------------------------------------------------------------------
|
|
359
|
+
// 工作空间嵌套
|
|
360
|
+
// ---------------------------------------------------------------------------
|
|
361
|
+
/**
|
|
362
|
+
* `target` **之上**是否已经有一份工作空间配置;有就返回最近的那份的路径。
|
|
363
|
+
*
|
|
364
|
+
* 🔴 为什么 `init` 必须查这个:`findConfig` 是「从 cwd 向上找到第一份就停」,所以嵌套出来的
|
|
365
|
+
* 内层 `supersdk.json` 会**遮蔽**外层 —— 之后每一次 `add` / `publish-site` 都悄悄绑到内层那个
|
|
366
|
+
* spid 上,两份配置各自漂移,全程零告警。`add` 早就把「项目目录不得互为祖先」当硬失败
|
|
367
|
+
* (findDirConflict),`init` 不查就等于在同一棵树上给了两套判据。
|
|
368
|
+
*
|
|
369
|
+
* 判定复用 `findConfig` 而不是另写一次向上遍历:停止边界(.git 仓库根 / 家目录 / 文件系统根 /
|
|
370
|
+
* 深度上限)必须与真正会去读配置的那条路径逐字一致,否则「init 说不嵌套、add 却找到了外层」。
|
|
371
|
+
*/
|
|
372
|
+
function findEnclosingWorkspace(target) {
|
|
373
|
+
const resolved = path.resolve(target);
|
|
374
|
+
const parent = path.dirname(resolved);
|
|
375
|
+
if (parent === resolved)
|
|
376
|
+
return undefined;
|
|
377
|
+
const found = (0, siteConfig_1.findConfig)(parent);
|
|
378
|
+
switch (found.kind) {
|
|
379
|
+
case 'valid':
|
|
380
|
+
return found.config.path;
|
|
381
|
+
// 这两种只可能来自一个真实存在的 supersdk.json(v2 的、或写坏了的)—— 一样会遮蔽。
|
|
382
|
+
case 'unsupported-schema':
|
|
383
|
+
case 'invalid':
|
|
384
|
+
return found.path;
|
|
385
|
+
// 上层是退役 YAML:它不参与 supersdk.json 的向上查找,只有同目录确实还有一份 JSON 时才算嵌套。
|
|
386
|
+
case 'legacy-app-yaml':
|
|
387
|
+
case 'legacy-site-yml':
|
|
388
|
+
return found.existingConfigPath;
|
|
389
|
+
case 'absent':
|
|
390
|
+
return undefined;
|
|
391
|
+
default: {
|
|
392
|
+
const exhaustive = found;
|
|
393
|
+
void exhaustive;
|
|
394
|
+
return undefined;
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
// ---------------------------------------------------------------------------
|
|
399
|
+
// 退役 YAML 方言的迁移提示
|
|
400
|
+
// ---------------------------------------------------------------------------
|
|
401
|
+
/**
|
|
402
|
+
* Fail-closed diagnostic for a retired YAML config. The snippet is meant to be
|
|
403
|
+
* pasted into a shell verbatim — a migration hint that is missing even one
|
|
404
|
+
* required field is a dead end, so the skeleton carries the complete set.
|
|
405
|
+
*
|
|
406
|
+
* 两种情形,动作顺序不同(且不能反):
|
|
407
|
+
* - 目录里**已经有一份合法的 supersdk.json** → 没有任何字段需要搬运,只发 `rm <legacy>`。
|
|
408
|
+
* 再让人照抄一遍 `cat >` 会用占位值覆盖掉他已经写好的真配置。
|
|
409
|
+
* - 没有 → 先写新文件、**再**删旧文件:旧文件是字段的唯一来源,先删就没得抄了。
|
|
410
|
+
*/
|
|
411
|
+
function legacyMigrationMessage(yamlPath, jsonAlreadyValid = false) {
|
|
412
|
+
const legacyName = path.basename(yamlPath);
|
|
413
|
+
const dir = path.dirname(yamlPath);
|
|
414
|
+
const head = [
|
|
415
|
+
`${legacyName} (retired schema_version: 1 dialect) is no longer supported — supercli reads ` +
|
|
416
|
+
`${exports.CONFIG_FILENAME} (schemaVersion ${exports.SCHEMA_VERSION}) only, and there is no compatibility fallback.`,
|
|
417
|
+
`found: ${yamlPath}`,
|
|
418
|
+
'',
|
|
419
|
+
];
|
|
420
|
+
if (jsonAlreadyValid) {
|
|
421
|
+
return [
|
|
422
|
+
...head,
|
|
423
|
+
`your ${exports.CONFIG_FILENAME} is already in place — nothing to migrate, just delete the retired file:`,
|
|
424
|
+
'',
|
|
425
|
+
`cd ${(0, shell_1.shellQuote)(dir)}`,
|
|
426
|
+
`rm ${(0, shell_1.shellQuote)(legacyName)}`,
|
|
427
|
+
].join('\n');
|
|
428
|
+
}
|
|
429
|
+
return [
|
|
430
|
+
...head,
|
|
431
|
+
'Migrate it once — replace the placeholder values with the ones already in your YAML, then run:',
|
|
432
|
+
'',
|
|
433
|
+
`cd ${(0, shell_1.shellQuote)(dir)}`,
|
|
434
|
+
`cat > ${(0, shell_1.shellQuote)(exports.CONFIG_FILENAME)} <<'SUPERSDK_JSON'`,
|
|
435
|
+
(0, appConfig_1.appConfigSkeleton)(),
|
|
436
|
+
'SUPERSDK_JSON',
|
|
437
|
+
`rm ${(0, shell_1.shellQuote)(legacyName)}`,
|
|
438
|
+
].join('\n');
|
|
439
|
+
}
|
|
440
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/workspace/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
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
|
+
exports.isValidSpid = isValidSpid;
|
|
5
|
+
exports.checkSpid = checkSpid;
|
|
6
|
+
exports.checkName = checkName;
|
|
7
|
+
exports.checkAndroidPackage = checkAndroidPackage;
|
|
8
|
+
exports.checkIosBundleId = checkIosBundleId;
|
|
9
|
+
exports.checkSpmMode = checkSpmMode;
|
|
10
|
+
exports.checkSiteName = checkSiteName;
|
|
11
|
+
exports.checkSlug = checkSlug;
|
|
12
|
+
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
|
+
exports.SPID_PATTERN_SOURCE = '[a-z0-9]{8}';
|
|
26
|
+
exports.ANDROID_PACKAGE_PATTERN_SOURCE = '[A-Za-z][A-Za-z0-9_]*(\\.[A-Za-z][A-Za-z0-9_]*)+';
|
|
27
|
+
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 android module (ANDROID_NAMESPACE in supersdk_template.py). */
|
|
29
|
+
exports.ANDROID_NAMESPACE = 'com.supersdk.simple';
|
|
30
|
+
/** ios.spmMode 的取值集合,镜像 supersdk_template.py 的 validate_ios_spm_mode()。 */
|
|
31
|
+
exports.SPM_MODES = ['mock', 'real'];
|
|
32
|
+
/**
|
|
33
|
+
* The template's own SuperSDK identity. `supercli add` must never let any of these
|
|
34
|
+
* survive into a generated project — a repo carrying them cannot be shipped.
|
|
35
|
+
* Listed here so failure messages can name them explicitly.
|
|
36
|
+
*/
|
|
37
|
+
exports.TEMPLATE_DEFAULTS = {
|
|
38
|
+
name: 'SuperSDK Simple',
|
|
39
|
+
androidPackage: 'com.supersdk.simple.host',
|
|
40
|
+
iosBundleId: 'com.supersdk.simple',
|
|
41
|
+
};
|
|
42
|
+
const SPID_PATTERN = new RegExp(`^${exports.SPID_PATTERN_SOURCE}$`);
|
|
43
|
+
const ANDROID_PACKAGE_PATTERN = new RegExp(`^${exports.ANDROID_PACKAGE_PATTERN_SOURCE}$`);
|
|
44
|
+
const IOS_BUNDLE_ID_PATTERN = new RegExp(`^${exports.IOS_BUNDLE_ID_PATTERN_SOURCE}$`);
|
|
45
|
+
function isValidSpid(spid) {
|
|
46
|
+
return SPID_PATTERN.test(spid);
|
|
47
|
+
}
|
|
48
|
+
/** Validators return `undefined` when the value is acceptable, otherwise a human-readable reason. */
|
|
49
|
+
function checkSpid(value) {
|
|
50
|
+
return isValidSpid(value) ? undefined : `must match ^${exports.SPID_PATTERN_SOURCE}$ (8 lowercase letters or digits, issued by Console)`;
|
|
51
|
+
}
|
|
52
|
+
/** Android app label rules from require_android_config(): non-empty, no control chars, no surrounding whitespace. */
|
|
53
|
+
function checkName(value) {
|
|
54
|
+
if (value.trim() === '')
|
|
55
|
+
return 'must not be empty';
|
|
56
|
+
if (value !== value.trim())
|
|
57
|
+
return 'must not have leading or trailing whitespace';
|
|
58
|
+
for (const char of value) {
|
|
59
|
+
// Python authority uses `ord(char) < 32`; deliberately identical, no extra rules.
|
|
60
|
+
if ((char.codePointAt(0) ?? 0) < 32)
|
|
61
|
+
return 'must not contain control characters';
|
|
62
|
+
}
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
function checkAndroidPackage(value) {
|
|
66
|
+
if (!ANDROID_PACKAGE_PATTERN.test(value)) {
|
|
67
|
+
return `must be a Java package matching ^${exports.ANDROID_PACKAGE_PATTERN_SOURCE}$ (e.g. com.acme.myapp)`;
|
|
68
|
+
}
|
|
69
|
+
if (value === exports.ANDROID_NAMESPACE) {
|
|
70
|
+
return `must differ from the template's fixed Gradle namespace ${exports.ANDROID_NAMESPACE}`;
|
|
71
|
+
}
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
function checkIosBundleId(value) {
|
|
75
|
+
return IOS_BUNDLE_ID_PATTERN.test(value)
|
|
76
|
+
? undefined
|
|
77
|
+
: `must be a bundle identifier matching ^${exports.IOS_BUNDLE_ID_PATTERN_SOURCE}$ (e.g. com.acme.myapp)`;
|
|
78
|
+
}
|
|
79
|
+
function checkSpmMode(value) {
|
|
80
|
+
return exports.SPM_MODES.includes(value) ? undefined : `must be one of ${exports.SPM_MODES.join('|')}`;
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* 站点名多一条长度上限:它会同时落进 `projects[].name` 与 `deploy[].name`,而**发布侧的
|
|
84
|
+
* 解析器对后者有 50 字符上限**(parseDeployEntries)。不在这里拦,超长的名字要等到文件都
|
|
85
|
+
* 拷完、写配置那一刻才被拒绝,然后整次 add 回滚 —— 报错时机差得越远越难懂。
|
|
86
|
+
*/
|
|
87
|
+
exports.SITE_NAME_MAX_LENGTH = 50;
|
|
88
|
+
function checkSiteName(value) {
|
|
89
|
+
const reason = checkName(value);
|
|
90
|
+
if (reason)
|
|
91
|
+
return reason;
|
|
92
|
+
return Array.from(value).length > exports.SITE_NAME_MAX_LENGTH ? `must be at most ${exports.SITE_NAME_MAX_LENGTH} characters` : undefined;
|
|
93
|
+
}
|
|
94
|
+
function checkSlug(value) {
|
|
95
|
+
return (0, siteConfig_1.isValidSlug)(value) ? undefined : 'must be 1-32 lowercase letters or digits, and must not be stg';
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* `deploy[].env` —— 站点发布到项目的哪个环境。
|
|
99
|
+
*
|
|
100
|
+
* 🔴 它**不是**已被移出配置的 SDK `environment`:后者是运行时 `SuperSDK.init(...)` 的参数,
|
|
101
|
+
* 编译期与配置里都不该再出现;前者是服务端站点实体的一部分,发布时必填。
|
|
102
|
+
*/
|
|
103
|
+
function checkSiteEnv(value) {
|
|
104
|
+
return (0, siteConfig_1.isValidEnvironment)(value) ? undefined : 'must be 1-10 lowercase letters or digits (e.g. prod, staging)';
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=identity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/workspace/identity.ts"],"names":[],"mappings":"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"}
|