@esportsplus/template 0.31.0 → 0.31.1

package/README.md

@@ -43,31 +43,6 @@ templatePlugin({
 })
 ```
 
-### ESBuild
-
-```typescript
-// esbuild.config.ts
-import * as esbuild from 'esbuild';
-import templatePlugin from '@esportsplus/template/plugins/esbuild';
-
-await esbuild.build({
-    entryPoints: ['src/index.ts'],
-    bundle: true,
-    outfile: 'dist/bundle.js',
-    plugins: [
-        templatePlugin()
-    ]
-});
-```
-
-**Options:**
-
-```typescript
-templatePlugin({
-    root: string  // Optional: project root (defaults to process.cwd())
-})
-```
-
 ### TypeScript Compiler (tsc)
 
 For direct `tsc` compilation, use the transformer factory:

package/build/transformer/index.js

@@ -4,15 +4,16 @@ import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
 import { ts } from '@esportsplus/typescript';
 const PATTERNS = ['html`', 'html.reactive'];
 function createTransformer(program) {
-    let typeChecker = program.getTypeChecker();
+    let printer = ts.createPrinter(), typeChecker = program.getTypeChecker();
     return (_context) => {
         return (sourceFile) => {
-            let code = sourceFile.getFullText();
+            let code = printer.printFile(sourceFile);
             if (!mightNeedTransform(code, { patterns: PATTERNS })) {
                 return sourceFile;
             }
+            let reparsed = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
             setTypeChecker(typeChecker);
-            let result = transformCode(code, sourceFile);
+            let result = transformCode(code, reparsed);
             if (!result.changed) {
                 return sourceFile;
             }
@@ -45,18 +46,18 @@ function transformCode(code, sourceFile) {
     return { changed, code: result, sourceFile };
 }
 const transform = (sourceFile, program) => {
-    let code = sourceFile.getFullText();
+    let printer = ts.createPrinter(), code = printer.printFile(sourceFile);
     if (!mightNeedTransform(code, { patterns: PATTERNS })) {
         return { changed: false, code, sourceFile };
     }
+    let reparsed = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
     let programSourceFile = program.getSourceFile(sourceFile.fileName);
     if (programSourceFile) {
         setTypeChecker(program.getTypeChecker());
-        sourceFile = programSourceFile;
     }
     else {
         setTypeChecker(undefined);
     }
-    return transformCode(code, sourceFile);
+    return transformCode(code, reparsed);
 };
 export { createTransformer, mightNeedTransform, PATTERNS, transform };

package/build/transformer/plugins/vite.js

@@ -1,4 +1,4 @@
-import { mightNeedTransform, PATTERNS, transform } from '../index.js';
+import { createTransformer, mightNeedTransform, PATTERNS } from '../index.js';
 import { program, TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import { ts } from '@esportsplus/typescript';
 export default (options) => {
@@ -17,11 +17,14 @@ export default (options) => {
                 return null;
             }
             try {
-                let sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile, program.get(root));
-                if (!result.changed) {
+                let p = program.get(root), printer = ts.createPrinter(), sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true), transformer = createTransformer(p), result = ts.transform(sourceFile, [transformer]), transformed = result.transformed[0];
+                if (transformed === sourceFile) {
+                    result.dispose();
                     return null;
                 }
-                return { code: result.code, map: null };
+                let output = printer.printFile(transformed);
+                result.dispose();
+                return { code: output, map: null };
             }
             catch (error) {
                 console.error(`@esportsplus/template: Error transforming ${id}:`, error);

package/package.json

@@ -40,7 +40,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/transformer/index.ts

@@ -15,19 +15,24 @@ const PATTERNS = ['html`', 'html.reactive'];
 
 
 function createTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile> {
-    let typeChecker = program.getTypeChecker();
+    let printer = ts.createPrinter(),
+        typeChecker = program.getTypeChecker();
 
     return (_context: ts.TransformationContext) => {
         return (sourceFile: ts.SourceFile): ts.SourceFile => {
-            let code = sourceFile.getFullText();
+            // Use printer to get current text representation (handles chained transformers)
+            let code = printer.printFile(sourceFile);
 
             if (!mightNeedTransform(code, { patterns: PATTERNS })) {
                 return sourceFile;
             }
 
+            // Re-parse the printed code to get accurate positions
+            let reparsed = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
+
             setTypeChecker(typeChecker);
 
-            let result = transformCode(code, sourceFile);
+            let result = transformCode(code, reparsed);
 
             if (!result.changed) {
                 return sourceFile;
@@ -74,23 +79,27 @@ function transformCode(code: string, sourceFile: ts.SourceFile): TransformResult
 
 
 const transform = (sourceFile: ts.SourceFile, program: ts.Program): TransformResult => {
-    let code = sourceFile.getFullText();
+    // Use printer to get current text representation (handles chained transformers)
+    let printer = ts.createPrinter(),
+        code = printer.printFile(sourceFile);
 
     if (!mightNeedTransform(code, { patterns: PATTERNS })) {
         return { changed: false, code, sourceFile };
     }
 
+    // Re-parse the printed code to get accurate positions
+    let reparsed = ts.createSourceFile(sourceFile.fileName, code, sourceFile.languageVersion, true);
+
     let programSourceFile = program.getSourceFile(sourceFile.fileName);
 
     if (programSourceFile) {
         setTypeChecker(program.getTypeChecker());
-        sourceFile = programSourceFile;
     }
     else {
         setTypeChecker(undefined);
     }
 
-    return transformCode(code, sourceFile);
+    return transformCode(code, reparsed);
 };
 
 

package/src/transformer/plugins/vite.ts

@@ -1,4 +1,4 @@
-import { mightNeedTransform, PATTERNS, transform } from '../index';
+import { createTransformer, mightNeedTransform, PATTERNS } from '../index';
 import { program, TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import type { Plugin, ResolvedConfig } from 'vite';
 import { ts } from '@esportsplus/typescript';
@@ -25,14 +25,23 @@ export default (options?: { root?: string }): Plugin => {
             }
 
             try {
-                let sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true),
-                    result = transform(sourceFile, program.get(root));
-
-                if (!result.changed) {
+                let p = program.get(root),
+                    printer = ts.createPrinter(),
+                    sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true),
+                    transformer = createTransformer(p),
+                    result = ts.transform(sourceFile, [transformer]),
+                    transformed = result.transformed[0];
+
+                if (transformed === sourceFile) {
+                    result.dispose();
                     return null;
                 }
 
-                return { code: result.code, map: null };
+                let output = printer.printFile(transformed);
+
+                result.dispose();
+
+                return { code: output, map: null };
             }
             catch (error) {
                 console.error(`@esportsplus/template: Error transforming ${id}:`, error);