@tokenoftrust/storefront-runner 2.2.97 → 2.2.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.2.97",
+  "version": "2.2.98",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/public-runtime/src/static-bundle.ts

@@ -44,6 +44,7 @@ import { assetContentType } from "./tenant-assets.js";
 import { formatHtmlCacheControl } from "./html-cache-policy.js";
 import { NATIVE_GA4_SANDBOX_ASSET_PATH } from "./integration/native-ga4-sandbox-asset.mjs";
 import { CONTENT_NAMED_ASSET_PREFIXES } from "./content-named-asset-prefixes.mjs";
+import { resolveRedirect } from "./publication-redirects.mjs";
 
 // ---------------------------------------------------------------------------
 // R2 seam — same structural subset tenant-assets.ts uses (no workers-types dep)
@@ -189,41 +190,15 @@ function isManifestRedirectRule(value: string): boolean {
 }
 
 /**
- * Where a rule sends a request whose path continues `capture` past the rule's directory; null
- * unless the result is a same-origin path. Same semantics as `ruleLocation` in
- * `publication-redirects.mjs` and the CloudFront function — the three are held together by
- * `tests/fixtures/redirect-match-cases.json`.
- */
-function ruleLocation(to: string, capture: string): string | null {
-  const location = to.endsWith("/*") ? `${to.slice(0, -1)}${capture}` : to;
-  return location.startsWith("/") && !location.startsWith("//") && !location.includes("\\")
-    ? location
-    : null;
-}
-
-/**
- * The redirect the manifest declares for `pathname`, as a location, or null. An exact entry wins
- * outright; otherwise the rule with the longest directory that the trailing-slash form of the path
- * starts with decides — and when its location is unusable there is no redirect.
+ * The redirect the manifest declares for `pathname`, as a location, or null — the redirect
+ * contract's own matcher (`publication-redirects.mjs`), so this plane cannot answer differently.
  */
 function staticBundleRedirectLocation(
   redirects: StaticBundleManifest["redirects"],
   pathname: string,
 ): string | null {
   if (!redirects?.length) return null;
-  const path = pathname === "/" || pathname.split("/").pop()?.includes(".")
-    ? pathname
-    : pathname.endsWith("/") ? pathname : `${pathname}/`;
-  let rule: { from: string; to: string } | null = null;
-  for (const redirect of redirects) {
-    if (redirect.from.endsWith("/*")) {
-      const dir = redirect.from.slice(0, -1);
-      if (path.startsWith(dir) && (rule === null || dir.length > rule.from.length - 1)) rule = redirect;
-    } else if (redirect.from === pathname || redirect.from === path) {
-      return redirect.to;
-    }
-  }
-  return rule === null ? null : ruleLocation(rule.to, path.slice(rule.from.length - 1));
+  return resolveRedirect(redirects, pathname)?.location ?? null;
 }
 
 function isManifestRedirectDestination(value: string): boolean {

package/scripts/tenant/validate.mjs

@@ -1386,21 +1386,24 @@ if (isMain) {
     })()
     : baseline;
   const { ok, findings } = result;
+  // exitCode, never exit(): a report written to a pipe is flushed asynchronously, and exit() cuts a
+  // large one off mid-JSON for whoever parses it.
   if (asJson) {
     console.log(JSON.stringify({ ok, findings }, null, 2));
-    process.exit(ok ? 0 : 1);
-  }
-  const errors = findings.filter((f) => f.level === ERROR);
-  const warns = findings.filter((f) => f.level === WARN);
-  console.log(`\ntot validate${profile ? ` --profile ${profile}` : ""} — ${tenantId ?? dir}\n`);
-  // Named, grouped callouts FIRST — see printLoudAdvisories above.
-  printLoudAdvisories(findings, { log: (s) => console.log(s) });
-  for (const f of findings) {
-    const tag = f.level === ERROR ? "✗" : "⚠";
-    console.log(`  ${tag} [${f.rule}] ${f.file}\n      ${f.message}${f.fix ? `\n      → ${f.fix}` : ""}`);
-  }
-  console.log(
-    `\n${errors.length === 0 ? "✔" : "✖"} ${errors.length} error(s), ${warns.length} warning(s).\n`,
-  );
-  process.exit(errors.length === 0 ? 0 : 1);
+    process.exitCode = ok ? 0 : 1;
+  } else {
+    const errors = findings.filter((f) => f.level === ERROR);
+    const warns = findings.filter((f) => f.level === WARN);
+    console.log(`\ntot validate${profile ? ` --profile ${profile}` : ""} — ${tenantId ?? dir}\n`);
+    // Named, grouped callouts FIRST — see printLoudAdvisories above.
+    printLoudAdvisories(findings, { log: (s) => console.log(s) });
+    for (const f of findings) {
+      const tag = f.level === ERROR ? "✗" : "⚠";
+      console.log(`  ${tag} [${f.rule}] ${f.file}\n      ${f.message}${f.fix ? `\n      → ${f.fix}` : ""}`);
+    }
+    console.log(
+      `\n${errors.length === 0 ? "✔" : "✖"} ${errors.length} error(s), ${warns.length} warning(s).\n`,
+    );
+    process.exitCode = errors.length === 0 ? 0 : 1;
+  }
 }