@supernova-studio/client 0.9.2 → 0.9.3

package/package.json

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

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

@@ -39,12 +39,13 @@ import {
   PageBlockTableCellAlignment,
   PageBlockAppearanceV2,
   ColorValue,
+  nullishToOptional,
 } from "@supernova-studio/model";
 import { PageBlockEditorModel } from "./model/block";
 import { DocumentationPageEditorModel } from "./model/page";
 import { BlockDefinitionUtils } from "./utils";
 import { yXmlFragmentToProsemirrorJSON } from "y-prosemirror";
-import { ZodSchema, z } from "zod";
+import { ZodAnyDef, ZodSchema, ZodTypeDef, z } from "zod";
 
 export function yDocToPage(yDoc: Y.Doc, definitions: PageBlockDefinition[]): DocumentationPageEditorModel {
   return yXmlFragmentToPage(yDoc.getXmlFragment("default"), definitions);
@@ -135,7 +136,7 @@ function parseAsRichText(
   if (!id) return null;
 
   const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
-  const calloutType = parseCalloutType(getProsemirrorAttribute(prosemirrorNode, "type", z.string()));
+  const calloutType = parseCalloutType(getProsemirrorAttribute(prosemirrorNode, "type", z.string().optional()));
 
   return {
     // TODO Artem: indent
@@ -259,8 +260,8 @@ function parseRichTextAttribute(mark: ProsemirrorMark): PageBlockTextSpanAttribu
     case "code":
       return { type: "Code" };
     case "link":
-      const itemId = getProsemirrorAttribute(mark, "itemId", z.string());
-      const href = getProsemirrorAttribute(mark, "href", z.string());
+      const itemId = getProsemirrorAttribute(mark, "itemId", z.string().optional());
+      const href = getProsemirrorAttribute(mark, "href", z.string().optional());
 
       return {
         type: "Link",
@@ -286,7 +287,7 @@ function parseAsTable(
   if (!id) return null;
 
   const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
-  const hasBorder = getProsemirrorAttribute(prosemirrorNode, "hasBorder", z.boolean()) !== false;
+  const hasBorder = getProsemirrorAttribute(prosemirrorNode, "hasBorder", z.boolean().optional()) !== false;
 
   const tableChild = prosemirrorNode.content?.find(c => c.type === "table");
   if (!tableChild) {
@@ -342,10 +343,10 @@ function parseAsTableCell(prosemirrorNode: ProsemirrorNode): PageBlockItemTableC
   const id = getProsemirrorBlockId(prosemirrorNode);
   if (!id) return null;
 
-  const textAlign = getProsemirrorAttribute(prosemirrorNode, "textAlign", z.string());
+  const textAlign = getProsemirrorAttribute(prosemirrorNode, "textAlign", z.string().optional());
 
   let columnWidth: number | undefined;
-  const columnWidthArray = getProsemirrorAttribute(prosemirrorNode, "colwidth", z.array(z.number()));
+  const columnWidthArray = getProsemirrorAttribute(prosemirrorNode, "colwidth", z.array(z.number()).optional());
   if (columnWidthArray) {
     columnWidth = columnWidthArray[0];
   }
@@ -385,7 +386,7 @@ function parseAsTableNode(prosemirrorNode: ProsemirrorNode): PageBlockItemTableN
       };
 
     case "image":
-      const url = getProsemirrorAttribute(prosemirrorNode, "src", z.string());
+      const url = getProsemirrorAttribute(prosemirrorNode, "src", z.string().optional());
       if (!url) return null;
 
       return {
@@ -464,9 +465,9 @@ function parseAsEmbed(
 
   const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
 
-  const url = getProsemirrorAttribute(prosemirrorNode, "url", z.string());
-  const caption = getProsemirrorAttribute(prosemirrorNode, "caption", z.string());
-  const height = getProsemirrorAttribute(prosemirrorNode, "height", z.number());
+  const url = getProsemirrorAttribute(prosemirrorNode, "url", z.string().optional());
+  const caption = getProsemirrorAttribute(prosemirrorNode, "caption", z.string().optional());
+  const height = getProsemirrorAttribute(prosemirrorNode, "height", z.number().optional());
 
   return {
     id: id,
@@ -483,7 +484,7 @@ function parseAsEmbed(
             [property.id]: {
               value: url,
               caption: caption,
-              height: height,
+              height: height ?? 200,
             } as PageBlockItemEmbedValue,
           },
         },
@@ -565,12 +566,12 @@ function parseBlockItems(prosemirrorNode: ProsemirrorNode, definition: PageBlock
 function parseAppearance(prosemirrorNode: ProsemirrorNode): PageBlockAppearanceV2 | undefined {
   const appearance: PageBlockAppearanceV2 = {};
 
-  const columns = getProsemirrorAttribute(prosemirrorNode, "columns", z.number());
+  const columns = getProsemirrorAttribute(prosemirrorNode, "columns", z.number().optional());
   if (columns) {
     appearance.numberOfColumns = columns;
   }
 
-  const backgroundColor = getProsemirrorAttribute(prosemirrorNode, "backgroundColor", z.string());
+  const backgroundColor = getProsemirrorAttribute(prosemirrorNode, "backgroundColor", z.string().optional());
   if (backgroundColor) {
     const parsedColor = ColorValue.safeParse(JSON.parse(backgroundColor));
     if (parsedColor.success) {
@@ -678,25 +679,19 @@ function getProsemirrorBlockId(prosemirrorNode: ProsemirrorNode): string | undef
 }
 
 function getProsemirrorBlockVariantId(prosemirrorNode: ProsemirrorNode): string | undefined {
-  return getProsemirrorAttribute(prosemirrorNode, "variantId", z.string());
+  return getProsemirrorAttribute(prosemirrorNode, "variantId", nullishToOptional(z.string()));
 }
 
-function getProsemirrorAttribute<O>(
+function getProsemirrorAttribute<I, O>(
   prosemirrorNode: ProsemirrorNode,
   attributeName: string,
-  validationSchema: ZodSchema<O>
+  validationSchema: ZodSchema<O, ZodTypeDef, I>
 ): O | undefined {
-  const attr: unknown = prosemirrorNode.attrs?.[attributeName] ?? undefined;
-  if (!attr) {
-    console.warn(`Prosemirror attribute ${attributeName} on ${prosemirrorNode.type} was not defined`);
-    return undefined;
-  }
-
-  const parsedAttr = validationSchema.safeParse(attr);
+  const parsedAttr = validationSchema.safeParse(prosemirrorNode.attrs?.[attributeName]);
   if (parsedAttr.success) {
     return parsedAttr.data;
   } else {
-    console.warn(`Prosemirror attribute ${attributeName} on ${prosemirrorNode.type} is not valid and will be ignored`);
+    console.warn(`Prosemirror attribute ${attributeName} on ${prosemirrorNode.type} is invalid`);
     console.warn(parsedAttr.error.flatten());
     return undefined;
   }