@orion-studios/payload-studio 0.6.0-beta.45 → 0.6.0-beta.46

package/dist/builder-v2/index.d.ts

@@ -15,18 +15,76 @@ type BuilderV2ValidationIssue = {
     path: string;
     severity: 'error' | 'warning';
 };
+type BuilderV2Role = 'admin' | 'client' | 'developer' | 'editor';
+type BuilderV2PermissionSet = {
+    canEditCustomCode?: boolean;
+    canManageGlobalStyles?: boolean;
+    canManageReusableSections?: boolean;
+    canPublish?: boolean;
+    canUseEmbeds?: boolean;
+    role?: BuilderV2Role;
+};
 type BuilderV2CompiledOutput = {
     css: string;
     dynamicComponents: BuilderV2DynamicComponentInstance[];
     html: string;
+    validationIssues?: BuilderV2ValidationIssue[];
 };
 type BuilderV2ProjectData = Record<string, unknown>;
+type BuilderV2ThemeTokens = {
+    buttons?: Record<string, unknown>;
+    colors?: Record<string, string>;
+    fonts?: Record<string, string>;
+    radii?: Record<string, string>;
+    shadows?: Record<string, string>;
+    spacing?: Record<string, string>;
+    typography?: Record<string, unknown>;
+};
+type BuilderV2PageTreeNode = {
+    children?: BuilderV2PageTreeNode[];
+    id: number | string;
+    parentId?: number | string | null;
+    path: string;
+    slug: string;
+    status?: 'draft' | 'published';
+    title: string;
+};
+type BuilderV2VersionSnapshot = {
+    compiledCss?: string;
+    compiledHtml?: string;
+    createdAt: string;
+    id: string;
+    label: string;
+    projectData?: BuilderV2ProjectData | null;
+    published?: boolean;
+};
+type BuilderV2ReusableSection = {
+    category?: string;
+    id: string;
+    name: string;
+    projectData: BuilderV2ProjectData;
+    thumbnail?: string;
+};
+type BuilderV2EditorMeta = {
+    pageTree?: BuilderV2PageTreeNode[];
+    permissions?: BuilderV2PermissionSet;
+    themeTokens?: BuilderV2ThemeTokens;
+};
 type BuilderV2PageData = {
+    builderAutosaveProjectData?: BuilderV2ProjectData | null;
     builderDynamicComponents?: BuilderV2DynamicComponentInstance[];
+    builderLastPublishedAt?: string;
+    builderLastSavedAt?: string;
+    builderLockedAreas?: string[];
     builderMode?: string;
     builderProjectData?: BuilderV2ProjectData | null;
     builderPublishedProjectData?: BuilderV2ProjectData | null;
+    builderPublishedSnapshot?: BuilderV2VersionSnapshot | null;
+    builderReusableSections?: BuilderV2ReusableSection[];
+    builderSeo?: Record<string, unknown> | null;
+    builderThemeTokens?: BuilderV2ThemeTokens | null;
     builderValidationIssues?: BuilderV2ValidationIssue[];
+    builderVersions?: BuilderV2VersionSnapshot[];
     compiledCss?: string;
     compiledHtml?: string;
     id?: number | string;
@@ -70,11 +128,13 @@ type BuilderV2TraitDefinition = {
 type BuilderV2ProjectAdapter = {
     components?: Record<string, BuilderV2ProjectComponentDefinition | BuilderV2RuntimeComponent>;
     dataProviders?: Record<string, unknown>;
+    defaultThemeTokens?: BuilderV2ThemeTokens;
     id: string;
     label?: string;
     themeTokens?: Record<string, unknown>;
 };
 type BuilderV2EditorInitialData = {
+    meta?: BuilderV2EditorMeta;
     projectData?: BuilderV2ProjectData | null;
     title?: string;
 };
@@ -145,6 +205,19 @@ declare const createBuilderV2PageService: ({ collectionSlug, payload, user, }: C
 declare const createEmptyBuilderV2ProjectData: (title?: string) => BuilderV2ProjectData;
 declare const normalizeBuilderV2ProjectData: (value: unknown, fallbackTitle?: string) => BuilderV2ProjectData;
 
+type PageLike = {
+    id: number | string;
+    parent?: number | string | {
+        id?: number | string;
+    } | null;
+    parentId?: number | string | null;
+    path?: string | null;
+    slug?: string | null;
+    title?: string | null;
+    _status?: 'draft' | 'published';
+};
+declare const buildBuilderV2PageTree: (pages: PageLike[]) => BuilderV2PageTreeNode[];
+
 declare function BuilderPageRuntime({ adapter, className, page }: BuilderV2RuntimeProps): react_jsx_runtime.JSX.Element;
 
 declare const parseBuilderV2DynamicComponents: (html: string) => BuilderV2DynamicComponentInstance[];
@@ -152,5 +225,12 @@ declare const splitBuilderV2HtmlIntoChunks: (html: string) => BuilderV2Renderabl
 
 declare const sanitizeBuilderHtml: (value: unknown) => string;
 declare const sanitizeBuilderCss: (value: unknown) => string;
+declare const scopeBuilderCss: (value: unknown, scope?: string) => string;
+
+declare const validateBuilderV2Output: (input: {
+    css?: unknown;
+    html?: unknown;
+}) => BuilderV2ValidationIssue[];
+declare const hasBlockingBuilderV2Issues: (issues: BuilderV2ValidationIssue[]) => boolean;
 
-export { BuilderPageRuntime, type BuilderV2Asset, type BuilderV2CompiledOutput, type BuilderV2DynamicComponentInstance, type BuilderV2EditorInitialData, type BuilderV2FieldOptions, type BuilderV2Mode, type BuilderV2PageData, type BuilderV2PagePayloadDoc, type BuilderV2ProjectAdapter, type BuilderV2ProjectComponentDefinition, type BuilderV2ProjectData, type BuilderV2RenderResult, type BuilderV2RenderableChunk, type BuilderV2RuntimeComponent, type BuilderV2RuntimeComponentProps, type BuilderV2RuntimeProps, type BuilderV2TraitDefinition, type BuilderV2ValidationIssue, type CreateBuilderV2PageServiceArgs, type SaveBuilderV2PageInput, appendBuilderV2PageFields, compileBuilderV2Output, createBuilderV2PageFields, createBuilderV2PageService, createEmptyBuilderV2ProjectData, normalizeBuilderV2ProjectData, parseBuilderV2DynamicComponents, sanitizeBuilderCss, sanitizeBuilderHtml, splitBuilderV2HtmlIntoChunks, toBuilderV2EditorInitialData };
+export { BuilderPageRuntime, type BuilderV2Asset, type BuilderV2CompiledOutput, type BuilderV2DynamicComponentInstance, type BuilderV2EditorInitialData, type BuilderV2FieldOptions, type BuilderV2Mode, type BuilderV2PageData, type BuilderV2PagePayloadDoc, type BuilderV2PageTreeNode, type BuilderV2PermissionSet, type BuilderV2ProjectAdapter, type BuilderV2ProjectComponentDefinition, type BuilderV2ProjectData, type BuilderV2RenderResult, type BuilderV2RenderableChunk, type BuilderV2RuntimeComponent, type BuilderV2RuntimeComponentProps, type BuilderV2RuntimeProps, type BuilderV2ThemeTokens, type BuilderV2TraitDefinition, type BuilderV2ValidationIssue, type BuilderV2VersionSnapshot, type CreateBuilderV2PageServiceArgs, type SaveBuilderV2PageInput, appendBuilderV2PageFields, buildBuilderV2PageTree, compileBuilderV2Output, createBuilderV2PageFields, createBuilderV2PageService, createEmptyBuilderV2ProjectData, hasBlockingBuilderV2Issues, normalizeBuilderV2ProjectData, parseBuilderV2DynamicComponents, sanitizeBuilderCss, sanitizeBuilderHtml, scopeBuilderCss, splitBuilderV2HtmlIntoChunks, toBuilderV2EditorInitialData, validateBuilderV2Output };

package/dist/builder-v2/index.js

@@ -32,16 +32,20 @@ var builder_v2_exports = {};
 __export(builder_v2_exports, {
   BuilderPageRuntime: () => BuilderPageRuntime,
   appendBuilderV2PageFields: () => appendBuilderV2PageFields,
+  buildBuilderV2PageTree: () => buildBuilderV2PageTree,
   compileBuilderV2Output: () => compileBuilderV2Output,
   createBuilderV2PageFields: () => createBuilderV2PageFields,
   createBuilderV2PageService: () => createBuilderV2PageService,
   createEmptyBuilderV2ProjectData: () => createEmptyBuilderV2ProjectData,
+  hasBlockingBuilderV2Issues: () => hasBlockingBuilderV2Issues,
   normalizeBuilderV2ProjectData: () => normalizeBuilderV2ProjectData,
   parseBuilderV2DynamicComponents: () => parseBuilderV2DynamicComponents,
   sanitizeBuilderCss: () => sanitizeBuilderCss,
   sanitizeBuilderHtml: () => sanitizeBuilderHtml,
+  scopeBuilderCss: () => scopeBuilderCss,
   splitBuilderV2HtmlIntoChunks: () => splitBuilderV2HtmlIntoChunks,
-  toBuilderV2EditorInitialData: () => toBuilderV2EditorInitialData
+  toBuilderV2EditorInitialData: () => toBuilderV2EditorInitialData,
+  validateBuilderV2Output: () => validateBuilderV2Output
 });
 module.exports = __toCommonJS(builder_v2_exports);
 
@@ -75,6 +79,13 @@ var createBuilderV2PageFields = (options = {}) => {
       },
       hidden
     ),
+    withHiddenAdmin(
+      {
+        name: "builderAutosaveProjectData",
+        type: "json"
+      },
+      hidden
+    ),
     withHiddenAdmin(
       {
         name: "builderPublishedProjectData",
@@ -109,6 +120,62 @@ var createBuilderV2PageFields = (options = {}) => {
         type: "json"
       },
       hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderVersions",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderPublishedSnapshot",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderReusableSections",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderThemeTokens",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderLockedAreas",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderSeo",
+        type: "json"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderLastSavedAt",
+        type: "date"
+      },
+      hidden
+    ),
+    withHiddenAdmin(
+      {
+        name: "builderLastPublishedAt",
+        type: "date"
+      },
+      hidden
     )
   ];
 };
@@ -253,15 +320,119 @@ var sanitizeBuilderCss = (value) => {
   }
   return value.replace(/@import\s+[^;]+;/gi, "").replace(/expression\s*\(/gi, "").replace(/javascript\s*:/gi, "");
 };
+var scopeSelector = (selector, scope) => selector.split(",").map((part) => {
+  const trimmed = part.trim();
+  if (!trimmed || trimmed.startsWith(scope) || trimmed.startsWith("@")) {
+    return trimmed;
+  }
+  if (/^(html|body|:root)\b/i.test(trimmed)) {
+    return trimmed.replace(/^(html|body|:root)\b/i, scope);
+  }
+  return `${scope} ${trimmed}`;
+}).filter(Boolean).join(", ");
+var scopeBuilderCss = (value, scope = ".orion-builder-v2-runtime") => {
+  const css = sanitizeBuilderCss(value);
+  if (!css) {
+    return "";
+  }
+  let output = "";
+  let cursor = 0;
+  const rulePattern = /([^{}]+)\{/g;
+  let match;
+  while ((match = rulePattern.exec(css)) !== null) {
+    const selectorStart = match.index;
+    const selector = match[1];
+    output += css.slice(cursor, selectorStart);
+    const trimmedSelector = selector.trim();
+    if (trimmedSelector.startsWith("@keyframes") || trimmedSelector.startsWith("@font-face") || trimmedSelector.startsWith("@page")) {
+      output += `${selector}{`;
+    } else if (trimmedSelector.startsWith("@media") || trimmedSelector.startsWith("@supports")) {
+      output += `${selector}{`;
+    } else {
+      output += `${scopeSelector(selector, scope)} {`;
+    }
+    cursor = rulePattern.lastIndex;
+  }
+  output += css.slice(cursor);
+  return output;
+};
+
+// src/builder-v2/validation.ts
+var hasMatch = (value, pattern) => pattern.test(value);
+var validateBuilderV2Output = (input) => {
+  const html = typeof input.html === "string" ? input.html : "";
+  const css = typeof input.css === "string" ? input.css : "";
+  const issues = [];
+  if (!html.trim()) {
+    issues.push({
+      code: "empty-page",
+      message: "This page has no rendered content.",
+      path: "compiledHtml",
+      severity: "error"
+    });
+  }
+  if (!hasMatch(html, /<h1\b/i)) {
+    issues.push({
+      code: "missing-h1",
+      message: "Add one H1 so the published page has a clear primary heading.",
+      path: "compiledHtml",
+      severity: "warning"
+    });
+  }
+  if (hasMatch(html, /\son[a-z]+\s*=/i)) {
+    issues.push({
+      code: "inline-event-handler",
+      message: "Inline event handlers are not allowed in published builder HTML.",
+      path: "compiledHtml",
+      severity: "error"
+    });
+  }
+  if (hasMatch(html, /<(script|object|embed)\b/i)) {
+    issues.push({
+      code: "unsafe-element",
+      message: "Script, object, and embed tags are not allowed in builder content.",
+      path: "compiledHtml",
+      severity: "error"
+    });
+  }
+  if (hasMatch(html, /\b(?:href|src)=["']\s*javascript:/i)) {
+    issues.push({
+      code: "unsafe-url",
+      message: "Links and media cannot use javascript URLs.",
+      path: "compiledHtml",
+      severity: "error"
+    });
+  }
+  if (hasMatch(css, /@import\s/i)) {
+    issues.push({
+      code: "css-import",
+      message: "CSS imports are removed at publish time. Use the site font and theme managers instead.",
+      path: "compiledCss",
+      severity: "warning"
+    });
+  }
+  if (hasMatch(css, /position\s*:\s*fixed/i)) {
+    issues.push({
+      code: "fixed-position",
+      message: "Fixed positioning can cover site navigation or dialogs. Review this before publishing.",
+      path: "compiledCss",
+      severity: "warning"
+    });
+  }
+  return issues;
+};
+var hasBlockingBuilderV2Issues = (issues) => issues.some((issue) => issue.severity === "error");
 
 // src/builder-v2/payload/compile.ts
 var compileBuilderV2Output = (input) => {
   const html = sanitizeBuilderHtml(input.html);
-  const css = sanitizeBuilderCss(input.css);
+  const css = scopeBuilderCss(input.css);
+  const validationIssues = validateBuilderV2Output({ css: input.css, html: input.html });
   return {
     css,
     dynamicComponents: parseBuilderV2DynamicComponents(html),
-    html
+    html,
+    validationIssues
   };
 };
 
@@ -309,6 +480,25 @@ var normalizeBuilderV2ProjectData = (value, fallbackTitle = "Untitled Page") =>
 
 // src/builder-v2/payload/pageService.ts
 var pageTitle = (page) => typeof page.title === "string" && page.title.trim().length > 0 ? page.title : "Untitled Page";
+var normalizeVersions = (value) => Array.isArray(value) ? value.filter((item) => Boolean(item && typeof item === "object")) : [];
+var createVersionSnapshot = ({
+  compiled,
+  label,
+  projectData,
+  published = false
+}) => {
+  const createdAt = (/* @__PURE__ */ new Date()).toISOString();
+  return {
+    compiledCss: compiled.css,
+    compiledHtml: compiled.html,
+    createdAt,
+    id: `builder-v2-${createdAt.replace(/[^0-9]/g, "")}`,
+    label,
+    projectData,
+    published
+  };
+};
+var appendVersionSnapshot = (current, snapshot) => [snapshot, ...normalizeVersions(current)].slice(0, 50);
 var toBuilderV2EditorInitialData = (page) => ({
   projectData: normalizeBuilderV2ProjectData(
     page.builderProjectData || page.builderPublishedProjectData,
@@ -338,14 +528,33 @@ var createBuilderV2PageService = ({
   },
   saveDraft: async (pageID, input) => {
     const compiled = compileBuilderV2Output(input.compiled);
+    const existing = await payload.findByID({
+      collection: collectionSlug,
+      depth: 0,
+      draft: true,
+      id: pageID,
+      overrideAccess: false,
+      user
+    });
+    const validationIssues = input.validationIssues || compiled.validationIssues || [];
     await payload.update({
       collection: collectionSlug,
       data: {
         _status: "draft",
+        builderAutosaveProjectData: null,
         builderDynamicComponents: compiled.dynamicComponents,
+        builderLastSavedAt: (/* @__PURE__ */ new Date()).toISOString(),
         builderMode: "grapes-v2",
         builderProjectData: input.projectData,
-        builderValidationIssues: input.validationIssues || [],
+        builderValidationIssues: validationIssues,
+        builderVersions: appendVersionSnapshot(
+          existing.builderVersions,
+          createVersionSnapshot({
+            compiled,
+            label: "Draft saved",
+            projectData: input.projectData
+          })
+        ),
         compiledCss: compiled.css,
         compiledHtml: compiled.html,
         ...input.title ? { title: input.title } : {}
@@ -362,15 +571,35 @@ var createBuilderV2PageService = ({
   },
   publish: async (pageID, input) => {
     const compiled = compileBuilderV2Output(input.compiled);
+    const existing = await payload.findByID({
+      collection: collectionSlug,
+      depth: 0,
+      draft: true,
+      id: pageID,
+      overrideAccess: false,
+      user
+    });
+    const validationIssues = input.validationIssues || compiled.validationIssues || [];
+    const snapshot = createVersionSnapshot({
+      compiled,
+      label: "Published",
+      projectData: input.projectData,
+      published: true
+    });
     await payload.update({
       collection: collectionSlug,
       data: {
         _status: "published",
+        builderAutosaveProjectData: null,
         builderDynamicComponents: compiled.dynamicComponents,
+        builderLastPublishedAt: snapshot.createdAt,
+        builderLastSavedAt: snapshot.createdAt,
         builderMode: "grapes-v2",
         builderProjectData: input.projectData,
         builderPublishedProjectData: input.projectData,
-        builderValidationIssues: input.validationIssues || [],
+        builderPublishedSnapshot: snapshot,
+        builderValidationIssues: validationIssues,
+        builderVersions: appendVersionSnapshot(existing.builderVersions, snapshot),
         compiledCss: compiled.css,
         compiledHtml: compiled.html,
         ...input.title ? { title: input.title } : {}
@@ -387,6 +616,46 @@ var createBuilderV2PageService = ({
   }
 });
 
+// src/builder-v2/pageTree.ts
+var relationId = (value) => {
+  if (typeof value === "number" || typeof value === "string") {
+    return value;
+  }
+  if (value && typeof value === "object") {
+    const id = value.id;
+    return typeof id === "number" || typeof id === "string" ? id : null;
+  }
+  return null;
+};
+var buildBuilderV2PageTree = (pages) => {
+  const nodes = /* @__PURE__ */ new Map();
+  const roots = [];
+  pages.forEach((page) => {
+    nodes.set(page.id, {
+      children: [],
+      id: page.id,
+      parentId: page.parentId ?? relationId(page.parent),
+      path: page.path || (page.slug ? `/${page.slug}` : "/"),
+      slug: page.slug || "",
+      status: page._status,
+      title: page.title || "Untitled page"
+    });
+  });
+  nodes.forEach((node) => {
+    if (node.parentId && nodes.has(node.parentId)) {
+      nodes.get(node.parentId)?.children?.push(node);
+    } else {
+      roots.push(node);
+    }
+  });
+  const sortNodes = (items) => {
+    items.sort((a, b) => a.path.localeCompare(b.path));
+    items.forEach((item) => sortNodes(item.children || []));
+  };
+  sortNodes(roots);
+  return roots;
+};
+
 // src/builder-v2/runtime/BuilderPageRuntime.tsx
 var import_react = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -402,7 +671,7 @@ var resolveRuntimeComponent = (adapter, type) => {
 };
 function BuilderPageRuntime({ adapter, className, page }) {
   const html = sanitizeBuilderHtml(page.compiledHtml);
-  const css = sanitizeBuilderCss(page.compiledCss);
+  const css = scopeBuilderCss(page.compiledCss);
   const chunks = splitBuilderV2HtmlIntoChunks(html);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: ["orion-builder-v2-runtime", className].filter(Boolean).join(" "), children: [
     css ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("style", { dangerouslySetInnerHTML: { __html: css } }) : null,
@@ -436,14 +705,18 @@ function BuilderPageRuntime({ adapter, className, page }) {
 0 && (module.exports = {
   BuilderPageRuntime,
   appendBuilderV2PageFields,
+  buildBuilderV2PageTree,
   compileBuilderV2Output,
   createBuilderV2PageFields,
   createBuilderV2PageService,
   createEmptyBuilderV2ProjectData,
+  hasBlockingBuilderV2Issues,
   normalizeBuilderV2ProjectData,
   parseBuilderV2DynamicComponents,
   sanitizeBuilderCss,
   sanitizeBuilderHtml,
+  scopeBuilderCss,
   splitBuilderV2HtmlIntoChunks,
-  toBuilderV2EditorInitialData
+  toBuilderV2EditorInitialData,
+  validateBuilderV2Output
 });