@quolu/lattice 0.52.2 → 0.52.4
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/package.json +1 -1
- package/src/artifact-contracts-v2.mjs +325 -325
- package/src/artifact-contracts.mjs +895 -895
- package/src/boundary-compiler.mjs +712 -712
- package/src/boundary-observation-compiler-v2.mjs +344 -344
- package/src/bounded-seam.mjs +230 -230
- package/src/bridge-address.mjs +107 -107
- package/src/bridge-cli.mjs +297 -297
- package/src/bridge-config.mjs +346 -346
- package/src/bridge-daemon.mjs +378 -378
- package/src/bridge-hub-protocol.mjs +198 -0
- package/src/bridge-launch-agent.mjs +323 -323
- package/src/bridge-registrar.mjs +102 -102
- package/src/bridge-server.mjs +376 -376
- package/src/cli-help.mjs +308 -308
- package/src/cli-stdio.mjs +40 -40
- package/src/control-compiler.mjs +532 -532
- package/src/dag-chain.mjs +261 -261
- package/src/factory-diagnostics.mjs +188 -188
- package/src/git-process.mjs +72 -0
- package/src/hash-chain.mjs +76 -76
- package/src/hooks-cli.mjs +1057 -1057
- package/src/isolation-runner.mjs +409 -409
- package/src/node-version-guard.mjs +44 -44
- package/src/project-cli.mjs +699 -697
- package/src/project-identity.mjs +130 -130
- package/src/rc1-black-box-oracle.mjs +906 -906
- package/src/rc1-comparison.mjs +154 -154
- package/src/rc1-evidence-bundle.mjs +456 -456
- package/src/rc1-v4-campaign.mjs +708 -708
- package/src/rc1-v4-transform.mjs +467 -467
- package/src/rc1-v5-artifact-set.mjs +855 -855
- package/src/rc1-v5-behavior-evidence.mjs +594 -594
- package/src/rc1-v5-campaign.mjs +797 -797
- package/src/rc1-v5-transform.mjs +421 -421
- package/src/rc1-v6-artifact-set.mjs +807 -807
- package/src/rc1-v6-behavior-evidence.mjs +273 -273
- package/src/rc1-v6-campaign.mjs +623 -623
- package/src/rc1-v6-causal-binding.mjs +473 -473
- package/src/rc1-v6-measurement.mjs +313 -313
- package/src/rc2-artifact-set.mjs +1584 -1584
- package/src/rc2-campaign.mjs +1506 -1506
- package/src/rc2-delivery-policy-front-end.mjs +1079 -1079
- package/src/rc2-delivery-policy-oracle.mjs +134 -134
- package/src/rc2-delivery-policy-transform.mjs +1127 -1127
- package/src/rc2-rc1-transfer-front-end.mjs +511 -511
- package/src/rc3-actual-dogfood.mjs +652 -652
- package/src/rc3-dogfood-scaffold.mjs +315 -315
- package/src/rc3-scripted-campaign.mjs +1383 -1383
- package/src/rc4-stage1-dogfood.mjs +673 -673
- package/src/runtime-adapter-registry.mjs +524 -524
- package/src/runtime-cli.mjs +4588 -4588
- package/src/runtime-contracts.mjs +824 -824
- package/src/runtime-control-store.mjs +604 -604
- package/src/runtime-controller-protocol.mjs +587 -587
- package/src/runtime-decision-verifier.mjs +701 -701
- package/src/runtime-diff-observer.mjs +361 -361
- package/src/runtime-direct-os-observer.mjs +301 -301
- package/src/runtime-driver-state.mjs +166 -166
- package/src/runtime-engine.mjs +779 -779
- package/src/runtime-errors.mjs +356 -356
- package/src/runtime-event-store.mjs +189 -189
- package/src/runtime-front-end.mjs +925 -925
- package/src/runtime-gate-store.mjs +481 -481
- package/src/runtime-hold-recompile.mjs +916 -916
- package/src/runtime-io-sentinel.mjs +391 -391
- package/src/runtime-lifecycle-lock.mjs +294 -294
- package/src/runtime-managed-supervisor.mjs +1490 -1490
- package/src/runtime-multi-epoch-store.mjs +838 -838
- package/src/runtime-projection.mjs +269 -269
- package/src/runtime-pull-intake.mjs +1192 -1192
- package/src/runtime-scripted-adapter-controller.mjs +1160 -1160
- package/src/runtime-scripted-executor.mjs +163 -163
- package/src/runtime-scripted-worktree.mjs +104 -104
- package/src/runtime-seam-resolve.mjs +428 -428
- package/src/runtime-seam-treatment.mjs +173 -173
- package/src/runtime-socket-owner.mjs +125 -125
- package/src/runtime-work-order-contracts.mjs +91 -91
- package/src/runtime-work-order-controller.mjs +1171 -1171
- package/src/runtime-worktree-executor.mjs +199 -199
- package/src/schedulability-compiler-v2.mjs +303 -303
- package/src/schedulability-verifier-v2.mjs +317 -317
- package/src/seam-apply.mjs +549 -549
- package/src/seam-commit-shared.mjs +22 -22
- package/src/seam-commit-transform.mjs +81 -81
- package/src/seam-commit.mjs +18 -18
- package/src/seam-cost.mjs +322 -322
- package/src/seam-derivation.mjs +188 -188
- package/src/seam-gate.mjs +146 -146
- package/src/seam-proposal-contracts.mjs +446 -446
- package/src/seam-proposal-queries.mjs +521 -521
- package/src/seam-proposal.mjs +2011 -2011
- package/src/seam-ref.mjs +33 -33
- package/src/seam-rewrite.mjs +286 -286
- package/src/seam-transform.mjs +554 -554
- package/src/seam-verification.mjs +260 -260
- package/src/sensor-adapter.mjs +432 -432
- package/src/sensor-cli.mjs +139 -139
- package/src/sensor-diff.mjs +661 -661
- package/src/sensor-node-runtime.mjs +53 -53
- package/src/sensor-runtime.mjs +52 -52
- package/src/timestamp-contract.mjs +8 -8
- package/src/todo-audit-pending.mjs +91 -91
- package/src/todo-chain.mjs +178 -178
- package/src/todo-cli.mjs +3143 -3141
- package/src/todo-contracts.mjs +728 -728
- package/src/todo-dashboard-registry.mjs +573 -573
- package/src/todo-dispatch-shape.mjs +190 -190
- package/src/todo-gantt-html-independence.mjs +239 -239
- package/src/todo-gantt-html-shared.mjs +226 -226
- package/src/todo-gantt-html-style.mjs +131 -131
- package/src/todo-gantt-html.mjs +248 -248
- package/src/todo-gantt-layout.mjs +974 -974
- package/src/todo-gantt-live.mjs +361 -361
- package/src/todo-gantt-nested.mjs +263 -263
- package/src/todo-gantt-presentation.mjs +217 -217
- package/src/todo-gantt-scope.mjs +123 -123
- package/src/todo-gantt-svg.mjs +353 -353
- package/src/todo-independence-contracts.mjs +595 -595
- package/src/todo-independence-guidance.mjs +322 -322
- package/src/todo-independence.mjs +640 -640
- package/src/todo-markdown-renderer.mjs +260 -260
- package/src/todo-migration.mjs +448 -448
- package/src/todo-narrative-anchor.mjs +130 -130
- package/src/todo-note-store.mjs +629 -629
- package/src/todo-parallel-candidates.mjs +114 -114
- package/src/todo-revision.mjs +995 -995
- package/src/todo-split.mjs +472 -472
- package/src/todo-status.mjs +690 -690
- package/src/todo-store-git-transaction.mjs +418 -418
- package/src/todo-store.mjs +4360 -4322
- package/src/treatment-compiler.mjs +728 -728
- package/src/treatment-runner.mjs +656 -656
- package/src/witness-scaffold.mjs +180 -180
package/src/seam-ref.mjs
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
import { SEAM_REF_PREFIX, git } from './seam-commit-shared.mjs';
|
|
2
|
-
|
|
3
|
-
/** 変換の成果を指すref。branch名前空間へ置かないので、通常のbranch一覧には現れない。 */
|
|
4
|
-
export function seamRefFor(candidateId) {
|
|
5
|
-
return `${SEAM_REF_PREFIX}/${candidateId}`;
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
/**
|
|
9
|
-
* 確定済みseam refを列挙する(ADR 0142 / ADR 0141 OQ1)。
|
|
10
|
-
*
|
|
11
|
-
* **自動では消さない。** このrefが指すのは「五条件を通って受理された変換の実体」であり、
|
|
12
|
-
* どの版がどの競合をどう解いたかを後から辿れる唯一の資源である。runが閉じたら消す設計も
|
|
13
|
-
* 検討したが、それは証跡を寿命付きにするということで、記録を所有するという製品の役目と
|
|
14
|
-
* 衝突する。消すかどうかは所有者の裁定に委ね、道具は「何が在るか」を見せる側だけを持つ。
|
|
15
|
-
*
|
|
16
|
-
* @returns {Promise<Array<{ref: string, candidate_id: string, commit_sha: string}>>}
|
|
17
|
-
*/
|
|
18
|
-
export async function listSeamRefs({ repoRoot } = {}) {
|
|
19
|
-
let stdout;
|
|
20
|
-
try {
|
|
21
|
-
stdout = await git(['for-each-ref', '--format=%(refname) %(objectname)', SEAM_REF_PREFIX], repoRoot);
|
|
22
|
-
} catch {
|
|
23
|
-
return [];
|
|
24
|
-
}
|
|
25
|
-
return stdout.split('\n')
|
|
26
|
-
.map((line) => line.trim())
|
|
27
|
-
.filter((line) => line.length > 0)
|
|
28
|
-
.map((line) => {
|
|
29
|
-
const [ref, commitSha] = line.split(' ');
|
|
30
|
-
return { ref, candidate_id: ref.slice(`${SEAM_REF_PREFIX}/`.length), commit_sha: commitSha };
|
|
31
|
-
})
|
|
32
|
-
.sort((left, right) => (left.ref < right.ref ? -1 : left.ref > right.ref ? 1 : 0));
|
|
33
|
-
}
|
|
1
|
+
import { SEAM_REF_PREFIX, git } from './seam-commit-shared.mjs';
|
|
2
|
+
|
|
3
|
+
/** 変換の成果を指すref。branch名前空間へ置かないので、通常のbranch一覧には現れない。 */
|
|
4
|
+
export function seamRefFor(candidateId) {
|
|
5
|
+
return `${SEAM_REF_PREFIX}/${candidateId}`;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* 確定済みseam refを列挙する(ADR 0142 / ADR 0141 OQ1)。
|
|
10
|
+
*
|
|
11
|
+
* **自動では消さない。** このrefが指すのは「五条件を通って受理された変換の実体」であり、
|
|
12
|
+
* どの版がどの競合をどう解いたかを後から辿れる唯一の資源である。runが閉じたら消す設計も
|
|
13
|
+
* 検討したが、それは証跡を寿命付きにするということで、記録を所有するという製品の役目と
|
|
14
|
+
* 衝突する。消すかどうかは所有者の裁定に委ね、道具は「何が在るか」を見せる側だけを持つ。
|
|
15
|
+
*
|
|
16
|
+
* @returns {Promise<Array<{ref: string, candidate_id: string, commit_sha: string}>>}
|
|
17
|
+
*/
|
|
18
|
+
export async function listSeamRefs({ repoRoot } = {}) {
|
|
19
|
+
let stdout;
|
|
20
|
+
try {
|
|
21
|
+
stdout = await git(['for-each-ref', '--format=%(refname) %(objectname)', SEAM_REF_PREFIX], repoRoot);
|
|
22
|
+
} catch {
|
|
23
|
+
return [];
|
|
24
|
+
}
|
|
25
|
+
return stdout.split('\n')
|
|
26
|
+
.map((line) => line.trim())
|
|
27
|
+
.filter((line) => line.length > 0)
|
|
28
|
+
.map((line) => {
|
|
29
|
+
const [ref, commitSha] = line.split(' ');
|
|
30
|
+
return { ref, candidate_id: ref.slice(`${SEAM_REF_PREFIX}/`.length), commit_sha: commitSha };
|
|
31
|
+
})
|
|
32
|
+
.sort((left, right) => (left.ref < right.ref ? -1 : left.ref > right.ref ? 1 : 0));
|
|
33
|
+
}
|
package/src/seam-rewrite.mjs
CHANGED
|
@@ -1,286 +1,286 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* 三面の変換候補を実際のソースへ適用する書き換え(ADR 0137)。
|
|
3
|
-
*
|
|
4
|
-
* 決まった移動を機械的に実行するだけである。どこへ何を移すかはseam導出が決めており、
|
|
5
|
-
* 「どう書くのが綺麗か」の裁量は持ち込まない。整形の判断を入れると、変換の前後で挙動以外の差が
|
|
6
|
-
* 増え、外部挙動同等性の検証が何を見ているのか分からなくなる。
|
|
7
|
-
*
|
|
8
|
-
* 純関数として組む。worktreeへ書くのは呼び出し側の仕事で、ここはtextからtextを作る。
|
|
9
|
-
*/
|
|
10
|
-
|
|
11
|
-
const IMPORT_START = /^import[\s{*]/u;
|
|
12
|
-
const COMMENT_LINE = /^\s*(?:\/\/|\/\*|\*|\*\/)/u;
|
|
13
|
-
const compareText = (left, right) => left < right ? -1 : left > right ? 1 : 0;
|
|
14
|
-
|
|
15
|
-
function fail(reasons) {
|
|
16
|
-
return { files: null, reasons: [...new Set(reasons)].sort(compareText) };
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* 先頭のimport文を、行範囲と束縛名つきで取り出す。
|
|
21
|
-
*
|
|
22
|
-
* 複数行importがあるので`from '...'`で終わる行までを1文とする。束縛名は、移した先で
|
|
23
|
-
* どのimportが要るかを語単位で判定するために使う。
|
|
24
|
-
*
|
|
25
|
-
* **書き換え本体はこれを使わない(sc-013)。** planSeamRewriteのimport面はsensorの
|
|
26
|
-
* AST観測(`joinImportSurface`)から受け取る。この正規表現走査が残っているのは
|
|
27
|
-
* seam-costのprofile投影(ESM限定とconfidenceで申告済み)のためだけである。
|
|
28
|
-
*/
|
|
29
|
-
export function scanImportStatements(lines) {
|
|
30
|
-
const statements = [];
|
|
31
|
-
let index = 0;
|
|
32
|
-
while (index < lines.length) {
|
|
33
|
-
const line = lines[index];
|
|
34
|
-
if (line.trim() === '' || COMMENT_LINE.test(line)) { index += 1; continue; }
|
|
35
|
-
if (!IMPORT_START.test(line)) break;
|
|
36
|
-
const start = index;
|
|
37
|
-
while (index < lines.length
|
|
38
|
-
&& !/from\s+['"][^'"]+['"];?\s*$/u.test(lines[index])
|
|
39
|
-
&& !/^import\s+['"][^'"]+['"];?\s*$/u.test(lines[index])) index += 1;
|
|
40
|
-
const end = Math.min(index, lines.length - 1);
|
|
41
|
-
const text = lines.slice(start, end + 1).join('\n');
|
|
42
|
-
statements.push({ text, bindings: importBindings(text), start, end });
|
|
43
|
-
index = end + 1;
|
|
44
|
-
}
|
|
45
|
-
return { statements, endIndex: statements.length === 0 ? -1 : statements.at(-1).end };
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
export function importBindings(text) {
|
|
49
|
-
const bindings = [];
|
|
50
|
-
const namespace = /import\s+\*\s+as\s+([A-Za-z_$][\w$]*)/u.exec(text);
|
|
51
|
-
if (namespace) bindings.push(namespace[1]);
|
|
52
|
-
const defaultBinding = /^import\s+([A-Za-z_$][\w$]*)\s*(?:,|\sfrom)/u.exec(text);
|
|
53
|
-
if (defaultBinding) bindings.push(defaultBinding[1]);
|
|
54
|
-
const named = /\{([\s\S]*?)\}/u.exec(text);
|
|
55
|
-
if (named) {
|
|
56
|
-
for (const entry of named[1].split(',')) {
|
|
57
|
-
const parts = entry.split(/\s+as\s+/u).map((part) => part.trim());
|
|
58
|
-
const name = parts.length > 1 ? parts[1] : parts[0];
|
|
59
|
-
if (/^[A-Za-z_$][\w$]*$/u.test(name)) bindings.push(name);
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
return [...new Set(bindings)];
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
/** 語として現れるか。string中やcomment中の一致も拾うが、余分なimportは害にならない。 */
|
|
66
|
-
export function mentions(text, name) {
|
|
67
|
-
return new RegExp(`(?<![\\w$])${name.replace(/[$]/gu, '\\$$')}(?![\\w$])`, 'u').test(text);
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
/**
|
|
71
|
-
* sensorの観測(`file-nodes`の`imports`と`import_bindings`)をimport文単位へ束ねる(sc-013)。
|
|
72
|
-
*
|
|
73
|
-
* importsは文の行範囲、import_bindingsは束縛ごとの`{local, form, imported, line}`で、
|
|
74
|
-
* 両者は行番号で結合できる(解決済み束縛はedge metadata、builtin等の未解決束縛は
|
|
75
|
-
* unresolved_refs由来——どちらもAST抽出であり、正規表現の再実装ではない)。
|
|
76
|
-
* どの文にも入らない束縛は`unassigned`として返し、黙って捨てない。
|
|
77
|
-
*
|
|
78
|
-
* @returns {{statements: Array<{startLine:number,endLine:number,bindings:string[]}>, unassigned: string[]}}
|
|
79
|
-
*/
|
|
80
|
-
export function joinImportSurface(importNodes = [], importBindings = []) {
|
|
81
|
-
const statements = importNodes
|
|
82
|
-
.filter((node) => Number.isSafeInteger(node?.startLine) && Number.isSafeInteger(node?.endLine)
|
|
83
|
-
&& node.startLine >= 1 && node.endLine >= node.startLine)
|
|
84
|
-
.map((node) => ({ startLine: node.startLine, endLine: node.endLine, bindings: [] }))
|
|
85
|
-
.sort((left, right) => left.startLine - right.startLine);
|
|
86
|
-
const unassigned = [];
|
|
87
|
-
for (const binding of importBindings) {
|
|
88
|
-
if (typeof binding?.local !== 'string' || binding.local === '') continue;
|
|
89
|
-
const owner = Number.isSafeInteger(binding.line)
|
|
90
|
-
? statements.find(({ startLine, endLine }) => binding.line >= startLine && binding.line <= endLine)
|
|
91
|
-
: undefined;
|
|
92
|
-
if (owner === undefined) { unassigned.push(binding.local); continue; }
|
|
93
|
-
if (!owner.bindings.includes(binding.local)) owner.bindings.push(binding.local);
|
|
94
|
-
}
|
|
95
|
-
for (const statement of statements) statement.bindings.sort(compareText);
|
|
96
|
-
return { statements, unassigned: [...new Set(unassigned)].sort(compareText) };
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
/**
|
|
100
|
-
* 宣言の範囲を直前の連続コメント行まで広げる。
|
|
101
|
-
*
|
|
102
|
-
* JSDocを置き去りにすると、残余に持ち主のいない説明が残り、移した先が無説明になる。
|
|
103
|
-
* 空行で切るのは、離れた位置のコメントを巻き込まないため。
|
|
104
|
-
*/
|
|
105
|
-
function extendUpward(lines, startLine) {
|
|
106
|
-
let start = startLine;
|
|
107
|
-
while (start - 1 >= 1 && COMMENT_LINE.test(lines[start - 2])) start -= 1;
|
|
108
|
-
return start;
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
function exportedBlock(raw) {
|
|
112
|
-
const parts = raw.split('\n');
|
|
113
|
-
const declarationIndex = parts
|
|
114
|
-
.findIndex((line) => !COMMENT_LINE.test(line) && line.trim() !== '');
|
|
115
|
-
if (declarationIndex >= 0 && !/^\s*export\s/u.test(parts[declarationIndex])) {
|
|
116
|
-
parts[declarationIndex] = `export ${parts[declarationIndex]}`;
|
|
117
|
-
}
|
|
118
|
-
return parts.join('\n');
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// 原pathでexport宣言だったかは、text走査でなくsensorのisExported(AST事実)で判定する
|
|
122
|
-
// (sc-013)。extentと同じくfile-nodes由来で、symbolExtentsの各entryが持って来る。
|
|
123
|
-
|
|
124
|
-
/**
|
|
125
|
-
* repo相対path同士から、ESMが解決できる相対specifierを作る。
|
|
126
|
-
*
|
|
127
|
-
* 以前は行き先がfromの配下でない時に`./<repo相対>`を返しており、親ディレクトリや兄弟
|
|
128
|
-
* ディレクトリへの移動で**解決不能なspecifier**を生成していた(`src/a/x.mjs`→`src/b/y.mjs`で
|
|
129
|
-
* `./src/b/y.mjs`)。segment単位で共通prefixを外し、残りを`../`で遡って組み立てる。
|
|
130
|
-
*/
|
|
131
|
-
export function relativeSpecifier(fromPath, toPath) {
|
|
132
|
-
const fromSegments = fromPath.split('/').slice(0, -1);
|
|
133
|
-
const toSegments = toPath.split('/');
|
|
134
|
-
let shared = 0;
|
|
135
|
-
while (shared < fromSegments.length && shared < toSegments.length - 1
|
|
136
|
-
&& fromSegments[shared] === toSegments[shared]) shared += 1;
|
|
137
|
-
const ascent = '../'.repeat(fromSegments.length - shared);
|
|
138
|
-
const descent = toSegments.slice(shared).join('/');
|
|
139
|
-
return ascent === '' ? `./${descent}` : `${ascent}${descent}`;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
/**
|
|
143
|
-
* 三面の変換後textを作る。
|
|
144
|
-
*
|
|
145
|
-
* import面と各symbolのexport状態はsensorの観測を入力として受け取る(sc-013)。
|
|
146
|
-
* ここで正規表現によるimport再解析を行わない——言語理解はsensorが所有し、
|
|
147
|
-
* ここは決まった移動のtext組み立てだけを持つ。観測が無ければtyped理由で止める。
|
|
148
|
-
* 唯一残るtext走査は直前コメント行の巻き込み(extendUpward)で、sensorはcomment行の
|
|
149
|
-
* 範囲を記録しないため、これはtext組み立ての一部として保持する。
|
|
150
|
-
*
|
|
151
|
-
* @param {object} options
|
|
152
|
-
* @param {string} options.sourceText 原pathの現在の内容
|
|
153
|
-
* @param {object} options.candidate `lattice.bounded_seam_candidate.v2`
|
|
154
|
-
* @param {object} options.symbolExtents symbol名 -> `{startLine, endLine, isExported}`(1始まり・両端含む)
|
|
155
|
-
* @param {object} options.importSurface `joinImportSurface`の結果(`{statements, unassigned}`)
|
|
156
|
-
* @returns {{files: object|null, reasons: string[]}} pathごとの変換後text
|
|
157
|
-
*/
|
|
158
|
-
export function planSeamRewrite({ sourceText, candidate, symbolExtents, importSurface } = {}) {
|
|
159
|
-
if (typeof sourceText !== 'string' || sourceText.length === 0) return fail(['empty_source']);
|
|
160
|
-
const lines = sourceText.split('\n');
|
|
161
|
-
const surfaces = candidate?.surfaces ?? [];
|
|
162
|
-
const residual = surfaces.find(({ role }) => role === 'residual');
|
|
163
|
-
const moving = surfaces.filter(({ role }) => role !== 'residual');
|
|
164
|
-
if (residual === undefined || moving.length === 0) return fail(['surfaces_incomplete']);
|
|
165
|
-
|
|
166
|
-
const blocks = [];
|
|
167
|
-
for (const surface of moving) {
|
|
168
|
-
for (const symbol of surface.symbols) {
|
|
169
|
-
const extent = symbolExtents?.[symbol];
|
|
170
|
-
if (extent === undefined
|
|
171
|
-
|| !Number.isSafeInteger(extent.startLine) || !Number.isSafeInteger(extent.endLine)
|
|
172
|
-
|| extent.startLine < 1 || extent.endLine > lines.length
|
|
173
|
-
|| extent.endLine < extent.startLine) {
|
|
174
|
-
return fail([`symbol_extent_missing:${symbol}`]);
|
|
175
|
-
}
|
|
176
|
-
// export状態はAST事実として要求する。無ければ推測せず止める(確実の門)。
|
|
177
|
-
if (typeof extent.isExported !== 'boolean') {
|
|
178
|
-
return fail([`symbol_export_status_missing:${symbol}`]);
|
|
179
|
-
}
|
|
180
|
-
blocks.push({
|
|
181
|
-
symbol, path: surface.path, end: extent.endLine, exported: extent.isExported,
|
|
182
|
-
start: extendUpward(lines, extent.startLine),
|
|
183
|
-
});
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
blocks.sort((left, right) => left.start - right.start);
|
|
187
|
-
for (let index = 1; index < blocks.length; index += 1) {
|
|
188
|
-
// 範囲が重なる宣言は、片方を切ると他方が壊れる。整形で解こうとせず止める。
|
|
189
|
-
if (blocks[index].start <= blocks[index - 1].end) {
|
|
190
|
-
return fail([`symbol_extent_overlap:${blocks[index - 1].symbol}:${blocks[index].symbol}`]);
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
// import面はsensorの観測から。観測が無い・束縛の帰属が決まらない・importが先頭block
|
|
195
|
-
// の外にある——いずれも「たぶん大丈夫」で進まず、typed理由でAIへ渡す。
|
|
196
|
-
if (importSurface === null || typeof importSurface !== 'object'
|
|
197
|
-
|| !Array.isArray(importSurface.statements)) {
|
|
198
|
-
return fail(['import_surface_missing']);
|
|
199
|
-
}
|
|
200
|
-
if (Array.isArray(importSurface.unassigned) && importSurface.unassigned.length > 0) {
|
|
201
|
-
return fail(importSurface.unassigned.map((name) => `import_binding_unassigned:${name}`));
|
|
202
|
-
}
|
|
203
|
-
const statements = [];
|
|
204
|
-
let cursor = 1;
|
|
205
|
-
for (const entry of [...importSurface.statements]
|
|
206
|
-
.sort((left, right) => left.startLine - right.startLine)) {
|
|
207
|
-
if (!Number.isSafeInteger(entry.startLine) || !Number.isSafeInteger(entry.endLine)
|
|
208
|
-
|| entry.startLine < 1 || entry.endLine > lines.length || entry.endLine < entry.startLine
|
|
209
|
-
|| !Array.isArray(entry.bindings)) {
|
|
210
|
-
return fail(['import_surface_missing']);
|
|
211
|
-
}
|
|
212
|
-
if (entry.startLine < cursor) return fail([`import_statement_ambiguous:${entry.startLine}`]);
|
|
213
|
-
for (let line = cursor; line < entry.startLine; line += 1) {
|
|
214
|
-
const text = lines[line - 1];
|
|
215
|
-
if (text.trim() !== '' && !COMMENT_LINE.test(text)) {
|
|
216
|
-
// 先頭block外のimport(ESMでは合法)は、残余headerの組み立てが機械では確実に
|
|
217
|
-
// できない。整形で解こうとせず止める。
|
|
218
|
-
return fail([`import_below_header:${entry.startLine}`]);
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
statements.push({
|
|
222
|
-
text: lines.slice(entry.startLine - 1, entry.endLine).join('\n'),
|
|
223
|
-
bindings: entry.bindings.filter((name) => typeof name === 'string' && name !== ''),
|
|
224
|
-
});
|
|
225
|
-
cursor = entry.endLine + 1;
|
|
226
|
-
}
|
|
227
|
-
const endIndex = cursor - 2;
|
|
228
|
-
if (blocks.some((block) => block.start <= endIndex + 1)) {
|
|
229
|
-
return fail(['symbol_inside_import_block']);
|
|
230
|
-
}
|
|
231
|
-
|
|
232
|
-
const bodyByPath = new Map();
|
|
233
|
-
const removal = new Set();
|
|
234
|
-
// 原pathでexportされていたsymbolは、移した先から残余面が再exportする。
|
|
235
|
-
// しないと原pathをimportしている全fileが壊れ、外部挙動同等性が原理的に満たせない。
|
|
236
|
-
const reExportByPath = new Map();
|
|
237
|
-
for (const block of blocks) {
|
|
238
|
-
const raw = lines.slice(block.start - 1, block.end).join('\n');
|
|
239
|
-
if (!bodyByPath.has(block.path)) bodyByPath.set(block.path, []);
|
|
240
|
-
bodyByPath.get(block.path).push(exportedBlock(raw));
|
|
241
|
-
if (block.exported) {
|
|
242
|
-
if (!reExportByPath.has(block.path)) reExportByPath.set(block.path, []);
|
|
243
|
-
reExportByPath.get(block.path).push(block.symbol);
|
|
244
|
-
}
|
|
245
|
-
for (let line = block.start; line <= block.end; line += 1) removal.add(line);
|
|
246
|
-
}
|
|
247
|
-
|
|
248
|
-
const symbolPath = new Map(blocks.map((block) => [block.symbol, block.path]));
|
|
249
|
-
const importsFor = (ownerPath, body) => {
|
|
250
|
-
const carried = statements
|
|
251
|
-
.filter((statement) => statement.bindings.some((name) => mentions(body, name)))
|
|
252
|
-
.map((statement) => statement.text);
|
|
253
|
-
const byTarget = new Map();
|
|
254
|
-
for (const [symbol, targetPath] of symbolPath) {
|
|
255
|
-
if (targetPath === ownerPath || !mentions(body, symbol)) continue;
|
|
256
|
-
if (!byTarget.has(targetPath)) byTarget.set(targetPath, []);
|
|
257
|
-
byTarget.get(targetPath).push(symbol);
|
|
258
|
-
}
|
|
259
|
-
const cross = [...byTarget.entries()]
|
|
260
|
-
.sort(([left], [right]) => compareText(left, right))
|
|
261
|
-
.map(([targetPath, names]) => `import { ${[...names].sort(compareText).join(', ')} } from '${relativeSpecifier(ownerPath, targetPath)}';`);
|
|
262
|
-
return [...carried, ...cross];
|
|
263
|
-
};
|
|
264
|
-
|
|
265
|
-
const files = {};
|
|
266
|
-
for (const [path, bodies] of bodyByPath) {
|
|
267
|
-
const body = bodies.join('\n\n');
|
|
268
|
-
const header = importsFor(path, body);
|
|
269
|
-
files[path] = `${header.length === 0 ? '' : `${header.join('\n')}\n\n`}${body}\n`;
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
const keptHeader = lines.slice(0, endIndex + 1);
|
|
273
|
-
const keptBody = lines.slice(endIndex + 1)
|
|
274
|
-
.filter((_, index) => !removal.has(endIndex + 2 + index));
|
|
275
|
-
const residualBody = keptBody.join('\n').replace(/\n{3,}/gu, '\n\n').replace(/\n+$/u, '');
|
|
276
|
-
const residualCross = importsFor(residual.path, residualBody)
|
|
277
|
-
.filter((statement) => !keptHeader.join('\n').includes(statement));
|
|
278
|
-
const reExports = [...reExportByPath.entries()]
|
|
279
|
-
.sort(([left], [right]) => compareText(left, right))
|
|
280
|
-
.map(([targetPath, names]) => `export { ${[...names].sort(compareText).join(', ')} }`
|
|
281
|
-
+ ` from '${relativeSpecifier(residual.path, targetPath)}';`);
|
|
282
|
-
files[residual.path] = `${[...keptHeader, ...residualCross, ...reExports].join('\n')}\n${residualBody}\n`
|
|
283
|
-
.replace(/^\n+/u, '');
|
|
284
|
-
|
|
285
|
-
return { files, reasons: [] };
|
|
286
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* 三面の変換候補を実際のソースへ適用する書き換え(ADR 0137)。
|
|
3
|
+
*
|
|
4
|
+
* 決まった移動を機械的に実行するだけである。どこへ何を移すかはseam導出が決めており、
|
|
5
|
+
* 「どう書くのが綺麗か」の裁量は持ち込まない。整形の判断を入れると、変換の前後で挙動以外の差が
|
|
6
|
+
* 増え、外部挙動同等性の検証が何を見ているのか分からなくなる。
|
|
7
|
+
*
|
|
8
|
+
* 純関数として組む。worktreeへ書くのは呼び出し側の仕事で、ここはtextからtextを作る。
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
const IMPORT_START = /^import[\s{*]/u;
|
|
12
|
+
const COMMENT_LINE = /^\s*(?:\/\/|\/\*|\*|\*\/)/u;
|
|
13
|
+
const compareText = (left, right) => left < right ? -1 : left > right ? 1 : 0;
|
|
14
|
+
|
|
15
|
+
function fail(reasons) {
|
|
16
|
+
return { files: null, reasons: [...new Set(reasons)].sort(compareText) };
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* 先頭のimport文を、行範囲と束縛名つきで取り出す。
|
|
21
|
+
*
|
|
22
|
+
* 複数行importがあるので`from '...'`で終わる行までを1文とする。束縛名は、移した先で
|
|
23
|
+
* どのimportが要るかを語単位で判定するために使う。
|
|
24
|
+
*
|
|
25
|
+
* **書き換え本体はこれを使わない(sc-013)。** planSeamRewriteのimport面はsensorの
|
|
26
|
+
* AST観測(`joinImportSurface`)から受け取る。この正規表現走査が残っているのは
|
|
27
|
+
* seam-costのprofile投影(ESM限定とconfidenceで申告済み)のためだけである。
|
|
28
|
+
*/
|
|
29
|
+
export function scanImportStatements(lines) {
|
|
30
|
+
const statements = [];
|
|
31
|
+
let index = 0;
|
|
32
|
+
while (index < lines.length) {
|
|
33
|
+
const line = lines[index];
|
|
34
|
+
if (line.trim() === '' || COMMENT_LINE.test(line)) { index += 1; continue; }
|
|
35
|
+
if (!IMPORT_START.test(line)) break;
|
|
36
|
+
const start = index;
|
|
37
|
+
while (index < lines.length
|
|
38
|
+
&& !/from\s+['"][^'"]+['"];?\s*$/u.test(lines[index])
|
|
39
|
+
&& !/^import\s+['"][^'"]+['"];?\s*$/u.test(lines[index])) index += 1;
|
|
40
|
+
const end = Math.min(index, lines.length - 1);
|
|
41
|
+
const text = lines.slice(start, end + 1).join('\n');
|
|
42
|
+
statements.push({ text, bindings: importBindings(text), start, end });
|
|
43
|
+
index = end + 1;
|
|
44
|
+
}
|
|
45
|
+
return { statements, endIndex: statements.length === 0 ? -1 : statements.at(-1).end };
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export function importBindings(text) {
|
|
49
|
+
const bindings = [];
|
|
50
|
+
const namespace = /import\s+\*\s+as\s+([A-Za-z_$][\w$]*)/u.exec(text);
|
|
51
|
+
if (namespace) bindings.push(namespace[1]);
|
|
52
|
+
const defaultBinding = /^import\s+([A-Za-z_$][\w$]*)\s*(?:,|\sfrom)/u.exec(text);
|
|
53
|
+
if (defaultBinding) bindings.push(defaultBinding[1]);
|
|
54
|
+
const named = /\{([\s\S]*?)\}/u.exec(text);
|
|
55
|
+
if (named) {
|
|
56
|
+
for (const entry of named[1].split(',')) {
|
|
57
|
+
const parts = entry.split(/\s+as\s+/u).map((part) => part.trim());
|
|
58
|
+
const name = parts.length > 1 ? parts[1] : parts[0];
|
|
59
|
+
if (/^[A-Za-z_$][\w$]*$/u.test(name)) bindings.push(name);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return [...new Set(bindings)];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/** 語として現れるか。string中やcomment中の一致も拾うが、余分なimportは害にならない。 */
|
|
66
|
+
export function mentions(text, name) {
|
|
67
|
+
return new RegExp(`(?<![\\w$])${name.replace(/[$]/gu, '\\$$')}(?![\\w$])`, 'u').test(text);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* sensorの観測(`file-nodes`の`imports`と`import_bindings`)をimport文単位へ束ねる(sc-013)。
|
|
72
|
+
*
|
|
73
|
+
* importsは文の行範囲、import_bindingsは束縛ごとの`{local, form, imported, line}`で、
|
|
74
|
+
* 両者は行番号で結合できる(解決済み束縛はedge metadata、builtin等の未解決束縛は
|
|
75
|
+
* unresolved_refs由来——どちらもAST抽出であり、正規表現の再実装ではない)。
|
|
76
|
+
* どの文にも入らない束縛は`unassigned`として返し、黙って捨てない。
|
|
77
|
+
*
|
|
78
|
+
* @returns {{statements: Array<{startLine:number,endLine:number,bindings:string[]}>, unassigned: string[]}}
|
|
79
|
+
*/
|
|
80
|
+
export function joinImportSurface(importNodes = [], importBindings = []) {
|
|
81
|
+
const statements = importNodes
|
|
82
|
+
.filter((node) => Number.isSafeInteger(node?.startLine) && Number.isSafeInteger(node?.endLine)
|
|
83
|
+
&& node.startLine >= 1 && node.endLine >= node.startLine)
|
|
84
|
+
.map((node) => ({ startLine: node.startLine, endLine: node.endLine, bindings: [] }))
|
|
85
|
+
.sort((left, right) => left.startLine - right.startLine);
|
|
86
|
+
const unassigned = [];
|
|
87
|
+
for (const binding of importBindings) {
|
|
88
|
+
if (typeof binding?.local !== 'string' || binding.local === '') continue;
|
|
89
|
+
const owner = Number.isSafeInteger(binding.line)
|
|
90
|
+
? statements.find(({ startLine, endLine }) => binding.line >= startLine && binding.line <= endLine)
|
|
91
|
+
: undefined;
|
|
92
|
+
if (owner === undefined) { unassigned.push(binding.local); continue; }
|
|
93
|
+
if (!owner.bindings.includes(binding.local)) owner.bindings.push(binding.local);
|
|
94
|
+
}
|
|
95
|
+
for (const statement of statements) statement.bindings.sort(compareText);
|
|
96
|
+
return { statements, unassigned: [...new Set(unassigned)].sort(compareText) };
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* 宣言の範囲を直前の連続コメント行まで広げる。
|
|
101
|
+
*
|
|
102
|
+
* JSDocを置き去りにすると、残余に持ち主のいない説明が残り、移した先が無説明になる。
|
|
103
|
+
* 空行で切るのは、離れた位置のコメントを巻き込まないため。
|
|
104
|
+
*/
|
|
105
|
+
function extendUpward(lines, startLine) {
|
|
106
|
+
let start = startLine;
|
|
107
|
+
while (start - 1 >= 1 && COMMENT_LINE.test(lines[start - 2])) start -= 1;
|
|
108
|
+
return start;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function exportedBlock(raw) {
|
|
112
|
+
const parts = raw.split('\n');
|
|
113
|
+
const declarationIndex = parts
|
|
114
|
+
.findIndex((line) => !COMMENT_LINE.test(line) && line.trim() !== '');
|
|
115
|
+
if (declarationIndex >= 0 && !/^\s*export\s/u.test(parts[declarationIndex])) {
|
|
116
|
+
parts[declarationIndex] = `export ${parts[declarationIndex]}`;
|
|
117
|
+
}
|
|
118
|
+
return parts.join('\n');
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
// 原pathでexport宣言だったかは、text走査でなくsensorのisExported(AST事実)で判定する
|
|
122
|
+
// (sc-013)。extentと同じくfile-nodes由来で、symbolExtentsの各entryが持って来る。
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* repo相対path同士から、ESMが解決できる相対specifierを作る。
|
|
126
|
+
*
|
|
127
|
+
* 以前は行き先がfromの配下でない時に`./<repo相対>`を返しており、親ディレクトリや兄弟
|
|
128
|
+
* ディレクトリへの移動で**解決不能なspecifier**を生成していた(`src/a/x.mjs`→`src/b/y.mjs`で
|
|
129
|
+
* `./src/b/y.mjs`)。segment単位で共通prefixを外し、残りを`../`で遡って組み立てる。
|
|
130
|
+
*/
|
|
131
|
+
export function relativeSpecifier(fromPath, toPath) {
|
|
132
|
+
const fromSegments = fromPath.split('/').slice(0, -1);
|
|
133
|
+
const toSegments = toPath.split('/');
|
|
134
|
+
let shared = 0;
|
|
135
|
+
while (shared < fromSegments.length && shared < toSegments.length - 1
|
|
136
|
+
&& fromSegments[shared] === toSegments[shared]) shared += 1;
|
|
137
|
+
const ascent = '../'.repeat(fromSegments.length - shared);
|
|
138
|
+
const descent = toSegments.slice(shared).join('/');
|
|
139
|
+
return ascent === '' ? `./${descent}` : `${ascent}${descent}`;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* 三面の変換後textを作る。
|
|
144
|
+
*
|
|
145
|
+
* import面と各symbolのexport状態はsensorの観測を入力として受け取る(sc-013)。
|
|
146
|
+
* ここで正規表現によるimport再解析を行わない——言語理解はsensorが所有し、
|
|
147
|
+
* ここは決まった移動のtext組み立てだけを持つ。観測が無ければtyped理由で止める。
|
|
148
|
+
* 唯一残るtext走査は直前コメント行の巻き込み(extendUpward)で、sensorはcomment行の
|
|
149
|
+
* 範囲を記録しないため、これはtext組み立ての一部として保持する。
|
|
150
|
+
*
|
|
151
|
+
* @param {object} options
|
|
152
|
+
* @param {string} options.sourceText 原pathの現在の内容
|
|
153
|
+
* @param {object} options.candidate `lattice.bounded_seam_candidate.v2`
|
|
154
|
+
* @param {object} options.symbolExtents symbol名 -> `{startLine, endLine, isExported}`(1始まり・両端含む)
|
|
155
|
+
* @param {object} options.importSurface `joinImportSurface`の結果(`{statements, unassigned}`)
|
|
156
|
+
* @returns {{files: object|null, reasons: string[]}} pathごとの変換後text
|
|
157
|
+
*/
|
|
158
|
+
export function planSeamRewrite({ sourceText, candidate, symbolExtents, importSurface } = {}) {
|
|
159
|
+
if (typeof sourceText !== 'string' || sourceText.length === 0) return fail(['empty_source']);
|
|
160
|
+
const lines = sourceText.split('\n');
|
|
161
|
+
const surfaces = candidate?.surfaces ?? [];
|
|
162
|
+
const residual = surfaces.find(({ role }) => role === 'residual');
|
|
163
|
+
const moving = surfaces.filter(({ role }) => role !== 'residual');
|
|
164
|
+
if (residual === undefined || moving.length === 0) return fail(['surfaces_incomplete']);
|
|
165
|
+
|
|
166
|
+
const blocks = [];
|
|
167
|
+
for (const surface of moving) {
|
|
168
|
+
for (const symbol of surface.symbols) {
|
|
169
|
+
const extent = symbolExtents?.[symbol];
|
|
170
|
+
if (extent === undefined
|
|
171
|
+
|| !Number.isSafeInteger(extent.startLine) || !Number.isSafeInteger(extent.endLine)
|
|
172
|
+
|| extent.startLine < 1 || extent.endLine > lines.length
|
|
173
|
+
|| extent.endLine < extent.startLine) {
|
|
174
|
+
return fail([`symbol_extent_missing:${symbol}`]);
|
|
175
|
+
}
|
|
176
|
+
// export状態はAST事実として要求する。無ければ推測せず止める(確実の門)。
|
|
177
|
+
if (typeof extent.isExported !== 'boolean') {
|
|
178
|
+
return fail([`symbol_export_status_missing:${symbol}`]);
|
|
179
|
+
}
|
|
180
|
+
blocks.push({
|
|
181
|
+
symbol, path: surface.path, end: extent.endLine, exported: extent.isExported,
|
|
182
|
+
start: extendUpward(lines, extent.startLine),
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
blocks.sort((left, right) => left.start - right.start);
|
|
187
|
+
for (let index = 1; index < blocks.length; index += 1) {
|
|
188
|
+
// 範囲が重なる宣言は、片方を切ると他方が壊れる。整形で解こうとせず止める。
|
|
189
|
+
if (blocks[index].start <= blocks[index - 1].end) {
|
|
190
|
+
return fail([`symbol_extent_overlap:${blocks[index - 1].symbol}:${blocks[index].symbol}`]);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
// import面はsensorの観測から。観測が無い・束縛の帰属が決まらない・importが先頭block
|
|
195
|
+
// の外にある——いずれも「たぶん大丈夫」で進まず、typed理由でAIへ渡す。
|
|
196
|
+
if (importSurface === null || typeof importSurface !== 'object'
|
|
197
|
+
|| !Array.isArray(importSurface.statements)) {
|
|
198
|
+
return fail(['import_surface_missing']);
|
|
199
|
+
}
|
|
200
|
+
if (Array.isArray(importSurface.unassigned) && importSurface.unassigned.length > 0) {
|
|
201
|
+
return fail(importSurface.unassigned.map((name) => `import_binding_unassigned:${name}`));
|
|
202
|
+
}
|
|
203
|
+
const statements = [];
|
|
204
|
+
let cursor = 1;
|
|
205
|
+
for (const entry of [...importSurface.statements]
|
|
206
|
+
.sort((left, right) => left.startLine - right.startLine)) {
|
|
207
|
+
if (!Number.isSafeInteger(entry.startLine) || !Number.isSafeInteger(entry.endLine)
|
|
208
|
+
|| entry.startLine < 1 || entry.endLine > lines.length || entry.endLine < entry.startLine
|
|
209
|
+
|| !Array.isArray(entry.bindings)) {
|
|
210
|
+
return fail(['import_surface_missing']);
|
|
211
|
+
}
|
|
212
|
+
if (entry.startLine < cursor) return fail([`import_statement_ambiguous:${entry.startLine}`]);
|
|
213
|
+
for (let line = cursor; line < entry.startLine; line += 1) {
|
|
214
|
+
const text = lines[line - 1];
|
|
215
|
+
if (text.trim() !== '' && !COMMENT_LINE.test(text)) {
|
|
216
|
+
// 先頭block外のimport(ESMでは合法)は、残余headerの組み立てが機械では確実に
|
|
217
|
+
// できない。整形で解こうとせず止める。
|
|
218
|
+
return fail([`import_below_header:${entry.startLine}`]);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
statements.push({
|
|
222
|
+
text: lines.slice(entry.startLine - 1, entry.endLine).join('\n'),
|
|
223
|
+
bindings: entry.bindings.filter((name) => typeof name === 'string' && name !== ''),
|
|
224
|
+
});
|
|
225
|
+
cursor = entry.endLine + 1;
|
|
226
|
+
}
|
|
227
|
+
const endIndex = cursor - 2;
|
|
228
|
+
if (blocks.some((block) => block.start <= endIndex + 1)) {
|
|
229
|
+
return fail(['symbol_inside_import_block']);
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
const bodyByPath = new Map();
|
|
233
|
+
const removal = new Set();
|
|
234
|
+
// 原pathでexportされていたsymbolは、移した先から残余面が再exportする。
|
|
235
|
+
// しないと原pathをimportしている全fileが壊れ、外部挙動同等性が原理的に満たせない。
|
|
236
|
+
const reExportByPath = new Map();
|
|
237
|
+
for (const block of blocks) {
|
|
238
|
+
const raw = lines.slice(block.start - 1, block.end).join('\n');
|
|
239
|
+
if (!bodyByPath.has(block.path)) bodyByPath.set(block.path, []);
|
|
240
|
+
bodyByPath.get(block.path).push(exportedBlock(raw));
|
|
241
|
+
if (block.exported) {
|
|
242
|
+
if (!reExportByPath.has(block.path)) reExportByPath.set(block.path, []);
|
|
243
|
+
reExportByPath.get(block.path).push(block.symbol);
|
|
244
|
+
}
|
|
245
|
+
for (let line = block.start; line <= block.end; line += 1) removal.add(line);
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
const symbolPath = new Map(blocks.map((block) => [block.symbol, block.path]));
|
|
249
|
+
const importsFor = (ownerPath, body) => {
|
|
250
|
+
const carried = statements
|
|
251
|
+
.filter((statement) => statement.bindings.some((name) => mentions(body, name)))
|
|
252
|
+
.map((statement) => statement.text);
|
|
253
|
+
const byTarget = new Map();
|
|
254
|
+
for (const [symbol, targetPath] of symbolPath) {
|
|
255
|
+
if (targetPath === ownerPath || !mentions(body, symbol)) continue;
|
|
256
|
+
if (!byTarget.has(targetPath)) byTarget.set(targetPath, []);
|
|
257
|
+
byTarget.get(targetPath).push(symbol);
|
|
258
|
+
}
|
|
259
|
+
const cross = [...byTarget.entries()]
|
|
260
|
+
.sort(([left], [right]) => compareText(left, right))
|
|
261
|
+
.map(([targetPath, names]) => `import { ${[...names].sort(compareText).join(', ')} } from '${relativeSpecifier(ownerPath, targetPath)}';`);
|
|
262
|
+
return [...carried, ...cross];
|
|
263
|
+
};
|
|
264
|
+
|
|
265
|
+
const files = {};
|
|
266
|
+
for (const [path, bodies] of bodyByPath) {
|
|
267
|
+
const body = bodies.join('\n\n');
|
|
268
|
+
const header = importsFor(path, body);
|
|
269
|
+
files[path] = `${header.length === 0 ? '' : `${header.join('\n')}\n\n`}${body}\n`;
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
const keptHeader = lines.slice(0, endIndex + 1);
|
|
273
|
+
const keptBody = lines.slice(endIndex + 1)
|
|
274
|
+
.filter((_, index) => !removal.has(endIndex + 2 + index));
|
|
275
|
+
const residualBody = keptBody.join('\n').replace(/\n{3,}/gu, '\n\n').replace(/\n+$/u, '');
|
|
276
|
+
const residualCross = importsFor(residual.path, residualBody)
|
|
277
|
+
.filter((statement) => !keptHeader.join('\n').includes(statement));
|
|
278
|
+
const reExports = [...reExportByPath.entries()]
|
|
279
|
+
.sort(([left], [right]) => compareText(left, right))
|
|
280
|
+
.map(([targetPath, names]) => `export { ${[...names].sort(compareText).join(', ')} }`
|
|
281
|
+
+ ` from '${relativeSpecifier(residual.path, targetPath)}';`);
|
|
282
|
+
files[residual.path] = `${[...keptHeader, ...residualCross, ...reExports].join('\n')}\n${residualBody}\n`
|
|
283
|
+
.replace(/^\n+/u, '');
|
|
284
|
+
|
|
285
|
+
return { files, reasons: [] };
|
|
286
|
+
}
|