@justanarthur/payload-www 0.3.4 → 1.0.1

package/dist/metadata.js

@@ -1,21 +1,6 @@
 
-var __defProp = Object.defineProperty;
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {
-      get: all[name],
-      enumerable: true,
-      configurable: true,
-      set: __exportSetter.bind(all, name)
-    });
-};
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 
-// src/render/metadata/jsonld.ts
+// src/render/metadata/jsonld-utils.ts
 function getImageUrl(doc, siteUrl) {
   const img = doc?.meta?.image ?? doc?.heroImage ?? doc?.image;
   if (!img)
@@ -26,11 +11,6 @@ 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 "";
@@ -52,13 +32,8 @@ 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;
-}
+
+// src/render/metadata/jsonld.ts
 function buildArticleLd({
   doc,
   url,
@@ -69,13 +44,12 @@ 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: resolveLocalizedFieldWithLog(doc.title, locale),
-    description: resolveLocalizedFieldWithLog(doc.meta?.description ?? doc.description ?? doc.excerpt, locale),
+    headline: resolveLocalizedField(doc.title, locale),
+    description: resolveLocalizedField(doc.meta?.description ?? doc.description ?? doc.excerpt, locale),
     inLanguage: locale,
     url,
     dateModified: doc.updatedAt ? new Date(doc.updatedAt).toISOString() : undefined
@@ -83,7 +57,7 @@ function buildArticleLd({
   const datePublished = doc.publishedAt ?? doc.createdAt;
   if (datePublished)
     ld.datePublished = new Date(datePublished).toISOString();
-  const imgUrl = getImageUrlWithLog(doc, siteUrl);
+  const imgUrl = getImageUrl(doc, siteUrl);
   if (imgUrl)
     ld.image = imgUrl;
   ld.author = { "@type": "Organization", name, url: siteUrl };
@@ -99,7 +73,6 @@ function buildBreadcrumbsLd({
   items,
   currentUrl
 }) {
-  console.log("[WWW] render/metadata:buildBreadcrumbsLd items=", items.length, "currentUrl=", currentUrl);
   return {
     "@context": "https://schema.org",
     "@type": "BreadcrumbList",
@@ -111,127 +84,76 @@ function buildBreadcrumbsLd({
     }))
   };
 }
-function buildOrganizationLd({
-  siteUrl,
-  name,
-  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",
-    "@id": `${siteUrl}#organization`,
-    url: siteUrl,
-    ...name && { name },
-    ...logo && { logo: { "@type": "ImageObject", url: logo } },
-    ...sameAs && sameAs.length > 0 && { sameAs }
-  };
-  return org;
-}
 
-// src/render/metadata/hreflang.ts
-async function buildHreflangAlternates({
-  siteUrl,
-  locale,
-  urlPrefix,
-  storedSlug,
-  queryAllLocaleSlugs,
-  nested,
-  homeSlug,
-  defaultLocale,
-  locales,
-  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, "");
-    const prefixSegment = trimmedPrefix ? `/${trimmedPrefix}` : "";
-    const urlPath = slug === homeSlug ? "/" : nested ? "/" + slug.replaceAll("_", "/") : "/" + slug;
-    const localeSegment = localePrefix === "never" ? "" : localePrefix === "as-needed" && l === defaultLocale ? "" : `/${l}`;
-    return `${siteUrl}${localeSegment}${prefixSegment}${urlPath}`;
-  };
-  for (const l of locales) {
-    const slugForLocale = allLocaleSlugs?.[l];
-    if (!slugForLocale)
-      continue;
-    languages[l] = urlFor(l, slugForLocale);
-  }
-  if (allLocaleSlugs?.[defaultLocale]) {
-    languages["x-default"] = urlFor(defaultLocale, allLocaleSlugs[defaultLocale]);
-  }
-  console.log("[WWW] render/metadata:buildHreflangAlternates ->", JSON.stringify(languages));
-  return languages;
-}
+// src/exports/metadata.ts
+import {
+  buildOrganizationLd,
+  buildProductLd,
+  buildRootJsonLd,
+  buildWebSiteLd
+} from "@justanarthur/payload-plugin-seo/root-jsonld";
 
 // src/render/metadata/slug.ts
 var SLUG_NESTED_DIVIDER = "_";
-function segmentsToStoredSlug(segments, nested) {
-  if (!Array.isArray(segments)) {
-    console.log("[WWW] render/metadata:segmentsToStoredSlug string passthrough:", JSON.stringify(segments));
-    return segments;
-  }
-  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))
-    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) {
-  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,
-  locale,
-  urlPrefix,
-  urlPath
-}) {
-  const trimmedPrefix = urlPrefix.replace(/^\/|\/$/g, "");
-  const prefixSegment = trimmedPrefix ? `/${trimmedPrefix}` : "";
-  const result = `${siteUrl}/${locale}${prefixSegment}${urlPath}`;
-  console.log("[WWW] render/metadata:buildCanonicalUrl siteUrl=", siteUrl, "locale=", locale, "urlPrefix=", urlPrefix, "urlPath=", urlPath, "->", result);
-  return result;
+function paramsSlugToSlug(slug, _shape) {
+  if (!slug)
+    return "";
+  return (Array.isArray(slug) ? slug : [slug]).join(SLUG_NESTED_DIVIDER);
 }
-function getUrlPath(segments, nested, homeSlug) {
-  const urlPath = segmentsToUrlPath(segments, nested);
-  if (nested && !Array.isArray(segments)) {
-    if (segments === homeSlug)
-      return "/";
-  } else if (nested && Array.isArray(segments)) {
-    const stored = segments.join(SLUG_NESTED_DIVIDER);
-    if (stored === homeSlug)
-      return "/";
-  }
-  return urlPath;
+function slugToParamsSlug(slug, shape) {
+  if (!slug)
+    return shape === "catch-all" ? [] : "";
+  return shape === "catch-all" ? slug.split(SLUG_NESTED_DIVIDER) : slug;
 }
 
 // src/render/metadata/query.ts
 import { getPayload } from "payload";
-import { cache } from "react";
 
-// src/core/utils/getFromImportMap.ts
-function getFromImportMap(key, importMap) {
-  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/collections/hooks/createRevalidateCollectionGlobalHook.ts
+import { revalidateTag } from "next/cache";
+function createRevalidateCollectionGlobalHook() {
+  const afterChangeDeleteHook = async ({ doc, req, ...args }) => {
+    const previousDoc = "previousDoc" in args ? args.previousDoc : null, locale = req.locale;
+    function revalidate(args2) {
+      try {
+        revalidateTag(createCollectionCacheKey({ ...args2, locale }), "max");
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("static generation store missing"))
+          return;
+        console.error(error);
+      }
+    }
+    if ("collection" in args) {
+      [
+        doc && doc._status !== "draft" && doc.slug,
+        previousDoc && previousDoc._status === "published" && previousDoc.slug
+      ].filter((slug) => slug !== undefined && slug !== false).map((slug) => revalidate({ collectionSlug: args.collection.slug, slug }));
+    } else {
+      revalidate({ globalSlug: args.global.slug });
+    }
+    return doc;
+  };
+  return { afterChange: afterChangeDeleteHook, afterDelete: afterChangeDeleteHook };
+}
+function createCollectionCacheKey(args) {
+  return `${"globalSlug" in args ? args.globalSlug : args.collectionSlug + args.slug}_${args.locale}`;
 }
 
 // src/render/metadata/query.ts
-var queryDocBySlug = cache(async function queryDocBySlug2({
+async function withUnstableCache(keyParts, tags, fn) {
+  const { unstable_cache } = await import("next/cache");
+  return unstable_cache(fn, keyParts.map(String), { tags })();
+}
+async function queryDoc(args, { config: configPromise }) {
+  return withUnstableCache(Object.values(args), [createCollectionCacheKey(args)], async () => {
+    if ("globalSlug" in args)
+      return queryGlobal({ ...args, config: configPromise });
+    else
+      return queryDocBySlug({ ...args, config: configPromise });
+  });
+}
+async function queryDocBySlug({
   collectionSlug,
   slug,
   slugField = "slug",
@@ -239,155 +161,98 @@ 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,
-    draft,
-    limit: 1,
-    pagination: false,
-    overrideAccess: draft,
-    where: { [slugField]: { equals: slug } },
-    locale
+  return withUnstableCache([collectionSlug, slug, locale, draft], [createCollectionCacheKey({ collectionSlug, slug, locale })], async () => {
+    const payload = await getPayload({ config });
+    const result = await payload.find({
+      collection: collectionSlug,
+      draft,
+      limit: 1,
+      pagination: false,
+      overrideAccess: draft,
+      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,
-  slugField = "slug",
+}
+async function queryGlobal({
+  globalSlug,
   locale,
+  draft = false,
   config
 }) {
-  console.log("[WWW] render/metadata:queryAllDocs collection=", collectionSlug, "locale=", locale);
-  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 withUnstableCache([globalSlug, locale, draft], [createCollectionCacheKey({ globalSlug, locale })], async () => {
+    const payload = await getPayload({ config });
+    try {
+      return await payload.findGlobal({ slug: globalSlug, draft, locale });
+    } catch (error) {
+      console.warn("[WWW] queryGlobal failed", { globalSlug, locale, error: String(error) });
+      return null;
+    }
   });
-  const docs = result.docs ?? [];
-  console.log("[WWW] render/metadata:queryAllDocs -> count=", docs.length);
-  return docs;
-});
-var queryAllLocaleSlugs = cache(async function queryAllLocaleSlugs2({
+}
+async function queryAllDocs({
   collectionSlug,
-  slug,
   slugField = "slug",
   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,
-    draft: false,
-    limit: 1,
-    pagination: false,
-    overrideAccess: false,
-    locale,
-    where: { [slugField]: { equals: slug } },
-    select: { [slugField]: true }
-  });
-  const doc = result.docs?.[0];
-  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({
+  return withUnstableCache([collectionSlug, slugField, locale], [createCollectionCacheKey({ collectionSlug, slug: "__all__", locale })], async () => {
+    const payload = await getPayload({ config });
+    const result = await payload.find({
       collection: collectionSlug,
-      id: doc.id,
-      locale: "all",
       draft: false,
+      limit: 1000,
+      pagination: false,
       overrideAccess: false,
-      select: { [slugField]: true }
-    }).catch(() => null);
-    if (allLocales)
-      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;
-  const rawLocales = Array.isArray(resolved?.localization?.localeCodes) ? resolved.localization.localeCodes : resolved?.localization?.locales?.map((l) => l.code) ?? [];
-  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({
-  globalSlug,
-  locale,
-  depth = 0,
-  draft = false,
+      select: { [slugField]: true },
+      locale
+    });
+    return result.docs ?? [];
+  });
+}
+async function queryAllLocaleSlugs({
+  collectionSlug,
+  id,
+  slugField = "slug",
   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({
-      slug: globalSlug,
-      depth,
-      draft,
-      locale
-    });
-    console.log("[WWW] render/metadata:queryGlobal -> hit");
-    return global;
-  } 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) {
-    console.log("[WWW] render/metadata:getRenderModuleExports no custom.path exportName=", exportName);
-    return;
-  }
-  const mod = getFromImportMap(path, importMap);
-  const value = mod?.[exportName];
-  console.log("[WWW] render/metadata:getRenderModuleExports exportName=", exportName, "path=", path, "hit=", Boolean(value));
-  return value;
+  const doc = await payload.findByID({
+    collection: collectionSlug,
+    id,
+    locale: "all",
+    select: { [slugField]: true }
+  });
+  return doc?.[slugField];
 }
 
 // src/exports/metadata.ts
-var metadata_default = {
+var metadata = {
   buildArticleLd,
   buildBreadcrumbsLd,
   buildOrganizationLd,
-  buildHreflangAlternates,
+  buildWebSiteLd,
+  buildProductLd,
+  buildRootJsonLd,
   queryDocBySlug,
   queryAllDocs,
   queryAllLocaleSlugs,
-  getUrlPath,
-  segmentsToStoredSlug,
-  segmentsToUrlPath,
-  storedSlugToSegments,
-  buildCanonicalUrl,
-  getRenderModuleExports
+  paramsSlugToSlug,
+  slugToParamsSlug
 };
+var metadata_default = metadata;
 export {
-  storedSlugToSegments,
-  segmentsToUrlPath,
-  segmentsToStoredSlug,
+  slugToParamsSlug,
   queryDocBySlug,
   queryAllLocaleSlugs,
   queryAllDocs,
-  getUrlPath,
-  getRenderModuleExports,
+  paramsSlugToSlug,
   metadata_default as default,
+  buildWebSiteLd,
+  buildRootJsonLd,
+  buildProductLd,
   buildOrganizationLd,
-  buildHreflangAlternates,
-  buildCanonicalUrl,
   buildBreadcrumbsLd,
   buildArticleLd
 };