@justanarthur/payload-www 0.3.2 → 0.3.4

package/dist/globals.js

@@ -39,6 +39,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",
@@ -117,6 +124,7 @@ var link = (options = {}) => {
   if (extraFields.length) {
     result.fields.push(...extraFields);
   }
+  console.log("[WWW] core/fields:link built fieldsCount=", result.fields.length);
   return { ...result, ...overrides };
 };
 
@@ -126,31 +134,40 @@ 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)}`);
   }
 }
 
 // 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);

package/dist/hooks.js

@@ -17,30 +17,45 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
 // 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) {
@@ -51,6 +66,7 @@ function allLocales(req) {
         out.push(code);
     }
   }
+  console.log("[WWW] render/_locale:allLocales ->", JSON.stringify(out));
   return out;
 }
 
@@ -60,21 +76,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)}`);
   }
 }
@@ -90,6 +113,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 ?? "";
@@ -118,6 +142,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}`);
     }
@@ -131,6 +156,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";
@@ -154,6 +180,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:`);
     }
@@ -162,18 +189,23 @@ 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/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);

package/dist/index.js

@@ -24,6 +24,7 @@ import { jsx } from "react/jsx-runtime";
 var LivePreviewListener = ({ serverURL }) => {
   const router = useRouter();
   const url = serverURL ?? process.env.NEXT_PUBLIC_SERVER_URL ?? (typeof window !== "undefined" ? window.location.origin : "");
+  console.log("[WWW] render/components:LivePreviewListener serverURL=", url);
   return /* @__PURE__ */ jsx(PayloadLivePreview, {
     refresh: router.refresh,
     serverURL: url

package/dist/metadata.js

@@ -26,6 +26,11 @@ function getImageUrl(doc, siteUrl) {
     return img.url.startsWith("http") ? img.url : `${siteUrl}${img.url}`;
   return null;
 }
+function getImageUrlWithLog(doc, siteUrl) {
+  const result = getImageUrl(doc, siteUrl);
+  console.log("[WWW] render/metadata:jsonld:getImageUrl ->", result);
+  return result;
+}
 function resolveLocalizedField(value, locale) {
   if (value == null)
     return "";
@@ -47,6 +52,13 @@ function resolveLocalizedField(value, locale) {
   }
   return Object.values(obj).filter((v) => typeof v === "string" && v.length > 0).join(" / ");
 }
+function resolveLocalizedFieldWithLog(value, locale) {
+  const result = resolveLocalizedField(value, locale);
+  if (value && typeof value === "object") {
+    console.log("[WWW] render/metadata:jsonld:resolveLocalizedField locale=", locale, "->", JSON.stringify(result));
+  }
+  return result;
+}
 function buildArticleLd({
   doc,
   url,
@@ -57,12 +69,13 @@ function buildArticleLd({
   publisherLogo
 }) {
   const name = publisherName ?? new URL(siteUrl).hostname;
+  console.log("[WWW] render/metadata:buildArticleLd url=", url, "locale=", locale, "type=", type, "publisherName=", name);
   const ld = {
     "@context": "https://schema.org",
     "@type": type,
     "@id": `${url}#article`,
-    headline: resolveLocalizedField(doc.title, locale),
-    description: resolveLocalizedField(doc.meta?.description ?? doc.description ?? doc.excerpt, locale),
+    headline: resolveLocalizedFieldWithLog(doc.title, locale),
+    description: resolveLocalizedFieldWithLog(doc.meta?.description ?? doc.description ?? doc.excerpt, locale),
     inLanguage: locale,
     url,
     dateModified: doc.updatedAt ? new Date(doc.updatedAt).toISOString() : undefined
@@ -70,7 +83,7 @@ function buildArticleLd({
   const datePublished = doc.publishedAt ?? doc.createdAt;
   if (datePublished)
     ld.datePublished = new Date(datePublished).toISOString();
-  const imgUrl = getImageUrl(doc, siteUrl);
+  const imgUrl = getImageUrlWithLog(doc, siteUrl);
   if (imgUrl)
     ld.image = imgUrl;
   ld.author = { "@type": "Organization", name, url: siteUrl };
@@ -86,6 +99,7 @@ function buildBreadcrumbsLd({
   items,
   currentUrl
 }) {
+  console.log("[WWW] render/metadata:buildBreadcrumbsLd items=", items.length, "currentUrl=", currentUrl);
   return {
     "@context": "https://schema.org",
     "@type": "BreadcrumbList",
@@ -103,6 +117,7 @@ function buildOrganizationLd({
   logo,
   sameAs
 }) {
+  console.log("[WWW] render/metadata:buildOrganizationLd siteUrl=", siteUrl, "name=", name, "logo?", Boolean(logo), "sameAs?", Boolean(sameAs));
   const org = {
     "@context": "https://schema.org",
     "@type": "Organization",
@@ -129,6 +144,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, "");
@@ -146,29 +162,36 @@ async function buildHreflangAlternates({
   if (allLocaleSlugs?.[defaultLocale]) {
     languages["x-default"] = urlFor(defaultLocale, allLocaleSlugs[defaultLocale]);
   }
+  console.log("[WWW] render/metadata:buildHreflangAlternates ->", JSON.stringify(languages));
   return languages;
 }
 
 // src/render/metadata/slug.ts
 var SLUG_NESTED_DIVIDER = "_";
 function segmentsToStoredSlug(segments, nested) {
-  if (!Array.isArray(segments))
+  if (!Array.isArray(segments)) {
+    console.log("[WWW] render/metadata:segmentsToStoredSlug string passthrough:", JSON.stringify(segments));
     return segments;
-  if (nested)
-    return segments.join(SLUG_NESTED_DIVIDER);
-  return segments[0] ?? "";
+  }
+  const result = nested ? segments.join(SLUG_NESTED_DIVIDER) : segments[0] ?? "";
+  console.log("[WWW] render/metadata:segmentsToStoredSlug nested=", nested, "segments=", JSON.stringify(segments), "->", result);
+  return result;
 }
 function segmentsToUrlPath(segments, nested) {
+  let result;
   if (!Array.isArray(segments))
-    return "/" + segments;
-  if (nested)
-    return "/" + segments.join("/");
-  return "/" + (segments[0] ?? "");
+    result = "/" + segments;
+  else if (nested)
+    result = "/" + segments.join("/");
+  else
+    result = "/" + (segments[0] ?? "");
+  console.log("[WWW] render/metadata:segmentsToUrlPath nested=", nested, "segments=", JSON.stringify(segments), "->", result);
+  return result;
 }
 function storedSlugToSegments(storedSlug, nested) {
-  if (nested)
-    return storedSlug.split(SLUG_NESTED_DIVIDER);
-  return storedSlug;
+  const result = nested ? storedSlug.split(SLUG_NESTED_DIVIDER) : storedSlug;
+  console.log("[WWW] render/metadata:storedSlugToSegments nested=", nested, "storedSlug=", storedSlug, "->", JSON.stringify(result));
+  return result;
 }
 function buildCanonicalUrl({
   siteUrl,
@@ -178,7 +201,9 @@ function buildCanonicalUrl({
 }) {
   const trimmedPrefix = urlPrefix.replace(/^\/|\/$/g, "");
   const prefixSegment = trimmedPrefix ? `/${trimmedPrefix}` : "";
-  return `${siteUrl}/${locale}${prefixSegment}${urlPath}`;
+  const result = `${siteUrl}/${locale}${prefixSegment}${urlPath}`;
+  console.log("[WWW] render/metadata:buildCanonicalUrl siteUrl=", siteUrl, "locale=", locale, "urlPrefix=", urlPrefix, "urlPath=", urlPath, "->", result);
+  return result;
 }
 function getUrlPath(segments, nested, homeSlug) {
   const urlPath = segmentsToUrlPath(segments, nested);
@@ -199,7 +224,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
@@ -211,6 +239,7 @@ var queryDocBySlug = cache(async function queryDocBySlug2({
   draft = false,
   config
 }) {
+  console.log("[WWW] render/metadata:queryDocBySlug collection=", collectionSlug, "slug=", slug, "slugField=", slugField, "locale=", locale, "draft=", draft);
   const payload = await getPayload({ config });
   const result = await payload.find({
     collection: collectionSlug,
@@ -221,7 +250,9 @@ var queryDocBySlug = cache(async function queryDocBySlug2({
     where: { [slugField]: { 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,
@@ -229,6 +260,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,
@@ -239,7 +271,9 @@ var queryAllDocs = cache(async function queryAllDocs2({
     select: { [slugField]: 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,
@@ -248,6 +282,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,
@@ -260,8 +295,10 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
     select: { [slugField]: true }
   });
   const doc = result.docs?.[0];
-  if (!doc)
+  if (!doc) {
+    console.log("[WWW] render/metadata:queryAllLocaleSlugs -> undefined (no doc)");
     return;
+  }
   let fieldValue = doc[slugField];
   if (doc.id != null) {
     const allLocales = await payload.findByID({
@@ -276,6 +313,7 @@ var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
       fieldValue = allLocales[slugField];
   }
   if (fieldValue && typeof fieldValue === "object") {
+    console.log("[WWW] render/metadata:queryAllLocaleSlugs -> localized map=", JSON.stringify(fieldValue));
     return fieldValue;
   }
   const resolved = await config;
@@ -283,6 +321,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({
@@ -292,6 +331,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({
@@ -300,17 +340,23 @@ 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/exports/metadata.ts