@tiptap/core 2.0.0-beta.17 → 2.0.0-beta.170

package/src/EventEmitter.ts

@@ -1,8 +1,18 @@
-export default class EventEmitter {
+type StringKeyOf<T> = Extract<keyof T, string>
+type CallbackType<
+  T extends Record<string, any>,
+  EventName extends StringKeyOf<T>,
+> = T[EventName] extends any[] ? T[EventName] : [T[EventName]]
+type CallbackFunction<
+  T extends Record<string, any>,
+  EventName extends StringKeyOf<T>,
+> = (...props: CallbackType<T, EventName>) => any
+
+export class EventEmitter<T extends Record<string, any>> {
 
   private callbacks: { [key: string]: Function[] } = {}
 
-  public on(event: string, fn: Function): this {
+  public on<EventName extends StringKeyOf<T>>(event: EventName, fn: CallbackFunction<T, EventName>): this {
     if (!this.callbacks[event]) {
       this.callbacks[event] = []
     }
@@ -12,7 +22,7 @@ export default class EventEmitter {
     return this
   }
 
-  protected emit(event: string, ...args: any): this {
+  protected emit<EventName extends StringKeyOf<T>>(event: EventName, ...args: CallbackType<T, EventName>): this {
     const callbacks = this.callbacks[event]
 
     if (callbacks) {
@@ -22,7 +32,7 @@ export default class EventEmitter {
     return this
   }
 
-  public off(event: string, fn?: Function): this {
+  public off<EventName extends StringKeyOf<T>>(event: EventName, fn?: CallbackFunction<T, EventName>): this {
     const callbacks = this.callbacks[event]
 
     if (callbacks) {

package/src/Extension.ts

@@ -1,14 +1,24 @@
 import { Plugin, Transaction } from 'prosemirror-state'
-import { Command as ProseMirrorCommand } from 'prosemirror-commands'
-import { InputRule } from 'prosemirror-inputrules'
+import { InputRule } from './InputRule'
+import { PasteRule } from './PasteRule'
 import { Editor } from './Editor'
 import { Node } from './Node'
-import mergeDeep from './utilities/mergeDeep'
-import { GlobalAttributes, RawCommands } from './types'
+import { Mark } from './Mark'
+import { mergeDeep } from './utilities/mergeDeep'
+import { callOrReturn } from './utilities/callOrReturn'
+import { getExtensionField } from './helpers/getExtensionField'
+import {
+  AnyConfig,
+  Extensions,
+  GlobalAttributes,
+  RawCommands,
+  ParentConfig,
+  KeyboardShortcutCommand,
+} from './types'
 import { ExtensionConfig } from '.'
 
 declare module '@tiptap/core' {
-  interface ExtensionConfig<Options = any> {
+  interface ExtensionConfig<Options = any, Storage = any> {
     [key: string]: any;
 
     /**
@@ -16,114 +26,178 @@ declare module '@tiptap/core' {
      */
     name: string,
 
+    /**
+     * Priority
+     */
+    priority?: number,
+
     /**
      * Default options
      */
     defaultOptions?: Options,
 
+    /**
+     * Default Options
+     */
+    addOptions?: (this: {
+      name: string,
+      parent: Exclude<ParentConfig<ExtensionConfig<Options, Storage>>['addOptions'], undefined>,
+    }) => Options,
+
+    /**
+     * Default Storage
+     */
+    addStorage?: (this: {
+      name: string,
+      options: Options,
+      parent: Exclude<ParentConfig<ExtensionConfig<Options, Storage>>['addStorage'], undefined>,
+    }) => Storage,
+
     /**
      * Global attributes
      */
     addGlobalAttributes?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addGlobalAttributes'],
     }) => GlobalAttributes | {},
 
     /**
      * Raw
      */
     addCommands?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addCommands'],
     }) => Partial<RawCommands>,
 
     /**
      * Keyboard shortcuts
      */
     addKeyboardShortcuts?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addKeyboardShortcuts'],
     }) => {
-      [key: string]: ProseMirrorCommand,
+      [key: string]: KeyboardShortcutCommand,
     },
 
     /**
      * Input rules
      */
     addInputRules?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addInputRules'],
     }) => InputRule[],
 
     /**
      * Paste rules
      */
     addPasteRules?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
-    }) => Plugin[],
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addPasteRules'],
+    }) => PasteRule[],
 
     /**
      * ProseMirror plugins
      */
     addProseMirrorPlugins?: (this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addProseMirrorPlugins'],
     }) => Plugin[],
 
+    /**
+     * Extensions
+     */
+    addExtensions?: (this: {
+      name: string,
+      options: Options,
+      storage: Storage,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['addExtensions'],
+    }) => Extensions,
+
     /**
      * Extend Node Schema
      */
     extendNodeSchema?: ((
       this: {
+        name: string,
         options: Options,
+        storage: Storage,
+        parent: ParentConfig<ExtensionConfig<Options, Storage>>['extendNodeSchema'],
       },
       extension: Node,
-    ) => {
-      [key: string]: any,
-    }) | null,
+    ) => Record<string, any>) | null,
 
     /**
      * Extend Mark Schema
      */
     extendMarkSchema?: ((
       this: {
+        name: string,
         options: Options,
+        storage: Storage,
+        parent: ParentConfig<ExtensionConfig<Options, Storage>>['extendMarkSchema'],
       },
-      extension: Node,
-    ) => {
-      [key: string]: any,
-    }) | null,
+      extension: Mark,
+    ) => Record<string, any>) | null,
 
     /**
-     * The editor is ready.
+     * The editor is not ready yet.
      */
-    onCreate?: ((this: {
+    onBeforeCreate?: ((this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['onBeforeCreate'],
     }) => void) | null,
 
     /**
-     * The content has changed.
+     * The editor is ready.
      */
-    onUpdate?: ((this: {
+    onCreate?: ((this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['onCreate'],
     }) => void) | null,
 
     /**
-     * The selection has changed.
+     * The content has changed.
      */
-    onSelectionUpdate?: ((this: {
+    onUpdate?: ((this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['onUpdate'],
     }) => void) | null,
 
     /**
-     * The view has changed.
+     * The selection has changed.
      */
-     onViewUpdate?: ((this: {
+    onSelectionUpdate?: ((this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['onSelectionUpdate'],
     }) => void) | null,
 
     /**
@@ -131,8 +205,11 @@ declare module '@tiptap/core' {
      */
     onTransaction?: ((
       this: {
+        name: string,
         options: Options,
+        storage: Storage,
         editor: Editor,
+        parent: ParentConfig<ExtensionConfig<Options, Storage>>['onTransaction'],
       },
       props: {
         transaction: Transaction,
@@ -144,8 +221,11 @@ declare module '@tiptap/core' {
      */
     onFocus?: ((
       this: {
+        name: string,
         options: Options,
+        storage: Storage,
         editor: Editor,
+        parent: ParentConfig<ExtensionConfig<Options, Storage>>['onFocus'],
       },
       props: {
         event: FocusEvent,
@@ -157,8 +237,11 @@ declare module '@tiptap/core' {
      */
     onBlur?: ((
       this: {
+        name: string,
         options: Options,
+        storage: Storage,
         editor: Editor,
+        parent: ParentConfig<ExtensionConfig<Options, Storage>>['onBlur'],
       },
       props: {
         event: FocusEvent,
@@ -169,51 +252,123 @@ declare module '@tiptap/core' {
      * The editor is destroyed.
      */
     onDestroy?: ((this: {
+      name: string,
       options: Options,
+      storage: Storage,
       editor: Editor,
+      parent: ParentConfig<ExtensionConfig<Options, Storage>>['onDestroy'],
     }) => void) | null,
   }
 }
 
-export class Extension<Options = any> {
+export class Extension<Options = any, Storage = any> {
   type = 'extension'
 
+  name = 'extension'
+
+  parent: Extension | null = null
+
+  child: Extension | null = null
+
+  options: Options
+
+  storage: Storage
+
   config: ExtensionConfig = {
-    name: 'extension',
+    name: this.name,
     defaultOptions: {},
   }
 
-  options!: Options
-
-  constructor(config: ExtensionConfig<Options>) {
+  constructor(config: Partial<ExtensionConfig<Options, Storage>> = {}) {
     this.config = {
       ...this.config,
       ...config,
     }
 
+    this.name = this.config.name
+
+    if (config.defaultOptions) {
+      console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${this.name}".`)
+    }
+
+    // TODO: remove `addOptions` fallback
     this.options = this.config.defaultOptions
+
+    if (this.config.addOptions) {
+      this.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
+        this,
+        'addOptions',
+        {
+          name: this.name,
+        },
+      ))
+    }
+
+    this.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
+      this,
+      'addStorage',
+      {
+        name: this.name,
+        options: this.options,
+      },
+    )) || {}
   }
 
-  static create<O>(config: ExtensionConfig<O>) {
-    return new Extension<O>(config)
+  static create<O = any, S = any>(config: Partial<ExtensionConfig<O, S>> = {}) {
+    return new Extension<O, S>(config)
   }
 
   configure(options: Partial<Options> = {}) {
-    return Extension
-      .create<Options>(this.config as ExtensionConfig<Options>)
-      .#configure(options)
-  }
+    // return a new instance so we can use the same extension
+    // with different calls of `configure`
+    const extension = this.extend()
 
-  #configure = (options: Partial<Options>) => {
-    this.options = mergeDeep(this.config.defaultOptions, options) as Options
+    extension.options = mergeDeep(this.options, options) as Options
 
-    return this
+    extension.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
+      extension,
+      'addStorage',
+      {
+        name: extension.name,
+        options: extension.options,
+      },
+    ))
+
+    return extension
   }
 
-  extend<ExtendedOptions = Options>(extendedConfig: Partial<ExtensionConfig<ExtendedOptions>>) {
-    return new Extension<ExtendedOptions>({
-      ...this.config,
-      ...extendedConfig,
-    } as ExtensionConfig<ExtendedOptions>)
+  extend<ExtendedOptions = Options, ExtendedStorage = Storage>(extendedConfig: Partial<ExtensionConfig<ExtendedOptions, ExtendedStorage>> = {}) {
+    const extension = new Extension<ExtendedOptions, ExtendedStorage>(extendedConfig)
+
+    extension.parent = this
+
+    this.child = extension
+
+    extension.name = extendedConfig.name
+      ? extendedConfig.name
+      : extension.parent.name
+
+    if (extendedConfig.defaultOptions) {
+      console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`)
+    }
+
+    extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
+      extension,
+      'addOptions',
+      {
+        name: extension.name,
+      },
+    ))
+
+    extension.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
+      extension,
+      'addStorage',
+      {
+        name: extension.name,
+        options: extension.options,
+      },
+    ))
+
+    return extension
   }
 }