@bagelink/blox 1.17.6 → 1.18.6

package/dist/{validate-output-CuX33CnX.js → validate-output-yDJYYYzK.js}

@@ -3,7 +3,7 @@ import fs, { readFile } from "node:fs/promises";
 import path, { resolve } from "node:path";
 import process$1 from "node:process";
 import { pathToFileURL } from "node:url";
-import { r as resolvePageTitle, p as primaryPageContext, c as contextPageTitle } from "./pageTitle-B1mtDJKn.js";
+import { r as resolvePageTitle, p as primaryPageContext, c as contextPageTitle } from "./localeStrategy-hXlNof1E.js";
 class BloxBuildResponseError extends Error {
   constructor(status, url, statusText) {
     super(`Build API ${status} ${statusText}: ${url}`);
@@ -72,6 +72,24 @@ async function bloxBuildJson(input, init = {}, options = {}) {
   if (response.status === 204) return null;
   return response.json();
 }
+function buildPageSlugMap(localizedBundles, defaultLocale) {
+  var _a;
+  const map = {};
+  const defaultPages = ((_a = localizedBundles.find((result) => result.locale === defaultLocale)) == null ? void 0 : _a.bundle.pages) ?? [];
+  const canonicalById = new Map(
+    defaultPages.flatMap((page) => page.id && page.slug && !page.slug.includes(":") ? [[page.id, page.slug]] : [])
+  );
+  for (const { locale, bundle } of localizedBundles) {
+    for (const page of bundle.pages) {
+      if (!page.slug || page.slug.includes(":") || page.status && page.status !== "published") continue;
+      const canonical = page.id ? canonicalById.get(page.id) : void 0;
+      if (!canonical) continue;
+      const entry = map[canonical] ?? (map[canonical] = { [defaultLocale]: canonical });
+      entry[locale] = page.slug;
+    }
+  }
+  return map;
+}
 function localizePath(slug, locale, defaultLocale) {
   if (locale === defaultLocale) return slug === "" ? "/" : slug;
   const s = slug === "" || slug === "/" ? "" : slug;
@@ -118,7 +136,7 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
         return [{
           from_path: fromPath,
           to_path: localizePath(page.slug, locale, defaultLocale2),
-          status_code: 302
+          status_code: 301
         }];
       });
     });
@@ -132,6 +150,7 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       website: website2,
       paths: paths2,
       pageSlugs: [...new Set(localizedBundles.flatMap((result) => result.bundle.pages.flatMap((page) => page.slug ? [localizePath(page.slug, result.locale, defaultLocale2)] : [])))],
+      pageSlugMap: buildPageSlugMap(localizedBundles, defaultLocale2),
       redirects: redirects2,
       collections: extractCollectionRefs(localizedBundles.flatMap((result) => result.bundle.pages)),
       collectionItems
@@ -175,7 +194,7 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
       return [{
         from_path: fromPath,
         to_path: localizePath(page.slug, locale, defaultLocale),
-        status_code: 302
+        status_code: 301
       }];
     });
   });
@@ -191,7 +210,18 @@ async function fetchCmsSiteData(apiBase, websiteName, requestOptions = {}) {
   const pages = localizedPages.flatMap((result) => result.pages);
   const collections = extractCollectionRefs(pages);
   const pageSlugs = [...new Set(localizedPages.flatMap((result) => result.pages.flatMap((page) => page.slug ? [localizePath(page.slug, result.locale, defaultLocale)] : [])))];
-  return { websiteId: site.id, website, paths, pageSlugs, redirects, collections };
+  return {
+    websiteId: site.id,
+    website,
+    paths,
+    pageSlugs,
+    pageSlugMap: buildPageSlugMap(
+      localizedPages.map((result) => ({ locale: result.locale, bundle: { pages: result.pages } })),
+      defaultLocale
+    ),
+    redirects,
+    collections
+  };
 }
 async function expandRoutes(apiBase, pages, requestOptions, locale, collectItems) {
   const routes = [];
@@ -654,7 +684,7 @@ function generateSitemapArtifacts(options) {
 function generateRobotsTxt(options) {
   const { robotsTxt, canonicalBase, noindex } = options;
   const base = (canonicalBase || "").replace(/\/$/, "");
-  const sitemapLine = base && !noindex ? `
+  const sitemapLine = base ? `
 Sitemap: ${base}/sitemap.xml
 ` : "";
   if (robotsTxt) {
@@ -667,7 +697,7 @@ ${sitemapLine}`;
   if (noindex) {
     return `User-agent: *
 Disallow: /
-`;
+${sitemapLine}`;
   }
   return `User-agent: *
 Allow: /
@@ -992,6 +1022,7 @@ async function prerender({
   website = null,
   websiteId = "",
   redirects = [],
+  pageSlugMap = {},
   llm = {}
 } = {}) {
   var _a, _b, _c, _d, _e, _f;
@@ -1099,6 +1130,7 @@ async function prerender({
       template,
       website,
       websiteId,
+      pageSlugMap,
       resolveCache,
       llm
     });
@@ -1148,8 +1180,8 @@ async function prerender({
   }
   const canonicalBase = (((_a = website == null ? void 0 : website.seo) == null ? void 0 : _a.canonical_base_url) || (website == null ? void 0 : website.domain) || "").replace(/\/$/, "");
   if (writeSharedAssets) {
-    const sitemapPaths = rendered.filter((p) => !noindexPaths.has(p));
-    if (!((_b = website == null ? void 0 : website.seo) == null ? void 0 : _b.noindex) && canonicalBase && sitemapPaths.length > 0) {
+    const sitemapPaths = ((_b = website == null ? void 0 : website.seo) == null ? void 0 : _b.noindex) ? rendered : rendered.filter((p) => !noindexPaths.has(p));
+    if (canonicalBase && sitemapPaths.length > 0) {
       const artifacts = generateSitemapArtifacts({
         routes: sitemapPaths.map((routePath) => ({
           path: routePath,
@@ -1573,7 +1605,7 @@ async function validateSsgOutput(options) {
   if (!htmlFiles.length) failures.push("output contains no HTML files");
   if (!hydratedFiles) failures.push("output contains no prerendered Blox hydration state");
   const siteNoindex = await readSiteNoindex(outDir);
-  const optionalWhenNoindex = /* @__PURE__ */ new Set(["sitemap.xml", "llms.txt", "llms-full.txt"]);
+  const optionalWhenNoindex = /* @__PURE__ */ new Set(["llms.txt", "llms-full.txt"]);
   for (const required of requiredFiles) {
     if (siteNoindex && optionalWhenNoindex.has(required)) continue;
     try {

package/package.json

@@ -1,125 +1,126 @@
 {
-  "name": "@bagelink/blox",
-  "type": "module",
-  "version": "1.17.6",
-  "description": "Blox page builder library for drag-and-drop page building and static data management",
-  "author": {
-    "name": "Bagel Studio",
-    "email": "info@bagelstudio.co.il",
-    "url": "https://bagelstudio.co.il"
-  },
-  "license": "MIT",
-  "homepage": "https://github.com/bageldb/bagelink/tree/master/packages/blox#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bageldb/bagelink.git",
-    "directory": "packages/blox"
-  },
-  "bugs": "https://github.com/bageldb/bagelink/issues",
-  "keywords": [
-    "blox",
-    "page-builder",
-    "preview",
-    "external-preview",
-    "cms",
-    "vue",
-    "component-library",
-    "drag-and-drop",
-    "static-pages"
-  ],
-  "bin": {
-    "blox-ssg": "dist/ssg/cli.mjs"
-  },
-  "sideEffects": [
-    "**/*.css",
-    "**/*.vue"
-  ],
-  "exports": {
-    "./package.json": "./package.json",
-    "./vite": {
-      "types": "./dist/vite-plugin.d.ts",
-      "import": "./dist/vite-plugin.mjs"
-    },
-    ".": {
-      "types": "./dist/index.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.mjs"
-    },
-    "./ssg": {
-      "types": "./dist/ssg/index.d.ts",
-      "import": "./dist/ssg/index.mjs"
-    },
-    "./ssg/client": {
-      "types": "./dist/ssg/client.d.ts",
-      "import": "./dist/ssg/client.mjs"
-    },
-    "./ssg/build-grant": {
-      "types": "./dist/ssg/build-grant.d.ts",
-      "import": "./dist/ssg/build-grant.mjs"
-    },
-    "./style.css": "./dist/style.css",
-    "./dist/style.css": "./dist/style.css"
-  },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./dist/*",
-        "./dist/index.d.ts"
-      ]
-    }
-  },
-  "files": [
-    "dist",
-    "core",
-    "components",
-    "config",
-    "ssg",
-    "utils",
-    "views",
-    "setup.ts",
-    "index.ts",
-    "README.md"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "peerDependencies": {
-    "@bagelink/vue": "*",
-    "happy-dom": ">=14.0.0",
-    "vite": ">=5.0.0",
-    "vue": "^3.3.0",
-    "vue-router": "^4.0.0"
-  },
-  "peerDependenciesMeta": {
-    "happy-dom": {
-      "optional": true
-    },
-    "vite": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^5.2.4",
-    "@vue/tsconfig": "^0.7.0",
-    "typescript": "^5.9.3",
-    "vite": "^5.4.21",
-    "vite-plugin-dts": "^4.5.4",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.2.7",
-    "vue": "^3.5.43",
-    "vue-router": "^4.6.4",
-    "vue-tsc": "^2.2.12"
-  },
-  "dependencies": {
-    "magic-string": "^0.30.21",
-    "pinia": "^3.0.4"
-  },
-  "scripts": {
-    "dev": "vite build --watch",
-    "build": "vite build",
-    "typecheck": "vue-tsc --noEmit"
-  }
-}
+	"name": "@bagelink/blox",
+	"type": "module",
+	"version": "1.18.6",
+	"description": "Blox page builder library for drag-and-drop page building and static data management",
+	"author": {
+		"name": "Bagel Studio",
+		"email": "info@bagelstudio.co.il",
+		"url": "https://bagelstudio.co.il"
+	},
+	"license": "MIT",
+	"homepage": "https://github.com/bageldb/bagelink/tree/master/packages/blox#readme",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/bageldb/bagelink.git",
+		"directory": "packages/blox"
+	},
+	"bugs": "https://github.com/bageldb/bagelink/issues",
+	"keywords": [
+		"blox",
+		"page-builder",
+		"preview",
+		"external-preview",
+		"cms",
+		"vue",
+		"component-library",
+		"drag-and-drop",
+		"static-pages"
+	],
+	"bin": {
+		"blox-ssg": "dist/ssg/cli.mjs"
+	},
+	"sideEffects": [
+		"**/*.css",
+		"**/*.vue"
+	],
+	"exports": {
+		"./package.json": "./package.json",
+		"./vite": {
+			"types": "./dist/vite-plugin.d.ts",
+			"import": "./dist/vite-plugin.mjs"
+		},
+		".": {
+			"types": "./dist/index.d.ts",
+			"require": "./dist/index.cjs",
+			"import": "./dist/index.mjs"
+		},
+		"./ssg": {
+			"types": "./dist/ssg/index.d.ts",
+			"import": "./dist/ssg/index.mjs"
+		},
+		"./ssg/client": {
+			"types": "./dist/ssg/client.d.ts",
+			"import": "./dist/ssg/client.mjs"
+		},
+		"./ssg/build-grant": {
+			"types": "./dist/ssg/build-grant.d.ts",
+			"import": "./dist/ssg/build-grant.mjs"
+		},
+		"./style.css": "./dist/style.css",
+		"./dist/style.css": "./dist/style.css"
+	},
+	"main": "./dist/index.cjs",
+	"module": "./dist/index.mjs",
+	"types": "./dist/index.d.ts",
+	"typesVersions": {
+		"*": {
+			"*": [
+				"./dist/*",
+				"./dist/index.d.ts"
+			]
+		}
+	},
+	"files": [
+		"dist",
+		"core",
+		"components",
+		"config",
+		"ssg",
+		"utils",
+		"views",
+		"setup.ts",
+		"index.ts",
+		"README.md"
+	],
+	"scripts": {
+		"prepublishOnly": "pnpm build",
+		"dev": "vite build --watch",
+		"build": "vite build",
+		"typecheck": "vue-tsc --noEmit"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"peerDependencies": {
+		"@bagelink/vue": "*",
+		"happy-dom": ">=14.0.0",
+		"vite": ">=5.0.0",
+		"vue": "^3.3.0",
+		"vue-router": "^4.0.0"
+	},
+	"peerDependenciesMeta": {
+		"happy-dom": {
+			"optional": true
+		},
+		"vite": {
+			"optional": true
+		}
+	},
+	"devDependencies": {
+		"@vitejs/plugin-vue": "^5.2.4",
+		"@vue/tsconfig": "^0.7.0",
+		"typescript": "^5.9.3",
+		"vite": "^5.4.21",
+		"vite-plugin-dts": "^4.5.4",
+		"vite-tsconfig-paths": "^5.1.4",
+		"vitest": "^3.2.7",
+		"vue": "^3.5.43",
+		"vue-router": "^4.6.4",
+		"vue-tsc": "^2.2.12"
+	},
+	"dependencies": {
+		"magic-string": "^0.30.21",
+		"pinia": "^3.0.4"
+	}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Bagel Studio
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/pageTitle-B1mtDJKn.js

@@ -1,59 +0,0 @@
-const PREFERRED_CONTEXT_KEYS = ["$page", "$post", "$item", "$article", "$product", "$event", "$author"];
-const TITLE_FIELDS = ["meta_title", "metaTitle", "title", "name", "productName", "displayName"];
-function primaryPageContext(contexts) {
-  if (!contexts) return null;
-  const keys = [
-    ...PREFERRED_CONTEXT_KEYS.filter((key) => key in contexts),
-    ...Object.keys(contexts).filter((key) => key !== "$website" && !PREFERRED_CONTEXT_KEYS.includes(key)).sort()
-  ];
-  for (const key of keys) {
-    const ctx = contexts[key];
-    if (ctx != null && typeof ctx === "object") return { key, ctx };
-  }
-  return null;
-}
-function contextPageTitle(context) {
-  if (!context) return null;
-  for (const field of TITLE_FIELDS) {
-    const value = context[field];
-    if (typeof value === "string" && value.trim()) return value.trim();
-  }
-  return null;
-}
-function siteNameFromContexts(contexts) {
-  const website = contexts == null ? void 0 : contexts.$website;
-  const seo = website == null ? void 0 : website.seo;
-  const siteName = seo && typeof seo === "object" ? seo.site_name : website == null ? void 0 : website.site_name;
-  return typeof siteName === "string" && siteName.trim() ? siteName.trim() : null;
-}
-function withSiteName(title, siteName) {
-  if (!siteName || title.includes(siteName)) return title;
-  return `${title} · ${siteName}`;
-}
-function resolvePageTitle(resolved, options = {}) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const hasBinding = !!((_a = resolved.page) == null ? void 0 : _a.data_bindings) && Object.keys(resolved.page.data_bindings).length > 0;
-  const contextTitle = hasBinding ? contextPageTitle((_b = primaryPageContext(resolved.contexts)) == null ? void 0 : _b.ctx) : null;
-  const overrideTitle = (_c = options.override) == null ? void 0 : _c.trim();
-  if (overrideTitle) return overrideTitle;
-  if (contextTitle) return withSiteName(contextTitle, options.siteName);
-  if ((_e = (_d = resolved.page) == null ? void 0 : _d.meta_title) == null ? void 0 : _e.trim()) return resolved.page.meta_title.trim();
-  if ((_g = (_f = resolved.page) == null ? void 0 : _f.title) == null ? void 0 : _g.trim()) return withSiteName(resolved.page.title.trim(), options.siteName);
-  if ((_h = options.defaultTitle) == null ? void 0 : _h.trim()) return options.defaultTitle.trim();
-  if (options.siteName) return options.siteName;
-  return null;
-}
-function preserveCurrentSiteSuffix(title, currentTitle) {
-  const separator = " · ";
-  const suffixIndex = currentTitle.lastIndexOf(separator);
-  if (suffixIndex < 0) return title;
-  const siteName = currentTitle.slice(suffixIndex + separator.length).trim();
-  return withSiteName(title, siteName);
-}
-export {
-  preserveCurrentSiteSuffix as a,
-  contextPageTitle as c,
-  primaryPageContext as p,
-  resolvePageTitle as r,
-  siteNameFromContexts as s
-};

package/dist/pageTitle-wobGhtiZ.cjs

@@ -1,58 +0,0 @@
-"use strict";
-const PREFERRED_CONTEXT_KEYS = ["$page", "$post", "$item", "$article", "$product", "$event", "$author"];
-const TITLE_FIELDS = ["meta_title", "metaTitle", "title", "name", "productName", "displayName"];
-function primaryPageContext(contexts) {
-  if (!contexts) return null;
-  const keys = [
-    ...PREFERRED_CONTEXT_KEYS.filter((key) => key in contexts),
-    ...Object.keys(contexts).filter((key) => key !== "$website" && !PREFERRED_CONTEXT_KEYS.includes(key)).sort()
-  ];
-  for (const key of keys) {
-    const ctx = contexts[key];
-    if (ctx != null && typeof ctx === "object") return { key, ctx };
-  }
-  return null;
-}
-function contextPageTitle(context) {
-  if (!context) return null;
-  for (const field of TITLE_FIELDS) {
-    const value = context[field];
-    if (typeof value === "string" && value.trim()) return value.trim();
-  }
-  return null;
-}
-function siteNameFromContexts(contexts) {
-  const website = contexts == null ? void 0 : contexts.$website;
-  const seo = website == null ? void 0 : website.seo;
-  const siteName = seo && typeof seo === "object" ? seo.site_name : website == null ? void 0 : website.site_name;
-  return typeof siteName === "string" && siteName.trim() ? siteName.trim() : null;
-}
-function withSiteName(title, siteName) {
-  if (!siteName || title.includes(siteName)) return title;
-  return `${title} · ${siteName}`;
-}
-function resolvePageTitle(resolved, options = {}) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
-  const hasBinding = !!((_a = resolved.page) == null ? void 0 : _a.data_bindings) && Object.keys(resolved.page.data_bindings).length > 0;
-  const contextTitle = hasBinding ? contextPageTitle((_b = primaryPageContext(resolved.contexts)) == null ? void 0 : _b.ctx) : null;
-  const overrideTitle = (_c = options.override) == null ? void 0 : _c.trim();
-  if (overrideTitle) return overrideTitle;
-  if (contextTitle) return withSiteName(contextTitle, options.siteName);
-  if ((_e = (_d = resolved.page) == null ? void 0 : _d.meta_title) == null ? void 0 : _e.trim()) return resolved.page.meta_title.trim();
-  if ((_g = (_f = resolved.page) == null ? void 0 : _f.title) == null ? void 0 : _g.trim()) return withSiteName(resolved.page.title.trim(), options.siteName);
-  if ((_h = options.defaultTitle) == null ? void 0 : _h.trim()) return options.defaultTitle.trim();
-  if (options.siteName) return options.siteName;
-  return null;
-}
-function preserveCurrentSiteSuffix(title, currentTitle) {
-  const separator = " · ";
-  const suffixIndex = currentTitle.lastIndexOf(separator);
-  if (suffixIndex < 0) return title;
-  const siteName = currentTitle.slice(suffixIndex + separator.length).trim();
-  return withSiteName(title, siteName);
-}
-exports.contextPageTitle = contextPageTitle;
-exports.preserveCurrentSiteSuffix = preserveCurrentSiteSuffix;
-exports.primaryPageContext = primaryPageContext;
-exports.resolvePageTitle = resolvePageTitle;
-exports.siteNameFromContexts = siteNameFromContexts;