@macroforge/typescript-plugin 0.1.64 → 0.1.67

package/dist/index.js

@@ -13,7 +13,7 @@
  *    this plugin intercepts the call and returns the macro-expanded version instead.
  *
  * 2. **Position Mapping**: Since expanded code has different positions than the original,
- *    the plugin maintains a {@link PositionMapper} for each file to translate positions
+ *    the plugin maintains a PositionMapper for each file to translate positions
  *    between original and expanded coordinates.
  *
  * 3. **Virtual .d.ts Files**: For each macro-containing file, the plugin generates a
@@ -44,13 +44,13 @@
  * ```
  *
  * @see {@link init} - The main plugin factory function
- * @see {@link PositionMapper} - Position mapping between original and expanded code
+ * @see PositionMapper from macroforge - Position mapping between original and expanded code
  * @module @macroforge/typescript-plugin
  */
-import { NativePlugin, __macroforgeGetManifest, loadConfig as nativeLoadConfig } from "macroforge";
-import { createRequire } from "module";
-import path from "path";
-import { parseMacroImportComments, getExternalMacroInfo, getExternalDecoratorInfo, loadMacroConfig, } from "@macroforge/shared";
+import { __macroforgeGetManifest, loadConfig as nativeLoadConfig, NativePlugin } from 'macroforge';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { getExternalDecoratorInfo, getExternalMacroInfo, loadMacroConfig, parseMacroImportComments } from '@macroforge/shared';
 // Create require for external package loading
 const moduleRequire = createRequire(import.meta.url);
 /**
@@ -92,8 +92,8 @@ function getMacroManifest() {
     try {
         const manifest = __macroforgeGetManifest();
         macroManifestCache = {
-            macros: new Map(manifest.macros.map(m => [m.name.toLowerCase(), m])),
-            decorators: new Map(manifest.decorators.map(d => [d.export.toLowerCase(), d])),
+            macros: new Map(manifest.macros.map((m) => [m.name.toLowerCase(), m])),
+            decorators: new Map(manifest.decorators.map((d) => [d.export.toLowerCase(), d]))
         };
         return macroManifestCache;
     }
@@ -144,11 +144,11 @@ function findDeriveAtPosition(text, position) {
         const deriveStart = match.index;
         const deriveEnd = deriveStart + match[0].length;
         if (position >= deriveStart && position <= deriveEnd) {
-            const argsStart = text.indexOf("(", deriveStart) + 1;
-            const argsEnd = text.indexOf(")", argsStart);
+            const argsStart = text.indexOf('(', deriveStart) + 1;
+            const argsEnd = text.indexOf(')', argsStart);
             const argsContent = text.substring(argsStart, argsEnd);
             let currentPos = argsStart;
-            const macroNames = argsContent.split(",");
+            const macroNames = argsContent.split(',');
             for (const rawName of macroNames) {
                 const trimmedName = rawName.trim();
                 const nameStartInArgs = rawName.indexOf(trimmedName);
@@ -191,7 +191,7 @@ function findDeriveKeywordAtPosition(text, position) {
     let match;
     while ((match = deriveKeywordPattern.exec(text)) !== null) {
         const start = match.index; // Position of @
-        const end = start + "@derive".length;
+        const end = start + '@derive'.length;
         if (position >= start && position < end) {
             return { start, end };
         }
@@ -242,10 +242,10 @@ function findDecoratorAtPosition(text, position) {
         const nameEnd = nameStart + match[1].length;
         if (position >= atSign && position <= nameEnd) {
             // Skip @derive in JSDoc comments - let findDeriveAtPosition handle those
-            if (match[1].toLowerCase() === "derive") {
+            if (match[1].toLowerCase() === 'derive') {
                 const beforeMatch = text.substring(0, atSign);
-                const lastCommentStart = beforeMatch.lastIndexOf("/**");
-                const lastCommentEnd = beforeMatch.lastIndexOf("*/");
+                const lastCommentStart = beforeMatch.lastIndexOf('/**');
+                const lastCommentEnd = beforeMatch.lastIndexOf('*/');
                 if (lastCommentStart > lastCommentEnd) {
                     continue;
                 }
@@ -289,7 +289,7 @@ function findEnclosingDeriveContext(text, position) {
     }
     if (lastMatch) {
         const macros = lastMatch[1]
-            .split(",")
+            .split(',')
             .map((m) => m.trim())
             .filter(Boolean);
         return macros;
@@ -374,22 +374,22 @@ function getMacroHoverInfo(text, position, tsModule) {
     if (deriveKeyword) {
         return {
             kind: tsModule.ScriptElementKind.keyword,
-            kindModifiers: "",
+            kindModifiers: '',
             textSpan: {
                 start: deriveKeyword.start,
-                length: deriveKeyword.end - deriveKeyword.start,
+                length: deriveKeyword.end - deriveKeyword.start
             },
-            displayParts: [{ text: "@derive", kind: "keyword" }],
+            displayParts: [{ text: '@derive', kind: 'keyword' }],
             documentation: [
                 {
-                    text: "Derive directive - applies compile-time macros to generate methods and implementations.\n\n" +
-                        "**Usage:** `/** @derive(MacroName, AnotherMacro) */`\n\n" +
-                        "**Built-in macros:** Debug, Clone, Default, Hash, PartialEq, PartialOrd, Ord, Serialize, Deserialize\n\n" +
-                        "External macros can be imported using:\n" +
+                    text: 'Derive directive - applies compile-time macros to generate methods and implementations.\n\n' +
+                        '**Usage:** `/** @derive(MacroName, AnotherMacro) */`\n\n' +
+                        '**Built-in macros:** Debug, Clone, Default, Hash, PartialEq, PartialOrd, Ord, Serialize, Deserialize\n\n' +
+                        'External macros can be imported using:\n' +
                         '`/** import macro {Name} from "package"; */`',
-                    kind: "text",
-                },
-            ],
+                    kind: 'text'
+                }
+            ]
         };
     }
     // Parse external macro imports for later use
@@ -402,19 +402,19 @@ function getMacroHoverInfo(text, position, tsModule) {
         if (macroInfo) {
             return {
                 kind: tsModule.ScriptElementKind.functionElement,
-                kindModifiers: "",
+                kindModifiers: '',
                 textSpan: {
                     start: deriveMatch.start,
-                    length: deriveMatch.end - deriveMatch.start,
+                    length: deriveMatch.end - deriveMatch.start
                 },
                 displayParts: [
-                    { text: "@derive(", kind: "punctuation" },
-                    { text: macroInfo.name, kind: "functionName" },
-                    { text: ")", kind: "punctuation" },
+                    { text: '@derive(', kind: 'punctuation' },
+                    { text: macroInfo.name, kind: 'functionName' },
+                    { text: ')', kind: 'punctuation' }
                 ],
                 documentation: macroInfo.description
-                    ? [{ text: macroInfo.description, kind: "text" }]
-                    : [],
+                    ? [{ text: macroInfo.description, kind: 'text' }]
+                    : []
             };
         }
         // 2b. Check external macro imports
@@ -424,39 +424,42 @@ function getMacroHoverInfo(text, position, tsModule) {
             const externalMacroInfo = getExternalMacroInfo(deriveMatch.macroName, modulePath, moduleRequire);
             const description = externalMacroInfo?.description
                 ? externalMacroInfo.description
-                : "This macro is loaded from an external package at compile time.";
+                : 'This macro is loaded from an external package at compile time.';
             return {
                 kind: tsModule.ScriptElementKind.functionElement,
-                kindModifiers: "external",
+                kindModifiers: 'external',
                 textSpan: {
                     start: deriveMatch.start,
-                    length: deriveMatch.end - deriveMatch.start,
+                    length: deriveMatch.end - deriveMatch.start
                 },
                 displayParts: [
-                    { text: "@derive(", kind: "punctuation" },
-                    { text: externalMacroInfo?.name ?? deriveMatch.macroName, kind: "functionName" },
-                    { text: ")", kind: "punctuation" },
+                    { text: '@derive(', kind: 'punctuation' },
+                    {
+                        text: externalMacroInfo?.name ?? deriveMatch.macroName,
+                        kind: 'functionName'
+                    },
+                    { text: ')', kind: 'punctuation' }
                 ],
                 documentation: [
                     {
                         text: `**External macro** from \`${modulePath}\`\n\n${description}`,
-                        kind: "text",
-                    },
-                ],
+                        kind: 'text'
+                    }
+                ]
             };
         }
         // 2c. Fallback for unknown/unrecognized macros
         return {
             kind: tsModule.ScriptElementKind.functionElement,
-            kindModifiers: "",
+            kindModifiers: '',
             textSpan: {
                 start: deriveMatch.start,
-                length: deriveMatch.end - deriveMatch.start,
+                length: deriveMatch.end - deriveMatch.start
             },
             displayParts: [
-                { text: "@derive(", kind: "punctuation" },
-                { text: deriveMatch.macroName, kind: "functionName" },
-                { text: ")", kind: "punctuation" },
+                { text: '@derive(', kind: 'punctuation' },
+                { text: deriveMatch.macroName, kind: 'functionName' },
+                { text: ')', kind: 'punctuation' }
             ],
             documentation: [
                 {
@@ -464,9 +467,9 @@ function getMacroHoverInfo(text, position, tsModule) {
                         "This macro is not in the built-in manifest. If it's a custom macro, " +
                         "ensure it's imported using:\n\n" +
                         `\`/** import macro {${deriveMatch.macroName}} from "your-package"; */\``,
-                    kind: "text",
-                },
-            ],
+                    kind: 'text'
+                }
+            ]
         };
     }
     // 3. Check for @decorator patterns
@@ -477,18 +480,18 @@ function getMacroHoverInfo(text, position, tsModule) {
         if (macroInfo) {
             return {
                 kind: tsModule.ScriptElementKind.functionElement,
-                kindModifiers: "",
+                kindModifiers: '',
                 textSpan: {
                     start: decoratorMatch.start,
-                    length: decoratorMatch.end - decoratorMatch.start,
+                    length: decoratorMatch.end - decoratorMatch.start
                 },
                 displayParts: [
-                    { text: "@", kind: "punctuation" },
-                    { text: macroInfo.name, kind: "functionName" },
+                    { text: '@', kind: 'punctuation' },
+                    { text: macroInfo.name, kind: 'functionName' }
                 ],
                 documentation: macroInfo.description
-                    ? [{ text: macroInfo.description, kind: "text" }]
-                    : [],
+                    ? [{ text: macroInfo.description, kind: 'text' }]
+                    : []
             };
         }
         // 3b. Check if it's a built-in decorator
@@ -496,16 +499,16 @@ function getMacroHoverInfo(text, position, tsModule) {
         if (decoratorInfo && decoratorInfo.docs) {
             return {
                 kind: tsModule.ScriptElementKind.functionElement,
-                kindModifiers: "",
+                kindModifiers: '',
                 textSpan: {
                     start: decoratorMatch.start,
-                    length: decoratorMatch.end - decoratorMatch.start,
+                    length: decoratorMatch.end - decoratorMatch.start
                 },
                 displayParts: [
-                    { text: "@", kind: "punctuation" },
-                    { text: decoratorInfo.export, kind: "functionName" },
+                    { text: '@', kind: 'punctuation' },
+                    { text: decoratorInfo.export, kind: 'functionName' }
                 ],
-                documentation: [{ text: decoratorInfo.docs, kind: "text" }],
+                documentation: [{ text: decoratorInfo.docs, kind: 'text' }]
             };
         }
         // 3c. Check if this decorator is in a macro context (for external/custom decorators)
@@ -521,47 +524,50 @@ function getMacroHoverInfo(text, position, tsModule) {
                     : null;
                 const description = externalDecoratorInfo?.docs
                     ? externalDecoratorInfo.docs
-                    : "This decorator configures field-level behavior for the macro.";
+                    : 'This decorator configures field-level behavior for the macro.';
                 return {
                     kind: tsModule.ScriptElementKind.functionElement,
-                    kindModifiers: "external",
+                    kindModifiers: 'external',
                     textSpan: {
                         start: decoratorMatch.start,
-                        length: decoratorMatch.end - decoratorMatch.start,
+                        length: decoratorMatch.end - decoratorMatch.start
                     },
                     displayParts: [
-                        { text: "@", kind: "punctuation" },
-                        { text: externalDecoratorInfo?.export ?? decoratorMatch.name, kind: "functionName" },
+                        { text: '@', kind: 'punctuation' },
+                        {
+                            text: externalDecoratorInfo?.export ?? decoratorMatch.name,
+                            kind: 'functionName'
+                        }
                     ],
                     documentation: [
                         {
                             text: `**Field decorator** from \`${likelySourceMacro}\` macro (\`${modulePath}\`)\n\n` +
                                 description,
-                            kind: "text",
-                        },
-                    ],
+                            kind: 'text'
+                        }
+                    ]
                 };
             }
             // Fallback: Generic decorator in macro context
             return {
                 kind: tsModule.ScriptElementKind.functionElement,
-                kindModifiers: "",
+                kindModifiers: '',
                 textSpan: {
                     start: decoratorMatch.start,
-                    length: decoratorMatch.end - decoratorMatch.start,
+                    length: decoratorMatch.end - decoratorMatch.start
                 },
                 displayParts: [
-                    { text: "@", kind: "punctuation" },
-                    { text: decoratorMatch.name, kind: "functionName" },
+                    { text: '@', kind: 'punctuation' },
+                    { text: decoratorMatch.name, kind: 'functionName' }
                 ],
                 documentation: [
                     {
                         text: `**Field decorator:** ${decoratorMatch.name}\n\n` +
-                            `Used with @derive(${enclosingMacros.join(", ")}).\n` +
-                            "This decorator configures field-level behavior for the applied macros.",
-                        kind: "text",
-                    },
-                ],
+                            `Used with @derive(${enclosingMacros.join(', ')}).\n` +
+                            'This decorator configures field-level behavior for the applied macros.',
+                        kind: 'text'
+                    }
+                ]
             };
         }
     }
@@ -571,7 +577,7 @@ function getMacroHoverInfo(text, position, tsModule) {
  * File extensions that the plugin will process for macro expansion.
  * @internal
  */
-const FILE_EXTENSIONS = [".ts", ".tsx", ".svelte"];
+const FILE_EXTENSIONS = ['.ts', '.tsx', '.svelte'];
 /**
  * Determines whether a file should be processed for macro expansion.
  *
@@ -599,12 +605,12 @@ const FILE_EXTENSIONS = [".ts", ".tsx", ".svelte"];
  */
 function shouldProcess(fileName) {
     const lower = fileName.toLowerCase();
-    if (lower.includes("node_modules"))
+    if (lower.includes('node_modules'))
         return false;
     if (fileName.includes(`${path.sep}.macroforge${path.sep}`))
         return false;
     // Skip generated .d.ts files
-    if (fileName.endsWith(".macroforge.d.ts"))
+    if (fileName.endsWith('.macroforge.d.ts'))
         return false;
     return FILE_EXTENSIONS.some((ext) => lower.endsWith(ext));
 }
@@ -636,7 +642,7 @@ function shouldProcess(fileName) {
  * ```
  */
 function hasMacroDirectives(text) {
-    return (text.includes("@derive") ||
+    return (text.includes('@derive') ||
         /\/\*\*\s*@derive\s*\(/i.test(text) ||
         /\/\*\*\s*import\s+macro\b/i.test(text));
 }
@@ -773,7 +779,7 @@ function init(modules) {
                 const result = nativeLoadConfig(content, filepath);
                 return {
                     ...result,
-                    returnTypes: "vanilla", // TODO: Extract from config if available
+                    returnTypes: 'vanilla' // TODO: Extract from config if available
                 };
             }
             catch {
@@ -782,7 +788,7 @@ function init(modules) {
                     generateConvenienceConst: false,
                     hasForeignTypes: false,
                     foreignTypeCount: 0,
-                    returnTypes: "vanilla",
+                    returnTypes: 'vanilla'
                 };
             }
         };
@@ -804,11 +810,15 @@ function init(modules) {
             try {
                 info.project.projectService.logger.info(`[macroforge] ${msg}`);
             }
-            catch { }
+            catch {
+                // Ignore logging failures
+            }
             try {
                 console.error(`[macroforge] ${msg}`);
             }
-            catch { }
+            catch {
+                // Ignore logging failures
+            }
         };
         /**
          * Registers a virtual `.macroforge.d.ts` file with TypeScript's project service.
@@ -897,7 +907,7 @@ function init(modules) {
                 }
             };
         }
-        log("Plugin initialized");
+        log('Plugin initialized');
         /**
          * Processes a file through macro expansion via the native Rust plugin.
          *
@@ -941,9 +951,9 @@ function init(modules) {
                         types: undefined,
                         metadata: undefined,
                         diagnostics: [],
-                        sourceMapping: undefined,
+                        sourceMapping: undefined
                     },
-                    code: content,
+                    code: content
                 };
             }
             try {
@@ -951,10 +961,10 @@ function init(modules) {
                 const result = nativePlugin.processFile(fileName, content, {
                     keepDecorators,
                     version,
-                    configPath: macroConfig.configPath,
+                    configPath: macroConfig.configPath
                 });
                 // Update virtual .d.ts files
-                const virtualDtsFileName = fileName + ".macroforge.d.ts";
+                const virtualDtsFileName = fileName + '.macroforge.d.ts';
                 if (result.types) {
                     virtualDtsFiles.set(virtualDtsFileName, tsModule.ScriptSnapshot.fromString(result.types));
                     ensureVirtualDtsRegistered(virtualDtsFileName);
@@ -969,17 +979,17 @@ function init(modules) {
             catch (e) {
                 const errorMessage = e instanceof Error ? e.stack || e.message : String(e);
                 log(`Plugin expansion failed for ${fileName}: ${errorMessage}`);
-                virtualDtsFiles.delete(fileName + ".macroforge.d.ts");
-                cleanupVirtualDts(fileName + ".macroforge.d.ts");
+                virtualDtsFiles.delete(fileName + '.macroforge.d.ts');
+                cleanupVirtualDts(fileName + '.macroforge.d.ts');
                 return {
                     result: {
                         code: content,
                         types: undefined,
                         metadata: undefined,
                         diagnostics: [],
-                        sourceMapping: undefined,
+                        sourceMapping: undefined
                     },
-                    code: content,
+                    code: content
                 };
             }
         }
@@ -995,12 +1005,13 @@ function init(modules) {
          * them from the source file's version. This ensures TypeScript invalidates
          * the virtual file when its source changes.
          */
-        const originalGetScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
+        const originalGetScriptVersion = info.languageServiceHost.getScriptVersion
+            .bind(info.languageServiceHost);
         info.languageServiceHost.getScriptVersion = (fileName) => {
             try {
                 if (virtualDtsFiles.has(fileName)) {
                     // Virtual .d.ts files inherit version from their source file
-                    const sourceFileName = fileName.replace(".macroforge.d.ts", "");
+                    const sourceFileName = fileName.replace('.macroforge.d.ts', '');
                     return originalGetScriptVersion(sourceFileName);
                 }
                 return originalGetScriptVersion(fileName);
@@ -1073,7 +1084,8 @@ function init(modules) {
          * - Uses `processingFiles` Set to prevent infinite loops during expansion
          * - Version-based cache invalidation ensures fresh expansions on file changes
          */
-        const originalGetScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
+        const originalGetScriptSnapshot = info.languageServiceHost.getScriptSnapshot
+            .bind(info.languageServiceHost);
         info.languageServiceHost.getScriptSnapshot = (fileName) => {
             try {
                 log(`getScriptSnapshot: ${fileName}`);
@@ -1096,7 +1108,7 @@ function init(modules) {
                 if (!snapshot) {
                     // Avoid tsserver crashes when a file was reported but no snapshot exists
                     log(`  -> no snapshot available for ${fileName}, returning empty snapshot`);
-                    return tsModule.ScriptSnapshot.fromString("");
+                    return tsModule.ScriptSnapshot.fromString('');
                 }
                 const text = snapshot.getText(0, snapshot.getLength());
                 // Scenario 4: No macro directives - return original
@@ -1124,7 +1136,7 @@ function init(modules) {
                         // Cache for stable identity across TS requests
                         snapshotCache.set(fileName, {
                             version,
-                            snapshot: expandedSnapshot,
+                            snapshot: expandedSnapshot
                         });
                         log(`  -> returning expanded snapshot`);
                         return expandedSnapshot;
@@ -1159,20 +1171,20 @@ function init(modules) {
          * @returns A plain object with diagnostic information
          */
         function toPlainDiagnostic(diag) {
-            const message = typeof diag.messageText === "string"
+            const message = typeof diag.messageText === 'string'
                 ? diag.messageText
                 : diag.messageText.messageText;
             const category = diag.category === tsModule.DiagnosticCategory.Error
-                ? "error"
+                ? 'error'
                 : diag.category === tsModule.DiagnosticCategory.Warning
-                    ? "warning"
-                    : "message";
+                    ? 'warning'
+                    : 'message';
             return {
                 start: diag.start,
                 length: diag.length,
                 message,
                 code: diag.code,
-                category,
+                category
             };
         }
         /**
@@ -1197,7 +1209,7 @@ function init(modules) {
                 return {
                     ...diag,
                     start: mappedDiag.start,
-                    length: mappedDiag.length,
+                    length: mappedDiag.length
                 };
             });
         }
@@ -1218,7 +1230,8 @@ function init(modules) {
          * meaningful locations in the user's source code, even when the actual error
          * occurred in macro-generated code.
          */
-        const originalGetSemanticDiagnostics = info.languageService.getSemanticDiagnostics.bind(info.languageService);
+        const originalGetSemanticDiagnostics = info.languageService
+            .getSemanticDiagnostics.bind(info.languageService);
         info.languageService.getSemanticDiagnostics = (fileName) => {
             try {
                 log(`getSemanticDiagnostics: ${fileName}`);
@@ -1262,7 +1275,7 @@ function init(modules) {
                         return {
                             ...diag,
                             start: mapped.start,
-                            length: mapped.length,
+                            length: mapped.length
                         };
                     })
                         .filter((diag) => diag !== null);
@@ -1291,7 +1304,7 @@ function init(modules) {
                     while ((match = deriveRegex.exec(text)) !== null) {
                         const fullStart = match.index;
                         const fullLength = match[0].length;
-                        const argsStart = match.index + match[0].indexOf("(") + 1;
+                        const argsStart = match.index + match[0].indexOf('(') + 1;
                         const argsText = match[1];
                         // Parse individual macro names from the arguments
                         const macros = [];
@@ -1301,7 +1314,7 @@ function init(modules) {
                             macros.push({
                                 name: macroMatch[1],
                                 start: argsStart + macroMatch.index,
-                                length: macroMatch[1].length,
+                                length: macroMatch[1].length
                             });
                         }
                         deriveDecorators.push({ fullStart, fullLength, macros });
@@ -1319,7 +1332,7 @@ function init(modules) {
                                     return { start: macro.start, length: macro.length };
                                 return {
                                     start: firstDec.fullStart,
-                                    length: firstDec.fullLength,
+                                    length: firstDec.fullLength
                                 };
                             }
                             return { start: 0, length: 7 };
@@ -1350,7 +1363,7 @@ function init(modules) {
                             }
                             // If macro name is "macro" (generic fallback) and there's exactly one macro,
                             // use that macro's position
-                            if ((macroName === "macro" || macroName === "") &&
+                            if ((macroName === 'macro' || macroName === '') &&
                                 nearestDecorator.macros.length === 1) {
                                 const onlyMacro = nearestDecorator.macros[0];
                                 return { start: onlyMacro.start, length: onlyMacro.length };
@@ -1358,7 +1371,7 @@ function init(modules) {
                             // Fallback to full decorator if macro not found
                             return {
                                 start: nearestDecorator.fullStart,
-                                length: nearestDecorator.fullLength,
+                                length: nearestDecorator.fullLength
                             };
                         }
                         return { start: 0, length: 7 };
@@ -1370,25 +1383,30 @@ function init(modules) {
                         // If mapper didn't return a name, try to get it from the generated region
                         if (!macroName) {
                             const region = result.sourceMapping.generatedRegions.find((r) => diagStart >= r.start && diagStart < r.end);
-                            macroName = region?.sourceMacro ?? "macro";
+                            macroName = region?.sourceMacro ?? 'macro';
                         }
                         // Extract just the macro name if it contains a path (e.g., "derive::Debug" -> "Debug")
-                        const simpleMacroName = macroName.includes("::")
-                            ? (macroName.split("::").pop() ?? macroName)
+                        const simpleMacroName = macroName.includes('::')
+                            ? (macroName.split('::').pop() ?? macroName)
                             : macroName;
                         log(`  -> diagnostic at ${diagStart}, macroName="${macroName}", simpleMacroName="${simpleMacroName}"`);
                         log(`  -> generatedRegions: ${JSON.stringify(result.sourceMapping.generatedRegions)}`);
-                        log(`  -> deriveDecorators: ${JSON.stringify(deriveDecorators.map((d) => ({ fullStart: d.fullStart, macros: d.macros })))}`);
+                        log(`  -> deriveDecorators: ${JSON.stringify(deriveDecorators.map((d) => ({
+                            fullStart: d.fullStart,
+                            macros: d.macros
+                        })))}`);
                         const position = findMacroPosition(diagStart, simpleMacroName);
                         log(`  -> resolved position: ${JSON.stringify(position)}`);
                         generatedDiagsAsMacro.push({
                             file: info.languageService.getProgram()?.getSourceFile(fileName),
                             start: position.start,
                             length: position.length,
-                            messageText: `[${simpleMacroName}] ${typeof diag.messageText === "string" ? diag.messageText : diag.messageText.messageText}`,
+                            messageText: `[${simpleMacroName}] ${typeof diag.messageText === 'string'
+                                ? diag.messageText
+                                : diag.messageText.messageText}`,
                             category: diag.category,
                             code: 9998, // Different code for generated code errors
-                            source: "macroforge-generated",
+                            source: 'macroforge-generated'
                         });
                     }
                     log(`  -> converted ${generatedDiagsAsMacro.length} generated code diagnostics`);
@@ -1399,15 +1417,18 @@ function init(modules) {
                     const decoratorStart = deriveMatch?.index ?? 0;
                     const decoratorLength = deriveMatch?.[0].length ?? 7;
                     for (const diag of generatedCodeDiagnostics) {
-                        const macroName = effectiveMapper?.generatedBy(diag.start ?? 0) ?? "macro";
+                        const macroName = effectiveMapper?.generatedBy(diag.start ?? 0) ??
+                            'macro';
                         generatedDiagsAsMacro.push({
                             file: info.languageService.getProgram()?.getSourceFile(fileName),
                             start: decoratorStart,
                             length: decoratorLength,
-                            messageText: `[${macroName}] ${typeof diag.messageText === "string" ? diag.messageText : diag.messageText.messageText}`,
+                            messageText: `[${macroName}] ${typeof diag.messageText === 'string'
+                                ? diag.messageText
+                                : diag.messageText.messageText}`,
                             category: diag.category,
                             code: 9998, // Different code for generated code errors
-                            source: "macroforge-generated",
+                            source: 'macroforge-generated'
                         });
                     }
                     log(`  -> converted ${generatedDiagsAsMacro.length} generated code diagnostics (fallback)`);
@@ -1416,9 +1437,9 @@ function init(modules) {
                     return [...mappedDiagnostics, ...generatedDiagsAsMacro];
                 }
                 const macroDiagnostics = result.diagnostics.map((d) => {
-                    const category = d.level === "error"
+                    const category = d.level === 'error'
                         ? tsModule.DiagnosticCategory.Error
-                        : d.level === "warning"
+                        : d.level === 'warning'
                             ? tsModule.DiagnosticCategory.Warning
                             : tsModule.DiagnosticCategory.Message;
                     return {
@@ -1428,13 +1449,13 @@ function init(modules) {
                         messageText: d.message,
                         category,
                         code: 9999, // Custom error code
-                        source: "macroforge",
+                        source: 'macroforge'
                     };
                 });
                 return [
                     ...mappedDiagnostics,
                     ...macroDiagnostics,
-                    ...generatedDiagsAsMacro,
+                    ...generatedDiagsAsMacro
                 ];
             }
             catch (e) {
@@ -1449,7 +1470,8 @@ function init(modules) {
          * Simpler than semantic diagnostics as it doesn't need to handle generated
          * code errors (syntax errors are in user code, not generated code).
          */
-        const originalGetSyntacticDiagnostics = info.languageService.getSyntacticDiagnostics.bind(info.languageService);
+        const originalGetSyntacticDiagnostics = info.languageService
+            .getSyntacticDiagnostics.bind(info.languageService);
         info.languageService.getSyntacticDiagnostics = (fileName) => {
             try {
                 log(`getSyntacticDiagnostics: ${fileName}`);
@@ -1493,7 +1515,8 @@ function init(modules) {
          * If the hover would be in generated code, returns undefined to hide it
          * (prevents confusing users with hover info for code they can't see).
          */
-        const originalGetQuickInfoAtPosition = info.languageService.getQuickInfoAtPosition.bind(info.languageService);
+        const originalGetQuickInfoAtPosition = info.languageService
+            .getQuickInfoAtPosition.bind(info.languageService);
         info.languageService.getQuickInfoAtPosition = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1528,8 +1551,8 @@ function init(modules) {
                     ...result,
                     textSpan: {
                         start: mappedTextSpan.start,
-                        length: mappedTextSpan.length,
-                    },
+                        length: mappedTextSpan.length
+                    }
                 };
             }
             catch (e) {
@@ -1544,7 +1567,8 @@ function init(modules) {
          * coordinates to get accurate completions that include generated methods,
          * then maps any replacement spans back to original coordinates.
          */
-        const originalGetCompletionsAtPosition = info.languageService.getCompletionsAtPosition.bind(info.languageService);
+        const originalGetCompletionsAtPosition = info.languageService
+            .getCompletionsAtPosition.bind(info.languageService);
         info.languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1575,13 +1599,13 @@ function init(modules) {
                         return { ...entry, replacementSpan: undefined }; // Remove invalid span
                     return {
                         ...entry,
-                        replacementSpan: { start: mapped.start, length: mapped.length },
+                        replacementSpan: { start: mapped.start, length: mapped.length }
                     };
                 });
                 return {
                     ...result,
                     optionalReplacementSpan: mappedOptionalSpan,
-                    entries: mappedEntries,
+                    entries: mappedEntries
                 };
             }
             catch (e) {
@@ -1601,7 +1625,8 @@ function init(modules) {
          * passed through unchanged. Only same-file definitions need mapping.
          * Definitions pointing to generated code are filtered out.
          */
-        const originalGetDefinitionAtPosition = info.languageService.getDefinitionAtPosition.bind(info.languageService);
+        const originalGetDefinitionAtPosition = info.languageService
+            .getDefinitionAtPosition.bind(info.languageService);
         info.languageService.getDefinitionAtPosition = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1630,7 +1655,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...def,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -1648,7 +1673,8 @@ function init(modules) {
          * text span that was used to find the definition (useful for highlighting).
          * Maps both the bound span and definition spans.
          */
-        const originalGetDefinitionAndBoundSpan = info.languageService.getDefinitionAndBoundSpan.bind(info.languageService);
+        const originalGetDefinitionAndBoundSpan = info.languageService
+            .getDefinitionAndBoundSpan.bind(info.languageService);
         info.languageService.getDefinitionAndBoundSpan = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1681,7 +1707,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...def,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -1689,9 +1715,9 @@ function init(modules) {
                 return {
                     textSpan: {
                         start: mappedTextSpan.start,
-                        length: mappedTextSpan.length,
+                        length: mappedTextSpan.length
                     },
-                    definitions: mappedDefinitions,
+                    definitions: mappedDefinitions
                 };
             }
             catch (e) {
@@ -1706,7 +1732,8 @@ function init(modules) {
          * getDefinitionAtPosition but navigates to the type's definition
          * rather than the symbol's definition.
          */
-        const originalGetTypeDefinitionAtPosition = info.languageService.getTypeDefinitionAtPosition.bind(info.languageService);
+        const originalGetTypeDefinitionAtPosition = info.languageService
+            .getTypeDefinitionAtPosition.bind(info.languageService);
         info.languageService.getTypeDefinitionAtPosition = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1734,7 +1761,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...def,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -1752,7 +1779,8 @@ function init(modules) {
          * finds all references in the expanded code, then maps each reference
          * span back to original positions. References in generated code are filtered.
          */
-        const originalGetReferencesAtPosition = info.languageService.getReferencesAtPosition.bind(info.languageService);
+        const originalGetReferencesAtPosition = info.languageService
+            .getReferencesAtPosition.bind(info.languageService);
         info.languageService.getReferencesAtPosition = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1780,7 +1808,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...ref,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -1828,11 +1856,11 @@ function init(modules) {
                         if (mapped) {
                             acc.push({
                                 ...ref,
-                                textSpan: { start: mapped.start, length: mapped.length },
+                                textSpan: { start: mapped.start, length: mapped.length }
                             });
                         }
                         return acc;
-                    }, []),
+                    }, [])
                 }))
                     .filter((s) => s.references.length > 0);
             }
@@ -1847,7 +1875,8 @@ function init(modules) {
          * Provides function signature help (parameter hints shown while typing
          * function arguments). Maps cursor position and the applicable span.
          */
-        const originalGetSignatureHelpItems = info.languageService.getSignatureHelpItems.bind(info.languageService);
+        const originalGetSignatureHelpItems = info.languageService
+            .getSignatureHelpItems.bind(info.languageService);
         info.languageService.getSignatureHelpItems = (fileName, position, options) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -1869,8 +1898,8 @@ function init(modules) {
                     ...result,
                     applicableSpan: {
                         start: mappedSpan.start,
-                        length: mappedSpan.length,
-                    },
+                        length: mappedSpan.length
+                    }
                 };
             }
             catch (e) {
@@ -1918,12 +1947,12 @@ function init(modules) {
                 if (!mappedSpan) {
                     return {
                         canRename: false,
-                        localizedErrorMessage: "Cannot rename in generated code",
+                        localizedErrorMessage: 'Cannot rename in generated code'
                     };
                 }
                 return {
                     ...result,
-                    triggerSpan: { start: mappedSpan.start, length: mappedSpan.length },
+                    triggerSpan: { start: mappedSpan.start, length: mappedSpan.length }
                 };
             }
             catch (e) {
@@ -1942,7 +1971,8 @@ function init(modules) {
          * Uses a compatibility wrapper (callFindRenameLocations) to handle
          * different TypeScript version signatures.
          */
-        const originalFindRenameLocations = info.languageService.findRenameLocations.bind(info.languageService);
+        const originalFindRenameLocations = info.languageService.findRenameLocations
+            .bind(info.languageService);
         /**
          * Compatibility wrapper for findRenameLocations that handles both old
          * and new TypeScript API signatures.
@@ -1981,7 +2011,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...loc,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -1999,7 +2029,8 @@ function init(modules) {
          * click on a variable and see all usages highlighted). Maps highlight
          * spans back to original positions.
          */
-        const originalGetDocumentHighlights = info.languageService.getDocumentHighlights.bind(info.languageService);
+        const originalGetDocumentHighlights = info.languageService
+            .getDocumentHighlights.bind(info.languageService);
         info.languageService.getDocumentHighlights = (fileName, position, filesToSearch) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -2030,11 +2061,11 @@ function init(modules) {
                         if (mapped) {
                             acc.push({
                                 ...span,
-                                textSpan: { start: mapped.start, length: mapped.length },
+                                textSpan: { start: mapped.start, length: mapped.length }
                             });
                         }
                         return acc;
-                    }, []),
+                    }, [])
                 }))
                     .filter((h) => h.highlightSpans.length > 0);
             }
@@ -2049,7 +2080,8 @@ function init(modules) {
          * Provides "Go to Implementation" functionality. Similar to definition
          * but finds concrete implementations of abstract methods/interfaces.
          */
-        const originalGetImplementationAtPosition = info.languageService.getImplementationAtPosition.bind(info.languageService);
+        const originalGetImplementationAtPosition = info.languageService
+            .getImplementationAtPosition.bind(info.languageService);
         info.languageService.getImplementationAtPosition = (fileName, position) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -2077,7 +2109,7 @@ function init(modules) {
                     if (mapped) {
                         acc.push({
                             ...impl,
-                            textSpan: { start: mapped.start, length: mapped.length },
+                            textSpan: { start: mapped.start, length: mapped.length }
                         });
                     }
                     return acc;
@@ -2100,7 +2132,8 @@ function init(modules) {
          * could be problematic. Consider filtering or mapping fix edits in
          * future versions.
          */
-        const originalGetCodeFixesAtPosition = info.languageService.getCodeFixesAtPosition.bind(info.languageService);
+        const originalGetCodeFixesAtPosition = info.languageService
+            .getCodeFixesAtPosition.bind(info.languageService);
         info.languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -2125,7 +2158,8 @@ function init(modules) {
          * Provides the document outline/structure tree (shown in the Outline
          * panel). Recursively maps all spans in the tree back to original positions.
          */
-        const originalGetNavigationTree = info.languageService.getNavigationTree.bind(info.languageService);
+        const originalGetNavigationTree = info.languageService.getNavigationTree
+            .bind(info.languageService);
         info.languageService.getNavigationTree = (fileName) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -2141,9 +2175,7 @@ function init(modules) {
                 function mapNavigationItem(item) {
                     const mappedSpans = item.spans.map((span) => {
                         const mapped = navMapper.mapSpanToOriginal(span.start, span.length);
-                        return mapped
-                            ? { start: mapped.start, length: mapped.length }
-                            : span;
+                        return mapped ? { start: mapped.start, length: mapped.length } : span;
                     });
                     const mappedNameSpan = item.nameSpan
                         ? (navMapper.mapSpanToOriginal(item.nameSpan.start, item.nameSpan.length) ?? item.nameSpan)
@@ -2154,7 +2186,7 @@ function init(modules) {
                         nameSpan: mappedNameSpan
                             ? { start: mappedNameSpan.start, length: mappedNameSpan.length }
                             : undefined,
-                        childItems: item.childItems?.map(mapNavigationItem),
+                        childItems: item.childItems?.map(mapNavigationItem)
                     };
                 }
                 return mapNavigationItem(tree);
@@ -2170,7 +2202,8 @@ function init(modules) {
          * Provides code folding regions. Maps both the text span (what gets
          * folded) and hint span (what's shown when collapsed) back to original.
          */
-        const originalGetOutliningSpans = info.languageService.getOutliningSpans.bind(info.languageService);
+        const originalGetOutliningSpans = info.languageService.getOutliningSpans
+            .bind(info.languageService);
         info.languageService.getOutliningSpans = (fileName) => {
             try {
                 if (virtualDtsFiles.has(fileName) || !shouldProcess(fileName)) {
@@ -2190,12 +2223,12 @@ function init(modules) {
                         ...span,
                         textSpan: {
                             start: mappedTextSpan.start,
-                            length: mappedTextSpan.length,
+                            length: mappedTextSpan.length
                         },
                         hintSpan: {
                             start: mappedHintSpan.start,
-                            length: mappedHintSpan.length,
-                        },
+                            length: mappedHintSpan.length
+                        }
                     };
                 });
             }
@@ -2215,7 +2248,8 @@ function init(modules) {
          * This hook is conditional - provideInlayHints may not exist in older
          * TypeScript versions.
          */
-        const originalProvideInlayHints = info.languageService.provideInlayHints?.bind(info.languageService);
+        const originalProvideInlayHints = info.languageService.provideInlayHints
+            ?.bind(info.languageService);
         if (originalProvideInlayHints) {
             info.languageService.provideInlayHints = (fileName, span, preferences) => {
                 try {
@@ -2245,8 +2279,8 @@ function init(modules) {
                         return [
                             {
                                 ...hint,
-                                position: originalPos,
-                            },
+                                position: originalPos
+                            }
                         ];
                     });
                 }