@datawheel/bespoke 0.5.8 → 0.5.9

package/dist/index.js

@@ -33,7 +33,7 @@ import dynamic from 'next/dynamic';
 import { Plugin, PluginKey, Selection, TextSelection, NodeSelection } from '@tiptap/pm/state';
 import '@tiptap/pm/view';
 import '@tiptap/pm/keymap';
-import { Fragment as Fragment$2, Slice, DOMParser } from '@tiptap/pm/model';
+import { Fragment as Fragment$2, Slice, Schema, DOMParser } from '@tiptap/pm/model';
 import { liftTarget, joinPoint, canSplit, ReplaceStep, ReplaceAroundStep, canJoin } from '@tiptap/pm/transform';
 import { createParagraphNear as createParagraphNear$1, deleteSelection as deleteSelection$1, exitCode as exitCode$1, joinUp as joinUp$1, joinDown as joinDown$1, joinBackward as joinBackward$1, joinForward as joinForward$1, joinTextblockBackward as joinTextblockBackward$1, joinTextblockForward as joinTextblockForward$1, lift as lift$1, liftEmptyBlock as liftEmptyBlock$1, newlineInCode as newlineInCode$1, selectNodeBackward as selectNodeBackward$1, selectNodeForward as selectNodeForward$1, selectParentNode as selectParentNode$1, selectTextblockEnd as selectTextblockEnd$1, selectTextblockStart as selectTextblockStart$1, setBlockType, wrapIn as wrapIn$1 } from '@tiptap/pm/commands';
 import { liftListItem as liftListItem$1, sinkListItem as sinkListItem$1, wrapInList as wrapInList$1 } from '@tiptap/pm/schema-list';
@@ -6615,14 +6615,10 @@ function mergeDeep(target, source) {
   const output = { ...target };
   if (isPlainObject(target) && isPlainObject(source)) {
     Object.keys(source).forEach((key) => {
-      if (isPlainObject(source[key])) {
-        if (!(key in target)) {
-          Object.assign(output, { [key]: source[key] });
-        } else {
-          output[key] = mergeDeep(target[key], source[key]);
-        }
+      if (isPlainObject(source[key]) && isPlainObject(target[key])) {
+        output[key] = mergeDeep(target[key], source[key]);
       } else {
-        Object.assign(output, { [key]: source[key] });
+        output[key] = source[key];
       }
     });
   }
@@ -6632,15 +6628,13 @@ function getTextBetween(startNode, range, options) {
   const { from, to } = range;
   const { blockSeparator = "\n\n", textSerializers = {} } = options || {};
   let text = "";
-  let separated = true;
   startNode.nodesBetween(from, to, (node, pos, parent, index) => {
     var _a;
+    if (node.isBlock && pos > from) {
+      text += blockSeparator;
+    }
     const textSerializer = textSerializers === null || textSerializers === void 0 ? void 0 : textSerializers[node.type.name];
     if (textSerializer) {
-      if (node.isBlock && !separated) {
-        text += blockSeparator;
-        separated = true;
-      }
       if (parent) {
         text += textSerializer({
           node,
@@ -6650,12 +6644,10 @@ function getTextBetween(startNode, range, options) {
           range
         });
       }
-    } else if (node.isText) {
+      return false;
+    }
+    if (node.isText) {
       text += (_a = node === null || node === void 0 ? void 0 : node.text) === null || _a === void 0 ? void 0 : _a.slice(Math.max(from, pos) - pos, to - pos);
-      separated = false;
-    } else if (node.isBlock && !separated) {
-      text += blockSeparator;
-      separated = true;
     }
   });
   return text;
@@ -6774,20 +6766,63 @@ function createNodeFromContent(content, schema2, options) {
     parseOptions: {},
     ...options
   };
-  if (typeof content === "object" && content !== null) {
+  const isJSONContent = typeof content === "object" && content !== null;
+  const isTextContent = typeof content === "string";
+  if (isJSONContent) {
     try {
-      if (Array.isArray(content) && content.length > 0) {
+      const isArrayContent = Array.isArray(content) && content.length > 0;
+      if (isArrayContent) {
         return Fragment$2.fromArray(content.map((item) => schema2.nodeFromJSON(item)));
       }
       return schema2.nodeFromJSON(content);
     } catch (error) {
+      if (options.errorOnInvalidContent) {
+        throw new Error("[tiptap error]: Invalid JSON content", { cause: error });
+      }
       console.warn("[tiptap warn]: Invalid content.", "Passed value:", content, "Error:", error);
       return createNodeFromContent("", schema2, options);
     }
   }
-  if (typeof content === "string") {
+  if (isTextContent) {
+    if (options.errorOnInvalidContent) {
+      let hasInvalidContent = false;
+      let invalidContent = "";
+      const contentCheckSchema = new Schema({
+        topNode: schema2.spec.topNode,
+        marks: schema2.spec.marks,
+        // Prosemirror's schemas are executed such that: the last to execute, matches last
+        // This means that we can add a catch-all node at the end of the schema to catch any content that we don't know how to handle
+        nodes: schema2.spec.nodes.append({
+          __tiptap__private__unknown__catch__all__node: {
+            content: "inline*",
+            group: "block",
+            parseDOM: [
+              {
+                tag: "*",
+                getAttrs: (e) => {
+                  hasInvalidContent = true;
+                  invalidContent = typeof e === "string" ? e : e.outerHTML;
+                  return null;
+                }
+              }
+            ]
+          }
+        })
+      });
+      if (options.slice) {
+        DOMParser.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options.parseOptions);
+      } else {
+        DOMParser.fromSchema(contentCheckSchema).parse(elementFromString(content), options.parseOptions);
+      }
+      if (options.errorOnInvalidContent && hasInvalidContent) {
+        throw new Error("[tiptap error]: Invalid HTML content", { cause: new Error(`Invalid element found: ${invalidContent}`) });
+      }
+    }
     const parser = DOMParser.fromSchema(schema2);
-    return options.slice ? parser.parseSlice(elementFromString(content), options.parseOptions).content : parser.parse(elementFromString(content), options.parseOptions);
+    if (options.slice) {
+      return parser.parseSlice(elementFromString(content), options.parseOptions).content;
+    }
+    return parser.parse(elementFromString(content), options.parseOptions);
   }
   return createNodeFromContent("", schema2, options);
 }
@@ -6903,8 +6938,12 @@ function deleteProps(obj, propOrProps) {
     return newObj;
   }, {});
 }
-function createDocument(content, schema2, parseOptions = {}) {
-  return createNodeFromContent(content, schema2, { slice: false, parseOptions });
+function createDocument(content, schema2, parseOptions = {}, options = {}) {
+  return createNodeFromContent(content, schema2, {
+    slice: false,
+    parseOptions,
+    errorOnInvalidContent: options.errorOnInvalidContent
+  });
 }
 function getMarkAttributes(state, typeOrName) {
   const type = getMarkType(typeOrName, state.schema);
@@ -6955,7 +6994,7 @@ function getMarksBetween(from, to, doc) {
   const marks = [];
   if (from === to) {
     doc.resolve(from).marks().forEach((mark) => {
-      const $pos = doc.resolve(from - 1);
+      const $pos = doc.resolve(from);
       const range = getMarkRange($pos, mark.type);
       if (!range) {
         return;
@@ -7147,7 +7186,8 @@ function nodeInputRule(config) {
         tr.insertText(lastChar, start2 + match[0].length - 1);
         tr.replaceWith(matchStart, end2, newNode);
       } else if (match[0]) {
-        tr.insert(start2 - 1, config.type.create(attributes)).delete(tr.mapping.map(start2), tr.mapping.map(end2));
+        const insertionStart = config.type.isInline ? start2 : start2 - 1;
+        tr.insert(insertionStart, config.type.create(attributes)).delete(tr.mapping.map(start2), tr.mapping.map(end2));
       }
       tr.scrollIntoView();
     }
@@ -7334,12 +7374,14 @@ var init_dist = __esm({
         return new Extension(config);
       }
       configure(options = {}) {
-        const extension = this.extend();
-        extension.options = mergeDeep(this.options, options);
-        extension.storage = callOrReturn(getExtensionField(extension, "addStorage", {
-          name: extension.name,
-          options: extension.options
-        }));
+        const extension = this.extend({
+          ...this.config,
+          addOptions: () => {
+            return mergeDeep(this.options, options);
+          }
+        });
+        extension.name = this.name;
+        extension.parent = this.parent;
         return extension;
       }
       extend(extendedConfig = {}) {
@@ -7347,7 +7389,7 @@ var init_dist = __esm({
         extension.parent = this;
         this.child = extension;
         extension.name = extendedConfig.name ? extendedConfig.name : extension.parent.name;
-        if (extendedConfig.defaultOptions) {
+        if (extendedConfig.defaultOptions && Object.keys(extendedConfig.defaultOptions).length > 0) {
           console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`);
         }
         extension.options = callOrReturn(getExtensionField(extension, "addOptions", {
@@ -7362,6 +7404,11 @@ var init_dist = __esm({
     };
     Extension.create({
       name: "clipboardTextSerializer",
+      addOptions() {
+        return {
+          blockSeparator: void 0
+        };
+      },
       addProseMirrorPlugins() {
         return [
           new Plugin({
@@ -7377,6 +7424,7 @@ var init_dist = __esm({
                 const textSerializers = getTextSerializersFromSchema(schema2);
                 const range = { from, to };
                 return getTextBetween(doc, range, {
+                  ...this.options.blockSeparator !== void 0 ? { blockSeparator: this.options.blockSeparator } : {},
                   textSerializers
                 });
               }
@@ -7574,23 +7622,36 @@ var init_dist = __esm({
       return node;
     };
     isFragment = (nodeOrFragment) => {
-      return nodeOrFragment.toString().startsWith("<");
+      return !("type" in nodeOrFragment);
     };
     insertContentAt = (position, value, options) => ({ tr, dispatch, editor }) => {
+      var _a;
       if (dispatch) {
         options = {
           parseOptions: {},
           updateSelection: true,
+          applyInputRules: false,
+          applyPasteRules: false,
           ...options
         };
-        const content = createNodeFromContent(value, editor.schema, {
-          parseOptions: {
-            preserveWhitespace: "full",
-            ...options.parseOptions
-          }
-        });
-        if (content.toString() === "<>") {
-          return true;
+        let content;
+        try {
+          content = createNodeFromContent(value, editor.schema, {
+            parseOptions: {
+              preserveWhitespace: "full",
+              ...options.parseOptions
+            },
+            errorOnInvalidContent: (_a = options.errorOnInvalidContent) !== null && _a !== void 0 ? _a : editor.options.enableContentCheck
+          });
+        } catch (e) {
+          editor.emit("contentError", {
+            editor,
+            error: e,
+            disableCollaboration: () => {
+              console.error("[tiptap error]: Unable to disable collaboration at this point in time");
+            }
+          });
+          return false;
         }
         let { from, to } = typeof position === "number" ? { from: position, to: position } : { from: position.from, to: position.to };
         let isOnlyTextContent = true;
@@ -7609,20 +7670,29 @@ var init_dist = __esm({
             to += 1;
           }
         }
+        let newContent;
         if (isOnlyTextContent) {
           if (Array.isArray(value)) {
-            tr.insertText(value.map((v2) => v2.text || "").join(""), from, to);
+            newContent = value.map((v2) => v2.text || "").join("");
           } else if (typeof value === "object" && !!value && !!value.text) {
-            tr.insertText(value.text, from, to);
+            newContent = value.text;
           } else {
-            tr.insertText(value, from, to);
+            newContent = value;
           }
+          tr.insertText(newContent, from, to);
         } else {
-          tr.replaceWith(from, to, content);
+          newContent = content;
+          tr.replaceWith(from, to, newContent);
         }
         if (options.updateSelection) {
           selectionToInsertionEnd(tr, tr.steps.length - 1, -1);
         }
+        if (options.applyInputRules) {
+          tr.setMeta("applyInputRules", { from, text: newContent });
+        }
+        if (options.applyPasteRules) {
+          tr.setMeta("applyPasteRules", { from, text: newContent });
+        }
       }
       return true;
     };
@@ -7638,7 +7708,7 @@ var init_dist = __esm({
     joinForward = () => ({ state, dispatch }) => {
       return joinForward$1(state, dispatch);
     };
-    joinItemBackward = () => ({ tr, state, dispatch }) => {
+    joinItemBackward = () => ({ state, dispatch, tr }) => {
       try {
         const point = joinPoint(state.doc, state.selection.$from.pos, -1);
         if (point === null || point === void 0) {
@@ -7649,7 +7719,7 @@ var init_dist = __esm({
           dispatch(tr);
         }
         return true;
-      } catch {
+      } catch (e) {
         return false;
       }
     };
@@ -7773,13 +7843,25 @@ var init_dist = __esm({
     selectTextblockStart = () => ({ state, dispatch }) => {
       return selectTextblockStart$1(state, dispatch);
     };
-    setContent = (content, emitUpdate = false, parseOptions = {}) => ({ tr, editor, dispatch }) => {
+    setContent = (content, emitUpdate = false, parseOptions = {}, options = {}) => ({ editor, tr, dispatch, commands: commands2 }) => {
+      var _a, _b;
       const { doc } = tr;
-      const document2 = createDocument(content, editor.schema, parseOptions);
+      if (parseOptions.preserveWhitespace !== "full") {
+        const document2 = createDocument(content, editor.schema, parseOptions, {
+          errorOnInvalidContent: (_a = options.errorOnInvalidContent) !== null && _a !== void 0 ? _a : editor.options.enableContentCheck
+        });
+        if (dispatch) {
+          tr.replaceWith(0, doc.content.size, document2).setMeta("preventUpdate", !emitUpdate);
+        }
+        return true;
+      }
       if (dispatch) {
-        tr.replaceWith(0, doc.content.size, document2).setMeta("preventUpdate", !emitUpdate);
+        tr.setMeta("preventUpdate", !emitUpdate);
       }
-      return true;
+      return commands2.insertContentAt({ from: 0, to: doc.content.size }, content, {
+        parseOptions,
+        errorOnInvalidContent: (_b = options.errorOnInvalidContent) !== null && _b !== void 0 ? _b : editor.options.enableContentCheck
+      });
     };
     setMark = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
       const { selection } = tr;
@@ -7884,29 +7966,29 @@ var init_dist = __esm({
       if (!$from.parent.isBlock) {
         return false;
       }
-      if (dispatch) {
-        const atEnd = $to.parentOffset === $to.parent.content.size;
-        if (selection instanceof TextSelection) {
-          tr.deleteSelection();
+      const atEnd = $to.parentOffset === $to.parent.content.size;
+      const deflt = $from.depth === 0 ? void 0 : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
+      let types = atEnd && deflt ? [
+        {
+          type: deflt,
+          attrs: newAttributes
         }
-        const deflt = $from.depth === 0 ? void 0 : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
-        let types = atEnd && deflt ? [
+      ] : void 0;
+      let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
+      if (!types && !can && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : void 0)) {
+        can = true;
+        types = deflt ? [
           {
             type: deflt,
             attrs: newAttributes
           }
         ] : void 0;
-        let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types);
-        if (!types && !can && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : void 0)) {
-          can = true;
-          types = deflt ? [
-            {
-              type: deflt,
-              attrs: newAttributes
-            }
-          ] : void 0;
-        }
+      }
+      if (dispatch) {
         if (can) {
+          if (selection instanceof TextSelection) {
+            tr.deleteSelection();
+          }
           tr.split(tr.mapping.map($from.pos), 1, types);
           if (deflt && !atEnd && !$from.parentOffset && $from.parent.type !== deflt) {
             const first2 = tr.mapping.map($from.before());
@@ -7921,7 +8003,7 @@ var init_dist = __esm({
         }
         tr.scrollIntoView();
       }
-      return true;
+      return can;
     };
     splitListItem = (typeOrName) => ({ tr, state, dispatch, editor }) => {
       var _a;
@@ -8226,14 +8308,14 @@ var init_dist = __esm({
       forEach,
       insertContent,
       insertContentAt,
-      joinUp,
-      joinDown,
       joinBackward,
+      joinDown,
       joinForward,
       joinItemBackward,
       joinItemForward,
       joinTextblockBackward,
       joinTextblockForward,
+      joinUp,
       keyboardShortcut,
       lift,
       liftEmptyBlock,
@@ -8325,11 +8407,11 @@ var init_dist = __esm({
             const { selection, doc } = tr;
             const { empty, $anchor } = selection;
             const { pos, parent } = $anchor;
-            const $parentPos = $anchor.parent.isTextblock ? tr.doc.resolve(pos - 1) : $anchor;
+            const $parentPos = $anchor.parent.isTextblock && pos > 0 ? tr.doc.resolve(pos - 1) : $anchor;
             const parentIsIsolating = $parentPos.parent.type.spec.isolating;
             const parentPos = $anchor.pos - $anchor.parentOffset;
             const isAtStart = parentIsIsolating && $parentPos.parent.childCount === 1 ? parentPos === $anchor.pos : Selection.atStart(doc).from === pos;
-            if (!empty || !isAtStart || !parent.type.isTextblock || parent.textContent.length) {
+            if (!empty || !parent.type.isTextblock || parent.textContent.length || !isAtStart || isAtStart && $anchor.parent.type.name === "paragraph") {
               return false;
             }
             return commands2.clearNodes();
@@ -8430,7 +8512,7 @@ var init_dist = __esm({
           new Plugin({
             key: new PluginKey("tabindex"),
             props: {
-              attributes: this.editor.isEditable ? { tabindex: "0" } : {}
+              attributes: () => this.editor.isEditable ? { tabindex: "0" } : {}
             }
           })
         ];
@@ -8469,20 +8551,22 @@ var init_dist = __esm({
         return new Mark(config);
       }
       configure(options = {}) {
-        const extension = this.extend();
-        extension.options = mergeDeep(this.options, options);
-        extension.storage = callOrReturn(getExtensionField(extension, "addStorage", {
-          name: extension.name,
-          options: extension.options
-        }));
+        const extension = this.extend({
+          ...this.config,
+          addOptions: () => {
+            return mergeDeep(this.options, options);
+          }
+        });
+        extension.name = this.name;
+        extension.parent = this.parent;
         return extension;
       }
       extend(extendedConfig = {}) {
-        const extension = new Mark({ ...this.config, ...extendedConfig });
+        const extension = new Mark(extendedConfig);
         extension.parent = this;
         this.child = extension;
         extension.name = extendedConfig.name ? extendedConfig.name : extension.parent.name;
-        if (extendedConfig.defaultOptions) {
+        if (extendedConfig.defaultOptions && Object.keys(extendedConfig.defaultOptions).length > 0) {
           console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`);
         }
         extension.options = callOrReturn(getExtensionField(extension, "addOptions", {
@@ -8548,20 +8632,22 @@ var init_dist = __esm({
         return new Node(config);
       }
       configure(options = {}) {
-        const extension = this.extend();
-        extension.options = mergeDeep(this.options, options);
-        extension.storage = callOrReturn(getExtensionField(extension, "addStorage", {
-          name: extension.name,
-          options: extension.options
-        }));
+        const extension = this.extend({
+          ...this.config,
+          addOptions: () => {
+            return mergeDeep(this.options, options);
+          }
+        });
+        extension.name = this.name;
+        extension.parent = this.parent;
         return extension;
       }
       extend(extendedConfig = {}) {
-        const extension = new Node({ ...this.config, ...extendedConfig });
+        const extension = new Node(extendedConfig);
         extension.parent = this;
         this.child = extension;
         extension.name = extendedConfig.name ? extendedConfig.name : extension.parent.name;
-        if (extendedConfig.defaultOptions) {
+        if (extendedConfig.defaultOptions && Object.keys(extendedConfig.defaultOptions).length > 0) {
           console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`);
         }
         extension.options = callOrReturn(getExtensionField(extension, "addOptions", {
@@ -8583,10 +8669,10 @@ var init_dist2 = __esm({
   "../../node_modules/@tiptap/extension-bold/dist/index.js"() {
     init_esm_shims();
     init_dist();
-    starInputRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))$/;
-    starPasteRegex = /(?:^|\s)((?:\*\*)((?:[^*]+))(?:\*\*))/g;
-    underscoreInputRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))$/;
-    underscorePasteRegex = /(?:^|\s)((?:__)((?:[^__]+))(?:__))/g;
+    starInputRegex = /(?:^|\s)(\*\*(?!\s+\*\*)((?:[^*]+))\*\*(?!\s+\*\*))$/;
+    starPasteRegex = /(?:^|\s)(\*\*(?!\s+\*\*)((?:[^*]+))\*\*(?!\s+\*\*))/g;
+    underscoreInputRegex = /(?:^|\s)(__(?!\s+__)((?:[^_]+))__(?!\s+__))$/;
+    underscorePasteRegex = /(?:^|\s)(__(?!\s+__)((?:[^_]+))__(?!\s+__))/g;
     Bold = Mark.create({
       name: "bold",
       addOptions() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -53,17 +53,17 @@
     "@monaco-editor/react": "^4.4.5",
     "@reduxjs/toolkit": "^1.8.4",
     "@tabler/icons-react": "^2.15.0",
-    "@tiptap/extension-hard-break": "^2.2.2",
-    "@tiptap/extension-history": "^2.2.2",
-    "@tiptap/extension-mention": "^2.2.2",
-    "@tiptap/extension-placeholder": "^2.2.4",
-    "@tiptap/extension-text-align": "^2.2.2",
-    "@tiptap/extension-typography": "^2.2.4",
-    "@tiptap/extension-underline": "^2.2.2",
-    "@tiptap/pm": "^2.2.2",
-    "@tiptap/react": "^2.2.2",
-    "@tiptap/starter-kit": "^2.2.2",
-    "@tiptap/suggestion": "^2.2.2",
+    "@tiptap/extension-hard-break": "^2.5.9",
+    "@tiptap/extension-history": "^2.5.9",
+    "@tiptap/extension-mention": "^2.5.9",
+    "@tiptap/extension-placeholder": "^2.5.9",
+    "@tiptap/extension-text-align": "^2.5.9",
+    "@tiptap/extension-typography": "^2.5.9",
+    "@tiptap/extension-underline": "^2.5.9",
+    "@tiptap/pm": "^2.5.9",
+    "@tiptap/react": "^2.5.9",
+    "@tiptap/starter-kit": "^2.5.9",
+    "@tiptap/suggestion": "^2.5.9",
     "auth0": "^3.3",
     "axios": "^1.6.2",
     "axios-retry": "^3.8.0",