@justanarthur/payload-www 0.2.0 → 0.3.0

package/dist/test.js

@@ -29,7 +29,6 @@ var authenticatedOrPublished = ({ req: { user } }) => {
     return true;
   return { _status: { equals: "published" } };
 };
-
 // src/render/_locale.ts
 function prefixFor(locale, defaultLocale, mode) {
   if (mode === "never")
@@ -204,26 +203,6 @@ var createPagesCollection = (blocks, options = {}) => {
     defaultLocale,
     nested = false
   } = options;
-  const slugPattern = nested ? /^[a-z0-9_-]+$/ : /^[a-z0-9-]+$/;
-  const slugField = {
-    name: "slug",
-    type: "text",
-    required: true,
-    unique: true,
-    index: true,
-    admin: {
-      position: "sidebar",
-      ...nested ? { description: "Lowercase, hyphens for words. Use the `_` divider for nesting, e.g. `about_us` → `/about/us`." } : {}
-    },
-    validate: (value) => {
-      if (typeof value !== "string")
-        return "Slug must be a string";
-      if (value !== "" && !slugPattern.test(value)) {
-        return nested ? "Slug must be lowercase, with hyphens or the `_` nesting divider (no spaces or other special characters)" : "Slug must be lowercase, with hyphens (no spaces or special characters)";
-      }
-      return true;
-    }
-  };
   const baseFields = [
     {
       name: "title",
@@ -253,7 +232,7 @@ var createPagesCollection = (blocks, options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField({ nested })
   ];
   const { afterChange: revalidateAfterChange, afterDelete: revalidateAfterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -288,14 +267,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",
@@ -320,7 +291,7 @@ var createPostsCollection = (options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField()
   ];
   const { afterChange, afterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -421,11 +392,11 @@ 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,
@@ -500,7 +471,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",
@@ -541,12 +512,12 @@ var createHeaderGlobal = (options = {}) => {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
+      { 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, extraFields: navItemLinkFields })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "header",
@@ -578,12 +549,12 @@ var createFooterGlobal = (options = {}) => {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
+      { 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, extraFields: navItemLinkFields })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "footer",
@@ -672,7 +643,7 @@ function getFromImportMap(key, importMap) {
 var queryDocBySlug = cache(async function queryDocBySlug2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   draft = false,
   config
@@ -684,14 +655,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
 }) {
@@ -702,7 +673,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
     limit: 1000,
     pagination: false,
     overrideAccess: false,
-    select: { [slugField]: true },
+    select: { [slugField2]: true },
     locale
   });
   return result.docs ?? [];
@@ -710,7 +681,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
 var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   config
 }) {
@@ -722,13 +693,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;
   }

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")
@@ -198,26 +197,6 @@ var createPagesCollection = (blocks, options = {}) => {
     defaultLocale,
     nested = false
   } = options;
-  const slugPattern = nested ? /^[a-z0-9_-]+$/ : /^[a-z0-9-]+$/;
-  const slugField = {
-    name: "slug",
-    type: "text",
-    required: true,
-    unique: true,
-    index: true,
-    admin: {
-      position: "sidebar",
-      ...nested ? { description: "Lowercase, hyphens for words. Use the `_` divider for nesting, e.g. `about_us` → `/about/us`." } : {}
-    },
-    validate: (value) => {
-      if (typeof value !== "string")
-        return "Slug must be a string";
-      if (value !== "" && !slugPattern.test(value)) {
-        return nested ? "Slug must be lowercase, with hyphens or the `_` nesting divider (no spaces or other special characters)" : "Slug must be lowercase, with hyphens (no spaces or special characters)";
-      }
-      return true;
-    }
-  };
   const baseFields = [
     {
       name: "title",
@@ -247,7 +226,7 @@ var createPagesCollection = (blocks, options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField({ nested })
   ];
   const { afterChange: revalidateAfterChange, afterDelete: revalidateAfterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -282,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",
@@ -314,7 +285,7 @@ var createPostsCollection = (options = {}) => {
       type: "date",
       admin: { position: "sidebar" }
     },
-    slugField
+    slugField()
   ];
   const { afterChange, afterDelete } = createRevalidateCollectionHook({
     collectionSlug,
@@ -415,11 +386,11 @@ 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,
@@ -494,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",
@@ -535,12 +506,12 @@ var createHeaderGlobal = (options = {}) => {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
+      { 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, extraFields: navItemLinkFields })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "header",
@@ -572,12 +543,12 @@ var createFooterGlobal = (options = {}) => {
     slug: "navColumn",
     fields: [
       { name: "title", type: "text", required: true, localized: true },
-      { name: "links", type: "array", fields: [link({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navColumnLinkFields })] }
+      { 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, extraFields: navItemLinkFields })]
+    fields: [link2({ appearances: false, localized: true, relationTo: linkRelationTo, extraFields: navItemLinkFields })]
   };
   return {
     slug: "footer",
@@ -666,7 +637,7 @@ function getFromImportMap(key, importMap) {
 var queryDocBySlug = cache(async function queryDocBySlug2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   draft = false,
   config
@@ -678,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
 }) {
@@ -696,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 ?? [];
@@ -704,7 +675,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
 var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   collectionSlug,
   slug,
-  slugField = "slug",
+  slugField: slugField2 = "slug",
   locale,
   config
 }) {
@@ -716,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;
   }

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