@constela/runtime 2.0.2 → 2.0.4

package/dist/index.js

@@ -15545,10 +15545,23 @@ function renderPortal(node, ctx) {
   });
   return document.createComment("portal");
 }
-function createLocalStateStore(stateDefs) {
+function createLocalStateStore(stateDefs, ctx) {
   const signals = {};
   for (const [name, def] of Object.entries(stateDefs)) {
-    signals[name] = createSignal(def.initial);
+    const initial = def.initial;
+    let initialValue;
+    if (initial && typeof initial === "object" && "expr" in initial) {
+      const evalCtx = {
+        state: ctx.state,
+        locals: ctx.locals
+      };
+      if (ctx.route) evalCtx.route = ctx.route;
+      if (ctx.imports) evalCtx.imports = ctx.imports;
+      initialValue = evaluate(initial, evalCtx);
+    } else {
+      initialValue = initial;
+    }
+    signals[name] = createSignal(initialValue);
   }
   return {
     get(name) {
@@ -15622,7 +15635,7 @@ function createStateWithLocalState(globalState, localStore) {
   };
 }
 function renderLocalState(node, ctx) {
-  const localStore = createLocalStateStore(node.state);
+  const localStore = createLocalStateStore(node.state, ctx);
   const mergedLocals = createLocalsWithLocalState(ctx.locals, localStore);
   const mergedState = createStateWithLocalState(ctx.state, localStore);
   const mergedActions = { ...ctx.actions };
@@ -15877,10 +15890,23 @@ function createReactiveLocals2(baseLocals, itemSignal, indexSignal, itemName, in
     }
   });
 }
-function createLocalStateStore2(stateDefs) {
+function createLocalStateStore2(stateDefs, ctx) {
   const signals = {};
   for (const [name, def] of Object.entries(stateDefs)) {
-    signals[name] = createSignal(def.initial);
+    const initial = def.initial;
+    let initialValue;
+    if (initial && typeof initial === "object" && "expr" in initial) {
+      const evalCtx = {
+        state: ctx.state,
+        locals: ctx.locals
+      };
+      if (ctx.route) evalCtx.route = ctx.route;
+      if (ctx.imports) evalCtx.imports = ctx.imports;
+      initialValue = evaluate(initial, evalCtx);
+    } else {
+      initialValue = initial;
+    }
+    signals[name] = createSignal(initialValue);
   }
   return {
     get(name) {
@@ -16059,7 +16085,7 @@ function hydrate(node, domNode, ctx) {
   }
 }
 function hydrateLocalState(node, domNode, ctx) {
-  const localStore = createLocalStateStore2(node.state);
+  const localStore = createLocalStateStore2(node.state, ctx);
   const mergedLocals = createLocalsWithLocalState2(ctx.locals, localStore);
   const mergedState = createStateWithLocalState2(ctx.state, localStore);
   const mergedActions = { ...ctx.actions };
@@ -16141,20 +16167,22 @@ function hydrateElement(node, el, ctx) {
     hydrateChildren(node.children, el, ctx);
   }
 }
-function findSsrIfBranchMarker(parent, beforeNode) {
-  let current = beforeNode ? beforeNode.previousSibling : parent.lastChild;
-  while (current) {
-    if (current.nodeType === Node.COMMENT_NODE) {
-      const comment2 = current;
-      const text3 = comment2.textContent;
-      if (text3 === "if:then") return { branch: "then", marker: comment2 };
-      if (text3 === "if:else") return { branch: "else", marker: comment2 };
-      if (text3 === "if:none") return { branch: "none", marker: comment2 };
+function collectIfMarkers(parent) {
+  const markers = [];
+  for (let i = 0; i < parent.childNodes.length; i++) {
+    const child = parent.childNodes[i];
+    if (child.nodeType === Node.COMMENT_NODE) {
+      const text3 = child.textContent;
+      if (text3 === "if:then") {
+        markers.push({ branch: "then", marker: child });
+      } else if (text3 === "if:else") {
+        markers.push({ branch: "else", marker: child });
+      } else if (text3 === "if:none") {
+        markers.push({ branch: "none", marker: child });
+      }
     }
-    if (current.nodeType === Node.ELEMENT_NODE) break;
-    current = current.previousSibling;
   }
-  return null;
+  return markers;
 }
 function hydrateChildren(children, parent, ctx) {
   const domChildren = [];
@@ -16164,6 +16192,8 @@ function hydrateChildren(children, parent, ctx) {
       domChildren.push(child);
     }
   }
+  const ifMarkers = collectIfMarkers(parent);
+  let ifMarkerIndex = 0;
   let domIndex = 0;
   for (let i = 0; i < children.length; i++) {
     const childNode = children[i];
@@ -16198,14 +16228,15 @@ function hydrateChildren(children, parent, ctx) {
         ...ctx.route && { route: ctx.route }
       });
       const clientBranch = Boolean(clientCondition) ? "then" : ifNode.else ? "else" : "none";
-      const domChild = domChildren[domIndex];
-      const ssrInfo = findSsrIfBranchMarker(parent, domChild || null);
+      const ssrInfo = ifMarkerIndex < ifMarkers.length ? ifMarkers[ifMarkerIndex] : null;
+      ifMarkerIndex++;
       const ssrBranch = ssrInfo?.branch ?? null;
       const ssrHasDom = ssrBranch === "then" || ssrBranch === "else";
       if (ssrInfo?.marker) {
         ssrInfo.marker.remove();
       }
-      if (ssrHasDom && domChild) {
+      if (ssrHasDom && domChildren[domIndex]) {
+        const domChild = domChildren[domIndex];
         hydrateIf(ifNode, domChild, ctx, { ssrBranch, clientBranch });
         domIndex++;
       } else if (ssrBranch === "none") {
@@ -16214,6 +16245,7 @@ function hydrateChildren(children, parent, ctx) {
         });
       } else {
         const hasDomForIf = Boolean(clientCondition) || Boolean(ifNode.else);
+        const domChild = domChildren[domIndex];
         if (hasDomForIf && domChild) {
           hydrate(childNode, domChild, ctx);
           domIndex++;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/runtime",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Runtime DOM renderer for Constela UI framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,7 +29,7 @@
     "tsup": "^8.0.0",
     "typescript": "^5.3.0",
     "vitest": "^2.0.0",
-    "@constela/server": "14.0.2"
+    "@constela/server": "14.0.3"
   },
   "peerDependencies": {
     "@constela/ai": "3.0.2"