@supernova-studio/client 0.38.0 → 0.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supernova-studio/client",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "description": "Supernova Data Models",
   "source": "src/index.ts",
   "main": "dist/index.js",

package/src/yjs/docs-editor/blocks-to-prosemirror.ts

@@ -1,31 +1,31 @@
-import * as Y from "yjs";
 import {
+  PageBlockCalloutType,
   PageBlockDefinition,
   PageBlockDefinitionProperty,
-  PageBlockText,
-  PageBlockTextSpan,
-  PageBlockTextSpanAttribute,
+  PageBlockDefinitionRichTextOptions,
+  PageBlockItemImageValue,
   PageBlockItemRichTextValue,
-  PageBlockCalloutType,
-  PageBlockTableCellAlignment,
-  PageBlockItemTableNode,
   PageBlockItemTableCell,
-  PageBlockItemTableValue,
+  PageBlockItemTableNode,
   PageBlockItemTableRow,
-  PageBlockDefinitionRichTextOptions,
-  PageBlockItemImageValue,
-  SupernovaException,
-  PageSectionItemV2,
+  PageBlockItemTableValue,
+  PageBlockTableCellAlignment,
+  PageBlockText,
+  PageBlockTextSpan,
+  PageBlockTextSpanAttribute,
   PageSectionColumnV2,
+  PageSectionItemV2,
+  SupernovaException,
   mapByUnique,
 } from "@supernova-studio/model";
-import { PageBlockEditorModel, PageSectionEditorModel } from "./model/block";
-import { ProsemirrorNode, ProsemirrorMark } from "./prosemirror/types";
-import { BlockDefinitionUtils, BlockParsingUtils } from "./utils";
-import { DocumentationPageEditorModel } from "./model";
 import { prosemirrorJSONToYXmlFragment } from "y-prosemirror";
-import { pmSchema } from "./prosemirror";
+import * as Y from "yjs";
 import { ListNode, ListTreeBuilder } from "./list-tree-builder";
+import { DocumentationPageEditorModel } from "./model";
+import { PageBlockEditorModel, PageSectionEditorModel } from "./model/block";
+import { pmSchema } from "./prosemirror";
+import { ProsemirrorMark, ProsemirrorNode } from "./prosemirror/types";
+import { BlockDefinitionUtils, BlockParsingUtils } from "./utils";
 
 //
 // Types
@@ -94,7 +94,9 @@ export function blockToProsemirrorNode(
   block: PageBlockEditorModel,
   definition: PageBlockDefinition
 ): ProsemirrorNode | null {
-  return internalBlockToProsemirrorNode(block, definition);
+  const definitionsMap = new Map<string, PageBlockDefinition>([[definition.id, definition]]);
+  const nodes = internalBlocksToProsemirrorNodes([block], definitionsMap);
+  return nodes[0] ?? null;
 }
 
 //

package/src/yjs/docs-editor/prosemirror-to-blocks.ts

@@ -73,8 +73,14 @@ export function prosemirrorDocToPage(
   };
 }
 
-export function shallowProsemirrorNodeToBlock(prosemirrorNode: ProsemirrorNode, definition: PageBlockDefinition) {
-  return prosemirrorNodeAndDefinitionToBlock(prosemirrorNode, definition, new Map([[definition.id, definition]]), 0);
+export function shallowProsemirrorNodeToBlock(
+  prosemirrorNode: ProsemirrorNode,
+  definition: PageBlockDefinition
+): PageBlockEditorModel | null {
+  return (
+    prosemirrorNodeAndDefinitionToBlock(prosemirrorNode, definition, new Map([[definition.id, definition]]), 0)[0] ??
+    null
+  );
 }
 
 //