@portabletext/block-tools 3.3.3 → 3.4.0

package/lib/index.js

@@ -1,20 +1,9 @@
 import { sanitySchemaToPortableTextSchema } from "@portabletext/sanity-bridge";
+import { isTextBlock, isSpan } from "@portabletext/schema";
 import flatten from "lodash/flatten.js";
 import getRandomValues from "get-random-values-esm";
 import isEqual from "lodash/isEqual.js";
 import uniq from "lodash/uniq.js";
-function isArbitraryTypedObject(object) {
-  return isRecord(object) && typeof object._type == "string";
-}
-function isRecord(value) {
-  return !!value && (typeof value == "object" || typeof value == "function");
-}
-function isTextBlock(schema, block) {
-  return !(!isArbitraryTypedObject(block) || block._type !== schema.block.name || !Array.isArray(block.children));
-}
-function isSpan(schema, child) {
-  return !(!isArbitraryTypedObject(child) || child._type !== schema.span.name || typeof child.text != "string");
-}
 function keyGenerator() {
   return randomKey(12);
 }
@@ -46,6 +35,81 @@ function resolveJsType(val) {
   }
   return val === null ? "null" : val === void 0 ? "undefined" : val && typeof val == "object" && "nodeType" in val && val.nodeType === 1 ? "element" : val === Object(val) ? "object" : typeof val;
 }
+function isArbitraryTypedObject(object) {
+  return isRecord(object) && typeof object._type == "string";
+}
+function isRecord(value) {
+  return !!value && (typeof value == "object" || typeof value == "function");
+}
+function flattenNestedBlocks(context, blocks2) {
+  return blocks2.flatMap((block) => {
+    if (isBlockContainer(block))
+      return flattenNestedBlocks(context, [block.block]);
+    if (isTextBlock(context, block)) {
+      const hasBlockObjects = block.children.some((child) => context.schema.blockObjects.some(
+        (blockObject) => blockObject.name === child._type
+      )), hasBlocks = block.children.some(
+        (child) => child._type === "__block" || child._type === "block"
+      );
+      if (hasBlockObjects || hasBlocks) {
+        const splitChildren = getSplitChildren(context, block);
+        return splitChildren.length === 1 && splitChildren[0].type === "children" && isEqual(splitChildren[0].children, block.children) ? [block] : splitChildren.flatMap((slice) => slice.type === "block object" ? [slice.block] : slice.type === "block" ? flattenNestedBlocks(context, [
+          slice.block
+        ]) : slice.children.length > 0 ? slice.children.every(
+          (child) => isSpan(context, child) && child.text.trim() === ""
+        ) ? [] : flattenNestedBlocks(context, [
+          {
+            ...block,
+            children: slice.children
+          }
+        ]) : []);
+      }
+      return [block];
+    }
+    return [block];
+  });
+}
+function isBlockContainer(block) {
+  return block._type === "__block" && isArbitraryTypedObject(block.block);
+}
+function getSplitChildren(context, block) {
+  return block.children.reduce(
+    (slices, child) => {
+      const knownInlineObject = context.schema.inlineObjects.some(
+        (inlineObject) => inlineObject.name === child._type
+      ), knownBlockObject = context.schema.blockObjects.some(
+        (blockObject) => blockObject.name === child._type
+      ), lastSlice = slices.pop();
+      return !isSpan(context, child) && !knownInlineObject && knownBlockObject ? [
+        ...slices,
+        ...lastSlice ? [lastSlice] : [],
+        { type: "block object", block: child }
+      ] : child._type === "__block" ? [
+        ...slices,
+        ...lastSlice ? [lastSlice] : [],
+        {
+          type: "block object",
+          block: child.block
+        }
+      ] : child._type === "block" ? [
+        ...slices,
+        ...lastSlice ? [lastSlice] : [],
+        { type: "block", block: child }
+      ] : lastSlice && lastSlice.type === "children" ? [
+        ...slices,
+        {
+          type: "children",
+          children: [...lastSlice.children, child]
+        }
+      ] : [
+        ...slices,
+        ...lastSlice ? [lastSlice] : [],
+        { type: "children", children: [child] }
+      ];
+    },
+    []
+  );
+}
 var s = { 0: 8203, 1: 8204, 2: 8205, 3: 8290, 4: 8291, 5: 8288, 6: 65279, 7: 8289, 8: 119155, 9: 119156, a: 119157, b: 119158, c: 119159, d: 119160, e: 119161, f: 119162 }, c = { 0: 8203, 1: 8204, 2: 8205, 3: 65279 };
 new Array(4).fill(String.fromCodePoint(c[0])).join("");
 Object.fromEntries(Object.entries(c).map((t) => t.reverse()));
@@ -309,73 +373,6 @@ function defaultParseHtml() {
     );
   return (html) => new DOMParser().parseFromString(html, "text/html");
 }
-function flattenNestedBlocks(context, blocks2) {
-  let depth = 0;
-  const flattened = [], traverse = (nodes) => {
-    const toRemove = [];
-    nodes.forEach((node) => {
-      if (depth === 0)
-        if (context.schema.blockObjects.length > 0 && isTextBlock(context.schema, node)) {
-          const hasBlockObjects = node.children.some((child) => context.schema.blockObjects.some(
-            (blockObject) => blockObject.name === child._type
-          )), hasBlocks = node.children.some(
-            (child) => child._type === "__block"
-          );
-          if (hasBlockObjects || hasBlocks) {
-            node.children.reduce(
-              (slices, child) => {
-                const knownInlineObject = context.schema.inlineObjects.some(
-                  (inlineObject) => inlineObject.name === child._type
-                ), knownBlockObject = context.schema.blockObjects.some(
-                  (blockObject) => blockObject.name === child._type
-                ), lastSlice = slices.pop();
-                return !isSpan(context.schema, child) && !knownInlineObject && knownBlockObject ? [
-                  ...slices,
-                  ...lastSlice ? [lastSlice] : [],
-                  { type: "block object", block: child }
-                ] : child._type === "__block" ? [
-                  ...slices,
-                  ...lastSlice ? [lastSlice] : [],
-                  {
-                    type: "block object",
-                    block: child.block
-                  }
-                ] : lastSlice && lastSlice.type === "children" ? [
-                  ...slices,
-                  {
-                    type: "children",
-                    children: [...lastSlice.children, child]
-                  }
-                ] : [
-                  ...slices,
-                  ...lastSlice ? [lastSlice] : [],
-                  { type: "children", children: [child] }
-                ];
-              },
-              []
-            ).forEach((slice) => {
-              if (slice.type === "block object")
-                flattened.push(slice.block);
-              else if (slice.children.length > 0) {
-                const newBlock = {
-                  ...node,
-                  children: slice.children
-                };
-                flattened.push(newBlock);
-              }
-            });
-            return;
-          } else
-            flattened.push(node);
-        } else
-          flattened.push(node);
-      isTextBlock(context.schema, node) && (depth > 0 && (toRemove.push(node), flattened.push(node)), depth++, traverse(node.children)), node._type === "__block" && (toRemove.push(node), flattened.push(node.block));
-    }), toRemove.forEach((node) => {
-      nodes.splice(nodes.indexOf(node), 1);
-    }), depth--;
-  };
-  return traverse(blocks2), flattened;
-}
 function nextSpan(block, index) {
   const next = block.children[index + 1];
   return next && next._type === "span" ? next : null;
@@ -389,7 +386,7 @@ function isWhiteSpaceChar(text) {
 }
 function trimWhitespace(schema, blocks2) {
   return blocks2.forEach((block) => {
-    isTextBlock(schema, block) && block.children.forEach((child, index) => {
+    isTextBlock({ schema }, block) && block.children.forEach((child, index) => {
       if (!isMinimalSpan(child))
         return;
       const nextChild = nextSpan(block, index), prevChild = prevSpan(block, index);
@@ -397,20 +394,20 @@ function trimWhitespace(schema, blocks2) {
     });
   }), blocks2;
 }
-function ensureRootIsBlocks(schema, blocks2) {
-  return blocks2.reduce((memo, node, i, original) => {
+function ensureRootIsBlocks(schema, objects) {
+  return objects.reduce((blocks2, node, i, original) => {
     if (node._type === "block")
-      return memo.push(node), memo;
+      return blocks2.push(node), blocks2;
     if (node._type === "__block")
-      return memo.push(node.block), memo;
-    const lastBlock = memo[memo.length - 1];
-    if (i > 0 && !isTextBlock(schema, original[i - 1]) && isTextBlock(schema, lastBlock))
-      return lastBlock.children.push(node), memo;
+      return blocks2.push(node.block), blocks2;
+    const lastBlock = blocks2[blocks2.length - 1];
+    if (i > 0 && !isTextBlock({ schema }, original[i - 1]) && isTextBlock({ schema }, lastBlock))
+      return lastBlock.children.push(node), blocks2;
     const block = {
       ...DEFAULT_BLOCK,
       children: [node]
     };
-    return memo.push(block), memo;
+    return blocks2.push(block), blocks2;
   }, []);
 }
 function isNodeList(node) {
@@ -442,7 +439,9 @@ function normalizeWhitespace(rootNode) {
     const elm = child;
     isWhitespaceBlock(elm) ? (lastParent && elm.parentElement === lastParent ? (emptyBlockCount++, emptyBlockCount > 1 && nodesToRemove.push(elm)) : emptyBlockCount = 1, lastParent = elm.parentElement) : (normalizeWhitespace(child), emptyBlockCount = 0);
   }
-  nodesToRemove.forEach((node) => node.parentElement?.removeChild(node));
+  nodesToRemove.forEach((node) => {
+    node.parentElement?.removeChild(node);
+  });
 }
 function removeAllWhitespace(rootNode) {
   const nodesToRemove = [];
@@ -461,7 +460,9 @@ function removeAllWhitespace(rootNode) {
         collectNodesToRemove(child);
     }
   }
-  collectNodesToRemove(rootNode), nodesToRemove.forEach((node) => node.parentElement?.removeChild(node));
+  collectNodesToRemove(rootNode), nodesToRemove.forEach((node) => {
+    node.parentElement?.removeChild(node);
+  });
 }
 function isWhitespaceBlock(elm) {
   return ["p", "br"].includes(tagName(elm) || "") && !elm.textContent?.trim();
@@ -738,6 +739,15 @@ function createHTMLRules(schema, options) {
         } : el.appendChild(el.ownerDocument.createTextNode(` (${href})`)) && next(el.childNodes) : next(el.childNodes);
       }
     },
+    {
+      deserialize(el, next) {
+        if (isElement(el) && (tagName(el) === "td" || tagName(el) === "th"))
+          return {
+            ...DEFAULT_BLOCK,
+            children: next(el.childNodes)
+          };
+      }
+    },
     {
       deserialize(el) {
         if (isElement(el) && tagName(el) === "img") {
@@ -901,14 +911,14 @@ class HtmlDeserializer {
     const { parseHtml } = this, fragment = parseHtml(html), children = Array.from(fragment.childNodes), blocks2 = trimWhitespace(
       this.schema,
       flattenNestedBlocks(
-        { schema: this.schema },
+        { schema: this.schema, keyGenerator: this.keyGenerator },
         ensureRootIsBlocks(
           this.schema,
           this.deserializeElements(children)
         )
       )
     );
-    return this._markDefs.length > 0 && blocks2.filter((block) => isTextBlock(this.schema, block)).forEach((block) => {
+    return this._markDefs.length > 0 && blocks2.filter((block) => isTextBlock({ schema: this.schema }, block)).forEach((block) => {
       block.markDefs = block.markDefs || [], block.markDefs = block.markDefs.concat(
         this._markDefs.filter((def) => flatten(
           block.children.map((child) => child.marks || [])
@@ -1029,9 +1039,18 @@ class HtmlDeserializer {
 }
 function normalizeBlock(node, options = {}) {
   const schema = {
+    block: {
+      name: options.blockTypeName || "block"
+    },
     span: {
       name: "span"
-    }
+    },
+    styles: [],
+    lists: [],
+    decorators: [],
+    annotations: [],
+    blockObjects: [],
+    inlineObjects: []
   };
   if (node._type !== (options.blockTypeName || "block"))
     return "_key" in node ? node : {
@@ -1057,13 +1076,13 @@ function normalizeBlock(node, options = {}) {
   return block.children = block.children.reduce(
     (acc, child) => {
       const previousChild = acc[acc.length - 1];
-      return previousChild && isSpan(schema, child) && isSpan(schema, previousChild) && isEqual(previousChild.marks, child.marks) ? (lastChild && lastChild === child && child.text === "" && block.children.length > 1 || (previousChild.text += child.text), acc) : (acc.push(child), acc);
+      return previousChild && isSpan({ schema }, child) && isSpan({ schema }, previousChild) && isEqual(previousChild.marks, child.marks) ? (lastChild && lastChild === child && child.text === "" && block.children.length > 1 || (previousChild.text += child.text), acc) : (acc.push(child), acc);
     },
     []
   ).map((child) => {
     if (!child)
       throw new Error("missing child");
-    return child._key = options.keyGenerator ? options.keyGenerator() : keyGenerator(), isSpan(schema, child) && (child.marks ? allowedDecorators && (child.marks = child.marks.filter((mark) => {
+    return child._key = options.keyGenerator ? options.keyGenerator() : keyGenerator(), isSpan({ schema }, child) && (child.marks ? allowedDecorators && (child.marks = child.marks.filter((mark) => {
       const isAllowed = allowedDecorators.includes(mark), isUsed = block.markDefs?.some((def) => def._key === mark);
       return isAllowed || isUsed;
     })) : child.marks = [], usedMarkDefs.push(...child.marks)), child;