@vesk/vesk-cli 0.2.29 → 0.2.31

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
@@ -52411,6 +52444,24 @@ function countFilesNamed(dir, name) {
   }
   return n;
 }
+function cachedSsrCompile(cache2, src2, filePath) {
+  const compileHydrate = (source) => {
+    resetVskState(true);
+    return compileFile(source, { sourcePath: filePath });
+  };
+  const st = statSync21(filePath, { throwIfNoEntry: false });
+  if (st) {
+    const cur = cache2.get(filePath);
+    if (cur && cur.mtimeMs === st.mtimeMs && cur.size === st.size) return cur.result;
+    const result = compileHydrate(src2);
+    cache2.set(filePath, { mtimeMs: st.mtimeMs, size: st.size, result });
+    return result;
+  }
+  return compileHydrate(src2);
+}
+function invalidateSsrCompile(cache2, filePath) {
+  cache2.delete(filePath);
+}
 async function startDevServer(port, projectDir, config, host) {
   const bindHost = host || "127.0.0.1";
   if (!process.env.NODE_ENV) process.env.NODE_ENV = "development";
@@ -52562,6 +52613,7 @@ async function startDevServer(port, projectDir, config, host) {
   let runtimeBundle = "";
   let devBundleBytes = 0;
   const bundleCache = { files: /* @__PURE__ */ new Map() };
+  const ssrCompileCache = /* @__PURE__ */ new Map();
   function runtimeImportNamesFrom(clientJs) {
     const m = clientJs.match(/^import\s*\{([^}]*)\}\s*from\s*['"]\/_vesk\/runtime\.js['"];?\s*$/m);
     if (!m) return null;
@@ -52770,6 +52822,7 @@ async function startDevServer(port, projectDir, config, host) {
   const lastSeenContent = /* @__PURE__ */ new Map();
   let chunkRefresh = Promise.resolve();
   const queueClientChunksRefresh = (fullPath, filename, fileExists) => {
+    invalidateSsrCompile(ssrCompileCache, fullPath);
     chunkRefresh = chunkRefresh.then(async () => {
       try {
         const hot = await buildClientChunks(fullPath);
@@ -53277,7 +53330,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
           try {
             const nfSrc = readFileSync38(nfPath, "utf-8");
             const nfCompName = extractCompName2(nfSrc) || rootNode.notFound;
-            notFoundHtml = await renderFullPage(nfSrc, nfCompName, { params: {}, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, plugins: getActiveDevPlugins() });
+            notFoundHtml = await renderFullPage(nfSrc, nfCompName, { params: {}, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, cached: cachedSsrCompile(ssrCompileCache, nfSrc, nfPath), plugins: getActiveDevPlugins() });
           } catch {
           }
         }
@@ -53322,7 +53375,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
             if (i === chain.length - 1 && node.page && existsSync42(pageFilePath)) {
               const src2 = readFileSync38(pageFilePath, "utf-8");
               const compName = extractCompName2(src2) || node.page;
-              const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath });
+              const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, pageFilePath) });
               body = result.body;
               head = result.head || "";
               props = result.props;
@@ -53330,7 +53383,7 @@ Object.defineProperty(__components, ${JSON.stringify(cname)}, { get: () => __com
             if (node.layout && existsSync42(layoutFilePath)) {
               const src2 = readFileSync38(layoutFilePath, "utf-8");
               const compName = extractCompName2(src2) || node.layout;
-              const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath });
+              const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, layoutFilePath) });
               body = result.body;
               head = (result.head || "") + head;
             }
@@ -53375,7 +53428,7 @@ ${prettifyHtml(body)}
             if (leaf) {
               const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
               const compName = extractCompName2(src2) || leaf.page;
-              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), plugins: getActiveDevPlugins() });
+              html = await renderFullPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
               html = html.replace("</body>", '	<script type="module" src="/_vesk/hmr.js"></script>\n</body>');
               html = await applyHtmlPlugins(html, getActiveDevPlugins(), { sourcePath: url.pathname });
             } else {
@@ -53405,7 +53458,7 @@ ${prettifyHtml(body)}
           if (leaf) {
             const src2 = readFileSync38(resolve38(appDirPath, leaf.sourceDir, "page.vsk"), "utf-8");
             const compName = extractCompName2(src2) || leaf.page;
-            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), plugins: getActiveDevPlugins() });
+            yield* renderPageStream(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, clientScriptUrl: "/_vesk/client.js", cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: resolve38(appDirPath, leaf.sourceDir, "page.vsk"), cached: cachedSsrCompile(ssrCompileCache, src2, resolve38(appDirPath, leaf.sourceDir, "page.vsk")), plugins: getActiveDevPlugins() });
           } else {
             throw new Error("No page or layout matched");
           }
@@ -53421,7 +53474,7 @@ ${prettifyHtml(body)}
           if (i === chain.length - 1 && node.page && existsSync42(pageFilePath)) {
             const src2 = readFileSync38(pageFilePath, "utf-8");
             const compName = extractCompName2(src2) || node.page;
-            const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath });
+            const result = await renderPage(src2, compName, { params: matched.params }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: pageFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, pageFilePath) });
             body = result.body;
             head = result.head || "";
             props = result.props;
@@ -53429,7 +53482,7 @@ ${prettifyHtml(body)}
           if (node.layout && existsSync42(layoutFilePath)) {
             const src2 = readFileSync38(layoutFilePath, "utf-8");
             const compName = extractCompName2(src2) || node.layout;
-            const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath });
+            const result = await renderPage(src2, compName, { children: body }, /* @__PURE__ */ new Map(), { hydrate: true, sourcePath: layoutFilePath, cached: cachedSsrCompile(ssrCompileCache, src2, layoutFilePath) });
             body = result.body;
             head = (result.head || "") + head;
           }
@@ -53569,7 +53622,7 @@ ${prettifyHtml(body)}
                 try {
                   const nfSrc = readFileSync38(nfPath, "utf-8");
                   const nfCompName = extractCompName2(nfSrc) || node.notFound;
-                  const html = await renderFullPage(nfSrc, nfCompName, { params: match.params, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, plugins: getActiveDevPlugins() });
+                  const html = await renderFullPage(nfSrc, nfCompName, { params: match.params, url: url.pathname }, /* @__PURE__ */ new Map(), { hydrate: true, cssUrls: activeCssUrls(), security, externalDataScript: storeDataScript, sourcePath: nfPath, cached: cachedSsrCompile(ssrCompileCache, nfSrc, nfPath), plugins: getActiveDevPlugins() });
                   notFoundHtml = injectDevScripts(html);
                 } catch {
                 }

package/package.json

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