@supersdk/supercli 0.3.0-staging.22 → 0.3.0-staging.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -9,6 +9,7 @@ const init_1 = require("./commands/init");
9
9
  const login_1 = require("./commands/login");
10
10
  const logout_1 = require("./commands/logout");
11
11
  const publishSite_1 = require("./commands/publishSite");
12
+ const register_1 = require("./commands/register");
12
13
  const switchaccount_1 = require("./commands/switchaccount");
13
14
  const update_1 = require("./commands/update");
14
15
  const resultPrinter_1 = require("./output/resultPrinter");
@@ -62,6 +63,7 @@ function buildProgram() {
62
63
  (0, update_1.registerUpdateCommand)(program);
63
64
  (0, init_1.registerInitCommand)(program);
64
65
  (0, add_1.registerAddCommand)(program);
66
+ (0, register_1.registerRegisterCommand)(program);
65
67
  (0, publishSite_1.registerPublishSiteCommand)(program);
66
68
  // `supercli help <未知命令>` 默认只闷头打印总 help,用户不知道自己敲错了命令名 ——
67
69
  // 而 `supercli <未知命令>` 是有 `error: unknown command` 的,同一个 CLI 两种态度。
@@ -104,9 +106,15 @@ async function run() {
104
106
  // option / bad flag) must not print its own free-form text to stdout and
105
107
  // exit with commander's ad-hoc code — collect it into the standard envelope
106
108
  // and exit 6 instead (AC-1/AC-3). --help/--version still terminate 0.
107
- program.exitOverride();
108
- for (const cmd of program.commands)
109
+ // 递归到子子命令(`register android` 那一层):commander 的 exitOverride 只作用于它被
110
+ // 调用的那个 Command,漏掉嵌套层就会让 `register android <dir> --bogus --output json`
111
+ // 走 commander 自己的 process.exit + 自由文本,而不是标准 envelope。
112
+ const overrideAll = (cmd) => {
109
113
  cmd.exitOverride();
114
+ for (const child of cmd.commands)
115
+ overrideAll(child);
116
+ };
117
+ overrideAll(program);
110
118
  }
111
119
  try {
112
120
  await program.parseAsync(argv);
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
@@ -43,10 +43,8 @@ const shell_1 = require("../util/shell");
43
43
  const config_1 = require("../workspace/config");
44
44
  const identity_1 = require("../workspace/identity");
45
45
  const interactive_1 = require("../workspace/interactive");
46
+ const projectIdentity_1 = require("../workspace/projectIdentity");
46
47
  const template_1 = require("../workspace/template");
47
- const DEFAULT_SITE_ENV = 'prod';
48
- /** `web_package.py` 的 DIST_DIRNAME —— 站点的唯一可发布构建产物目录。 */
49
- const SITE_DIST_DIRNAME = 'dist';
50
48
  function commandLabel(type) {
51
49
  return `supercli add ${type}`;
52
50
  }
@@ -54,227 +52,53 @@ function isPlainObject(value) {
54
52
  return typeof value === 'object' && value !== null && !Array.isArray(value);
55
53
  }
56
54
  /**
57
- * The exact command a caller must run to succeed non-interactively. Known values are
58
- * echoed back verbatim; unknown ones become quoted `<...>` placeholders. Quoting matters:
59
- * the whole line stays runnable (shlex semantics, single quotes — double quotes would let
60
- * the shell expand a `$` inside a path), so pasting it without editing fails on this
61
- * command's own validation instead of on a shell redirect.
62
- */
63
- function suggestedCommand(type, dirArg, projectDir, opts, resolved) {
64
- const placeholder = (hint) => (0, shell_1.shellQuote)(`<${hint}>`);
65
- const parts = [commandLabel(type), (0, shell_1.shellQuote)(dirArg)];
66
- const push = (flag, value, hint) => {
67
- parts.push(flag, value ? (0, shell_1.shellQuote)(value) : placeholder(hint));
68
- };
69
- // 🔴 可选 flag 只在用户**本来就传了**它的时候回显,而且回显的是**解析后**的值。
70
- // 传了但被拒时,既不能原样抄回那个坏值(照着提示重跑 → 撞回同一句错误,死循环),也不该
71
- // 给占位符(占位符对可选 flag 同样是死循环:粘回去还是同一条报错)。这里回显的是**这个
72
- // flag 的默认值** —— 命令当场可跑,而且默认值就写在命令里、看得见,不是被我们悄悄替换掉的。
73
- const echoOptional = (flag, provided, value, fallback) => {
74
- if ((0, interactive_1.trimFlag)(provided) === undefined)
75
- return;
76
- parts.push(flag, (0, shell_1.shellQuote)(value ?? fallback));
77
- };
78
- if (type === 'site') {
79
- push('--slug', resolved.slug, 'myapp');
80
- if (resolved.name)
81
- parts.push('--name', (0, shell_1.shellQuote)(resolved.name));
82
- echoOptional('--env', opts.env, resolved.env, DEFAULT_SITE_ENV);
83
- echoOptional('--deploy-dir', opts.deployDir, resolved.deployDir, projectDir === '.' ? SITE_DIST_DIRNAME : `${projectDir}/${SITE_DIST_DIRNAME}`);
84
- return parts.join(' ');
85
- }
86
- push('--name', resolved.name, 'App label');
87
- if (type === 'android')
88
- push('--package', resolved.package, 'com.acme.myapp');
89
- if (type === 'ios') {
90
- push('--bundle-id', resolved.bundleId, 'com.acme.myapp');
91
- echoOptional('--spm-mode', opts.spmMode, resolved.spmMode, identity_1.SPM_MODES[0]);
92
- }
93
- return parts.join(' ');
94
- }
95
- function flagReference(type) {
96
- const lines = ['Flags:'];
97
- if (type === 'android') {
98
- lines.push(' --name <label> required, the Android app label. Never derived, never inherited.', ' --package <pkg> required, the Java package / applicationId (e.g. com.acme.myapp).');
99
- }
100
- else if (type === 'ios') {
101
- 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]}).`);
102
- }
103
- else {
104
- lines.push(' --slug <slug> required, 1-32 lowercase letters/digits identifying the site.', ' --name <label> optional. Left out, nothing is recorded and the site name resolves to the slug — so a ' +
105
- 'later `supercli publish-site --name <label>` still decides it.', ` --env <env> optional, the project environment this site deploys to (default: ${DEFAULT_SITE_ENV}). ` +
106
- '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 ` +
107
- `${config_1.CONFIG_FILENAME} it is relative to the WORKSPACE ROOT — not to <dir> — and it must sit inside <dir>. ` +
108
- `Default: <dir>/${SITE_DIST_DIRNAME}.`);
109
- }
110
- return lines;
111
- }
112
- function identityFailureMessage(type, dirArg, projectDir, opts, interactive, resolution, resolved, workspaceName) {
113
- const lines = [];
114
- if (resolution.errors.length > 0) {
115
- lines.push(`invalid \`${commandLabel(type)}\` arguments:`);
116
- for (const error of resolution.errors)
117
- lines.push(` - ${error}`);
118
- }
119
- if (resolution.missingFlags.length > 0) {
120
- lines.push((0, interactive_1.missingFlagsHeadline)(commandLabel(type), interactive, resolution.missingFlags));
121
- }
122
- // 🔴 根上有 name 而项目没给 name 时必须说清楚:workspace 级 name 是纯描述,不是 App label。
123
- // 不说的话,用户看着配置里明明写着 name 却被要求再传一个 --name,只会以为 CLI 坏了。
124
- if (resolution.missingFlags.includes('--name') && workspaceName !== undefined) {
125
- lines.push('', `the workspace name ${JSON.stringify(workspaceName)} in ${config_1.CONFIG_FILENAME} is a description only — ` +
126
- 'it is never used as an App label, so every android/ios project must carry its own --name.');
127
- }
128
- if (type !== 'site') {
129
- lines.push('', "`supercli add` never falls back to the template's own SuperSDK identity " +
130
- `(name "${identity_1.TEMPLATE_DEFAULTS.name}", android package ${identity_1.TEMPLATE_DEFAULTS.androidPackage}, ` +
131
- `ios bundleId ${identity_1.TEMPLATE_DEFAULTS.iosBundleId}) — a project generated from those values ` +
132
- 'cannot be published to any store.');
133
- }
134
- lines.push('', 'Re-run with the values spelled out:', '', ` ${suggestedCommand(type, dirArg, projectDir, opts, resolved)}`, '');
135
- lines.push(...flagReference(type));
136
- return lines.join('\n');
137
- }
138
- /**
139
- * `--deploy-dir` 的锚点是**工作空间根**,和 `projects[].dir` / `deploy[].dir` 完全一致 ——
140
- * 不是 `<dir>`。`<dir>` 是 cwd 相对的(命令行参数),`--deploy-dir` 是根相对的(配置字段),
141
- * 两个 flag 两个锚点,不说清楚就会写出 `cd apps && add site web --deploy-dir dist` → 记下
142
- * `<root>/dist` 这种指向一个根本不存在的目录的条目。
55
+ * 「这个目录里已经有东西了」时的出路。
143
56
  *
144
- * 🔴 再加一道包含性检查:发布目录必须落在这个站点项目自己的目录里。发布侧的回填是**只增不改**,
145
- * `deploy[].dir` 记错之后没有任何代码路径会去纠正它(publishSite.ts 的注释已经写明这一点),
146
- * 所以唯一的机会就是写进去之前。
57
+ * add = 新建,register = 接管已有 —— 两条命令是互补的,所以 add 在非空目录上失败时**必须**
58
+ * 把人送到 register,而不是停在「换个空目录吧」。后者对「已有工程想接入 SDK」这个最主流的
59
+ * 场景根本不是一个可行动作,人只能退回去手写 `projects[]`。
147
60
  *
148
- * 不查「目录是否存在」是刻意的:`dist/` 是构建产物,`add` 之后、第一次构建之前它本来就不该在。
61
+ * 🔴 ios 不在其中:register 明确不支持 ios(模板的 iOS 工程由 XcodeGen 从 project.yml 生成,
62
+ * 直接维护 .xcodeproj 的已有工程接不上)。给它一条跑不通的命令,比不给更糟。
149
63
  */
150
- function checkDeployDir(projectDir, value) {
151
- const outcome = (0, config_1.checkProjectDir)(value);
152
- if ('error' in outcome)
153
- return outcome.error;
154
- if (!(0, config_1.dirCovers)(projectDir, outcome.dir)) {
155
- return (`"${outcome.dir}" is outside the project directory "${projectDir}". --deploy-dir is relative to the ` +
156
- `workspace root (like every dir in ${config_1.CONFIG_FILENAME}), not to <dir>, and the published build output must ` +
157
- `live inside the site project that owns it — e.g. --deploy-dir ${projectDir === '.' ? SITE_DIST_DIRNAME : `${projectDir}/${SITE_DIST_DIRNAME}`}`);
158
- }
159
- return undefined;
160
- }
161
- function resolveIdentity(type, projectDir, opts, interactive, prompt) {
162
- const resolution = (0, interactive_1.newResolution)();
163
- const resolved = {};
164
- if (type === 'site') {
165
- // slug 是身份字段:永不继承、永不推导。
166
- resolved.slug = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
167
- flag: '--slug',
168
- question: 'Site slug (1-32 lowercase letters/digits, unique inside the project)',
169
- provided: (0, interactive_1.trimFlag)(opts.slug),
170
- check: identity_1.checkSlug,
171
- required: true,
172
- });
173
- // 🔴 `--name` 没给就**什么都不写**,绝不把「默认等于 slug」materialize 进配置。
174
- // 「默认等于 slug」是一条**解析规则**,不是用户已经作出的决定;一旦落盘,它就变成一条
175
- // 记录,而发布侧是「记录优先于 flag」—— 用户后来敲的 `publish-site --name 'Acme Web'`
176
- // 会被这条我们自己编出来的记录静默压掉。v2 时代 sites[] 是发布成功后才有的,所以首次
177
- // 发布的 --name 一直是生效的;v3 由 add 预写条目之后,这条默认值就成了静默覆盖用户输入
178
- // 的源头。配套的另一半在发布侧(publishSite.ts 取 siteName 的那行,优先级必须是
179
- // 「显式 --name > 已记录的 deploy[].name > slug」)—— 这里先保证配置只记录用户真说过的话。
180
- resolved.name = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
181
- flag: '--name',
182
- question: 'Site name (optional — leave blank to let it resolve to the slug)',
183
- provided: (0, interactive_1.trimFlag)(opts.name),
184
- check: identity_1.checkSiteName,
185
- required: false,
186
- askWhenOptional: true,
187
- });
188
- resolved.env = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
189
- flag: '--env',
190
- question: 'Project environment this site deploys to',
191
- provided: (0, interactive_1.trimFlag)(opts.env),
192
- fallback: DEFAULT_SITE_ENV,
193
- check: identity_1.checkSiteEnv,
194
- required: false,
195
- });
196
- const deployFallback = projectDir === '.' ? SITE_DIST_DIRNAME : `${projectDir}/${SITE_DIST_DIRNAME}`;
197
- resolved.deployDir = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
198
- flag: '--deploy-dir',
199
- question: `Directory published by publish-site (relative to the workspace root, inside "${projectDir}")`,
200
- provided: (0, interactive_1.trimFlag)(opts.deployDir),
201
- fallback: deployFallback,
202
- check: (value) => checkDeployDir(projectDir, value),
203
- required: false,
204
- });
205
- // 落盘的必须是**归一化后**的那个值:包含性是按归一化结果判的,存原样(`./apps/web/dist/`)
206
- // 会让配置里的字符串与刚刚通过检查的路径不是同一个东西。
207
- if (resolved.deployDir !== undefined) {
208
- const normalized = (0, config_1.checkProjectDir)(resolved.deployDir);
209
- if (!('error' in normalized))
210
- resolved.deployDir = normalized.dir;
211
- }
212
- }
213
- else {
214
- // 🔴 android/ios 的 name 没有 fallback:目录名("android")当 App label 是荒谬的,
215
- // workspace 级 name 更是明令不得投影。TTY 上照问不误,只是没有可回车接受的默认值。
216
- resolved.name = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
217
- flag: '--name',
218
- question: type === 'android' ? 'App name (Android label)' : 'App name (iOS display name)',
219
- provided: (0, interactive_1.trimFlag)(opts.name),
220
- check: identity_1.checkName,
221
- required: true,
222
- });
223
- if (type === 'android') {
224
- resolved.package = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
225
- flag: '--package',
226
- question: 'Java package / applicationId (e.g. com.acme.myapp)',
227
- provided: (0, interactive_1.trimFlag)(opts.package),
228
- check: identity_1.checkAndroidPackage,
229
- required: true,
230
- });
231
- }
232
- else {
233
- resolved.bundleId = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
234
- flag: '--bundle-id',
235
- question: 'Bundle identifier (e.g. com.acme.myapp)',
236
- provided: (0, interactive_1.trimFlag)(opts.bundleId),
237
- check: identity_1.checkIosBundleId,
238
- required: true,
239
- });
240
- resolved.spmMode = (0, interactive_1.resolveValue)(resolution, interactive, prompt, {
241
- flag: '--spm-mode',
242
- question: `SuperSDK Swift package mode (${identity_1.SPM_MODES.join('|')})`,
243
- provided: (0, interactive_1.trimFlag)(opts.spmMode),
244
- fallback: identity_1.SPM_MODES[0],
245
- check: identity_1.checkSpmMode,
246
- required: false,
247
- });
248
- }
249
- }
250
- const required = type === 'site' ? ['slug', 'env', 'deployDir'] : type === 'android' ? ['name', 'package'] : ['name', 'bundleId', 'spmMode'];
251
- const ok = resolution.errors.length === 0 &&
252
- resolution.missingFlags.length === 0 &&
253
- required.every((key) => resolved[key] !== undefined);
254
- return { ok, resolved, resolution };
255
- }
256
- function buildEntry(type, dir, resolved) {
257
- if (type === 'android') {
258
- return { type, dir, name: resolved.name, package: resolved.package };
259
- }
64
+ function adoptExistingHint(type, dirArg, projectDir, opts) {
260
65
  if (type === 'ios') {
261
- return { type, dir, name: resolved.name, bundleId: resolved.bundleId, spmMode: resolved.spmMode };
262
- }
263
- // 🔴 name 只在用户真的给了 --name 时才写。site 的 name 在权威侧(supersdk_template.py 的
264
- // validate_project)本来就是可选的,只有 android/ios 才 require_project_name —— 所以这里
265
- // 留空是合法终态,不是半成品。
266
- const siteName = resolved.name;
267
- const named = siteName !== undefined ? { name: siteName } : {};
268
- return {
269
- type,
270
- dir,
271
- ...named,
272
- // 🔴 deploy 是**数组**,不是单值:同一份产物发多个环境是已文档化的工作流,压成单条会
273
- // 静默丢掉另一条的 name 与 dir。每条逐字等于旧 sites[] 条目 {slug, name, env, dir}。
274
- deploy: [{ slug: resolved.slug, ...named, env: resolved.env, dir: resolved.deployDir }],
275
- // offline.host 由服务端回填:首次 publish-site 成功后 CLI 才把服务端返回的域名记进来。
276
- // CLI 绝不自己拼域名。
66
+ return [
67
+ 'Already have an iOS project there? It cannot be adopted: `supercli register` covers android and site only. ' +
68
+ "Run `supercli register ios <dir>` to see why (the template's iOS project is generated by XcodeGen from " +
69
+ 'project.yml, so a hand-maintained .xcodeproj has nothing to hook into).',
70
+ ];
71
+ }
72
+ const resolved = {
73
+ name: (0, interactive_1.trimFlag)(opts.name),
74
+ package: (0, interactive_1.trimFlag)(opts.package),
75
+ slug: (0, interactive_1.trimFlag)(opts.slug),
76
+ env: (0, interactive_1.trimFlag)(opts.env),
77
+ deployDir: (0, interactive_1.trimFlag)(opts.deployDir),
277
78
  };
79
+ return [
80
+ 'Already have a project there? `supercli add` scaffolds a NEW one; taking over an existing tree is ' +
81
+ '`supercli register`:',
82
+ '',
83
+ ` ${(0, projectIdentity_1.suggestedCommand)(`supercli register ${type}`, type, dirArg, projectDir, opts, resolved)}`,
84
+ '',
85
+ `\`register\` only records the directory in ${config_1.CONFIG_FILENAME}: it copies no template into it and never ` +
86
+ 'edits your build files.',
87
+ ];
88
+ }
89
+ /**
90
+ * add 独有的那一段散文:模板自带的 SuperSDK 身份**永远**不会被继承。
91
+ * (register 没有这一段 —— 它不拷模板,也就没有可继承的模板身份。)
92
+ */
93
+ function templateIdentityNote(type) {
94
+ if (type === 'site')
95
+ return [];
96
+ return [
97
+ "`supercli add` never falls back to the template's own SuperSDK identity " +
98
+ `(name "${identity_1.TEMPLATE_DEFAULTS.name}", android package ${identity_1.TEMPLATE_DEFAULTS.androidPackage}, ` +
99
+ `ios bundleId ${identity_1.TEMPLATE_DEFAULTS.iosBundleId}) — a project generated from those values ` +
100
+ 'cannot be published to any store.',
101
+ ];
278
102
  }
279
103
  function statTarget(target) {
280
104
  let stat;
@@ -386,22 +210,39 @@ async function runAdd(typeArg, dirArg, opts, deps = {}) {
386
210
  if (state === 'non-empty-dir') {
387
211
  return {
388
212
  ok: false,
389
- message: `target directory "${target}" is not empty. \`supercli add\` never merges into an existing tree — ` +
390
- 'it would silently mix template files with yours. Pick an empty (or new) directory.',
213
+ message: [
214
+ `target directory "${target}" is not empty. \`supercli add\` never merges into an existing tree — ` +
215
+ 'it would silently mix template files with yours. Pick an empty (or new) directory.',
216
+ '',
217
+ // 🔴 「接管一个已有工程」是最主流的真实场景,而 add 在这里对它硬失败。不指路的话,
218
+ // 唯一出路是手写 projects[] —— 这条提示存在的全部意义就是别让人走到那一步。
219
+ ...adoptExistingHint(type, dirArg, projectDir, opts),
220
+ ].join('\n'),
391
221
  };
392
222
  }
393
223
  // Asked last, so the user is never interrogated for a run that was going to fail on
394
224
  // the workspace, the directory or a missing template anyway.
395
225
  const interactive = (deps.isInteractive ?? prompt_1.isInteractiveStdin)();
396
226
  const prompt = deps.prompt ?? prompt_1.promptLineWithDefaultSync;
397
- const identity = resolveIdentity(type, projectDir, opts, interactive, prompt);
227
+ const identity = (0, projectIdentity_1.resolveIdentity)(type, projectDir, opts, interactive, prompt);
398
228
  if (!identity.ok) {
399
229
  return {
400
230
  ok: false,
401
- message: identityFailureMessage(type, dirArg, projectDir, opts, interactive, identity.resolution, identity.resolved, workspace.name),
231
+ message: (0, projectIdentity_1.identityFailureMessage)({
232
+ commandLabel: commandLabel(type),
233
+ type,
234
+ dirArg,
235
+ projectDir,
236
+ opts,
237
+ interactive,
238
+ resolution: identity.resolution,
239
+ resolved: identity.resolved,
240
+ workspaceName: workspace.name,
241
+ notes: templateIdentityNote(type),
242
+ }),
402
243
  };
403
244
  }
404
- const entry = buildEntry(type, projectDir, identity.resolved);
245
+ const entry = (0, projectIdentity_1.buildEntry)(type, projectDir, identity.resolved);
405
246
  // ---- 拷贝到进程私有的临时目录,全部就绪后再原子搬进目标位置 ----
406
247
  const tempDir = `${target}.tmp-${process.pid}`;
407
248
  try {
@@ -511,9 +352,9 @@ function registerAddCommand(program) {
511
352
  .description('Copy the site (web) project template into <dir> and register it in supersdk.json.')
512
353
  .option('--slug <slug>', 'site slug, 1-32 lowercase letters/digits (required)')
513
354
  .option('--name <name>', 'site name; omitted, nothing is recorded and it resolves to the slug')
514
- .option('--env <env>', `project environment this site deploys to (default: ${DEFAULT_SITE_ENV})`)
355
+ .option('--env <env>', `project environment this site deploys to (default: ${projectIdentity_1.DEFAULT_SITE_ENV})`)
515
356
  .option('--deploy-dir <dir>', `directory published by publish-site, relative to the workspace root (not to <dir>) and inside <dir> ` +
516
- `(default: <dir>/${SITE_DIST_DIRNAME})`)
357
+ `(default: <dir>/${projectIdentity_1.SITE_DIST_DIRNAME})`)
517
358
  .action(applyCommonAction('site'));
518
359
  }
519
360
  //# sourceMappingURL=add.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqcA,wBA4JC;AAcD,gDAgCC;AA1nBD,4CAA8B;AAC9B,gDAAkC;AAElC,qCAAkC;AAClC,2CAA+E;AAC/E,yCAA2C;AAC3C,gDAU6B;AAC7B,oDAU+B;AAC/B,0DAOkC;AAClC,oDAW+B;AAuC/B,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,yDAAyD;AACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC,SAAS,YAAY,CAAC,IAAiB;IACrC,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC;AAED,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;;;;;;GAMG;AACH,SAAS,gBAAgB,CACvB,IAAiB,EACjB,MAAc,EACd,UAAkB,EAClB,IAAgB,EAChB,QAA4C;IAE5C,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAA,kBAAU,EAAC,MAAM,CAAC,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,KAAyB,EAAE,IAAY,EAAE,EAAE;QACrE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC;IACF,kDAAkD;IAClD,+CAA+C;IAC/C,iDAAiD;IACjD,qDAAqD;IACrD,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,QAA4B,EAAE,KAAyB,EAAE,QAAgB,EAAE,EAAE;QAC/G,IAAI,IAAA,sBAAQ,EAAC,QAAQ,CAAC,KAAK,SAAS;YAAE,OAAO;QAC7C,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAA,kBAAU,EAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IACF,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAA,kBAAU,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAChE,YAAY,CACV,cAAc,EACd,IAAI,CAAC,SAAS,EACd,QAAQ,CAAC,SAAS,EAClB,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,iBAAiB,EAAE,CAC9E,CAAC;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC3C,IAAI,IAAI,KAAK,SAAS;QAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC9E,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACzD,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,oBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,aAAa,CAAC,IAAiB;IACtC,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC;IACzB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CACR,sFAAsF,EACtF,uFAAuF,CACxF,CAAC;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,KAAK,CAAC,IAAI,CACR,qFAAqF,EACrF,4EAA4E,EAC5E,iCAAiC,oBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,oBAAS,CAAC,CAAC,CAAC,IAAI,CACnF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CACR,mFAAmF,EACnF,4GAA4G;YAC1G,gEAAgE,EAClE,wFAAwF,gBAAgB,KAAK;YAC3G,+DAA+D,EACjE,2GAA2G;YACzG,GAAG,wBAAe,uFAAuF;YACzG,kBAAkB,iBAAiB,GAAG,CACzC,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAiB,EACjB,MAAc,EACd,UAAkB,EAClB,IAAgB,EAChB,WAAoB,EACpB,UAAsB,EACtB,QAA4C,EAC5C,aAAiC;IAEjC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,aAAa,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3D,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,UAAU,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,IAAA,kCAAoB,EAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;IAC7F,CAAC;IACD,oEAAoE;IACpE,qDAAqD;IACrD,IAAI,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9E,KAAK,CAAC,IAAI,CACR,EAAE,EACF,sBAAsB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,wBAAe,2BAA2B;YAClG,2FAA2F,CAC9F,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CACR,EAAE,EACF,0EAA0E;YACxE,UAAU,4BAAiB,CAAC,IAAI,sBAAsB,4BAAiB,CAAC,cAAc,IAAI;YAC1F,gBAAgB,4BAAiB,CAAC,WAAW,4CAA4C;YACzF,mCAAmC,CACtC,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,qCAAqC,EAAE,EAAE,EAAE,KAAK,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACjI,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,cAAc,CAAC,UAAkB,EAAE,KAAa;IACvD,MAAM,OAAO,GAAG,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC;IACvC,IAAI,OAAO,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC;IAC7C,IAAI,CAAC,IAAA,kBAAS,EAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,OAAO,CACL,IAAI,OAAO,CAAC,GAAG,uCAAuC,UAAU,qCAAqC;YACrG,qCAAqC,wBAAe,uDAAuD;YAC3G,iEAAiE,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,iBAAiB,EAAE,EAAE,CACjJ,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAQD,SAAS,eAAe,CACtB,IAAiB,EACjB,UAAkB,EAClB,IAAgB,EAChB,WAAoB,EACpB,MAAgB;IAEhB,MAAM,UAAU,GAAG,IAAA,2BAAa,GAAE,CAAC;IACnC,MAAM,QAAQ,GAAuC,EAAE,CAAC;IAExD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,wBAAwB;QACxB,QAAQ,CAAC,IAAI,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5D,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,sEAAsE;YAChF,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;YAC7B,KAAK,EAAE,oBAAS;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,0DAA0D;QAC1D,iDAAiD;QACjD,iEAAiE;QACjE,kDAAkD;QAClD,qDAAqD;QACrD,sDAAsD;QACtD,gEAAgE;QAChE,QAAQ,CAAC,IAAI,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5D,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kEAAkE;YAC5E,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;YAC7B,KAAK,EAAE,wBAAa;YACpB,QAAQ,EAAE,KAAK;YACf,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,QAAQ,CAAC,GAAG,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;YAC3D,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,0CAA0C;YACpD,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,GAAG,CAAC;YAC5B,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,uBAAY;YACnB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,iBAAiB,EAAE,CAAC;QACrG,QAAQ,CAAC,SAAS,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;YACjE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,gFAAgF,UAAU,IAAI;YACxG,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC;YAClC,QAAQ,EAAE,cAAc;YACxB,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC;YACnD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,0DAA0D;QAC1D,8BAA8B;QAC9B,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,IAAA,wBAAe,EAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACvD,IAAI,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC;gBAAE,QAAQ,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC;QACpE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,oEAAoE;QACpE,qDAAqD;QACrD,QAAQ,CAAC,IAAI,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5D,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,6BAA6B;YACzF,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC;YAC7B,KAAK,EAAE,oBAAS;YAChB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,QAAQ,CAAC,OAAO,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;gBAC/D,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,oDAAoD;gBAC9D,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC;gBAChC,KAAK,EAAE,8BAAmB;gBAC1B,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,QAAQ,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;gBAChE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,yCAAyC;gBACnD,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,QAAQ,CAAC;gBACjC,KAAK,EAAE,2BAAgB;gBACvB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,QAAQ,CAAC,OAAO,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;gBAC/D,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,gCAAgC,oBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;gBAChE,QAAQ,EAAE,IAAA,sBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC;gBAChC,QAAQ,EAAE,oBAAS,CAAC,CAAC,CAAC;gBACtB,KAAK,EAAE,uBAAY;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GACZ,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAC9H,MAAM,EAAE,GACN,UAAU,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAC9B,UAAU,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QACpC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC;IACvD,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,UAAU,CAAC,IAAiB,EAAE,GAAW,EAAE,QAA4C;IAC9F,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAiB,EAAE,CAAC;IAC3F,CAAC;IACD,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAkB,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAiB,EAAE,CAAC;IAClI,CAAC;IACD,sEAAsE;IACtE,yEAAyE;IACzE,iBAAiB;IACjB,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC/B,MAAM,KAAK,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,OAAO;QACL,IAAI;QACJ,GAAG;QACH,GAAG,KAAK;QACR,mDAAmD;QACnD,iEAAiE;QACjE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAc,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,SAAmB,EAAE,CAAC;QACrH,6DAA6D;QAC7D,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,IAAI,IAAc,CAAC;IACnB,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACvE,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAAE,OAAO,iBAAiB,CAAC;IAClD,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CACd,IAAiB,EACjB,MAAc,EACd,KAAmB,EACnB,SAAiB,EACjB,SAAoB,EACpB,UAAoB,EACpB,aAAuB;IAEvB,MAAM,KAAK,GAAG;QACZ,SAAS,IAAI,eAAe,MAAM,EAAE;QACpC,QAAQ,KAAK,CAAC,GAAG,EAAE;QACnB,UAAU,SAAS,EAAE;QACrB,kBAAkB,SAAS,CAAC,UAAU,EAAE;KACzC,CAAC;IACF,IAAI,IAAI,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvG,IAAI,IAAI,KAAK,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1I,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,MAAM,GAAI,KAAK,CAAC,MAAwC,CAAC,CAAC,CAAC,CAAC;QAClE,iDAAiD;QACjD,KAAK,CAAC,IAAI,CACR,KAAK,CAAC,IAAI,KAAK,SAAS;YACtB,CAAC,CAAC,yCAAyC,MAAM,CAAC,IAAI,qFAAqF;YAC3I,CAAC,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EACjC,mBAAmB,MAAM,CAAC,IAAI,QAAQ,MAAM,CAAC,GAAG,QAAQ,MAAM,CAAC,GAAG,EAAE,CACrE,CAAC;QACF,0DAA0D;QAC1D,KAAK,CAAC,IAAI,CACR,kFAAkF;YAChF,+GAA+G,CAClH,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,yBAAyB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9F,8CAA8C;IAC9C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,yDAAyD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxH,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,IAAA,kBAAU,EAAC,SAAS,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACpF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,MAAM,CAAC,OAAe,EAAE,MAAc,EAAE,IAAgB,EAAE,OAAgB,EAAE;IAChG,IAAI,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,yBAAyB,OAAO,eAAe,6BAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;IAC/G,CAAC;IACD,MAAM,IAAI,GAAgB,OAAO,CAAC;IAElC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAA,sBAAa,EAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACxE,MAAM,SAAS,GAAc,MAAM,CAAC,SAAS,CAAC;IAE9C,wCAAwC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,uBAAc,EAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,IAAA,wBAAe,EAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC1B,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,UAAU,MAAM,iBAAiB,MAAM,yCAAyC,SAAS,CAAC,IAAI,IAAI;gBAClG,GAAG,UAAU,CAAC,KAAK,oEAAoE;SAC1F,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC;IAElC,sDAAsD;IACtD,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACjE,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,oBAAoB,UAAU,MAAM,wBAAe,0BAA0B,QAAQ,CAAC,IAAI,cAAc;gBACxG,IAAI,QAAQ,CAAC,GAAG,8EAA8E;gBAC9F,6EAA6E;SAChF,CAAC;IACJ,CAAC;IAED,IAAI,YAAoB,CAAC;IACzB,IAAI,QAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAA,oCAAyB,GAAE,CAAC;QAChE,QAAQ,GAAG,IAAA,+BAAoB,EAAC,YAAY,CAAC,CAAC,QAAQ,CAAC;IACzD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAA,yBAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACjF,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,gCAAgC,IAAI,gBAAgB,cAAc,qBAAqB;SACjG,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;QAChC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,MAAM,yCAAyC,EAAE,CAAC;IACjG,CAAC;IACD,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,0BAA0B,MAAM,GAAG,EAAE,CAAC;IACrE,CAAC;IACD,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;QAC9B,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,qBAAqB,MAAM,wEAAwE;gBACnG,oFAAoF;SACvF,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,6DAA6D;IAC7D,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,2BAAkB,CAAC,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,kCAAyB,CAAC;IACxD,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC9E,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC;SACrI,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE9D,wCAAwC;IACxC,MAAM,OAAO,GAAG,GAAG,MAAM,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/C,IAAI,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,uDAAuD;IAC/G,CAAC;IAAC,MAAM,CAAC;QACP,cAAc;IAChB,CAAC;IAED,IAAI,SAAiB,CAAC;IACtB,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,SAAS,GAAG,IAAA,sBAAW,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAA,4CAAiC,EAAC,OAAO,EAAE;gBACzC,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAc;gBAC1B,OAAO,EAAE,KAAK,CAAC,OAAiB;gBAChC,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7F,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClF,CAAC,CAAC;QACL,CAAC;QACD,wCAAwC;QACxC,MAAM,GAAG,IAAA,gCAAqB,EAAC,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,6BAA6B,IAAI,aAAc,GAAa,CAAC,OAAO,EAAE,EAAE,CAAC;IACxG,CAAC;IAED,IAAI,CAAC;QACH,IAAI,KAAK,KAAK,WAAW;YAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChD,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EACL,OAAO,IAAI,2DAA2D,MAAM,MAAO,GAAa,CAAC,OAAO,IAAI;gBAC5G,6BAA6B,wBAAe,2CAA2C,OAAO,MAAM;gBACpG,wCAAwC,IAAA,kBAAU,EAAC,OAAO,CAAC,IAAI,IAAA,kBAAU,EAAC,MAAM,CAAC,2BAA2B;SAC/G,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,gDAAgD;IAChD,2CAA2C;IAC3C,IAAI,CAAC;QACH,IAAA,sBAAa,EAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,QAAQ,GAAG,0CAA0C,MAAM,GAAG,CAAC;QACnE,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,QAAQ,GAAG,qCAAqC,MAAM,+BAAgC,KAAe,CAAC,OAAO,yBAAyB,CAAC;QACzI,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,qCAAqC,SAAS,CAAC,UAAU,KAAM,GAAa,CAAC,OAAO,KAAK,QAAQ,GAAG;SAC9G,CAAC;IACJ,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC;QACxF,UAAU,EAAE,MAAM;QAClB,KAAK;QACL,SAAS;QACT,UAAU,EAAE,MAAM,CAAC,IAAI;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAiB;IAC1C,OAAO,KAAK,EAAE,MAAc,EAAE,IAAgB,EAAiB,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB;IACjD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,0DAA0D,6BAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE7G,GAAG;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,gFAAgF,CAAC;SAC7F,MAAM,CAAC,eAAe,EAAE,qEAAqE,CAAC;SAC9F,MAAM,CAAC,qBAAqB,EAAE,8DAA8D,CAAC;SAC7F,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;IAExC,GAAG;SACA,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,4EAA4E,CAAC;SACzF,MAAM,CAAC,eAAe,EAAE,oEAAoE,CAAC;SAC7F,MAAM,CAAC,wBAAwB,EAAE,mDAAmD,CAAC;SACrF,MAAM,CAAC,mBAAmB,EAAE,gCAAgC,oBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,oBAAS,CAAC,CAAC,CAAC,GAAG,CAAC;SAC7G,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpC,GAAG;SACA,OAAO,CAAC,YAAY,CAAC;SACrB,WAAW,CAAC,mFAAmF,CAAC;SAChG,MAAM,CAAC,eAAe,EAAE,qDAAqD,CAAC;SAC9E,MAAM,CAAC,eAAe,EAAE,qEAAqE,CAAC;SAC9F,MAAM,CAAC,aAAa,EAAE,sDAAsD,gBAAgB,GAAG,CAAC;SAChG,MAAM,CACL,oBAAoB,EACpB,sGAAsG;QACpG,mBAAmB,iBAAiB,GAAG,CAC1C;SACA,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AACvC,CAAC"}
1
+ {"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"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"}
@@ -365,12 +365,24 @@ function createConfigStep(step, configPath, spid, carryHint) {
365
365
  const carry = carryHint ?? 'a workspace created by `supercli init` already ships this file';
366
366
  return `${step}) write the following into ${quotePath(configPath)} (${carry}):\n${(0, siteConfig_1.configTemplate)(spid)}`;
367
367
  }
368
- /** 一条可以直接贴进 `projects[]` 的站点项目条目。键序与 config/appConfig.ts 的写盘键序一致。 */
369
- function siteProjectEntry(projectDir, deploy) {
370
- const deployEntry = `{ "slug": ${JSON.stringify(deploy.slug)}, "name": ${JSON.stringify(deploy.name)}, ` +
371
- `"env": ${JSON.stringify(deploy.env)}, "dir": ${JSON.stringify(deploy.dir)} }`;
372
- return (`{ "type": "site", "dir": ${JSON.stringify(projectDir)}, "name": ${JSON.stringify(deploy.name)}, ` +
373
- `"deploy": [${deployEntry}] }`);
368
+ /**
369
+ * 登记这个发布目录的**那条命令**(可原样粘进 shell)。
370
+ *
371
+ * 三个细节都是有意为之:
372
+ * - `cd <工作空间根> &&`:`register` 是从 **cwd** 向上找 supersdk.json 的,而
373
+ * `publish-site` 是从 `<dir>` 向上找 —— 两者不必是同一个地方(`cd /tmp && publish-site
374
+ * /repo/dist` 完全合法)。不带 cd 的话,照抄的人会拿到一句「no supersdk.json found」。
375
+ * - `--deploy-dir` 显式给出:它的默认值是 `<dir>/dist`,而这里的 `<dir>` 往往**就是**那个
376
+ * 产物目录,默认值会指向一个不存在的 `dist/dist`。
377
+ * - `--name` 只在它与 slug 不同时才给:「name 默认等于 slug」是一条解析规则,不是用户作出
378
+ * 的决定,materialize 进配置就会静默压掉他日后 `publish-site --name` 敲的值。
379
+ */
380
+ function registerSiteCommand(configPath, projectDir, deploy) {
381
+ const parts = [`supercli register site ${shellArg(projectDir)}`, `--slug ${shellArg(deploy.slug)}`];
382
+ if (deploy.name !== deploy.slug)
383
+ parts.push(`--name ${shellArg(deploy.name)}`);
384
+ parts.push(`--env ${shellArg(deploy.env)}`, `--deploy-dir ${shellArg(deploy.dir)}`);
385
+ return `cd ${shellArg(path.dirname(configPath))} && ${parts.join(' ')}`;
374
386
  }
375
387
  /**
376
388
  * 「把这个发布目录登记进 supersdk.json」的指引。
@@ -378,7 +390,13 @@ function siteProjectEntry(projectDir, deploy) {
378
390
  * 🔴 这里**绝不能**写 `supercli add site <dir>`:`add` 是「从内置模板生成一个新项目」的命令,
379
391
  * 它对非空目录硬失败("target directory … is not empty. `supercli add` never merges into an
380
392
  * existing tree"),而一个正在被发布的目录必然非空 —— 照着提示做只会撞回同一句提示,正是
381
- * reissueCommand 的注释里写着要消灭的那个死循环。所以给的是能直接照抄落盘的那一条 JSON。
393
+ * reissueCommand 的注释里写着要消灭的那个死循环。
394
+ *
395
+ * 现在有了对应的命令:`supercli register site <dir>`(接管已有目录,只记账、不写文件),
396
+ * 所以这里给的是**一条可以直接跑的命令**,而不再是让人手工粘贴的一段 JSON。
397
+ *
398
+ * 🔴 前面那两条合法性预判必须保留:候选 dir 含 `..`、或与既有项目嵌套时,register 会以完全
399
+ * 相同的理由拒绝 —— 发一条注定失败的命令,跟发一条会砸脚的 JSON 一样糟。
382
400
  *
383
401
  * 导出仅为可测:这条提示的三个分支里有两个只在「发布成功之后」才可达,离线到不了。
384
402
  */
@@ -399,11 +417,11 @@ function registerSiteProjectHint(configPath, deploy, existingProjectDirs) {
399
417
  `${quotePath(clash)}, then register that one.`);
400
418
  }
401
419
  return [
402
- `add this entry to the "projects" array in ${quotePath(configPath)} (\`supercli add site\` scaffolds a NEW project from the built-in template and refuses a non-empty directory, so it cannot register a directory you are already publishing):`,
403
- ` ${siteProjectEntry(normalized, deploy)}`,
420
+ `run this to record it in ${quotePath(configPath)} (\`register\` adopts a directory that already exists — it copies nothing into it and edits none of its files; \`supercli add site\` is the other command, it scaffolds a NEW project and refuses a non-empty directory):`,
421
+ ` ${registerSiteCommand(configPath, normalized, deploy)}`,
404
422
  // 这句只在合法分支成立:工作空间外的目录,它的任何祖先都得靠 `..` 才能表达,
405
423
  // 而 `..` 恰恰是非法的 —— 所以上面两个 refuse 分支绝不能带上它。
406
- ` (if ${quotePath(normalized)} is build output, put the source project directory in "dir" instead — any ancestor of the publish dir covers it, and only "deploy[].dir" has to be the directory you publish)`,
424
+ ` (if ${quotePath(normalized)} is build output, pass the source project directory as <dir> instead — any ancestor of the publish dir covers it, and only --deploy-dir has to be the directory you publish)`,
407
425
  ].join('\n');
408
426
  }
409
427
  /**