@datocms/astro 0.6.1 → 0.6.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@datocms/astro",
   "description": "A set of components and utilities to work faster with DatoCMS in Astro projects.",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "sideEffects": false,
   "repository": {
     "type": "git",

package/src/StructuredText/Node.astro

@@ -45,6 +45,7 @@ interface Props {
   node: DastNode;
 
   blocks?: DatocmsRecord[];
+  inlineBlocks?: DatocmsRecord[];
   links?: DatocmsRecord[];
 
   blockComponents?: BlockComponents<DatocmsRecord, DatocmsRecord>;
@@ -60,6 +61,7 @@ const { node, ...rest } = Astro.props;
 
 const {
   blocks,
+  inlineBlocks,
   links,
   blockComponents,
   inlineBlockComponents,
@@ -69,7 +71,7 @@ const {
   markOverrides,
 } = rest;
 
-function findRecordInBlocks(node: Block | InlineBlock) {
+function findRecordInBlocks(node: Block) {
   const record = (blocks || []).find(({ id }) => id === node.item);
 
   if (!record) {
@@ -82,6 +84,19 @@ function findRecordInBlocks(node: Block | InlineBlock) {
   return record;
 }
 
+function findRecordInInlineBlocks(node: InlineBlock) {
+  const record = (inlineBlocks || []).find(({ id }) => id === node.item);
+
+  if (!record) {
+    throw new RenderError(
+      `The Structured Text document contains a '${node.type}' node, but cannot find a record with ID ${node.item} inside data.inlineBlocks!`,
+      node,
+    );
+  }
+
+  return record;
+}
+
 function findRecordInLinks(node: ItemLink | InlineItem) {
   const record = (links || []).find(({ id }) => id === node.item);
 
@@ -125,7 +140,7 @@ const Component = otherNodeComponents[node.type] as AstroComponent;
     isBlock(node) ? (
       <Component {node} block={findRecordInBlocks(node)} {blockComponents} />
     ) : isInlineBlock(node) ? (
-      <Component {node} block={findRecordInBlocks(node)} {inlineBlockComponents} />
+      <Component {node} block={findRecordInInlineBlocks(node)} {inlineBlockComponents} />
     ) : isInlineItem(node) ? (
       <Component {node} record={findRecordInLinks(node)} {inlineRecordComponents} />
     ) : isItemLink(node) ? (

package/src/StructuredText/StructuredText.astro

@@ -52,8 +52,8 @@ const node = !data
         : undefined;
 
 const blocks = isStructuredText(data) ? data?.blocks : undefined;
-
+const inlineBlocks = isStructuredText(data) ? data?.inlineBlocks : undefined;
 const links = isStructuredText(data) ? data?.links : undefined;
 ---
 
-{node && <Node {node} {blocks} {links} {...rest} />}
+{node && <Node {node} {blocks} {inlineBlocks} {links} {...rest} />}

package/src/StructuredText/ensureValidStructuredTextProps.ts

@@ -14,7 +14,16 @@ import type {
 type Props<B extends DatocmsRecord, L extends DatocmsRecord, I extends DatocmsRecord> =
   | {
       /** The actual [field value](https://www.datocms.com/docs/structured-text/dast) you get from a DatoCMS Structured Text field */
-      data: Document | DastNode | null | undefined;
+      data:
+        | (Omit<StructuredText<B, L, I>, 'blocks' | 'links' | 'inlineBlocks'> & {
+            blocks?: never;
+            links?: never;
+            inlineBlocks?: never;
+          })
+        | Document
+        | DastNode
+        | null
+        | undefined;
       blockComponents?: never;
       inlineBlockComponents?: never;
       linkToRecordComponents?: never;