@esportsplus/template 0.32.2 → 0.32.3

package/build/transformer/codegen.d.ts

@@ -4,9 +4,9 @@ type CodegenResult = {
     changed: boolean;
     code: string;
 };
-declare const addArraySlotImport: (code: string) => string;
+declare const addImport: (code: string) => string;
 declare const generateCode: (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile, checker?: ts.TypeChecker) => CodegenResult;
 declare const generateReactiveInlining: (calls: ReactiveCallInfo[], code: string, sourceFile: ts.SourceFile) => string;
 declare const needsArraySlotImport: (sourceFile: ts.SourceFile) => boolean;
-export { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport };
+export { addImport, generateCode, generateReactiveInlining, needsArraySlotImport };
 export type { CodegenResult };

package/build/transformer/codegen.js

@@ -1,5 +1,5 @@
 import { ts } from '@esportsplus/typescript';
-import { code as c, uid } from '@esportsplus/typescript/transformer';
+import { ast, code as c, uid } from '@esportsplus/typescript/transformer';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer.js';
 import { COMPILER_ENTRYPOINT, COMPILER_NAMESPACE, COMPILER_TYPES, PACKAGE } from '../constants.js';
 import parser from './parser.js';
@@ -140,42 +140,21 @@ function hasArraySlotImport(sourceFile) {
     }
     return false;
 }
-function hasMatch(node, predicate) {
-    if (predicate(node)) {
-        return true;
-    }
-    let found = false;
-    ts.forEachChild(node, child => {
-        if (!found) {
-            found = hasMatch(child, predicate);
-        }
-    });
-    return found;
-}
 function isNestedHtmlTemplate(expr) {
     return ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT;
 }
-function isNestedTemplate(template, exprRanges) {
-    for (let i = 0, n = exprRanges.length; i < n; i++) {
-        let range = exprRanges[i];
-        if (template.start >= range.start && template.end <= range.end) {
-            return true;
-        }
-    }
-    return false;
-}
 function rewriteExpression(ctx, expr) {
     if (isNestedHtmlTemplate(expr)) {
         return generateNestedTemplateCode(ctx, expr);
     }
-    if (!hasMatch(expr, n => isNestedHtmlTemplate(n))) {
+    if (!ast.hasMatch(expr, n => isNestedHtmlTemplate(n))) {
         return ctx.printer.printNode(ts.EmitHint.Expression, expr, ctx.sourceFile);
     }
     let replacements = [];
     collectNestedTemplateReplacements(ctx, expr, expr.getStart(), replacements);
     return c.replaceReverse(expr.getText(ctx.sourceFile), replacements);
 }
-const addArraySlotImport = (code) => {
+const addImport = (code) => {
     return `import * as ${COMPILER_NAMESPACE} from '${PACKAGE}';\n` + code;
 };
 const generateCode = (templates, originalCode, sourceFile, checker) => {
@@ -189,7 +168,7 @@ const generateCode = (templates, originalCode, sourceFile, checker) => {
             ranges.push({ end: exprs[j].end, start: exprs[j].getStart() });
         }
     }
-    let rootTemplates = templates.filter(t => !isNestedTemplate(t, ranges));
+    let rootTemplates = templates.filter(t => !ast.inRange(ranges, t.start, t.end));
     if (rootTemplates.length === 0) {
         return { changed: false, code: originalCode };
     }
@@ -229,7 +208,7 @@ const generateCode = (templates, originalCode, sourceFile, checker) => {
         for (let [id, html] of ctx.hoistedFactories) {
             factories.push(`const ${id} = ${COMPILER_NAMESPACE}.template(\`${html}\`);`);
         }
-        code = `import * as ${COMPILER_NAMESPACE} from '${PACKAGE}';\n\n` + factories.join('\n') + '\n\n' + code;
+        code = addImport(factories.join('\n') + code);
     }
     return { changed, code };
 };
@@ -252,8 +231,8 @@ const generateReactiveInlining = (calls, code, sourceFile) => {
     return c.replaceReverse(code, replacements);
 };
 const needsArraySlotImport = (sourceFile) => {
-    return hasMatch(sourceFile, n => ts.isNewExpression(n) &&
+    return ast.hasMatch(sourceFile, n => ts.isNewExpression(n) &&
         ts.isPropertyAccessExpression(n.expression) &&
         n.expression.name.text === 'ArraySlot') && !hasArraySlotImport(sourceFile);
 };
-export { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport };
+export { addImport, generateCode, generateReactiveInlining, needsArraySlotImport };

package/build/transformer/index.js

@@ -1,5 +1,5 @@
 import { code as c } from '@esportsplus/typescript/transformer';
-import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen.js';
+import { addImport, generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen.js';
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY } from '../constants.js';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
 import { ts } from '@esportsplus/typescript';
@@ -36,7 +36,7 @@ const transform = (sourceFile, program) => {
         }
     }
     if (needsImport && !codegenChanged) {
-        result = addArraySlotImport(result);
+        result = addImport(result);
     }
     if (changed) {
         sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);

package/package.json

@@ -2,12 +2,12 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.2.0",
-    "@esportsplus/reactivity": "^0.25.12",
+    "@esportsplus/reactivity": "^0.25.14",
     "@esportsplus/utilities": "^0.27.2",
     "serve": "^14.2.5"
   },
   "devDependencies": {
-    "@esportsplus/typescript": "^0.18.0",
+    "@esportsplus/typescript": "^0.20.0",
     "@types/node": "^25.0.3",
     "vite": "^7.3.0",
     "vite-tsconfig-paths": "^6.0.3"
@@ -40,7 +40,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/transformer/codegen.ts

@@ -1,5 +1,5 @@
 import { ts } from '@esportsplus/typescript';
-import { code as c, uid, type Replacement } from '@esportsplus/typescript/transformer';
+import { ast, code as c, uid, type Replacement } from '@esportsplus/typescript/transformer';
 import type { ReactiveCallInfo, TemplateInfo } from './ts-parser';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer';
 import {
@@ -273,44 +273,16 @@ function hasArraySlotImport(sourceFile: ts.SourceFile): boolean {
     return false;
 }
 
-function hasMatch(node: ts.Node, predicate: (n: ts.Node) => boolean): boolean {
-    if (predicate(node)) {
-        return true;
-    }
-
-    let found = false;
-
-    ts.forEachChild(node, child => {
-        if (!found) {
-            found = hasMatch(child, predicate);
-        }
-    });
-
-    return found;
-}
-
 function isNestedHtmlTemplate(expr: ts.Expression): expr is ts.TaggedTemplateExpression {
     return ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT;
 }
 
-function isNestedTemplate(template: TemplateInfo, exprRanges: { end: number; start: number }[]): boolean {
-    for (let i = 0, n = exprRanges.length; i < n; i++) {
-        let range = exprRanges[i];
-
-        if (template.start >= range.start && template.end <= range.end) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 function rewriteExpression(ctx: CodegenContext, expr: ts.Expression): string {
     if (isNestedHtmlTemplate(expr)) {
         return generateNestedTemplateCode(ctx, expr);
     }
 
-    if (!hasMatch(expr, n => isNestedHtmlTemplate(n as ts.Expression))) {
+    if (!ast.hasMatch(expr, n => isNestedHtmlTemplate(n as ts.Expression))) {
         return ctx.printer.printNode(ts.EmitHint.Expression, expr, ctx.sourceFile);
     }
 
@@ -322,7 +294,7 @@ function rewriteExpression(ctx: CodegenContext, expr: ts.Expression): string {
 }
 
 
-const addArraySlotImport = (code: string): string => {
+const addImport = (code: string): string => {
     return `import * as ${COMPILER_NAMESPACE} from '${PACKAGE}';\n` + code;
 };
 
@@ -342,7 +314,7 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
         }
     }
 
-    let rootTemplates = templates.filter(t => !isNestedTemplate(t, ranges));
+    let rootTemplates = templates.filter(t => !ast.inRange(ranges, t.start, t.end));
 
     if (rootTemplates.length === 0) {
         return { changed: false, code: originalCode };
@@ -406,7 +378,7 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
             factories.push(`const ${id} = ${COMPILER_NAMESPACE}.template(\`${html}\`);`);
         }
 
-        code = `import * as ${COMPILER_NAMESPACE} from '${PACKAGE}';\n\n` + factories.join('\n') + '\n\n' + code;
+        code = addImport(factories.join('\n') + code);
     }
 
     return { changed, code };
@@ -436,7 +408,7 @@ const generateReactiveInlining = (calls: ReactiveCallInfo[], code: string, sourc
 };
 
 const needsArraySlotImport = (sourceFile: ts.SourceFile): boolean => {
-    return hasMatch(sourceFile, n =>
+    return ast.hasMatch(sourceFile, n =>
         ts.isNewExpression(n) &&
         ts.isPropertyAccessExpression(n.expression) &&
         n.expression.name.text === 'ArraySlot'
@@ -444,5 +416,5 @@ const needsArraySlotImport = (sourceFile: ts.SourceFile): boolean => {
 };
 
 
-export { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport };
+export { addImport, generateCode, generateReactiveInlining, needsArraySlotImport };
 export type { CodegenResult };

package/src/transformer/index.ts

@@ -1,5 +1,5 @@
 import { code as c } from '@esportsplus/typescript/transformer';
-import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen';
+import { addImport, generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen';
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY } from '../constants';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser';
 import { ts } from '@esportsplus/typescript';
@@ -64,7 +64,7 @@ const transform = (sourceFile: ts.SourceFile, program: ts.Program): TransformRes
     }
 
     if (needsImport && !codegenChanged) {
-        result = addArraySlotImport(result);
+        result = addImport(result);
     }
 
     if (changed) {