anvil-engineering-workbench 1.0.7 → 1.0.8
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/CHANGELOG.md +23 -0
- package/README.md +7 -0
- package/SECURITY.md +7 -4
- package/dist/ai/claude-code-provider.js +4 -3
- package/dist/ai/claude-code-provider.js.map +1 -1
- package/dist/ai/provider.js +1 -1
- package/dist/cli.js +151 -54
- package/dist/cli.js.map +1 -1
- package/dist/core/container-sandbox.js +1 -1
- package/dist/core/container-sandbox.js.map +1 -1
- package/dist/core/env-compat.d.ts +11 -0
- package/dist/core/env-compat.js +32 -0
- package/dist/core/env-compat.js.map +1 -0
- package/dist/core/hosted-agent-provider.js +11 -6
- package/dist/core/hosted-agent-provider.js.map +1 -1
- package/dist/core/project-cleaner.d.ts +7 -0
- package/dist/core/project-cleaner.js +226 -12
- package/dist/core/project-cleaner.js.map +1 -1
- package/dist/core/provider-diagnostics.js +3 -3
- package/dist/core/provider-diagnostics.js.map +1 -1
- package/dist/core/sarif-formatter.d.ts +12 -0
- package/dist/core/sarif-formatter.js +121 -0
- package/dist/core/sarif-formatter.js.map +1 -0
- package/dist/core/verification.js +2 -1
- package/dist/core/verification.js.map +1 -1
- package/dist/mcp/server.js +52 -32
- package/dist/mcp/server.js.map +1 -1
- package/package.json +7 -1
|
@@ -49,7 +49,7 @@ export function buildContainerRunArgs(workspace, image, script, containerName, p
|
|
|
49
49
|
"--memory=" + (policy?.maxMemory ?? profile.maxMemory), "--memory-swap=" + (policy?.maxMemory ?? profile.maxMemory), "--cpus=" + String(policy?.maxCpus ?? profile.maxCpus), "--ulimit", "nofile=1024:1024",
|
|
50
50
|
"--tmpfs", "/tmp:rw,nosuid,nodev,size=64m,mode=1777",
|
|
51
51
|
"--tmpfs", "/workspace:rw,nosuid,nodev,size=1g,mode=1777",
|
|
52
|
-
"--env", "CI=1", "--env", "NODE_ENV=test", "--env", "FORGE_VERIFICATION=1", "--env", "HOME=/tmp", "--env", "TMPDIR=/tmp",
|
|
52
|
+
"--env", "CI=1", "--env", "NODE_ENV=test", "--env", "ANVIL_VERIFICATION=1", "--env", "FORGE_VERIFICATION=1", "--env", "HOME=/tmp", "--env", "TMPDIR=/tmp",
|
|
53
53
|
"--user", typeof process.getuid === "function" && typeof process.getgid === "function" ? process.getuid() + ":" + process.getgid() : "1000:1000",
|
|
54
54
|
"--mount", "type=bind,source=" + workspace + ",target=/snapshot,readonly",
|
|
55
55
|
"--workdir", "/workspace", "--entrypoint", "node",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-sandbox.js","sourceRoot":"","sources":["../../src/core/container-sandbox.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"container-sandbox.js","sourceRoot":"","sources":["../../src/core/container-sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment variable compatibility and deprecation helper for ANVIL.
|
|
3
|
+
*
|
|
4
|
+
* Prioritizes modern ANVIL_* prefixes while gracefully supporting legacy FORGE_*
|
|
5
|
+
* fallbacks with a one-time runtime deprecation warning.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Reads an environment variable with priority given to ANVIL_*, falling back to FORGE_*.
|
|
9
|
+
* Logs a deprecation warning if only the FORGE_* variable is present.
|
|
10
|
+
*/
|
|
11
|
+
export declare function getAnvilEnv(anvilKey: string, forgeKey?: string, defaultValue?: string): string | undefined;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment variable compatibility and deprecation helper for ANVIL.
|
|
3
|
+
*
|
|
4
|
+
* Prioritizes modern ANVIL_* prefixes while gracefully supporting legacy FORGE_*
|
|
5
|
+
* fallbacks with a one-time runtime deprecation warning.
|
|
6
|
+
*/
|
|
7
|
+
const warnedDeprecatedKeys = new Set();
|
|
8
|
+
/**
|
|
9
|
+
* Reads an environment variable with priority given to ANVIL_*, falling back to FORGE_*.
|
|
10
|
+
* Logs a deprecation warning if only the FORGE_* variable is present.
|
|
11
|
+
*/
|
|
12
|
+
export function getAnvilEnv(anvilKey, forgeKey, defaultValue) {
|
|
13
|
+
const anvilVal = process.env[anvilKey];
|
|
14
|
+
if (anvilVal !== undefined && anvilVal !== "") {
|
|
15
|
+
return anvilVal;
|
|
16
|
+
}
|
|
17
|
+
if (forgeKey) {
|
|
18
|
+
const forgeVal = process.env[forgeKey];
|
|
19
|
+
if (forgeVal !== undefined && forgeVal !== "") {
|
|
20
|
+
if (!warnedDeprecatedKeys.has(forgeKey)) {
|
|
21
|
+
warnedDeprecatedKeys.add(forgeKey);
|
|
22
|
+
// Suppress warning during testing or JSON output to avoid breaking JSON parsers
|
|
23
|
+
if (!process.argv.includes("--json") && process.env.NODE_ENV !== "test") {
|
|
24
|
+
console.warn(`[ANVIL Deprecation] Environment variable '${forgeKey}' is deprecated and will be removed in ANVIL v2.0. Please use '${anvilKey}' instead.`);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return forgeVal;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return defaultValue;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=env-compat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-compat.js","sourceRoot":"","sources":["../../src/core/env-compat.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;AAE/C;;;GAGG;AACH,MAAM,UAAU,WAAW,CACzB,QAAgB,EAChB,QAAiB,EACjB,YAAqB;IAErB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QAC9C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACnC,gFAAgF;gBAChF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;oBACxE,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,kEAAkE,QAAQ,YAAY,CAC5I,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -59,7 +59,7 @@ export class HostedAgentProvider {
|
|
|
59
59
|
if (!options.model.trim())
|
|
60
60
|
throw new Error("A model name is required for the configured provider.");
|
|
61
61
|
if (options.provider !== "ollama" && !options.apiKey?.trim()) {
|
|
62
|
-
const credential = options.provider === "openai" ? "FORGE_API_KEY or OPENAI_API_KEY" : options.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
|
|
62
|
+
const credential = options.provider === "openai" ? "ANVIL_API_KEY, FORGE_API_KEY or OPENAI_API_KEY" : options.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
|
|
63
63
|
throw new Error(options.provider + " requires an API key (set " + credential + ").");
|
|
64
64
|
}
|
|
65
65
|
this.name = options.provider;
|
|
@@ -121,13 +121,18 @@ function defaultBase(provider) {
|
|
|
121
121
|
return "http://localhost:11434";
|
|
122
122
|
}
|
|
123
123
|
export function createHostedAgentProvider(env = process.env, modelOverride, runtime = {}) {
|
|
124
|
-
const provider = (env.FORGE_AI_PROVIDER ?? "openai").toLowerCase();
|
|
124
|
+
const provider = (env.ANVIL_AI_PROVIDER ?? env.FORGE_AI_PROVIDER ?? "openai").toLowerCase();
|
|
125
125
|
if (!["openai", "anthropic", "google", "ollama"].includes(provider))
|
|
126
126
|
throw new Error("Hosted provider must be openai, anthropic, google or ollama.");
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
127
|
+
const apiKey = provider === "openai"
|
|
128
|
+
? (env.ANVIL_API_KEY ?? env.FORGE_API_KEY ?? env.OPENAI_API_KEY)
|
|
129
|
+
: provider === "anthropic"
|
|
130
|
+
? env.ANTHROPIC_API_KEY
|
|
131
|
+
: provider === "google"
|
|
132
|
+
? env.GOOGLE_API_KEY
|
|
133
|
+
: undefined;
|
|
134
|
+
const model = modelOverride ?? env.ANVIL_AI_MODEL ?? env.FORGE_AI_MODEL ?? env.ANVIL_MODEL ?? env.FORGE_MODEL ?? (provider === "openai" ? "gpt-4.1-mini" : provider === "anthropic" ? "claude-sonnet-4-5" : provider === "google" ? "gemini-2.5-flash" : "llama3.2");
|
|
135
|
+
const baseUrl = env.ANVIL_BASE_URL ?? env.FORGE_BASE_URL ?? (provider === "ollama" ? env.OLLAMA_HOST : undefined);
|
|
131
136
|
return new HostedAgentProvider({ provider, model, ...(apiKey ? { apiKey } : {}), ...(baseUrl ? { baseUrl } : {}), ...runtime });
|
|
132
137
|
}
|
|
133
138
|
//# sourceMappingURL=hosted-agent-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosted-agent-provider.js","sourceRoot":"","sources":["../../src/core/hosted-agent-provider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hosted-agent-provider.js","sourceRoot":"","sources":["../../src/core/hosted-agent-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,13 @@ export interface CleanResult {
|
|
|
63
63
|
};
|
|
64
64
|
warnings: string[];
|
|
65
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Scans content to identify line indices that are inside multiline string literals or docstrings.
|
|
68
|
+
* In JS/TS: protects template literals (`...`) so runtime strings with intentional trailing spaces are preserved.
|
|
69
|
+
* In Python: protects triple-quoted strings ("""...""" and '''...''') so multiline docstrings are preserved.
|
|
70
|
+
* In Go: protects raw backtick string literals (`...`).
|
|
71
|
+
*/
|
|
72
|
+
export declare function getProtectedMultilineLines(content: string, ext: string): Set<number>;
|
|
66
73
|
export declare function autoFixCodeContent(content: string, filePath: string): {
|
|
67
74
|
newContent: string;
|
|
68
75
|
fixes: CodeFixItem[];
|
|
@@ -159,6 +159,179 @@ function parseNamedImports(namedBlock) {
|
|
|
159
159
|
return { importedName: single, localName: single, isType };
|
|
160
160
|
});
|
|
161
161
|
}
|
|
162
|
+
/**
|
|
163
|
+
* Scans content to identify line indices that are inside multiline string literals or docstrings.
|
|
164
|
+
* In JS/TS: protects template literals (`...`) so runtime strings with intentional trailing spaces are preserved.
|
|
165
|
+
* In Python: protects triple-quoted strings ("""...""" and '''...''') so multiline docstrings are preserved.
|
|
166
|
+
* In Go: protects raw backtick string literals (`...`).
|
|
167
|
+
*/
|
|
168
|
+
export function getProtectedMultilineLines(content, ext) {
|
|
169
|
+
const protectedLines = new Set();
|
|
170
|
+
const isJsTs = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"].includes(ext);
|
|
171
|
+
const isPython = [".py", ".pyi"].includes(ext);
|
|
172
|
+
const isGo = ext === ".go";
|
|
173
|
+
if (!isJsTs && !isPython && !isGo) {
|
|
174
|
+
return protectedLines;
|
|
175
|
+
}
|
|
176
|
+
const lines = content.split("\n");
|
|
177
|
+
if (isJsTs) {
|
|
178
|
+
let inBacktick = false;
|
|
179
|
+
let inBlockComment = false;
|
|
180
|
+
let templateBraceDepth = 0;
|
|
181
|
+
for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
|
|
182
|
+
const line = lines[lineIdx] ?? "";
|
|
183
|
+
let i = 0;
|
|
184
|
+
const startedInTemplate = inBacktick;
|
|
185
|
+
while (i < line.length) {
|
|
186
|
+
if (inBlockComment) {
|
|
187
|
+
if (line.charAt(i) === "*" && line.charAt(i + 1) === "/") {
|
|
188
|
+
inBlockComment = false;
|
|
189
|
+
i += 2;
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
i++;
|
|
193
|
+
}
|
|
194
|
+
continue;
|
|
195
|
+
}
|
|
196
|
+
if (!inBacktick) {
|
|
197
|
+
if (line.charAt(i) === "/" && line.charAt(i + 1) === "/") {
|
|
198
|
+
break; // Single line comment
|
|
199
|
+
}
|
|
200
|
+
if (line.charAt(i) === "/" && line.charAt(i + 1) === "*") {
|
|
201
|
+
inBlockComment = true;
|
|
202
|
+
i += 2;
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
205
|
+
if (line.charAt(i) === '"' || line.charAt(i) === "'") {
|
|
206
|
+
const quote = line.charAt(i);
|
|
207
|
+
i++;
|
|
208
|
+
while (i < line.length && line.charAt(i) !== quote) {
|
|
209
|
+
if (line.charAt(i) === "\\")
|
|
210
|
+
i++;
|
|
211
|
+
i++;
|
|
212
|
+
}
|
|
213
|
+
if (i < line.length)
|
|
214
|
+
i++;
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
if (line.charAt(i) === "`") {
|
|
218
|
+
inBacktick = true;
|
|
219
|
+
i++;
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
// Inside template literal
|
|
225
|
+
if (line.charAt(i) === "\\") {
|
|
226
|
+
i += 2;
|
|
227
|
+
continue;
|
|
228
|
+
}
|
|
229
|
+
if (line.charAt(i) === "$" && line.charAt(i + 1) === "{") {
|
|
230
|
+
templateBraceDepth++;
|
|
231
|
+
i += 2;
|
|
232
|
+
continue;
|
|
233
|
+
}
|
|
234
|
+
if (templateBraceDepth > 0) {
|
|
235
|
+
if (line.charAt(i) === "{")
|
|
236
|
+
templateBraceDepth++;
|
|
237
|
+
else if (line.charAt(i) === "}")
|
|
238
|
+
templateBraceDepth--;
|
|
239
|
+
i++;
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
if (line.charAt(i) === "`") {
|
|
243
|
+
inBacktick = false;
|
|
244
|
+
i++;
|
|
245
|
+
continue;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
i++;
|
|
249
|
+
}
|
|
250
|
+
if (startedInTemplate || inBacktick) {
|
|
251
|
+
protectedLines.add(lineIdx);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
else if (isPython) {
|
|
256
|
+
let inTripleDouble = false;
|
|
257
|
+
let inTripleSingle = false;
|
|
258
|
+
for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
|
|
259
|
+
const line = lines[lineIdx] ?? "";
|
|
260
|
+
let i = 0;
|
|
261
|
+
const startedInTriple = inTripleDouble || inTripleSingle;
|
|
262
|
+
while (i < line.length) {
|
|
263
|
+
if (!inTripleDouble && !inTripleSingle) {
|
|
264
|
+
if (line.charAt(i) === "#") {
|
|
265
|
+
break;
|
|
266
|
+
}
|
|
267
|
+
if (line.slice(i, i + 3) === '"""') {
|
|
268
|
+
inTripleDouble = true;
|
|
269
|
+
i += 3;
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
if (line.slice(i, i + 3) === "'''") {
|
|
273
|
+
inTripleSingle = true;
|
|
274
|
+
i += 3;
|
|
275
|
+
continue;
|
|
276
|
+
}
|
|
277
|
+
if (line.charAt(i) === '"' || line.charAt(i) === "'") {
|
|
278
|
+
const quote = line.charAt(i);
|
|
279
|
+
i++;
|
|
280
|
+
while (i < line.length && line.charAt(i) !== quote) {
|
|
281
|
+
if (line.charAt(i) === "\\")
|
|
282
|
+
i++;
|
|
283
|
+
i++;
|
|
284
|
+
}
|
|
285
|
+
if (i < line.length)
|
|
286
|
+
i++;
|
|
287
|
+
continue;
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
else if (inTripleDouble) {
|
|
291
|
+
if (line.charAt(i) === "\\") {
|
|
292
|
+
i += 2;
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
if (line.slice(i, i + 3) === '"""') {
|
|
296
|
+
inTripleDouble = false;
|
|
297
|
+
i += 3;
|
|
298
|
+
continue;
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
else if (inTripleSingle) {
|
|
302
|
+
if (line.charAt(i) === "\\") {
|
|
303
|
+
i += 2;
|
|
304
|
+
continue;
|
|
305
|
+
}
|
|
306
|
+
if (line.slice(i, i + 3) === "'''") {
|
|
307
|
+
inTripleSingle = false;
|
|
308
|
+
i += 3;
|
|
309
|
+
continue;
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
i++;
|
|
313
|
+
}
|
|
314
|
+
if (startedInTriple || inTripleDouble || inTripleSingle) {
|
|
315
|
+
protectedLines.add(lineIdx);
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
else if (isGo) {
|
|
320
|
+
let inBacktick = false;
|
|
321
|
+
for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
|
|
322
|
+
const line = lines[lineIdx] ?? "";
|
|
323
|
+
const startedIn = inBacktick;
|
|
324
|
+
for (let i = 0; i < line.length; i++) {
|
|
325
|
+
if (line.charAt(i) === "`")
|
|
326
|
+
inBacktick = !inBacktick;
|
|
327
|
+
}
|
|
328
|
+
if (startedIn || inBacktick) {
|
|
329
|
+
protectedLines.add(lineIdx);
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
return protectedLines;
|
|
334
|
+
}
|
|
162
335
|
export function autoFixCodeContent(content, filePath) {
|
|
163
336
|
const fixes = [];
|
|
164
337
|
const ext = path.extname(filePath).toLowerCase();
|
|
@@ -168,10 +341,15 @@ export function autoFixCodeContent(content, filePath) {
|
|
|
168
341
|
return { newContent: content, fixes: [] };
|
|
169
342
|
}
|
|
170
343
|
let updated = content;
|
|
171
|
-
// 1. Whitespace normalization: remove trailing spaces
|
|
344
|
+
// 1. Whitespace normalization: remove trailing spaces ONLY outside protected string literals
|
|
345
|
+
const protectedLines = getProtectedMultilineLines(updated, ext);
|
|
172
346
|
const lines = updated.split("\n");
|
|
173
347
|
let trailingWhitespaceRemoved = false;
|
|
174
|
-
const cleanedLines = lines.map(line => {
|
|
348
|
+
const cleanedLines = lines.map((line, lineIdx) => {
|
|
349
|
+
// If line is inside a template literal or docstring, preserve trailing whitespace exactly!
|
|
350
|
+
if (protectedLines.has(lineIdx)) {
|
|
351
|
+
return line;
|
|
352
|
+
}
|
|
175
353
|
const stripped = line.replace(/[ \t\r]+$/, "");
|
|
176
354
|
if (stripped !== line.replace(/\r$/, "")) {
|
|
177
355
|
trailingWhitespaceRemoved = true;
|
|
@@ -183,19 +361,55 @@ export function autoFixCodeContent(content, filePath) {
|
|
|
183
361
|
fixes.push({
|
|
184
362
|
file: filePath,
|
|
185
363
|
type: "whitespace",
|
|
186
|
-
detail: "Trimmed trailing whitespace from lines",
|
|
364
|
+
detail: "Trimmed trailing whitespace from lines (string literals preserved)",
|
|
187
365
|
applied: true
|
|
188
366
|
});
|
|
189
367
|
}
|
|
190
|
-
// 2. Blank line normalization
|
|
191
|
-
if (
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
368
|
+
// 2. Blank line normalization: collapse 3+ consecutive newlines outside string literals
|
|
369
|
+
if (protectedLines.size === 0) {
|
|
370
|
+
if (/\n{3,}/.test(updated)) {
|
|
371
|
+
updated = updated.replace(/\n{3,}/g, "\n\n");
|
|
372
|
+
fixes.push({
|
|
373
|
+
file: filePath,
|
|
374
|
+
type: "blank-lines",
|
|
375
|
+
detail: "Collapsed excessive consecutive blank lines",
|
|
376
|
+
applied: true
|
|
377
|
+
});
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
else {
|
|
381
|
+
const recheckedLines = updated.split("\n");
|
|
382
|
+
const freshProtected = getProtectedMultilineLines(updated, ext);
|
|
383
|
+
let consecutiveBlank = 0;
|
|
384
|
+
const finalLines = [];
|
|
385
|
+
let blankLinesCollapsed = false;
|
|
386
|
+
for (let i = 0; i < recheckedLines.length; i++) {
|
|
387
|
+
const line = recheckedLines[i] ?? "";
|
|
388
|
+
const isBlank = line.trim() === "";
|
|
389
|
+
const isProtected = freshProtected.has(i);
|
|
390
|
+
if (isBlank && !isProtected) {
|
|
391
|
+
consecutiveBlank++;
|
|
392
|
+
if (consecutiveBlank <= 2) {
|
|
393
|
+
finalLines.push(line);
|
|
394
|
+
}
|
|
395
|
+
else {
|
|
396
|
+
blankLinesCollapsed = true;
|
|
397
|
+
}
|
|
398
|
+
}
|
|
399
|
+
else {
|
|
400
|
+
consecutiveBlank = 0;
|
|
401
|
+
finalLines.push(line);
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
if (blankLinesCollapsed) {
|
|
405
|
+
updated = finalLines.join("\n");
|
|
406
|
+
fixes.push({
|
|
407
|
+
file: filePath,
|
|
408
|
+
type: "blank-lines",
|
|
409
|
+
detail: "Collapsed excessive consecutive blank lines outside string literals",
|
|
410
|
+
applied: true
|
|
411
|
+
});
|
|
412
|
+
}
|
|
199
413
|
}
|
|
200
414
|
// 3. Ensure single trailing newline
|
|
201
415
|
if (updated.length > 0 && !updated.endsWith("\n")) {
|