@supernova-studio/client 0.33.0 → 0.35.0

package/package.json

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

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

@@ -72,7 +72,7 @@ export function pageToProsemirrorDoc(
       blockBuffer.push(b);
     } else if (b.type === "Section") {
       if (blockBuffer.length) {
-        children.push(...blocksToProsemirrorNodes(blockBuffer, definitionsMap));
+        children.push(...internalBlocksToProsemirrorNodes(blockBuffer, definitionsMap));
         blockBuffer = [];
       }
 
@@ -81,7 +81,7 @@ export function pageToProsemirrorDoc(
   });
 
   if (blockBuffer.length) {
-    children.push(...blocksToProsemirrorNodes(blockBuffer, definitionsMap));
+    children.push(...internalBlocksToProsemirrorNodes(blockBuffer, definitionsMap));
   }
 
   return {
@@ -90,6 +90,13 @@ export function pageToProsemirrorDoc(
   };
 }
 
+export function blockToProsemirrorNode(
+  block: PageBlockEditorModel,
+  definition: PageBlockDefinition
+): ProsemirrorNode | null {
+  return internalBlockToProsemirrorNode(block, definition);
+}
+
 //
 // Sections
 //
@@ -126,7 +133,7 @@ function sectionColumnToProsemirrorNode(
   sectionColumn: PageSectionColumnV2,
   definitionsMap: Map<string, PageBlockDefinition>
 ): ProsemirrorNode {
-  const blocks = blocksToProsemirrorNodes(sectionColumn.blocks, definitionsMap);
+  const blocks = internalBlocksToProsemirrorNodes(sectionColumn.blocks, definitionsMap);
 
   if (!blocks.length) {
     blocks.push({
@@ -151,7 +158,7 @@ function sectionColumnToProsemirrorNode(
 // Blocks
 //
 
-function blocksToProsemirrorNodes(
+function internalBlocksToProsemirrorNodes(
   blocks: PageBlockEditorModel[],
   definitionsMap: Map<string, PageBlockDefinition>
 ): ProsemirrorNode[] {
@@ -170,7 +177,7 @@ function blocksToProsemirrorNodes(
 
     if (multiRichTextProp) {
       // This is list
-      const node = listTreeBuilder.add(b, multiRichTextProp);
+      const node = listTreeBuilder.addWithProperty(b, multiRichTextProp);
       if (node) {
         result.push(serializeAsMultiRichTextBlock(node));
       }
@@ -182,7 +189,7 @@ function blocksToProsemirrorNodes(
         result.push(serializeAsMultiRichTextBlock(tree));
       }
 
-      const node = blockToProsemirrorNode(b, definition);
+      const node = internalBlockToProsemirrorNode(b, definition);
       node && result.push(node);
     }
   });
@@ -195,7 +202,10 @@ function blocksToProsemirrorNodes(
   return result;
 }
 
-function blockToProsemirrorNode(block: PageBlockEditorModel, definition: PageBlockDefinition): ProsemirrorNode | null {
+function internalBlockToProsemirrorNode(
+  block: PageBlockEditorModel,
+  definition: PageBlockDefinition
+): ProsemirrorNode | null {
   // Single rich text
   const richTextProperty = BlockDefinitionUtils.firstRichTextProperty(definition);
   if (richTextProperty) {

package/src/yjs/docs-editor/index.ts

@@ -1,6 +1,7 @@
 export * from "./model";
 export * from "./prosemirror";
 export * from "./blocks-to-prosemirror";
+export * from "./list-tree-builder";
 export * from "./mock";
 export * from "./prosemirror-to-blocks";
 export * from "./utils";

package/src/yjs/docs-editor/list-tree-builder.ts

@@ -1,5 +1,6 @@
 import {
   PageBlockDefinition,
+  PageBlockDefinitionMultiRichTextPropertyStyle,
   PageBlockDefinitionMutiRichTextOptions,
   PageBlockDefinitionProperty,
   PageBlockText,
@@ -25,8 +26,20 @@ export type ListItemNode = {
 export class ListTreeBuilder {
   private rootNode: ListNode | undefined;
 
-  add(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): ListNode | undefined {
-    const list = this.createList(block, multiRichTextProperty);
+  addWithProperty(
+    block: PageBlockEditorModel,
+    multiRichTextProperty: PageBlockDefinitionProperty
+  ): ListNode | undefined {
+    const parsedOptions = PageBlockDefinitionMutiRichTextOptions.optional().parse(multiRichTextProperty.options);
+    return this.add(block, multiRichTextProperty.id, parsedOptions?.multiRichTextStyle || "OL");
+  }
+
+  add(
+    block: PageBlockEditorModel,
+    multiRichTextPropertyId: string,
+    multiRichTextPropertyStyle: PageBlockDefinitionMultiRichTextPropertyStyle
+  ) {
+    const list = this.createList(block, multiRichTextPropertyId, multiRichTextPropertyStyle);
 
     // No root
     if (!this.rootNode) {
@@ -91,86 +104,14 @@ export class ListTreeBuilder {
     return currentNode;
   }
 
-  // next(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): ListNode | undefined {
-  //   console.log("Next");
-  //   const list = this.createList(block, multiRichTextProperty);
-
-  //   if (this.currentList) {
-  //     if (this.currentList.listType === list.listType) {
-  //       // Merge items into the current list
-  //       this.currentList.children.push(...list.leadingChildren);
-  //       return undefined;
-  //     } else {
-  //       // Close the current list and start a new one
-  //       if (!this.currentParentList) {
-  //         const flushed = this.flush();
-  //         this.currentList = list;
-  //         return flushed;
-  //       } else {
-  //         this.currentList = list;
-  //         this.currentParentList.children.push(list);
-  //         this.parentMap.set(list, this.currentParentList);
-
-  //         return undefined;
-  //       }
-  //     }
-  //   } else {
-  //     this.currentList = list;
-  //     return undefined;
-  //   }
-  // }
-
-  // stepIn(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): void {
-  //   console.log("Step in");
-  //   if (!this.currentList) {
-  //     throw new Error("Cannot step in without a list");
-  //   }
-
-  //   const list = this.createList(block, multiRichTextProperty);
-
-  //   this.currentParentList = this.currentList;
-  //   this.currentList = list;
-  //   this.currentParentList.children.push(list);
-  //   this.parentMap.set(list, this.currentParentList);
-  // }
-
-  // stepOut(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): ListNode | undefined {
-  //   console.log("Step out");
-
-  //   if (!this.currentList) {
-  //     throw new Error("Cannot step out without a list");
-  //   }
-
-  //   if (!this.currentParentList) {
-  //     throw new Error("Cannot step out without a parent list");
-  //   }
-
-  //   const newCurrentList = this.currentParentList;
-  //   const newParent = this.parentMap.get(newCurrentList);
-
-  //   this.currentList = newCurrentList;
-  //   this.currentParentList = newParent;
-
-  //   return this.next(block, multiRichTextProperty);
-  // }
-
-  // flush(): ListNode | undefined {
-  //   const result = this.currentList;
-
-  //   this.currentList = undefined;
-  //   this.currentParentList = undefined;
-  //   this.parentMap.clear();
-
-  //   return result;
-  // }
-
-  private createList(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): ListNode {
+  private createList(
+    block: PageBlockEditorModel,
+    multiRichTextPropertyId: string,
+    multiRichTextPropertyStyle: PageBlockDefinitionMultiRichTextPropertyStyle
+  ): ListNode {
+    // private createList(block: PageBlockEditorModel, multiRichTextProperty: PageBlockDefinitionProperty): ListNode {
     const blockItem = BlockParsingUtils.singleBlockItem(block);
-    const multiRichTextValue = BlockParsingUtils.multiRichTextPropertyValue(blockItem, multiRichTextProperty.id);
-
-    const parsedOptions = PageBlockDefinitionMutiRichTextOptions.optional().parse(multiRichTextProperty.options);
-
-    const style = parsedOptions?.multiRichTextStyle ?? "Default";
+    const multiRichTextValue = BlockParsingUtils.multiRichTextPropertyValue(blockItem, multiRichTextPropertyId);
 
     const leadingChildren: ListNode["leadingChildren"] = multiRichTextValue.value.map(t => {
       return {
@@ -185,7 +126,7 @@ export class ListTreeBuilder {
 
     return {
       type: "List",
-      listType: style === "OL" ? "Ordered" : "Unordered",
+      listType: multiRichTextPropertyStyle === "OL" ? "Ordered" : "Unordered",
       leadingChildren: leadingChildren,
       block: block,
       children: [],