@datocms/astro 0.3.1 → 0.3.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.3.1",
+  "version": "0.3.3",
   "sideEffects": false,
   "repository": {
     "type": "git",

package/src/StructuredText/Node.astro

@@ -10,6 +10,7 @@ import {
   isInlineItem,
   isItemLink,
   RenderError,
+  type NodeType,
 } from 'datocms-structured-text-utils';
 
 import Blockquote from './nodes/Blockquote.astro';
@@ -26,7 +27,13 @@ import BlockComponent from './nodes/Block.astro';
 import InlineItemComponent from './nodes/InlineItem.astro';
 import ItemLinkComponent from './nodes/ItemLink.astro';
 
-import type { BlockComponents, InlineItemComponents, ItemLinkComponents, Overrides } from './types';
+import type {
+  BlockComponents,
+  InlineItemComponents,
+  ItemLinkComponents,
+  Overrides,
+  AstroComponent,
+} from './types';
 
 interface Props {
   node: DastNode;
@@ -71,7 +78,7 @@ function findRecordInLinks(node: ItemLink | InlineItem) {
   return record;
 }
 
-const defaultComponents: Overrides = {
+const defaultComponents: Record<NodeType, AstroComponent> = {
   paragraph: Paragraph,
   root: Root,
   span: Span,
@@ -87,7 +94,11 @@ const defaultComponents: Overrides = {
   block: BlockComponent,
 };
 
-const otherNodeComponents: Overrides = { ...defaultComponents, ...overrides };
+const otherNodeComponents: Record<NodeType, AstroComponent> = {
+  ...defaultComponents,
+  ...overrides,
+};
+
 const Component = otherNodeComponents[node.type];
 ---
 

package/src/StructuredText/StructuredText.astro

@@ -12,13 +12,18 @@ import {
 import Node from './Node.astro';
 import type { BlockComponents, InlineItemComponents, ItemLinkComponents, Overrides } from './types';
 
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-interface Props<R1 extends DatocmsRecord = any, R2 extends DatocmsRecord = any> {
-  data: StructuredText<R1, R2> | Document | DastNode | null | undefined;
-
-  blockComponents?: BlockComponents<R1, R2>;
-  itemLinkComponents?: ItemLinkComponents<R1, R2>;
-  inlineItemComponents?: InlineItemComponents<R1, R2>;
+// It would be better to type this as:
+//
+// interface Props<R1 extends DatocmsRecord = any, R2 extends DatocmsRecord = any>
+//
+// but it's currently not possible: https://github.com/withastro/roadmap/discussions/601#discussioncomment-10333959
+
+interface Props {
+  data: StructuredText<DatocmsRecord, DatocmsRecord> | Document | DastNode | null | undefined;
+
+  blockComponents?: BlockComponents<DatocmsRecord, DatocmsRecord>;
+  itemLinkComponents?: ItemLinkComponents<DatocmsRecord, DatocmsRecord>;
+  inlineItemComponents?: InlineItemComponents<DatocmsRecord, DatocmsRecord>;
   overrides?: Overrides;
 }
 

package/src/StructuredText/types.ts

@@ -1,7 +1,7 @@
 import type { Record as DatocmsRecord, NodeType } from 'datocms-structured-text-utils';
 
 // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-type AstroComponent = (props: any) => any;
+export type AstroComponent = (props: any) => any;
 
 export type BlockComponents<R1 extends DatocmsRecord, R2 extends DatocmsRecord> = Record<
   R1['__typename'],
@@ -18,4 +18,4 @@ export type InlineItemComponents<R1 extends DatocmsRecord, R2 extends DatocmsRec
   AstroComponent
 >;
 
-export type Overrides = Record<NodeType, AstroComponent>;
+export type Overrides = Partial<Record<NodeType, AstroComponent>>;