@vesk/vesk-cli 0.2.50-canary.4 → 0.2.50-canary.6

package/dist/cli.js

@@ -399,6 +399,13 @@ var init_ir = __esm({
       importedNames;
       staticProps;
       loadFn;
+      /**
+       * Source of `export const metadata = defineMetadata({...})`, when present.
+       * Static by construction: evaluated with only `defineMetadata` in scope, at
+       * build time where possible and in a sealed sandbox at request time
+       * otherwise, so the head never depends on the component's frame.
+       */
+      metadataSource;
       topLevelCode;
       /**
        * Same-file specifier exports (`export { A }`, `export { A as B }`) as
@@ -1966,8 +1973,16 @@ function writeCache(key, data2) {
   const entry = getClientCache().get(key);
   if (!entry || entry.data !== data2) getClientCache().set(key, { data: data2, fetchedAt: Date.now() });
 }
-function trackSsrPromise(promise) {
+function trackSsrPromise(promise, defer = false) {
   const tk = g().__vsk_ssr_token || "";
+  if (defer) {
+    const deferredKey = tk ? `__vsk_ssr_deferred_${tk}` : "__vsk_ssr_deferred";
+    if (!g()[deferredKey]) g()[deferredKey] = [];
+    g()[deferredKey].push(promise);
+    promise.then(void 0, () => {
+    });
+    return;
+  }
   const promisesKey = tk ? `__vsk_ssr_promises_${tk}` : "__vsk_ssr_promises";
   if (!g()[promisesKey]) g()[promisesKey] = [];
   g()[promisesKey].push(promise);
@@ -2034,7 +2049,7 @@ function startRequest(handle2, skipCache) {
     } else {
       attachSettle(handle2, prom2);
     }
-    trackSsrPromise(prom2);
+    trackSsrPromise(prom2, options.ssr === "defer");
     return prom2;
   }
   if (!skipCache && options.staleTime && options.staleTime > 0) {
@@ -21292,6 +21307,7 @@ function generateIR(ast, source, filename) {
   const importedNames = /* @__PURE__ */ new Set();
   let staticProps = null;
   let loadFn = null;
+  let metadataSource = null;
   const topLevelCode = [];
   const exportAliases = [];
   const reexportSources = [];
@@ -21327,6 +21343,14 @@ function generateIR(ast, source, filename) {
           continue;
         }
       }
+      if (node.type === "ExportNamedDeclaration" && node.declaration && !metadataSource) {
+        const decl = node.declaration;
+        const first = decl.type === "VariableDeclaration" ? decl.declarations[0] : null;
+        if (first?.id?.name === "metadata") {
+          metadataSource = first.init ? stripCodeTypes(getSource(source, first.init)) : null;
+          continue;
+        }
+      }
       if (node.type === "ExportNamedDeclaration" && node.declaration && !loadFn) {
         const decl = node.declaration;
         const fnName = decl.type === "FunctionDeclaration" ? decl.id?.name : decl.type === "VariableDeclaration" ? decl.declarations[0]?.id?.name : null;
@@ -21543,7 +21567,9 @@ function generateIR(ast, source, filename) {
         imports.push(`import { ${missing.join(", ")} } from '@vesk/runtime';`);
       }
     }
-    return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode, exportAliases, reexportSources);
+    const irRoot = new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode, exportAliases, reexportSources);
+    irRoot.metadataSource = metadataSource;
+    return irRoot;
   } finally {
     currentVskNamespaceLocals = prevNamespaceLocals;
     currentSourceFile = prevSourceFile;
@@ -22836,18 +22862,20 @@ function webhook(options) {
     secret,
     handler,
     headerName = "x-webhook-signature",
-    signaturePrefix = "sha256="
+    signaturePrefix = "sha256=",
+    algorithm = "SHA-256",
+    signedPayload
   } = options;
   if (!secret) throw new Error("webhook() requires a secret");
   if (!handler) throw new Error("webhook() requires a handler function");
-  async function computeSignature(body) {
+  async function computeSignature(payload) {
     const key = typeof secret === "string" ? new TextEncoder().encode(secret) : secret;
-    const data2 = typeof body === "string" ? new TextEncoder().encode(body) : body;
+    const data2 = new TextEncoder().encode(payload);
     const crypto2 = globalThis.crypto;
     if (!crypto2?.subtle) {
       throw new Error("Web Crypto API not available (required for webhook signature verification)");
     }
-    return crypto2.subtle.importKey("raw", key, { name: "HMAC", hash: "SHA-256" }, false, ["sign"]).then((k) => crypto2.subtle.sign("HMAC", k, data2)).then((sig) => {
+    return crypto2.subtle.importKey("raw", key, { name: "HMAC", hash: algorithm }, false, ["sign"]).then((k) => crypto2.subtle.sign("HMAC", k, data2)).then((sig) => {
       const hex = Array.from(new Uint8Array(sig)).map((b) => b.toString(16).padStart(2, "0")).join("");
       return hex;
     });
@@ -22867,7 +22895,25 @@ function webhook(options) {
       });
     }
     const body = await request.text();
-    const expectedSig = await computeSignature(body);
+    let parsed;
+    try {
+      parsed = JSON.parse(body);
+    } catch {
+      parsed = body;
+    }
+    const event = parsed;
+    let payload = body;
+    if (signedPayload) {
+      try {
+        payload = signedPayload(event);
+      } catch {
+        return new Response(JSON.stringify({ error: "Invalid signature" }), {
+          status: 401,
+          headers: { "Content-Type": "application/json" }
+        });
+      }
+    }
+    const expectedSig = await computeSignature(payload);
     const prefixLen = signaturePrefix.length;
     const providedSig = signature.startsWith(signaturePrefix) ? signature.slice(prefixLen) : signature;
     if (providedSig.length !== expectedSig.length) {
@@ -22886,12 +22932,6 @@ function webhook(options) {
         headers: { "Content-Type": "application/json" }
       });
     }
-    let event;
-    try {
-      event = JSON.parse(body);
-    } catch {
-      event = body;
-    }
     return handler(event, request);
   }
   return webhookHandler;
@@ -26614,6 +26654,177 @@ var init_action = __esm({
   }
 });
 
+// ../runtime/src/metadata.ts
+function assertPlainObject(value, where) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(`defineMetadata: ${where} must be a plain object, got ${Array.isArray(value) ? "an array" : typeof value}`);
+  }
+  return value;
+}
+function defineMetadata(input) {
+  const meta = assertPlainObject(input, "the argument");
+  if ("title" in meta && meta.title !== void 0) {
+    if (typeof meta.title !== "string" && typeof meta.title !== "object") {
+      throw new Error("defineMetadata: `title` must be a string or { default, template }");
+    }
+    if (typeof meta.title === "object") {
+      const t = assertPlainObject(meta.title, "`title`");
+      for (const key of Object.keys(t)) {
+        if (key !== "default" && key !== "template" && key !== "absolute") {
+          throw new Error(`defineMetadata: unknown \`title.${key}\` (expected default, template or absolute)`);
+        }
+      }
+    }
+  }
+  if ("description" in meta && meta.description !== void 0 && typeof meta.description !== "string") {
+    throw new Error("defineMetadata: `description` must be a string");
+  }
+  for (const key of ["openGraph", "twitter"]) {
+    if (key in meta && meta[key] !== void 0) assertPlainObject(meta[key], `\`${key}\``);
+  }
+  if ("alternates" in meta && meta.alternates !== void 0) {
+    const alt = assertPlainObject(meta.alternates, "`alternates`");
+    for (const key of Object.keys(alt)) {
+      if (key !== "canonical" && key !== "languages") {
+        throw new Error(`defineMetadata: unknown \`alternates.${key}\` (expected canonical or languages)`);
+      }
+    }
+  }
+  for (const key of Object.keys(meta)) {
+    if (!KNOWN_KEYS.has(key)) {
+      throw new Error(
+        `defineMetadata: unknown key "${key}". Known keys: ${[...KNOWN_KEYS].join(", ")}. (\`openGraph\` carries og:* tags, not top-level \`ogTitle\`.)`
+      );
+    }
+  }
+  return meta;
+}
+function resolveTitle(meta, child) {
+  if (!meta || meta.title === void 0 || meta.title === null) return null;
+  if (typeof meta.title === "string") return meta.title;
+  if (meta.title.absolute) return meta.title.absolute;
+  if (meta.title.default) return meta.title.default;
+  if (meta.title.template && child) {
+    const childTitle = resolveTitle(child);
+    return childTitle === null ? null : meta.title.template.replace("%s", childTitle);
+  }
+  return null;
+}
+function mergeMetadata(...sources) {
+  const out = {};
+  let template;
+  let sawTemplate = false;
+  for (const source of sources) {
+    if (!source) continue;
+    for (const [key, value] of Object.entries(source)) {
+      if (value === void 0) continue;
+      if (key === "openGraph" || key === "twitter") {
+        out[key] = { ...out[key] || {}, ...value };
+        continue;
+      }
+      if (key === "title") {
+        if (value && typeof value === "object" && value.template) {
+          sawTemplate = true;
+          template = value.template || template;
+        }
+        out.title = value;
+        continue;
+      }
+      out[key] = value;
+    }
+  }
+  if (sawTemplate && out.title !== void 0) {
+    const own = out.title;
+    if (typeof own === "string") out.title = { absolute: own };
+    else if (own && typeof own === "object" && own.template) {
+      out.title = { default: own.default, template: own.template || template };
+    } else if (own && typeof own === "object") {
+      out.title = { ...own, template };
+    }
+  }
+  return out;
+}
+function escapeAttr2(value) {
+  return String(value).split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;").split('"').join("&quot;");
+}
+function escapeText(value) {
+  return String(value).split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;");
+}
+function metadataToHtml(meta, opts = {}) {
+  if (!meta) return "";
+  const lines = [];
+  const title = resolveTitle(meta, opts.child);
+  if (title !== null) lines.push(`<title data-vesk-head>${escapeText(title)}</title>`);
+  if (typeof meta.description === "string" && meta.description.length > 0) {
+    lines.push(`<meta name="description" content="${escapeAttr2(meta.description)}" data-vesk-head />`);
+  }
+  if (meta.robots) {
+    const content = typeof meta.robots === "string" ? meta.robots : Object.entries(meta.robots).filter(([, on]) => on).map(([k]) => k).join(", ");
+    if (content) lines.push(`<meta name="robots" content="${escapeAttr2(content)}" data-vesk-head />`);
+  }
+  if (meta.themeColor) {
+    lines.push(`<meta name="theme-color" content="${escapeAttr2(meta.themeColor)}" data-vesk-head />`);
+  }
+  const og = meta.openGraph;
+  if (og) {
+    const ogTitle = resolveTitle(og) ?? title;
+    const ogFields = [
+      ["og:title", ogTitle],
+      ["og:description", og.description ?? meta.description],
+      ["og:url", og.url],
+      ["og:site_name", og.siteName],
+      ["og:image", og.image],
+      ["og:type", og.type]
+    ];
+    for (const [prop, value] of ogFields) {
+      if (value === void 0 || value === null || value === "") continue;
+      lines.push(`<meta property="${prop}" content="${escapeAttr2(value)}" data-vesk-head />`);
+    }
+  }
+  const tw = meta.twitter;
+  if (tw) {
+    const twFields = [
+      ["twitter:card", tw.card],
+      ["twitter:site", tw.site],
+      ["twitter:title", resolveTitle(tw) ?? title],
+      ["twitter:description", tw.description ?? meta.description],
+      ["twitter:image", tw.image]
+    ];
+    for (const [name, value] of twFields) {
+      if (value === void 0 || value === null || value === "") continue;
+      lines.push(`<meta name="${name}" content="${escapeAttr2(value)}" data-vesk-head />`);
+    }
+  }
+  const alt = meta.alternates;
+  if (alt) {
+    if (typeof alt === "object" && typeof alt.canonical === "string") {
+      lines.push(`<link rel="canonical" href="${escapeAttr2(alt.canonical)}" data-vesk-head />`);
+    }
+    const languages = alt.languages;
+    if (languages && typeof languages === "object") {
+      for (const [lang, href] of Object.entries(languages)) {
+        lines.push(`<link rel="alternate" hreflang="${escapeAttr2(lang)}" href="${escapeAttr2(href)}" data-vesk-head />`);
+      }
+    }
+  }
+  return lines.join("\n");
+}
+var KNOWN_KEYS;
+var init_metadata = __esm({
+  "../runtime/src/metadata.ts"() {
+    "use strict";
+    KNOWN_KEYS = /* @__PURE__ */ new Set([
+      "title",
+      "description",
+      "robots",
+      "openGraph",
+      "twitter",
+      "alternates",
+      "themeColor"
+    ]);
+  }
+});
+
 // ../runtime/src/index-server.ts
 var index_server_exports = {};
 __export(index_server_exports, {
@@ -26675,6 +26886,7 @@ __export(index_server_exports, {
   custom: () => custom,
   defineAction: () => defineAction,
   defineHook: () => defineHook,
+  defineMetadata: () => defineMetadata,
   defineRoute: () => defineRoute,
   derived: () => derived,
   destroy_block: () => destroy_block,
@@ -26702,6 +26914,8 @@ __export(index_server_exports, {
   leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
+  mergeMetadata: () => mergeMetadata,
+  metadataToHtml: () => metadataToHtml,
   minLength: () => minLength,
   mutate: () => mutate,
   notFound: () => notFound,
@@ -26722,6 +26936,7 @@ __export(index_server_exports, {
   required: () => required,
   rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
+  resolveTitle: () => resolveTitle,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
   revalidatePath: () => revalidatePath,
@@ -26786,6 +27001,7 @@ var init_index_server = __esm({
     init_primitive();
     init_loading_indicator();
     init_action();
+    init_metadata();
   }
 });
 
@@ -31410,6 +31626,17 @@ function irNodeToHeadHtml(node, ctx2, reconcileable = false) {
   }
   return "";
 }
+function renderStaticMetadataHtml(source) {
+  if (!source) return "";
+  try {
+    const fn = new Function("defineMetadata", "return (" + source + ")");
+    const meta = fn(defineMetadata);
+    return metadataToHtml(meta);
+  } catch (e) {
+    console.error("vesk: static metadata could not be evaluated:", e instanceof Error ? e.message : e);
+    return "";
+  }
+}
 function renderHeadHtml(comp, props = {}, scope2 = {}) {
   const tracked2 = collectTrackedNames(comp.body);
   const needed = headNeededNames(comp);
@@ -31577,6 +31804,7 @@ var init_server_head = __esm({
     init_scan();
     init_parser();
     init_client_codegen();
+    init_metadata();
     headRuntimeShims = () => ({
       track: (init) => headCell(init),
       derived: (fn) => headCell(typeof fn === "function" ? fn() : fn),
@@ -32244,6 +32472,7 @@ function compileFile(source, options) {
   const owners = new VskComponentOwners();
   const result = compileFileInternal(source, options?.sourcePath, /* @__PURE__ */ new Set(), owners);
   owners.report("SSR");
+  result.metadataSource = result.ir.metadataSource || null;
   return result;
 }
 function compileFileInternal(source, sourcePath2, seenImportFiles, owners) {
@@ -32346,6 +32575,7 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
   if (!renderFn) throw new Error(`Component "${componentName}" not found in source`);
   const fullRegistry = new Map([...registry, ...componentMap]);
   const targetComp = ir.components.find((c) => c.name === componentName);
+  const metadataSource = ir.metadataSource || null;
   const doRender = (ssrProps) => {
     globalThis.__vsk_ssr = true;
     if (!globalThis.__vsk_ssr_token) globalThis.__vsk_ssr_token = Math.random().toString(36).slice(2);
@@ -32364,9 +32594,11 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
         }
         return {
           body: bodyHtml2,
-          // The component's own scope, so head expressions that read an import
-          // resolve (see renderHeadHtml).
-          head: renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk)),
+          // A static `export const metadata` wins: it is evaluated in a sealed
+          // sandbox, so it cannot depend on the component's frame resolving
+          // (the failure mode that shipped an empty <title>). Whatever the
+          // page's `<Head>` adds is appended, not lost.
+          head: [renderStaticMetadataHtml(metadataSource), renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk))].filter(Boolean).join("\n"),
           props: ssrProps
         };
       })();
@@ -32377,7 +32609,10 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
     } finally {
       delete globalThis.__vsk_ssr;
     }
-    const headHtml = targetComp ? renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk)) : "";
+    const headHtml = [
+      renderStaticMetadataHtml(metadataSource),
+      targetComp ? renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk)) : ""
+    ].filter(Boolean).join("\n");
     const pending = globalThis[`__vsk_ssr_promises_${renderToken}`];
     if (pending && pending.length > 0) {
       return (async () => {
@@ -32407,6 +32642,7 @@ function renderPage(source, componentName, props = {}, registry = /* @__PURE__ *
 function clearSsrCells(token) {
   if (!token) return;
   delete globalThis[`__vsk_ssr_promises_${token}`];
+  delete globalThis[`__vsk_ssr_deferred_${token}`];
   delete globalThis[`__vsk_ssr_failures_${token}`];
   dropSsrSlot(token);
   const cells = globalThis.__vsk_ssr_cells;
@@ -32679,6 +32915,7 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
     if (!renderFn) throw new Error(`Component "${componentName}" not found in source`);
     resetVskState(!!options.hydrate, options.markerless !== false);
     const targetComp = ir.components.find((c) => c.name === componentName);
+    const metadataSource = cached?.metadataSource ?? ir.metadataSource ?? null;
     const cssUrls = options.cssUrls || (options.cssUrl ? [options.cssUrl] : []);
     const cssLink = cssUrls.map((u) => `	<link rel="stylesheet" href="${u}" />
 `).join("");
@@ -32692,7 +32929,10 @@ function renderPageStream(source, componentName, props = {}, registry = /* @__PU
     }
     let streamHeadHtml = null;
     if (targetComp) {
-      let headHtml = renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk));
+      let headHtml = [
+        renderStaticMetadataHtml(metadataSource),
+        renderHeadHtml(targetComp, ssrProps, scopedVesk(renderFn, __vesk))
+      ].filter(Boolean).join("\n");
       if (options.pageHead) {
         const merged = mergeHeadHtml(options.pageHead, headHtml);
         headHtml = merged.html;
@@ -46657,6 +46897,7 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
     setVskHydrate(false);
   }
   const topLevelCode = transformTopLevelForActions(ir.topLevelCode, "server");
+  const metadataSource = ir.metadataSource || null;
   const runtimeImports = ir.imports.slice();
   const collector = { keysByAbs: /* @__PURE__ */ new Map(), modules: [] };
   const bindings = sourcePath2 !== void 0 ? collectModuleBundle(ir.imports, dirname6(sourcePath2), collector) : [];
@@ -46684,7 +46925,10 @@ function precompileFileInternal(source, sourcePath2, seenImportFiles) {
     modules: collector.modules,
     bindings,
     topLevelCode,
-    subFiles
+    subFiles,
+    // A static `export const metadata` rides along so a serverless function can
+    // serialize the head without the `.vsk` source being present at all.
+    ...metadataSource ? { metadataSource } : {}
   };
 }
 
@@ -62534,6 +62778,7 @@ __export(index_server_exports2, {
   custom: () => custom,
   defineAction: () => defineAction,
   defineHook: () => defineHook,
+  defineMetadata: () => defineMetadata,
   defineRoute: () => defineRoute,
   derived: () => derived,
   destroy_block: () => destroy_block,
@@ -62561,6 +62806,8 @@ __export(index_server_exports2, {
   leaf: () => leaf,
   locals: () => locals,
   maxLength: () => maxLength,
+  mergeMetadata: () => mergeMetadata,
+  metadataToHtml: () => metadataToHtml,
   minLength: () => minLength,
   mutate: () => mutate,
   notFound: () => notFound,
@@ -62581,6 +62828,7 @@ __export(index_server_exports2, {
   required: () => required,
   rerenderNode: () => rerenderNode,
   resolveSsrResources: () => resolveSsrResources,
+  resolveTitle: () => resolveTitle,
   resume_block: () => resume_block,
   revalidateComponent: () => revalidateComponent,
   revalidatePath: () => revalidatePath,
@@ -62642,6 +62890,7 @@ init_headless();
 init_primitive();
 init_loading_indicator();
 init_action();
+init_metadata();
 
 // src/index.ts
 var __filename2 = fileURLToPath9(import.meta.url);

package/package.json

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