@esportsplus/template 0.38.1 → 0.38.2

package/build/compiler/codegen.js

@@ -16,7 +16,7 @@ function collectNestedReplacements(ctx, node, exprStart, replacements) {
     else if (isReactiveCall(node)) {
         replacements.push({
             end: node.end - exprStart,
-            newText: rewriteReactiveCall(ctx, node),
+            newText: rewriteNestedReactiveCall(ctx, node),
             start: node.getStart(ctx.sourceFile) - exprStart
         });
     }
@@ -183,6 +183,10 @@ function rewriteReactiveCall(ctx, node) {
     let arrayArg = node.arguments[0], arrayText = ctx.printer.printNode(ts.EmitHint.Expression, arrayArg, ctx.sourceFile), callbackArg = node.arguments[1], callbackText = rewriteExpression(ctx, callbackArg);
     return `${arrayText}, ${callbackText}`;
 }
+function rewriteNestedReactiveCall(ctx, node) {
+    let arrayArg = node.arguments[0], arrayText = ctx.printer.printNode(ts.EmitHint.Expression, arrayArg, ctx.sourceFile), callbackArg = node.arguments[1], callbackText = rewriteExpression(ctx, callbackArg);
+    return `new ${COMPILER_NAMESPACE}.ArraySlot(${arrayText}, ${callbackText})`;
+}
 function discoverTemplatesInExpression(ctx, node) {
     if (isNestedHtmlTemplate(node)) {
         let template = node, expressions = [], literals = [], tpl = template.template;

package/build/compiler/index.js

@@ -2,10 +2,6 @@ import { ts } from '@esportsplus/typescript';
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, COMPILER_NAMESPACE, PACKAGE } from '../constants.js';
 import { generateCode } from './codegen.js';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
-const PATTERNS = [
-    `${COMPILER_ENTRYPOINT}\``,
-    `${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`
-];
 function isInRange(ranges, start, end) {
     for (let i = 0, n = ranges.length; i < n; i++) {
         let range = ranges[i];
@@ -17,7 +13,10 @@ function isInRange(ranges, start, end) {
 }
 let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 const plugin = {
-    patterns: PATTERNS,
+    patterns: [
+        `${COMPILER_ENTRYPOINT}\``,
+        `${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`
+    ],
     transform: (ctx) => {
         let importsIntent = [], prepend = [], replacements = [], removeImports = [];
         let templates = findHtmlTemplates(ctx.sourceFile, ctx.checker);

package/package.json

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

package/src/compiler/codegen.ts

@@ -66,9 +66,10 @@ function collectNestedReplacements(
         });
     }
     else if (isReactiveCall(node as ts.Expression)) {
+        // Nested reactive calls need full ArraySlot construction (not just args)
         replacements.push({
             end: node.end - exprStart,
-            newText: rewriteReactiveCall(ctx, node as ts.CallExpression),
+            newText: rewriteNestedReactiveCall(ctx, node as ts.CallExpression),
             start: node.getStart(ctx.sourceFile) - exprStart
         });
     }
@@ -327,6 +328,7 @@ function rewriteExpression(ctx: CodegenContext, expr: ts.Expression): string {
     return replaceReverse(expr.getText(ctx.sourceFile), replacements);
 }
 
+// Returns just args "array, callback" - for direct slot usage where generateNodeBinding wraps it
 function rewriteReactiveCall(ctx: CodegenContext, node: ts.CallExpression): string {
     let arrayArg = node.arguments[0],
         arrayText = ctx.printer.printNode(ts.EmitHint.Expression, arrayArg, ctx.sourceFile),
@@ -336,6 +338,16 @@ function rewriteReactiveCall(ctx: CodegenContext, node: ts.CallExpression): stri
     return `${arrayText}, ${callbackText}`;
 }
 
+// Returns full "new ArraySlot(array, callback)" - for nested reactive calls inside expressions
+function rewriteNestedReactiveCall(ctx: CodegenContext, node: ts.CallExpression): string {
+    let arrayArg = node.arguments[0],
+        arrayText = ctx.printer.printNode(ts.EmitHint.Expression, arrayArg, ctx.sourceFile),
+        callbackArg = node.arguments[1],
+        callbackText = rewriteExpression(ctx, callbackArg as ts.Expression);
+
+    return `new ${COMPILER_NAMESPACE}.ArraySlot(${arrayText}, ${callbackText})`;
+}
+
 // Eager discovery - walk all expressions to find templates before prepend generation
 function discoverTemplatesInExpression(ctx: CodegenContext, node: ts.Node): void {
     if (isNestedHtmlTemplate(node as ts.Expression)) {

package/src/compiler/index.ts

@@ -5,12 +5,6 @@ import { generateCode } from './codegen';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser';
 
 
-const PATTERNS = [
-    `${COMPILER_ENTRYPOINT}\``,
-    `${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`
-];
-
-
 function isInRange(ranges: { end: number; start: number }[], start: number, end: number): boolean {
     for (let i = 0, n = ranges.length; i < n; i++) {
         let range = ranges[i];
@@ -28,7 +22,10 @@ let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 
 
 const plugin: Plugin = {
-    patterns: PATTERNS,
+    patterns: [
+        `${COMPILER_ENTRYPOINT}\``,
+        `${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`
+    ],
 
     transform: (ctx: TransformContext) => {
         let importsIntent: ImportIntent[] = [],