speccore 8.3.302 → 8.3.304
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/commands/doc2spec.d.ts.map +1 -1
- package/dist/commands/doc2spec.js +22 -61
- package/dist/commands/doc2spec.js.map +1 -1
- package/dist/commands/execute.js +26 -38
- package/dist/commands/execute.js.map +1 -1
- package/dist/commands/unitize.d.ts +9 -0
- package/dist/commands/unitize.d.ts.map +1 -1
- package/dist/commands/unitize.js +87 -3
- package/dist/commands/unitize.js.map +1 -1
- package/dist/core/git-integration.d.ts +12 -0
- package/dist/core/git-integration.d.ts.map +1 -1
- package/dist/core/git-integration.js +56 -0
- package/dist/core/git-integration.js.map +1 -1
- package/dist/core/unified-config.d.ts +12 -0
- package/dist/core/unified-config.d.ts.map +1 -1
- package/dist/core/unified-config.js +51 -5
- package/dist/core/unified-config.js.map +1 -1
- package/package.json +1 -1
- package/templates/html/speccore-ask-guide.html +1 -1
- package/templates/html/speccore-ask-pipeline.html +1 -1
- package/templates/html/speccore-ask-result.html +1 -1
- package/templates/html/speccore-help.html +2 -2
- package/templates/speccore-yml-example.yml +56 -117
package/dist/commands/unitize.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.matchPlatformDoc = matchPlatformDoc;
|
|
3
4
|
exports.unitizeCommand = unitizeCommand;
|
|
4
5
|
/**
|
|
5
6
|
* unitize — 切分需求文档为功能单元(独立能力命令)
|
|
@@ -11,10 +12,15 @@ exports.unitizeCommand = unitizeCommand;
|
|
|
11
12
|
*
|
|
12
13
|
* 输入为 Markdown 需求文档(通常是 doc2spec 转换产物 converted/*.md 或 PRD 的 .md)。
|
|
13
14
|
* docx/pdf 需先经 `speccore doc2spec --file=xxx.docx` 转换后再 unitize。
|
|
15
|
+
*
|
|
16
|
+
* v8.3.303+: 未指定 --file/--files 时默认发现本迭代全部端级需求文档(converted/ 下
|
|
17
|
+
* 匹配端名白名单的 {端名}.md / {端名}requirements.md),逐一切分;REQUIREMENT.md 总纲
|
|
18
|
+
* 与无端文档不参与自动发现。显式指定 --file 时照旧只切点名的。
|
|
14
19
|
*/
|
|
15
20
|
const fs_extra_1 = require("fs-extra");
|
|
16
21
|
const path_1 = require("path");
|
|
17
22
|
const logger_1 = require("../utils/logger");
|
|
23
|
+
const unified_config_1 = require("../core/unified-config");
|
|
18
24
|
const doc2spec_1 = require("./doc2spec");
|
|
19
25
|
const context_1 = require("../core/context");
|
|
20
26
|
/** 批量参数解析(与 doc2spec --files 同格式:"path1.md=平台1,path2.md=平台2") */
|
|
@@ -27,6 +33,22 @@ function parseBatch(files) {
|
|
|
27
33
|
}
|
|
28
34
|
return pairs;
|
|
29
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* v8.3.303+: 判定文件名是否为端级需求文档。
|
|
38
|
+
* 新命名 {端名}.md(与源文档同名);旧命名 {端名}requirements.md(v8.3.223~302,兼容不迁移)。
|
|
39
|
+
* 总纲 REQUIREMENT.md、无端文档(如 PRD 全量)不在此列。
|
|
40
|
+
*/
|
|
41
|
+
function matchPlatformDoc(filename, platformNames) {
|
|
42
|
+
const base = filename.replace(/\.md$/i, '');
|
|
43
|
+
if (!base)
|
|
44
|
+
return { matched: false };
|
|
45
|
+
if (platformNames.has(base))
|
|
46
|
+
return { matched: true, platform: base };
|
|
47
|
+
const legacy = base.replace(/requirements$/i, '');
|
|
48
|
+
if (legacy !== base && platformNames.has(legacy))
|
|
49
|
+
return { matched: true, platform: legacy };
|
|
50
|
+
return { matched: false };
|
|
51
|
+
}
|
|
30
52
|
async function unitizeSingle(file, platform, iterName, translateEn, translateResponse, onDuplicate) {
|
|
31
53
|
if (!(await (0, fs_extra_1.pathExists)(file))) {
|
|
32
54
|
logger_1.logger.error(`文件不存在: ${file}`);
|
|
@@ -38,6 +60,23 @@ async function unitizeSingle(file, platform, iterName, translateEn, translateRes
|
|
|
38
60
|
logger_1.logger.info(` 💡 请先转换: speccore doc2spec --file=${file} --iter=${iterName}`);
|
|
39
61
|
return;
|
|
40
62
|
}
|
|
63
|
+
// v8.3.303+: REQUIREMENT.md 总纲不参与切分(切分以端命名需求文档为准)
|
|
64
|
+
if (/^REQUIREMENT\.md$/i.test((0, path_1.basename)(file))) {
|
|
65
|
+
logger_1.logger.error(`REQUIREMENT.md 是需求总纲,不参与切分: ${(0, path_1.basename)(file)}`);
|
|
66
|
+
logger_1.logger.info(' 💡 请指定端级需求文档(如 admin-web.md),或直接运行 speccore unitize 自动切分全部端');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
// v8.3.303+: platform 未显式指定时,从文件名匹配端列表自动识别({端名}.md 命名免传 --platform)
|
|
70
|
+
if (!platform) {
|
|
71
|
+
const base = (0, path_1.basename)(file).replace(/\.md$/i, '');
|
|
72
|
+
try {
|
|
73
|
+
const projectConfig = await (0, unified_config_1.loadProjectConfig)();
|
|
74
|
+
const matched = projectConfig.platforms.find(p => p.name === base || `${p.name}requirements` === base);
|
|
75
|
+
if (matched)
|
|
76
|
+
platform = matched.name;
|
|
77
|
+
}
|
|
78
|
+
catch { /* PROJECT.yaml 缺失时保持无端 */ }
|
|
79
|
+
}
|
|
41
80
|
const iterDir = `Iteration-${iterName.replace(/^Iteration-/, '')}`;
|
|
42
81
|
if (!(await (0, fs_extra_1.pathExists)(iterDir))) {
|
|
43
82
|
logger_1.logger.error(`迭代目录不存在: ${iterDir}`);
|
|
@@ -65,12 +104,57 @@ async function unitizeCommand(options) {
|
|
|
65
104
|
}
|
|
66
105
|
return;
|
|
67
106
|
}
|
|
68
|
-
// ──
|
|
107
|
+
// ── 默认发现模式(v8.3.303+):未指定 --file/--files 时,自动切分本迭代全部端级需求文档 ──
|
|
69
108
|
if (!options.file) {
|
|
70
|
-
|
|
71
|
-
|
|
109
|
+
const iterName = options.iter || (await (0, context_1.detectActiveIteration)());
|
|
110
|
+
if (!iterName) {
|
|
111
|
+
logger_1.logger.error('请指定迭代: speccore unitize --iter=<迭代>');
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
const iterDir = `Iteration-${iterName.replace(/^Iteration-/, '')}`;
|
|
115
|
+
const convDir = (0, path_1.join)(iterDir, '010-requirements', 'converted');
|
|
116
|
+
if (!(await (0, fs_extra_1.pathExists)(convDir))) {
|
|
117
|
+
logger_1.logger.error(`需求目录不存在: ${convDir}`);
|
|
118
|
+
logger_1.logger.info(' 💡 请先转换需求文档: speccore doc2spec --file=xxx.docx --iter=' + iterName);
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
// 端名白名单(PROJECT.yaml platforms)——总纲/无端文档等不在列,天然排除
|
|
122
|
+
let platformNames = new Set();
|
|
123
|
+
try {
|
|
124
|
+
const projectConfig = await (0, unified_config_1.loadProjectConfig)();
|
|
125
|
+
platformNames = new Set(projectConfig.platforms.map(p => p.name));
|
|
126
|
+
}
|
|
127
|
+
catch { /* PROJECT.yaml 缺失时白名单为空,走下方报错指路 */ }
|
|
128
|
+
const allFiles = (await (0, fs_extra_1.readdir)(convDir)).filter(f => f.endsWith('.md'));
|
|
129
|
+
const platformFiles = [];
|
|
130
|
+
for (const f of allFiles) {
|
|
131
|
+
const hit = matchPlatformDoc(f, platformNames);
|
|
132
|
+
if (hit.matched && hit.platform)
|
|
133
|
+
platformFiles.push({ file: f, platform: hit.platform });
|
|
134
|
+
}
|
|
135
|
+
if (platformFiles.length === 0) {
|
|
136
|
+
logger_1.logger.error('converted/ 中没有匹配端名的需求文档');
|
|
137
|
+
logger_1.logger.info(' 💡 端文档命名: {端名}.md(如 admin-web.md),端名须在 .speccore/PROJECT.yaml platforms 中');
|
|
138
|
+
logger_1.logger.info(' 也可显式指定: speccore unitize --file=<md 路径>');
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
logger_1.logger.info(`🔎 自动发现 ${platformFiles.length} 份端级需求文档:`);
|
|
142
|
+
for (const { file } of platformFiles) {
|
|
143
|
+
logger_1.logger.info(` · ${file}`);
|
|
144
|
+
}
|
|
145
|
+
const skipped = allFiles.filter(f => !platformFiles.some(p => p.file === f));
|
|
146
|
+
if (skipped.length > 0) {
|
|
147
|
+
logger_1.logger.info('⏭️ 以下文档非端命名需求,未自动切分(总纲/无端文档可 --file 显式切分):');
|
|
148
|
+
for (const f of skipped) {
|
|
149
|
+
logger_1.logger.info(` · ${f}`);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
for (const { file, platform } of platformFiles) {
|
|
153
|
+
await unitizeSingle((0, path_1.join)(convDir, file), platform, iterName, options.translateEn, options.translateResponse, options.onDuplicate);
|
|
154
|
+
}
|
|
72
155
|
return;
|
|
73
156
|
}
|
|
157
|
+
// ── 单文件模式(显式指定,绝不越界)──
|
|
74
158
|
const iterName = options.iter || (await (0, context_1.detectActiveIteration)());
|
|
75
159
|
if (!iterName) {
|
|
76
160
|
logger_1.logger.error('请指定迭代: speccore unitize --file=<md 路径> --iter=<迭代>');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unitize.js","sourceRoot":"","sources":["../../src/commands/unitize.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"unitize.js","sourceRoot":"","sources":["../../src/commands/unitize.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,18 @@ export declare function loadGitConfig(iteration?: string, taskDir?: string): Git
|
|
|
76
76
|
* v8.3.87+: 增加 cwd 参数,支持 speccore 与工程代码分离
|
|
77
77
|
*/
|
|
78
78
|
export declare function detectDefaultBranch(iteration?: string, cwd?: string): string | undefined;
|
|
79
|
+
/**
|
|
80
|
+
* 解析任务分支的创建源分支(v8.3.304+)
|
|
81
|
+
*
|
|
82
|
+
* 优先级:任务级 .meta/git-config「源分支」 > 迭代级 PROJECT_GRAPH「默认分支」
|
|
83
|
+
* > PROJECT.yaml branch_types[{taskType}].source > PROJECT.yaml git.default_base
|
|
84
|
+
* > 回退 detectDefaultBranch(CONSTITUTION「默认分支」/ 默认 main / git remote HEAD / 本地分支)
|
|
85
|
+
*
|
|
86
|
+
* 背景:此前 execute 拉分支只走 loadGitConfig(CONSTITUTION/任务级 git-config),
|
|
87
|
+
* PROJECT.yaml 的 git.default_base 与 branch_types[].source 从未参与判定,
|
|
88
|
+
* 用户在主配置里声明的 source 不生效。
|
|
89
|
+
*/
|
|
90
|
+
export declare function resolveTaskBaseBranch(taskType?: string, iteration?: string, taskDir?: string, cwd?: string): Promise<string | undefined>;
|
|
79
91
|
/**
|
|
80
92
|
* 获取当前分支关联的任务
|
|
81
93
|
* v8.3.88+: 支持 cwd 参数,工程目录分离场景下使用正确的 git 仓库
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-integration.d.ts","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"git-integration.d.ts","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ exports.createTaskBranch = createTaskBranch;
|
|
|
48
48
|
exports.loadSubtaskGitConfig = loadSubtaskGitConfig;
|
|
49
49
|
exports.loadGitConfig = loadGitConfig;
|
|
50
50
|
exports.detectDefaultBranch = detectDefaultBranch;
|
|
51
|
+
exports.resolveTaskBaseBranch = resolveTaskBaseBranch;
|
|
51
52
|
exports.getCurrentTaskMapping = getCurrentTaskMapping;
|
|
52
53
|
exports.generateCommitMessage = generateCommitMessage;
|
|
53
54
|
exports.generatePRDescription = generatePRDescription;
|
|
@@ -63,6 +64,7 @@ const fs_extra_1 = require("fs-extra");
|
|
|
63
64
|
const path_1 = require("path");
|
|
64
65
|
const child_process_1 = require("child_process");
|
|
65
66
|
const crypto_1 = require("crypto");
|
|
67
|
+
const unified_config_1 = require("./unified-config");
|
|
66
68
|
const GIT_MAPPING_PATH = '.speccore/.git-mapping.json';
|
|
67
69
|
/** 任务类型 → 分支类型映射 */
|
|
68
70
|
exports.TASK_TYPE_TO_BRANCH_TYPE = {
|
|
@@ -467,6 +469,60 @@ function detectDefaultBranch(iteration, cwd) {
|
|
|
467
469
|
catch { }
|
|
468
470
|
return undefined;
|
|
469
471
|
}
|
|
472
|
+
/**
|
|
473
|
+
* 解析任务分支的创建源分支(v8.3.304+)
|
|
474
|
+
*
|
|
475
|
+
* 优先级:任务级 .meta/git-config「源分支」 > 迭代级 PROJECT_GRAPH「默认分支」
|
|
476
|
+
* > PROJECT.yaml branch_types[{taskType}].source > PROJECT.yaml git.default_base
|
|
477
|
+
* > 回退 detectDefaultBranch(CONSTITUTION「默认分支」/ 默认 main / git remote HEAD / 本地分支)
|
|
478
|
+
*
|
|
479
|
+
* 背景:此前 execute 拉分支只走 loadGitConfig(CONSTITUTION/任务级 git-config),
|
|
480
|
+
* PROJECT.yaml 的 git.default_base 与 branch_types[].source 从未参与判定,
|
|
481
|
+
* 用户在主配置里声明的 source 不生效。
|
|
482
|
+
*/
|
|
483
|
+
async function resolveTaskBaseBranch(taskType, iteration, taskDir, cwd) {
|
|
484
|
+
// 1. 任务级 .meta/git-config「源分支」(最局部,最高优先级)
|
|
485
|
+
if (taskDir) {
|
|
486
|
+
const sub = loadSubtaskGitConfig(taskDir);
|
|
487
|
+
if (sub.defaultBranch)
|
|
488
|
+
return sub.defaultBranch;
|
|
489
|
+
}
|
|
490
|
+
// 2. 迭代级 PROJECT_GRAPH.md「默认分支」
|
|
491
|
+
if (iteration) {
|
|
492
|
+
try {
|
|
493
|
+
const iterGraphPath = (0, path_1.join)(`Iteration-${iteration}`, '000-overview', 'PROJECT_GRAPH.md');
|
|
494
|
+
if ((0, fs_extra_1.existsSync)(iterGraphPath)) {
|
|
495
|
+
const content = (0, fs_extra_1.readFileSync)(iterGraphPath, 'utf-8');
|
|
496
|
+
const tableMatch = content.match(/\|\s*默认分支\s*\|\s*([^|]+)\s*\|/);
|
|
497
|
+
if (tableMatch) {
|
|
498
|
+
const val = tableMatch[1].trim();
|
|
499
|
+
if (val && val !== '继承全局配置' && val !== '-' && val !== '')
|
|
500
|
+
return val;
|
|
501
|
+
}
|
|
502
|
+
}
|
|
503
|
+
}
|
|
504
|
+
catch { }
|
|
505
|
+
}
|
|
506
|
+
// 3. PROJECT.yaml 主配置(读原始文件,只认用户显式声明):
|
|
507
|
+
// branch_types[{taskType}].source 优先,git.default_base 兜底
|
|
508
|
+
// 不用 loadProjectConfig:其返回的 merge 后配置含 DEFAULT_PROJECT_CONFIG
|
|
509
|
+
// 预置 branch_types 表,会把「用户没配 release」误判为「显式 source=develop」
|
|
510
|
+
try {
|
|
511
|
+
const raw = await (0, unified_config_1.loadRawProjectConfig)();
|
|
512
|
+
if (raw) {
|
|
513
|
+
if (taskType) {
|
|
514
|
+
const source = raw.git?.branch_types?.[taskType]?.source;
|
|
515
|
+
if (source)
|
|
516
|
+
return source;
|
|
517
|
+
}
|
|
518
|
+
if (raw.git?.default_base)
|
|
519
|
+
return raw.git.default_base;
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
catch { }
|
|
523
|
+
// 4. 回退:CONSTITUTION「默认分支」/ 默认 main / git remote HEAD / 本地分支
|
|
524
|
+
return detectDefaultBranch(iteration, cwd);
|
|
525
|
+
}
|
|
470
526
|
/**
|
|
471
527
|
* 获取当前分支关联的任务
|
|
472
528
|
* v8.3.88+: 支持 cwd 参数,工程目录分离场景下使用正确的 git 仓库
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-integration.js","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git-integration.js","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -300,6 +300,13 @@ export declare function loadConfig(): Promise<SpecConfig>;
|
|
|
300
300
|
export declare function loadConfigWithMeta(): Promise<ConfigLoadResult>;
|
|
301
301
|
/** 加载项目配置(简化版) */
|
|
302
302
|
export declare function loadProjectConfig(): Promise<ProjectConfig>;
|
|
303
|
+
/**
|
|
304
|
+
* 读取磁盘上的原始 PROJECT.yaml(不做默认值合并/迁移,环境变量原样保留)
|
|
305
|
+
* v8.3.304+: 供「只认用户显式配置」的场景使用——merge 后的配置无法区分
|
|
306
|
+
* 「用户显式声明」与「DEFAULT_PROJECT_CONFIG 出厂预置」(如 branch_types 预置表),
|
|
307
|
+
* 拉分支等需要严格遵循用户声明语义的消费方应使用本函数。
|
|
308
|
+
*/
|
|
309
|
+
export declare function loadRawProjectConfig(): Promise<ProjectConfig | null>;
|
|
303
310
|
/** 获取项目配置 + 元信息 */
|
|
304
311
|
export declare function loadProjectConfigWithMeta(): Promise<ProjectConfigLoadResult>;
|
|
305
312
|
/**
|
|
@@ -369,6 +376,11 @@ export declare function detectProjectConfigDiffFromFile(): Promise<ConfigDiff |
|
|
|
369
376
|
*/
|
|
370
377
|
export declare function formatConfigDiff(diff: ConfigDiff): string[];
|
|
371
378
|
export declare const LEGACY_MAIN_CONFIG_KEYS: Set<string>;
|
|
379
|
+
export declare const LEGACY_DROP_PATHS: Set<string>;
|
|
380
|
+
/** v8.3.303: 过滤已知废弃/迁移字段,避免旧字段触发人工确认截停升级 */
|
|
381
|
+
export declare function filterLegacyRemoved(diff: ConfigDiff): ConfigDiff;
|
|
382
|
+
/** v8.3.303: 按点路径删除嵌套键(路径不存在时静默跳过) */
|
|
383
|
+
export declare function deleteNestedKey(obj: unknown, path: string): void;
|
|
372
384
|
export declare function upgradeConfig(): Promise<ConfigLoadResult>;
|
|
373
385
|
export declare const PROJECT_OPTIONAL_PATHS: Set<string>;
|
|
374
386
|
export declare function upgradeProjectConfig(): Promise<ProjectConfigLoadResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unified-config.d.ts","sourceRoot":"","sources":["../../src/core/unified-config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"unified-config.d.ts","sourceRoot":"","sources":["../../src/core/unified-config.ts"],"names":[],"mappings":"AAcA,uCAAuC;AACvC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,gDAAgD;AAChD,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAMhD,gBAAgB;AAChB,MAAM,WAAW,eAAe;IAC9B,WAAW;IACX,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,YAAY,GAAG,MAAM,CAAC;IACzG,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe;IACf,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC;IACvC,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wBAAwB;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iEAAiE;IACjE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,cAAc,EAAE,MAAM,CAAC;IACvB,0CAA0C;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sDAAsD;IACtD,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF,wBAAwB;IACxB,MAAM,CAAC,EAAE;QACP,WAAW;QACX,OAAO,CAAC,EAAE,eAAe,CAAC;QAC1B,WAAW;QACX,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,2BAA2B;QAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;KAC5C,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wCAAwC;AACxC,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,wDAAwD;IACxD,OAAO,CAAC,EAAE;QACR,sCAAsC;QACtC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IACF,aAAa,EAAE;QACb,eAAe,EAAE,OAAO,CAAC;QACzB,cAAc,EAAE,OAAO,CAAC;QACxB,UAAU,EAAE,OAAO,CAAC;QACpB,6DAA6D;QAC7D,WAAW,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC;QACrC,SAAS,CAAC,EAAE;YACV,OAAO,EAAE,OAAO,CAAC;YACjB,UAAU,EAAE,OAAO,CAAC;YACpB,YAAY,EAAE,OAAO,CAAC;YACtB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;YACzC,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,MAAM,CAAC;YAChB,iCAAiC;YACjC,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,aAAa;YACb,YAAY,CAAC,EAAE;gBACb,oDAAoD;gBACpD,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;gBACvD,WAAW;gBACX,KAAK,CAAC,EAAE,MAAM,CAAC;gBACf,4BAA4B;gBAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,gBAAgB;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAClB,wBAAwB;gBACxB,OAAO,CAAC,EAAE,MAAM,CAAC;aAClB,CAAC;SACH,CAAC;KACH,CAAC;IACF,WAAW,EAAE;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAAC;KAC1C,CAAC;IACF,QAAQ,EAAE;QACR,QAAQ,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAA;SAAE,CAAC;QACjE,KAAK,EAAE;YAAE,OAAO,EAAE,OAAO,CAAC;YAAC,aAAa,EAAE,OAAO,CAAA;SAAE,CAAC;QACpD,OAAO,EAAE;YAAE,YAAY,EAAE,OAAO,CAAA;SAAE,CAAC;QACnC,IAAI,EAAE;YAAE,gBAAgB,EAAE,OAAO,CAAA;SAAE,CAAC;QACpC,UAAU,EAAE;YAAE,WAAW,EAAE,OAAO,CAAA;SAAE,CAAC;QACrC,IAAI,EAAE;YAAE,UAAU,EAAE,OAAO,CAAA;SAAE,CAAC;QAC9B,QAAQ,EAAE;YAAE,SAAS,EAAE,KAAK,GAAG,OAAO,GAAG,YAAY,CAAA;SAAE,CAAC;QACxD,MAAM,EAAE;YAAE,cAAc,EAAE,OAAO,CAAA;SAAE,CAAC;QACpC,qCAAqC;QACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,8DAA8D;QAC9D,cAAc,CAAC,EAAE;YACf,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;YAChC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;YAC/B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;YACjC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;YAC3B,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;YAC7B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;SAClC,CAAC;QACF,4CAA4C;QAC5C,SAAS,CAAC,EAAE;YACV,2CAA2C;YAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,mEAAmE;YACnE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC,CAAC;QACF,iEAAiE;QACjE,KAAK,CAAC,EAAE;YACN,yDAAyD;YACzD,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;SAC1B,CAAC;QACF,4DAA4D;QAC5D,EAAE,CAAC,EAAE;YACH,2FAA2F;YAC3F,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;YACnC,gFAAgF;YAChF,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;YAChC,yEAAyE;YACzE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAClC,6CAA6C;YAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,mDAAmD;QACnD,cAAc,CAAC,EAAE;YACf,+EAA+E;YAC/E,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;SAC9B,CAAC;QACF,gDAAgD;QAChD,MAAM,CAAC,EAAE;YACP,OAAO,EAAE,OAAO,CAAC;YACjB,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;YACvD,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,iCAAiC;YACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,gCAAgC;YAChC,cAAc,CAAC,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,+CAA+C;QAC/C,KAAK,CAAC,EAAE;YACN,0CAA0C;YAC1C,MAAM,CAAC,EAAE;gBACP,0CAA0C;gBAC1C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;gBAC9B,4DAA4D;gBAC5D,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;gBACrC,kCAAkC;gBAClC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC;aACvC,CAAC;YACF,iDAAiD;YACjD,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;YAC1B,+BAA+B;YAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC;SAClD,CAAC;KACH,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,cAAc,CAAC;YAC7C,cAAc,EAAE,MAAM,CAAC;YACvB,aAAa,EAAE,MAAM,CAAC;YACtB,YAAY,EAAE,OAAO,CAAC;YACtB,aAAa,EAAE,OAAO,CAAC;YACvB,cAAc,EAAE,MAAM,CAAC;SACxB,CAAC;QACF,KAAK,EAAE;YAAE,aAAa,EAAE,OAAO,CAAA;SAAE,CAAC;QAClC,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACpC,CAAC;IACF,cAAc,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACxE,0BAA0B;IAC1B,KAAK,CAAC,EAAE;QACN,6CAA6C;QAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,wCAAwC;QACxC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAED,0CAA0C;AAC1C,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,GAAG,EAAE;QACH,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAC7B,wHAAwH;QACxH,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACrF,CAAC;IACF,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,uBAAuB;IACvB,MAAM,CAAC,EAAE;QACP,6BAA6B;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAMD,eAAO,MAAM,cAAc,EAAE,UA+D5B,CAAC;AAMF,eAAO,MAAM,sBAAsB,EAAE,aAgBpC,CAAC;AASF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,CAMtD;AAED,iCAAiC;AACjC,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAqDpE;AAED,kBAAkB;AAClB,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,aAAa,CAAC,CAMhE;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAS1E;AAED,mBAAmB;AACnB,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAqDlF;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAsD7F;AAED,gCAAgC;AAChC,wBAAsB,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC,CAErD;AAMD,wBAAsB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAIlE;AAED,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5E;AAED;;GAEG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAGhD;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO3E;AA0JD,MAAM,WAAW,UAAU;IACzB,eAAe;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,eAAe;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,qBAAqB;IACrB,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnE,oBAAoB;IACpB,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IACvE,yBAAyB;IACzB,gBAAgB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3D;AAKD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,SAAK,GAAG,UAAU,CA6EzF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAKlE;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAS3E;AAED;;GAEG;AACH,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CASlF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,EAAE,CAiC3D;AAWD,eAAO,MAAM,uBAAuB,aAAyD,CAAC;AAK9F,eAAO,MAAM,iBAAiB,aAAqC,CAAC;AAEpE,4CAA4C;AAC5C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAOhE;AAED,sCAAsC;AACtC,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAShE;AAuDD,wBAAsB,aAAa,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAsH/D;AASD,eAAO,MAAM,sBAAsB,aAAgE,CAAC;AAEpG,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CA0F7E;AAoKD,gCAAgC;AAChC,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB7F;AA4sBD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,iBAAiB;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,mBAAmB,CAuBhE"}
|
|
@@ -36,10 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.PROJECT_OPTIONAL_PATHS = exports.LEGACY_MAIN_CONFIG_KEYS = exports.DEFAULT_PROJECT_CONFIG = exports.DEFAULT_CONFIG = exports.PROJECT_CURRENT_SCHEMA_VERSION = exports.CURRENT_SCHEMA_VERSION = void 0;
|
|
39
|
+
exports.PROJECT_OPTIONAL_PATHS = exports.LEGACY_DROP_PATHS = exports.LEGACY_MAIN_CONFIG_KEYS = exports.DEFAULT_PROJECT_CONFIG = exports.DEFAULT_CONFIG = exports.PROJECT_CURRENT_SCHEMA_VERSION = exports.CURRENT_SCHEMA_VERSION = void 0;
|
|
40
40
|
exports.loadConfig = loadConfig;
|
|
41
41
|
exports.loadConfigWithMeta = loadConfigWithMeta;
|
|
42
42
|
exports.loadProjectConfig = loadProjectConfig;
|
|
43
|
+
exports.loadRawProjectConfig = loadRawProjectConfig;
|
|
43
44
|
exports.loadProjectConfigWithMeta = loadProjectConfigWithMeta;
|
|
44
45
|
exports.loadProjectConfigWithEnv = loadProjectConfigWithEnv;
|
|
45
46
|
exports.getConfig = getConfig;
|
|
@@ -52,6 +53,8 @@ exports.requiresUserConfirmation = requiresUserConfirmation;
|
|
|
52
53
|
exports.detectConfigDiffFromFile = detectConfigDiffFromFile;
|
|
53
54
|
exports.detectProjectConfigDiffFromFile = detectProjectConfigDiffFromFile;
|
|
54
55
|
exports.formatConfigDiff = formatConfigDiff;
|
|
56
|
+
exports.filterLegacyRemoved = filterLegacyRemoved;
|
|
57
|
+
exports.deleteNestedKey = deleteNestedKey;
|
|
55
58
|
exports.upgradeConfig = upgradeConfig;
|
|
56
59
|
exports.upgradeProjectConfig = upgradeProjectConfig;
|
|
57
60
|
exports.getEffectiveGitConfig = getEffectiveGitConfig;
|
|
@@ -225,6 +228,24 @@ async function loadProjectConfig() {
|
|
|
225
228
|
}
|
|
226
229
|
return config;
|
|
227
230
|
}
|
|
231
|
+
/**
|
|
232
|
+
* 读取磁盘上的原始 PROJECT.yaml(不做默认值合并/迁移,环境变量原样保留)
|
|
233
|
+
* v8.3.304+: 供「只认用户显式配置」的场景使用——merge 后的配置无法区分
|
|
234
|
+
* 「用户显式声明」与「DEFAULT_PROJECT_CONFIG 出厂预置」(如 branch_types 预置表),
|
|
235
|
+
* 拉分支等需要严格遵循用户声明语义的消费方应使用本函数。
|
|
236
|
+
*/
|
|
237
|
+
async function loadRawProjectConfig() {
|
|
238
|
+
if (!(await (0, fs_extra_1.pathExists)(PROJECT_CONFIG_PATH)))
|
|
239
|
+
return null;
|
|
240
|
+
try {
|
|
241
|
+
const raw = await (0, fs_extra_1.readFile)(PROJECT_CONFIG_PATH, 'utf-8');
|
|
242
|
+
const parsed = parseYaml(raw);
|
|
243
|
+
return parsed;
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
return null;
|
|
247
|
+
}
|
|
248
|
+
}
|
|
228
249
|
/** 获取项目配置 + 元信息 */
|
|
229
250
|
async function loadProjectConfigWithMeta() {
|
|
230
251
|
const warnings = [];
|
|
@@ -643,6 +664,29 @@ function formatConfigDiff(diff) {
|
|
|
643
664
|
const LEGACY_MIGRATE_KEYS = new Set(['project', 'platforms', 'git', 'code_scope']);
|
|
644
665
|
const LEGACY_DROP_KEYS = new Set(['tech_stack', 'team', 'conventions', 'error_codes']);
|
|
645
666
|
exports.LEGACY_MAIN_CONFIG_KEYS = new Set([...LEGACY_MIGRATE_KEYS, ...LEGACY_DROP_KEYS]);
|
|
667
|
+
// v8.3.303: 已知废弃的嵌套字段(带点路径)——升级时自动移除,不触发人工确认
|
|
668
|
+
// 背景:v8.3.197 用 block_level 取代 quality_gates.compile;旧项目升级时 compile 判 removed
|
|
669
|
+
// → requiresUserConfirmation 截停 → 新增字段(verify_ui.devices/browsers/timeout/visual_model 等)永远补不上
|
|
670
|
+
exports.LEGACY_DROP_PATHS = new Set(['quality_gates.compile']);
|
|
671
|
+
/** v8.3.303: 过滤已知废弃/迁移字段,避免旧字段触发人工确认截停升级 */
|
|
672
|
+
function filterLegacyRemoved(diff) {
|
|
673
|
+
return {
|
|
674
|
+
...diff,
|
|
675
|
+
removed: diff.removed.filter((p) => !exports.LEGACY_MAIN_CONFIG_KEYS.has(p.split('.')[0]) && !exports.LEGACY_DROP_PATHS.has(p)),
|
|
676
|
+
};
|
|
677
|
+
}
|
|
678
|
+
/** v8.3.303: 按点路径删除嵌套键(路径不存在时静默跳过) */
|
|
679
|
+
function deleteNestedKey(obj, path) {
|
|
680
|
+
const parts = path.split('.');
|
|
681
|
+
let cur = obj;
|
|
682
|
+
for (let i = 0; i < parts.length - 1; i++) {
|
|
683
|
+
const next = cur[parts[i]];
|
|
684
|
+
if (!isPlainObject(next))
|
|
685
|
+
return;
|
|
686
|
+
cur = next;
|
|
687
|
+
}
|
|
688
|
+
delete cur[parts[parts.length - 1]];
|
|
689
|
+
}
|
|
646
690
|
/**
|
|
647
691
|
* v8.3.298+: 迁移旧版 .speccore.yml 的顶层字段
|
|
648
692
|
* - project/platforms/git/code_scope → 合并进 .speccore/PROJECT.yaml(缺失/空时回填,不覆盖新数据)
|
|
@@ -706,10 +750,8 @@ async function upgradeConfig() {
|
|
|
706
750
|
// 1. 检测配置差异(优先用磁盘原始文件差异,能看到缺失的新字段)
|
|
707
751
|
const diff = fileDiff || detectConfigDiff(config, exports.DEFAULT_CONFIG);
|
|
708
752
|
// v8.3.298: 旧版顶层字段(已归属 PROJECT.yaml 或废弃)不触发「需人工确认」,自动迁移
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
removed: diff.removed.filter((p) => !exports.LEGACY_MAIN_CONFIG_KEYS.has(p.split('.')[0])),
|
|
712
|
-
};
|
|
753
|
+
// v8.3.303: 已知废弃嵌套字段(quality_gates.compile 等)同样豁免,自动清理
|
|
754
|
+
const effectiveDiff = filterLegacyRemoved(diff);
|
|
713
755
|
const needsConfirm = requiresUserConfirmation(effectiveDiff);
|
|
714
756
|
if (needsConfirm) {
|
|
715
757
|
// 生成差异报告文件
|
|
@@ -754,6 +796,10 @@ async function upgradeConfig() {
|
|
|
754
796
|
}
|
|
755
797
|
// 2. 用默认值深度合并(补全缺失字段)
|
|
756
798
|
const upgraded = deepMerge(exports.DEFAULT_CONFIG, config);
|
|
799
|
+
// v8.3.303: 清理已知废弃字段(被新字段取代),避免写回后残留旧键
|
|
800
|
+
for (const legacyPath of exports.LEGACY_DROP_PATHS) {
|
|
801
|
+
deleteNestedKey(upgraded, legacyPath);
|
|
802
|
+
}
|
|
757
803
|
// v8.3.298+: 旧版顶层字段自动迁移(platforms/git/code_scope → PROJECT.yaml,废弃字段删除)
|
|
758
804
|
const legacyLogs = await migrateLegacyMainConfig(upgraded);
|
|
759
805
|
// 3. 执行跨版本迁移(rename / add / remove / transform)
|