feat: update prosemirror dependencies

package.json

@@ -62,14 +62,6 @@
     "@floating-ui/dom": "^0.5.2",
     "@types/jasmine": "~3.10.0",
     "@types/node": "^12.11.1",
-    "@types/prosemirror-commands": "^1.0.4",
-    "@types/prosemirror-history": "^1.0.3",
-    "@types/prosemirror-inputrules": "^1.0.4",
-    "@types/prosemirror-keymap": "^1.0.4",
-    "@types/prosemirror-model": "^1.16.2",
-    "@types/prosemirror-schema-list": "^1.0.3",
-    "@types/prosemirror-state": "^1.3.0",
-    "@types/prosemirror-view": "^1.23.1",
     "@typescript-eslint/eslint-plugin": "^5.27.0",
     "@typescript-eslint/parser": "^5.27.0",
     "docsify-cli": "^4.4.4",
@@ -87,14 +79,14 @@
     "ng-packagr": "^13.0.0",
     "prettier": "^2.6.2",
     "prosemirror-codemirror-6": "^0.2.0",
-    "prosemirror-commands": "^1.2.2",
-    "prosemirror-history": "^1.2.0",
-    "prosemirror-inputrules": "^1.1.3",
-    "prosemirror-keymap": "^1.1.5",
-    "prosemirror-model": "^1.16.1",
-    "prosemirror-schema-list": "^1.1.6",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-view": "^1.23.13",
+    "prosemirror-commands": "^1.3.0",
+    "prosemirror-history": "^1.3.0",
+    "prosemirror-inputrules": "^1.2.0",
+    "prosemirror-keymap": "^1.2.0",
+    "prosemirror-model": "^1.17.0",
+    "prosemirror-schema-list": "^1.2.0",
+    "prosemirror-state": "^1.4.0",
+    "prosemirror-view": "^1.24.1",
     "typescript": "~4.5.1"
   }
 }

projects/demo/src/app/components/custom-menu/custom-menu.component.ts

@@ -26,16 +26,16 @@ export class CustomMenuComponent implements OnInit {
     const { schema } = state;
 
     if (this.isActive) {
-      return setBlockType(schema.nodes.paragraph)(state, dispatch);
+      return setBlockType(schema.nodes['paragraph'])(state, dispatch);
     }
 
-    return setBlockType(schema.nodes.code_mirror)(state, dispatch);
+    return setBlockType(schema.nodes['code_mirror'])(state, dispatch);
   }
 
   update = (view: EditorView):void => {
     const { state } = view;
     const { schema } = state;
-    this.isActive = isNodeActive(state, schema.nodes.code_mirror);
+    this.isActive = isNodeActive(state, schema.nodes['code_mirror']);
     this.isDisabled = !this.execute(state, null); // returns true if executable
   };
 

projects/ngx-editor/commands/applyMark.ts

@@ -1,6 +1,5 @@
 import { MarkType } from 'prosemirror-model';
-import { Command } from 'prosemirror-commands';
-import { EditorState, TextSelection, Transaction } from 'prosemirror-state';
+import { EditorState, TextSelection, Transaction, type Command } from 'prosemirror-state';
 
 import { markApplies } from 'ngx-editor/helpers';
 

projects/ngx-editor/commands/removeLink.ts

@@ -1,5 +1,4 @@
-import { Command } from 'prosemirror-commands';
-import { EditorState, Transaction } from 'prosemirror-state';
+import { EditorState, Transaction, type Command } from 'prosemirror-state';
 
 export const removeLink = (): Command => {
   return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {

projects/ngx-editor/commands/removeMark.ts

@@ -1,8 +1,7 @@
 import { MarkType } from 'prosemirror-model';
-import { EditorState, TextSelection, Transaction } from 'prosemirror-state';
+import { EditorState, TextSelection, Transaction, type Command } from 'prosemirror-state';
 
 import { markApplies } from 'ngx-editor/helpers';
-import { Command } from 'prosemirror-commands';
 
 export const removeMark = (type: MarkType): Command => {
   return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {

projects/ngx-editor/helpers/getSelectionMarks.ts

@@ -1,8 +1,8 @@
 import { EditorState } from 'prosemirror-state';
 import { Mark } from 'prosemirror-model';
 
-export const getSelectionMarks = (state: EditorState): Mark[] => {
-  let marks: Mark[] = [];
+export const getSelectionMarks = (state: EditorState): readonly Mark[] => {
+  let marks: readonly Mark[] = [];
 
   const { selection, storedMarks } = state;
   const { from, to, empty, $from } = selection;

projects/ngx-editor/helpers/markApplies.ts

@@ -2,7 +2,7 @@ import { MarkType, Node as PrmosemirroNode } from 'prosemirror-model';
 import { SelectionRange } from 'prosemirror-state';
 
 // Ref: https://github.com/ProseMirror/prosemirror-commands/blob/master/src/commands.js
-export const markApplies = (doc: PrmosemirroNode, ranges: SelectionRange[], type: MarkType): boolean => {
+export const markApplies = (doc: PrmosemirroNode, ranges: readonly SelectionRange[], type: MarkType): boolean => {
   for (const range of ranges) {
     const { $from, $to } = range;
 

projects/ngx-editor/input-rules/auto-link.ts

@@ -8,7 +8,7 @@ export const autoLink = (): InputRule => {
     const { schema } = state;
 
     const tr = state.tr.insertText(match[0], start, end); // Replace existing text with entire match
-    const mark = schema.marks.link.create({ href: match[0] });
+    const mark = schema.marks['link'].create({ href: match[0] });
 
     return tr.addMark(start, start + match[0].length, mark);
   });

projects/ngx-editor/package.json

@@ -23,22 +23,14 @@
   "dependencies": {
     "@floating-ui/core": "^0.7.0",
     "@floating-ui/dom": "^0.5.0",
-    "@types/prosemirror-commands": "1.0.4",
-    "@types/prosemirror-history": "1.0.3",
-    "@types/prosemirror-inputrules":"1.0.4",
-    "@types/prosemirror-keymap": "1.0.4",
-    "@types/prosemirror-model": "1.16.1",
-    "@types/prosemirror-schema-list": "1.0.3",
-    "@types/prosemirror-state": "1.2.8",
-    "@types/prosemirror-view": "1.23.1",
-    "prosemirror-commands": "^1.2.2",
-    "prosemirror-history": "^1.2.0",
-    "prosemirror-inputrules":"^1.1.3",
-    "prosemirror-keymap": "^1.1.5",
-    "prosemirror-model": "^1.16.1",
-    "prosemirror-schema-list": "^1.1.6",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-view": "^1.23.12",
+    "prosemirror-commands": "^1.3.0",
+    "prosemirror-history": "^1.3.0",
+    "prosemirror-inputrules":"^1.2.0",
+    "prosemirror-keymap": "^1.2.0",
+    "prosemirror-model": "^1.17.0",
+    "prosemirror-schema-list": "^1.2.0",
+    "prosemirror-state": "^1.4.0",
+    "prosemirror-view": "^1.24.1",
     "tslib": "^2.3.0"
   }
 }

projects/ngx-editor/src/lib/commands/Blockquote.ts

@@ -1,6 +1,6 @@
 import type { NodeType } from 'prosemirror-model';
-import type { EditorState, Transaction } from 'prosemirror-state';
-import { type Command, lift, wrapIn } from 'prosemirror-commands';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
+import { lift, wrapIn } from 'prosemirror-commands';
 
 import { isNodeActive } from 'ngx-editor/helpers';
 
@@ -9,7 +9,7 @@ class Blockqote {
     return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {
       const { schema } = state;
 
-      const type: NodeType = schema.nodes.blockquote;
+      const type: NodeType = schema.nodes['blockquote'];
       if (!type) {
         return false;
       }
@@ -25,7 +25,7 @@ class Blockqote {
   isActive(state: EditorState): boolean {
     const { schema } = state;
 
-    const type: NodeType = schema.nodes.blockquote;
+    const type: NodeType = schema.nodes['blockquote'];
     if (!type) {
       return false;
     }

projects/ngx-editor/src/lib/commands/Heading.ts

@@ -1,6 +1,6 @@
 import type { NodeType, Node as ProseMirrorNode } from 'prosemirror-model';
-import type { EditorState, Transaction } from 'prosemirror-state';
-import { type Command, setBlockType } from 'prosemirror-commands';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
+import { setBlockType } from 'prosemirror-commands';
 
 import { getSelectionNodes } from 'ngx-editor/helpers';
 
@@ -17,7 +17,7 @@ class Heading {
     return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {
       const { schema } = state;
 
-      const type: NodeType = schema.nodes.heading;
+      const type: NodeType = schema.nodes['heading'];
       if (!type) {
         return false;
       }
@@ -30,7 +30,7 @@ class Heading {
     return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {
       const { schema, selection, doc } = state;
 
-      const type: NodeType = schema.nodes.heading;
+      const type: NodeType = schema.nodes['heading'];
       if (!type) {
         return false;
       }
@@ -41,7 +41,7 @@ class Heading {
       const attrs = node?.attrs ?? {};
 
       if (this.isActive(state)) {
-        return setBlockType(schema.nodes.paragraph, attrs)(state, dispatch);
+        return setBlockType(schema.nodes['paragraph'], attrs)(state, dispatch);
       }
 
       return setBlockType(type, { ...attrs, level: this.level })(state, dispatch);
@@ -52,15 +52,15 @@ class Heading {
     const { schema } = state;
     const nodesInSelection = getSelectionNodes(state);
 
-    const type: NodeType = schema.nodes.heading;
+    const type: NodeType = schema.nodes['heading'];
     if (!type) {
       return false;
     }
 
     const supportedNodes = [
       type,
-      schema.nodes.text,
-      schema.nodes.blockquote,
+      schema.nodes['text'],
+      schema.nodes['blockquote'],
     ];
 
     // heading is a text node

projects/ngx-editor/src/lib/commands/HorizontalRule.ts

@@ -1,6 +1,5 @@
 import type { NodeType } from 'prosemirror-model';
-import type { EditorState, Transaction } from 'prosemirror-state';
-import type { Command } from 'prosemirror-commands';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
 
 import { canInsert } from 'ngx-editor/helpers';
 
@@ -9,7 +8,7 @@ class HorizontalRule {
     return (state: EditorState, dispatch?: (tr: Transaction) => void): boolean => {
       const { schema, tr } = state;
 
-      const type: NodeType = schema.nodes.horizontal_rule;
+      const type: NodeType = schema.nodes['horizontal_rule'];
 
       if (!type) {
         return false;
@@ -21,7 +20,7 @@ class HorizontalRule {
   }
 
   canExecute(state: EditorState): boolean {
-    return canInsert(state, state.schema.nodes.horizontal_rule);
+    return canInsert(state, state.schema.nodes['horizontal_rule']);
   }
 }
 

projects/ngx-editor/src/lib/commands/Image.ts

@@ -1,5 +1,4 @@
-import { type EditorState, NodeSelection } from 'prosemirror-state';
-import type { Command } from 'prosemirror-commands';
+import { type EditorState, NodeSelection, type Command } from 'prosemirror-state';
 
 import { Dispatch } from './types';
 
@@ -14,7 +13,7 @@ class Image {
     return (state: EditorState, dispatch?: Dispatch): boolean => {
       const { schema, tr, selection } = state;
 
-      const type = schema.nodes.image;
+      const type = schema.nodes['image'];
       if (!type) {
         return false;
       }

projects/ngx-editor/src/lib/commands/Link.ts

@@ -1,6 +1,6 @@
 import type { MarkType } from 'prosemirror-model';
-import type { EditorState } from 'prosemirror-state';
-import { type Command, toggleMark } from 'prosemirror-commands';
+import type { EditorState, Command } from 'prosemirror-state';
+import { toggleMark } from 'prosemirror-commands';
 
 import { isMarkActive } from 'ngx-editor/helpers';
 import { removeLink } from 'ngx-editor/commands';
@@ -21,7 +21,7 @@ class Link {
     return (state: EditorState, dispatch?: Dispatch): boolean => {
       const { schema, selection } = state;
 
-      const type: MarkType = schema.marks.link;
+      const type: MarkType = schema.marks['link'];
       if (!type) {
         return false;
       }
@@ -38,7 +38,7 @@ class Link {
     return (state: EditorState, dispatch?: Dispatch): boolean => {
       const { schema, tr } = state;
 
-      const type: MarkType = schema.marks.link;
+      const type: MarkType = schema.marks['link'];
       if (!type) {
         return false;
       }
@@ -49,7 +49,7 @@ class Link {
         target: attrs.target ?? '_blank',
       };
 
-      const node = schema.text(text, [schema.marks.link.create(linkAttrs)]);
+      const node = schema.text(text, [schema.marks['link'].create(linkAttrs)]);
 
       tr.replaceSelectionWith(node, false)
         .scrollIntoView();
@@ -69,7 +69,7 @@ class Link {
     }
 
     const { schema } = state;
-    const type = schema.marks.link;
+    const type = schema.marks['link'];
 
     if (!type) {
       return false;

projects/ngx-editor/src/lib/commands/ListItem.ts

@@ -1,7 +1,6 @@
 import type { NodeType, Schema } from 'prosemirror-model';
-import type { EditorState, Transaction } from 'prosemirror-state';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
 import { liftListItem, wrapInList } from 'prosemirror-schema-list';
-import type { Command } from 'prosemirror-commands';
 
 import { isNodeActive } from 'ngx-editor/helpers';
 
@@ -26,7 +25,7 @@ class ListItem {
       }
 
       if (this.isActive(state)) {
-        return liftListItem(schema.nodes.list_item)(state, dispatch);
+        return liftListItem(schema.nodes['list_item'])(state, dispatch);
       }
 
       return wrapInList(type)(state, dispatch);

projects/ngx-editor/src/lib/commands/Mark.ts

@@ -1,6 +1,6 @@
 import type { MarkType } from 'prosemirror-model';
-import type { EditorState, Transaction } from 'prosemirror-state';
-import { type Command, toggleMark } from 'prosemirror-commands';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
+import { toggleMark } from 'prosemirror-commands';
 
 import { applyMark } from 'ngx-editor/commands';
 import { isMarkActive } from 'ngx-editor/helpers';

projects/ngx-editor/src/lib/commands/TextAlign.ts

@@ -1,6 +1,5 @@
-import type { EditorState, Transaction } from 'prosemirror-state';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
 import type { Node } from 'prosemirror-model';
-import type { Command } from 'prosemirror-commands';
 
 import { getSelectionNodes } from 'ngx-editor/helpers';
 
@@ -22,7 +21,7 @@ class TextAlign {
 
       doc.nodesBetween(from, to, (node, pos) => {
         const nodeType = node.type;
-        if ([schema.nodes.paragraph, schema.nodes.heading].includes(nodeType)) {
+        if ([schema.nodes['paragraph'], schema.nodes['heading']].includes(nodeType)) {
           applicable = true;
           tr.setNodeMarkup(pos, nodeType, { ...node.attrs, align: this.align });
         }

projects/ngx-editor/src/lib/commands/TextColor.ts

@@ -1,6 +1,5 @@
 import type { MarkType } from 'prosemirror-model';
-import type { EditorState } from 'prosemirror-state';
-import type { Command } from 'prosemirror-commands';
+import type { EditorState, Command } from 'prosemirror-state';
 
 import { getSelectionMarks, isMarkActive } from 'ngx-editor/helpers';
 import { applyMark, removeMark } from 'ngx-editor/commands';

projects/ngx-editor/src/lib/commands/types.ts

@@ -1,5 +1,4 @@
-import { EditorState, Transaction } from 'prosemirror-state';
-import { Command } from 'prosemirror-commands';
+import type { EditorState, Transaction, Command } from 'prosemirror-state';
 
 export type Dispatch = (tr: Transaction) => void | null;
 

projects/ngx-editor/src/lib/plugins/editable.ts

@@ -7,7 +7,7 @@ const editablePlugin = (editable = true): Plugin => {
       init(): boolean {
         return editable;
       },
-      apply(tr: Transaction, previousVal: boolean): string {
+      apply(tr: Transaction, previousVal: boolean): boolean {
         return tr.getMeta('UPDATE_EDITABLE') ?? previousVal;
       },
     },