@orion-studios/payload-studio 0.6.0-beta.184 → 0.6.0-beta.186

package/dist/{chunk-KHK6RTGC.mjs → chunk-MMJNHBOF.mjs}

@@ -231,23 +231,33 @@ function configureAdmin(config) {
   if (cssSources.length === 0) {
     cssPath = sourceCssPath;
   } else {
-    let css = cssSources.map((filePath) => fs.readFileSync(filePath, "utf-8")).join("\n\n");
-    css = css.replace(
-      "--orion-cms-brand-primary-fallback: #3b82f6;",
-      `--orion-cms-brand-primary-fallback: ${brandPrimary};`
-    );
-    css = css.replace(
-      "--orion-cms-brand-secondary-fallback: #8b5cf6;",
-      `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
-    );
-    const outputBasePath = config.basePath || process.cwd();
-    const genDir = path.resolve(outputBasePath, ".generated");
-    if (!fs.existsSync(genDir)) {
-      fs.mkdirSync(genDir, { recursive: true });
+    try {
+      let css = cssSources.map((filePath) => fs.readFileSync(filePath, "utf-8")).join("\n\n");
+      css = css.replace(
+        "--orion-cms-brand-primary-fallback: #3b82f6;",
+        `--orion-cms-brand-primary-fallback: ${brandPrimary};`
+      );
+      css = css.replace(
+        "--orion-cms-brand-secondary-fallback: #8b5cf6;",
+        `--orion-cms-brand-secondary-fallback: ${brandSecondary};`
+      );
+      const outputBasePath = config.basePath || process.cwd();
+      const genDir = path.resolve(outputBasePath, ".generated");
+      const genPath = path.resolve(genDir, "admin.css");
+      let existing = null;
+      try {
+        existing = fs.readFileSync(genPath, "utf-8");
+      } catch {
+        existing = null;
+      }
+      if (existing !== css) {
+        fs.mkdirSync(genDir, { recursive: true });
+        fs.writeFileSync(genPath, css);
+      }
+      cssPath = genPath;
+    } catch {
+      cssPath = sourceCssPath;
     }
-    const genPath = path.resolve(genDir, "admin.css");
-    fs.writeFileSync(genPath, css);
-    cssPath = genPath;
   }
   const clientPath = "@orion-studios/payload-studio/admin/client";
   const studioNavClientProps = {
@@ -700,16 +710,47 @@ function configureAdmin(config) {
       });
     },
     wrapGlobals(globals2) {
-      const labelMap = {
+      const defaultLabelMap = {
         header: { group: "Site Design", label: "Header & Navigation" },
         footer: { group: "Site Design", label: "Footer" },
         "site-settings": { group: "Site Design", label: "Website Settings" },
         "social-media": { group: "Site Design", label: "Social Media" },
         "contact-form": { group: "Lead Forms", label: "Contact Form" }
       };
+      const configuredBySlug = new Map(
+        (config.studio?.globals || []).map((link) => [link.slug, link])
+      );
+      const attachBreadcrumbToGlobal = (global) => {
+        if (!studioEnabled) {
+          return global;
+        }
+        const existingControls = global.admin?.components?.elements?.beforeDocumentControls;
+        return {
+          ...global,
+          admin: {
+            ...global.admin,
+            components: {
+              ...global.admin?.components,
+              elements: {
+                ...global.admin?.components?.elements,
+                beforeDocumentControls: appendComponent(
+                  existingControls,
+                  studioBackBreadcrumbComponent,
+                  "StudioBackBreadcrumb"
+                )
+              }
+            }
+          }
+        };
+      };
       return globals2.map((global) => {
-        const mapping = labelMap[global.slug];
-        if (!mapping) return global;
+        const configured = configuredBySlug.get(global.slug);
+        const defaults = defaultLabelMap[global.slug];
+        const mapping = configured || defaults ? {
+          group: configured?.group || defaults?.group,
+          label: configured?.label || defaults?.label || global.slug
+        } : void 0;
+        if (!mapping) return attachBreadcrumbToGlobal(global);
         const shouldAttachSiteSettingsEditView = studioEnabled && global.slug === "site-settings";
         const shouldAttachSocialMediaEditView = studioEnabled && global.slug === "social-media";
         const shouldAttachContactFormRedirect = studioEnabled && global.slug === "contact-form";
@@ -818,7 +859,7 @@ function configureAdmin(config) {
           ...global,
           admin: {
             ...global.admin,
-            group: mapping.group,
+            ...mapping.group ? { group: mapping.group } : {},
             components: {
               ...global.admin?.components,
               elements: {

package/dist/{chunk-ZADL33R6.mjs → chunk-OF6BATTO.mjs}

@@ -26,12 +26,15 @@ __export(nextjs_exports, {
 
 // src/nextjs/client/payload.ts
 import { getPayload } from "payload";
-var payloadPromise = null;
 var WEBSITE_CONTENT_TAG = "website-content";
 function createPayloadClient(config) {
+  let payloadPromise = null;
   return function getPayloadClient() {
     if (!payloadPromise) {
-      payloadPromise = getPayload({ config });
+      payloadPromise = Promise.resolve(config).then((resolvedConfig) => getPayload({ config: resolvedConfig })).catch((error) => {
+        payloadPromise = null;
+        throw error;
+      });
     }
     return payloadPromise;
   };
@@ -64,7 +67,7 @@ function normalizePath(segments) {
   const cleaned = segments.map((segment) => segment.trim()).filter(Boolean).join("/");
   return cleaned.length > 0 ? `/${cleaned}` : "/";
 }
-async function queryPageByPath(payload, path, draft) {
+async function queryPageByPath(payload, path, draft, collectionSlug, homeSlug) {
   const pathWhere = {
     path: {
       equals: path
@@ -76,7 +79,7 @@ async function queryPageByPath(payload, path, draft) {
     }
   };
   const result = await payload.find({
-    collection: "pages",
+    collection: collectionSlug,
     depth: 2,
     draft,
     limit: 1,
@@ -89,11 +92,11 @@ async function queryPageByPath(payload, path, draft) {
   if (path === "/") {
     const homeWhere = {
       slug: {
-        equals: "home"
+        equals: homeSlug
       }
     };
     const homeResult = await payload.find({
-      collection: "pages",
+      collection: collectionSlug,
       depth: 2,
       draft,
       limit: 1,
@@ -104,27 +107,31 @@ async function queryPageByPath(payload, path, draft) {
   }
   return null;
 }
-function createPageQueries(getPayloadClient, contentTag = "website-content") {
+function createPageQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const pagesCollectionSlug = options.pagesCollectionSlug || "pages";
+  const homeSlug = options.homeSlug || "home";
   const getPublishedPageByPathCached = unstable_cache(
     async (path) => {
       const payload = await getPayloadClient();
-      return queryPageByPath(payload, path, false);
+      return queryPageByPath(payload, path, false, pagesCollectionSlug, homeSlug);
     },
-    ["page-by-path", PAGE_QUERY_CACHE_VERSION],
+    ["page-by-path", PAGE_QUERY_CACHE_VERSION, pagesCollectionSlug, homeSlug, contentTag],
     { tags: [contentTag] }
   );
   async function getPageBySegments(segments, draft = false) {
     const path = normalizePath(segments);
     const payload = await getPayloadClient();
     if (draft) {
-      return queryPageByPath(payload, path, true);
+      return queryPageByPath(payload, path, true, pagesCollectionSlug, homeSlug);
     }
     return getPublishedPageByPathCached(path);
   }
   async function listPublishedPagePaths() {
     const payload = await getPayloadClient();
     const pages = await payload.find({
-      collection: "pages",
+      collection: pagesCollectionSlug,
       depth: 0,
       draft: false,
       limit: 1e3,
@@ -153,108 +160,46 @@ function createPageQueries(getPayloadClient, contentTag = "website-content") {
 
 // src/nextjs/queries/site.ts
 import { unstable_cache as unstable_cache2 } from "next/cache";
-function createSiteQueries(getPayloadClient, contentTag = "website-content") {
-  const getSiteSettingsCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1
-      });
-      return settings;
-    },
-    ["site-settings-global"],
-    { tags: [contentTag] }
-  );
-  const getHeaderCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1
-      });
-      return header;
-    },
-    ["header-global"],
-    { tags: [contentTag] }
-  );
-  const getFooterCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1
-      });
-      return footer;
-    },
-    ["footer-global"],
-    { tags: [contentTag] }
-  );
-  const getSocialMediaCached = unstable_cache2(
-    async () => {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1
-      });
-      return socialMedia;
-    },
-    ["social-media-global"],
-    { tags: [contentTag] }
-  );
-  async function getSiteSettings(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const settings = await payload.findGlobal({
-        slug: "site-settings",
-        depth: 1,
-        draft: true
-      });
-      return settings;
-    }
-    return getSiteSettingsCached();
-  }
-  async function getHeader(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const header = await payload.findGlobal({
-        slug: "header",
-        depth: 1,
-        draft: true
-      });
-      return header;
-    }
-    return getHeaderCached();
-  }
-  async function getFooter(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const footer = await payload.findGlobal({
-        slug: "footer",
-        depth: 1,
-        draft: true
-      });
-      return footer;
-    }
-    return getFooterCached();
-  }
-  async function getSocialMedia(draft = false) {
-    if (draft) {
-      const payload = await getPayloadClient();
-      const socialMedia = await payload.findGlobal({
-        slug: "social-media",
-        depth: 1,
-        draft: true
-      });
-      return socialMedia;
-    }
-    return getSocialMediaCached();
+function createSiteQueries(getPayloadClient, contentTagOrOptions = "website-content") {
+  const options = typeof contentTagOrOptions === "string" ? { contentTag: contentTagOrOptions } : contentTagOrOptions;
+  const contentTag = options.contentTag || "website-content";
+  const siteSettingsSlug = options.siteSettingsSlug || "site-settings";
+  const headerSlug = options.headerSlug || "header";
+  const footerSlug = options.footerSlug || "footer";
+  const socialMediaSlug = options.socialMediaSlug || "social-media";
+  function createGlobalQuery(slug, cacheKey) {
+    const getCached = unstable_cache2(
+      async () => {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          overrideAccess: false
+        });
+        return data;
+      },
+      [cacheKey, slug, contentTag],
+      { tags: [contentTag] }
+    );
+    return async function getGlobal(draft = false) {
+      if (draft) {
+        const payload = await getPayloadClient();
+        const data = await payload.findGlobal({
+          slug,
+          depth: 1,
+          draft: true,
+          overrideAccess: false
+        });
+        return data;
+      }
+      return getCached();
+    };
   }
   return {
-    getSiteSettings,
-    getHeader,
-    getFooter,
-    getSocialMedia
+    getSiteSettings: createGlobalQuery(siteSettingsSlug, "site-settings-global"),
+    getHeader: createGlobalQuery(headerSlug, "header-global"),
+    getFooter: createGlobalQuery(footerSlug, "footer-global"),
+    getSocialMedia: createGlobalQuery(socialMediaSlug, "social-media-global")
   };
 }
 

package/dist/chunk-VA545CHJ.mjs

@@ -0,0 +1,202 @@
+// src/forms/validation.ts
+var MAJOR_EMAIL_PROVIDERS = [
+  "gmail.com",
+  "yahoo.com",
+  "outlook.com",
+  "hotmail.com",
+  "icloud.com",
+  "live.com",
+  "protonmail.com"
+];
+var KNOWN_GOOD_DOMAINS = /* @__PURE__ */ new Set([
+  ...MAJOR_EMAIL_PROVIDERS,
+  "aol.com",
+  "gmx.com",
+  "googlemail.com",
+  "hey.com",
+  "mac.com",
+  "mail.com",
+  "me.com",
+  "msn.com",
+  "pm.me",
+  "proton.me",
+  "ymail.com",
+  "zoho.com"
+]);
+var EXPLICIT_TYPO_MAP = {
+  "gamil.com": "gmail.com",
+  "gmial.com": "gmail.com",
+  "gmai.com": "gmail.com",
+  "gmaill.com": "gmail.com",
+  "gmail.co": "gmail.com",
+  "gmail.con": "gmail.com",
+  "gmail.cmo": "gmail.com",
+  "hotmial.com": "hotmail.com",
+  "hotmall.com": "hotmail.com",
+  "hotmail.co": "hotmail.com",
+  "hotmail.con": "hotmail.com",
+  "iclod.com": "icloud.com",
+  "icloud.co": "icloud.com",
+  "icoud.com": "icloud.com",
+  "outlok.com": "outlook.com",
+  "outloook.com": "outlook.com",
+  "outlook.co": "outlook.com",
+  "outlook.con": "outlook.com",
+  "protonmail.co": "protonmail.com",
+  "yaho.com": "yahoo.com",
+  "yahooo.com": "yahoo.com",
+  "yahoo.co": "yahoo.com",
+  "yahoo.con": "yahoo.com"
+};
+var EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/;
+function levenshtein(a, b) {
+  if (a === b) return 0;
+  const rows = a.length + 1;
+  const cols = b.length + 1;
+  const dist = Array.from({ length: cols }, (_, j) => j);
+  for (let i = 1; i < rows; i += 1) {
+    let prevDiagonal = dist[0];
+    dist[0] = i;
+    for (let j = 1; j < cols; j += 1) {
+      const temp = dist[j];
+      dist[j] = Math.min(
+        dist[j] + 1,
+        dist[j - 1] + 1,
+        prevDiagonal + (a[i - 1] === b[j - 1] ? 0 : 1)
+      );
+      prevDiagonal = temp;
+    }
+  }
+  return dist[cols - 1];
+}
+function normalizeEmail(value) {
+  return value.trim().toLowerCase();
+}
+function validateEmail(value, options = {}) {
+  const normalized = normalizeEmail(value);
+  if (normalized.length === 0) {
+    return { valid: false, normalized, message: "Email is required." };
+  }
+  if (!EMAIL_PATTERN.test(normalized)) {
+    return { valid: false, normalized, message: "Enter a valid email address." };
+  }
+  const [localPart, domain] = normalized.split("@");
+  const knownGood = options.knownGoodDomains ? /* @__PURE__ */ new Set([...KNOWN_GOOD_DOMAINS, ...options.knownGoodDomains.map((entry) => entry.toLowerCase())]) : KNOWN_GOOD_DOMAINS;
+  if (knownGood.has(domain)) {
+    return { valid: true, normalized };
+  }
+  const explicitCorrection = EXPLICIT_TYPO_MAP[domain];
+  if (explicitCorrection) {
+    const suggestion = `${localPart}@${explicitCorrection}`;
+    return {
+      valid: false,
+      normalized,
+      message: `Did you mean ${suggestion}?`,
+      suggestion
+    };
+  }
+  for (const provider of MAJOR_EMAIL_PROVIDERS) {
+    if (levenshtein(domain, provider) === 1) {
+      const suggestion = `${localPart}@${provider}`;
+      return {
+        valid: false,
+        normalized,
+        message: `Did you mean ${suggestion}?`,
+        suggestion
+      };
+    }
+  }
+  return { valid: true, normalized };
+}
+function normalizePhone(value) {
+  const digits = value.replace(/\D+/g, "");
+  if (digits.length === 11 && digits.startsWith("1")) {
+    return digits.slice(1);
+  }
+  return digits;
+}
+function formatPhoneUS(value) {
+  const digits = normalizePhone(value).slice(0, 10);
+  if (digits.length === 0) return "";
+  if (digits.length < 4) return `(${digits}`;
+  if (digits.length < 7) return `(${digits.slice(0, 3)}) ${digits.slice(3)}`;
+  return `(${digits.slice(0, 3)}) ${digits.slice(3, 6)}-${digits.slice(6)}`;
+}
+function validatePhoneUS(value) {
+  const digits = normalizePhone(value);
+  if (digits.length === 0) {
+    return { valid: false, normalized: "", message: "Phone number is required." };
+  }
+  if (digits.length !== 10) {
+    return { valid: false, normalized: digits, message: "Enter a 10-digit phone number." };
+  }
+  return { valid: true, normalized: digits };
+}
+function normalizeUrl(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) return "";
+  if (/^https?:\/\//i.test(trimmed)) return trimmed;
+  return `https://${trimmed}`;
+}
+function validateUrl(value) {
+  const normalized = normalizeUrl(value);
+  if (normalized.length === 0) {
+    return { valid: false, normalized, message: "URL is required." };
+  }
+  try {
+    const parsed = new URL(normalized);
+    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+      return { valid: false, normalized, message: "Enter a valid web address." };
+    }
+    if (!parsed.hostname.includes(".")) {
+      return { valid: false, normalized, message: "Enter a valid web address." };
+    }
+    return { valid: true, normalized };
+  } catch {
+    return { valid: false, normalized, message: "Enter a valid web address." };
+  }
+}
+function validateRequired(value, label = "This field") {
+  const normalized = typeof value === "string" ? value.trim() : "";
+  const present = typeof value === "string" ? normalized.length > 0 : Array.isArray(value) ? value.length > 0 : value !== null && value !== void 0 && value !== false;
+  if (!present) {
+    return { valid: false, normalized, message: `${label} is required.` };
+  }
+  return { valid: true, normalized: typeof value === "string" ? normalized : String(value) };
+}
+function normalizeFieldValue(value, fieldType) {
+  switch (fieldType) {
+    case "email":
+      return normalizeEmail(value);
+    case "phone":
+      return normalizePhone(value);
+    case "url":
+      return normalizeUrl(value);
+    default:
+      return value.trim();
+  }
+}
+function inferFieldType(field) {
+  const type = typeof field.type === "string" ? field.type.toLowerCase() : "";
+  if (type === "email" || type === "phone" || type === "tel" || type === "url") {
+    return type === "tel" ? "phone" : type;
+  }
+  const name = typeof field.name === "string" ? field.name.toLowerCase() : "";
+  if (name.includes("email")) return "email";
+  if (name.includes("phone") || name.includes("mobile")) return "phone";
+  if (name.includes("website") || name.endsWith("url")) return "url";
+  return "text";
+}
+
+export {
+  normalizeEmail,
+  validateEmail,
+  normalizePhone,
+  formatPhoneUS,
+  validatePhoneUS,
+  normalizeUrl,
+  validateUrl,
+  validateRequired,
+  normalizeFieldValue,
+  inferFieldType
+};

package/dist/forms/index.d.mts

@@ -0,0 +1,25 @@
+type FieldValidationResult = {
+    valid: boolean;
+    normalized: string;
+    message?: string;
+    suggestion?: string;
+};
+declare function normalizeEmail(value: string): string;
+type ValidateEmailOptions = {
+    knownGoodDomains?: string[];
+};
+declare function validateEmail(value: string, options?: ValidateEmailOptions): FieldValidationResult;
+declare function normalizePhone(value: string): string;
+declare function formatPhoneUS(value: string): string;
+declare function validatePhoneUS(value: string): FieldValidationResult;
+declare function normalizeUrl(value: string): string;
+declare function validateUrl(value: string): FieldValidationResult;
+declare function validateRequired(value: unknown, label?: string): FieldValidationResult;
+type StudioFormFieldType = 'email' | 'phone' | 'url' | 'text';
+declare function normalizeFieldValue(value: string, fieldType: StudioFormFieldType): string;
+declare function inferFieldType(field: {
+    name?: unknown;
+    type?: unknown;
+}): StudioFormFieldType;
+
+export { type FieldValidationResult, type StudioFormFieldType, type ValidateEmailOptions, formatPhoneUS, inferFieldType, normalizeEmail, normalizeFieldValue, normalizePhone, normalizeUrl, validateEmail, validatePhoneUS, validateRequired, validateUrl };

package/dist/forms/index.d.ts

@@ -0,0 +1,25 @@
+type FieldValidationResult = {
+    valid: boolean;
+    normalized: string;
+    message?: string;
+    suggestion?: string;
+};
+declare function normalizeEmail(value: string): string;
+type ValidateEmailOptions = {
+    knownGoodDomains?: string[];
+};
+declare function validateEmail(value: string, options?: ValidateEmailOptions): FieldValidationResult;
+declare function normalizePhone(value: string): string;
+declare function formatPhoneUS(value: string): string;
+declare function validatePhoneUS(value: string): FieldValidationResult;
+declare function normalizeUrl(value: string): string;
+declare function validateUrl(value: string): FieldValidationResult;
+declare function validateRequired(value: unknown, label?: string): FieldValidationResult;
+type StudioFormFieldType = 'email' | 'phone' | 'url' | 'text';
+declare function normalizeFieldValue(value: string, fieldType: StudioFormFieldType): string;
+declare function inferFieldType(field: {
+    name?: unknown;
+    type?: unknown;
+}): StudioFormFieldType;
+
+export { type FieldValidationResult, type StudioFormFieldType, type ValidateEmailOptions, formatPhoneUS, inferFieldType, normalizeEmail, normalizeFieldValue, normalizePhone, normalizeUrl, validateEmail, validatePhoneUS, validateRequired, validateUrl };