@portabletext/block-tools 3.2.1 → 3.3.1

package/lib/index.js

@@ -1,8 +1,8 @@
 import { sanitySchemaToPortableTextSchema } from "@portabletext/sanity-bridge";
 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";
-import getRandomValues from "get-random-values-esm";
 function isArbitraryTypedObject(object) {
   return isRecord(object) && typeof object._type == "string";
 }
@@ -15,6 +15,19 @@ function isTextBlock(schema, block) {
 function isSpan(schema, child) {
   return !(!isArbitraryTypedObject(child) || child._type !== schema.span.name || typeof child.text != "string");
 }
+function keyGenerator() {
+  return randomKey(12);
+}
+function whatwgRNG(length = 16) {
+  const rnds8 = new Uint8Array(length);
+  return getRandomValues(rnds8), rnds8;
+}
+const byteToHex = [];
+for (let i = 0; i < 256; ++i)
+  byteToHex[i] = (i + 256).toString(16).slice(1);
+function randomKey(length) {
+  return whatwgRNG(length).reduce((str, n) => str + byteToHex[n], "").slice(0, length);
+}
 const objectToString = Object.prototype.toString;
 function resolveJsType(val) {
   switch (objectToString.call(val)) {
@@ -296,12 +309,67 @@ function defaultParseHtml() {
     );
   return (html) => new DOMParser().parseFromString(html, "text/html");
 }
-function flattenNestedBlocks(schema, blocks2) {
+function flattenNestedBlocks(context, blocks2) {
   let depth = 0;
   const flattened = [], traverse = (nodes) => {
     const toRemove = [];
     nodes.forEach((node) => {
-      depth === 0 && flattened.push(node), isTextBlock(schema, node) && (depth > 0 && (toRemove.push(node), flattened.push(node)), depth++, traverse(node.children)), node._type === "__block" && (toRemove.push(node), flattened.push(node.block));
+      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--;
@@ -451,8 +519,10 @@ function getBlockStyle(schema, el) {
 function createGDocsRules(schema) {
   return [
     {
-      deserialize(el) {
+      deserialize(el, next) {
         if (isElement(el) && tagName(el) === "span" && isGoogleDocs(el)) {
+          if (!el.textContent)
+            return !el.previousSibling && !el.nextSibling && el.setAttribute("data-lonely-child", "true"), next(el.childNodes);
           const span = {
             ...DEFAULT_SPAN,
             marks: [],
@@ -495,19 +565,6 @@ function createGDocsRules(schema) {
     }
   ];
 }
-function keyGenerator() {
-  return randomKey(12);
-}
-function whatwgRNG(length = 16) {
-  const rnds8 = new Uint8Array(length);
-  return getRandomValues(rnds8), rnds8;
-}
-const byteToHex = [];
-for (let i = 0; i < 256; ++i)
-  byteToHex[i] = (i + 256).toString(16).slice(1);
-function randomKey(length) {
-  return whatwgRNG(length).reduce((str, n) => str + byteToHex[n], "").slice(0, length);
-}
 const whitespaceTextNodeRule = {
   deserialize(node) {
     return node.nodeName === "#text" && isWhitespaceTextNode(node) ? {
@@ -680,6 +737,62 @@ function createHTMLRules(schema, options) {
           children: next(el.childNodes)
         } : el.appendChild(el.ownerDocument.createTextNode(` (${href})`)) && next(el.childNodes) : next(el.childNodes);
       }
+    },
+    {
+      deserialize(el) {
+        if (isElement(el) && tagName(el) === "img") {
+          const src = el.getAttribute("src") ?? void 0, alt = el.getAttribute("alt") ?? void 0, props = Object.fromEntries(
+            Array.from(el.attributes).map((attr) => [attr.name, attr.value])
+          ), ancestorOfLonelyChild = el?.parentElement?.parentElement?.getAttribute("data-lonely-child"), ancestorOfListItem = el.closest("li") !== null;
+          if (ancestorOfLonelyChild && !ancestorOfListItem) {
+            const image2 = options.matchers?.image?.({
+              context: {
+                schema,
+                keyGenerator: options.keyGenerator ?? keyGenerator
+              },
+              props: {
+                ...props,
+                ...src ? { src } : {},
+                ...alt ? { alt } : {}
+              }
+            });
+            if (image2)
+              return {
+                _type: "__block",
+                block: image2
+              };
+          }
+          const inlineImage = options.matchers?.inlineImage?.({
+            context: {
+              schema,
+              keyGenerator: options.keyGenerator ?? keyGenerator
+            },
+            props: {
+              ...props,
+              ...src ? { src } : {},
+              ...alt ? { alt } : {}
+            }
+          });
+          if (inlineImage)
+            return inlineImage;
+          const image = options.matchers?.image?.({
+            context: {
+              schema,
+              keyGenerator: options.keyGenerator ?? keyGenerator
+            },
+            props: {
+              ...props,
+              ...src ? { src } : {},
+              ...alt ? { alt } : {}
+            }
+          });
+          if (image)
+            return {
+              _type: "__block",
+              block: image
+            };
+        }
+      }
     }
   ];
 }
@@ -757,6 +870,7 @@ function createRules(schema, options) {
   ];
 }
 class HtmlDeserializer {
+  keyGenerator;
   schema;
   rules;
   parseHtml;
@@ -769,9 +883,10 @@ class HtmlDeserializer {
    */
   constructor(schema, options = {}) {
     const { rules = [], unstable_whitespaceOnPasteMode = "preserve" } = options, standardRules = createRules(schema, {
-      keyGenerator: options.keyGenerator
+      keyGenerator: options.keyGenerator,
+      matchers: options.matchers
     });
-    this.schema = schema, this.rules = [...rules, ...standardRules];
+    this.schema = schema, this.keyGenerator = options.keyGenerator ?? keyGenerator, this.rules = [...rules, ...standardRules];
     const parseHtml = options.parseHtml || defaultParseHtml();
     this.parseHtml = (html) => preprocess(html, parseHtml, { unstable_whitespaceOnPasteMode }).body;
   }
@@ -786,8 +901,11 @@ class HtmlDeserializer {
     const { parseHtml } = this, fragment = parseHtml(html), children = Array.from(fragment.childNodes), blocks2 = trimWhitespace(
       this.schema,
       flattenNestedBlocks(
-        this.schema,
-        ensureRootIsBlocks(this.schema, this.deserializeElements(children))
+        { schema: this.schema },
+        ensureRootIsBlocks(
+          this.schema,
+          this.deserializeElements(children)
+        )
       )
     );
     return this._markDefs.length > 0 && blocks2.filter((block) => isTextBlock(this.schema, block)).forEach((block) => {