Fixed most parse tests

Author: matthewlipski

packages/core/src/blocks/Code/block.ts

@@ -2,6 +2,7 @@ import type { HighlighterGeneric } from "@shikijs/types";
 import { createBlockNoteExtension } from "../../editor/BlockNoteExtension.js";
 import { createBlockConfig, createBlockSpec } from "../../schema/index.js";
 import { lazyShikiPlugin } from "./shiki.js";
+import { DOMParser } from "@tiptap/pm/model";
 
 export type CodeBlockOptions = {
   /**
@@ -71,12 +72,35 @@ export const createCodeBlockSpec = createBlockSpec(
   createCodeBlockConfig,
   (options) => ({
     parse: (e) => {
-      const pre = e.querySelector("pre");
-      if (!pre) {
+      if (e.tagName !== "PRE") {
         return undefined;
       }
 
-      return {};
+      if (
+        e.childElementCount !== 1 ||
+        e.firstElementChild?.tagName !== "CODE"
+      ) {
+        return undefined;
+      }
+
+      const code = e.firstElementChild!;
+      const language =
+        code.getAttribute("data-language") ||
+        code.className
+          .split(" ")
+          .find((name) => name.includes("language-"))
+          ?.replace("language-", "");
+
+      return { language };
+    },
+
+    parseContent: ({ el, schema }) => {
+      const parser = DOMParser.fromSchema(schema);
+      const code = el.firstElementChild!;
+
+      return parser.parse(code, {
+        topNode: schema.nodes["codeBlock"].create(),
+      }).content;
     },
 
     render(block, editor) {

packages/core/src/blocks/ListItem/NumberedListItem/block.ts

@@ -34,8 +34,8 @@ export const createNumberedListItemBlockSpec = createBlockSpec(
       }
 
       if (
-        parent.tagName === "UL" ||
-        (parent.tagName === "DIV" && parent.parentElement?.tagName === "UL")
+        parent.tagName === "OL" ||
+        (parent.tagName === "DIV" && parent.parentElement?.tagName === "OL")
       ) {
         return {};
       }

packages/core/src/blocks/Paragraph/block.ts

@@ -17,12 +17,16 @@ export const createParagraphBlockSpec = createBlockSpec(
   createParagraphBlockConfig,
   {
     parse: (e) => {
-      const paragraph = e.querySelector("p");
-      if (!paragraph) {
+      if (e.tagName !== "P") {
         return undefined;
       }
 
-      return {};
+      // Edge case for things like images directly inside paragraph.
+      if (!e.textContent?.trim()) {
+        return undefined;
+      }
+
+      return undefined;
     },
     render: () => {
       const dom = document.createElement("p");

packages/core/src/blocks/Quote/block.ts

@@ -8,7 +8,10 @@ export const createQuoteBlockConfig = createBlockConfig(
   () =>
     ({
       type: "quote" as const,
-      propSchema: { ...defaultProps },
+      propSchema: {
+        backgroundColor: defaultProps.backgroundColor,
+        textColor: defaultProps.textColor,
+      },
       content: "inline" as const,
     }) as const,
 );
@@ -17,7 +20,7 @@ export const createQuoteBlockSpec = createBlockSpec(
   createQuoteBlockConfig,
   {
     parse(element) {
-      if (element.querySelector("blockquote")) {
+      if (element.tagName === "BLOCKQUOTE") {
         return {};
       }
 

tests/src/unit/core/formatConversion/parse/__snapshots__/html/deepNestedContent.json

@@ -273,25 +273,13 @@
         "text": "All",
         "type": "text",
       },
-    ],
-    "id": "13",
-    "props": {
-      "backgroundColor": "default",
-      "textAlignment": "left",
-      "textColor": "default",
-    },
-    "type": "paragraph",
-  },
-  {
-    "children": [],
-    "content": [
       {
         "styles": {},
         "text": " Outer 4 Div After Outer 3 Div After Outer 2 Div After Outer 1 Div After",
         "type": "text",
       },
     ],
-    "id": "14",
+    "id": "13",
     "props": {
       "backgroundColor": "default",
       "textAlignment": "left",

tests/src/unit/core/formatConversion/parse/__snapshots__/html/googleDocs.json

@@ -612,29 +612,12 @@ Hard Break",
     "content": [
       {
         "styles": {},
-        "text": "Paragraph",
-        "type": "text",
-      },
-    ],
-    "id": "23",
-    "props": {
-      "backgroundColor": "default",
-      "textAlignment": "left",
-      "textColor": "default",
-    },
-    "type": "paragraph",
-  },
-  {
-    "children": [],
-    "content": [
-      {
-        "styles": {},
-        "text": "
+        "text": "Paragraph 
 ",
         "type": "text",
       },
     ],
-    "id": "24",
+    "id": "23",
     "props": {
       "backgroundColor": "default",
       "textAlignment": "left",

tests/src/unit/core/formatConversion/parse/__snapshots__/html/lists.json

@@ -55,7 +55,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Fourth",
+        "text": "Fourth",
         "type": "text",
       },
     ],
@@ -73,7 +73,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Fifth",
+        "text": "Fifth",
         "type": "text",
       },
     ],
@@ -127,7 +127,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Child 3",
+            "text": "Child 3",
             "type": "text",
           },
         ],
@@ -145,7 +145,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Child 4",
+            "text": "Child 4",
             "type": "text",
           },
         ],

tests/src/unit/core/formatConversion/parse/__snapshots__/html/mixedNestedLists.json

@@ -109,7 +109,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Nested Check List Item",
+            "text": "Nested Check List Item",
             "type": "text",
           },
         ],
@@ -127,7 +127,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Nested Check List Item",
+            "text": "Nested Check List Item",
             "type": "text",
           },
         ],
@@ -178,7 +178,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Check List Item",
+        "text": "Check List Item",
         "type": "text",
       },
     ],
@@ -231,7 +231,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Check List Item",
+        "text": "Check List Item",
         "type": "text",
       },
     ],
@@ -249,7 +249,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Nested Check List Item",
+        "text": "Nested Check List Item",
         "type": "text",
       },
     ],

tests/src/unit/core/formatConversion/parse/__snapshots__/html/mixedTextTableCell.json

@@ -14,7 +14,8 @@
               "content": [
                 {
                   "styles": {},
-                  "text": "Table CellTable Cell Table Cell",
+                  "text": "Table Cell
+Table Cell Table Cell",
                   "type": "text",
                 },
               ],

tests/src/unit/core/formatConversion/parse/__snapshots__/html/nestedLists.json

@@ -176,7 +176,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Check List Item",
+        "text": "Check List Item",
         "type": "text",
       },
     ],
@@ -196,7 +196,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Nested Check List Item",
+            "text": "Nested Check List Item",
             "type": "text",
           },
         ],
@@ -214,7 +214,7 @@
         "content": [
           {
             "styles": {},
-            "text": " Nested Check List Item",
+            "text": "Nested Check List Item",
             "type": "text",
           },
         ],
@@ -231,7 +231,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Check List Item",
+        "text": "Check List Item",
         "type": "text",
       },
     ],
@@ -249,7 +249,7 @@
     "content": [
       {
         "styles": {},
-        "text": " Nested Check List Item",
+        "text": "Nested Check List Item",
         "type": "text",
       },
     ],