@supernova-studio/client 0.9.0 → 0.9.2

package/dist/index.js

@@ -4076,8 +4076,9 @@ function pageToProsemirrorDoc(page, definitions) {
 }
 function blockDefinitionForBlock(block, definitions) {
   const definition = definitions.find((d) => d.id === block.data.packageId);
-  if (!definition)
+  if (!definition) {
     throw new Error(`Could not find definition for ${block.id} (${block.data.packageId})`);
+  }
   return definition;
 }
 function blockToProsemirrorNode(block, definition) {
@@ -6961,6 +6962,7 @@ var blocks = [
 
 // src/docs-editor/prosemirror-to-blocks.ts
 
+
 function yDocToPage(yDoc, definitions) {
   return yXmlFragmentToPage(yDoc.getXmlFragment("default"), definitions);
 }
@@ -6972,14 +6974,21 @@ function prosemirrorDocToPage(prosemirrorDoc, definitions) {
   const definitionsById = mapByUnique(definitions, (d) => d.id);
   return {
     blocks: (_nullishCoalesce(prosemirrorDoc.content, () => ( []))).map((prosemirrorNode) => {
-      const definitionId = parseProsemirrorBlockAttribute(prosemirrorNode, "definitionId");
-      if (!definitionId)
-        throw new Error(`Node is missing defintion id`);
-      if (typeof definitionId !== "string")
-        throw new Error(`Definition id is ${typeof definitionId}, has to be string`);
+      const definitionId = getProsemirrorAttribute(prosemirrorNode, "definitionId", _zod.z.string());
+      if (!definitionId) {
+        console.warn(
+          `definitionId on ${prosemirrorNode.type} is required to be interpreted as a block, skipping node`
+        );
+        return null;
+      }
       const definition = definitionsById.get(definitionId);
-      if (!definition)
-        throw new Error(`Definition by id ${definitionId} doesn't exist`);
+      if (!definition) {
+        console.warn(
+          `Block definitionId "${definitionId}" (prosemirror node ${prosemirrorNode.type}) is not among available definitions`
+        );
+        console.warn(prosemirrorNode);
+        return null;
+      }
       return prosemirrorNodeToBlock(prosemirrorNode, definition);
     }).filter(nonNullFilter2)
   };
@@ -7007,12 +7016,11 @@ function prosemirrorNodeToBlock(prosemirrorNode, definition) {
   return parseAsCustomBlock(prosemirrorNode, definition);
 }
 function parseAsRichText(prosemirrorNode, definition, property) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
-  const calloutType = parseCalloutType(parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "type"));
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
+  const calloutType = parseCalloutType(getProsemirrorAttribute(prosemirrorNode, "type", _zod.z.string()));
   return {
     // TODO Artem: indent
     id,
@@ -7051,11 +7059,10 @@ function parseCalloutType(prosemirrorCalloutType) {
   }
 }
 function parseAsMultiRichText(prosemirrorNode, definition, property) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
   return {
     // TODO Artem: indent
     id,
@@ -7111,10 +7118,8 @@ function parseRichTextAttribute(mark) {
     case "code":
       return { type: "Code" };
     case "link":
-      const itemIdRaw = parseProsemirrorBlockAttribute(mark, "itemId");
-      const itemId = typeof itemIdRaw === "string" ? itemIdRaw : void 0;
-      const hrefRaw = parseProsemirrorBlockAttribute(mark, "href");
-      const href = typeof hrefRaw === "string" ? hrefRaw : void 0;
+      const itemId = getProsemirrorAttribute(mark, "itemId", _zod.z.string());
+      const href = getProsemirrorAttribute(mark, "href", _zod.z.string());
       return {
         type: "Link",
         openInNewWindow: _optionalChain([mark, 'access', _15 => _15.attrs, 'optionalAccess', _16 => _16.target]) !== "_self",
@@ -7125,12 +7130,11 @@ function parseRichTextAttribute(mark) {
   return null;
 }
 function parseAsTable(prosemirrorNode, definition, property) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
-  const hasBorder = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "hasBorder") !== false;
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
+  const hasBorder = getProsemirrorAttribute(prosemirrorNode, "hasBorder", _zod.z.boolean()) !== false;
   const tableChild = _optionalChain([prosemirrorNode, 'access', _17 => _17.content, 'optionalAccess', _18 => _18.find, 'call', _19 => _19((c) => c.type === "table")]);
   if (!tableChild) {
     return emptyTable(id, variantId, 0);
@@ -7172,13 +7176,13 @@ function parseAsTable(prosemirrorNode, definition, property) {
   };
 }
 function parseAsTableCell(prosemirrorNode) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const textAlign = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "textAlign");
+  const textAlign = getProsemirrorAttribute(prosemirrorNode, "textAlign", _zod.z.string());
   let columnWidth;
-  const columnWidthArray = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "colwidth");
-  if (Array.isArray(columnWidthArray) && typeof columnWidthArray[0] === "number") {
+  const columnWidthArray = getProsemirrorAttribute(prosemirrorNode, "colwidth", _zod.z.array(_zod.z.number()));
+  if (columnWidthArray) {
     columnWidth = columnWidthArray[0];
   }
   const tableNodes = (_nullishCoalesce(prosemirrorNode.content, () => ( []))).map(parseAsTableNode).filter(nonNullFilter2);
@@ -7211,8 +7215,8 @@ function parseAsTableNode(prosemirrorNode) {
         value: parseRichText(_nullishCoalesce(prosemirrorNode.content, () => ( [])))
       };
     case "image":
-      const url = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "src");
-      if (!url || typeof url !== "string")
+      const url = getProsemirrorAttribute(prosemirrorNode, "src", _zod.z.string());
+      if (!url)
         return null;
       return {
         type: "Image",
@@ -7270,14 +7274,13 @@ function emptyTableCellContent() {
   ];
 }
 function parseAsEmbed(prosemirrorNode, definition, property) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
-  const url = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "url");
-  const caption = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "caption");
-  const height = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "height");
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
+  const url = getProsemirrorAttribute(prosemirrorNode, "url", _zod.z.string());
+  const caption = getProsemirrorAttribute(prosemirrorNode, "caption", _zod.z.string());
+  const height = getProsemirrorAttribute(prosemirrorNode, "height", _zod.z.number());
   return {
     id,
     data: {
@@ -7300,11 +7303,10 @@ function parseAsEmbed(prosemirrorNode, definition, property) {
   };
 }
 function parseAsDivider(prosemirrorNode, definition) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
   return {
     id,
     data: {
@@ -7316,11 +7318,10 @@ function parseAsDivider(prosemirrorNode, definition) {
   };
 }
 function parseAsCustomBlock(prosemirrorNode, definition) {
-  const id = parseProsemirrorBlockAttribute(prosemirrorNode, "id");
-  if (typeof id !== "string")
+  const id = getProsemirrorBlockId(prosemirrorNode);
+  if (!id)
     return null;
-  const variantIdRaw = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "variantId");
-  const variantId = typeof variantIdRaw === "string" ? variantIdRaw : void 0;
+  const variantId = getProsemirrorBlockVariantId(prosemirrorNode);
   const appearance = parseAppearance(prosemirrorNode);
   const parsedItems = parseBlockItems(prosemirrorNode, definition);
   if (!parsedItems)
@@ -7337,8 +7338,8 @@ function parseAsCustomBlock(prosemirrorNode, definition) {
   };
 }
 function parseBlockItems(prosemirrorNode, definition) {
-  const itemsString = parseProsemirrorBlockAttribute(prosemirrorNode, "items");
-  if (typeof itemsString !== "string")
+  const itemsString = getProsemirrorAttribute(prosemirrorNode, "items", _zod.z.string());
+  if (!itemsString)
     return null;
   const itemsJson = JSON.parse(itemsString);
   if (!Array.isArray(itemsJson)) {
@@ -7349,12 +7350,12 @@ function parseBlockItems(prosemirrorNode, definition) {
 }
 function parseAppearance(prosemirrorNode) {
   const appearance = {};
-  const columns = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "columns");
-  if (typeof columns === "number") {
+  const columns = getProsemirrorAttribute(prosemirrorNode, "columns", _zod.z.number());
+  if (columns) {
     appearance.numberOfColumns = columns;
   }
-  const backgroundColor = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, "backgroundColor");
-  if (typeof backgroundColor === "string") {
+  const backgroundColor = getProsemirrorAttribute(prosemirrorNode, "backgroundColor", _zod.z.string());
+  if (backgroundColor) {
     const parsedColor = ColorValue.safeParse(JSON.parse(backgroundColor));
     if (parsedColor.success) {
       appearance.itemBackgroundColor = parsedColor.data;
@@ -7441,15 +7442,29 @@ function valueSchemaForPropertyType(type) {
       return PageBlockItemColorValue;
   }
 }
-function parseProsemirrorBlockAttribute(prosemirrorNode, attributeName) {
-  const attributeValue = parseProsemirrorOptionalBlockAttribute(prosemirrorNode, attributeName);
-  if (!attributeValue) {
-    throw new Error(`Attribute ${attributeName} was not defined on node ${prosemirrorNode.type}`);
-  }
-  return attributeValue;
+function getProsemirrorBlockId(prosemirrorNode) {
+  const id = getProsemirrorAttribute(prosemirrorNode, "id", _zod.z.string());
+  if (!id)
+    console.warn(`Prosemirror attribute "id" on ${prosemirrorNode.type} is required`);
+  return id;
 }
-function parseProsemirrorOptionalBlockAttribute(prosemirrorNode, attributeName) {
-  return _nullishCoalesce(_optionalChain([prosemirrorNode, 'access', _36 => _36.attrs, 'optionalAccess', _37 => _37[attributeName]]), () => ( void 0));
+function getProsemirrorBlockVariantId(prosemirrorNode) {
+  return getProsemirrorAttribute(prosemirrorNode, "variantId", _zod.z.string());
+}
+function getProsemirrorAttribute(prosemirrorNode, attributeName, validationSchema) {
+  const attr = _nullishCoalesce(_optionalChain([prosemirrorNode, 'access', _36 => _36.attrs, 'optionalAccess', _37 => _37[attributeName]]), () => ( void 0));
+  if (!attr) {
+    console.warn(`Prosemirror attribute ${attributeName} on ${prosemirrorNode.type} was not defined`);
+    return void 0;
+  }
+  const parsedAttr = validationSchema.safeParse(attr);
+  if (parsedAttr.success) {
+    return parsedAttr.data;
+  } else {
+    console.warn(`Prosemirror attribute ${attributeName} on ${prosemirrorNode.type} is not valid and will be ignored`);
+    console.warn(parsedAttr.error.flatten());
+    return void 0;
+  }
 }
 function nonNullFilter2(item) {
   return item !== null;