@justanarthur/payload-www 0.1.2 → 0.3.0

package/dist/with-www-config.js

@@ -23,7 +23,6 @@ var authenticatedOrPublished = ({ req: { user } }) => {
     return true;
   return { _status: { equals: "published" } };
 };
-
 // src/render/_locale.ts
 function prefixFor(locale, defaultLocale, mode) {
   if (mode === "never")
@@ -195,24 +194,9 @@ var createPagesCollection = (blocks, options = {}) => {
     renderPath = PAGES_RENDER_PATH,
     slug: collectionSlug = PAGES_SLUG2,
     localePrefix,
-    defaultLocale
+    defaultLocale,
+    nested = false
   } = options;
-  const slugField = {
-    name: "slug",
-    type: "text",
-    required: true,
-    unique: true,
-    index: true,
-    admin: { position: "sidebar" },
-    validate: (value) => {
-      if (typeof value !== "string")
-        return "Slug must be a string";
-      if (value !== "" && !/^[a-z0-9-]+$/.test(value)) {
-        return "Slug must be lowercase, with hyphens (no spaces or special characters)";
-      }
-      return true;
-    }
-  };
   const baseFields = [
     {
       name: "title",
@@ -242,7 +226,7 @@ var createPagesCollection = (blocks, options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField({ nested })
   ];
   const { afterChange: revalidateAfterChange, afterDelete: revalidateAfterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -277,14 +261,6 @@ var createPostsCollection = (options = {}) => {
     localePrefix,
     defaultLocale
   } = options;
-  const slugField = {
-    name: "slug",
-    type: "text",
-    required: true,
-    unique: true,
-    index: true,
-    admin: { position: "sidebar" }
-  };
   const baseFields = [
     {
       name: "title",
@@ -309,7 +285,7 @@ var createPostsCollection = (options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField()
   ];
   const { afterChange, afterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -410,17 +386,18 @@ var createStaticPagesCollection = (blocks) => {
 };
 
 // src/core/fields/link.ts
-var appearanceOptions = {
+var appearanceOptions2 = {
   default: { label: "Default", value: "default" },
   outline: { label: "Outline", value: "outline" }
 };
-var link = (options = {}) => {
+var link2 = (options = {}) => {
   const {
     appearances,
     disableLabel = false,
     relationTo = [PAGES_SLUG],
     localized = false,
-    overrides = {}
+    overrides = {},
+    extraFields = []
   } = options;
   const result = {
     name: "link",
@@ -488,7 +465,7 @@ var link = (options = {}) => {
     result.fields = [...result.fields, ...linkTypes];
   }
   if (appearances !== false) {
-    const opts = appearances ? appearances.map((a) => appearanceOptions[a]) : [appearanceOptions.default, appearanceOptions.outline];
+    const opts = appearances ? appearances.map((a) => appearanceOptions2[a]) : [appearanceOptions2.default, appearanceOptions2.outline];
     result.fields.push({
       name: "appearance",
       type: "select",
@@ -497,6 +474,9 @@ var link = (options = {}) => {
       options: opts
     });
   }
+  if (extraFields.length) {
+    result.fields.push(...extraFields);
+  }
   return { ...result, ...overrides };
 };
 
@@ -516,17 +496,22 @@ function createRevalidateGlobalHook(slug) {
 
 // src/data/collections/globals/Header/config.ts
 var createHeaderGlobal = (options = {}) => {
-  const { renderPath = HEADER_RENDER_PATH, linkRelationTo = [PAGES_SLUG] } = options;
+  const {
+    renderPath = HEADER_RENDER_PATH,
+    linkRelationTo = [PAGES_SLUG],
+    navColumnLinkFields = [],
+    navItemLinkFields = []
+  } = options;
   const navColumnBlock = {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo })] }
+      { name: "links", type: "array", fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
     ]
   };
   const navItemBlock = {
     slug: "navItem",
-    fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "header",
@@ -548,17 +533,22 @@ var createHeaderGlobal = (options = {}) => {
 
 // src/data/collections/globals/Footer/config.ts
 var createFooterGlobal = (options = {}) => {
-  const { renderPath = FOOTER_RENDER_PATH, linkRelationTo = [PAGES_SLUG] } = options;
+  const {
+    renderPath = FOOTER_RENDER_PATH,
+    linkRelationTo = [PAGES_SLUG],
+    navColumnLinkFields = [],
+    navItemLinkFields = []
+  } = options;
   const navColumnBlock = {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo })] }
+      { name: "links", type: "array", fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
     ]
   };
   const navItemBlock = {
     slug: "navItem",
-    fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "footer",
@@ -647,7 +637,7 @@ function getFromImportMap(key, importMap) {
 var queryDocBySlug = cache(async function queryDocBySlug2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   draft = false,
   config
@@ -659,14 +649,14 @@ var queryDocBySlug = cache(async function queryDocBySlug2({
     limit: 1,
     pagination: false,
     overrideAccess: draft,
-    where: { [slugField]: { equals: slug } },
+    where: { [slugField2]: { equals: slug } },
     locale
   });
   return result.docs?.[0] ?? null;
 });
 var queryAllDocs = cache(async function queryAllDocs2({
   collectionSlug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   config
 }) {
@@ -677,7 +667,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
     limit: 1000,
     pagination: false,
     overrideAccess: false,
-    select: { [slugField]: true },
+    select: { [slugField2]: true },
     locale
   });
   return result.docs ?? [];
@@ -685,7 +675,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
 var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   config
 }) {
@@ -697,13 +687,25 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
     pagination: false,
     overrideAccess: false,
     locale,
-    where: { [slugField]: { equals: slug } },
-    select: { [slugField]: true }
+    where: { [slugField2]: { equals: slug } },
+    select: { [slugField2]: true }
   });
   const doc = result.docs?.[0];
   if (!doc)
     return;
-  const fieldValue = doc?.[slugField];
+  let fieldValue = doc[slugField2];
+  if (doc.id != null) {
+    const allLocales2 = await payload.findByID({
+      collection: collectionSlug,
+      id: doc.id,
+      locale: "all",
+      draft: false,
+      overrideAccess: false,
+      select: { [slugField2]: true }
+    }).catch(() => null);
+    if (allLocales2)
+      fieldValue = allLocales2[slugField2];
+  }
   if (fieldValue && typeof fieldValue === "object") {
     return fieldValue;
   }
@@ -756,6 +758,7 @@ function createSitemapFile(options) {
       const collectionDefaults = options.perCollection?.[collectionSlug] ?? {};
       const urlPrefix = (options.urlPrefixes?.[collectionSlug] ?? "").replace(/\/$/, "");
       const siteUrl = options.getServerSideURL().replace(/\/$/, "");
+      const isNested = options.nested?.[collectionSlug] ?? false;
       for (const locale of activeLocales) {
         const docs = await queryAllDocs({
           collectionSlug,
@@ -771,13 +774,14 @@ function createSitemapFile(options) {
           if (seen.has(dedupeKey))
             continue;
           seen.add(dedupeKey);
-          const url = `${siteUrl}${prefixFor(locale, defaultLocale, options.localePrefix ?? "always")}${urlPrefix}/${storedSlug}`;
+          const slugPath = isNested ? storedSlug.replaceAll("_", "/") : storedSlug;
+          const url = `${siteUrl}${prefixFor(locale, defaultLocale, options.localePrefix ?? "always")}${urlPrefix}/${slugPath}`;
           const languages = await buildHreflangAlternates({
             siteUrl,
             locale,
             urlPrefix,
             storedSlug,
-            nested: false,
+            nested: isNested,
             homeSlug: "",
             defaultLocale,
             locales: activeLocales,
@@ -808,7 +812,7 @@ function createSitemapFile(options) {
 }
 // src/config/createWWWConfig.ts
 function createWWWConfig(options) {
-  const { locales, routing, blocks, linkRelationTo, registerPosts = true, defaultPlugins } = options;
+  const { locales, routing, blocks, linkRelationTo, registerPosts = true, nested = false, defaultPlugins } = options;
   const defaultLocale = routing?.defaultLocale ?? locales[0] ?? "";
   const localePrefixMode = (() => {
     const raw = routing?.localePrefix;
@@ -821,7 +825,8 @@ function createWWWConfig(options) {
   }
   const buildPagesCollection = () => createPagesCollection(blocks, {
     localePrefix: localePrefixMode,
-    defaultLocale
+    defaultLocale,
+    nested
   });
   const buildPostsCollection = () => createPostsCollection({
     localePrefix: localePrefixMode,

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": "0.1.2",
+  "version": "0.3.0",
   "type": "module",
   "private": false,
   "module": "./dist/index.js",