@cmssy/astro 9.10.0 → 10.1.0

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var core = require('@cmssy/core');
+var internal = require('@cmssy/core/internal');
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -8,9 +9,9 @@ function cmssyMiddleware(config, options = {}) {
   return async function onRequest(context, next) {
     const { pathname } = context.url;
     context.request.headers.delete(core.CMSSY_EDIT_HEADER);
-    context.request.headers.delete(core.CMSSY_LOCALE_HEADER);
-    const locale = await core.localeForPathname(config, pathname);
-    context.request.headers.set(core.CMSSY_LOCALE_HEADER, locale);
+    context.request.headers.delete(internal.CMSSY_LOCALE_HEADER);
+    const locale = await internal.localeForPathname(config, pathname);
+    context.request.headers.set(internal.CMSSY_LOCALE_HEADER, locale);
     const editRequested = context.url.searchParams.getAll(core.CMSSY_EDIT_QUERY_PARAM).includes("1");
     if (editRequested) {
       const verified = await core.isVerifiedEditUrl(context.url, config);
@@ -21,7 +22,7 @@ function cmssyMiddleware(config, options = {}) {
         core.applyCmssyCsp(response, { editorOrigin: config.editorOrigin });
         return response;
       }
-      if (!verified && core.isDevelopment()) {
+      if (!verified && internal.isDevelopment()) {
         const { collectEditDiagnostics, renderEditDiagnosticsDocument } = await import('@cmssy/core/preflight');
         const diagnostics = await collectEditDiagnostics({
           config,
@@ -37,7 +38,7 @@ function cmssyMiddleware(config, options = {}) {
       }
     }
     if (options.stripLocalePrefix && pathname.startsWith(`/${locale}`)) {
-      const { defaultLocale } = await core.resolveSiteLocales(config);
+      const { defaultLocale } = await internal.resolveSiteLocales(config);
       if (locale !== defaultLocale) {
         const stripped = pathname.slice(locale.length + 1) || "/";
         return context.rewrite(`${stripped}${context.url.search}`);
@@ -48,15 +49,15 @@ function cmssyMiddleware(config, options = {}) {
 }
 async function loadCmssyPage(config, request, url) {
   const isEdit = request.headers.get(core.CMSSY_EDIT_HEADER) === "1";
-  const siteLocales = await core.resolveSiteLocales(config);
+  const siteLocales = await internal.resolveSiteLocales(config);
   const segments = url.pathname.replace(/^\/cmssy-edit/, "").split("/").filter(Boolean);
-  const fromPath = core.splitLocaleFromPath(segments, siteLocales);
-  const locale = request.headers.get(core.CMSSY_LOCALE_HEADER) ?? fromPath.locale;
+  const fromPath = internal.splitLocaleFromPath(segments, siteLocales);
+  const locale = request.headers.get(internal.CMSSY_LOCALE_HEADER) ?? fromPath.locale;
   const path = fromPath.path;
   const previewSecret = isEdit ? config.draftSecret : void 0;
   const [page, layouts] = await Promise.all([
-    core.fetchPage(config, path, { previewSecret }),
-    core.fetchLayouts(config, path, { previewSecret })
+    internal.fetchPage(config, path, { previewSecret }),
+    internal.fetchLayouts(config, path, { previewSecret })
   ]);
   return {
     page,
@@ -67,77 +68,6 @@ async function loadCmssyPage(config, request, url) {
     isEdit
   };
 }
-function xmlEscape(value) {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function baseUrlFor(config, url, request) {
-  if (config.siteUrl) return config.siteUrl.replace(/\/+$/, "");
-  const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
-  if (!host) return url.origin.replace(/\/+$/, "");
-  const protocol = request.headers.get("x-forwarded-proto") ?? (host.startsWith("localhost") || host.startsWith("127.0.0.1") ? "http" : "https");
-  return `${protocol}://${host}`.replace(/\/+$/, "");
-}
-function createCmssySitemap(config, options = {}) {
-  return async function GET({
-    url,
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, url, request);
-    const { defaultLocale, locales } = await core.resolveSiteLocales(config);
-    const pages = await core.fetchPages(config);
-    const entries = [];
-    for (const page of pages) {
-      const slug = core.normalizeSlug(page.slug);
-      for (const locale of locales) {
-        entries.push({
-          url: `${baseUrl}${core.localizedPath(slug, locale, defaultLocale)}`,
-          lastModified: page.updatedAt ?? void 0
-        });
-      }
-    }
-    if (options.extra) {
-      entries.push(
-        ...await options.extra({
-          baseUrl,
-          defaultLocale,
-          locales
-        })
-      );
-    }
-    const body = [
-      '<?xml version="1.0" encoding="UTF-8"?>',
-      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
-      ...entries.map(
-        (entry) => [
-          "  <url>",
-          `    <loc>${xmlEscape(entry.url)}</loc>`,
-          entry.lastModified ? `    <lastmod>${xmlEscape(entry.lastModified)}</lastmod>` : "",
-          "  </url>"
-        ].filter(Boolean).join("\n")
-      ),
-      "</urlset>"
-    ].join("\n");
-    return new Response(body, {
-      headers: { "content-type": "application/xml" }
-    });
-  };
-}
-function createCmssyRobots(config) {
-  return async function GET({
-    url,
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, url, request);
-    const body = [
-      "User-agent: *",
-      "Allow: /",
-      "Disallow: /cmssy-edit",
-      `Sitemap: ${baseUrl}/sitemap.xml`,
-      ""
-    ].join("\n");
-    return new Response(body, { headers: { "content-type": "text/plain" } });
-  };
-}
 
 Object.defineProperty(exports, "CMSSY_EDIT_HEADER", {
   enumerable: true,
@@ -147,10 +77,6 @@ Object.defineProperty(exports, "CMSSY_LOCALE_HEADER", {
   enumerable: true,
   get: function () { return core.CMSSY_LOCALE_HEADER; }
 });
-Object.defineProperty(exports, "buildBlockContext", {
-  enumerable: true,
-  get: function () { return core.buildBlockContext; }
-});
 Object.defineProperty(exports, "createCmssyClient", {
   enumerable: true,
   get: function () { return core.createCmssyClient; }
@@ -159,40 +85,10 @@ Object.defineProperty(exports, "defineCmssyConfig", {
   enumerable: true,
   get: function () { return core.defineCmssyConfig; }
 });
-Object.defineProperty(exports, "fetchLayouts", {
-  enumerable: true,
-  get: function () { return core.fetchLayouts; }
-});
-Object.defineProperty(exports, "fetchPage", {
-  enumerable: true,
-  get: function () { return core.fetchPage; }
-});
-Object.defineProperty(exports, "fetchPageMeta", {
-  enumerable: true,
-  get: function () { return core.fetchPageMeta; }
-});
-Object.defineProperty(exports, "fetchPages", {
-  enumerable: true,
-  get: function () { return core.fetchPages; }
-});
-Object.defineProperty(exports, "fetchProduct", {
-  enumerable: true,
-  get: function () { return core.fetchProduct; }
-});
-Object.defineProperty(exports, "fetchProducts", {
-  enumerable: true,
-  get: function () { return core.fetchProducts; }
-});
 Object.defineProperty(exports, "localizeHref", {
   enumerable: true,
   get: function () { return core.localizeHref; }
 });
-Object.defineProperty(exports, "resolveSiteLocales", {
-  enumerable: true,
-  get: function () { return core.resolveSiteLocales; }
-});
 exports.CMSSY_EDIT_PATH_PREFIX = CMSSY_EDIT_PATH_PREFIX;
 exports.cmssyMiddleware = cmssyMiddleware;
-exports.createCmssyRobots = createCmssyRobots;
-exports.createCmssySitemap = createCmssySitemap;
 exports.loadCmssyPage = loadCmssyPage;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, localizeHref, resolveSiteLocales } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
 interface CmssyMiddlewareOptions {
@@ -50,33 +50,4 @@ interface CmssyPageResult {
  */
 declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL): Promise<CmssyPageResult>;
 
-interface CmssySitemapEntry {
-    url: string;
-    lastModified?: string;
-}
-interface CmssySitemapOptions {
-    /**
-     * Records are not pages, so the sitemap cannot know about your products or
-     * categories. Add them here; you get the same base URL and locales the page
-     * entries use, so the two cannot disagree.
-     */
-    extra?: (context: {
-        baseUrl: string;
-        defaultLocale: string;
-        locales: string[];
-    }) => Promise<CmssySitemapEntry[]> | CmssySitemapEntry[];
-}
-/**
- * One `<url>` per language, plus x-default - a translated page is not a
- * duplicate, and telling Google it is keeps the translation out of the index.
- */
-declare function createCmssySitemap(config: CmssyConfig, options?: CmssySitemapOptions): ({ url, request, }: {
-    url: URL;
-    request: Request;
-}) => Promise<Response>;
-declare function createCmssyRobots(config: CmssyConfig): ({ url, request, }: {
-    url: URL;
-    request: Request;
-}) => Promise<Response>;
-
-export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, type CmssySitemapEntry, type CmssySitemapOptions, cmssyMiddleware, createCmssyRobots, createCmssySitemap, loadCmssyPage };
+export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, cmssyMiddleware, loadCmssyPage };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { CmssyConfig, CmssyPageData, CmssyLayoutGroup } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, localizeHref, resolveSiteLocales } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, CmssyBlockContext, CmssyConfig, CmssyEnvConfig, CmssyLayoutGroup, CmssyPageData, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
 
 declare const CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
 interface CmssyMiddlewareOptions {
@@ -50,33 +50,4 @@ interface CmssyPageResult {
  */
 declare function loadCmssyPage(config: CmssyConfig, request: Request, url: URL): Promise<CmssyPageResult>;
 
-interface CmssySitemapEntry {
-    url: string;
-    lastModified?: string;
-}
-interface CmssySitemapOptions {
-    /**
-     * Records are not pages, so the sitemap cannot know about your products or
-     * categories. Add them here; you get the same base URL and locales the page
-     * entries use, so the two cannot disagree.
-     */
-    extra?: (context: {
-        baseUrl: string;
-        defaultLocale: string;
-        locales: string[];
-    }) => Promise<CmssySitemapEntry[]> | CmssySitemapEntry[];
-}
-/**
- * One `<url>` per language, plus x-default - a translated page is not a
- * duplicate, and telling Google it is keeps the translation out of the index.
- */
-declare function createCmssySitemap(config: CmssyConfig, options?: CmssySitemapOptions): ({ url, request, }: {
-    url: URL;
-    request: Request;
-}) => Promise<Response>;
-declare function createCmssyRobots(config: CmssyConfig): ({ url, request, }: {
-    url: URL;
-    request: Request;
-}) => Promise<Response>;
-
-export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, type CmssySitemapEntry, type CmssySitemapOptions, cmssyMiddleware, createCmssyRobots, createCmssySitemap, loadCmssyPage };
+export { CMSSY_EDIT_PATH_PREFIX, type CmssyMiddlewareOptions, type CmssyPageResult, cmssyMiddleware, loadCmssyPage };

package/dist/index.js

@@ -1,5 +1,6 @@
-import { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, localeForPathname, CMSSY_EDIT_QUERY_PARAM, isVerifiedEditUrl, applyCmssyCsp, isDevelopment, CMSSY_SECRET_QUERY_PARAM, resolveSiteLocales, splitLocaleFromPath, fetchPage, fetchLayouts, fetchPages, normalizeSlug, localizedPath } from '@cmssy/core';
-export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, buildBlockContext, createCmssyClient, defineCmssyConfig, fetchLayouts, fetchPage, fetchPageMeta, fetchPages, fetchProduct, fetchProducts, localizeHref, resolveSiteLocales } from '@cmssy/core';
+import { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, isVerifiedEditUrl, applyCmssyCsp, CMSSY_SECRET_QUERY_PARAM } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, createCmssyClient, defineCmssyConfig, localizeHref } from '@cmssy/core';
+import { CMSSY_LOCALE_HEADER, localeForPathname, isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, fetchLayouts } from '@cmssy/core/internal';
 
 // src/middleware.ts
 var CMSSY_EDIT_PATH_PREFIX = "/cmssy-edit";
@@ -66,76 +67,5 @@ async function loadCmssyPage(config, request, url) {
     isEdit
   };
 }
-function xmlEscape(value) {
-  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function baseUrlFor(config, url, request) {
-  if (config.siteUrl) return config.siteUrl.replace(/\/+$/, "");
-  const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
-  if (!host) return url.origin.replace(/\/+$/, "");
-  const protocol = request.headers.get("x-forwarded-proto") ?? (host.startsWith("localhost") || host.startsWith("127.0.0.1") ? "http" : "https");
-  return `${protocol}://${host}`.replace(/\/+$/, "");
-}
-function createCmssySitemap(config, options = {}) {
-  return async function GET({
-    url,
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, url, request);
-    const { defaultLocale, locales } = await resolveSiteLocales(config);
-    const pages = await fetchPages(config);
-    const entries = [];
-    for (const page of pages) {
-      const slug = normalizeSlug(page.slug);
-      for (const locale of locales) {
-        entries.push({
-          url: `${baseUrl}${localizedPath(slug, locale, defaultLocale)}`,
-          lastModified: page.updatedAt ?? void 0
-        });
-      }
-    }
-    if (options.extra) {
-      entries.push(
-        ...await options.extra({
-          baseUrl,
-          defaultLocale,
-          locales
-        })
-      );
-    }
-    const body = [
-      '<?xml version="1.0" encoding="UTF-8"?>',
-      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
-      ...entries.map(
-        (entry) => [
-          "  <url>",
-          `    <loc>${xmlEscape(entry.url)}</loc>`,
-          entry.lastModified ? `    <lastmod>${xmlEscape(entry.lastModified)}</lastmod>` : "",
-          "  </url>"
-        ].filter(Boolean).join("\n")
-      ),
-      "</urlset>"
-    ].join("\n");
-    return new Response(body, {
-      headers: { "content-type": "application/xml" }
-    });
-  };
-}
-function createCmssyRobots(config) {
-  return async function GET({
-    url,
-    request
-  }) {
-    const baseUrl = baseUrlFor(config, url, request);
-    const body = [
-      "User-agent: *",
-      "Allow: /",
-      "Disallow: /cmssy-edit",
-      `Sitemap: ${baseUrl}/sitemap.xml`,
-      ""
-    ].join("\n");
-    return new Response(body, { headers: { "content-type": "text/plain" } });
-  };
-}
 
-export { CMSSY_EDIT_PATH_PREFIX, cmssyMiddleware, createCmssyRobots, createCmssySitemap, loadCmssyPage };
+export { CMSSY_EDIT_PATH_PREFIX, cmssyMiddleware, loadCmssyPage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/astro",
-  "version": "9.10.0",
+  "version": "10.1.0",
   "description": "Astro bindings for cmssy headless sites: middleware, page loader, sitemap and robots.",
   "keywords": [
     "cmssy",
@@ -48,7 +48,7 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/core": "9.10.0"
+    "@cmssy/core": "10.1.0"
   },
   "scripts": {
     "build": "tsup",