@vesk/vesk-cli 0.2.23 → 0.2.24

package/dist/cli.js

@@ -2018,6 +2018,7 @@ function createResource(fn, key, into, options = {}) {
   }
   const ssrData = getSsrData(resourceKey);
   if (ssrData !== void 0) {
+    if (isServer()) setSsrData(resourceKey, ssrData);
     settle(handle2, ssrData);
     writeCache(resourceKey, ssrData);
     return accessor;
@@ -2834,6 +2835,11 @@ function isRouteHref(href) {
 function setIsHydrating(v) {
   __isHydrating = v;
 }
+function captureInitialScroll() {
+  if (typeof window === "undefined") return;
+  _initialSavedScroll = window.scrollY || 0;
+  _initialScrollRestored = false;
+}
 function setIsPopStateNavigation(v) {
   _isPopStateNavigation = v;
 }
@@ -2892,16 +2898,22 @@ function showLoadingInContainer(container, loadingFn, params) {
     container.innerHTML = loadingContent;
   }
 }
-function handleScroll(pathname, isReplace) {
+function handleScroll(pathname, isReplace, scrollBehavior) {
   if (typeof window === "undefined" || typeof window.scrollTo !== "function") return;
+  const behavior = scrollBehavior === "smooth" || scrollBehavior === "instant" ? scrollBehavior : "auto";
   if (_isPopStateNavigation) {
     setIsPopStateNavigation(false);
     const savedY = _scrollPositions.get(pathname);
     requestAnimationFrame(() => {
-      window.scrollTo(0, savedY !== void 0 ? savedY : 0);
+      window.scrollTo({ top: savedY !== void 0 ? savedY : 0, behavior });
+    });
+  } else if (isReplace && !_initialScrollRestored) {
+    _initialScrollRestored = true;
+    requestAnimationFrame(() => {
+      window.scrollTo({ top: _initialSavedScroll, behavior });
     });
   } else if (!isReplace) {
-    requestAnimationFrame(() => window.scrollTo(0, 0));
+    requestAnimationFrame(() => window.scrollTo({ top: 0, behavior }));
   }
 }
 function applyHead(headHtml) {
@@ -2986,7 +2998,7 @@ function Link(props, registry, hydrate) {
       e.preventDefault();
       e.stopPropagation();
       const nav = useNavigate();
-      nav(href);
+      nav(href, { scrollBehavior: props.scrollBehavior });
     });
     return claimed ? document.createDocumentFragment() : a2;
   }
@@ -3018,7 +3030,7 @@ function Link(props, registry, hydrate) {
     e.preventDefault();
     e.stopPropagation();
     const nav = useNavigate();
-    nav(href);
+    nav(href, { scrollBehavior: props.scrollBehavior });
   });
   return a;
 }
@@ -3058,7 +3070,7 @@ function NavLink(props, registry, hydrate) {
       e.preventDefault();
       e.stopPropagation();
       const nav = useNavigate();
-      nav(props.href);
+      nav(props.href, { scrollBehavior: props.scrollBehavior });
     });
     const path2 = usePathname();
     const routeHref2 = routeHrefOf(props.href);
@@ -3088,7 +3100,7 @@ function NavLink(props, registry, hydrate) {
         e.preventDefault();
         e.stopPropagation();
         const nav = useNavigate();
-        nav(props.href);
+        nav(props.href, { scrollBehavior: props.scrollBehavior });
       });
       const path2 = usePathname();
       const routeHref2 = routeHrefOf(props.href);
@@ -3210,7 +3222,7 @@ function useRouter() {
     }
   };
 }
-var Redirect, NotFoundError, RouterCtx, _currentRouter, _outletId, __isHydrating, _state, _scrollPositions, _isPopStateNavigation, HEAD_MARKER;
+var Redirect, NotFoundError, RouterCtx, _currentRouter, _outletId, __isHydrating, _state, _scrollPositions, _isPopStateNavigation, _initialScrollRestored, _initialSavedScroll, HEAD_MARKER;
 var init_router_components = __esm({
   "../runtime/src/router-components.ts"() {
     "use strict";
@@ -3245,6 +3257,8 @@ var init_router_components = __esm({
     };
     _scrollPositions = /* @__PURE__ */ new Map();
     _isPopStateNavigation = false;
+    _initialScrollRestored = false;
+    _initialSavedScroll = 0;
     HEAD_MARKER = "data-vesk-head";
   }
 });
@@ -4303,6 +4317,7 @@ function createRouter(routes, options = {}) {
     start() {
       setCurrentRouter(this);
       if (typeof window !== "undefined" && "scrollRestoration" in window.history) {
+        captureInitialScroll();
         window.history.scrollRestoration = "manual";
       }
       if (typeof window !== "undefined" && typeof window.addEventListener === "function") {
@@ -4416,7 +4431,7 @@ function createRouter(routes, options = {}) {
           }
           this._currentMatch = match;
           clearOfflineFlag(this, container);
-          handleScroll(url.pathname, opts.replace);
+          handleScroll(url.pathname, opts.replace, opts.scrollBehavior);
         };
         const swapView = (fn) => {
           const d = document;
@@ -4625,6 +4640,7 @@ function createFileRouter(routeTree, options = {}) {
     start() {
       setCurrentRouter(this);
       if (typeof window !== "undefined" && "scrollRestoration" in window.history) {
+        captureInitialScroll();
         window.history.scrollRestoration = "manual";
       }
       if (typeof window !== "undefined" && typeof window.addEventListener === "function") {
@@ -4768,7 +4784,7 @@ function createFileRouter(routeTree, options = {}) {
           }
           router._currentMatch = match;
           clearOfflineFlag(router, container);
-          handleScroll(url.pathname, opts.replace);
+          handleScroll(url.pathname, opts.replace, opts.scrollBehavior);
         };
         const doRender = () => {
           navDebug("doRender", url.pathname, "token=" + navToken);
@@ -27909,7 +27925,10 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
       const cl = ctx2.n();
       ctx2.push(indent2(`const ${cl} = [];`));
       for (const n of chain[i].nodes) {
+        const savedClaim = ctx2.claimStatic;
+        if (hyd) ctx2.claimStatic = true;
         const v = emitNode(ctx2, n, tracked2, effectsVar2, parentVar);
+        ctx2.claimStatic = savedClaim;
         if (v) ctx2.push(indent2(`${cl}.push(${v});`));
       }
       ctx2.push(indent2(`__place(${anchor2}, ${endAnchor2}, ${cl}, ${parent});`));
@@ -27922,7 +27941,10 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
       const cl2 = ctx2.n();
       ctx2.push(indent2(`const ${cl2} = [];`));
       for (const n of finalElse) {
+        const savedClaim = ctx2.claimStatic;
+        if (hyd) ctx2.claimStatic = true;
         const v = emitNode(ctx2, n, tracked2, effectsVar2, parentVar);
+        ctx2.claimStatic = savedClaim;
         if (v) ctx2.push(indent2(`${cl2}.push(${v});`));
       }
       ctx2.push(indent2(`__place(${anchor2}, ${endAnchor2}, ${cl2}, ${parent});`));
@@ -27932,16 +27954,16 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
     for (let i = 1; i < chain.length; i++) init += ` else if (${chain[i].cond}) { ${asyncKw2}${renderNames[i]}(); }`;
     if (finalRender) init += ` else { ${asyncKw2}${finalRender}(); }`;
     ctx2.push(init);
-    let branchInit;
-    if (chain.length === 1 && finalRender) branchInit = `(${chain[0].cond} ? 0 : 1)`;
-    else if (chain.length === 2 && finalRender) branchInit = `(${chain[0].cond} ? 0 : (${chain[1].cond} ? 1 : 2))`;
-    else if (chain.length === 2 && !finalRender) branchInit = `(${chain[0].cond} ? 0 : (${chain[1].cond} ? 1 : -1))`;
-    else branchInit = `(${chain[0].cond} ? 0 : -1)`;
+    let branchInitFallback = finalRender ? `${chain.length}` : "-1";
+    for (let i = chain.length - 1; i >= 0; i--) {
+      branchInitFallback = `(${chain[i].cond} ? ${i} : ${branchInitFallback})`;
+    }
+    const branchInit = `(${branchInitFallback})`;
     let effInner = `if (__new === 0) { ${asyncKw2}${renderNames[0]}(); }`;
     for (let i = 1; i < chain.length; i++) effInner += ` else if (__new === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
     if (finalRender) effInner += ` else { ${asyncKw2}${finalRender}(); }`;
     const effBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-        if (__first) { __first = false; return; }
+        if (__first) { __first = false; __iv = ${branchInit}; return; }
         const __new = ${branchInit};
         if (__new !== __iv) {
           for (const e of ${effectsVar2}) destroy_block(e);
@@ -27984,7 +28006,10 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
   if (!hyd) ctx2.push(indent2(`const ${conFrag} = document.createDocumentFragment();`));
   if (hyd) ctx2.push(indent2(`const __cl = [];`));
   for (const n of node.consequentNodes) {
+    const savedClaim = ctx2.claimStatic;
+    if (hyd) ctx2.claimStatic = true;
     const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : conFrag);
+    ctx2.claimStatic = savedClaim;
     if (v) {
       if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
       else ctx2.push(indent2(`${conFrag}.appendChild(${v});`));
@@ -28002,7 +28027,10 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
     if (!hyd) ctx2.push(indent2(`const ${altFrag} = document.createDocumentFragment();`));
     if (hyd) ctx2.push(indent2(`const __cl = [];`));
     for (const n of node.alternateNodes) {
+      const savedAltClaim = ctx2.claimStatic;
+      if (hyd) ctx2.claimStatic = true;
       const v = emitNode(ctx2, n, tracked2, effectsVar, hyd ? parentVar : altFrag);
+      ctx2.claimStatic = savedAltClaim;
       if (v) {
         if (hyd) ctx2.push(indent2(`__cl.push(${v});`));
         else ctx2.push(indent2(`${altFrag}.appendChild(${v});`));
@@ -29064,16 +29092,20 @@ function opaqueRegionToJS(node, isAsync = false, tracked2) {
   const lines = [];
   const cond = exprJSX(node.condition, tracked2);
   lines.push(`if (${cond}) {`);
+  setVskForceClaim(true);
   for (const n of node.consequentNodes) {
     const code = irNodeToJS(n, null, isAsync, tracked2);
     if (code) lines.push(indent(code));
   }
+  setVskForceClaim(false);
   if (node.alternateNodes.length > 0) {
     lines.push(`} else {`);
+    setVskForceClaim(true);
     for (const n of node.alternateNodes) {
       const code = irNodeToJS(n, null, isAsync, tracked2);
       if (code) lines.push(indent(code));
     }
+    setVskForceClaim(false);
   }
   lines.push(`}`);
   return lines.join("\n");
@@ -41549,7 +41581,11 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
       const cl = ctx2.n();
       ctx2.push(indent3(`const ${cl} = [];`));
       for (const n of chain[i].nodes) {
+        const savedClaim = ctx2.claimStatic;
+        if (hyd)
+          ctx2.claimStatic = true;
         const v = emitNode2(ctx2, n, tracked2, effectsVar2, parentVar);
+        ctx2.claimStatic = savedClaim;
         if (v)
           ctx2.push(indent3(`${cl}.push(${v});`));
       }
@@ -41563,7 +41599,11 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
       const cl2 = ctx2.n();
       ctx2.push(indent3(`const ${cl2} = [];`));
       for (const n of finalElse) {
+        const savedClaim = ctx2.claimStatic;
+        if (hyd)
+          ctx2.claimStatic = true;
         const v = emitNode2(ctx2, n, tracked2, effectsVar2, parentVar);
+        ctx2.claimStatic = savedClaim;
         if (v)
           ctx2.push(indent3(`${cl2}.push(${v});`));
       }
@@ -41576,22 +41616,18 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
     if (finalRender)
       init += ` else { ${asyncKw2}${finalRender}(); }`;
     ctx2.push(init);
-    let branchInit;
-    if (chain.length === 1 && finalRender)
-      branchInit = `(${chain[0].cond} ? 0 : 1)`;
-    else if (chain.length === 2 && finalRender)
-      branchInit = `(${chain[0].cond} ? 0 : (${chain[1].cond} ? 1 : 2))`;
-    else if (chain.length === 2 && !finalRender)
-      branchInit = `(${chain[0].cond} ? 0 : (${chain[1].cond} ? 1 : -1))`;
-    else
-      branchInit = `(${chain[0].cond} ? 0 : -1)`;
+    let branchInitFallback = finalRender ? `${chain.length}` : "-1";
+    for (let i = chain.length - 1; i >= 0; i--) {
+      branchInitFallback = `(${chain[i].cond} ? ${i} : ${branchInitFallback})`;
+    }
+    const branchInit = `(${branchInitFallback})`;
     let effInner = `if (__new === 0) { ${asyncKw2}${renderNames[0]}(); }`;
     for (let i = 1; i < chain.length; i++)
       effInner += ` else if (__new === ${i}) { ${asyncKw2}${renderNames[i]}(); }`;
     if (finalRender)
       effInner += ` else { ${asyncKw2}${finalRender}(); }`;
     const effBody = `effect(${ctx2.isAsyncScope ? "async () => {" : "() => {"}
-        if (__first) { __first = false; return; }
+        if (__first) { __first = false; __iv = ${branchInit}; return; }
         const __new = ${branchInit};
         if (__new !== __iv) {
           for (const e of ${effectsVar2}) destroy_block(e);
@@ -41638,7 +41674,11 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
   if (hyd)
     ctx2.push(indent3(`const __cl = [];`));
   for (const n of node.consequentNodes) {
+    const savedClaim = ctx2.claimStatic;
+    if (hyd)
+      ctx2.claimStatic = true;
     const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : conFrag);
+    ctx2.claimStatic = savedClaim;
     if (v) {
       if (hyd)
         ctx2.push(indent3(`__cl.push(${v});`));
@@ -41663,7 +41703,11 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
     if (hyd)
       ctx2.push(indent3(`const __cl = [];`));
     for (const n of node.alternateNodes) {
+      const savedAltClaim = ctx2.claimStatic;
+      if (hyd)
+        ctx2.claimStatic = true;
       const v = emitNode2(ctx2, n, tracked2, effectsVar, hyd ? parentVar : altFrag);
+      ctx2.claimStatic = savedAltClaim;
       if (v) {
         if (hyd)
           ctx2.push(indent3(`__cl.push(${v});`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.23",
-    "@vesk/compiler": "^0.2.23",
-    "@vesk/plugin-tailwind": "^0.2.23",
-    "@vesk/runtime": "^0.2.23",
+    "@vesk/adapter": "^0.2.24",
+    "@vesk/compiler": "^0.2.24",
+    "@vesk/plugin-tailwind": "^0.2.24",
+    "@vesk/runtime": "^0.2.24",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",