@bettercms-ai/astro 0.4.0 → 0.5.0

package/components/BcmsBlocks.astro

@@ -1,24 +1,51 @@
 ---
 /**
- * <BcmsBlocks> — renders a page's blockJson tree natively in Astro. Covers all
- * 8 block types (heading, text, image, button, spacer, video, columns, form),
- * with `columns` recursing via Astro.self and `form` resolving from the `forms`
- * prop. Class names mirror the server-side renderer.
+ * <BcmsBlocks> — renders a page's blockJson tree natively in Astro. Covers
+ * heading, text, image, button, spacer, video, columns, form and `component`,
+ * with `columns` and `component` recursing via Astro.self and `form`/`component`
+ * resolving from the `forms`/`components` props. Class names mirror the
+ * server-side renderer.
+ *
+ * `component` was previously absent, so every placed component instance hit
+ * `default: return null` — a silently blank section on Astro sites while the
+ * dashboard canvas and the Next adapter both rendered it. Resolution mirrors
+ * render-page.ts: the same shared `applyOverrides`, the same depth/cycle guard,
+ * the same fail-soft on a missing definition.
  */
 import type { ContentBlock } from "@bettercms-ai/types";
-import type { DeliveryForm } from "@bettercms-ai/sdk";
+import type { DeliveryComponent, DeliveryForm } from "@bettercms-ai/sdk";
+import { applyOverrides } from "@bettercms-ai/ui/resolve";
 import BcmsImage from "./BcmsImage.astro";
 import BcmsForm from "./BcmsForm.astro";
 
 interface Props {
   blocks: ContentBlock[];
   forms?: DeliveryForm[];
+  /** Definitions for `component` blocks — pass `readComponents()` from @bettercms-ai/next
+   *  or fetch `/delivery/:workspace/components`. Absent ⇒ instances render nothing. */
+  components?: DeliveryComponent[];
   turnstileSiteKey?: string | null;
+  /** Recursion depth for nested components. Internal; do not pass. */
+  depth?: number;
+  /** Component ids already on this branch — cycle guard. Internal; do not pass. */
+  seen?: string[];
   class?: string;
 }
 
-const { blocks = [], forms = [], turnstileSiteKey, class: className } = Astro.props;
+/** Matches render-page.ts and @bettercms-ai/next; a component tree deeper than this is a bug. */
+const MAX_COMPONENT_DEPTH = 10;
+
+const {
+  blocks = [],
+  forms = [],
+  components = [],
+  turnstileSiteKey,
+  depth = 0,
+  seen = [],
+  class: className,
+} = Astro.props;
 const formMap = new Map(forms.map((f) => [f.id, f]));
+const componentMap = new Map(components.map((c) => [c.id, c]));
 
 const clamp = (n: number, min: number, max: number) => Math.min(max, Math.max(min, n));
 const anyProps = (b: ContentBlock) => (b as { props?: Record<string, any> }).props ?? {};
@@ -69,7 +96,14 @@ const anyProps = (b: ContentBlock) => (b as { props?: Record<string, any> }).pro
           >
             {cols.map((col) => (
               <div class="bcms-col">
-                <Astro.self blocks={col} forms={forms} turnstileSiteKey={turnstileSiteKey} />
+                <Astro.self
+                  blocks={col}
+                  forms={forms}
+                  components={components}
+                  turnstileSiteKey={turnstileSiteKey}
+                  depth={depth}
+                  seen={seen}
+                />
               </div>
             ))}
           </div>
@@ -79,6 +113,30 @@ const anyProps = (b: ContentBlock) => (b as { props?: Record<string, any> }).pro
         const form = formMap.get(p.formId);
         return form ? <BcmsForm form={form} turnstileSiteKey={turnstileSiteKey} /> : null;
       }
+      case "component": {
+        const def = componentMap.get(String(p.componentId ?? ""));
+        // Fail soft on a deleted/unknown component, exactly like the server renderer —
+        // a dangling reference must never break the build or the page.
+        if (!def) return null;
+        // A component's blockJson can embed other components, and nothing validates
+        // against a cycle at write time, so the guard has to live at render.
+        if (depth >= MAX_COMPONENT_DEPTH || seen.includes(def.id)) return null;
+        const resolved = applyOverrides<ContentBlock>(
+          def.blockJson,
+          def.props ?? [],
+          (p.overrides as Record<string, unknown>) ?? {},
+        );
+        return (
+          <Astro.self
+            blocks={resolved}
+            forms={forms}
+            components={components}
+            turnstileSiteKey={turnstileSiteKey}
+            depth={depth + 1}
+            seen={[...seen, def.id]}
+          />
+        );
+      }
       default:
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettercms-ai/astro",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "description": "The BetterCMS adapter for Astro — a `bettercms()` integration, a `bettercms:client` virtual module, typed content loaders, draft preview, and native .astro rendering components.",
   "main": "./dist/index.js",
@@ -49,7 +49,8 @@
   "dependencies": {
     "@bettercms-ai/image-url": "^0.1.0",
     "@bettercms-ai/sdk": "^1.5.0",
-    "@bettercms-ai/types": "^1.4.0"
+    "@bettercms-ai/types": "^1.4.0",
+    "@bettercms-ai/ui": "^0.4.0"
   },
   "peerDependencies": {
     "astro": ">=4"