From b5e891cf02904cdf9203be4f4e63611ea87628fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sat, 22 Aug 2020 00:12:34 +0200 Subject: [PATCH] improve some types --- packages/core/src/Extension.ts | 3 ++- packages/core/src/ExtensionManager.ts | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts index 588ac3c1..7f157c97 100644 --- a/packages/core/src/Extension.ts +++ b/packages/core/src/Extension.ts @@ -1,3 +1,4 @@ +import { Plugin } from 'prosemirror-state' import { Editor, Command } from './Editor' export default abstract class Extension { @@ -30,7 +31,7 @@ export default abstract class Extension { return () => {} } - plugins(): any { + plugins(): Plugin[] { return [] } diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts index c7459d61..de3744b0 100644 --- a/packages/core/src/ExtensionManager.ts +++ b/packages/core/src/ExtensionManager.ts @@ -1,9 +1,10 @@ import collect from 'collect.js' +import { Plugin } from 'prosemirror-state' import { keymap } from 'prosemirror-keymap' import { inputRules } from 'prosemirror-inputrules' import { EditorView, Decoration } from 'prosemirror-view' import { Node as ProsemirrorNode } from 'prosemirror-model' -import { Editor, CommandSpec } from './Editor' +import { Editor } from './Editor' import Extension from './Extension' import Node from './Node' import Mark from './Mark' @@ -39,18 +40,18 @@ export default class ExtensionManager { get nodes(): any { return collect(this.extensions) .where('extensionType', 'node') - .mapWithKeys((extension: any) => [extension.name, extension.schema()]) + .mapWithKeys((extension: Node) => [extension.name, extension.schema()]) .all() } get marks(): any { return collect(this.extensions) .where('extensionType', 'mark') - .mapWithKeys((extension: any) => [extension.name, extension.schema()]) + .mapWithKeys((extension: Mark) => [extension.name, extension.schema()]) .all() } - get plugins(): any { + get plugins(): Plugin[] { const plugins = collect(this.extensions) .flatMap(extension => extension.plugins()) .toArray()