@esportsplus/typescript 0.28.2 → 0.28.4

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

@@ -43,6 +43,20 @@ function applyPrepend(code, file, prepend) {
     }
     return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
+function 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);
+}
 function hasPattern(code, patterns) {
     for (let i = 0, n = patterns.length; i < n; i++) {
         if (code.indexOf(patterns[i]) !== -1) {
@@ -99,7 +113,6 @@ function modify(code, file, pkg, options) {
     }
     return replaceReverse(code, replacements);
 }
-;
 function replaceReverse(code, replacements) {
     if (replacements.length === 0) {
         return code;
@@ -112,41 +125,47 @@ function replaceReverse(code, replacements) {
     }
     return result;
 }
-;
 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 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(currentCode, plugin.patterns)) {
             continue;
         }
         let { imports, prepend, replacements } = plugin.transform({
-            checker,
+            checker: currentProgram.getTypeChecker(),
             code: currentCode,
-            program,
+            program: currentProgram,
             shared,
             sourceFile: currentFile
-        });
+        }), pluginChanged = false;
         if (replacements?.length) {
             currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
         }
         if (prepend?.length) {
             currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
         }
         if (imports?.length) {
             currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
+        }
+        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);
+            }
         }
     }
-    return {
-        changed: currentCode !== code,
-        code: currentCode,
-        sourceFile: currentFile
-    };
+    return { changed, code: currentCode, sourceFile: currentFile };
 };
 export default { transform };

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.4",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/coordinator.ts

@@ -73,6 +73,28 @@ function applyPrepend(code: string, file: ts.SourceFile, prepend: string[]): str
     return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
 
+function 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
+    );
+}
+
 function hasPattern(code: string, patterns: string[]): boolean {
     for (let i = 0, n = patterns.length; i < n; i++) {
         if (code.indexOf(patterns[i]) !== -1) {
@@ -148,7 +170,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,28 +188,23 @@ function replaceReverse(code: string, replacements: Replacement[]): string {
     }
 
     return result;
-};
-
+}
 
-/**
- * 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(),
+    let changed = false,
         currentCode = code,
         currentFile = file,
+        currentProgram = program,
         fileName = file.fileName;
 
     for (let i = 0, n = plugins.length; i < n; i++) {
@@ -198,49 +215,44 @@ const transform = (
         }
 
         let { imports, prepend, replacements } = plugin.transform({
-                checker,
+                checker: currentProgram.getTypeChecker(),
                 code: currentCode,
-                program,
+                program: currentProgram,
                 shared,
                 sourceFile: currentFile
-            });
+            }),
+            pluginChanged = false;
 
         if (replacements?.length) {
             currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            pluginChanged = true;
         }
 
         if (prepend?.length) {
             currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            pluginChanged = true;
         }
 
         if (imports?.length) {
             currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(
-                fileName,
-                currentCode,
-                currentFile.languageVersion,
-                true
-            );
+            pluginChanged = true;
+        }
+
+        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);
+            }
         }
     }
 
-    return {
-        changed: currentCode !== code,
-        code: currentCode,
-        sourceFile: currentFile
-    };
+    return { changed, code: currentCode, sourceFile: currentFile };
 };
 
 

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