@bagelink/blox 1.15.533 → 1.15.539

package/dist/{validate-output-C3NhyFsU.cjs → validate-output-DqDUmsyO.cjs}

@@ -21,12 +21,81 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+const process$1 = require("node:process");
 const node_child_process = require("node:child_process");
 const fs = require("node:fs/promises");
 const path = require("node:path");
-const process$1 = require("node:process");
 const node_url = require("node:url");
 const pageTitle = require("./pageTitle-nIl1cDfD.cjs");
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const PAYLOAD_FIELDS = /* @__PURE__ */ new Set(["version", "source", "website_id", "grant"]);
+function parseJsonObject(value) {
+  let parsed;
+  try {
+    parsed = JSON.parse(value);
+  } catch {
+    throw new Error("Invalid Blox build hook payload");
+  }
+  if (parsed === null || Array.isArray(parsed) || typeof parsed !== "object") {
+    throw new Error("Invalid Blox build hook payload");
+  }
+  return parsed;
+}
+function parseBloxBuildGrantBody(body) {
+  const trimmed = body.trim();
+  if (!trimmed) throw new Error("Missing Blox build hook payload");
+  let payload;
+  try {
+    payload = parseJsonObject(trimmed);
+  } catch {
+    let decoded;
+    try {
+      decoded = decodeURIComponent(trimmed);
+    } catch {
+      throw new Error("Invalid Blox build hook payload");
+    }
+    payload = parseJsonObject(decoded);
+  }
+  if (Object.keys(payload).some((field) => !PAYLOAD_FIELDS.has(field))) {
+    throw new Error("Invalid Blox build hook payload fields");
+  }
+  if (payload.version !== 1 || payload.source !== "blox" || typeof payload.website_id !== "string" || !UUID_PATTERN.test(payload.website_id) || typeof payload.grant !== "string" || payload.grant.trim() === "") {
+    throw new Error("Invalid Blox build hook payload");
+  }
+  return {
+    version: 1,
+    source: "blox",
+    websiteId: payload.website_id,
+    grant: payload.grant
+  };
+}
+function isLocalOrTest(mode, env2) {
+  return mode === "localhost" || mode === "development" || mode === "test" || env2.NODE_ENV === "development" || env2.NODE_ENV === "test";
+}
+function resolveBloxBuildGrant(options = {}) {
+  var _a, _b, _c, _d, _e;
+  const env2 = options.env ?? process$1.env;
+  if (isLocalOrTest(options.mode, env2)) {
+    const websiteId = (_a = env2.BLOX_WEBSITE_ID) == null ? void 0 : _a.trim();
+    const grant2 = (_b = env2.BLOX_BUILD_TOKEN) == null ? void 0 : _b.trim();
+    if (!websiteId && !grant2) return void 0;
+    if (!websiteId || !UUID_PATTERN.test(websiteId) || !grant2) {
+      throw new Error("Local Blox build overrides require a valid BLOX_WEBSITE_ID and BLOX_BUILD_TOKEN");
+    }
+    return { version: 1, source: "blox", websiteId, grant: grant2 };
+  }
+  if (!((_c = env2.INCOMING_HOOK_URL) == null ? void 0 : _c.trim()) || !((_d = env2.INCOMING_HOOK_TITLE) == null ? void 0 : _d.trim())) {
+    throw new Error("Blox production builds require Netlify incoming hook metadata");
+  }
+  const body = env2.INCOMING_HOOK_BODY;
+  if (body == null) throw new Error("Blox production builds require a hook payload");
+  const grant = parseBloxBuildGrantBody(body);
+  const configuredWebsiteId = (_e = env2.BLOX_WEBSITE_ID) == null ? void 0 : _e.trim();
+  if (configuredWebsiteId && configuredWebsiteId !== grant.websiteId) {
+    throw new Error("Blox build hook website does not match the configured website");
+  }
+  return grant;
+}
 class BloxBuildResponseError extends Error {
   constructor(status, url, statusText) {
     super(`Build API ${status} ${statusText}: ${url}`);
@@ -41,6 +110,7 @@ function env(name) {
 }
 function getBloxBuildRequestOptions(overrides = {}) {
   return {
+    websiteId: overrides.websiteId,
     token: overrides.token ?? env("BLOX_BUILD_TOKEN"),
     tokenHeader: overrides.tokenHeader ?? env("BLOX_BUILD_TOKEN_HEADER") ?? "Authorization",
     tokenScheme: overrides.tokenScheme ?? env("BLOX_BUILD_TOKEN_SCHEME") ?? "Bearer",
@@ -111,7 +181,7 @@ function expandLocalePaths(paths, defaultLocale, supportedLocales) {
 }
 async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   var _a, _b, _c;
-  const websiteId = typeof process !== "undefined" ? (_b = (_a = process.env) == null ? void 0 : _a.BLOX_WEBSITE_ID) == null ? void 0 : _b.trim() : void 0;
+  const websiteId = requestOptions.websiteId ?? (typeof process !== "undefined" ? (_b = (_a = process.env) == null ? void 0 : _a.BLOX_WEBSITE_ID) == null ? void 0 : _b.trim() : void 0);
   if (websiteId) {
     const bundle = await bloxBuildJson(
       `${apiBase}/blox-build/websites/${websiteId}/published`,
@@ -134,9 +204,11 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       collections: extractCollectionRefs(bundle.pages)
     };
   }
-  const sitesData = await bloxBuildJson(`${apiBase}/blox/websites`, {}, requestOptions);
-  const sites = Array.isArray(sitesData) ? sitesData : sitesData.data ?? [];
-  const site = sites.find((s) => s.name === websiteName);
+  const site = await bloxBuildJson(
+    `${apiBase}/blox/sites/${encodeURIComponent(websiteName)}`,
+    {},
+    requestOptions
+  );
   if ((site == null ? void 0 : site.id) == null || site.id === "") throw new Error(`Website "${websiteName}" not found at ${apiBase}`);
   const website = await bloxBuildJson(
     `${apiBase}/blox/websites/${site.id}`,
@@ -192,6 +264,7 @@ async function fetchCmsPrerenderPaths(apiBase, websiteName, requestOptions = {})
 }
 async function expandRoutes(apiBase, pages, requestOptions, locale) {
   const routes = [];
+  const grantedWebsiteId = requestOptions.websiteId;
   for (const page of pages) {
     const slug = page.slug ?? "/";
     if (page.status && page.status !== "published") continue;
@@ -201,12 +274,13 @@ async function expandRoutes(apiBase, pages, requestOptions, locale) {
         if (b.adapter === "datastore" && b.collection != null && b.collection !== "" && b.store != null && b.store !== "" && b.bind_by != null && b.bind_by !== "") {
           const q = b.filter ? `&q=${encodeURIComponent(b.filter)}` : "";
           const localeParam = locale ? `&locale=${encodeURIComponent(locale)}` : "";
+          const collectionPath = grantedWebsiteId ? `/blox-build/websites/${grantedWebsiteId}/collections/${b.store}/${b.collection}` : `/datastore/${b.store}/collections/${b.collection}`;
           const itemsData = await bloxBuildJson(
-            `${apiBase}/datastore/${b.store}/collections/${b.collection}?limit=200${localeParam}${q}`,
+            `${apiBase}${collectionPath}?limit=200${localeParam}${q}`,
             {},
             requestOptions
           );
-          const items = Array.isArray(itemsData) ? itemsData : itemsData.data ?? [];
+          const items = Array.isArray(itemsData) ? itemsData : itemsData.items ?? itemsData.data ?? [];
           for (const item of items) {
             const bindValue = item[b.bind_by];
             if (typeof bindValue !== "string" || bindValue === "") continue;
@@ -272,9 +346,9 @@ async function resolveManifestProvenance() {
     commit
   };
 }
-async function uploadBloxManifest(apiBase, websiteId) {
-  if (!environment("BLOX_BUILD_TOKEN")) {
-    throw new Error("BLOX_BUILD_TOKEN is required to upload the Blox manifest");
+async function uploadBloxManifest(apiBase, websiteId, requestOptions = {}) {
+  if (!requestOptions.token && !environment("BLOX_BUILD_TOKEN")) {
+    throw new Error("A Blox build grant is required to upload the Blox manifest");
   }
   const distDirectory = path.resolve(process$1.cwd(), "dist");
   const resolvedManifestPath = path.resolve(distDirectory, ".blox-manifest.json");
@@ -289,7 +363,8 @@ async function uploadBloxManifest(apiBase, websiteId) {
       method: "PUT",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(payload)
-    }
+    },
+    requestOptions
   );
 }
 async function polyfillBloxSsgGlobals(options) {
@@ -500,6 +575,45 @@ function localeSitemapPath(locale) {
   }
   return `/sitemap-${locale}.xml`;
 }
+function generateSitemapArtifacts(options) {
+  const indexableRoutes = options.routes.filter((route) => !route.noindex);
+  const renderedPaths = indexableRoutes.map((route) => route.path);
+  const lastmod = Object.fromEntries(
+    indexableRoutes.flatMap((route) => route.lastmod ? [[route.path, route.lastmod]] : [])
+  );
+  if (options.splitByLocale === false) {
+    return [{
+      path: "/sitemap.xml",
+      content: generateSitemapXml({ renderedPaths, canonicalBase: options.canonicalBase, lastmod })
+    }];
+  }
+  const pathsByLocale = splitSitemapPathsByLocale({
+    renderedPaths,
+    defaultLocale: options.defaultLocale,
+    supportedLocales: options.supportedLocales
+  });
+  const localeArtifacts = [...pathsByLocale].map(([locale, paths]) => ({
+    path: localeSitemapPath(locale),
+    content: generateSitemapXml({
+      renderedPaths: paths,
+      canonicalBase: options.canonicalBase,
+      lastmod
+    })
+  }));
+  return [
+    {
+      path: "/sitemap.xml",
+      content: generateSitemapIndexXml({
+        canonicalBase: options.canonicalBase,
+        sitemapPaths: [
+          ...localeArtifacts.map((artifact) => artifact.path),
+          ...options.additionalSitemapPaths ?? []
+        ]
+      })
+    },
+    ...localeArtifacts
+  ];
+}
 function generateRobotsTxt(options) {
   const { robotsTxt, canonicalBase, noindex } = options;
   if (noindex) {
@@ -978,38 +1092,25 @@ async function prerender({
   if (writeSharedAssets) {
     const sitemapPaths = rendered.filter((p) => !noindexPaths.has(p));
     if (canonicalBase && sitemapPaths.length > 0) {
-      if (((_b = website == null ? void 0 : website.seo) == null ? void 0 : _b.sitemap_split_by_locale) !== false) {
-        const pathsByLocale = splitSitemapPathsByLocale({
-          renderedPaths: sitemapPaths,
-          defaultLocale: (website == null ? void 0 : website.default_locale) ?? "en",
-          supportedLocales: (website == null ? void 0 : website.supported_locales) ?? [(website == null ? void 0 : website.default_locale) ?? "en"]
-        });
-        const sitemapFiles = [];
-        for (const [locale, localePaths] of pathsByLocale) {
-          const sitemapPath = localeSitemapPath(locale);
-          await fs.writeFile(
-            path.join(absClient, sitemapPath.slice(1)),
-            generateSitemapXml({ renderedPaths: localePaths, canonicalBase, lastmod }),
-            "utf8"
-          );
-          sitemapFiles.push(sitemapPath);
-        }
-        await fs.writeFile(
-          path.join(absClient, "sitemap.xml"),
-          generateSitemapIndexXml({ canonicalBase, sitemapPaths: sitemapFiles }),
-          "utf8"
-        );
-        console.log(`  Generated sitemap.xml (${sitemapFiles.length} locales, ${sitemapPaths.length} URLs)`);
-      } else {
+      const artifacts = generateSitemapArtifacts({
+        routes: sitemapPaths.map((routePath) => ({
+          path: routePath,
+          lastmod: lastmod[routePath]
+        })),
+        canonicalBase,
+        defaultLocale: (website == null ? void 0 : website.default_locale) ?? "en",
+        supportedLocales: (website == null ? void 0 : website.supported_locales) ?? [(website == null ? void 0 : website.default_locale) ?? "en"],
+        splitByLocale: (_b = website == null ? void 0 : website.seo) == null ? void 0 : _b.sitemap_split_by_locale
+      });
+      for (const artifact of artifacts) {
         await fs.writeFile(
-          path.join(absClient, "sitemap.xml"),
-          generateSitemapXml({ renderedPaths: sitemapPaths, canonicalBase, lastmod }),
+          path.join(absClient, artifact.path.slice(1)),
+          artifact.content,
           "utf8"
         );
-        console.log(`  Generated sitemap.xml (${sitemapPaths.length} URLs)`);
       }
       const skipped = noindexPaths.size > 0 ? ` (${noindexPaths.size} noindex excluded)` : "";
-      if (skipped) console.log(`  Sitemap exclusions:${skipped}`);
+      console.log(`  Generated sitemap.xml (${artifacts.length} files, ${sitemapPaths.length} URLs)${skipped}`);
     }
     const robotsTxt = generateRobotsTxt({
       robotsTxt: website == null ? void 0 : website.robots_txt,
@@ -1296,6 +1397,7 @@ exports.generateLlmsFullTxt = generateLlmsFullTxt;
 exports.generateLlmsTxt = generateLlmsTxt;
 exports.generateNetlifyRedirects = generateNetlifyRedirects;
 exports.generateRobotsTxt = generateRobotsTxt;
+exports.generateSitemapArtifacts = generateSitemapArtifacts;
 exports.generateSitemapIndexXml = generateSitemapIndexXml;
 exports.generateSitemapXml = generateSitemapXml;
 exports.getBloxBuildRequestOptions = getBloxBuildRequestOptions;
@@ -1303,9 +1405,11 @@ exports.getSiteIconFlags = getSiteIconFlags;
 exports.llmArtifacts = llmArtifacts;
 exports.localeSitemapPath = localeSitemapPath;
 exports.mergeLlmParts = mergeLlmParts;
+exports.parseBloxBuildGrantBody = parseBloxBuildGrantBody;
 exports.polyfillBloxSsgGlobals = polyfillBloxSsgGlobals;
 exports.prerender = prerender;
 exports.primaryContextEntry = primaryContextEntry;
+exports.resolveBloxBuildGrant = resolveBloxBuildGrant;
 exports.resolveManifestProvenance = resolveManifestProvenance;
 exports.splitSitemapPathsByLocale = splitSitemapPathsByLocale;
 exports.uploadBloxManifest = uploadBloxManifest;

package/dist/vite-plugin.cjs

@@ -176,6 +176,7 @@ function bloxPlugin(options = {}) {
     let outDir = "dist";
     let isSsrBuild = false;
     let vuePlugin;
+    let resolvedAliases;
     plugins.push({
       name: "vite-plugin-blox-manifest",
       apply: "build",
@@ -184,6 +185,7 @@ function bloxPlugin(options = {}) {
         outDir = resolved.build.outDir;
         isSsrBuild = !!resolved.build.ssr;
         vuePlugin = resolved.plugins.find((plugin) => plugin.name === "vite:vue");
+        resolvedAliases = resolved.resolve.alias;
       },
       resolveId(id) {
         if (id === VIRTUAL_ENTRY) return RESOLVED_ENTRY;
@@ -212,6 +214,7 @@ function bloxPlugin(options = {}) {
           configFile: false,
           logLevel: "silent",
           server: { middlewareMode: true, hmr: false },
+          resolve: { alias: resolvedAliases },
           plugins: [
             {
               name: "vite-plugin-blox-manifest-entry",

package/dist/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAA;AAM9C,MAAM,WAAW,iBAAiB;IACjC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IACb;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;;;;;;OAaG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,MAAM,EAAE,CAogBpE"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAA;AAM9C,MAAM,WAAW,iBAAiB;IACjC;;;;;OAKG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IACb;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;;;;;;OAaG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,MAAM,EAAE,CAugBpE"}

package/dist/vite-plugin.mjs

@@ -152,6 +152,7 @@ function bloxPlugin(options = {}) {
     let outDir = "dist";
     let isSsrBuild = false;
     let vuePlugin;
+    let resolvedAliases;
     plugins.push({
       name: "vite-plugin-blox-manifest",
       apply: "build",
@@ -160,6 +161,7 @@ function bloxPlugin(options = {}) {
         outDir = resolved.build.outDir;
         isSsrBuild = !!resolved.build.ssr;
         vuePlugin = resolved.plugins.find((plugin) => plugin.name === "vite:vue");
+        resolvedAliases = resolved.resolve.alias;
       },
       resolveId(id) {
         if (id === VIRTUAL_ENTRY) return RESOLVED_ENTRY;
@@ -188,6 +190,7 @@ function bloxPlugin(options = {}) {
           configFile: false,
           logLevel: "silent",
           server: { middlewareMode: true, hmr: false },
+          resolve: { alias: resolvedAliases },
           plugins: [
             {
               name: "vite-plugin-blox-manifest-entry",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/blox",
   "type": "module",
-  "version": "1.15.533",
+  "version": "1.15.539",
   "description": "Blox page builder library for drag-and-drop page building and static data management",
   "author": {
     "name": "Bagel Studio",
@@ -28,7 +28,7 @@
     "static-pages"
   ],
   "bin": {
-    "blox-ssg": "./dist/ssg/cli.mjs"
+    "blox-ssg": "dist/ssg/cli.mjs"
   },
   "sideEffects": [
     "**/*.css",