@bagelink/blox 1.15.547 → 1.15.549

package/dist/{shard-runner-Bg091Bud.cjs → shard-runner-BwSs_Ws5.cjs}

@@ -26,10 +26,19 @@ const node_child_process = require("node:child_process");
 const os = require("node:os");
 const path = require("node:path");
 const process = require("node:process");
-const llmArtifacts = require("./validate-output-Dku8tCir.cjs");
+const llmArtifacts = require("./validate-output-BrUqMZIw.cjs");
 const AUTO_SHARD_CAP = Number(process.env.BLOX_SSG_SHARD_CAP) || 6;
 const PREFETCH_BUDGET = Number(process.env.BLOX_SSG_PREFETCH_BUDGET) || 24;
 const SEQUENTIAL_SHARDS = process.env.BLOX_SSG_SEQUENTIAL === "1";
+function matchesCmsPath(pathname, cmsPaths) {
+  if (cmsPaths.has(pathname)) return true;
+  for (const template of cmsPaths) {
+    if (!template.includes(":")) continue;
+    const pattern = template.replace(/:[a-z_]+/g, "[^/]+");
+    if (new RegExp(`^${pattern}$`).test(pathname)) return true;
+  }
+  return false;
+}
 function resolveShardCount(shards) {
   if (shards === "auto") {
     const cores = os.cpus().length || 4;
@@ -102,8 +111,8 @@ async function runSharded(opts) {
     opts.buildRequest
   );
   for (const p of siteData.paths) if (!paths.includes(p)) paths.push(p);
-  const cmsPathSet = new Set(siteData.paths);
-  const routerPaths = appPaths.filter((path2) => !cmsPathSet.has(path2));
+  const cmsPathSet = /* @__PURE__ */ new Set([...siteData.paths, ...siteData.pageSlugs]);
+  const routerPaths = appPaths.filter((path2) => !matchesCmsPath(path2, cmsPathSet));
   if (!paths.includes("/")) {
     paths.unshift("/");
     routerPaths.unshift("/");
@@ -149,7 +158,7 @@ async function runSharded(opts) {
   }
   if (process.env.BLOX_SSG_LLM !== "0") {
     try {
-      const { mergeLlmParts } = await Promise.resolve().then(() => require("./validate-output-Dku8tCir.cjs")).then((n) => n.llmArtifacts);
+      const { mergeLlmParts } = await Promise.resolve().then(() => require("./validate-output-BrUqMZIw.cjs")).then((n) => n.llmArtifacts);
       const mergeWebsite = website;
       const partFiles = Array.from({ length: total }, (_, i) => path.join(llmPartsDir, `part.${i}.json`));
       const { pages } = await mergeLlmParts({

package/dist/{shard-runner-DY4hpGdP.js → shard-runner-C8zwo_6O.js}

@@ -2,10 +2,19 @@ import { spawn } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
-import { f as fetchCmsSiteData, g as generateSitemapArtifacts } from "./validate-output-XdxaXjgE.js";
+import { f as fetchCmsSiteData, g as generateSitemapArtifacts } from "./validate-output-CaMwqCa1.js";
 const AUTO_SHARD_CAP = Number(process.env.BLOX_SSG_SHARD_CAP) || 6;
 const PREFETCH_BUDGET = Number(process.env.BLOX_SSG_PREFETCH_BUDGET) || 24;
 const SEQUENTIAL_SHARDS = process.env.BLOX_SSG_SEQUENTIAL === "1";
+function matchesCmsPath(pathname, cmsPaths) {
+  if (cmsPaths.has(pathname)) return true;
+  for (const template of cmsPaths) {
+    if (!template.includes(":")) continue;
+    const pattern = template.replace(/:[a-z_]+/g, "[^/]+");
+    if (new RegExp(`^${pattern}$`).test(pathname)) return true;
+  }
+  return false;
+}
 function resolveShardCount(shards) {
   if (shards === "auto") {
     const cores = os.cpus().length || 4;
@@ -78,8 +87,8 @@ async function runSharded(opts) {
     opts.buildRequest
   );
   for (const p of siteData.paths) if (!paths.includes(p)) paths.push(p);
-  const cmsPathSet = new Set(siteData.paths);
-  const routerPaths = appPaths.filter((path2) => !cmsPathSet.has(path2));
+  const cmsPathSet = /* @__PURE__ */ new Set([...siteData.paths, ...siteData.pageSlugs]);
+  const routerPaths = appPaths.filter((path2) => !matchesCmsPath(path2, cmsPathSet));
   if (!paths.includes("/")) {
     paths.unshift("/");
     routerPaths.unshift("/");
@@ -125,7 +134,7 @@ async function runSharded(opts) {
   }
   if (process.env.BLOX_SSG_LLM !== "0") {
     try {
-      const { mergeLlmParts } = await import("./validate-output-XdxaXjgE.js").then((n) => n.A);
+      const { mergeLlmParts } = await import("./validate-output-CaMwqCa1.js").then((n) => n.A);
       const mergeWebsite = website;
       const partFiles = Array.from({ length: total }, (_, i) => path.join(llmPartsDir, `part.${i}.json`));
       const { pages } = await mergeLlmParts({

package/dist/ssg/cli.cjs

@@ -3,7 +3,7 @@
 const process = require("node:process");
 const fs = require("node:fs/promises");
 const ssg_buildGrant = require("./build-grant.cjs");
-const llmArtifacts = require("../validate-output-Dku8tCir.cjs");
+const llmArtifacts = require("../validate-output-BrUqMZIw.cjs");
 function installFetchTimeout() {
   const ms = Number(process.env.BLOX_SSG_FETCH_TIMEOUT_MS) || 2e4;
   const original = globalThis.fetch;
@@ -141,7 +141,7 @@ Environment:
   if (shardsOpt !== null || routesCmd) {
     const { apiBase: apiBase2, websiteName: configWebsiteName2 } = await resolveApiBase(mode);
     const websiteName2 = process.env.WEBSITE_NAME ?? configWebsiteName2 ?? "default";
-    const { runSharded } = await Promise.resolve().then(() => require("../shard-runner-Bg091Bud.cjs"));
+    const { runSharded } = await Promise.resolve().then(() => require("../shard-runner-BwSs_Ws5.cjs"));
     const code = await runSharded({
       shards: shardsOpt ?? "auto",
       mode,

package/dist/ssg/cli.mjs

@@ -2,7 +2,7 @@
 import process from "node:process";
 import fs from "node:fs/promises";
 import { resolveBloxBuildGrant } from "./build-grant.mjs";
-import { v as validateSsgOutput, u as uploadBloxManifest, p as polyfillBloxSsgGlobals, f as fetchCmsSiteData, a as prerender } from "../validate-output-XdxaXjgE.js";
+import { v as validateSsgOutput, u as uploadBloxManifest, p as polyfillBloxSsgGlobals, f as fetchCmsSiteData, a as prerender } from "../validate-output-CaMwqCa1.js";
 function installFetchTimeout() {
   const ms = Number(process.env.BLOX_SSG_FETCH_TIMEOUT_MS) || 2e4;
   const original = globalThis.fetch;
@@ -140,7 +140,7 @@ Environment:
   if (shardsOpt !== null || routesCmd) {
     const { apiBase: apiBase2, websiteName: configWebsiteName2 } = await resolveApiBase(mode);
     const websiteName2 = process.env.WEBSITE_NAME ?? configWebsiteName2 ?? "default";
-    const { runSharded } = await import("../shard-runner-DY4hpGdP.js");
+    const { runSharded } = await import("../shard-runner-C8zwo_6O.js");
     const code = await runSharded({
       shards: shardsOpt ?? "auto",
       mode,

package/dist/ssg/cms-routes.d.ts

@@ -10,6 +10,8 @@ export interface CmsSiteData {
     websiteId: string;
     website: WebsiteRead;
     paths: string[];
+    /** Published CMS page slugs, including dynamic templates. */
+    pageSlugs: string[];
     redirects: RedirectEntry[];
     /** Datastore collections referenced by any page's data_bindings. */
     collections: CollectionRef[];

package/dist/ssg/cms-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cms-routes.d.ts","sourceRoot":"","sources":["../../src/ssg/cms-routes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAoB9D,2EAA2E;AAC3E,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,WAAW;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAA;IACpB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,SAAS,EAAE,aAAa,EAAE,CAAA;IAC1B,oEAAoE;IACpE,WAAW,EAAE,aAAa,EAAE,CAAA;CAC5B;AAYD;;;GAGG;AACH,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACxB,MAAM,EAAE,CASV;AAMD;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,uBAA4B,GAC1C,OAAO,CAAC,WAAW,CAAC,CA4GtB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,uBAA4B,GAC1C,OAAO,CAAC,MAAM,EAAE,CAAC,CAGnB"}
+{"version":3,"file":"cms-routes.d.ts","sourceRoot":"","sources":["../../src/ssg/cms-routes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAoB9D,2EAA2E;AAC3E,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,WAAW;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,WAAW,CAAA;IACpB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,6DAA6D;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,SAAS,EAAE,aAAa,EAAE,CAAA;IAC1B,oEAAoE;IACpE,WAAW,EAAE,aAAa,EAAE,CAAA;CAC5B;AAYD;;;GAGG;AACH,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACxB,MAAM,EAAE,CASV;AAMD;;;GAGG;AACH,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,uBAA4B,GAC1C,OAAO,CAAC,WAAW,CAAC,CA+GtB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,uBAA4B,GAC1C,OAAO,CAAC,MAAM,EAAE,CAAC,CAGnB"}

package/dist/ssg/index.cjs

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const llmArtifacts = require("../validate-output-Dku8tCir.cjs");
+const llmArtifacts = require("../validate-output-BrUqMZIw.cjs");
 const ssg_buildGrant = require("./build-grant.cjs");
 const ssg_client = require("./client.cjs");
 const pinia = require("pinia");

package/dist/ssg/index.mjs

@@ -1,5 +1,5 @@
-import { b as buildPageHead, c as primaryContextEntry, d as buildJsonLd, e as extractPageText, B as BloxBuildResponseError, h as bloxBuildJson } from "../validate-output-XdxaXjgE.js";
-import { i, j, k, f, l, m, n, o, g, q, r, s, t, w, x, p, a, y, z, u, v } from "../validate-output-XdxaXjgE.js";
+import { b as buildPageHead, c as primaryContextEntry, d as buildJsonLd, e as extractPageText, B as BloxBuildResponseError, h as bloxBuildJson } from "../validate-output-CaMwqCa1.js";
+import { i, j, k, f, l, m, n, o, g, q, r, s, t, w, x, p, a, y, z, u, v } from "../validate-output-CaMwqCa1.js";
 import { parseBloxBuildGrantBody, resolveBloxBuildGrant } from "./build-grant.mjs";
 import { BLOX_STATE_WINDOW_KEY, BLOX_WEBSITE_ID_WINDOW_KEY } from "./client.mjs";
 import { BLOX_COLLECTIONS_WINDOW_KEY, BLOX_DATA_WINDOW_KEY, BLOX_PAGE_SEO_WINDOW_KEY, getCollectionCache, getEmbeddedWebsiteId, installBloxStateCache, installCollectionCache } from "./client.mjs";

package/dist/ssg/shard-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shard-runner.d.ts","sourceRoot":"","sources":["../../src/ssg/shard-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAQH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAI9D,MAAM,WAAW,kBAAkB;IAClC,qDAAqD;IACrD,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAA;IACZ,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAA;IACf,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAA;IACnB,yEAAyE;IACzE,YAAY,CAAC,EAAE,uBAAuB,CAAA;IACtC,iFAAiF;IACjF,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,8FAA8F;IAC9F,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB;AA+ED;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6I1E"}
+{"version":3,"file":"shard-runner.d.ts","sourceRoot":"","sources":["../../src/ssg/shard-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAQH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAI9D,MAAM,WAAW,kBAAkB;IAClC,qDAAqD;IACrD,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAA;IACZ,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAA;IACf,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAA;IACnB,yEAAyE;IACzE,YAAY,CAAC,EAAE,uBAAuB,CAAA;IACtC,iFAAiF;IACjF,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,8FAA8F;IAC9F,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CAClB;AAyFD;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6I1E"}

package/dist/{validate-output-Dku8tCir.cjs → validate-output-BrUqMZIw.cjs}

@@ -131,6 +131,7 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       websiteId,
       website: website2,
       paths: localizedPaths,
+      pageSlugs: [...new Set(bundle.pages.flatMap((page) => page.slug ? [page.slug] : []))],
       redirects: bundle.redirects.filter((redirect) => redirect.from_path && redirect.to_path),
       collections: extractCollectionRefs(bundle.pages)
     };
@@ -154,9 +155,9 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       {},
       requestOptions
     );
-    const pages = Array.isArray(pagesData) ? pagesData : pagesData.data ?? [];
-    const localePaths = await expandRoutes(apiBase, pages, requestOptions, locale);
-    return { locale, pages, paths: localePaths.map((path2) => localizePath(path2, locale, defaultLocale)) };
+    const pages2 = Array.isArray(pagesData) ? pagesData : pagesData.data ?? [];
+    const localePaths = await expandRoutes(apiBase, pages2, requestOptions, locale);
+    return { locale, pages: pages2, paths: localePaths.map((path2) => localizePath(path2, locale, defaultLocale)) };
   }));
   const paths = [...new Set(localizedPages.flatMap((result) => result.paths))];
   const pathSet = new Set(paths);
@@ -164,9 +165,9 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   const canonicalSlugById = new Map(
     defaultPages.flatMap((page) => page.id && page.slug && !page.slug.includes(":") ? [[page.id, page.slug]] : [])
   );
-  const localeAliases = localizedPages.flatMap(({ locale, pages }) => {
+  const localeAliases = localizedPages.flatMap(({ locale, pages: pages2 }) => {
     if (locale === defaultLocale) return [];
-    return pages.flatMap((page) => {
+    return pages2.flatMap((page) => {
       const canonicalSlug = page.id ? canonicalSlugById.get(page.id) : void 0;
       const fromPath = canonicalSlug ? localizePath(canonicalSlug, locale, defaultLocale) : "";
       if (page.status && page.status !== "published" || !canonicalSlug || !page.slug || page.slug.includes(":") || page.slug === canonicalSlug || pathSet.has(fromPath)) return [];
@@ -186,8 +187,10 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   const redirects = redirectItems.filter((r) => r.from_path && r.to_path);
   const explicitSources = new Set(redirects.map((redirect) => redirect.from_path.trim()));
   redirects.push(...localeAliases.filter((alias) => !explicitSources.has(alias.from_path)));
-  const collections = extractCollectionRefs(localizedPages.flatMap((result) => result.pages));
-  return { websiteId: site.id, website, paths, redirects, collections };
+  const pages = localizedPages.flatMap((result) => result.pages);
+  const collections = extractCollectionRefs(pages);
+  const pageSlugs = [...new Set(pages.flatMap((page) => page.slug ? [page.slug] : []))];
+  return { websiteId: site.id, website, paths, pageSlugs, redirects, collections };
 }
 async function fetchCmsPrerenderPaths(apiBase, websiteName, requestOptions = {}) {
   const { paths } = await fetchCmsSiteData(apiBase, websiteName, requestOptions);

package/dist/{validate-output-XdxaXjgE.js → validate-output-CaMwqCa1.js}

@@ -108,6 +108,7 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       websiteId,
       website: website2,
       paths: localizedPaths,
+      pageSlugs: [...new Set(bundle.pages.flatMap((page) => page.slug ? [page.slug] : []))],
       redirects: bundle.redirects.filter((redirect) => redirect.from_path && redirect.to_path),
       collections: extractCollectionRefs(bundle.pages)
     };
@@ -131,9 +132,9 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       {},
       requestOptions
     );
-    const pages = Array.isArray(pagesData) ? pagesData : pagesData.data ?? [];
-    const localePaths = await expandRoutes(apiBase, pages, requestOptions, locale);
-    return { locale, pages, paths: localePaths.map((path2) => localizePath(path2, locale, defaultLocale)) };
+    const pages2 = Array.isArray(pagesData) ? pagesData : pagesData.data ?? [];
+    const localePaths = await expandRoutes(apiBase, pages2, requestOptions, locale);
+    return { locale, pages: pages2, paths: localePaths.map((path2) => localizePath(path2, locale, defaultLocale)) };
   }));
   const paths = [...new Set(localizedPages.flatMap((result) => result.paths))];
   const pathSet = new Set(paths);
@@ -141,9 +142,9 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   const canonicalSlugById = new Map(
     defaultPages.flatMap((page) => page.id && page.slug && !page.slug.includes(":") ? [[page.id, page.slug]] : [])
   );
-  const localeAliases = localizedPages.flatMap(({ locale, pages }) => {
+  const localeAliases = localizedPages.flatMap(({ locale, pages: pages2 }) => {
     if (locale === defaultLocale) return [];
-    return pages.flatMap((page) => {
+    return pages2.flatMap((page) => {
       const canonicalSlug = page.id ? canonicalSlugById.get(page.id) : void 0;
       const fromPath = canonicalSlug ? localizePath(canonicalSlug, locale, defaultLocale) : "";
       if (page.status && page.status !== "published" || !canonicalSlug || !page.slug || page.slug.includes(":") || page.slug === canonicalSlug || pathSet.has(fromPath)) return [];
@@ -163,8 +164,10 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   const redirects = redirectItems.filter((r) => r.from_path && r.to_path);
   const explicitSources = new Set(redirects.map((redirect) => redirect.from_path.trim()));
   redirects.push(...localeAliases.filter((alias) => !explicitSources.has(alias.from_path)));
-  const collections = extractCollectionRefs(localizedPages.flatMap((result) => result.pages));
-  return { websiteId: site.id, website, paths, redirects, collections };
+  const pages = localizedPages.flatMap((result) => result.pages);
+  const collections = extractCollectionRefs(pages);
+  const pageSlugs = [...new Set(pages.flatMap((page) => page.slug ? [page.slug] : []))];
+  return { websiteId: site.id, website, paths, pageSlugs, redirects, collections };
 }
 async function fetchCmsPrerenderPaths(apiBase, websiteName, requestOptions = {}) {
   const { paths } = await fetchCmsSiteData(apiBase, websiteName, requestOptions);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/blox",
   "type": "module",
-  "version": "1.15.547",
+  "version": "1.15.549",
   "description": "Blox page builder library for drag-and-drop page building and static data management",
   "author": {
     "name": "Bagel Studio",