Add TextDescendant and Simplify types. Simplify NodeProps output.

Author: octet-stream

src/internal/createNodeProps.ts

@@ -11,6 +11,7 @@ import type {TextNode} from "../public/TextNode.js"
 import {NoIdFieldError} from "../public/NoIdFieldError.js"
 
 import type {Descendant} from "./type/Descendant.js"
+import type {Simplify} from "./type/Simplify.js"
 
 /**
  * @api private
@@ -38,16 +39,17 @@ interface ElementWithChildren {
  *
  * @api private
  */
-type LeafNodeBase<T extends TextNode = TextNode> =
+type LeafNodeBase<T extends TextNode = TextNode> = Simplify<
   Replace<RenderLeafProps, LeafWithChildren & {
     leaf: T
     text: T
   }>
+>
 
 /**
  * @api private
  */
-type ElementNodeBase<T extends Node = Node> =
+type ElementNodeBase<T extends Node = Node> = Simplify<
   Replace<
     RenderElementProps,
 
@@ -60,6 +62,7 @@ type ElementNodeBase<T extends Node = Node> =
         attributes: Omit<RenderElementProps["attributes"], "ref">
       }
   >
+>
 
 /**
  * @api private
@@ -74,7 +77,7 @@ type NodeBaseProps<T extends Descendant> = T extends Node
  * @api private
  */
 export type NodeProps<T extends Descendant> = Replace<NodeBaseProps<T>, {
-  attributes: Replace<NodeBaseProps<T>["attributes"], PropsWithKey>
+  attributes: Simplify<Replace<NodeBaseProps<T>["attributes"], PropsWithKey>>
 }>
 
 /**

src/internal/type/InlineDescendant.ts

@@ -1,6 +1,4 @@
-import type {TextNode} from "../../public/TextNode.js"
-
-import type {RichText} from "./RichText.js"
+import type {TextDescendant} from "./TextDescendant.js"
 import type {Link} from "./Link.js"
 
-export type InlineDescendant = TextNode | RichText | Link
+export type InlineDescendant = TextDescendant | Link

src/internal/type/Link.ts

@@ -1,15 +1,14 @@
-import type {TextNode} from "../../public/TextNode.js"
 import type {Replace} from "../../public/Replace.js"
 import type {Node} from "../../public/Node.js"
 
 import {ELEMENT_LINK} from "../constants.js"
 
-import type {RichText} from "./RichText.js"
+import type {TextDescendant} from "./TextDescendant.js"
 
 interface WithUrl {
   url: string
 }
 
 export type Link = Replace<Node<typeof ELEMENT_LINK>, {
-  children: Array<TextNode | RichText>
+  children: TextDescendant[]
 }> & WithUrl

src/internal/type/Simplify.ts

@@ -0,0 +1 @@
+export type Simplify<T> = {[K in keyof T]: T[K]} & {}

src/internal/type/TextDescendant.ts

@@ -0,0 +1,6 @@
+import type {TextNode} from "../../public/TextNode.js"
+
+import type {RichText} from "./RichText.js"
+import type {EmptyText} from "./EmptyText.js"
+
+export type TextDescendant = EmptyText | RichText | TextNode