@sprlab/wccompiler 0.16.10 → 0.16.12

package/lib/codegen.js

@@ -1138,14 +1138,25 @@ export function generateComponent(parseResult, options = {}) {
   if (slots.length > 0) {
     lines.push('    const __slotMap = {};');
     lines.push('    const __defaultSlotNodes = [];');
+    lines.push('    const __templatesToRemove = [];');
     lines.push('    for (const child of Array.from(this.childNodes)) {');
     lines.push("      if (child.nodeName === 'TEMPLATE') {");
+    lines.push('        let handled = false;');
     lines.push('        for (const attr of child.attributes) {');
     lines.push("          if (attr.name.startsWith('#')) {");
     lines.push('            const slotName = attr.name.slice(1);');
     lines.push('            __slotMap[slotName] = { content: child.innerHTML, propsExpr: attr.value };');
+    lines.push('            handled = true;');
+    lines.push('          } else if (attr.name === "slot") {');
+    // NEW: <template slot="name"> syntax (Vue standard)
+    lines.push('            const slotName = attr.value;');
+    lines.push("            const propsExpr = child.getAttribute('slot-props') || '';");
+    lines.push("            child.removeAttribute('slot-props');");
+    lines.push('            __slotMap[slotName] = { content: child.innerHTML, propsExpr };');
+    lines.push('            handled = true;');
     lines.push('          }');
     lines.push('        }');
+    lines.push('        if (handled) __templatesToRemove.push(child);');
     lines.push("      } else if (child.nodeType === 1 && child.getAttribute('slot')) {");
     // NEW: regular element with slot="name" (cross-framework support)
     lines.push("        const slotName = child.getAttribute('slot');");
@@ -1154,21 +1165,15 @@ export function generateComponent(parseResult, options = {}) {
     lines.push("        child.removeAttribute('slot-props');");
     lines.push("        __slotMap[slotName] = { content: propsExpr ? child.innerHTML : child.outerHTML, propsExpr };");
     lines.push("      } else if (child.nodeType === 1) {");
-    // NEW: check for slot-template-<name> attributes (React/Angular string attribute pattern)
-    lines.push("        for (const attr of Array.from(child.attributes)) {");
-    lines.push("          if (attr.name.startsWith('slot-template-')) {");
-    lines.push("            const slotName = attr.name.slice('slot-template-'.length);");
-    lines.push("            if (!__slotMap[slotName]) {");
-    lines.push("              __slotMap[slotName] = { content: attr.value, propsExpr: '' };");
-    lines.push("            }");
-    lines.push("            child.removeAttribute(attr.name);");
-    lines.push("          }");
-    lines.push("        }");
     lines.push("        __defaultSlotNodes.push(child);");
     lines.push("      } else if (child.nodeType === 3 && child.textContent.trim()) {");
     lines.push('        __defaultSlotNodes.push(child);');
     lines.push('      }');
     lines.push('    }');
+    // Remove processed template elements to prevent them from appearing in default slot
+    lines.push('    for (const tpl of __templatesToRemove) {');
+    lines.push('      if (tpl.parentNode) tpl.parentNode.removeChild(tpl);');
+    lines.push('    }');
   }
 
   // Clone template
@@ -1312,15 +1317,8 @@ export function generateComponent(parseResult, options = {}) {
     lines.push("            __sm[sn] = { content: pe ? child.innerHTML : child.outerHTML, propsExpr: pe };");
     lines.push("            child.remove();");
     lines.push("          } else if (child.nodeType === 1) {");
-    lines.push("            for (const attr of Array.from(child.attributes)) {");
-    lines.push("              if (attr.name.startsWith('slot-template-')) {");
-    lines.push("                const sn = attr.name.slice('slot-template-'.length);");
-    lines.push("                if (!__sm[sn]) { __sm[sn] = { content: attr.value, propsExpr: '' }; }");
-    lines.push("                child.removeAttribute(attr.name);");
-    lines.push("              }");
-    lines.push("            }");
     lines.push("            __dn.push(child);");
-    lines.push("          } else if (child.nodeType === 3 && child.textContent.trim()) {");
+    lines.push("          } else if (child.nodeType === 3 && child.textContent.trim()) {",);
     lines.push("            __dn.push(child);");
     lines.push('          }');
     lines.push('        }');

package/lib/sfc-parser.js

@@ -287,16 +287,21 @@ export function parseSFC(source, fileName = '<unknown>') {
   }
 
   // Collect all block ranges for unexpected-content check
+  // Use filtered templateBlocks (main SFC template only, not nested slot templates)
+  // The main template's range already covers all nested content including <template slot="name">
   /** @type {Array<{start: number, end: number}>} */
   const allRanges = [
     ...scriptBlocks,
-    ...templateBlocks,
+    ...templateBlocks, // Only main SFC blocks (filtered to exclude slot templates)
     ...styleBlocks,
   ].sort((a, b) => a.start - b.start);
 
-  // Temporarily disable unexpected content validation due to issues with nested slot templates
-  // TODO: Fix validateNoUnexpectedContent to properly handle nested <template slot="name"> elements
-  // validateNoUnexpectedContent(source, allRanges, fileName);
+  // Validate unexpected content ONLY if there are no nested slot templates
+  // Nested <template slot="name"> elements can cause false positives in range validation
+  const hasNestedSlotTemplates = allTemplateBlocks.length > templateBlocks.length;
+  if (!hasNestedSlotTemplates) {
+    validateNoUnexpectedContent(source, allRanges, fileName);
+  }
 
   // Extract block contents
   const scriptContent = scriptBlocks[0].content;

package/package.json

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