@vesk/vesk-cli 0.2.30 → 0.2.32

package/dist/cli.js

@@ -1619,6 +1619,17 @@ function getInflight() {
   g().__vsk_fetch_inflight = map;
   return map;
 }
+function getServerFailureCache() {
+  const value = g().__vsk_ssr_failure_cache;
+  if (value) return value;
+  const map = /* @__PURE__ */ new Map();
+  g().__vsk_ssr_failure_cache = map;
+  return map;
+}
+function clearFailureCache(key) {
+  if (!isServer()) return;
+  g().__vsk_ssr_failure_cache?.delete(key);
+}
 function getRegistry() {
   const value = g().__vsk_fetch_registry;
   if (value) return value;
@@ -1887,6 +1898,20 @@ function startRequest(handle2, skipCache) {
   const key = handle2.key;
   const options = handle2.options;
   if (isServer()) {
+    const failureTtl = options.failureTtl ?? DEFAULT_FAILURE_TTL;
+    if (!skipCache && failureTtl > 0) {
+      const failed = getServerFailureCache().get(key);
+      if (failed && failed.ttl > 0 && Date.now() - failed.failedAt < failed.ttl) {
+        getSsrFailures()?.set(key, failed.error);
+        settleError(handle2, failed.error);
+        const settled = handle2.settled.then(() => {
+          throw failed.error;
+        });
+        settled.catch(() => {
+        });
+        return settled;
+      }
+    }
     const recorded = !skipCache ? getSsrFailures()?.get(key) : void 0;
     if (recorded !== void 0) {
       settleError(handle2, recorded);
@@ -1905,10 +1930,14 @@ function startRequest(handle2, skipCache) {
       prom2.then(
         (data2) => {
           setSsrData(key, data2, startToken);
+          clearFailureCache(key);
           settle(handle2, data2);
         },
         (error) => {
           getSsrFailures()?.set(key, error);
+          if (isServer() && !isAbortError(error) && failureTtl > 0) {
+            getServerFailureCache().set(key, { error, failedAt: Date.now(), ttl: failureTtl });
+          }
           settleError(handle2, error);
         }
       ).finally(() => {
@@ -2056,7 +2085,10 @@ function createResource(fn, key, into, options = {}) {
   }
   const ssrData = getSsrData(resourceKey);
   if (ssrData !== void 0) {
-    if (isServer()) setSsrData(resourceKey, ssrData);
+    if (isServer()) {
+      setSsrData(resourceKey, ssrData);
+      clearFailureCache(resourceKey);
+    }
     settle(handle2, ssrData);
     writeCache(resourceKey, ssrData);
     return accessor;
@@ -2081,7 +2113,7 @@ async function resolveSsrResources() {
   delete g().__vsk_ssr_failures;
   return data2;
 }
-var HttpError, TimeoutError, g, isServer, ssrSink;
+var HttpError, TimeoutError, g, isServer, ssrSink, DEFAULT_FAILURE_TTL;
 var init_resource = __esm({
   "../runtime/src/resource.ts"() {
     "use strict";
@@ -2106,6 +2138,7 @@ var init_resource = __esm({
     g = () => globalThis;
     isServer = () => !!g().__vsk_ssr;
     ssrSink = null;
+    DEFAULT_FAILURE_TTL = 1e4;
     useFetch.text = (url, options) => useFetch(() => doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {})).then((r) => r.text()), {
       ...options,
       key: options?.key ?? url
@@ -2931,6 +2964,19 @@ ${String(this.root.outerHTML).slice(0, 800)}` : ""),
         }
         return null;
       }
+      insertBeforeNextClaim(node) {
+        let i = this.idx;
+        while (i < this.markers.length && this.markers[i].state === "claimed") i++;
+        const next = i < this.markers.length ? this.markers[i] : null;
+        const host = next && next.comment.parentNode ? next.comment.parentNode : this.root;
+        if (host === null || host === void 0) return false;
+        try {
+          host.insertBefore(node, next ? next.comment : null);
+          return true;
+        } catch {
+          return false;
+        }
+      }
     };
   }
 });
@@ -28403,7 +28449,7 @@ function emitStatic(ctx2, node, tracked2, effectsVar) {
         } else {
           const expr = transformTracked(attr.expression, tracked2);
           const useProp = PROPERTY_ATTRS[node.tag]?.has(target);
-          const eff = useProp ? `effect(() => { ${ssrEl}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v != null && __v !== false) ${ssrEl}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
+          const eff = useProp ? `effect(() => { ${ssrEl}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v == null || __v === false) ${ssrEl}.removeAttribute(${JSON.stringify(target)}); else ${ssrEl}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
           if (effectsVar) {
             ctx2.push(`${effectsVar}.push(${eff});`);
           } else {
@@ -28459,7 +28505,7 @@ function emitStatic(ctx2, node, tracked2, effectsVar) {
     } else {
       const expr = transformTracked(attr.expression, tracked2);
       const useProp = PROPERTY_ATTRS[node.tag]?.has(target);
-      const eff = useProp ? `effect(() => { ${el}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v != null && __v !== false) ${el}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
+      const eff = useProp ? `effect(() => { ${el}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v == null || __v === false) ${el}.removeAttribute(${JSON.stringify(target)}); else ${el}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
       if (effectsVar) {
         ctx2.push(`${effectsVar}.push(${eff});`);
       } else {
@@ -28694,6 +28740,14 @@ function emitComponentCall(ctx2, node, tracked2, effectsVar, parentVar, compPref
   }
   return v;
 }
+function emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, rootLevel) {
+  if (!ctx2.hydrate || !rootLevel) return;
+  ctx2.push(`// Anchor region fences to the SSR slot so no-content regions do not fall back to $root's end.`);
+  ctx2.push(`if (__hydrate && __hydrate.insertBeforeNextClaim) {`);
+  ctx2.push(indent2(`__hydrate.insertBeforeNextClaim(${anchor});`));
+  ctx2.push(indent2(`__hydrate.insertBeforeNextClaim(${endAnchor});`));
+  ctx2.push(`}`);
+}
 function emitTryCatch(ctx2, node, tracked2, effectsVar, parentVar) {
   const anchor = ctx2.n();
   const endAnchor = ctx2.n();
@@ -28704,6 +28758,7 @@ function emitTryCatch(ctx2, node, tracked2, effectsVar, parentVar) {
   if (!ctx2.hydrate) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effArr} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('try-end');`);
+  emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, parent === "$root");
   const asyncKw = ctx2.isAsyncScope ? "await " : "";
   function emitRenderFunc(name, isCatch, hydMode, compPrefix = "__components") {
     const savedHydrate = ctx2.hydrate;
@@ -28790,6 +28845,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
     ctx2.push(`const ${anchor2} = document.createComment('if');`);
     ctx2.push(`let ${effectsVar2} = [];`);
     ctx2.push(`const ${endAnchor2} = document.createComment('if-end');`);
+    emitHydrateFenceAnchoring(ctx2, anchor2, endAnchor2, parent === "$root");
     const asyncKw2 = ctx2.isAsyncScope ? "await " : "";
     const fnOpen2 = ctx2.isAsyncScope ? "async () => {" : "() => {";
     const renderNames = [];
@@ -28872,6 +28928,7 @@ function emitOpaque(ctx2, node, tracked2, effTarget, parentVar) {
   if (!hyd) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('if-end');`);
+  emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, parent === "$root");
   const asyncKw = ctx2.isAsyncScope ? "await " : "";
   const fnOpen = ctx2.isAsyncScope ? "async () => {" : "() => {";
   const conRenderName = ctx2.n();
@@ -28956,6 +29013,7 @@ function emitWhileLoop(ctx2, node, tracked2, parentVar) {
   if (!hyd) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('while-end');`);
+  emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, parent === "$root");
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd) ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
@@ -29018,6 +29076,7 @@ function emitForLoop(ctx2, node, tracked2, parentVar) {
   if (!hyd) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('for-end');`);
+  emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, parent === "$root");
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd) ctx2.push(indent2(`const __p = ${anchor}.parentNode;`));
@@ -29158,6 +29217,7 @@ function emitSwitchBlock(ctx2, node, tracked2, parentVar) {
   if (!hyd) ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('switch-end');`);
+  emitHydrateFenceAnchoring(ctx2, anchor, endAnchor, parent === "$root");
   const renderSwitch = ctx2.n();
   ctx2.push(`const ${renderSwitch} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (hyd) {
@@ -42335,7 +42395,7 @@ function emitStatic2(ctx2, node, tracked2, effectsVar) {
         } else {
           const expr = transformTracked2(attr.expression, tracked2);
           const useProp = PROPERTY_ATTRS2[node.tag]?.has(target);
-          const eff = useProp ? `effect(() => { ${ssrEl}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v != null && __v !== false) ${ssrEl}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
+          const eff = useProp ? `effect(() => { ${ssrEl}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v == null || __v === false) ${ssrEl}.removeAttribute(${JSON.stringify(target)}); else ${ssrEl}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
           if (effectsVar) {
             ctx2.push(`${effectsVar}.push(${eff});`);
           } else {
@@ -42391,7 +42451,7 @@ function emitStatic2(ctx2, node, tracked2, effectsVar) {
     } else {
       const expr = transformTracked2(attr.expression, tracked2);
       const useProp = PROPERTY_ATTRS2[node.tag]?.has(target);
-      const eff = useProp ? `effect(() => { ${el}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v != null && __v !== false) ${el}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
+      const eff = useProp ? `effect(() => { ${el}.${target} = ${expr}; })` : `effect(() => { const __v = ${expr}; if (__v == null || __v === false) ${el}.removeAttribute(${JSON.stringify(target)}); else ${el}.setAttribute(${JSON.stringify(target)}, __v === true ? 'true' : String(__v)); })`;
       if (effectsVar) {
         ctx2.push(`${effectsVar}.push(${eff});`);
       } else {
@@ -42654,6 +42714,15 @@ function emitComponentCall2(ctx2, node, tracked2, effectsVar, parentVar, compPre
   }
   return v;
 }
+function emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, rootLevel) {
+  if (!ctx2.hydrate || !rootLevel)
+    return;
+  ctx2.push(`// Anchor region fences to the SSR slot so no-content regions do not fall back to $root's end.`);
+  ctx2.push(`if (__hydrate && __hydrate.insertBeforeNextClaim) {`);
+  ctx2.push(indent3(`__hydrate.insertBeforeNextClaim(${anchor});`));
+  ctx2.push(indent3(`__hydrate.insertBeforeNextClaim(${endAnchor});`));
+  ctx2.push(`}`);
+}
 function emitTryCatch2(ctx2, node, tracked2, effectsVar, parentVar) {
   const anchor = ctx2.n();
   const endAnchor = ctx2.n();
@@ -42665,6 +42734,7 @@ function emitTryCatch2(ctx2, node, tracked2, effectsVar, parentVar) {
     ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effArr} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('try-end');`);
+  emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, parent === "$root");
   const asyncKw = ctx2.isAsyncScope ? "await " : "";
   function emitRenderFunc(name, isCatch, hydMode, compPrefix = "__components") {
     const savedHydrate = ctx2.hydrate;
@@ -42755,6 +42825,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
     ctx2.push(`const ${anchor2} = document.createComment('if');`);
     ctx2.push(`let ${effectsVar2} = [];`);
     ctx2.push(`const ${endAnchor2} = document.createComment('if-end');`);
+    emitHydrateFenceAnchoring2(ctx2, anchor2, endAnchor2, parent === "$root");
     const asyncKw2 = ctx2.isAsyncScope ? "await " : "";
     const fnOpen2 = ctx2.isAsyncScope ? "async () => {" : "() => {";
     const renderNames = [];
@@ -42846,6 +42917,7 @@ function emitOpaque2(ctx2, node, tracked2, effTarget, parentVar) {
     ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('if-end');`);
+  emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, parent === "$root");
   const asyncKw = ctx2.isAsyncScope ? "await " : "";
   const fnOpen = ctx2.isAsyncScope ? "async () => {" : "() => {";
   const conRenderName = ctx2.n();
@@ -42949,6 +43021,7 @@ function emitWhileLoop2(ctx2, node, tracked2, parentVar) {
     ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('while-end');`);
+  emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, parent === "$root");
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd)
@@ -43022,6 +43095,7 @@ function emitForLoop2(ctx2, node, tracked2, parentVar) {
     ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('for-end');`);
+  emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, parent === "$root");
   const renderLoop = ctx2.n();
   ctx2.push(`const ${renderLoop} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (!hyd)
@@ -43177,6 +43251,7 @@ function emitSwitchBlock2(ctx2, node, tracked2, parentVar) {
     ctx2.push(`${parent}.appendChild(${anchor});`);
   ctx2.push(`let ${effectsVar} = [];`);
   ctx2.push(`const ${endAnchor} = document.createComment('switch-end');`);
+  emitHydrateFenceAnchoring2(ctx2, anchor, endAnchor, parent === "$root");
   const renderSwitch = ctx2.n();
   ctx2.push(`const ${renderSwitch} = ${ctx2.isAsyncScope ? "async () => {" : "() => {"}`);
   if (hyd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "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.30",
-    "@vesk/compiler": "^0.2.30",
-    "@vesk/plugin-tailwind": "^0.2.30",
-    "@vesk/runtime": "^0.2.30",
+    "@vesk/adapter": "^0.2.32",
+    "@vesk/compiler": "^0.2.32",
+    "@vesk/plugin-tailwind": "^0.2.32",
+    "@vesk/runtime": "^0.2.32",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",