@esportsplus/typescript 0.28.0 → 0.28.1

package/build/compiler/coordinator.js

@@ -1,5 +1,6 @@
 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];
@@ -43,6 +44,24 @@ 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) {
@@ -117,34 +136,42 @@ const transform = (plugins, code, file, program, shared) => {
     if (plugins.length === 0) {
         return { changed: false, code, sourceFile: file };
     }
-    let currentCode = code, currentFile = file;
+    let currentCode = code, currentFile = file, currentProgram = program, fileName = file.fileName, transformed = false;
     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: program.getTypeChecker(),
+            checker: currentProgram.getTypeChecker(),
             code: currentCode,
-            program,
+            program: currentProgram,
             shared,
             sourceFile: currentFile
         });
+        let pluginChanged = false;
         if (replacements?.length) {
             currentCode = applyIntents(currentCode, currentFile, replacements);
-            currentFile = ts.createSourceFile(currentFile.fileName, currentCode, currentFile.languageVersion, true);
+            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
         }
         if (prepend?.length) {
             currentCode = applyPrepend(currentCode, currentFile, prepend);
-            currentFile = ts.createSourceFile(currentFile.fileName, currentCode, currentFile.languageVersion, true);
+            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
         }
         if (imports?.length) {
             currentCode = applyImports(currentCode, currentFile, imports);
-            currentFile = ts.createSourceFile(currentFile.fileName, currentCode, currentFile.languageVersion, true);
+            currentFile = ts.createSourceFile(fileName, currentCode, currentFile.languageVersion, true);
+            pluginChanged = true;
+        }
+        if (pluginChanged) {
+            transformed = true;
+            currentProgram = createUpdatedProgram(currentProgram, fileName, currentCode);
         }
     }
     return {
-        changed: currentCode !== code,
+        changed: transformed,
         code: currentCode,
         sourceFile: currentFile
     };

package/build/compiler/imports.js

@@ -46,7 +46,7 @@ const includes = (checker, node, pkg, symbolName) => {
         imports.set(pkg, names);
     }
     if (names.has(node.text)) {
-        let symbol = checker?.getSymbolAtLocation(node);
+        let symbol = checker.getSymbolAtLocation(node);
         if (symbol) {
             let declarations = symbol.getDeclarations();
             if (declarations && declarations.length > 0) {
@@ -68,7 +68,7 @@ const includes = (checker, node, pkg, symbolName) => {
         }
         return true;
     }
-    let symbol = checker?.getSymbolAtLocation(node);
+    let symbol = checker.getSymbolAtLocation(node);
     if (!symbol) {
         return false;
     }

package/package.json

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

package/src/compiler/coordinator.ts

@@ -10,6 +10,9 @@ 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];
@@ -73,6 +76,51 @@ 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) {
@@ -174,7 +222,7 @@ function replaceReverse(code: string, replacements: Replacement[]): string {
 
 /**
  * Transform source through all plugins sequentially.
- * Each plugin receives fresh AST with accurate positions.
+ * Each plugin receives fresh AST and TypeChecker with accurate positions.
  */
 const transform = (
     plugins: Plugin[],
@@ -188,7 +236,10 @@ const transform = (
     }
 
     let currentCode = code,
-        currentFile = file;
+        currentFile = file,
+        currentProgram = program,
+        fileName = file.fileName,
+        transformed = false;
 
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
@@ -198,46 +249,57 @@ const transform = (
         }
 
         let { imports, prepend, replacements } = plugin.transform({
-                checker: program.getTypeChecker(),
+                checker: currentProgram.getTypeChecker(),
                 code: currentCode,
-                program,
+                program: currentProgram,
                 shared,
                 sourceFile: currentFile
             });
 
+        let pluginChanged = false;
+
         if (replacements?.length) {
             currentCode = applyIntents(currentCode, currentFile, replacements);
             currentFile = ts.createSourceFile(
-                currentFile.fileName,
+                fileName,
                 currentCode,
                 currentFile.languageVersion,
                 true
             );
+            pluginChanged = true;
         }
 
         if (prepend?.length) {
             currentCode = applyPrepend(currentCode, currentFile, prepend);
             currentFile = ts.createSourceFile(
-                currentFile.fileName,
+                fileName,
                 currentCode,
                 currentFile.languageVersion,
                 true
             );
+            pluginChanged = true;
         }
 
         if (imports?.length) {
             currentCode = applyImports(currentCode, currentFile, imports);
             currentFile = ts.createSourceFile(
-                currentFile.fileName,
+                fileName,
                 currentCode,
                 currentFile.languageVersion,
                 true
             );
+            pluginChanged = true;
+        }
+
+        // Rebuild program with updated source so next plugin gets valid checker
+        if (pluginChanged) {
+            transformed = true;
+            currentProgram = createUpdatedProgram(currentProgram, fileName, currentCode);
         }
     }
 
     return {
-        changed: currentCode !== code,
+        changed: transformed,
         code: currentCode,
         sourceFile: currentFile
     };

package/src/compiler/imports.ts

@@ -89,7 +89,7 @@ const includes = (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolNam
 
     // Fast path: direct import from package
     if (names.has(node.text)) {
-        let symbol = checker?.getSymbolAtLocation(node);
+        let symbol = checker.getSymbolAtLocation(node);
 
         if (symbol) {
             let declarations = symbol.getDeclarations();
@@ -120,7 +120,7 @@ const includes = (checker: ts.TypeChecker, node: ts.Node, pkg: string, symbolNam
     }
 
     // Slow path: check for re-exports via aliased symbol
-    let symbol = checker?.getSymbolAtLocation(node);
+    let symbol = checker.getSymbolAtLocation(node);
 
     if (!symbol) {
         return false;