@esportsplus/typescript 0.28.1 → 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

@@ -1,6 +1,5 @@
 import { ts } from '../index.js';
 import imports from './imports.js';
-const DIRECTORY_SEPARATOR = /\\/g;
 function applyImports(code, file, intents) {
     for (let i = 0, n = intents.length; i < n; i++) {
         let intent = intents[i];
@@ -44,24 +43,6 @@ function applyPrepend(code, file, prepend) {
     }
     return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
-function createUpdatedProgram(originalProgram, fileName, newCode) {
-    let options = originalProgram.getCompilerOptions(), originalHost = ts.createCompilerHost(options), originalGetSourceFile = originalHost.getSourceFile.bind(originalHost), originalReadFile = originalHost.readFile.bind(originalHost);
-    originalHost.getSourceFile = (name, languageVersion, onError, shouldCreateNewSourceFile) => {
-        if (name === fileName ||
-            name.replace(DIRECTORY_SEPARATOR, '/') === fileName.replace(DIRECTORY_SEPARATOR, '/')) {
-            return ts.createSourceFile(name, newCode, languageVersion, true);
-        }
-        return originalGetSourceFile(name, languageVersion, onError, shouldCreateNewSourceFile);
-    };
-    originalHost.readFile = (name) => {
-        if (name === fileName ||
-            name.replace(DIRECTORY_SEPARATOR, '/') === fileName.replace(DIRECTORY_SEPARATOR, '/')) {
-            return newCode;
-        }
-        return originalReadFile(name);
-    };
-    return ts.createProgram(originalProgram.getRootFileNames(), options, originalHost, originalProgram);
-}
 function hasPattern(code, patterns) {
     for (let i = 0, n = patterns.length; i < n; i++) {
         if (code.indexOf(patterns[i]) !== -1) {
@@ -136,42 +117,51 @@ const transform = (plugins, code, file, program, shared) => {
     if (plugins.length === 0) {
         return { changed: false, code, sourceFile: file };
     }
-    let currentCode = code, currentFile = file, currentProgram = program, fileName = file.fileName, transformed = false;
+    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: currentProgram.getTypeChecker(),
-            code: currentCode,
-            program: currentProgram,
+            checker,
+            code,
+            program,
             shared,
-            sourceFile: currentFile
+            sourceFile: originalFile
         });
-        let pluginChanged = false;
         if (replacements?.length) {
-            currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
-            pluginChanged = true;
+            allReplacements.push(...replacements);
         }
         if (prepend?.length) {
-            currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
-            pluginChanged = true;
+            allPrepend.push(...prepend);
         }
         if (imports?.length) {
-            currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
-            pluginChanged = true;
+            allImports.push(...imports);
         }
-        if (pluginChanged) {
-            transformed = true;
-            currentProgram = createUpdatedProgram(currentProgram, fileName, currentCode);
+    }
+    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: transformed,
+        changed: currentCode !== code,
         code: currentCode,
         sourceFile: currentFile
     };

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.1",
+  "version": "0.28.3",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/coordinator.ts

@@ -10,9 +10,6 @@ type CoordinatorResult = {
 };
 
 
-const DIRECTORY_SEPARATOR = /\\/g;
-
-
 function applyImports(code: string, file: ts.SourceFile, intents: ImportIntent[]): string {
     for (let i = 0, n = intents.length; i < n; i++) {
         let intent = intents[i];
@@ -76,51 +73,6 @@ function applyPrepend(code: string, file: ts.SourceFile, prepend: string[]): str
     return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
 
-function createUpdatedProgram(
-    originalProgram: ts.Program,
-    fileName: string,
-    newCode: string
-): ts.Program {
-    let options = originalProgram.getCompilerOptions(),
-        originalHost = ts.createCompilerHost(options),
-        originalGetSourceFile = originalHost.getSourceFile.bind(originalHost),
-        originalReadFile = originalHost.readFile.bind(originalHost);
-
-    originalHost.getSourceFile = (
-        name: string,
-        languageVersion: ts.ScriptTarget,
-        onError?: (message: string) => void,
-        shouldCreateNewSourceFile?: boolean
-    ): ts.SourceFile | undefined => {
-        if (
-            name === fileName ||
-            name.replace(DIRECTORY_SEPARATOR, '/') === fileName.replace(DIRECTORY_SEPARATOR, '/')
-        ) {
-            return ts.createSourceFile(name, newCode, languageVersion, true);
-        }
-
-        return originalGetSourceFile(name, languageVersion, onError, shouldCreateNewSourceFile);
-    };
-
-    originalHost.readFile = (name: string): string | undefined => {
-        if (
-            name === fileName ||
-            name.replace(DIRECTORY_SEPARATOR, '/') === fileName.replace(DIRECTORY_SEPARATOR, '/')
-        ) {
-            return newCode;
-        }
-
-        return originalReadFile(name);
-    };
-
-    return ts.createProgram(
-        originalProgram.getRootFileNames(),
-        options,
-        originalHost,
-        originalProgram
-    );
-}
-
 function hasPattern(code: string, patterns: string[]): boolean {
     for (let i = 0, n = patterns.length; i < n; i++) {
         if (code.indexOf(patterns[i]) !== -1) {
@@ -159,7 +111,6 @@ function modify(code: string, file: ts.SourceFile, pkg: string, options: ModifyO
     }
 
     let remove = options.remove ? new Set(options.remove) : null,
-        // Collect all non-removed specifiers from existing imports
         specifiers = new Set<string>();
 
     for (let i = 0, n = found.length; i < n; i++) {
@@ -176,7 +127,6 @@ function modify(code: string, file: ts.SourceFile, pkg: string, options: ModifyO
         }
     }
 
-    // Build replacement text - namespace import first, then named imports
     let statements: string[] = [];
 
     if (namespace) {
@@ -187,7 +137,6 @@ function modify(code: string, file: ts.SourceFile, pkg: string, options: ModifyO
         statements.push(`import { ${[...specifiers].sort().join(', ')} } from '${pkg}';`);
     }
 
-    // Build replacements - replace first import, remove others
     let replacements: Replacement[] = [];
 
     for (let i = 0, n = found.length; i < n; i++) {
@@ -220,86 +169,96 @@ function replaceReverse(code: string, replacements: Replacement[]): string {
 };
 
 
-/**
- * Transform source through all plugins sequentially.
- * Each plugin receives fresh AST and TypeChecker with accurate positions.
- */
 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 currentCode = code,
-        currentFile = file,
-        currentProgram = program,
+    let allImports = [],
+        allPrepend = [],
+        allReplacements = [],
+        checker = program.getTypeChecker(),
         fileName = file.fileName,
-        transformed = false;
+        // 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: currentProgram.getTypeChecker(),
-                code: currentCode,
-                program: currentProgram,
-                shared,
-                sourceFile: currentFile
-            });
-
-        let pluginChanged = false;
+            checker,
+            code,
+            program,
+            shared,
+            sourceFile: originalFile
+        });
 
         if (replacements?.length) {
-            currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
-            pluginChanged = true;
+            allReplacements.push(...replacements);
         }
 
         if (prepend?.length) {
-            currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
-            pluginChanged = true;
+            allPrepend.push(...prepend);
         }
 
         if (imports?.length) {
-            currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
-            pluginChanged = true;
+            allImports.push(...imports);
         }
+    }
 
-        // Rebuild program with updated source so next plugin gets valid checker
-        if (pluginChanged) {
-            transformed = true;
-            currentProgram = createUpdatedProgram(currentProgram, fileName, currentCode);
+    // 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: transformed,
+        changed: currentCode !== code,
         code: currentCode,
         sourceFile: currentFile
     };
@@ -307,4 +266,4 @@ const transform = (
 
 
 export default { transform };
-export type { CoordinatorResult };
+export type { CoordinatorResult };

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);
                     }