Skip to content

Commit

Permalink
fix(core): switch from static properties to @extensionDecorator
Browse files Browse the repository at this point in the history
  • Loading branch information
ifiokjr committed Jul 28, 2020
1 parent f3155b5 commit cc5c1c1
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 29 deletions.
5 changes: 5 additions & 0 deletions .changeset/gold-kings-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@remirror/core': patch
---

Remove static properties and use the `@extensionDecorator` instead.
3 changes: 0 additions & 3 deletions packages/@remirror/core/src/builtins/attributes-extension.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ExtensionPriority } from '@remirror/core-constants';
import { bool, object } from '@remirror/core-helpers';
import { AttributesWithClass } from '@remirror/core-types';

Expand All @@ -18,8 +17,6 @@ import { AnyCombinedUnion } from '../preset';
* @builtin
*/
export class AttributesExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Default;

get name() {
return 'attributes' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/commands-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@remirror/core-types';
import { EditorView } from '@remirror/pm/view';

import { extensionDecorator } from '../decorators';
import {
AnyExtension,
ChainedCommandRunParameter,
Expand Down Expand Up @@ -39,9 +40,8 @@ import {
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.Highest })
export class CommandsExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Highest;

get name() {
return 'commands' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/helpers-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { entries, invariant, object } from '@remirror/core-helpers';
import { AnyFunction, EmptyShape, ProsemirrorAttributes } from '@remirror/core-types';
import { isMarkActive, isNodeActive } from '@remirror/core-utils';

import { extensionDecorator } from '../decorators';
import {
AnyExtension,
HelpersFromExtensions,
Expand All @@ -27,9 +28,8 @@ import { ExtensionHelperReturn } from '../types';
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.High })
export class HelpersExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.High;

get name() {
return 'helpers' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/input-rules-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ExtensionPriority } from '@remirror/core-constants';
import { InputRule, inputRules } from '@remirror/pm/inputrules';
import { Plugin } from '@remirror/pm/state';

import { extensionDecorator } from '../decorators';
import { PlainExtension } from '../extension';

/**
Expand All @@ -15,9 +16,8 @@ import { PlainExtension } from '../extension';
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.High })
export class InputRulesExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.High;

get name() {
return 'inputRules' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/keymap-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { KeyBindings, ProsemirrorPlugin } from '@remirror/core-types';
import { mergeProsemirrorKeyBindings } from '@remirror/core-utils';
import { keymap } from '@remirror/pm/keymap';

import { extensionDecorator } from '../decorators';
import { PlainExtension } from '../extension';

/**
Expand All @@ -15,9 +16,8 @@ import { PlainExtension } from '../extension';
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.Low })
export class KeymapExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Low;

get name() {
return 'keymap' as const;
}
Expand Down
3 changes: 0 additions & 3 deletions packages/@remirror/core/src/builtins/node-views-extension.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ExtensionPriority } from '@remirror/core-constants';
import { isFunction, object } from '@remirror/core-helpers';
import { NodeViewMethod } from '@remirror/core-types';

Expand All @@ -17,8 +16,6 @@ import { AnyCombinedUnion } from '../preset';
* @builtin
*/
export class NodeViewsExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Default;

get name() {
return 'nodeView' as const;
}
Expand Down
3 changes: 0 additions & 3 deletions packages/@remirror/core/src/builtins/paste-rules-extension.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ExtensionPriority } from '@remirror/core-constants';
import { ProsemirrorPlugin } from '@remirror/core-types';

import { PlainExtension } from '../extension';
Expand All @@ -11,8 +10,6 @@ import { PlainExtension } from '../extension';
* @builtin
*/
export class PasteRulesExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Default;

get name() {
return 'pasteRules' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/plugins-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ProsemirrorPlugin } from '@remirror/core-types';
import { getPluginState } from '@remirror/core-utils';
import { EditorState, Plugin, PluginKey } from '@remirror/pm/state';

import { extensionDecorator } from '../decorators';
import { AnyExtension, AnyExtensionConstructor, PlainExtension } from '../extension';
import { AnyCombinedUnion, InferCombinedExtensions } from '../preset';
import { CreatePluginReturn, GetNameUnion } from '../types';
Expand All @@ -19,9 +20,8 @@ import { CreatePluginReturn, GetNameUnion } from '../types';
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.Highest })
export class PluginsExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Highest;

get name() {
return 'plugins' as const;
}
Expand Down
7 changes: 2 additions & 5 deletions packages/@remirror/core/src/builtins/schema-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import { isElementDomNode, isProsemirrorMark, isProsemirrorNode } from '@remirror/core-utils';
import { Schema } from '@remirror/pm/model';

import { extensionDecorator } from '../decorators';
import {
AnyExtension,
GetMarkNameUnion,
Expand All @@ -41,12 +42,8 @@ import { AnyCombinedUnion, InferCombinedExtensions } from '../preset';
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.Highest })
export class SchemaExtension extends PlainExtension {
/**
* Really this always needs to be the first extension to run.
*/
static defaultPriority: ExtensionPriority = ExtensionPriority.Highest;

get name() {
return 'schema' as const;
}
Expand Down
3 changes: 0 additions & 3 deletions packages/@remirror/core/src/builtins/suggestions-extension.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ExtensionPriority } from '@remirror/core-constants';
import { isArray } from '@remirror/core-helpers';
import { suggest, Suggestion } from '@remirror/pm/suggest';

Expand All @@ -16,8 +15,6 @@ import { PlainExtension } from '../extension';
* @builtin
*/
export class SuggestionsExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Default;

get name() {
return 'suggestions' as const;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@remirror/core/src/builtins/tags-extension.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ExtensionPriority, ExtensionTag, MarkGroup, NodeGroup } from '@remirror/core-constants';
import { isUndefined, object } from '@remirror/core-helpers';

import { extensionDecorator } from '../decorators';
import {
AnyExtension,
ExtensionTags,
Expand All @@ -17,9 +18,8 @@ import { GeneralExtensionTags, MarkExtensionTags, NodeExtensionTags } from '../t
*
* @builtin
*/
@extensionDecorator({ defaultPriority: ExtensionPriority.Highest })
export class TagsExtension extends PlainExtension {
static readonly defaultPriority = ExtensionPriority.Highest;

get name() {
return 'tags' as const;
}
Expand Down

0 comments on commit cc5c1c1

Please sign in to comment.