@justanarthur/payload-www 1.3.0 → 1.4.1

package/README.md

@@ -318,8 +318,8 @@ the matching component from the host's `importMap`.
 ```ts
 import { imageHashPlugin } from '@justanarthur/payload-www/imagehash'
 import { translator }      from '@justanarthur/payload-www/translator'
+import { mcpPlugin }       from '@justanarthur/payload-www/mcp'
 import { seoPlugin }       from '@justanarthur/payload-plugin-seo'          // no re-export here, import directly
-import { mcpPlugin }       from '@payloadcms/plugin-mcp'                    // no re-export here, import directly
 ```
 
 Use these if you want to compose the default plugin set manually outside `createWWWConfig`. Full
@@ -347,6 +347,7 @@ The package's `package.json#exports` map:
 | `@justanarthur/payload-www/utils` | `generateImportName`, `getFromImportMap` |
 | `@justanarthur/payload-www/imagehash` | `imageHashPlugin`, `BlurhashPluginOptions` (re-export of `@justanarthur/payload-imagehash-plugin`) |
 | `@justanarthur/payload-www/translator` | `translator` (re-export of `@justanarthur/payload-plugin-translator`) |
+| `@justanarthur/payload-www/mcp` | `mcpPlugin`, `MCPPluginConfig` (re-export of `@payloadcms/plugin-mcp`) |
 | `@justanarthur/payload-www/import-map-provider` | `setImportMapProvider`, `getImportMap` (stubs in the current build — reserved for future use) |
 
 There is **no root import** (`.`) and **no `/server`, `/with-www-config`, `/globals`, `/hooks`,

package/dist/blocks.js

@@ -32,9 +32,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
     const block = blocks[i];
     const { blockType } = block;
     const blockConfig = (config.blocks ?? []).find((b) => b.slug === blockType);
-    const blockCustom = blockConfig?.custom?.[name];
-    const customPath = blockCustom?.path;
-    const wantsSearchParams = blockCustom?.searchParams === true;
+    const customPath = blockConfig?.custom?.[name]?.path;
     const importMapPath = (typeof customPath === "string" ? customPath : null) ?? `${DEFAULT_BLOCK_PATH_PREFIX}/${blockType}`;
     const Block = await getFromImportMap(importMapPath, importMap);
     if (!Block) {
@@ -46,7 +44,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
       ...blockProps,
       ...block,
       locale,
-      ...wantsSearchParams ? { searchParams } : null
+      searchParams
     }, i));
   }
   return /* @__PURE__ */ jsx(Fragment, {

package/dist/collections.js

@@ -177,55 +177,16 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField2, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const collectionConfig = payload.collections[collectionSlug]?.config;
-    if (!collectionConfig)
-      return [];
-    const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-    const snakeSlugField = slugField2;
-    const drizzleDb = payload.db.drizzle;
-    if (!drizzleDb?.execute) {
-      const result2 = await payload.find({
-        collection: collectionSlug,
-        draft: false,
-        limit: 1000,
-        pagination: false,
-        overrideAccess: true
-      });
-      return (result2.docs ?? []).map((d) => ({ [slugField2]: d[slugField2] }));
-    }
-    const hasVersions = Boolean(collectionConfig.versions);
-    const isSlugLocalized = (() => {
-      const fields = collectionConfig.fields;
-      if (!Array.isArray(fields))
-        return false;
-      const found = fields.find((f) => f.name === slugField2);
-      return Boolean(found?.localized);
-    })();
-    const hasLocales = Boolean(collectionConfig.custom?._isLocalized) || Boolean(payload.config.localization?.locales?.length);
-    const localesTableName = `${tableName}_locales`;
-    let sqlText;
-    const safeLocale = locale.replace(/'/g, "''");
-    if (isSlugLocalized && hasLocales) {
-      const statusFilter = hasVersions ? ` AND "${tableName}"."_status" = 'published'` : "";
-      sqlText = `
-          SELECT DISTINCT ON ("${tableName}"."id")
-            "${tableName}"."id" AS "id",
-            "${localesTableName}"."${snakeSlugField}" AS "${snakeSlugField}",
-            "${tableName}"."updated_at" AS "updated_at"
-          FROM "${tableName}"
-          JOIN "${localesTableName}" ON "${localesTableName}"."_parent_id" = "${tableName}"."id"
-          WHERE "${localesTableName}"."_locale" = '${safeLocale}'${statusFilter}
-          ORDER BY "${tableName}"."id", "${tableName}"."created_at" DESC
-          LIMIT 1000
-        `;
-    } else {
-      const statusFilter = hasVersions ? ` WHERE "_status" = 'published'` : "";
-      sqlText = `SELECT id, "${snakeSlugField}", "updated_at" FROM "${tableName}"${statusFilter} ORDER BY "created_at" DESC LIMIT 1000`;
-    }
-    const { sql: drizzleSql } = await import("drizzle-orm");
-    const result = await drizzleDb.execute(drizzleSql.raw(sqlText));
-    const rows = result.rows ?? [];
-    return rows.map((r) => ({ [slugField2]: r[snakeSlugField], id: r.id, updatedAt: r.updated_at }));
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft: false,
+      limit: 1000,
+      pagination: false,
+      overrideAccess: false,
+      select: { [slugField2]: true },
+      locale
+    });
+    return result.docs ?? [];
   });
 }
 async function queryAllLocaleSlugs({
@@ -235,46 +196,13 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const collectionConfig = payload.collections[collectionSlug]?.config;
-  if (!collectionConfig)
-    return null;
-  const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-  const snakeSlugField = slugField2;
-  const localesTableName = `${tableName}_locales`;
-  const drizzleDb = payload.db.drizzle;
-  if (!drizzleDb?.execute) {
-    const doc = await payload.findByID({
-      collection: collectionSlug,
-      id,
-      locale: "all",
-      select: { [slugField2]: true }
-    });
-    return doc?.[slugField2] ?? null;
-  }
-  const { sql: drizzleSql } = await import("drizzle-orm");
-  const slugFieldConfig = collectionConfig.fields?.find((f) => f && f.name === slugField2);
-  const slugIsLocalized = Boolean(slugFieldConfig?.localized);
-  if (!slugIsLocalized) {
-    const result2 = await drizzleDb.execute(drizzleSql`SELECT ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(tableName)} WHERE "id" = ${id}`);
-    const rows2 = result2.rows ?? [];
-    const slugValue = rows2[0]?.[snakeSlugField];
-    if (typeof slugValue !== "string")
-      return null;
-    const localization = payload.config.localization;
-    const localeCodes = localization ? localization.localeCodes ?? localization.locales.map((l) => l.code) : [];
-    if (localeCodes.length === 0)
-      return null;
-    return Object.fromEntries(localeCodes.map((code) => [code, slugValue]));
-  }
-  const result = await drizzleDb.execute(drizzleSql`SELECT _locale, ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(localesTableName)} WHERE "_parent_id" = ${id}`);
-  const rows = result.rows ?? [];
-  const out = {};
-  for (const r of rows) {
-    if (typeof r._locale === "string" && typeof r[snakeSlugField] === "string") {
-      out[r._locale] = r[snakeSlugField];
-    }
-  }
-  return out;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField2]: true }
+  });
+  return doc?.[slugField2];
 }
 
 // src/exports/collections.ts

package/dist/config.js

@@ -346,6 +346,7 @@ var createHeaderGlobal = () => createWWWCollectionGlobal([
 import { seoPlugin } from "@justanarthur/payload-plugin-seo";
 import { imageHashPlugin } from "@justanarthur/payload-imagehash-plugin";
 import { translator } from "@justanarthur/payload-plugin-translator";
+import { mcpPlugin } from "@payloadcms/plugin-mcp";
 function createWWWConfig() {
   function withWWWConfig(input) {
     const { defaultPluginsConfigs, ...config } = input;
@@ -380,7 +381,17 @@ function createWWWConfig() {
             model: "gpt-5.4-mini"
           })
         ]
-      }, defaultPluginsConfigs?.translator))
+      }, defaultPluginsConfigs?.translator)),
+      mcpPlugin(mergeOrOverride({
+        collections: Object.fromEntries(collections.map(({ slug, admin }) => [slug, {
+          enabled: { find: true, create: true, update: true, delete: true },
+          description: typeof admin?.description === "string" ? admin.description : undefined
+        }])),
+        globals: Object.fromEntries(globals.map(({ slug, admin }) => [slug, {
+          enabled: { find: true, update: true },
+          description: typeof admin?.description === "string" ? admin.description : undefined
+        }]))
+      }, defaultPluginsConfigs?.mcp))
     ];
     const plugins = mergeOrOverride(defaultPlugins, config.plugins);
     return {

package/dist/mcp.d.ts

@@ -0,0 +1,3 @@
+import { mcpPlugin } from "@payloadcms/plugin-mcp";
+import { MCPPluginConfig } from "@payloadcms/plugin-mcp";
+export { mcpPlugin, mcpPlugin as default, MCPPluginConfig };

package/dist/mcp.js

@@ -0,0 +1,9 @@
+
+
+// src/exports/mcp.ts
+import { mcpPlugin } from "@payloadcms/plugin-mcp";
+var mcp_default = mcpPlugin;
+export {
+  mcpPlugin,
+  mcp_default as default
+};

package/dist/metadata.js

@@ -105,6 +105,11 @@ function slugToParamsSlug(slug, shape) {
     return shape === "catch-all" ? [] : "";
   return shape === "catch-all" ? slug.split(SLUG_NESTED_DIVIDER) : slug;
 }
+function slugToPath(slug) {
+  if (!slug)
+    return "";
+  return slug.split(SLUG_NESTED_DIVIDER).join("/");
+}
 
 // src/render/metadata/query.ts
 import { getPayload } from "payload";
@@ -199,55 +204,16 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const collectionConfig = payload.collections[collectionSlug]?.config;
-    if (!collectionConfig)
-      return [];
-    const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-    const snakeSlugField = slugField;
-    const drizzleDb = payload.db.drizzle;
-    if (!drizzleDb?.execute) {
-      const result2 = await payload.find({
-        collection: collectionSlug,
-        draft: false,
-        limit: 1000,
-        pagination: false,
-        overrideAccess: true
-      });
-      return (result2.docs ?? []).map((d) => ({ [slugField]: d[slugField] }));
-    }
-    const hasVersions = Boolean(collectionConfig.versions);
-    const isSlugLocalized = (() => {
-      const fields = collectionConfig.fields;
-      if (!Array.isArray(fields))
-        return false;
-      const found = fields.find((f) => f.name === slugField);
-      return Boolean(found?.localized);
-    })();
-    const hasLocales = Boolean(collectionConfig.custom?._isLocalized) || Boolean(payload.config.localization?.locales?.length);
-    const localesTableName = `${tableName}_locales`;
-    let sqlText;
-    const safeLocale = locale.replace(/'/g, "''");
-    if (isSlugLocalized && hasLocales) {
-      const statusFilter = hasVersions ? ` AND "${tableName}"."_status" = 'published'` : "";
-      sqlText = `
-          SELECT DISTINCT ON ("${tableName}"."id")
-            "${tableName}"."id" AS "id",
-            "${localesTableName}"."${snakeSlugField}" AS "${snakeSlugField}",
-            "${tableName}"."updated_at" AS "updated_at"
-          FROM "${tableName}"
-          JOIN "${localesTableName}" ON "${localesTableName}"."_parent_id" = "${tableName}"."id"
-          WHERE "${localesTableName}"."_locale" = '${safeLocale}'${statusFilter}
-          ORDER BY "${tableName}"."id", "${tableName}"."created_at" DESC
-          LIMIT 1000
-        `;
-    } else {
-      const statusFilter = hasVersions ? ` WHERE "_status" = 'published'` : "";
-      sqlText = `SELECT id, "${snakeSlugField}", "updated_at" FROM "${tableName}"${statusFilter} ORDER BY "created_at" DESC LIMIT 1000`;
-    }
-    const { sql: drizzleSql } = await import("drizzle-orm");
-    const result = await drizzleDb.execute(drizzleSql.raw(sqlText));
-    const rows = result.rows ?? [];
-    return rows.map((r) => ({ [slugField]: r[snakeSlugField], id: r.id, updatedAt: r.updated_at }));
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft: false,
+      limit: 1000,
+      pagination: false,
+      overrideAccess: false,
+      select: { [slugField]: true },
+      locale
+    });
+    return result.docs ?? [];
   });
 }
 async function queryAllLocaleSlugs({
@@ -257,46 +223,13 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const collectionConfig = payload.collections[collectionSlug]?.config;
-  if (!collectionConfig)
-    return null;
-  const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-  const snakeSlugField = slugField;
-  const localesTableName = `${tableName}_locales`;
-  const drizzleDb = payload.db.drizzle;
-  if (!drizzleDb?.execute) {
-    const doc = await payload.findByID({
-      collection: collectionSlug,
-      id,
-      locale: "all",
-      select: { [slugField]: true }
-    });
-    return doc?.[slugField] ?? null;
-  }
-  const { sql: drizzleSql } = await import("drizzle-orm");
-  const slugFieldConfig = collectionConfig.fields?.find((f) => f && f.name === slugField);
-  const slugIsLocalized = Boolean(slugFieldConfig?.localized);
-  if (!slugIsLocalized) {
-    const result2 = await drizzleDb.execute(drizzleSql`SELECT ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(tableName)} WHERE "id" = ${id}`);
-    const rows2 = result2.rows ?? [];
-    const slugValue = rows2[0]?.[snakeSlugField];
-    if (typeof slugValue !== "string")
-      return null;
-    const localization = payload.config.localization;
-    const localeCodes = localization ? localization.localeCodes ?? localization.locales.map((l) => l.code) : [];
-    if (localeCodes.length === 0)
-      return null;
-    return Object.fromEntries(localeCodes.map((code) => [code, slugValue]));
-  }
-  const result = await drizzleDb.execute(drizzleSql`SELECT _locale, ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(localesTableName)} WHERE "_parent_id" = ${id}`);
-  const rows = result.rows ?? [];
-  const out = {};
-  for (const r of rows) {
-    if (typeof r._locale === "string" && typeof r[snakeSlugField] === "string") {
-      out[r._locale] = r[snakeSlugField];
-    }
-  }
-  return out;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField]: true }
+  });
+  return doc?.[slugField];
 }
 
 // src/exports/metadata.ts

package/dist/pages.d.ts

@@ -15,23 +15,13 @@ import { ImportMap as ImportMap3, SanitizedConfig as SanitizedConfig2 } from "pa
 import { ReactNode as ReactNode2 } from "react";
 type SlugShape = "single" | "catch-all";
 type NextPageProps = {
-	params: {
+	params: Promise<{
 		locale: string;
 		slug?: string | string[];
-	};
-};
-type RoutingConfig = {
-	locales: readonly string[];
-	defaultLocale: string;
-	localePrefix?: "always" | "as-needed" | "never" | {
-		mode: "always" | "as-needed" | "never";
-		prefixes?: Partial<Record<string, string>>;
-	};
-	localeDetection?: boolean;
-	domains?: unknown;
-	localeCookie?: unknown;
-	alternateLinks?: boolean;
+	}>;
 };
+import { RoutingConfig as GenericRoutingConfig } from "next-intl/routing";
+type RoutingConfig = GenericRoutingConfig<string[], any, any, any>;
 type CreateCollectionPageExportsArgs<S extends string = "pages"> = {
 	slug?: S;
 	config: Promise<SanitizedConfig2>;
@@ -42,8 +32,6 @@ type CreateCollectionPageExportsArgs<S extends string = "pages"> = {
 type CreateCollectionPageExportsDeps<S extends string> = {
 	getServerSideURL: () => string;
 	pagePathPrefix?: string;
-	generateMeta?: (...args: any[]) => any;
-	metadataType?: "website" | "article";
 };
 declare function createCollectionPageExports<S extends string = "pages">({ slug: collectionSlug, config: configPromise, importMap, routing, slugShape }: CreateCollectionPageExportsArgs<S>, { getServerSideURL, pagePathPrefix }: CreateCollectionPageExportsDeps<S>): {
 	default: (props: NextPageProps) => Promise<ReactNode2>;

package/dist/pages.js

@@ -146,9 +146,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
     const block = blocks[i];
     const { blockType } = block;
     const blockConfig = (config.blocks ?? []).find((b) => b.slug === blockType);
-    const blockCustom = blockConfig?.custom?.[name];
-    const customPath = blockCustom?.path;
-    const wantsSearchParams = blockCustom?.searchParams === true;
+    const customPath = blockConfig?.custom?.[name]?.path;
     const importMapPath = (typeof customPath === "string" ? customPath : null) ?? `${DEFAULT_BLOCK_PATH_PREFIX}/${blockType}`;
     const Block = await getFromImportMap(importMapPath, importMap);
     if (!Block) {
@@ -160,7 +158,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
       ...blockProps,
       ...block,
       locale,
-      ...wantsSearchParams ? { searchParams } : null
+      searchParams
     }, i));
   }
   return /* @__PURE__ */ jsx3(Fragment, {
@@ -194,6 +192,11 @@ function slugToParamsSlug(slug, shape) {
     return shape === "catch-all" ? [] : "";
   return shape === "catch-all" ? slug.split(SLUG_NESTED_DIVIDER) : slug;
 }
+function slugToPath(slug) {
+  if (!slug)
+    return "";
+  return slug.split(SLUG_NESTED_DIVIDER).join("/");
+}
 
 // src/render/metadata/query.ts
 import { getPayload } from "payload";
@@ -288,55 +291,16 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const collectionConfig = payload.collections[collectionSlug]?.config;
-    if (!collectionConfig)
-      return [];
-    const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-    const snakeSlugField = slugField;
-    const drizzleDb = payload.db.drizzle;
-    if (!drizzleDb?.execute) {
-      const result2 = await payload.find({
-        collection: collectionSlug,
-        draft: false,
-        limit: 1000,
-        pagination: false,
-        overrideAccess: true
-      });
-      return (result2.docs ?? []).map((d) => ({ [slugField]: d[slugField] }));
-    }
-    const hasVersions = Boolean(collectionConfig.versions);
-    const isSlugLocalized = (() => {
-      const fields = collectionConfig.fields;
-      if (!Array.isArray(fields))
-        return false;
-      const found = fields.find((f) => f.name === slugField);
-      return Boolean(found?.localized);
-    })();
-    const hasLocales = Boolean(collectionConfig.custom?._isLocalized) || Boolean(payload.config.localization?.locales?.length);
-    const localesTableName = `${tableName}_locales`;
-    let sqlText;
-    const safeLocale = locale.replace(/'/g, "''");
-    if (isSlugLocalized && hasLocales) {
-      const statusFilter = hasVersions ? ` AND "${tableName}"."_status" = 'published'` : "";
-      sqlText = `
-          SELECT DISTINCT ON ("${tableName}"."id")
-            "${tableName}"."id" AS "id",
-            "${localesTableName}"."${snakeSlugField}" AS "${snakeSlugField}",
-            "${tableName}"."updated_at" AS "updated_at"
-          FROM "${tableName}"
-          JOIN "${localesTableName}" ON "${localesTableName}"."_parent_id" = "${tableName}"."id"
-          WHERE "${localesTableName}"."_locale" = '${safeLocale}'${statusFilter}
-          ORDER BY "${tableName}"."id", "${tableName}"."created_at" DESC
-          LIMIT 1000
-        `;
-    } else {
-      const statusFilter = hasVersions ? ` WHERE "_status" = 'published'` : "";
-      sqlText = `SELECT id, "${snakeSlugField}", "updated_at" FROM "${tableName}"${statusFilter} ORDER BY "created_at" DESC LIMIT 1000`;
-    }
-    const { sql: drizzleSql } = await import("drizzle-orm");
-    const result = await drizzleDb.execute(drizzleSql.raw(sqlText));
-    const rows = result.rows ?? [];
-    return rows.map((r) => ({ [slugField]: r[snakeSlugField], id: r.id, updatedAt: r.updated_at }));
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft: false,
+      limit: 1000,
+      pagination: false,
+      overrideAccess: false,
+      select: { [slugField]: true },
+      locale
+    });
+    return result.docs ?? [];
   });
 }
 async function queryAllLocaleSlugs({
@@ -346,46 +310,13 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const collectionConfig = payload.collections[collectionSlug]?.config;
-  if (!collectionConfig)
-    return null;
-  const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-  const snakeSlugField = slugField;
-  const localesTableName = `${tableName}_locales`;
-  const drizzleDb = payload.db.drizzle;
-  if (!drizzleDb?.execute) {
-    const doc = await payload.findByID({
-      collection: collectionSlug,
-      id,
-      locale: "all",
-      select: { [slugField]: true }
-    });
-    return doc?.[slugField] ?? null;
-  }
-  const { sql: drizzleSql } = await import("drizzle-orm");
-  const slugFieldConfig = collectionConfig.fields?.find((f) => f && f.name === slugField);
-  const slugIsLocalized = Boolean(slugFieldConfig?.localized);
-  if (!slugIsLocalized) {
-    const result2 = await drizzleDb.execute(drizzleSql`SELECT ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(tableName)} WHERE "id" = ${id}`);
-    const rows2 = result2.rows ?? [];
-    const slugValue = rows2[0]?.[snakeSlugField];
-    if (typeof slugValue !== "string")
-      return null;
-    const localization = payload.config.localization;
-    const localeCodes = localization ? localization.localeCodes ?? localization.locales.map((l) => l.code) : [];
-    if (localeCodes.length === 0)
-      return null;
-    return Object.fromEntries(localeCodes.map((code) => [code, slugValue]));
-  }
-  const result = await drizzleDb.execute(drizzleSql`SELECT _locale, ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(localesTableName)} WHERE "_parent_id" = ${id}`);
-  const rows = result.rows ?? [];
-  const out = {};
-  for (const r of rows) {
-    if (typeof r._locale === "string" && typeof r[snakeSlugField] === "string") {
-      out[r._locale] = r[snakeSlugField];
-    }
-  }
-  return out;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField]: true }
+  });
+  return doc?.[slugField];
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -393,25 +324,32 @@ import { setRequestLocale } from "next-intl/server";
 
 // src/render/pages/utils/buildLocalizedPath.ts
 function buildLocalizedPath(locale, prefix, slug, { routing }) {
+  const path = slugToPath(slug);
   return `${routing.localePrefix === "never" ? "" : routing.localePrefix === "always" ? locale : routing.localePrefix === "as-needed" ? locale === routing.defaultLocale ? "" : "/" + locale : (() => {
     throw new Error("Unsupported locale prefix");
-  })()}${prefix ? "/" + prefix : ""}${slug ? "/" + slug : ""}`;
+  })()}${prefix ? "/" + prefix : ""}${path ? "/" + path : ""}`;
 }
 function buildLocalizedPaths(localesSlug, pagePathPrefix, { routing }) {
+  if (!localesSlug[routing.defaultLocale])
+    return {};
   return routing.locales.reduce((paths, locale) => {
     const slug = localesSlug[locale];
+    if (!slug)
+      return paths;
     paths[locale] = buildLocalizedPath(locale, pagePathPrefix, slug, { routing });
     return paths;
   }, {});
 }
 function buildAlternates(locale, ...args) {
-  const siteUrl = args[2].siteUrl;
-  let localizedPaths = buildLocalizedPaths(...args);
-  localizedPaths["x-default"] = localizedPaths[args[2].routing.defaultLocale];
-  localizedPaths = Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + localizedPaths[key]]));
+  const [localesSlug, pagePathPrefix, { routing, siteUrl }] = args;
+  const localizedPaths = buildLocalizedPaths(...args);
+  const defaultPath = localizedPaths[routing.defaultLocale];
+  if (defaultPath !== undefined)
+    localizedPaths["x-default"] = defaultPath;
+  const canonical = localizedPaths[locale] ?? buildLocalizedPath(locale, pagePathPrefix, localesSlug[locale], { routing });
   return {
-    languages: localizedPaths,
-    canonical: localizedPaths[locale]
+    languages: Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + value])),
+    canonical: siteUrl + canonical
   };
 }
 
@@ -464,10 +402,6 @@ function createCollectionPageExports({
     });
   }
   const default_ = async (props) => {
-    if (!props || !props.params) {
-      const { notFound } = await import("next/navigation");
-      notFound();
-    }
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {

package/dist/render-pages.d.ts

@@ -18,10 +18,10 @@ import { ReactNode as ReactNode2 } from "react";
 type SlugShape = "single" | "catch-all";
 import { ReactNode } from "react";
 type NextPageProps = {
-	params: {
+	params: Promise<{
 		locale: string;
 		slug?: string | string[];
-	};
+	}>;
 };
 type NextLayoutProps = {
 	params: Promise<{
@@ -29,18 +29,8 @@ type NextLayoutProps = {
 	}>;
 	children: ReactNode;
 };
-type RoutingConfig = {
-	locales: readonly string[];
-	defaultLocale: string;
-	localePrefix?: "always" | "as-needed" | "never" | {
-		mode: "always" | "as-needed" | "never";
-		prefixes?: Partial<Record<string, string>>;
-	};
-	localeDetection?: boolean;
-	domains?: unknown;
-	localeCookie?: unknown;
-	alternateLinks?: boolean;
-};
+import { RoutingConfig as GenericRoutingConfig } from "next-intl/routing";
+type RoutingConfig = GenericRoutingConfig<string[], any, any, any>;
 type CreateCollectionPageExportsArgs<S extends string = "pages"> = {
 	slug?: S;
 	config: Promise<SanitizedConfig2>;
@@ -51,8 +41,6 @@ type CreateCollectionPageExportsArgs<S extends string = "pages"> = {
 type CreateCollectionPageExportsDeps<S extends string> = {
 	getServerSideURL: () => string;
 	pagePathPrefix?: string;
-	generateMeta?: (...args: any[]) => any;
-	metadataType?: "website" | "article";
 };
 declare function createCollectionPageExports<S extends string = "pages">({ slug: collectionSlug, config: configPromise, importMap, routing, slugShape }: CreateCollectionPageExportsArgs<S>, { getServerSideURL, pagePathPrefix }: CreateCollectionPageExportsDeps<S>): {
 	default: (props: NextPageProps) => Promise<ReactNode2>;

package/dist/render-pages.js

@@ -146,9 +146,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
     const block = blocks[i];
     const { blockType } = block;
     const blockConfig = (config.blocks ?? []).find((b) => b.slug === blockType);
-    const blockCustom = blockConfig?.custom?.[name];
-    const customPath = blockCustom?.path;
-    const wantsSearchParams = blockCustom?.searchParams === true;
+    const customPath = blockConfig?.custom?.[name]?.path;
     const importMapPath = (typeof customPath === "string" ? customPath : null) ?? `${DEFAULT_BLOCK_PATH_PREFIX}/${blockType}`;
     const Block = await getFromImportMap(importMapPath, importMap);
     if (!Block) {
@@ -160,7 +158,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
       ...blockProps,
       ...block,
       locale,
-      ...wantsSearchParams ? { searchParams } : null
+      searchParams
     }, i));
   }
   return /* @__PURE__ */ jsx3(Fragment, {
@@ -224,6 +222,11 @@ function slugToParamsSlug(slug, shape) {
     return shape === "catch-all" ? [] : "";
   return shape === "catch-all" ? slug.split(SLUG_NESTED_DIVIDER) : slug;
 }
+function slugToPath(slug) {
+  if (!slug)
+    return "";
+  return slug.split(SLUG_NESTED_DIVIDER).join("/");
+}
 
 // src/render/metadata/query.ts
 import { getPayload } from "payload";
@@ -318,55 +321,16 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const collectionConfig = payload.collections[collectionSlug]?.config;
-    if (!collectionConfig)
-      return [];
-    const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-    const snakeSlugField = slugField;
-    const drizzleDb = payload.db.drizzle;
-    if (!drizzleDb?.execute) {
-      const result2 = await payload.find({
-        collection: collectionSlug,
-        draft: false,
-        limit: 1000,
-        pagination: false,
-        overrideAccess: true
-      });
-      return (result2.docs ?? []).map((d) => ({ [slugField]: d[slugField] }));
-    }
-    const hasVersions = Boolean(collectionConfig.versions);
-    const isSlugLocalized = (() => {
-      const fields = collectionConfig.fields;
-      if (!Array.isArray(fields))
-        return false;
-      const found = fields.find((f) => f.name === slugField);
-      return Boolean(found?.localized);
-    })();
-    const hasLocales = Boolean(collectionConfig.custom?._isLocalized) || Boolean(payload.config.localization?.locales?.length);
-    const localesTableName = `${tableName}_locales`;
-    let sqlText;
-    const safeLocale = locale.replace(/'/g, "''");
-    if (isSlugLocalized && hasLocales) {
-      const statusFilter = hasVersions ? ` AND "${tableName}"."_status" = 'published'` : "";
-      sqlText = `
-          SELECT DISTINCT ON ("${tableName}"."id")
-            "${tableName}"."id" AS "id",
-            "${localesTableName}"."${snakeSlugField}" AS "${snakeSlugField}",
-            "${tableName}"."updated_at" AS "updated_at"
-          FROM "${tableName}"
-          JOIN "${localesTableName}" ON "${localesTableName}"."_parent_id" = "${tableName}"."id"
-          WHERE "${localesTableName}"."_locale" = '${safeLocale}'${statusFilter}
-          ORDER BY "${tableName}"."id", "${tableName}"."created_at" DESC
-          LIMIT 1000
-        `;
-    } else {
-      const statusFilter = hasVersions ? ` WHERE "_status" = 'published'` : "";
-      sqlText = `SELECT id, "${snakeSlugField}", "updated_at" FROM "${tableName}"${statusFilter} ORDER BY "created_at" DESC LIMIT 1000`;
-    }
-    const { sql: drizzleSql } = await import("drizzle-orm");
-    const result = await drizzleDb.execute(drizzleSql.raw(sqlText));
-    const rows = result.rows ?? [];
-    return rows.map((r) => ({ [slugField]: r[snakeSlugField], id: r.id, updatedAt: r.updated_at }));
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft: false,
+      limit: 1000,
+      pagination: false,
+      overrideAccess: false,
+      select: { [slugField]: true },
+      locale
+    });
+    return result.docs ?? [];
   });
 }
 async function queryAllLocaleSlugs({
@@ -376,46 +340,13 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const collectionConfig = payload.collections[collectionSlug]?.config;
-  if (!collectionConfig)
-    return null;
-  const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-  const snakeSlugField = slugField;
-  const localesTableName = `${tableName}_locales`;
-  const drizzleDb = payload.db.drizzle;
-  if (!drizzleDb?.execute) {
-    const doc = await payload.findByID({
-      collection: collectionSlug,
-      id,
-      locale: "all",
-      select: { [slugField]: true }
-    });
-    return doc?.[slugField] ?? null;
-  }
-  const { sql: drizzleSql } = await import("drizzle-orm");
-  const slugFieldConfig = collectionConfig.fields?.find((f) => f && f.name === slugField);
-  const slugIsLocalized = Boolean(slugFieldConfig?.localized);
-  if (!slugIsLocalized) {
-    const result2 = await drizzleDb.execute(drizzleSql`SELECT ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(tableName)} WHERE "id" = ${id}`);
-    const rows2 = result2.rows ?? [];
-    const slugValue = rows2[0]?.[snakeSlugField];
-    if (typeof slugValue !== "string")
-      return null;
-    const localization = payload.config.localization;
-    const localeCodes = localization ? localization.localeCodes ?? localization.locales.map((l) => l.code) : [];
-    if (localeCodes.length === 0)
-      return null;
-    return Object.fromEntries(localeCodes.map((code) => [code, slugValue]));
-  }
-  const result = await drizzleDb.execute(drizzleSql`SELECT _locale, ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(localesTableName)} WHERE "_parent_id" = ${id}`);
-  const rows = result.rows ?? [];
-  const out = {};
-  for (const r of rows) {
-    if (typeof r._locale === "string" && typeof r[snakeSlugField] === "string") {
-      out[r._locale] = r[snakeSlugField];
-    }
-  }
-  return out;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField]: true }
+  });
+  return doc?.[slugField];
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -423,25 +354,32 @@ import { setRequestLocale } from "next-intl/server";
 
 // src/render/pages/utils/buildLocalizedPath.ts
 function buildLocalizedPath(locale, prefix, slug, { routing }) {
+  const path = slugToPath(slug);
   return `${routing.localePrefix === "never" ? "" : routing.localePrefix === "always" ? locale : routing.localePrefix === "as-needed" ? locale === routing.defaultLocale ? "" : "/" + locale : (() => {
     throw new Error("Unsupported locale prefix");
-  })()}${prefix ? "/" + prefix : ""}${slug ? "/" + slug : ""}`;
+  })()}${prefix ? "/" + prefix : ""}${path ? "/" + path : ""}`;
 }
 function buildLocalizedPaths(localesSlug, pagePathPrefix, { routing }) {
+  if (!localesSlug[routing.defaultLocale])
+    return {};
   return routing.locales.reduce((paths, locale) => {
     const slug = localesSlug[locale];
+    if (!slug)
+      return paths;
     paths[locale] = buildLocalizedPath(locale, pagePathPrefix, slug, { routing });
     return paths;
   }, {});
 }
 function buildAlternates(locale, ...args) {
-  const siteUrl = args[2].siteUrl;
-  let localizedPaths = buildLocalizedPaths(...args);
-  localizedPaths["x-default"] = localizedPaths[args[2].routing.defaultLocale];
-  localizedPaths = Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + localizedPaths[key]]));
+  const [localesSlug, pagePathPrefix, { routing, siteUrl }] = args;
+  const localizedPaths = buildLocalizedPaths(...args);
+  const defaultPath = localizedPaths[routing.defaultLocale];
+  if (defaultPath !== undefined)
+    localizedPaths["x-default"] = defaultPath;
+  const canonical = localizedPaths[locale] ?? buildLocalizedPath(locale, pagePathPrefix, localesSlug[locale], { routing });
   return {
-    languages: localizedPaths,
-    canonical: localizedPaths[locale]
+    languages: Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + value])),
+    canonical: siteUrl + canonical
   };
 }
 
@@ -494,10 +432,6 @@ function createCollectionPageExports({
     });
   }
   const default_ = async (props) => {
-    if (!props || !props.params) {
-      const { notFound } = await import("next/navigation");
-      notFound();
-    }
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {

package/dist/sitemap.d.ts

@@ -1,8 +1,6 @@
 type CreateCollectionPageExportsDeps<S extends string> = {
 	getServerSideURL: () => string;
 	pagePathPrefix?: string;
-	generateMeta?: (...args: any[]) => any;
-	metadataType?: "website" | "article";
 };
 type GenerateSitemapPageExportsArgs = CreateCollectionPageExportsDeps<any>;
 declare function createSitemapFromCollections(...args: GenerateSitemapPageExportsArgs[]): () => Response;

package/dist/sitemap.js

@@ -15,6 +15,11 @@ function slugToParamsSlug(slug, shape) {
     return shape === "catch-all" ? [] : "";
   return shape === "catch-all" ? slug.split(SLUG_NESTED_DIVIDER) : slug;
 }
+function slugToPath(slug) {
+  if (!slug)
+    return "";
+  return slug.split(SLUG_NESTED_DIVIDER).join("/");
+}
 
 // src/render/metadata/query.ts
 import { getPayload } from "payload";
@@ -109,55 +114,16 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const collectionConfig = payload.collections[collectionSlug]?.config;
-    if (!collectionConfig)
-      return [];
-    const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-    const snakeSlugField = slugField;
-    const drizzleDb = payload.db.drizzle;
-    if (!drizzleDb?.execute) {
-      const result2 = await payload.find({
-        collection: collectionSlug,
-        draft: false,
-        limit: 1000,
-        pagination: false,
-        overrideAccess: true
-      });
-      return (result2.docs ?? []).map((d) => ({ [slugField]: d[slugField] }));
-    }
-    const hasVersions = Boolean(collectionConfig.versions);
-    const isSlugLocalized = (() => {
-      const fields = collectionConfig.fields;
-      if (!Array.isArray(fields))
-        return false;
-      const found = fields.find((f) => f.name === slugField);
-      return Boolean(found?.localized);
-    })();
-    const hasLocales = Boolean(collectionConfig.custom?._isLocalized) || Boolean(payload.config.localization?.locales?.length);
-    const localesTableName = `${tableName}_locales`;
-    let sqlText;
-    const safeLocale = locale.replace(/'/g, "''");
-    if (isSlugLocalized && hasLocales) {
-      const statusFilter = hasVersions ? ` AND "${tableName}"."_status" = 'published'` : "";
-      sqlText = `
-          SELECT DISTINCT ON ("${tableName}"."id")
-            "${tableName}"."id" AS "id",
-            "${localesTableName}"."${snakeSlugField}" AS "${snakeSlugField}",
-            "${tableName}"."updated_at" AS "updated_at"
-          FROM "${tableName}"
-          JOIN "${localesTableName}" ON "${localesTableName}"."_parent_id" = "${tableName}"."id"
-          WHERE "${localesTableName}"."_locale" = '${safeLocale}'${statusFilter}
-          ORDER BY "${tableName}"."id", "${tableName}"."created_at" DESC
-          LIMIT 1000
-        `;
-    } else {
-      const statusFilter = hasVersions ? ` WHERE "_status" = 'published'` : "";
-      sqlText = `SELECT id, "${snakeSlugField}", "updated_at" FROM "${tableName}"${statusFilter} ORDER BY "created_at" DESC LIMIT 1000`;
-    }
-    const { sql: drizzleSql } = await import("drizzle-orm");
-    const result = await drizzleDb.execute(drizzleSql.raw(sqlText));
-    const rows = result.rows ?? [];
-    return rows.map((r) => ({ [slugField]: r[snakeSlugField], id: r.id, updatedAt: r.updated_at }));
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft: false,
+      limit: 1000,
+      pagination: false,
+      overrideAccess: false,
+      select: { [slugField]: true },
+      locale
+    });
+    return result.docs ?? [];
   });
 }
 async function queryAllLocaleSlugs({
@@ -167,46 +133,13 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const collectionConfig = payload.collections[collectionSlug]?.config;
-  if (!collectionConfig)
-    return null;
-  const tableName = collectionConfig.dbName ?? collectionConfig.slug;
-  const snakeSlugField = slugField;
-  const localesTableName = `${tableName}_locales`;
-  const drizzleDb = payload.db.drizzle;
-  if (!drizzleDb?.execute) {
-    const doc = await payload.findByID({
-      collection: collectionSlug,
-      id,
-      locale: "all",
-      select: { [slugField]: true }
-    });
-    return doc?.[slugField] ?? null;
-  }
-  const { sql: drizzleSql } = await import("drizzle-orm");
-  const slugFieldConfig = collectionConfig.fields?.find((f) => f && f.name === slugField);
-  const slugIsLocalized = Boolean(slugFieldConfig?.localized);
-  if (!slugIsLocalized) {
-    const result2 = await drizzleDb.execute(drizzleSql`SELECT ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(tableName)} WHERE "id" = ${id}`);
-    const rows2 = result2.rows ?? [];
-    const slugValue = rows2[0]?.[snakeSlugField];
-    if (typeof slugValue !== "string")
-      return null;
-    const localization = payload.config.localization;
-    const localeCodes = localization ? localization.localeCodes ?? localization.locales.map((l) => l.code) : [];
-    if (localeCodes.length === 0)
-      return null;
-    return Object.fromEntries(localeCodes.map((code) => [code, slugValue]));
-  }
-  const result = await drizzleDb.execute(drizzleSql`SELECT _locale, ${drizzleSql.identifier(snakeSlugField)} FROM ${drizzleSql.identifier(localesTableName)} WHERE "_parent_id" = ${id}`);
-  const rows = result.rows ?? [];
-  const out = {};
-  for (const r of rows) {
-    if (typeof r._locale === "string" && typeof r[snakeSlugField] === "string") {
-      out[r._locale] = r[snakeSlugField];
-    }
-  }
-  return out;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField]: true }
+  });
+  return doc?.[slugField];
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -214,25 +147,32 @@ import { setRequestLocale } from "next-intl/server";
 
 // src/render/pages/utils/buildLocalizedPath.ts
 function buildLocalizedPath(locale, prefix, slug, { routing }) {
+  const path = slugToPath(slug);
   return `${routing.localePrefix === "never" ? "" : routing.localePrefix === "always" ? locale : routing.localePrefix === "as-needed" ? locale === routing.defaultLocale ? "" : "/" + locale : (() => {
     throw new Error("Unsupported locale prefix");
-  })()}${prefix ? "/" + prefix : ""}${slug ? "/" + slug : ""}`;
+  })()}${prefix ? "/" + prefix : ""}${path ? "/" + path : ""}`;
 }
 function buildLocalizedPaths(localesSlug, pagePathPrefix, { routing }) {
+  if (!localesSlug[routing.defaultLocale])
+    return {};
   return routing.locales.reduce((paths, locale) => {
     const slug = localesSlug[locale];
+    if (!slug)
+      return paths;
     paths[locale] = buildLocalizedPath(locale, pagePathPrefix, slug, { routing });
     return paths;
   }, {});
 }
 function buildAlternates(locale, ...args) {
-  const siteUrl = args[2].siteUrl;
-  let localizedPaths = buildLocalizedPaths(...args);
-  localizedPaths["x-default"] = localizedPaths[args[2].routing.defaultLocale];
-  localizedPaths = Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + localizedPaths[key]]));
+  const [localesSlug, pagePathPrefix, { routing, siteUrl }] = args;
+  const localizedPaths = buildLocalizedPaths(...args);
+  const defaultPath = localizedPaths[routing.defaultLocale];
+  if (defaultPath !== undefined)
+    localizedPaths["x-default"] = defaultPath;
+  const canonical = localizedPaths[locale] ?? buildLocalizedPath(locale, pagePathPrefix, localesSlug[locale], { routing });
   return {
-    languages: localizedPaths,
-    canonical: localizedPaths[locale]
+    languages: Object.fromEntries(Object.entries(localizedPaths).map(([key, value]) => [key, siteUrl + value])),
+    canonical: siteUrl + canonical
   };
 }
 
@@ -306,10 +246,6 @@ function createCollectionPageExports({
     });
   }
   const default_ = async (props) => {
-    if (!props || !props.params) {
-      const { notFound } = await import("next/navigation");
-      notFound();
-    }
     const params = await props.params;
     const locale = params.locale;
     if (!routing.locales.includes(locale)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@justanarthur/payload-www",
   "description": "Reusable Payload CMS website template — config builder, collections, globals, blocks, fields, access, hooks, metadata (JSON-LD, hreflang), page renderers, and test helpers.",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "type": "module",
   "private": false,
   "files": [
@@ -42,6 +42,12 @@
         "default": "./dist/imagehash.js"
       }
     },
+    "./mcp": {
+      "import": {
+        "types": "./dist/mcp.d.ts",
+        "default": "./dist/mcp.js"
+      }
+    },
     "./blocks": {
       "import": {
         "types": "./dist/blocks.d.ts",
@@ -109,7 +115,6 @@
   "dependencies": {
     "@payloadcms/live-preview-react": "3.85.0",
     "@payloadcms/plugin-mcp": "3.85.0",
-    "drizzle-orm": "0.45.2",
     "@payloadcms/richtext-lexical": "3.85.0",
     "@payloadcms/next": "3.85.0",
     "next": "16.2.6",