@esportsplus/typescript 0.28.2 → 0.28.3

package/build/compiler/coordinator.d.ts

@@ -6,7 +6,11 @@ type CoordinatorResult = {
     sourceFile: ts.SourceFile;
 };
 declare const _default: {
-    transform: (plugins: Plugin[], code: string, file: ts.SourceFile, program: ts.Program, shared: SharedContext) => CoordinatorResult;
+    transform: (plugins: Plugin[], code: string, file: ts.SourceFile, program: ts.Program, shared: SharedContext) => {
+        changed: boolean;
+        code: string;
+        sourceFile: ts.SourceFile;
+    };
 };
 export default _default;
 export type { CoordinatorResult };

package/build/compiler/coordinator.js

@@ -117,32 +117,49 @@ const transform = (plugins, code, file, program, shared) => {
     if (plugins.length === 0) {
         return { changed: false, code, sourceFile: file };
     }
-    let checker = program.getTypeChecker(), currentCode = code, currentFile = file, fileName = file.fileName;
+    let allImports = [], allPrepend = [], allReplacements = [], checker = program.getTypeChecker(), fileName = file.fileName, originalFile = file;
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
-        if (plugin.patterns && !hasPattern(currentCode, plugin.patterns)) {
+        if (plugin.patterns && !hasPattern(code, plugin.patterns)) {
             continue;
         }
         let { imports, prepend, replacements } = plugin.transform({
             checker,
-            code: currentCode,
+            code,
             program,
             shared,
-            sourceFile: currentFile
+            sourceFile: originalFile
         });
         if (replacements?.length) {
-            currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            allReplacements.push(...replacements);
         }
         if (prepend?.length) {
-            currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            allPrepend.push(...prepend);
         }
         if (imports?.length) {
-            currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            allImports.push(...imports);
         }
     }
+    let currentCode = code, currentFile = originalFile;
+    if (allReplacements.length > 0) {
+        allReplacements.sort((a, b) => a.node.getStart(originalFile) - b.node.getStart(originalFile));
+        for (let i = 1, n = allReplacements.length; i < n; i++) {
+            let prev = allReplacements[i - 1], curr = allReplacements[i], prevEnd = prev.node.end, currStart = curr.node.getStart(originalFile);
+            if (currStart < prevEnd) {
+                console.warn(`[coordinator] Overlapping replacements detected at ${fileName}:`, `[${prev.node.getStart(originalFile)}-${prevEnd}] overlaps [${currStart}-${curr.node.end}]`);
+            }
+        }
+        currentCode = applyIntents(currentCode, currentFile, allReplacements);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
+    if (allPrepend.length > 0) {
+        currentCode = applyPrepend(currentCode, currentFile, allPrepend);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
+    if (allImports.length > 0) {
+        currentCode = applyImports(currentCode, currentFile, allImports);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
     return {
         changed: currentCode !== code,
         code: currentCode,

package/build/compiler/plugins/vite.js

@@ -3,6 +3,7 @@ import coordinator from '../coordinator.js';
 import program from '../program.js';
 const FILE_REGEX = /\.[tj]sx?$/;
 const DIRECTORY_SEPARATOR_REGEX = /\\/g;
+const LINE_ENDINGS_REGEX = /\r\n/g;
 let contexts = new Map();
 export default ({ name, onWatchChange, plugins }) => {
     return ({ root } = {}) => {
@@ -18,7 +19,8 @@ export default ({ name, onWatchChange, plugins }) => {
                 }
                 try {
                     let prog = program.get(root || ''), sourceFile = prog.getSourceFile(id.replace(DIRECTORY_SEPARATOR_REGEX, '/')) || prog.getSourceFile(id);
-                    if (!sourceFile || sourceFile.getText() !== code) {
+                    if (!sourceFile ||
+                        sourceFile.getText().replace(LINE_ENDINGS_REGEX, '\n') !== code.replace(LINE_ENDINGS_REGEX, '\n')) {
                         sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true);
                     }
                     let result = coordinator.transform(plugins, code, sourceFile, prog, contexts.get(root || '') ?? contexts.set(root || '', new Map()).get(root || ''));

package/package.json

@@ -39,7 +39,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/coordinator.ts

@@ -169,73 +169,94 @@ function replaceReverse(code: string, replacements: Replacement[]): string {
 };
 
 
-/**
- * Transform source through all plugins sequentially.
- * Each plugin receives fresh AST with accurate positions.
- * All plugins share the original program type checker for import resolution.
- */
 const transform = (
     plugins: Plugin[],
     code: string,
     file: ts.SourceFile,
     program: ts.Program,
     shared: SharedContext
-): CoordinatorResult => {
+) => {
     if (plugins.length === 0) {
         return { changed: false, code, sourceFile: file };
     }
 
-    let checker = program.getTypeChecker(),
-        currentCode = code,
-        currentFile = file,
-        fileName = file.fileName;
-
+    let allImports = [],
+        allPrepend = [],
+        allReplacements = [],
+        checker = program.getTypeChecker(),
+        fileName = file.fileName,
+        // Keep original source file for symbol resolution - checker operations
+        // require nodes from a file that's part of the program's module graph
+        originalFile = file;
+
+    // Phase 1: Collect intents from all plugins using original source file
+    // This ensures checker.getSymbolAtLocation() and getAliasedSymbol() work
+    // correctly for re-exports and module resolution
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
 
-        if (plugin.patterns && !hasPattern(currentCode, plugin.patterns)) {
+        if (plugin.patterns && !hasPattern(code, plugin.patterns)) {
             continue;
         }
 
         let { imports, prepend, replacements } = plugin.transform({
-                checker,
-                code: currentCode,
-                program,
-                shared,
-                sourceFile: currentFile
-            });
+            checker,
+            code,
+            program,
+            shared,
+            sourceFile: originalFile
+        });
 
         if (replacements?.length) {
-            currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            allReplacements.push(...replacements);
         }
 
         if (prepend?.length) {
-            currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            allPrepend.push(...prepend);
         }
 
         if (imports?.length) {
-            currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            allImports.push(...imports);
         }
     }
 
+    // Phase 2: Apply all collected intents
+    let currentCode = code,
+        currentFile = originalFile;
+
+    if (allReplacements.length > 0) {
+        // Sort by start position to detect overlaps
+        allReplacements.sort((a, b) => a.node.getStart(originalFile) - b.node.getStart(originalFile));
+
+        // Check for overlapping replacements
+        for (let i = 1, n = allReplacements.length; i < n; i++) {
+            let prev = allReplacements[i - 1],
+                curr = allReplacements[i],
+                prevEnd = prev.node.end,
+                currStart = curr.node.getStart(originalFile);
+
+            if (currStart < prevEnd) {
+                console.warn(
+                    `[coordinator] Overlapping replacements detected at ${fileName}:`,
+                    `[${prev.node.getStart(originalFile)}-${prevEnd}] overlaps [${currStart}-${curr.node.end}]`
+                );
+            }
+        }
+
+        currentCode = applyIntents(currentCode, currentFile, allReplacements);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
+
+    if (allPrepend.length > 0) {
+        currentCode = applyPrepend(currentCode, currentFile, allPrepend);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
+
+    if (allImports.length > 0) {
+        currentCode = applyImports(currentCode, currentFile, allImports);
+        currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+    }
+
     return {
         changed: currentCode !== code,
         code: currentCode,

package/src/compiler/plugins/vite.ts

@@ -24,6 +24,8 @@ const FILE_REGEX = /\.[tj]sx?$/;
 
 const DIRECTORY_SEPARATOR_REGEX = /\\/g;
 
+const LINE_ENDINGS_REGEX = /\r\n/g;
+
 
 let contexts = new Map<string, SharedContext>();
 
@@ -45,7 +47,10 @@ export default ({ name, onWatchChange, plugins }: VitePluginOptions) => {
                     let prog = program.get(root || ''),
                         sourceFile = prog.getSourceFile(id.replace(DIRECTORY_SEPARATOR_REGEX, '/')) || prog.getSourceFile(id);
 
-                    if (!sourceFile || sourceFile.getText() !== code) {
+                    if (
+                        !sourceFile ||
+                        sourceFile.getText().replace(LINE_ENDINGS_REGEX, '\n') !== code.replace(LINE_ENDINGS_REGEX, '\n')
+                    ) {
                         sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true);
                     }