@justanarthur/payload-www 1.2.1 → 1.3.0

package/dist/blocks.js

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

package/dist/cli.js

@@ -80,41 +80,13 @@ async function generateAsyncImportmap(config, options) {
 
 // src/cli/index.ts
 register();
-function printHelp() {
-  console.log(`payload-www generate:async-importmap
-
-Generate an async-importMap.ts containing only the render-path dependencies
-(blocks + collection/global renderers) used by the public render path.
-
-Usage:
-  payload-www generate:async-importmap --config-path <path> --output <path>
-
-Options:
-  --config-path <path>   Path to the Payload config file (TS or JS).
-                         Resolved relative to the current working directory.
-  --output <path>        Output file path. Created if missing.
-  --package-name <name>  Custom-package key for the render-dependency lookup.
-                         Defaults to "@justanarthur/payload-www".
-  --help, -h             Show this help.
-
-Example:
-  payload-www generate:async-importmap \\
-    --config-path apps/www/payload.config.ts \\
-    --output apps/www/app/\\(payload\\)/admin/asyncImportMap.ts
-`);
-}
 function parseArgs(argv) {
   const args = {
     configPath: "",
-    output: "",
-    help: false
+    output: ""
   };
   for (let i = 0;i < argv.length; i++) {
     const a = argv[i];
-    if (a === "--help" || a === "-h") {
-      args.help = true;
-      continue;
-    }
     if (a === "--config-path") {
       args.configPath = argv[++i] ?? "";
       continue;
@@ -144,14 +116,8 @@ function parseArgs(argv) {
 }
 async function main() {
   const args = parseArgs(process.argv.slice(2));
-  if (args.help) {
-    printHelp();
-    process.exit(0);
-  }
   if (!args.configPath || !args.output) {
-    console.error(`[payload-www] --config-path and --output are required.
-`);
-    printHelp();
+    console.error("[payload-www] --config-path and --output are required.");
     process.exit(1);
   }
   const cwd = process.cwd();
@@ -178,11 +144,10 @@ async function main() {
     const { writeFileSync } = await import("node:fs");
     writeFileSync("/tmp/payload-config-dump.json", JSON.stringify(config, (k, v) => typeof v === "function" ? "[function]" : v, 2).slice(0, 200000));
   }
-  const result = await generateAsyncImportmap(config, {
+  await generateAsyncImportmap(config, {
     output: path.isAbsolute(args.output) ? args.output : path.resolve(cwd, args.output),
     ...args.packageName ? { packageName: args.packageName } : {}
   });
-  console.log(`[payload-www] wrote ${result.entries} entries to ${result.output}`);
 }
 main().catch((err) => {
   console.error("[payload-www] unhandled error:");

package/dist/collections.js

@@ -177,16 +177,55 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField2, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField2]: true },
-      locale
-    });
-    return result.docs ?? [];
+    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 }));
   });
 }
 async function queryAllLocaleSlugs({
@@ -196,13 +235,46 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField2]: true }
-  });
-  return doc?.[slugField2];
+  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;
 }
 
 // src/exports/collections.ts

package/dist/metadata.js

@@ -199,16 +199,55 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField]: true },
-      locale
-    });
-    return result.docs ?? [];
+    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 }));
   });
 }
 async function queryAllLocaleSlugs({
@@ -218,13 +257,46 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField]: true }
-  });
-  return doc?.[slugField];
+  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;
 }
 
 // src/exports/metadata.ts

package/dist/pages.d.ts

@@ -15,13 +15,23 @@ import { ImportMap as ImportMap3, SanitizedConfig as SanitizedConfig2 } from "pa
 import { ReactNode as ReactNode2 } from "react";
 type SlugShape = "single" | "catch-all";
 type NextPageProps = {
-	params: Promise<{
+	params: {
 		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>;
@@ -32,6 +42,8 @@ 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,7 +146,9 @@ 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 customPath = blockConfig?.custom?.[name]?.path;
+    const blockCustom = blockConfig?.custom?.[name];
+    const customPath = blockCustom?.path;
+    const wantsSearchParams = blockCustom?.searchParams === true;
     const importMapPath = (typeof customPath === "string" ? customPath : null) ?? `${DEFAULT_BLOCK_PATH_PREFIX}/${blockType}`;
     const Block = await getFromImportMap(importMapPath, importMap);
     if (!Block) {
@@ -158,7 +160,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
       ...blockProps,
       ...block,
       locale,
-      searchParams
+      ...wantsSearchParams ? { searchParams } : null
     }, i));
   }
   return /* @__PURE__ */ jsx3(Fragment, {
@@ -286,16 +288,55 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField]: true },
-      locale
-    });
-    return result.docs ?? [];
+    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 }));
   });
 }
 async function queryAllLocaleSlugs({
@@ -305,13 +346,46 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField]: true }
-  });
-  return doc?.[slugField];
+  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;
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -390,6 +464,10 @@ 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: Promise<{
+	params: {
 		locale: string;
 		slug?: string | string[];
-	}>;
+	};
 };
 type NextLayoutProps = {
 	params: Promise<{
@@ -29,8 +29,18 @@ type NextLayoutProps = {
 	}>;
 	children: ReactNode;
 };
-import { RoutingConfig as GenericRoutingConfig } from "next-intl/routing";
-type RoutingConfig = GenericRoutingConfig<string[], any, any, any>;
+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;
+};
 type CreateCollectionPageExportsArgs<S extends string = "pages"> = {
 	slug?: S;
 	config: Promise<SanitizedConfig2>;
@@ -41,6 +51,8 @@ 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,7 +146,9 @@ 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 customPath = blockConfig?.custom?.[name]?.path;
+    const blockCustom = blockConfig?.custom?.[name];
+    const customPath = blockCustom?.path;
+    const wantsSearchParams = blockCustom?.searchParams === true;
     const importMapPath = (typeof customPath === "string" ? customPath : null) ?? `${DEFAULT_BLOCK_PATH_PREFIX}/${blockType}`;
     const Block = await getFromImportMap(importMapPath, importMap);
     if (!Block) {
@@ -158,7 +160,7 @@ var RenderBlocks = async ({ blocks, blockProps, config, importMap, locale, searc
       ...blockProps,
       ...block,
       locale,
-      searchParams
+      ...wantsSearchParams ? { searchParams } : null
     }, i));
   }
   return /* @__PURE__ */ jsx3(Fragment, {
@@ -316,16 +318,55 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField]: true },
-      locale
-    });
-    return result.docs ?? [];
+    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 }));
   });
 }
 async function queryAllLocaleSlugs({
@@ -335,13 +376,46 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField]: true }
-  });
-  return doc?.[slugField];
+  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;
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -420,6 +494,10 @@ 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,6 +1,8 @@
 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

@@ -109,16 +109,55 @@ async function queryAllDocs({
 }) {
   return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
     const payload = await getPayload({ config });
-    const result = await payload.find({
-      collection: collectionSlug,
-      draft: false,
-      limit: 1000,
-      pagination: false,
-      overrideAccess: false,
-      select: { [slugField]: true },
-      locale
-    });
-    return result.docs ?? [];
+    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 }));
   });
 }
 async function queryAllLocaleSlugs({
@@ -128,13 +167,46 @@ async function queryAllLocaleSlugs({
   config
 }) {
   const payload = await getPayload({ config });
-  const doc = await payload.findByID({
-    collection: collectionSlug,
-    id,
-    locale: "all",
-    select: { [slugField]: true }
-  });
-  return doc?.[slugField];
+  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;
 }
 
 // src/render/pages/createCollectionPageExports.tsx
@@ -234,6 +306,10 @@ 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.2.1",
+  "version": "1.3.0",
   "type": "module",
   "private": false,
   "files": [
@@ -109,6 +109,7 @@
   "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",