@esportsplus/typescript 0.28.3 → 0.28.5

package/build/compiler/coordinator.d.ts

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

package/build/compiler/coordinator.js

@@ -99,7 +99,6 @@ function modify(code, file, pkg, options) {
     }
     return replaceReverse(code, replacements);
 }
-;
 function replaceReverse(code, replacements) {
     if (replacements.length === 0) {
         return code;
@@ -112,58 +111,61 @@ function replaceReverse(code, replacements) {
     }
     return result;
 }
-;
+const createPatchedProgram = (baseProgram, fileName, newContent) => {
+    let baseHost = ts.createCompilerHost(baseProgram.getCompilerOptions()), options = baseProgram.getCompilerOptions();
+    return ts.createProgram(baseProgram.getRootFileNames(), options, {
+        ...baseHost,
+        getSourceFile: (name, languageVersion) => {
+            if (name === fileName || name === fileName.replace(/\\/g, '/')) {
+                return ts.createSourceFile(name, newContent, languageVersion, true);
+            }
+            return baseProgram.getSourceFile(name) ?? baseHost.getSourceFile(name, languageVersion);
+        },
+        fileExists: (name) => baseHost.fileExists(name),
+        readFile: (name) => name === fileName ? newContent : baseHost.readFile(name)
+    }, baseProgram);
+};
 const transform = (plugins, code, file, program, shared) => {
     if (plugins.length === 0) {
         return { changed: false, code, sourceFile: file };
     }
-    let allImports = [], allPrepend = [], allReplacements = [], checker = program.getTypeChecker(), fileName = file.fileName, originalFile = file;
+    let changed = false, currentCode = code, currentFile = file, currentProgram = program, fileName = file.fileName;
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
-        if (plugin.patterns && !hasPattern(code, plugin.patterns)) {
+        if (plugin.patterns && !hasPattern(currentCode, plugin.patterns)) {
             continue;
         }
         let { imports, prepend, replacements } = plugin.transform({
-            checker,
-            code,
-            program,
+            checker: currentProgram.getTypeChecker(),
+            code: currentCode,
+            program: currentProgram,
             shared,
-            sourceFile: originalFile
-        });
+            sourceFile: currentFile
+        }), pluginChanged = false;
         if (replacements?.length) {
-            allReplacements.push(...replacements);
+            currentCode = applyIntents(currentCode, currentFile, replacements);
+            pluginChanged = true;
         }
         if (prepend?.length) {
-            allPrepend.push(...prepend);
+            currentCode = applyPrepend(currentCode, currentFile, prepend);
+            pluginChanged = true;
         }
         if (imports?.length) {
-            allImports.push(...imports);
+            currentCode = applyImports(currentCode, currentFile, imports);
+            pluginChanged = true;
         }
-    }
-    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}]`);
+        if (pluginChanged) {
+            changed = true;
+            if (i < n - 1) {
+                currentProgram = createPatchedProgram(program, fileName, currentCode);
+                currentFile = currentProgram.getSourceFile(fileName) ||
+                    ts.createSourceFile(fileName, currentCode, file.languageVersion, true);
+            }
+            else {
+                currentFile = ts.createSourceFile(fileName, currentCode, file.languageVersion, true);
             }
         }
-        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,
-        sourceFile: currentFile
-    };
+    }
+    return { changed, code: currentCode, sourceFile: currentFile };
 };
-export default { transform };
+export default { createPatchedProgram, transform };

package/build/compiler/plugins/vite.js

@@ -18,10 +18,13 @@ export default ({ name, onWatchChange, plugins }) => {
                     return null;
                 }
                 try {
-                    let prog = program.get(root || ''), sourceFile = prog.getSourceFile(id.replace(DIRECTORY_SEPARATOR_REGEX, '/')) || prog.getSourceFile(id);
-                    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 normalizedId = id.replace(DIRECTORY_SEPARATOR_REGEX, '/'), prog = program.get(root || ''), sourceFile = prog.getSourceFile(normalizedId) || prog.getSourceFile(id);
+                    if (sourceFile && sourceFile.getText().replace(LINE_ENDINGS_REGEX, '\n') !== code.replace(LINE_ENDINGS_REGEX, '\n')) {
+                        sourceFile = undefined;
+                    }
+                    if (!sourceFile) {
+                        prog = coordinator.createPatchedProgram(prog, normalizedId, code);
+                        sourceFile = prog.getSourceFile(normalizedId) || 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 || ''));
                     if (!result.changed) {

package/package.json

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

package/src/compiler/coordinator.ts

@@ -148,7 +148,7 @@ function modify(code: string, file: ts.SourceFile, pkg: string, options: ModifyO
     }
 
     return replaceReverse(code, replacements);
-};
+}
 
 function replaceReverse(code: string, replacements: Replacement[]): string {
     if (replacements.length === 0) {
@@ -166,9 +166,31 @@ function replaceReverse(code: string, replacements: Replacement[]): string {
     }
 
     return result;
-};
+}
 
 
+const createPatchedProgram = (baseProgram: ts.Program, fileName: string, newContent: string) => {
+    let baseHost = ts.createCompilerHost(baseProgram.getCompilerOptions()),
+        options = baseProgram.getCompilerOptions();
+
+    return ts.createProgram(
+        baseProgram.getRootFileNames(),
+        options,
+        {
+            ...baseHost,
+            getSourceFile: (name, languageVersion) => {
+                if (name === fileName || name === fileName.replace(/\\/g, '/')) {
+                    return ts.createSourceFile(name, newContent, languageVersion, true);
+                }
+                return baseProgram.getSourceFile(name) ?? baseHost.getSourceFile(name, languageVersion);
+            },
+            fileExists: (name) => baseHost.fileExists(name),
+            readFile: (name) => name === fileName ? newContent : baseHost.readFile(name)
+        },
+        baseProgram
+    );
+};
+
 const transform = (
     plugins: Plugin[],
     code: string,
@@ -180,90 +202,60 @@ const transform = (
         return { changed: false, code, sourceFile: file };
     }
 
-    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
+    let changed = false,
+        currentCode = code,
+        currentFile = file,
+        currentProgram = program,
+        fileName = file.fileName;
+
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
 
-        if (plugin.patterns && !hasPattern(code, plugin.patterns)) {
+        if (plugin.patterns && !hasPattern(currentCode, plugin.patterns)) {
             continue;
         }
 
         let { imports, prepend, replacements } = plugin.transform({
-            checker,
-            code,
-            program,
-            shared,
-            sourceFile: originalFile
-        });
+                checker: currentProgram.getTypeChecker(),
+                code: currentCode,
+                program: currentProgram,
+                shared,
+                sourceFile: currentFile
+            }),
+            pluginChanged = false;
 
         if (replacements?.length) {
-            allReplacements.push(...replacements);
+            currentCode = applyIntents(currentCode, currentFile, replacements);
+            pluginChanged = true;
         }
 
         if (prepend?.length) {
-            allPrepend.push(...prepend);
+            currentCode = applyPrepend(currentCode, currentFile, prepend);
+            pluginChanged = true;
         }
 
         if (imports?.length) {
-            allImports.push(...imports);
+            currentCode = applyImports(currentCode, currentFile, imports);
+            pluginChanged = true;
         }
-    }
 
-    // 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}]`
-                );
+        if (pluginChanged) {
+            changed = true;
+            // Create patched program for next plugin
+            if (i < n - 1) {
+                currentProgram = createPatchedProgram(program, fileName, currentCode);
+                currentFile = currentProgram.getSourceFile(fileName) ||
+                    ts.createSourceFile(fileName, currentCode, file.languageVersion, true);
+            }
+            else {
+                currentFile = ts.createSourceFile(fileName, currentCode, file.languageVersion, true);
             }
         }
-
-        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,
-        sourceFile: currentFile
-    };
+    return { changed, code: currentCode, sourceFile: currentFile };
 };
 
 
-export default { transform };
+export default { createPatchedProgram, transform };
 export type { CoordinatorResult };

package/src/compiler/plugins/vite.ts

@@ -44,14 +44,18 @@ export default ({ name, onWatchChange, plugins }: VitePluginOptions) => {
                 }
 
                 try {
-                    let prog = program.get(root || ''),
-                        sourceFile = prog.getSourceFile(id.replace(DIRECTORY_SEPARATOR_REGEX, '/')) || prog.getSourceFile(id);
-
-                    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 normalizedId = id.replace(DIRECTORY_SEPARATOR_REGEX, '/'),
+                        prog = program.get(root || ''),
+                        sourceFile = prog.getSourceFile(normalizedId) || prog.getSourceFile(id);
+
+                    // Check if file content matches (existing file may have changed)
+                    if (sourceFile && sourceFile.getText().replace(LINE_ENDINGS_REGEX, '\n') !== code.replace(LINE_ENDINGS_REGEX, '\n')) {
+                        sourceFile = undefined;
+                    }
+
+                    if (!sourceFile) {
+                        prog = coordinator.createPatchedProgram(prog, normalizedId, code);
+                        sourceFile = prog.getSourceFile(normalizedId) || ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true);
                     }
 
                     let result = coordinator.transform(