@esportsplus/template 0.30.1 → 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:
@@ -86,7 +61,7 @@ For direct `tsc` compilation, use the transformer factory:
 Or programmatically:
 
 ```typescript
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 import templateTransformer from '@esportsplus/template/plugins/tsc';
 
 const program = ts.createProgram(['src/index.ts'], {});

package/build/transformer/codegen.d.ts

@@ -1,5 +1,5 @@
 import type { ReactiveCallInfo, TemplateInfo } from './ts-parser.js';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 type CodegenResult = {
     changed: boolean;
     code: string;

package/build/transformer/codegen.js

@@ -1,6 +1,6 @@
 import { addImport, applyReplacementsReverse, uid } from '@esportsplus/typescript/transformer';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer.js';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 import parser from './parser.js';
 const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
 let currentChecker, hoistedFactories = new Map(), htmlToTemplateId = new Map(), nameArraySlot = '', nameAttr = '', nameEffectSlot = '', nameEvent = '', nameSlot = '', nameTemplate = '', needsArraySlot = false, needsAttr = false, needsEffectSlot = false, needsEvent = false, needsSlot = false;

package/build/transformer/index.d.ts

@@ -1,5 +1,5 @@
 import { mightNeedTransform } from '@esportsplus/typescript/transformer';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 type TransformResult = {
     changed: boolean;
     code: string;

package/build/transformer/index.js

@@ -1,18 +1,19 @@
 import { mightNeedTransform } from '@esportsplus/typescript/transformer';
 import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport, setTypeChecker } from './codegen.js';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
-import ts from 'typescript';
+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/tsc.d.ts

@@ -1,3 +1,3 @@
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 declare const _default: (program: ts.Program) => ts.TransformerFactory<ts.SourceFile>;
 export default _default;

package/build/transformer/plugins/vite.js

@@ -1,6 +1,6 @@
-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 'typescript';
+import { ts } from '@esportsplus/typescript';
 export default (options) => {
     let root;
     return {
@@ -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/build/transformer/ts-parser.d.ts

@@ -1,4 +1,4 @@
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 type ReactiveCallInfo = {
     arrayArg: ts.Expression;
     callbackArg: ts.Expression;

package/build/transformer/ts-parser.js

@@ -1,4 +1,4 @@
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 function extractTemplateInfo(node, depth) {
     let expressions = [], literals = [], template = node.template;
     if (ts.isNoSubstitutionTemplateLiteral(template)) {

package/build/transformer/type-analyzer.d.ts

@@ -1,4 +1,4 @@
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 type SlotType = 'array-slot' | 'document-fragment' | 'effect' | 'node' | 'primitive' | 'static' | 'unknown';
 declare const analyzeExpression: (expr: ts.Expression, checker?: ts.TypeChecker) => SlotType;
 declare const generateAttributeBinding: (elementVar: string, name: string, expr: string, staticValue: string) => string;

package/build/transformer/type-analyzer.js

@@ -1,6 +1,6 @@
 import { getNames } from './codegen.js';
 import { DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS } from '../event/constants.js';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 function analyzeSpread(expr, checker) {
     while (ts.isParenthesizedExpression(expr)) {
         expr = expr.expression;

package/package.json

@@ -2,15 +2,13 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.2.0",
-    "@esportsplus/reactivity": "^0.23.2",
+    "@esportsplus/reactivity": "^0.23.5",
     "@esportsplus/utilities": "^0.27.2",
     "serve": "^14.2.5"
   },
   "devDependencies": {
-    "@esportsplus/typescript": "^0.13.0",
+    "@esportsplus/typescript": "^0.15.0",
     "@types/node": "^25.0.3",
-    "esbuild": "^0.27.2",
-    "typescript": "^5.9.3",
     "vite": "^7.3.0",
     "vite-tsconfig-paths": "^6.0.3"
   },
@@ -23,10 +21,6 @@
       "import": "./build/constants.js",
       "types": "./build/constants.d.ts"
     },
-    "./plugins/esbuild": {
-      "import": "./build/transformer/plugins/esbuild.js",
-      "types": "./build/transformer/plugins/esbuild.d.ts"
-    },
     "./plugins/tsc": {
       "import": "./build/transformer/plugins/tsc.js",
       "require": "./build/transformer/plugins/tsc.js",
@@ -46,9 +40,9 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "scripts": {
-    "build": "tsc && tsc-alias",
+    "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",
     "-": "-"
   }

package/src/transformer/codegen.ts

@@ -2,7 +2,7 @@ import { addImport, applyReplacementsReverse, uid } from '@esportsplus/typescrip
 import type { Replacement } from '@esportsplus/typescript/transformer';
 import type { ReactiveCallInfo, TemplateInfo } from './ts-parser';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 import parser from './parser';
 
 

package/src/transformer/index.ts

@@ -1,7 +1,7 @@
 import { mightNeedTransform } from '@esportsplus/typescript/transformer';
 import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport, setTypeChecker } from './codegen';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 
 
 type TransformResult = {
@@ -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/tsc.ts

@@ -1,5 +1,5 @@
 import { createTransformer } from '../index';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 
 
 export default (program: ts.Program): ts.TransformerFactory<ts.SourceFile> => {

package/src/transformer/plugins/vite.ts

@@ -1,7 +1,7 @@
-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 'typescript';
+import { ts } from '@esportsplus/typescript';
 
 
 export default (options?: { root?: string }): Plugin => {
@@ -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);

package/src/transformer/ts-parser.ts

@@ -1,4 +1,4 @@
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 
 
 type ReactiveCallInfo = {

package/src/transformer/type-analyzer.ts

@@ -1,6 +1,6 @@
 import { getNames } from './codegen';
 import { DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS } from '../event/constants';
-import ts from 'typescript';
+import { ts } from '@esportsplus/typescript';
 
 
 type AnalyzerContext = {

package/build/transformer/plugins/esbuild.d.ts

@@ -1,5 +0,0 @@
-import type { Plugin } from 'esbuild';
-declare const _default: (options?: {
-    root?: string;
-}) => Plugin;
-export default _default;

package/build/transformer/plugins/esbuild.js

@@ -1,35 +0,0 @@
-import { mightNeedTransform, PATTERNS, transform } from '../index.js';
-import { program, TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
-import fs from 'fs';
-import ts from 'typescript';
-export default (options) => {
-    let root = options?.root ?? process.cwd();
-    return {
-        name: '@esportsplus/template/plugin-esbuild',
-        setup(build) {
-            build.onLoad({ filter: TRANSFORM_PATTERN }, async (args) => {
-                let code = await fs.promises.readFile(args.path, 'utf8');
-                if (!mightNeedTransform(code, { patterns: PATTERNS })) {
-                    return null;
-                }
-                try {
-                    let sourceFile = ts.createSourceFile(args.path, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile, program.get(root));
-                    if (!result.changed) {
-                        return null;
-                    }
-                    return {
-                        contents: result.code,
-                        loader: args.path.endsWith('x') ? 'tsx' : 'ts'
-                    };
-                }
-                catch (error) {
-                    console.error(`@esportsplus/template: Error transforming ${args.path}:`, error);
-                    return null;
-                }
-            });
-            build.onEnd(() => {
-                program.delete(root);
-            });
-        }
-    };
-};

package/src/transformer/plugins/esbuild.ts

@@ -1,46 +0,0 @@
-import { mightNeedTransform, PATTERNS, transform } from '../index';
-import { program, TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
-import type { OnLoadArgs, Plugin, PluginBuild } from 'esbuild';
-import fs from 'fs';
-import ts from 'typescript';
-
-
-export default (options?: { root?: string }): Plugin => {
-    let root = options?.root ?? process.cwd();
-
-    return {
-        name: '@esportsplus/template/plugin-esbuild',
-
-        setup(build: PluginBuild) {
-            build.onLoad({ filter: TRANSFORM_PATTERN }, async (args: OnLoadArgs) => {
-                let code = await fs.promises.readFile(args.path, 'utf8');
-
-                if (!mightNeedTransform(code, { patterns: PATTERNS })) {
-                    return null;
-                }
-
-                try {
-                    let sourceFile = ts.createSourceFile(args.path, code, ts.ScriptTarget.Latest, true),
-                        result = transform(sourceFile, program.get(root));
-
-                    if (!result.changed) {
-                        return null;
-                    }
-
-                    return {
-                        contents: result.code,
-                        loader: args.path.endsWith('x') ? 'tsx' : 'ts'
-                    };
-                }
-                catch (error) {
-                    console.error(`@esportsplus/template: Error transforming ${args.path}:`, error);
-                    return null;
-                }
-            });
-
-            build.onEnd(() => {
-                program.delete(root);
-            });
-        }
-    };
-};