openplanr 3.2.0 → 3.4.0

package/lib/host-packages/openai/openplanr/runtime/design/scripts/design-artifact-shell.mjs

@@ -1,9 +1,7 @@
 import {
-  digestArtifactEnvelope
-} from "./design-shared-artifact-support-protocol-contracts-ea2cd15e.mjs";
-import {
+  digestArtifactEnvelope,
   validateJson
-} from "./design-shared-protocol-contracts-b5f28f94.mjs";
+} from "./design-shared-artifact-support-protocol-contracts-9f6918b0.mjs";
 
 // packages/artifact/lib/artifact/ui/shell.mjs
 import { readFileSync as readFileSync2 } from "node:fs";

package/lib/host-packages/openai/openplanr/runtime/design/scripts/design-document.mjs

@@ -1,3 +1,18 @@
+import {
+  DESIGN_DOCUMENT_SCHEMA,
+  assertDesignDocument,
+  bundleLocalDocument,
+  initialFrameHeight,
+  inspectLocalDocumentBody,
+  loadReviewContext,
+  parse,
+  parseFragment,
+  resolveLocalDocumentFile,
+  reviewDigest,
+  reviewFingerprints,
+  serialize,
+  validateDesignProps
+} from "./design-shared-artifact-support-dependencies-design-support-protocol-contracts-d707e49b.mjs";
 import {
   AA_NORMAL,
   contrastRatio,
@@ -6,6 +21,15 @@ import {
   renderArtifactShellDocument,
   renderPlanrMark
 } from "./design-artifact-shell.mjs";
+import {
+  ARTIFACT_ERROR_CODES,
+  ARTIFACT_MAX_SOURCES,
+  ARTIFACT_MAX_VIEWS,
+  PipelineError,
+  createSharedArtifactEnvelope,
+  digestArtifactEnvelope,
+  resolveArtifactHtml
+} from "./design-shared-artifact-support-protocol-contracts-9f6918b0.mjs";
 import {
   ARTIFACT_FRAME_GUARD_TEMPLATE,
   ARTIFACT_HOST_GUARD_TEMPLATE,
@@ -14,38 +38,16 @@ import {
 import {
   atomicBytes,
   atomicJson,
-  bundleLocalDocument,
   currentDesign,
   designSpecPath,
   hash,
   json,
-  loadReviewContext,
-  parse,
-  parseFragment,
   readJson,
-  recoverDesignPublication,
-  resolveLocalDocumentFile,
-  reviewDigest,
-  reviewFingerprints,
-  serialize
-} from "./design-shared-artifact-support-dependencies-design-support-protocol-contracts-3d9b1a86.mjs";
+  recoverDesignPublication
+} from "./design-shared-design-support-0bac378d.mjs";
 import {
   acquireStartLock
 } from "./design-loopback-server.mjs";
-import {
-  ARTIFACT_ERROR_CODES,
-  ARTIFACT_MAX_SOURCES,
-  ARTIFACT_MAX_VIEWS,
-  PipelineError,
-  createSharedArtifactEnvelope,
-  digestArtifactEnvelope,
-  resolveArtifactHtml
-} from "./design-shared-artifact-support-protocol-contracts-ea2cd15e.mjs";
-import {
-  DESIGN_DOCUMENT_SCHEMA,
-  assertDesignDocument,
-  initialFrameHeight
-} from "./design-shared-protocol-contracts-b5f28f94.mjs";
 
 // packages/design/lib/design/frame-size.mjs
 function designFrameLabel(frame) {
@@ -1620,6 +1622,15 @@ function lintDesign(html, opts = {}) {
   const { designSystem = null } = opts;
   const errors = [];
   const warnings = [];
+  if (opts.screen) {
+    const values = Object.hasOwn(opts.variant?.props ?? {}, opts.screen.id) ? opts.variant.props[opts.screen.id] : {};
+    errors.push(
+      ...validateDesignProps({
+        screens: [opts.screen],
+        variants: [{ props: { [opts.screen.id]: values } }]
+      }).map((message) => ({ rule: "invalid-instance-prop", level: "error", message }))
+    );
+  }
   const decls = [...styleBlockDecls(html), ...inlineStyleDecls(html)];
   for (const d of decls) {
     if (SPACING_PROP.test(d.prop)) {
@@ -1693,6 +1704,57 @@ function lintDesign(html, opts = {}) {
     summary: `${errors.length} error(s), ${warnings.length} warning(s)`
   };
 }
+function withoutRootTheme(html) {
+  if (!/theme-(?:light|dark)|data-theme/iu.test(html)) return null;
+  const body = inspectLocalDocumentBody(html);
+  if (!body) return null;
+  const edits = [];
+  for (const { name, value } of body.attrs) {
+    const location = body.location.attrs?.[name];
+    if (!location) continue;
+    let replacement;
+    if (name === "data-theme" && ["light", "dark"].includes(value)) replacement = "";
+    if (name === "class") {
+      const raw = html.slice(location.startOffset, location.endOffset);
+      const quoted = /^(class\s*=\s*)(["'])([\s\S]*)\2$/iu.exec(raw);
+      if (quoted) {
+        const kept = quoted[3].replace(/(^|\s)theme-(?:light|dark)(?=\s|$)/gu, "$1");
+        if (kept !== quoted[3]) replacement = `${quoted[1]}${quoted[2]}${kept}${quoted[2]}`;
+      } else if (/^class\s*=\s*theme-(?:light|dark)$/iu.test(raw)) replacement = "";
+    }
+    if (replacement !== void 0) edits.push({ ...location, replacement });
+  }
+  if (!edits.length) return null;
+  let normalized = html;
+  for (const { startOffset, endOffset, replacement } of edits.sort(
+    (a, b) => b.startOffset - a.startOffset
+  ))
+    normalized = normalized.slice(0, startOffset) + replacement + normalized.slice(endOffset);
+  return normalized;
+}
+function lintThemeOnlySources(sources) {
+  const warnings = [];
+  const seen = /* @__PURE__ */ new Map();
+  for (const { screenId, source, html } of sources) {
+    const normalized = withoutRootTheme(html);
+    if (normalized === null) continue;
+    const key = JSON.stringify({
+      html: normalized,
+      styles: source.styles ?? [],
+      scripts: source.scripts ?? []
+    });
+    const previous = seen.get(key);
+    if (previous && previous.screenId !== screenId && previous.source !== source.html && previous.html !== html)
+      warnings.push({
+        rule: "theme-only-source",
+        level: "warn",
+        screenId,
+        message: `Screens ${previous.screenId} (${previous.source}) and ${screenId} (${source.html}) differ only by a root theme marker; declare a theme prop and share one source.`
+      });
+    else seen.set(key, { screenId, source: source.html, html });
+  }
+  return warnings;
+}
 function lintCanvasData(data, { frames } = {}) {
   const errors = [];
   for (const section of data?.sections || []) {
@@ -2434,8 +2496,19 @@ function prepareDesignDocument(file, { readSource, passive = false, maxBytes } =
     ])
   );
   for (const variant of document2.variants.filter((item) => item.status === "ready")) {
+    const themeWarnings = lintThemeOnlySources(
+      document2.screens.map((screen) => {
+        const source = variant.sources?.[screen.id] ?? screen.source;
+        return {
+          screenId: screen.id,
+          source,
+          html: sourceContents.get(source.html).toString("utf8")
+        };
+      })
+    );
     for (const screenId of document2.screenOrder) {
       const screen = document2.screens.find((item) => item.id === screenId);
+      const values = Object.hasOwn(variant.props ?? {}, screenId) ? variant.props[screenId] : {};
       const bundled = bundleLocalDocument({
         root,
         source: variant.sources?.[screenId] ?? screen.source,
@@ -2443,6 +2516,14 @@ function prepareDesignDocument(file, { readSource, passive = false, maxBytes } =
         screenId,
         readSource,
         passive,
+        ...screen.props ? {
+          screenProps: Object.fromEntries(
+            Object.entries(screen.props).map(([name, declaration]) => [
+              name,
+              Object.hasOwn(values, name) ? values[name] : declaration.default
+            ])
+          )
+        } : {},
         ...maxBytes === void 0 ? {} : { maxBytes }
       });
       if (document2.frames.some(({ height }) => height === "auto"))
@@ -2465,8 +2546,12 @@ function prepareDesignDocument(file, { readSource, passive = false, maxBytes } =
           );
       }
       const report = lintDesign(bundled.html, {
-        designSystem: document2.designSystem
+        designSystem: document2.designSystem,
+        screen,
+        variant
       });
+      report.warnings.push(...themeWarnings.filter((item) => item.screenId === screenId));
+      report.summary = `${report.errors.length} error(s), ${report.warnings.length} warning(s)`;
       lint.push({ variantId: variant.id, screenId, ...report });
       for (const anchor of screen.anchors ?? []) {
         if (!bundled.html.includes(`data-planr-id="${anchor}"`) && !bundled.html.includes(`id="${anchor}"`))