@sprlab/wccompiler 0.16.6 → 0.16.7

package/lib/codegen.js

@@ -317,9 +317,10 @@ export function transformMethodBody(body, signalNames, computedNames, propsObjec
  * @param {Set<string>} propsSet
  * @param {Set<string>} rootVarNames - Set of signal names
  * @param {Set<string>} computedNames
+ * @param {string[]} methodNames
  * @returns {string}
  */
-export function transformForExpr(expr, itemVar, indexVar, propsSet, rootVarNames, computedNames) {
+export function transformForExpr(expr, itemVar, indexVar, propsSet, rootVarNames, computedNames, methodNames = []) {
   let r = expr;
   const excludeSet = new Set([itemVar]);
   if (indexVar) excludeSet.add(indexVar);
@@ -345,6 +346,17 @@ export function transformForExpr(expr, itemVar, indexVar, propsSet, rootVarNames
     // Then: transform bare name references
     r = r.replace(new RegExp(`\\b${n}\\b(?!\\()`, 'g'), `this._c_${n}()`);
   }
+  // Transform method calls: methodName(args) → this._methodName(args)
+  for (const m of methodNames) {
+    if (excludeSet.has(m)) continue;
+    // Transform method calls with arguments
+    r = r.replace(new RegExp(`\\b${m}\\(`, 'g'), `this._${m}(`);
+  }
+  // Transform bare method references (not followed by parentheses)
+  for (const m of methodNames) {
+    if (excludeSet.has(m)) continue;
+    r = r.replace(new RegExp(`\\b${m}\\b(?!\\()`, 'g'), `this._${m}`);
+  }
   return r;
 }
 
@@ -440,22 +452,23 @@ export function generateEventHandler(handler, signalNames, computedNames, propsO
  * @param {Set<string>} propNames
  * @param {Set<string>} signalNamesSet
  * @param {Set<string>} computedNamesSet
+ * @param {string[]} methodNames
  * @returns {string}
  */
-export function generateForEventHandler(handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet) {
+export function generateForEventHandler(handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames) {
   if (handler.includes('=>')) {
     // Arrow function expression
     const arrowIdx = handler.indexOf('=>');
     const params = handler.slice(0, arrowIdx).trim();
     let body = handler.slice(arrowIdx + 2).trim();
-    body = transformForExpr(body, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+    body = transformForExpr(body, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
     return `${params} => { ${body}; }`;
   } else if (handler.includes('(')) {
     // Function call expression: removeItem(item)
     const parenIdx = handler.indexOf('(');
     const fnName = handler.slice(0, parenIdx).trim();
     const args = handler.slice(parenIdx + 1, handler.lastIndexOf(')')).trim();
-    const transformedArgs = args ? transformForExpr(args, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet) : '';
+    const transformedArgs = args ? transformForExpr(args, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames) : '';
     return `(e) => { this._${fnName}(${transformedArgs}); }`;
   } else {
     // Simple method name
@@ -474,8 +487,9 @@ export function generateForEventHandler(handler, itemVar, indexVar, propNames, s
  * @param {Set<string>} propNames
  * @param {Set<string>} signalNamesSet
  * @param {Set<string>} computedNamesSet
+ * @param {string[]} methodNames
  */
-function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet) {
+function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames) {
   const indent = '        ';
 
   // Bindings
@@ -484,7 +498,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
     if (isStaticForBinding(b.name, itemVar, indexVar)) {
       lines.push(`${indent}  ${nodeRef}.textContent = ${b.name} ?? '';`);
     } else {
-      const expr = transformForExpr(b.name, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+      const expr = transformForExpr(b.name, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
       lines.push(`${indent}  __effect(() => { ${nodeRef}.textContent = ${wrapTernaryExpr(expr)} ?? ''; });`);
     }
   }
@@ -492,7 +506,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
   // Events
   for (const e of forBlock.events) {
     const nodeRef = pathExpr(e.path, 'node');
-    const handlerExpr = generateForEventHandler(e.handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+    const handlerExpr = generateForEventHandler(e.handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
     lines.push(`${indent}  ${nodeRef}.addEventListener('${e.event}', ${handlerExpr});`);
   }
 
@@ -502,7 +516,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
     if (isStaticForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet)) {
       lines.push(`${indent}  ${nodeRef}.style.display = (${sb.expression}) ? '' : 'none';`);
     } else {
-      const expr = transformForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+      const expr = transformForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
       lines.push(`${indent}  __effect(() => { ${nodeRef}.style.display = (${expr}) ? '' : 'none'; });`);
     }
   }
@@ -514,7 +528,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
       lines.push(`${indent}  const __val_${ab.varName} = ${ab.expression};`);
       lines.push(`${indent}  if (__val_${ab.varName} != null && __val_${ab.varName} !== false) { ${nodeRef}.setAttribute('${ab.attr}', __val_${ab.varName}); }`);
     } else {
-      const expr = transformForExpr(ab.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+      const expr = transformForExpr(ab.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
       lines.push(`${indent}  __effect(() => {`);
       lines.push(`${indent}    const __val = ${expr};`);
       lines.push(`${indent}    if (__val == null || __val === false) { ${nodeRef}.removeAttribute('${ab.attr}'); }`);
@@ -583,7 +597,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
     lines.push(`${indent}  const ${innerVn}_anchor = ${pathExpr(innerFor.anchorPath, 'node')};`);
 
     // Transform the inner source expression (may reference outer item var)
-    const innerSourceExpr = transformForExpr(innerSource, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+    const innerSourceExpr = transformForExpr(innerSource, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
 
     // Determine if inner source is static (only references outer loop vars)
     const innerSourceIsStatic = isStaticForExpr(innerSource, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
@@ -601,7 +615,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
       lines.push(`${indent}    const innerNode = clone.firstChild;`);
 
       // Generate inner item bindings with combined excludeSet
-      generateNestedItemSetup(lines, innerFor, itemVar, indexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, indent + '    ');
+      generateNestedItemSetup(lines, innerFor, itemVar, indexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, methodNames, indent + '    ');
 
       lines.push(`${indent}    ${innerVn}_newNodes.push(innerNode);`);
       lines.push(`${indent}  });`);
@@ -617,7 +631,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
       lines.push(`${indent}    const innerNode = clone.firstChild;`);
 
       // Generate inner item bindings with combined excludeSet
-      generateNestedItemSetup(lines, innerFor, itemVar, indexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, indent + '    ');
+      generateNestedItemSetup(lines, innerFor, itemVar, indexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, methodNames, indent + '    ');
 
       lines.push(`${indent}    ${innerVn}_anchor.parentNode.insertBefore(innerNode, ${innerVn}_anchor);`);
       lines.push(`${indent}  });`);
@@ -690,7 +704,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
           if (isStaticForBinding(b.name, itemVar, indexVar)) {
             lines.push(`${indent}      ${nodeRef}.textContent = ${b.name} ?? '';`);
           } else {
-            const expr = transformForExpr(b.name, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+            const expr = transformForExpr(b.name, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
             lines.push(`${indent}      __effect(() => { ${nodeRef}.textContent = ${wrapTernaryExpr(expr)} ?? ''; });`);
           }
         }
@@ -698,7 +712,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
         // Events
         for (const e of branch.events) {
           const nodeRef = pathExpr(e.path, `${vn}_node`);
-          const handlerExpr = generateForEventHandler(e.handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+          const handlerExpr = generateForEventHandler(e.handler, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
           lines.push(`${indent}      ${nodeRef}.addEventListener('${e.event}', ${handlerExpr});`);
         }
 
@@ -708,7 +722,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
           if (isStaticForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet)) {
             lines.push(`${indent}      ${nodeRef}.style.display = (${sb.expression}) ? '' : 'none';`);
           } else {
-            const expr = transformForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+            const expr = transformForExpr(sb.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
             lines.push(`${indent}      __effect(() => { ${nodeRef}.style.display = (${expr}) ? '' : 'none'; });`);
           }
         }
@@ -720,7 +734,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
             lines.push(`${indent}      const __val_${ab.varName} = ${ab.expression};`);
             lines.push(`${indent}      if (__val_${ab.varName} != null && __val_${ab.varName} !== false) { ${nodeRef}.setAttribute('${ab.attr}', __val_${ab.varName}); }`);
           } else {
-            const expr = transformForExpr(ab.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+            const expr = transformForExpr(ab.expression, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
             lines.push(`${indent}      __effect(() => {`);
             lines.push(`${indent}        const __val = ${expr};`);
             lines.push(`${indent}        if (__val == null || __val === false) { ${nodeRef}.removeAttribute('${ab.attr}'); }`);
@@ -772,7 +786,7 @@ function generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signal
  * @param {Set<string>} computedNamesSet - Computed names set
  * @param {string} indent - Current indentation
  */
-function generateNestedItemSetup(lines, innerFor, outerItemVar, outerIndexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, indent) {
+function generateNestedItemSetup(lines, innerFor, outerItemVar, outerIndexVar, innerItemVar, innerIndexVar, propNames, signalNamesSet, computedNamesSet, methodNames, indent) {
   // Build combined exclude set with both outer and inner loop variables
   const combinedExcludeItemVar = innerItemVar;
   const combinedExcludeIndexVar = innerIndexVar;
@@ -810,7 +824,7 @@ function generateNestedItemSetup(lines, innerFor, outerItemVar, outerIndexVar, i
 
   // Helper: transform expression excluding both outer and inner loop vars
   function transformNested(expr) {
-    return transformForExpr(expr, innerItemVar, innerIndexVar, filteredPropNames, filteredSignalNames, filteredComputedNames);
+    return transformForExpr(expr, innerItemVar, innerIndexVar, filteredPropNames, filteredSignalNames, filteredComputedNames, methodNames);
   }
 
   // Bindings
@@ -827,7 +841,7 @@ function generateNestedItemSetup(lines, innerFor, outerItemVar, outerIndexVar, i
   // Events
   for (const e of innerFor.events) {
     const nodeRef = pathExpr(e.path, 'innerNode');
-    const handlerExpr = generateForEventHandler(e.handler, innerItemVar, innerIndexVar, filteredPropNames, filteredSignalNames, filteredComputedNames);
+    const handlerExpr = generateForEventHandler(e.handler, innerItemVar, innerIndexVar, filteredPropNames, filteredSignalNames, filteredComputedNames, methodNames);
     lines.push(`${indent}${nodeRef}.addEventListener('${e.event}', ${handlerExpr});`);
   }
 
@@ -1674,7 +1688,7 @@ export function generateComponent(parseResult, options = {}) {
     const computedNamesSet = new Set(computedNames);
 
     // Transform the source expression
-    const sourceExpr = transformForExpr(source, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+    const sourceExpr = transformForExpr(source, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
 
     lines.push('    this.__disposers.push(__effect(() => {');
     lines.push(`      const __source = ${sourceExpr};`);
@@ -1703,7 +1717,7 @@ export function generateComponent(parseResult, options = {}) {
 
       // Setup bindings/events/show/attr/model/slots for NEW nodes only
       // (reused nodes keep their existing bindings)
-      generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+      generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
 
       lines.push('          __newMap.set(__key, node);');
       lines.push('          __newNodes.push(node);');
@@ -1728,7 +1742,7 @@ export function generateComponent(parseResult, options = {}) {
       lines.push(`        const clone = this.${vn}_tpl.content.cloneNode(true);`);
       lines.push('        const node = clone.firstChild;');
 
-      generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet);
+      generateItemSetup(lines, forBlock, itemVar, indexVar, propNames, signalNamesSet, computedNamesSet, methodNames);
 
       lines.push(`        this.${vn}_anchor.parentNode.insertBefore(node, this.${vn}_anchor);`);
       lines.push('        customElements.upgrade(node);');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprlab/wccompiler",
-  "version": "0.16.6",
+  "version": "0.16.7",
   "description": "Zero-runtime compiler that transforms .wcc single-file components into native web components with signals-based reactivity",
   "type": "module",
   "exports": {