@justanarthur/payload-www 0.3.2 → 0.3.4

package/dist/test.js

@@ -22,11 +22,21 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/core/access/index.ts
-var anyone = () => true;
-var authenticated = ({ req: { user } }) => Boolean(user);
+var anyone = () => {
+  console.log("[WWW] core/access:anyone -> true");
+  return true;
+};
+var authenticated = ({ req: { user } }) => {
+  const result = Boolean(user);
+  console.log("[WWW] core/access:authenticated ->", result);
+  return result;
+};
 var authenticatedOrPublished = ({ req: { user } }) => {
-  if (user)
+  if (user) {
+    console.log("[WWW] core/access:authenticatedOrPublished -> true (authenticated)");
     return true;
+  }
+  console.log('[WWW] core/access:authenticatedOrPublished -> { _status: { equals: "published" } }');
   return { _status: { equals: "published" } };
 };
 
@@ -37,6 +47,7 @@ var slugField = (options = {}) => {
   const { name = "slug", nested = false, localized = true } = options;
   const pattern = nested ? NESTED_PATTERN : FLAT_PATTERN;
   const invalidMessage = 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)";
+  console.log("[WWW] core/fields:slugField options=", JSON.stringify({ name, nested, localized }));
   return {
     name,
     type: "text",
@@ -51,8 +62,10 @@ var slugField = (options = {}) => {
     validate: (value) => {
       if (typeof value !== "string")
         return "Slug must be a string";
-      if (value !== "" && !pattern.test(value))
+      if (value !== "" && !pattern.test(value)) {
+        console.warn("[WWW] core/fields:slugField invalid slug value=", JSON.stringify(value));
         return invalidMessage;
+      }
       return true;
     }
   };
@@ -60,30 +73,45 @@ var slugField = (options = {}) => {
 
 // src/render/_locale.ts
 function prefixFor(locale, defaultLocale, mode) {
+  let result;
   if (mode === "never")
-    return "";
-  if (mode === "as-needed" && locale === defaultLocale)
-    return "";
-  return `/${locale}`;
+    result = "";
+  else if (mode === "as-needed" && locale === defaultLocale)
+    result = "";
+  else
+    result = `/${locale}`;
+  console.log("[WWW] render/_locale:prefixFor locale=", locale, "default=", defaultLocale, "mode=", mode, "->", JSON.stringify(result));
+  return result;
 }
 function resolveLocale(req) {
-  if (!req || typeof req !== "object")
+  if (!req || typeof req !== "object") {
+    console.log('[WWW] render/_locale:resolveLocale -> "" (no req)');
     return "";
+  }
   const r = req;
-  if (typeof r.locale === "string" && r.locale.length > 0)
+  if (typeof r.locale === "string" && r.locale.length > 0) {
+    console.log("[WWW] render/_locale:resolveLocale ->", r.locale, "(from req.locale)");
     return r.locale;
+  }
   const fallback = r.payload?.config?.localization?.defaultLocale;
-  if (typeof fallback === "string" && fallback.length > 0)
+  if (typeof fallback === "string" && fallback.length > 0) {
+    console.log("[WWW] render/_locale:resolveLocale ->", fallback, "(from config.localization.defaultLocale)");
     return fallback;
+  }
+  console.log('[WWW] render/_locale:resolveLocale -> "" (no locale anywhere)');
   return "";
 }
 function allLocales(req) {
-  if (!req || typeof req !== "object")
+  if (!req || typeof req !== "object") {
+    console.log("[WWW] render/_locale:allLocales -> [] (no req)");
     return [];
+  }
   const r = req;
   const list = r.payload?.config?.localization?.locales;
-  if (!Array.isArray(list) || list.length === 0)
+  if (!Array.isArray(list) || list.length === 0) {
+    console.log("[WWW] render/_locale:allLocales -> [] (no locales declared)");
     return [];
+  }
   const out = [];
   for (const entry of list) {
     if (typeof entry === "string" && entry.length > 0) {
@@ -94,6 +122,7 @@ function allLocales(req) {
         out.push(code);
     }
   }
+  console.log("[WWW] render/_locale:allLocales ->", JSON.stringify(out));
   return out;
 }
 
@@ -103,21 +132,28 @@ function nextCacheImport() {
   return cachePromise ??= import("next/cache");
 }
 function shouldSkipRevalidate(context) {
-  return Boolean(context?.disableRevalidate);
+  const skip = Boolean(context?.disableRevalidate);
+  if (skip)
+    console.log("[WWW] render/hooks:_shared:shouldSkipRevalidate -> skip");
+  return skip;
 }
 async function safeRevalidatePath(payload, path) {
+  console.log("[WWW] render/hooks:_shared:safeRevalidatePath path=", path);
   try {
     const { revalidatePath } = await nextCacheImport();
     revalidatePath(path);
   } catch (error) {
+    console.error("[WWW] render/hooks:_shared:safeRevalidatePath failed path=", path, "err=", String(error));
     payload.logger.error(`revalidatePath("${path}") failed: ${String(error)}`);
   }
 }
 async function safeRevalidateTag(payload, tag, profile = "max") {
+  console.log("[WWW] render/hooks:_shared:safeRevalidateTag tag=", tag, "profile=", profile);
   try {
     const { revalidateTag } = await nextCacheImport();
     revalidateTag(tag, profile);
   } catch (error) {
+    console.error("[WWW] render/hooks:_shared:safeRevalidateTag failed tag=", tag, "err=", String(error));
     payload.logger.error(`revalidateTag("${tag}") failed: ${String(error)}`);
   }
 }
@@ -133,6 +169,7 @@ function createRevalidateCollectionHook(options) {
     pathMode = "url"
   } = options;
   const resolvedSitemapTag = sitemapTag === false ? false : sitemapTag ?? `${collectionSlug}-sitemap`;
+  console.log("[WWW] render/hooks:createRevalidateCollectionHook collectionSlug=", collectionSlug, "urlPathPrefix=", urlPathPrefix, "sitemapTag=", resolvedSitemapTag, "pathMode=", pathMode);
   const resolveDefaults = (req) => {
     const mode = modeOption ?? "always";
     const defaultLocale = defaultLocaleOption ?? req?.payload?.config?.localization?.defaultLocale ?? "";
@@ -161,6 +198,7 @@ function createRevalidateCollectionHook(options) {
     }
   };
   const fireCollectionTags = async (payload, docId, req) => {
+    console.log("[WWW] render/hooks:fireCollectionTags collectionSlug=", collectionSlug, "docId=", docId);
     if (typeof docId === "string" || typeof docId === "number") {
       await safeRevalidateTag(payload, `collection_${collectionSlug}_${docId}`);
     }
@@ -174,6 +212,7 @@ function createRevalidateCollectionHook(options) {
     const { payload } = req;
     const typed = doc;
     const prev = previousDoc;
+    console.log("[WWW] render/hooks:afterChange collectionSlug=", collectionSlug, "id=", typed.id, "slug=", typed.slug, "prevSlug=", prev?.slug);
     const isPublished = typed._status === "published";
     const wasPublished = prev?._status === "published";
     const prevSlugIsString = typeof prev?.slug === "string";
@@ -197,6 +236,7 @@ function createRevalidateCollectionHook(options) {
       return doc ?? null;
     const { payload } = req;
     const typed = doc;
+    console.log("[WWW] render/hooks:afterDelete collectionSlug=", collectionSlug, "id=", typed?.id, "slug=", typed?.slug);
     if (pathMode !== "tag-only") {
       await fanOutPaths(payload, req, typed?.slug, `Revalidating deleted ${collectionSlug} at path:`);
     }
@@ -205,11 +245,14 @@ function createRevalidateCollectionHook(options) {
   };
   return { afterChange, afterDelete };
 }
-var createRevalidatePageHooks = (opts = {}) => createRevalidateCollectionHook({
-  collectionSlug: "pages",
-  urlPathPrefix: "",
-  ...opts
-});
+var createRevalidatePageHooks = (opts = {}) => {
+  console.log("[WWW] render/hooks:createRevalidatePageHooks (deprecated alias) opts=", JSON.stringify(opts));
+  return createRevalidateCollectionHook({
+    collectionSlug: "pages",
+    urlPathPrefix: "",
+    ...opts
+  });
+};
 
 // src/config/constants.ts
 var PAGES_RENDER_PATH = "@justanarthur/payload-www/render-pages#PagesPage";
@@ -434,6 +477,13 @@ var link = (options = {}) => {
     overrides = {},
     extraFields = []
   } = options;
+  console.log("[WWW] core/fields:link options=", JSON.stringify({
+    appearances: appearances === false ? false : appearances ?? "default-set",
+    disableLabel,
+    relationTo,
+    localized,
+    extraFieldsCount: extraFields.length
+  }));
   const result = {
     name: "link",
     type: "group",
@@ -512,15 +562,18 @@ var link = (options = {}) => {
   if (extraFields.length) {
     result.fields.push(...extraFields);
   }
+  console.log("[WWW] core/fields:link built fieldsCount=", result.fields.length);
   return { ...result, ...overrides };
 };
 
 // src/render/hooks/revalidateGlobal.ts
 function createRevalidateGlobalHook(slug) {
+  console.log("[WWW] render/hooks:createRevalidateGlobalHook slug=", slug);
   return async ({ doc, req: { payload, context, locale } }) => {
     if (shouldSkipRevalidate(context))
       return doc;
     const tags = [`global_${slug}`, `global_${slug}_${locale}`];
+    console.log("[WWW] render/hooks:revalidateGlobal slug=", slug, "locale=", locale, "tags=", JSON.stringify(tags));
     payload.logger.info?.(`Revalidating global: ${tags.join(", ")}`);
     for (const tag of tags) {
       await safeRevalidateTag(payload, tag);
@@ -615,11 +668,14 @@ function createPreviewHandler(options) {
     const url = new URL(req.url);
     const path = url.searchParams.get("path") ?? "/";
     const previewSecret = url.searchParams.get("previewSecret");
+    console.log("[WWW] render/preview:createPreviewHandler:GET path=", path, "hasSecret=", Boolean(previewSecret), "enableDraftMode=", enableDraftMode);
     if (!previewSecret || previewSecret !== secret) {
+      console.warn("[WWW] render/preview:createPreviewHandler:GET invalid preview secret (401)");
       return new Response("Invalid preview secret", { status: 401 });
     }
     if (enableDraftMode) {
       (await draftMode()).enable();
+      console.log("[WWW] render/preview:createPreviewHandler:GET draftMode enabled");
     }
     redirect(path);
     return new Response(null, { status: 204 });
@@ -639,6 +695,7 @@ async function buildHreflangAlternates({
   localePrefix = "always"
 }) {
   const allLocaleSlugs = await queryAllLocaleSlugs(storedSlug, locale);
+  console.log("[WWW] render/metadata:buildHreflangAlternates storedSlug=", storedSlug, "locale=", locale, "allLocaleSlugs=", JSON.stringify(allLocaleSlugs));
   const languages = {};
   const urlFor = (l, slug) => {
     const trimmedPrefix = urlPrefix.replace(/^\/|\/$/g, "");
@@ -656,6 +713,7 @@ async function buildHreflangAlternates({
   if (allLocaleSlugs?.[defaultLocale]) {
     languages["x-default"] = urlFor(defaultLocale, allLocaleSlugs[defaultLocale]);
   }
+  console.log("[WWW] render/metadata:buildHreflangAlternates ->", JSON.stringify(languages));
   return languages;
 }
 
@@ -665,7 +723,10 @@ import { cache } from "react";
 
 // src/core/utils/getFromImportMap.ts
 function getFromImportMap(key, importMap) {
-  return importMap[key.includes("#") ? key : key + "#default"];
+  const resolvedKey = key.includes("#") ? key : key + "#default";
+  const value = importMap[resolvedKey];
+  console.log("[WWW] core/utils:getFromImportMap key=", key, "resolved=", resolvedKey, "hit=", Boolean(value));
+  return value;
 }
 
 // src/render/metadata/query.ts
@@ -677,6 +738,7 @@ var queryDocBySlug = cache(async function queryDocBySlug2({
   draft = false,
   config
 }) {
+  console.log("[WWW] render/metadata:queryDocBySlug collection=", collectionSlug, "slug=", slug, "slugField=", slugField2, "locale=", locale, "draft=", draft);
   const payload = await getPayload({ config });
   const result = await payload.find({
     collection: collectionSlug,
@@ -687,7 +749,9 @@ var queryDocBySlug = cache(async function queryDocBySlug2({
     where: { [slugField2]: { equals: slug } },
     locale
   });
-  return result.docs?.[0] ?? null;
+  const doc = result.docs?.[0] ?? null;
+  console.log("[WWW] render/metadata:queryDocBySlug ->", doc ? "hit" : "miss");
+  return doc;
 });
 var queryAllDocs = cache(async function queryAllDocs2({
   collectionSlug,
@@ -695,6 +759,7 @@ var queryAllDocs = cache(async function queryAllDocs2({
   locale,
   config
 }) {
+  console.log("[WWW] render/metadata:queryAllDocs collection=", collectionSlug, "locale=", locale);
   const payload = await getPayload({ config });
   const result = await payload.find({
     collection: collectionSlug,
@@ -705,7 +770,9 @@ var queryAllDocs = cache(async function queryAllDocs2({
     select: { [slugField2]: true },
     locale
   });
-  return result.docs ?? [];
+  const docs = result.docs ?? [];
+  console.log("[WWW] render/metadata:queryAllDocs -> count=", docs.length);
+  return docs;
 });
 var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   collectionSlug,
@@ -714,6 +781,7 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   locale,
   config
 }) {
+  console.log("[WWW] render/metadata:queryAllLocaleSlugs collection=", collectionSlug, "slug=", slug, "locale=", locale);
   const payload = await getPayload({ config });
   const result = await payload.find({
     collection: collectionSlug,
@@ -726,8 +794,10 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
     select: { [slugField2]: true }
   });
   const doc = result.docs?.[0];
-  if (!doc)
+  if (!doc) {
+    console.log("[WWW] render/metadata:queryAllLocaleSlugs -> undefined (no doc)");
     return;
+  }
   let fieldValue = doc[slugField2];
   if (doc.id != null) {
     const allLocales2 = await payload.findByID({
@@ -742,6 +812,7 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
       fieldValue = allLocales2[slugField2];
   }
   if (fieldValue && typeof fieldValue === "object") {
+    console.log("[WWW] render/metadata:queryAllLocaleSlugs -> localized map=", JSON.stringify(fieldValue));
     return fieldValue;
   }
   const resolved = await config;
@@ -749,6 +820,7 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
   const out = {};
   for (const l of rawLocales)
     out[l] = String(fieldValue ?? slug);
+  console.log("[WWW] render/metadata:queryAllLocaleSlugs -> flat-fanout locales=", rawLocales.length, "slug=", JSON.stringify(fieldValue ?? slug));
   return out;
 });
 var queryGlobal = cache(async function queryGlobal2({
@@ -758,6 +830,7 @@ var queryGlobal = cache(async function queryGlobal2({
   draft = false,
   config
 }) {
+  console.log("[WWW] render/metadata:queryGlobal global=", globalSlug, "locale=", locale, "depth=", depth, "draft=", draft);
   const payload = await getPayload({ config });
   try {
     const global = await payload.findGlobal({
@@ -766,27 +839,35 @@ var queryGlobal = cache(async function queryGlobal2({
       draft,
       locale
     });
+    console.log("[WWW] render/metadata:queryGlobal -> hit");
     return global;
-  } catch {
+  } catch (error) {
+    console.warn("[WWW] render/metadata:queryGlobal failed for slug=", globalSlug, "err=", String(error));
     return null;
   }
 });
 function getRenderModuleExports(exportName, collection, importMap) {
   const path = collection?.custom?.path;
-  if (!path)
+  if (!path) {
+    console.log("[WWW] render/metadata:getRenderModuleExports no custom.path exportName=", exportName);
     return;
+  }
   const mod = getFromImportMap(path, importMap);
-  return mod?.[exportName];
+  const value = mod?.[exportName];
+  console.log("[WWW] render/metadata:getRenderModuleExports exportName=", exportName, "path=", path, "hit=", Boolean(value));
+  return value;
 }
 
 // src/render/sitemap/createSitemapFile.ts
 function createSitemapFile(options) {
   const { collections } = options;
   return async function sitemap() {
+    console.log("[WWW] render/sitemap:createSitemapFile:sitemap collections=", JSON.stringify(options.collections), "localePrefix=", options.localePrefix ?? "always");
     const cfg = await options.config;
     const allLocales2 = Array.isArray(cfg.localization?.locales) ? cfg.localization.locales.map((l) => typeof l === "string" ? l : l.code) : [cfg.localization?.defaultLocale ?? "en"];
     const defaultLocale = cfg.localization?.defaultLocale ?? allLocales2[0];
     const activeLocales = Array.isArray(options.locales) && options.locales.length > 0 ? options.locales.filter((l) => allLocales2.includes(l)) : allLocales2;
+    console.log("[WWW] render/sitemap:createSitemapFile:sitemap allLocales=", JSON.stringify(allLocales2), "default=", defaultLocale, "active=", JSON.stringify(activeLocales));
     const entries = [];
     const seen = new Set;
     for (const collectionSlug of collections) {
@@ -842,6 +923,7 @@ function createSitemapFile(options) {
         }
       }
     }
+    console.log("[WWW] render/sitemap:createSitemapFile:sitemap -> entries=", entries.length);
     return entries;
   };
 }

package/dist/utils.js

@@ -17,17 +17,27 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // src/core/utils/getFromImportMap.ts
 function getFromImportMap(key, importMap) {
-  return importMap[key.includes("#") ? key : key + "#default"];
+  const resolvedKey = key.includes("#") ? key : key + "#default";
+  const value = importMap[resolvedKey];
+  console.log("[WWW] core/utils:getFromImportMap key=", key, "resolved=", resolvedKey, "hit=", Boolean(value));
+  return value;
 }
 
 // src/core/utils/generateImportName.ts
 function generateImportName(type, slug) {
   switch (type) {
-    case "block":
-      return `Block${slug.replace(/(^\w|-\w)/g, (m) => m.replace("-", "").toUpperCase())}#default`;
-    case "page":
-      return `Page${slug.replace(/(^\w|-\w)/g, (m) => m.replace("-", "").toUpperCase())}#default`;
+    case "block": {
+      const name = `Block${slug.replace(/(^\w|-\w)/g, (m) => m.replace("-", "").toUpperCase())}#default`;
+      console.log("[WWW] core/utils:generateImportName type=block slug=", slug, "->", name);
+      return name;
+    }
+    case "page": {
+      const name = `Page${slug.replace(/(^\w|-\w)/g, (m) => m.replace("-", "").toUpperCase())}#default`;
+      console.log("[WWW] core/utils:generateImportName type=page slug=", slug, "->", name);
+      return name;
+    }
     default:
+      console.error("[WWW] core/utils:generateImportName unknown type:", type);
       throw new Error(`Unknown type: ${type}`);
   }
 }
@@ -36,13 +46,17 @@ function generateImportName(type, slug) {
 import { jsx } from "react/jsx-runtime";
 function renderCollectionModule(collection = [], slug, importMap, props) {
   const renderPath = collection?.find((c) => c.slug === slug)?.custom?.path;
-  if (!renderPath)
+  if (!renderPath) {
+    console.log("[WWW] render/utils:renderCollectionModule no custom.path slug=", slug);
     return null;
+  }
   const CollectionRenderModule = getFromImportMap(renderPath, importMap);
   if (!CollectionRenderModule) {
+    console.error("[WWW] render/utils:renderCollectionModule not found slug=", slug, "path=", renderPath);
     if (false) {}
     return null;
   }
+  console.log("[WWW] render/utils:renderCollectionModule rendering slug=", slug, "path=", renderPath);
   return /* @__PURE__ */ jsx(CollectionRenderModule, {
     importMap,
     ...props