From 09738456080a8925db53b5a23a71c63037e9f390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 9 Sep 2020 17:10:29 +0200
Subject: [PATCH] fix options type

---
 packages/core/src/Extension.ts | 14 +++++++++-----
 packages/core/src/Mark.ts      | 14 +++++++++-----
 packages/core/src/Node.ts      | 16 ++++++++++------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts
index cf51edca..bb1114ec 100644
--- a/packages/core/src/Extension.ts
+++ b/packages/core/src/Extension.ts
@@ -60,15 +60,15 @@ type AnyObject = {
 
 type NoInfer<T> = [T][T extends any ? 0 : never]
 
-export interface ExtensionCallback {
+export interface ExtensionCallback<Options> {
   name: string
   editor: Editor
-  options: any
+  options: Options
 }
 
-export interface ExtensionExtends<Callback> {
+export interface ExtensionExtends<Callback, Options> {
   name: string
-  options: AnyObject
+  options: Options
   commands: (params: Callback) => CommandSpec
   inputRules: (params: Callback) => any[]
   pasteRules: (params: Callback) => any[]
@@ -78,7 +78,11 @@ export interface ExtensionExtends<Callback> {
   plugins: (params: Callback) => Plugin[]
 }
 
-export default class Extension<Options = {}, Callback = ExtensionCallback, Extends extends ExtensionExtends<Callback> = ExtensionExtends<Callback>> {
+export default class Extension<
+  Options = {},
+  Callback = ExtensionCallback<Options>,
+  Extends extends ExtensionExtends<Callback, Options> = ExtensionExtends<Callback, Options>
+> {
   type = 'extension'
   config: any = {}
   configs: {
diff --git a/packages/core/src/Mark.ts b/packages/core/src/Mark.ts
index dd7cdc15..ccdc2851 100644
--- a/packages/core/src/Mark.ts
+++ b/packages/core/src/Mark.ts
@@ -2,22 +2,26 @@ import { MarkSpec, MarkType } from 'prosemirror-model'
 import Extension, { ExtensionCallback, ExtensionExtends } from './Extension'
 import { Editor } from './Editor'
 
-interface Callback {
+interface MarkCallback<Options> {
   name: string
   editor: Editor
-  options: any
+  options: Options
   type: MarkType
 }
 
-export interface MarkExtends extends ExtensionExtends<Callback> {
+export interface MarkExtends<Callback, Options> extends ExtensionExtends<Callback, Options> {
   topMark: boolean
   schema: (params: Callback) => MarkSpec
 }
 
-export default class Mark<Options = {}> extends Extension<Options, Callback, MarkExtends> {
+export default class Mark<
+  Options = {},
+  Callback = MarkCallback<Options>,
+  Extends extends MarkExtends<Callback, Options> = MarkExtends<Callback, Options>
+> extends Extension<Options, Callback, Extends> {
   type = 'mark'
 
-  public schema(value: MarkExtends['schema']) {
+  public schema(value: Extends['schema']) {
     this.storeConfig('schema', value, 'overwrite')
     return this
   }
diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts
index 8b85e363..19eceedc 100644
--- a/packages/core/src/Node.ts
+++ b/packages/core/src/Node.ts
@@ -2,27 +2,31 @@ import { NodeSpec, NodeType } from 'prosemirror-model'
 import Extension, { ExtensionCallback, ExtensionExtends } from './Extension'
 import { Editor } from './Editor'
 
-interface Callback {
+interface NodeCallback<Options> {
   name: string
   editor: Editor
-  options: any
+  options: Options
   type: NodeType
 }
 
-export interface NodeExtends extends ExtensionExtends<Callback> {
+export interface NodeExtends<Callback, Options> extends ExtensionExtends<Callback, Options> {
   topNode: boolean
   schema: (params: Callback) => NodeSpec
 }
 
-export default class Node<Options = {}> extends Extension<Options, Callback, NodeExtends> {
+export default class Node<
+  Options = {},
+  Callback = NodeCallback<Options>,
+  Extends extends NodeExtends<Callback, Options> = NodeExtends<Callback, Options>
+> extends Extension<Options, Callback, Extends> {
   type = 'node'
 
-  public topNode(value: NodeExtends['topNode'] = true) {
+  public topNode(value: Extends['topNode'] = true) {
     this.storeConfig('topNode', value, 'overwrite')
     return this
   }
 
-  public schema(value: NodeExtends['schema']) {
+  public schema(value: Extends['schema']) {
     this.storeConfig('schema', value, 'overwrite')
     return this
   }