merge and build

Author: YousefED

packages/core/src/api/blockManipulation/commands/insertBlocks/insertBlocks.ts

@@ -29,7 +29,7 @@ export function insertBlocks<
   const pmSchema = getPmSchema(tr);
   const nodesToInsert = blocksToInsert.map((block) =>
     blockToNode(
-      partialBlockToBlock(getBlockNoteSchema(pmSchema), block),
+      partialBlockToBlock<BSchema, I, S>(getBlockNoteSchema(pmSchema), block),
       pmSchema,
     ),
   );

packages/core/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts

@@ -30,7 +30,7 @@ export function removeAndInsertBlocks<
   // document.
   const nodesToInsert: Node[] = blocksToInsert.map((block) =>
     blockToNode(
-      partialBlockToBlock(getBlockNoteSchema(pmSchema), block),
+      partialBlockToBlock<BSchema, I, S>(getBlockNoteSchema(pmSchema), block),
       pmSchema,
     ),
   );

packages/core/src/api/nodeConversions/blockToNode.ts

@@ -1,6 +1,7 @@
 import { Attrs, Fragment, Mark, Node, Schema } from "@tiptap/pm/model";
 
 import type {
+  BlockSchema,
   CustomInlineContentFromConfig,
   InlineContent,
   InlineContentSchema,
@@ -320,10 +321,14 @@ function blockOrInlineContentToContentNode(
 /**
  * Converts a BlockNote block to a Prosemirror node.
  */
-export function blockToNode(
-  block: Block<any, any, any>,
+export function blockToNode<
+  BSchema extends BlockSchema,
+  I extends InlineContentSchema,
+  S extends StyleSchema,
+>(
+  block: Block<BSchema, I, S>,
   schema: Schema,
-  styleSchema: StyleSchema = getStyleSchema(schema),
+  styleSchema: S = getStyleSchema(schema),
 ) {
   const children: Node[] = [];
 

packages/core/src/api/pmUtil.ts

@@ -1,8 +1,8 @@
 import type { Node, Schema } from "prosemirror-model";
 import { Transform } from "prosemirror-transform";
 import type { BlockNoteEditor } from "../editor/BlockNoteEditor.js";
-import { CustomBlockNoteSchema } from "../schema/schema.js";
 import type { BlockSchema } from "../schema/blocks/types.js";
+import { CustomBlockNoteSchema } from "../schema/CustomBlockNoteSchema.js";
 import type { InlineContentSchema } from "../schema/inlineContent/types.js";
 import type { StyleSchema } from "../schema/styles/types.js";
 

packages/core/src/schema/partialBlockToBlock.ts

@@ -31,16 +31,18 @@ function partialPropsToProps(
 ): Props<PropSchema> {
   const props: Props<PropSchema> = partialProps || {};
 
-  Object.entries(propSchema._zod.def.shape).forEach(([propKey, propValue]) => {
-    if (props[propKey] === undefined) {
-      if (propValue instanceof z.$ZodDefault) {
-        props[propKey] = propValue._zod.def.defaultValue;
+  Object.entries(propSchema._zodSource._zod.def.shape).forEach(
+    ([propKey, propValue]) => {
+      if (props[propKey] === undefined) {
+        if (propValue instanceof z.$ZodDefault) {
+          props[propKey] = propValue._zod.def.defaultValue;
+        }
+        if (propValue instanceof z.$ZodOptional) {
+          props[propKey] = undefined;
+        }
       }
-      if (propValue instanceof z.$ZodOptional) {
-        props[propKey] = undefined;
-      }
-    }
-  });
+    },
+  );
   return props;
 }
 
@@ -64,7 +66,9 @@ function partialLinkToLink(partialLink: PartialLink<StyleSchema>): Link<any> {
 }
 
 export function partialInlineContentToInlineContent(
-  partialInlineContent: PartialInlineContent<any, any> | undefined,
+  partialInlineContent:
+    | PartialInlineContent<InlineContentSchema, StyleSchema>
+    | undefined,
   inlineContentSchema: InlineContentSchema,
 ): InlineContent<any, any>[] {
   if (partialInlineContent === undefined) {