@bettercms-ai/astro 0.14.5 → 0.15.0

package/components/BcmsBlocks.astro

@@ -32,7 +32,7 @@ import type { DeliveryComponent, DeliveryForm } from "@bettercms-ai/sdk";
 import { applyOverrides } from "@bettercms-ai/ui/resolve";
 import { addressFor } from "../dist/bindings.js";
 import { portableTextToHtml } from "@bettercms-ai/richtext/html";
-import { readStructuredContent } from "@bettercms-ai/richtext";
+import { embeddedComponentBlock, readStructuredContent } from "@bettercms-ai/richtext";
 import { headingParts, richtextHeadingLevel } from "@bettercms-ai/richtext/heading";
 import BcmsImage from "./BcmsImage.astro";
 import BcmsForm from "./BcmsForm.astro";
@@ -60,6 +60,11 @@ interface Props {
    *  does not declare gets no address, rather than one that binds to no field.
    *  Internal; do not pass. */
   fieldAddresses?: Map<string, string>;
+  /** Set when `blocks` is a component EMBEDDED in rich text: the address of that rich-text field,
+   *  which names the instance (`<owner>#<_key>`), or null when the field has none — so the
+   *  embed gets no addresses rather than a bare `_key` that resolves to nothing.
+   *  Internal; do not pass. */
+  owner?: string | null;
   class?: string;
 }
 
@@ -76,6 +81,7 @@ const {
   nested = false,
   containerAttrs = {},
   fieldAddresses,
+  owner,
   class: className,
 } = Astro.props;
 /** What `bind`/`bindProps` read. One object, so every call site cannot disagree. */
@@ -125,6 +131,30 @@ function resolveComponent(
   return { id: def.id, blocks: resolved, props: def.props ?? [] };
 }
 
+/** What an embedded component's slot looks like in the rendered html — content cannot spell a comment. */
+const EMBED_SLOT = "<!--bcms-embed-->";
+
+/**
+ * Portable Text → the html around each embedded component, plus those components as ordinary
+ * `component` blocks. An Astro component cannot render to a string inside `portableTextToHtml`,
+ * so the hook leaves a slot and the template mounts each embed there through `<Astro.self>` —
+ * the same `component` case (resolver, cycle guard, identity attributes) a placed instance uses.
+ * `chunks` has one more entry than `embeds`.
+ */
+function richTextParts(structured: NonNullable<ReturnType<typeof readStructuredContent>>, base: string | null) {
+  const embeds: ContentBlock[] = [];
+  const html = portableTextToHtml(structured, {
+    ...(base ? { bindingBase: base } : {}),
+    renderBlock: (v) => {
+      const block = embeddedComponentBlock(v);
+      if (!block) return undefined;
+      embeds.push(block as ContentBlock);
+      return EMBED_SLOT;
+    },
+  });
+  return { chunks: html.split(EMBED_SLOT), embeds };
+}
+
 /**
  * Depth-limited scan for a block type anywhere in the tree, components included, so the
  * slider/tabs runtimes only ship on pages that use them — the same gating render-page.ts
@@ -247,7 +277,17 @@ const pass = { forms, components, turnstileSiteKey, nested: true, fieldAddresses
         const structured = readStructuredContent(p);
         if (structured) {
           const base = addressFor(block.id, "html", bctx);
-          return <div class="bcms-text" {...blockAttrs} set:html={portableTextToHtml(structured, base ? { bindingBase: base } : {})} />;
+          const { chunks, embeds } = richTextParts(structured, base);
+          return (
+            <div class="bcms-text" {...blockAttrs}>
+              {chunks.map((html, i) => (
+                <Fragment>
+                  <Fragment set:html={html} />
+                  {embeds[i] && <Astro.self blocks={[embeds[i]]} depth={depth} seen={seen} {...pass} owner={base} />}
+                </Fragment>
+              ))}
+            </div>
+          );
         }
         return <div class="bcms-text" {...bind(block.id, "html", "richtext", bctx)} {...blockAttrs} set:html={p.html ?? ""} />;
       }
@@ -474,7 +514,7 @@ const pass = { forms, components, turnstileSiteKey, nested: true, fieldAddresses
               "data-bcms-instance": block.id,
             }}
             {...pass}
-            fieldAddresses={componentInstanceAddresses(block.id, resolved.props)}
+            fieldAddresses={owner === null ? new Map() : componentInstanceAddresses(block.id, resolved.props, owner)}
           />
         );
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettercms-ai/astro",
-  "version": "0.14.5",
+  "version": "0.15.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",
@@ -54,11 +54,11 @@
   },
   "dependencies": {
     "@bettercms-ai/image-url": "^0.3.0",
-    "@bettercms-ai/next": "^0.13.4",
-    "@bettercms-ai/richtext": "^0.5.0",
+    "@bettercms-ai/next": "^0.14.0",
+    "@bettercms-ai/richtext": "^0.7.0",
     "@bettercms-ai/sdk": "^1.22.0",
-    "@bettercms-ai/types": "^1.19.0",
-    "@bettercms-ai/ui": "^0.8.2",
+    "@bettercms-ai/types": "^1.20.0",
+    "@bettercms-ai/ui": "^0.9.0",
     "libphonenumber-js": "^1.13.13"
   },
   "peerDependencies": {