@stacksjs/stx 0.2.110 → 0.2.112

package/dist/expressions.js

@@ -269,12 +269,17 @@ function expressionUsesOnlyContextVars(expr, context) {
       if (ch === "$" && exprWithoutStrings[ti + 1] === "{") {
         tplDepth++;
         ti++;
+        tplResult += " ";
         continue;
       }
       if (ch === "}" && tplDepth > 0) {
         tplDepth--;
         continue;
       }
+      if (tplDepth > 0) {
+        tplResult += ch;
+        continue;
+      }
       continue;
     }
     tplResult += ch;
@@ -378,7 +383,7 @@ export function processExpressions(template, context, filePath, options) {
       return "";
     try {
       const value = evaluateExpression(expr, context);
-      if (value === void 0 && hasSignals && !expressionUsesOnlyContextVars(trimmedExpr, context))
+      if (hasSignals && !expressionUsesOnlyContextVars(trimmedExpr, context))
         return match;
       if (value === void 0 && context.__stx_buildMode === "compile" && !hasSignals)
         return createPlaceholder("expr", trimmedExpr);

package/dist/includes.js

@@ -189,8 +189,8 @@ ${scriptContent}
 ${tail}})();
 `;
 }
-function transformSignalScript(scriptContent, scopeId) {
-  const tail = `
+function buildScopeRegistrationTail(scriptContent, scopeId) {
+  return `
   // Register scope variables for STX runtime
   if (!window.stx._scopes) window.stx._scopes = {};
   var __scopeRegistration = { __destroyCallbacks: __destroyHooks };
@@ -202,7 +202,10 @@ ${extractExports(scriptContent).split(",").map((s) => s.trim()).filter(Boolean).
   // shadowing import. __stxScopeRenames is emitted by bundleClientScript.
   try { if (typeof __stxScopeRenames !== 'undefined' && __stxScopeRenames) { for (var __stxRK in __stxScopeRenames) __scopeRegistration[__stxRK] = __stxScopeRenames[__stxRK]; } } catch (e) { /* no renames */ }
   window.stx._scopes['${scopeId}'] = __scopeRegistration;
-`, head = `
+`;
+}
+function transformSignalScript(scriptContent, scopeId) {
+  const tail = buildScopeRegistrationTail(scriptContent, scopeId), head = `
 (function() {
   var __stxScopeEl = (typeof document !== 'undefined') ? document.querySelector('[data-stx-scope="${scopeId}"]') : null;
   var __stxPrevEl = (typeof window !== 'undefined') ? window.__STX_CURRENT_ELEMENT__ : undefined;
@@ -542,7 +545,7 @@ export async function processIncludes(template, context, filePath, options, depe
         if (options.debug)
           console.warn(`[stx] partial ES import extraction skipped for ${includeFilePath}:`, err instanceof Error ? err.message : err);
       }
-      const templateMatch = workingContent.match(/<template\b(?![^>]*(?:\b(?:id|x-for|x-if|@for|@if|:for|:if)\s*=|\s#[\w-]|\bv-slot|\bslot\s*=))[^>]*>([\s\S]*?)<\/template>/i);
+      const templateMatch = workingContent.match(/<template\b(?![^>]*(?:\b(?:id|x-for|x-if|x-else|@for|@if|@else|:for|:if|:else)\s*=|\s#[\w-]|\bv-slot|\bslot\s*=))[^>]*>([\s\S]*?)<\/template>/i);
       if (templateMatch)
         workingContent = templateMatch[1].trim();
       const styleMatch = partialContent.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "").match(/<style\b([^>]*)>([\s\S]*?)<\/style>/i);
@@ -604,10 +607,7 @@ export async function processIncludes(template, context, filePath, options, depe
         if (!isServerScript && !isSignalScript) {
           const extraAttrs = scriptAttrs.replace(/\bclient\b/i, "").trim();
           signalScopeId = `stx_scope_${path.basename(includeFilePath, ".stx").replace(/[^a-zA-Z0-9]/g, "_")}_${++scopeIdCounter}`;
-          const resolvedContent = transformStoreImports(scriptContent), tail = `
-  if (!window.stx._scopes) window.stx._scopes = {};
-  window.stx._scopes['${signalScopeId}'] = { __destroyCallbacks: __destroyHooks };
-`, wrapped = wrapClientScript(resolvedContent, tail);
+          const resolvedContent = transformStoreImports(scriptContent), tail = buildScopeRegistrationTail(resolvedContent, signalScopeId), wrapped = wrapClientScript(resolvedContent, tail);
           preservedScript += `${vendorStyleTags}<script data-stx-scoped${extraAttrs ? ` ${extraAttrs}` : ""}>${wrapped}</script>
 `;
         }

package/dist/parser/directive-parser.d.ts

@@ -11,6 +11,21 @@ export declare function extractParenthesizedExpression(source: string, startPos:
   endPos: number
 } | null;
 export declare function extractParenthesizedExpressionDetailed(source: string, startPos: number): ExtractParenResult;
+/**
+ * Whether `pos` in `source` falls INSIDE an HTML tag (`<...>`) — i.e. the nearest
+ * angle bracket looking backwards is an unclosed `<`.
+ *
+ * Directive tokens (`@if`/`@elseif`/`@else`/`@endif`) only ever occur in text
+ * content, never inside a tag. The reactive-signal pass, however, rewrites a
+ * NESTED reactive conditional into HTML-attribute markers BEFORE this server pass
+ * runs — e.g. `@if (isPro())A@else B@endif` becomes
+ * `<template @if="isPro()">A</template><template @else>B</template>`. Without this
+ * guard the branch scanner matches that `@else` ATTRIBUTE as the enclosing server
+ * `@if`'s top-level `@else`, mismatching branch/`@endif` boundaries and corrupting
+ * the rest of the template. Skipping tag-interior tokens keeps the two passes from
+ * disagreeing on what is a directive.
+ */
+export declare function isInsideTag(source: string, pos: number): boolean;
 /**
  * Find the matching end tag for a directive, handling nested instances
  *

package/dist/parser/directive-parser.js

@@ -14,6 +14,12 @@ export function extractParenthesizedExpressionDetailed(source, startPos) {
     return { ok: !1, reason: "unclosed-paren", pos };
   return { ok: !0, expression: source.slice(pos + 1, closePos), endPos: closePos + 1 };
 }
+export function isInsideTag(source, pos) {
+  const lastOpen = source.lastIndexOf("<", pos);
+  if (lastOpen === -1)
+    return !1;
+  return lastOpen > source.lastIndexOf(">", pos);
+}
 export function findMatchingEndTag(source, startName, endName, startPos) {
   let depth = 1, pos = startPos;
   const openPattern = new RegExp(`@${startName}\\s*\\(`, "g"), closePattern = new RegExp(`@${endName}(?![a-z])`, "g");
@@ -52,6 +58,10 @@ export function parseConditionalBlock(source, startPos) {
       break;
     currentPos = atIdx;
     const remaining = fullContent.substring(atIdx);
+    if (isInsideTag(fullContent, atIdx)) {
+      currentPos++;
+      continue;
+    }
     if (/^@if\s*\(/.test(remaining)) {
       nestedDepth++;
       currentPos++;