diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts index 68a90843..213f8c62 100644 --- a/packages/core/src/CommandManager.ts +++ b/packages/core/src/CommandManager.ts @@ -1,6 +1,6 @@ import { EditorState, Transaction } from 'prosemirror-state' import { Editor } from './Editor' -import createChainableState from './helpers/createChainableState' +import { createChainableState } from './helpers/createChainableState' import { SingleCommands, ChainedCommands, @@ -9,7 +9,7 @@ import { CommandProps, } from './types' -export default class CommandManager { +export class CommandManager { editor: Editor diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts index a9968e15..e3cf3f0f 100644 --- a/packages/core/src/Editor.ts +++ b/packages/core/src/Editor.ts @@ -6,19 +6,19 @@ import { } from 'prosemirror-state' import { EditorView } from 'prosemirror-view' import { Schema, MarkType, NodeType } from 'prosemirror-model' -import getAttributes from './helpers/getAttributes' -import isActive from './helpers/isActive' -import createDocument from './helpers/createDocument' -import getHTMLFromFragment from './helpers/getHTMLFromFragment' -import getText from './helpers/getText' -import isNodeEmpty from './helpers/isNodeEmpty' -import resolveFocusPosition from './helpers/resolveFocusPosition' -import getTextSeralizersFromSchema from './helpers/getTextSeralizersFromSchema' -import createStyleTag from './utilities/createStyleTag' -import isFunction from './utilities/isFunction' -import CommandManager from './CommandManager' -import ExtensionManager from './ExtensionManager' -import EventEmitter from './EventEmitter' +import { getAttributes } from './helpers/getAttributes' +import { isActive } from './helpers/isActive' +import { createDocument } from './helpers/createDocument' +import { getHTMLFromFragment } from './helpers/getHTMLFromFragment' +import { getText } from './helpers/getText' +import { isNodeEmpty } from './helpers/isNodeEmpty' +import { resolveFocusPosition } from './helpers/resolveFocusPosition' +import { getTextSeralizersFromSchema } from './helpers/getTextSeralizersFromSchema' +import { createStyleTag } from './utilities/createStyleTag' +import { isFunction } from './utilities/isFunction' +import { CommandManager } from './CommandManager' +import { ExtensionManager } from './ExtensionManager' +import { EventEmitter } from './EventEmitter' import { EditorOptions, CanCommands, @@ -29,7 +29,7 @@ import { EditorEvents, } from './types' import * as extensions from './extensions' -import style from './style' +import { style } from './style' export { extensions } diff --git a/packages/core/src/EventEmitter.ts b/packages/core/src/EventEmitter.ts index 56ba9886..09ff510b 100644 --- a/packages/core/src/EventEmitter.ts +++ b/packages/core/src/EventEmitter.ts @@ -8,7 +8,7 @@ type CallbackFunction< EventName extends StringKeyOf, > = (...props: CallbackType) => any -export default class EventEmitter> { +export class EventEmitter> { private callbacks: { [key: string]: Function[] } = {} diff --git a/packages/core/src/Extension.ts b/packages/core/src/Extension.ts index c03f725e..db3fb5fe 100644 --- a/packages/core/src/Extension.ts +++ b/packages/core/src/Extension.ts @@ -4,9 +4,9 @@ import { PasteRule } from './PasteRule' import { Editor } from './Editor' import { Node } from './Node' import { Mark } from './Mark' -import mergeDeep from './utilities/mergeDeep' -import callOrReturn from './utilities/callOrReturn' -import getExtensionField from './helpers/getExtensionField' +import { mergeDeep } from './utilities/mergeDeep' +import { callOrReturn } from './utilities/callOrReturn' +import { getExtensionField } from './helpers/getExtensionField' import { AnyConfig, Extensions, diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts index c3f6cd61..ae7155bf 100644 --- a/packages/core/src/ExtensionManager.ts +++ b/packages/core/src/ExtensionManager.ts @@ -6,19 +6,19 @@ import { EditorView, Decoration } from 'prosemirror-view' import { Plugin } from 'prosemirror-state' import { Editor } from './Editor' import { Extensions, RawCommands, AnyConfig } from './types' -import getExtensionField from './helpers/getExtensionField' -import getSchemaByResolvedExtensions from './helpers/getSchemaByResolvedExtensions' -import getSchemaTypeByName from './helpers/getSchemaTypeByName' -import getNodeType from './helpers/getNodeType' -import splitExtensions from './helpers/splitExtensions' -import getAttributesFromExtensions from './helpers/getAttributesFromExtensions' -import getRenderedAttributes from './helpers/getRenderedAttributes' -import isExtensionRulesEnabled from './helpers/isExtensionRulesEnabled' -import callOrReturn from './utilities/callOrReturn' -import findDuplicates from './utilities/findDuplicates' +import { getExtensionField } from './helpers/getExtensionField' +import { getSchemaByResolvedExtensions } from './helpers/getSchemaByResolvedExtensions' +import { getSchemaTypeByName } from './helpers/getSchemaTypeByName' +import { getNodeType } from './helpers/getNodeType' +import { splitExtensions } from './helpers/splitExtensions' +import { getAttributesFromExtensions } from './helpers/getAttributesFromExtensions' +import { getRenderedAttributes } from './helpers/getRenderedAttributes' +import { isExtensionRulesEnabled } from './helpers/isExtensionRulesEnabled' +import { callOrReturn } from './utilities/callOrReturn' +import { findDuplicates } from './utilities/findDuplicates' import { NodeConfig } from '.' -export default class ExtensionManager { +export class ExtensionManager { editor: Editor diff --git a/packages/core/src/InputRule.ts b/packages/core/src/InputRule.ts index 01ae4942..ad6f83e7 100644 --- a/packages/core/src/InputRule.ts +++ b/packages/core/src/InputRule.ts @@ -1,8 +1,8 @@ import { EditorState, Plugin, TextSelection } from 'prosemirror-state' import { Editor } from './Editor' -import CommandManager from './CommandManager' -import createChainableState from './helpers/createChainableState' -import isRegExp from './utilities/isRegExp' +import { CommandManager } from './CommandManager' +import { createChainableState } from './helpers/createChainableState' +import { isRegExp } from './utilities/isRegExp' import { Range, ExtendedRegExpMatchArray, diff --git a/packages/core/src/Mark.ts b/packages/core/src/Mark.ts index 9372f4fc..7e6a2710 100644 --- a/packages/core/src/Mark.ts +++ b/packages/core/src/Mark.ts @@ -7,9 +7,9 @@ import { import { Plugin, Transaction } from 'prosemirror-state' import { InputRule } from './InputRule' import { PasteRule } from './PasteRule' -import mergeDeep from './utilities/mergeDeep' -import callOrReturn from './utilities/callOrReturn' -import getExtensionField from './helpers/getExtensionField' +import { mergeDeep } from './utilities/mergeDeep' +import { callOrReturn } from './utilities/callOrReturn' +import { getExtensionField } from './helpers/getExtensionField' import { AnyConfig, Extensions, diff --git a/packages/core/src/Node.ts b/packages/core/src/Node.ts index 9eaf3499..9d29bc84 100644 --- a/packages/core/src/Node.ts +++ b/packages/core/src/Node.ts @@ -7,9 +7,9 @@ import { import { Plugin, Transaction } from 'prosemirror-state' import { InputRule } from './InputRule' import { PasteRule } from './PasteRule' -import mergeDeep from './utilities/mergeDeep' -import callOrReturn from './utilities/callOrReturn' -import getExtensionField from './helpers/getExtensionField' +import { mergeDeep } from './utilities/mergeDeep' +import { callOrReturn } from './utilities/callOrReturn' +import { getExtensionField } from './helpers/getExtensionField' import { AnyConfig, Extensions, diff --git a/packages/core/src/NodeView.ts b/packages/core/src/NodeView.ts index 35c35ccc..3fb19e98 100644 --- a/packages/core/src/NodeView.ts +++ b/packages/core/src/NodeView.ts @@ -3,7 +3,7 @@ import { NodeSelection } from 'prosemirror-state' import { Node as ProseMirrorNode } from 'prosemirror-model' import { Editor as CoreEditor } from './Editor' import { Node } from './Node' -import isiOS from './utilities/isiOS' +import { isiOS } from './utilities/isiOS' import { NodeViewRendererProps, NodeViewRendererOptions } from './types' export class NodeView< diff --git a/packages/core/src/PasteRule.ts b/packages/core/src/PasteRule.ts index 3a03ce7c..c14f0e88 100644 --- a/packages/core/src/PasteRule.ts +++ b/packages/core/src/PasteRule.ts @@ -1,9 +1,9 @@ import { EditorState, Plugin } from 'prosemirror-state' import { Editor } from './Editor' -import CommandManager from './CommandManager' -import createChainableState from './helpers/createChainableState' -import isRegExp from './utilities/isRegExp' -import isNumber from './utilities/isNumber' +import { CommandManager } from './CommandManager' +import { createChainableState } from './helpers/createChainableState' +import { isRegExp } from './utilities/isRegExp' +import { isNumber } from './utilities/isNumber' import { Range, ExtendedRegExpMatchArray, diff --git a/packages/core/src/commands/deleteNode.ts b/packages/core/src/commands/deleteNode.ts index 447134a7..42e2a6d8 100644 --- a/packages/core/src/commands/deleteNode.ts +++ b/packages/core/src/commands/deleteNode.ts @@ -1,5 +1,5 @@ import { NodeType } from 'prosemirror-model' -import getNodeType from '../helpers/getNodeType' +import { getNodeType } from '../helpers/getNodeType' import { RawCommands } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/extendMarkRange.ts b/packages/core/src/commands/extendMarkRange.ts index b44317ce..9e224c0f 100644 --- a/packages/core/src/commands/extendMarkRange.ts +++ b/packages/core/src/commands/extendMarkRange.ts @@ -1,8 +1,8 @@ import { TextSelection } from 'prosemirror-state' import { MarkType } from 'prosemirror-model' import { RawCommands } from '../types' -import getMarkType from '../helpers/getMarkType' -import getMarkRange from '../helpers/getMarkRange' +import { getMarkType } from '../helpers/getMarkType' +import { getMarkRange } from '../helpers/getMarkRange' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts index 650e84e3..32148967 100644 --- a/packages/core/src/commands/focus.ts +++ b/packages/core/src/commands/focus.ts @@ -1,7 +1,7 @@ import { RawCommands, FocusPosition } from '../types' -import isTextSelection from '../helpers/isTextSelection' -import isiOS from '../utilities/isiOS' -import resolveFocusPosition from '../helpers/resolveFocusPosition' +import { isTextSelection } from '../helpers/isTextSelection' +import { isiOS } from '../utilities/isiOS' +import { resolveFocusPosition } from '../helpers/resolveFocusPosition' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/insertContentAt.ts b/packages/core/src/commands/insertContentAt.ts index 87e7890c..ba84b50d 100644 --- a/packages/core/src/commands/insertContentAt.ts +++ b/packages/core/src/commands/insertContentAt.ts @@ -1,6 +1,6 @@ import { Fragment, Node as ProseMirrorNode, ParseOptions } from 'prosemirror-model' -import createNodeFromContent from '../helpers/createNodeFromContent' -import selectionToInsertionEnd from '../helpers/selectionToInsertionEnd' +import { createNodeFromContent } from '../helpers/createNodeFromContent' +import { selectionToInsertionEnd } from '../helpers/selectionToInsertionEnd' import { RawCommands, Content, diff --git a/packages/core/src/commands/lift.ts b/packages/core/src/commands/lift.ts index b245e9d7..66de60bc 100644 --- a/packages/core/src/commands/lift.ts +++ b/packages/core/src/commands/lift.ts @@ -1,8 +1,8 @@ import { lift as originalLift } from 'prosemirror-commands' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import isNodeActive from '../helpers/isNodeActive' -import getNodeType from '../helpers/getNodeType' +import { isNodeActive } from '../helpers/isNodeActive' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/liftListItem.ts b/packages/core/src/commands/liftListItem.ts index 97266886..6b66fb83 100644 --- a/packages/core/src/commands/liftListItem.ts +++ b/packages/core/src/commands/liftListItem.ts @@ -1,7 +1,7 @@ import { liftListItem as originalLiftListItem } from 'prosemirror-schema-list' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/resetAttributes.ts b/packages/core/src/commands/resetAttributes.ts index 020bac6b..d3f551e6 100644 --- a/packages/core/src/commands/resetAttributes.ts +++ b/packages/core/src/commands/resetAttributes.ts @@ -1,8 +1,8 @@ import { NodeType, MarkType } from 'prosemirror-model' -import getNodeType from '../helpers/getNodeType' -import getMarkType from '../helpers/getMarkType' -import getSchemaTypeNameByName from '../helpers/getSchemaTypeNameByName' -import deleteProps from '../utilities/deleteProps' +import { getNodeType } from '../helpers/getNodeType' +import { getMarkType } from '../helpers/getMarkType' +import { getSchemaTypeNameByName } from '../helpers/getSchemaTypeNameByName' +import { deleteProps } from '../utilities/deleteProps' import { RawCommands } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts index 1e7452fc..56e8c1d9 100644 --- a/packages/core/src/commands/setContent.ts +++ b/packages/core/src/commands/setContent.ts @@ -1,6 +1,6 @@ import { TextSelection } from 'prosemirror-state' import { ParseOptions } from 'prosemirror-model' -import createDocument from '../helpers/createDocument' +import { createDocument } from '../helpers/createDocument' import { RawCommands, Content } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/setMark.ts b/packages/core/src/commands/setMark.ts index 511ab822..7817e225 100644 --- a/packages/core/src/commands/setMark.ts +++ b/packages/core/src/commands/setMark.ts @@ -1,7 +1,7 @@ import { MarkType } from 'prosemirror-model' import { RawCommands } from '../types' -import getMarkType from '../helpers/getMarkType' -import getMarkAttributes from '../helpers/getMarkAttributes' +import { getMarkType } from '../helpers/getMarkType' +import { getMarkAttributes } from '../helpers/getMarkAttributes' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/setNode.ts b/packages/core/src/commands/setNode.ts index 51210f07..587a098c 100644 --- a/packages/core/src/commands/setNode.ts +++ b/packages/core/src/commands/setNode.ts @@ -1,7 +1,7 @@ import { NodeType } from 'prosemirror-model' import { setBlockType } from 'prosemirror-commands' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/setNodeSelection.ts b/packages/core/src/commands/setNodeSelection.ts index e40ef3a6..0bd2a9ae 100644 --- a/packages/core/src/commands/setNodeSelection.ts +++ b/packages/core/src/commands/setNodeSelection.ts @@ -1,5 +1,5 @@ import { Selection, NodeSelection } from 'prosemirror-state' -import minMax from '../utilities/minMax' +import { minMax } from '../utilities/minMax' import { RawCommands } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/setTextSelection.ts b/packages/core/src/commands/setTextSelection.ts index ce85ba2a..2eceb494 100644 --- a/packages/core/src/commands/setTextSelection.ts +++ b/packages/core/src/commands/setTextSelection.ts @@ -1,5 +1,5 @@ import { Selection, TextSelection } from 'prosemirror-state' -import minMax from '../utilities/minMax' +import { minMax } from '../utilities/minMax' import { RawCommands, Range } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/sinkListItem.ts b/packages/core/src/commands/sinkListItem.ts index 6b914da0..1acc21d5 100644 --- a/packages/core/src/commands/sinkListItem.ts +++ b/packages/core/src/commands/sinkListItem.ts @@ -1,7 +1,7 @@ import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/splitBlock.ts b/packages/core/src/commands/splitBlock.ts index ffca4c74..5d0af0ae 100644 --- a/packages/core/src/commands/splitBlock.ts +++ b/packages/core/src/commands/splitBlock.ts @@ -2,7 +2,7 @@ import { canSplit } from 'prosemirror-transform' import { ContentMatch } from 'prosemirror-model' import { EditorState, NodeSelection, TextSelection } from 'prosemirror-state' import { RawCommands } from '../types' -import getSplittedAttributes from '../helpers/getSplittedAttributes' +import { getSplittedAttributes } from '../helpers/getSplittedAttributes' function defaultBlockAt(match: ContentMatch) { for (let i = 0; i < match.edgeCount; i += 1) { diff --git a/packages/core/src/commands/splitListItem.ts b/packages/core/src/commands/splitListItem.ts index 27b91b23..6c9c6025 100644 --- a/packages/core/src/commands/splitListItem.ts +++ b/packages/core/src/commands/splitListItem.ts @@ -7,8 +7,8 @@ import { import { canSplit } from 'prosemirror-transform' import { TextSelection } from 'prosemirror-state' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' -import getSplittedAttributes from '../helpers/getSplittedAttributes' +import { getNodeType } from '../helpers/getNodeType' +import { getSplittedAttributes } from '../helpers/getSplittedAttributes' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/toggleList.ts b/packages/core/src/commands/toggleList.ts index b548b7b2..a912f727 100644 --- a/packages/core/src/commands/toggleList.ts +++ b/packages/core/src/commands/toggleList.ts @@ -1,8 +1,8 @@ import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' -import findParentNode from '../helpers/findParentNode' -import isList from '../helpers/isList' +import { getNodeType } from '../helpers/getNodeType' +import { findParentNode } from '../helpers/findParentNode' +import { isList } from '../helpers/isList' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts index d43a8982..eb686ef5 100644 --- a/packages/core/src/commands/toggleMark.ts +++ b/packages/core/src/commands/toggleMark.ts @@ -1,7 +1,7 @@ import { MarkType } from 'prosemirror-model' import { RawCommands } from '../types' -import getMarkType from '../helpers/getMarkType' -import isMarkActive from '../helpers/isMarkActive' +import { getMarkType } from '../helpers/getMarkType' +import { isMarkActive } from '../helpers/isMarkActive' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/toggleNode.ts b/packages/core/src/commands/toggleNode.ts index d8c0e0a1..debf6c1c 100644 --- a/packages/core/src/commands/toggleNode.ts +++ b/packages/core/src/commands/toggleNode.ts @@ -1,7 +1,7 @@ import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import isNodeActive from '../helpers/isNodeActive' -import getNodeType from '../helpers/getNodeType' +import { isNodeActive } from '../helpers/isNodeActive' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/toggleWrap.ts b/packages/core/src/commands/toggleWrap.ts index d59e2dc5..799a61e1 100644 --- a/packages/core/src/commands/toggleWrap.ts +++ b/packages/core/src/commands/toggleWrap.ts @@ -1,8 +1,8 @@ import { wrapIn, lift } from 'prosemirror-commands' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import isNodeActive from '../helpers/isNodeActive' -import getNodeType from '../helpers/getNodeType' +import { isNodeActive } from '../helpers/isNodeActive' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/unsetMark.ts b/packages/core/src/commands/unsetMark.ts index 05d922be..a26bfb09 100644 --- a/packages/core/src/commands/unsetMark.ts +++ b/packages/core/src/commands/unsetMark.ts @@ -1,7 +1,7 @@ import { MarkType } from 'prosemirror-model' import { RawCommands } from '../types' -import getMarkType from '../helpers/getMarkType' -import getMarkRange from '../helpers/getMarkRange' +import { getMarkType } from '../helpers/getMarkType' +import { getMarkRange } from '../helpers/getMarkRange' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/updateAttributes.ts b/packages/core/src/commands/updateAttributes.ts index ceed6577..d6f8ddaf 100644 --- a/packages/core/src/commands/updateAttributes.ts +++ b/packages/core/src/commands/updateAttributes.ts @@ -1,7 +1,7 @@ import { NodeType, MarkType } from 'prosemirror-model' -import getNodeType from '../helpers/getNodeType' -import getMarkType from '../helpers/getMarkType' -import getSchemaTypeNameByName from '../helpers/getSchemaTypeNameByName' +import { getNodeType } from '../helpers/getNodeType' +import { getMarkType } from '../helpers/getMarkType' +import { getSchemaTypeNameByName } from '../helpers/getSchemaTypeNameByName' import { RawCommands } from '../types' declare module '@tiptap/core' { diff --git a/packages/core/src/commands/wrapIn.ts b/packages/core/src/commands/wrapIn.ts index 0d7db9d0..f7d60fa5 100644 --- a/packages/core/src/commands/wrapIn.ts +++ b/packages/core/src/commands/wrapIn.ts @@ -1,8 +1,8 @@ import { wrapIn as originalWrapIn } from 'prosemirror-commands' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import isNodeActive from '../helpers/isNodeActive' -import getNodeType from '../helpers/getNodeType' +import { isNodeActive } from '../helpers/isNodeActive' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/commands/wrapInList.ts b/packages/core/src/commands/wrapInList.ts index 20cc4efc..61921e5d 100644 --- a/packages/core/src/commands/wrapInList.ts +++ b/packages/core/src/commands/wrapInList.ts @@ -1,7 +1,7 @@ import { wrapInList as originalWrapInList } from 'prosemirror-schema-list' import { NodeType } from 'prosemirror-model' import { RawCommands } from '../types' -import getNodeType from '../helpers/getNodeType' +import { getNodeType } from '../helpers/getNodeType' declare module '@tiptap/core' { interface Commands { diff --git a/packages/core/src/extensions/clipboardTextSerializer.ts b/packages/core/src/extensions/clipboardTextSerializer.ts index 91e98b4d..3d743c7a 100644 --- a/packages/core/src/extensions/clipboardTextSerializer.ts +++ b/packages/core/src/extensions/clipboardTextSerializer.ts @@ -1,7 +1,7 @@ import { Plugin, PluginKey } from 'prosemirror-state' import { Extension } from '../Extension' -import getTextBetween from '../helpers/getTextBetween' -import getTextSeralizersFromSchema from '../helpers/getTextSeralizersFromSchema' +import { getTextBetween } from '../helpers/getTextBetween' +import { getTextSeralizersFromSchema } from '../helpers/getTextSeralizersFromSchema' export const ClipboardTextSerializer = Extension.create({ name: 'clipboardTextSerializer', diff --git a/packages/core/src/helpers/combineTransactionSteps.ts b/packages/core/src/helpers/combineTransactionSteps.ts index a7a4b9cb..88020cfc 100644 --- a/packages/core/src/helpers/combineTransactionSteps.ts +++ b/packages/core/src/helpers/combineTransactionSteps.ts @@ -5,7 +5,7 @@ import { Transform } from 'prosemirror-transform' /** * Returns a new `Transform` based on all steps of the passed transactions. */ -export default function combineTransactionSteps(oldDoc: ProseMirrorNode, transactions: Transaction[]): Transform { +export function combineTransactionSteps(oldDoc: ProseMirrorNode, transactions: Transaction[]): Transform { const transform = new Transform(oldDoc) transactions.forEach(transaction => { diff --git a/packages/core/src/helpers/createChainableState.ts b/packages/core/src/helpers/createChainableState.ts index 7e6a668c..2fda9809 100644 --- a/packages/core/src/helpers/createChainableState.ts +++ b/packages/core/src/helpers/createChainableState.ts @@ -1,6 +1,6 @@ import { EditorState, Transaction } from 'prosemirror-state' -export default function createChainableState(config: { +export function createChainableState(config: { transaction: Transaction, state: EditorState, }): EditorState { diff --git a/packages/core/src/helpers/createDocument.ts b/packages/core/src/helpers/createDocument.ts index 573432ee..307de172 100644 --- a/packages/core/src/helpers/createDocument.ts +++ b/packages/core/src/helpers/createDocument.ts @@ -1,8 +1,8 @@ import { Schema, Node as ProseMirrorNode, ParseOptions } from 'prosemirror-model' import { Content } from '../types' -import createNodeFromContent from './createNodeFromContent' +import { createNodeFromContent } from './createNodeFromContent' -export default function createDocument( +export function createDocument( content: Content, schema: Schema, parseOptions: ParseOptions = {}, diff --git a/packages/core/src/helpers/createNodeFromContent.ts b/packages/core/src/helpers/createNodeFromContent.ts index a1f1d1e9..3a2dcf41 100644 --- a/packages/core/src/helpers/createNodeFromContent.ts +++ b/packages/core/src/helpers/createNodeFromContent.ts @@ -5,7 +5,7 @@ import { Fragment, ParseOptions, } from 'prosemirror-model' -import elementFromString from '../utilities/elementFromString' +import { elementFromString } from '../utilities/elementFromString' import { Content } from '../types' export type CreateNodeFromContentOptions = { @@ -13,7 +13,7 @@ export type CreateNodeFromContentOptions = { parseOptions?: ParseOptions, } -export default function createNodeFromContent( +export function createNodeFromContent( content: Content, schema: Schema, options?: CreateNodeFromContentOptions, diff --git a/packages/core/src/helpers/defaultBlockAt.ts b/packages/core/src/helpers/defaultBlockAt.ts index 977cb798..02b5caf7 100644 --- a/packages/core/src/helpers/defaultBlockAt.ts +++ b/packages/core/src/helpers/defaultBlockAt.ts @@ -1,6 +1,6 @@ import { ContentMatch, NodeType } from 'prosemirror-model' -export default function defaultBlockAt(match: ContentMatch): NodeType | null { +export function defaultBlockAt(match: ContentMatch): NodeType | null { for (let i = 0; i < match.edgeCount; i += 1) { const { type } = match.edge(i) diff --git a/packages/core/src/helpers/findChildren.ts b/packages/core/src/helpers/findChildren.ts index 61cc4155..eba947c9 100644 --- a/packages/core/src/helpers/findChildren.ts +++ b/packages/core/src/helpers/findChildren.ts @@ -1,7 +1,7 @@ import { Node as ProseMirrorNode } from 'prosemirror-model' import { Predicate, NodeWithPos } from '../types' -export default function findChildren(node: ProseMirrorNode, predicate: Predicate): NodeWithPos[] { +export function findChildren(node: ProseMirrorNode, predicate: Predicate): NodeWithPos[] { const nodesWithPos: NodeWithPos[] = [] node.descendants((child, pos) => { diff --git a/packages/core/src/helpers/findChildrenInRange.ts b/packages/core/src/helpers/findChildrenInRange.ts index 28dc2260..2cbe9231 100644 --- a/packages/core/src/helpers/findChildrenInRange.ts +++ b/packages/core/src/helpers/findChildrenInRange.ts @@ -4,7 +4,7 @@ import { Predicate, Range, NodeWithPos } from '../types' /** * Same as `findChildren` but searches only within a `range`. */ -export default function findChildrenInRange(node: ProseMirrorNode, range: Range, predicate: Predicate): NodeWithPos[] { +export function findChildrenInRange(node: ProseMirrorNode, range: Range, predicate: Predicate): NodeWithPos[] { const nodesWithPos: NodeWithPos[] = [] // if (range.from === range.to) { diff --git a/packages/core/src/helpers/findParentNode.ts b/packages/core/src/helpers/findParentNode.ts index 4bd622b4..cda7b920 100644 --- a/packages/core/src/helpers/findParentNode.ts +++ b/packages/core/src/helpers/findParentNode.ts @@ -1,7 +1,7 @@ import { Selection } from 'prosemirror-state' -import findParentNodeClosestToPos from './findParentNodeClosestToPos' +import { findParentNodeClosestToPos } from './findParentNodeClosestToPos' import { Predicate } from '../types' -export default function findParentNode(predicate: Predicate) { +export function findParentNode(predicate: Predicate) { return (selection: Selection) => findParentNodeClosestToPos(selection.$from, predicate) } diff --git a/packages/core/src/helpers/findParentNodeClosestToPos.ts b/packages/core/src/helpers/findParentNodeClosestToPos.ts index 720f6197..11bc23e8 100644 --- a/packages/core/src/helpers/findParentNodeClosestToPos.ts +++ b/packages/core/src/helpers/findParentNodeClosestToPos.ts @@ -1,7 +1,7 @@ import { ResolvedPos, Node as ProseMirrorNode } from 'prosemirror-model' import { Predicate } from '../types' -export default function findParentNodeClosestToPos($pos: ResolvedPos, predicate: Predicate): ({ +export function findParentNodeClosestToPos($pos: ResolvedPos, predicate: Predicate): ({ pos: number, start: number, depth: number, diff --git a/packages/core/src/helpers/generateHTML.ts b/packages/core/src/helpers/generateHTML.ts index 75df2dec..3044c3bc 100644 --- a/packages/core/src/helpers/generateHTML.ts +++ b/packages/core/src/helpers/generateHTML.ts @@ -1,9 +1,9 @@ import { Node } from 'prosemirror-model' -import getSchema from './getSchema' -import getHTMLFromFragment from './getHTMLFromFragment' +import { getSchema } from './getSchema' +import { getHTMLFromFragment } from './getHTMLFromFragment' import { Extensions, JSONContent } from '../types' -export default function generateHTML(doc: JSONContent, extensions: Extensions): string { +export function generateHTML(doc: JSONContent, extensions: Extensions): string { const schema = getSchema(extensions) const contentNode = Node.fromJSON(schema, doc) diff --git a/packages/core/src/helpers/generateJSON.ts b/packages/core/src/helpers/generateJSON.ts index ec025f49..d9f6ffbb 100644 --- a/packages/core/src/helpers/generateJSON.ts +++ b/packages/core/src/helpers/generateJSON.ts @@ -1,9 +1,9 @@ import { DOMParser } from 'prosemirror-model' -import getSchema from './getSchema' -import elementFromString from '../utilities/elementFromString' +import { getSchema } from './getSchema' +import { elementFromString } from '../utilities/elementFromString' import { Extensions } from '../types' -export default function generateJSON(html: string, extensions: Extensions): Record { +export function generateJSON(html: string, extensions: Extensions): Record { const schema = getSchema(extensions) const dom = elementFromString(html) diff --git a/packages/core/src/helpers/generateText.ts b/packages/core/src/helpers/generateText.ts index 300f745b..1ac7e791 100644 --- a/packages/core/src/helpers/generateText.ts +++ b/packages/core/src/helpers/generateText.ts @@ -1,10 +1,10 @@ import { Node } from 'prosemirror-model' -import getSchema from './getSchema' +import { getSchema } from './getSchema' import { Extensions, JSONContent, TextSerializer } from '../types' -import getTextSeralizersFromSchema from './getTextSeralizersFromSchema' -import getText from './getText' +import { getTextSeralizersFromSchema } from './getTextSeralizersFromSchema' +import { getText } from './getText' -export default function generateText( +export function generateText( doc: JSONContent, extensions: Extensions, options?: { diff --git a/packages/core/src/helpers/getAttributes.ts b/packages/core/src/helpers/getAttributes.ts index 6c06fbe4..c1dfc569 100644 --- a/packages/core/src/helpers/getAttributes.ts +++ b/packages/core/src/helpers/getAttributes.ts @@ -1,10 +1,10 @@ import { MarkType, NodeType } from 'prosemirror-model' import { EditorState } from 'prosemirror-state' -import getSchemaTypeNameByName from './getSchemaTypeNameByName' -import getNodeAttributes from './getNodeAttributes' -import getMarkAttributes from './getMarkAttributes' +import { getSchemaTypeNameByName } from './getSchemaTypeNameByName' +import { getNodeAttributes } from './getNodeAttributes' +import { getMarkAttributes } from './getMarkAttributes' -export default function getAttributes( +export function getAttributes( state: EditorState, typeOrName: string | NodeType | MarkType, ): Record { diff --git a/packages/core/src/helpers/getAttributesFromExtensions.ts b/packages/core/src/helpers/getAttributesFromExtensions.ts index d76a6a2d..e1c8157c 100644 --- a/packages/core/src/helpers/getAttributesFromExtensions.ts +++ b/packages/core/src/helpers/getAttributesFromExtensions.ts @@ -1,5 +1,5 @@ -import splitExtensions from './splitExtensions' -import getExtensionField from './getExtensionField' +import { splitExtensions } from './splitExtensions' +import { getExtensionField } from './getExtensionField' import { Extensions, GlobalAttributes, @@ -14,7 +14,7 @@ import { NodeConfig, MarkConfig } from '..' * Get a list of all extension attributes defined in `addAttribute` and `addGlobalAttribute`. * @param extensions List of extensions */ -export default function getAttributesFromExtensions(extensions: Extensions): ExtensionAttribute[] { +export function getAttributesFromExtensions(extensions: Extensions): ExtensionAttribute[] { const extensionAttributes: ExtensionAttribute[] = [] const { nodeExtensions, markExtensions } = splitExtensions(extensions) const nodeAndMarkExtensions = [...nodeExtensions, ...markExtensions] diff --git a/packages/core/src/helpers/getChangedRanges.ts b/packages/core/src/helpers/getChangedRanges.ts index b39419a2..8d133303 100644 --- a/packages/core/src/helpers/getChangedRanges.ts +++ b/packages/core/src/helpers/getChangedRanges.ts @@ -1,6 +1,6 @@ import { Transform, Step } from 'prosemirror-transform' import { Range } from '../types' -import removeDuplicates from '../utilities/removeDuplicates' +import { removeDuplicates } from '../utilities/removeDuplicates' export type ChangedRange = { oldRange: Range, @@ -32,7 +32,7 @@ function simplifyChangedRanges(changes: ChangedRange[]): ChangedRange[] { * Returns a list of changed ranges * based on the first and last state of all steps. */ -export default function getChangedRanges(transform: Transform): ChangedRange[] { +export function getChangedRanges(transform: Transform): ChangedRange[] { const { mapping, steps } = transform const changes: ChangedRange[] = [] diff --git a/packages/core/src/helpers/getDebugJSON.ts b/packages/core/src/helpers/getDebugJSON.ts index fdd25fda..c2d3d0d5 100644 --- a/packages/core/src/helpers/getDebugJSON.ts +++ b/packages/core/src/helpers/getDebugJSON.ts @@ -6,7 +6,7 @@ interface DebugJSONContent extends JSONContent { to: number, } -export default function getDebugJSON(node: ProseMirrorNode, startOffset = 0): DebugJSONContent { +export function getDebugJSON(node: ProseMirrorNode, startOffset = 0): DebugJSONContent { const isTopNode = node.type === node.type.schema.topNodeType const increment = isTopNode ? 0 : 1 const from = startOffset // + offset diff --git a/packages/core/src/helpers/getExtensionField.ts b/packages/core/src/helpers/getExtensionField.ts index 90df54ff..a9bed22b 100644 --- a/packages/core/src/helpers/getExtensionField.ts +++ b/packages/core/src/helpers/getExtensionField.ts @@ -1,6 +1,6 @@ import { AnyExtension, RemoveThis, MaybeThisParameterType } from '../types' -export default function getExtensionField( +export function getExtensionField( extension: AnyExtension, field: string, context?: Omit, 'parent'>, diff --git a/packages/core/src/helpers/getHTMLFromFragment.ts b/packages/core/src/helpers/getHTMLFromFragment.ts index afe13d14..7e396152 100644 --- a/packages/core/src/helpers/getHTMLFromFragment.ts +++ b/packages/core/src/helpers/getHTMLFromFragment.ts @@ -1,6 +1,6 @@ import { DOMSerializer, Schema, Fragment } from 'prosemirror-model' -export default function getHTMLFromFragment(fragment: Fragment, schema: Schema): string { +export function getHTMLFromFragment(fragment: Fragment, schema: Schema): string { const documentFragment = DOMSerializer .fromSchema(schema) .serializeFragment(fragment) diff --git a/packages/core/src/helpers/getMarkAttributes.ts b/packages/core/src/helpers/getMarkAttributes.ts index b9ff8bb0..b4bec67d 100644 --- a/packages/core/src/helpers/getMarkAttributes.ts +++ b/packages/core/src/helpers/getMarkAttributes.ts @@ -1,8 +1,8 @@ import { EditorState } from 'prosemirror-state' import { Mark, MarkType } from 'prosemirror-model' -import getMarkType from './getMarkType' +import { getMarkType } from './getMarkType' -export default function getMarkAttributes(state: EditorState, typeOrName: string | MarkType): Record { +export function getMarkAttributes(state: EditorState, typeOrName: string | MarkType): Record { const type = getMarkType(typeOrName, state.schema) const { from, to, empty } = state.selection const marks: Mark[] = [] diff --git a/packages/core/src/helpers/getMarkRange.ts b/packages/core/src/helpers/getMarkRange.ts index 63c44c9e..6fbcc008 100644 --- a/packages/core/src/helpers/getMarkRange.ts +++ b/packages/core/src/helpers/getMarkRange.ts @@ -1,5 +1,5 @@ import { Mark as ProseMirrorMark, MarkType, ResolvedPos } from 'prosemirror-model' -import objectIncludes from '../utilities/objectIncludes' +import { objectIncludes } from '../utilities/objectIncludes' import { Range } from '../types' function findMarkInSet( @@ -20,7 +20,7 @@ function isMarkInSet( return !!findMarkInSet(marks, type, attributes) } -export default function getMarkRange( +export function getMarkRange( $pos: ResolvedPos, type: MarkType, attributes: Record = {}, diff --git a/packages/core/src/helpers/getMarkType.ts b/packages/core/src/helpers/getMarkType.ts index 48bf08a2..2f79223b 100644 --- a/packages/core/src/helpers/getMarkType.ts +++ b/packages/core/src/helpers/getMarkType.ts @@ -1,6 +1,6 @@ import { MarkType, Schema } from 'prosemirror-model' -export default function getMarkType(nameOrType: string | MarkType, schema: Schema): MarkType { +export function getMarkType(nameOrType: string | MarkType, schema: Schema): MarkType { if (typeof nameOrType === 'string') { if (!schema.marks[nameOrType]) { throw Error(`There is no mark type named '${nameOrType}'. Maybe you forgot to add the extension?`) diff --git a/packages/core/src/helpers/getMarksBetween.ts b/packages/core/src/helpers/getMarksBetween.ts index 6e62bddd..4c0b0e4d 100644 --- a/packages/core/src/helpers/getMarksBetween.ts +++ b/packages/core/src/helpers/getMarksBetween.ts @@ -1,8 +1,8 @@ import { Node as ProseMirrorNode } from 'prosemirror-model' import { MarkRange } from '../types' -import getMarkRange from './getMarkRange' +import { getMarkRange } from './getMarkRange' -export default function getMarksBetween(from: number, to: number, doc: ProseMirrorNode): MarkRange[] { +export function getMarksBetween(from: number, to: number, doc: ProseMirrorNode): MarkRange[] { const marks: MarkRange[] = [] // get all inclusive marks on empty selection diff --git a/packages/core/src/helpers/getNodeAttributes.ts b/packages/core/src/helpers/getNodeAttributes.ts index f808daef..35215576 100644 --- a/packages/core/src/helpers/getNodeAttributes.ts +++ b/packages/core/src/helpers/getNodeAttributes.ts @@ -1,8 +1,8 @@ import { EditorState } from 'prosemirror-state' import { Node, NodeType } from 'prosemirror-model' -import getNodeType from './getNodeType' +import { getNodeType } from './getNodeType' -export default function getNodeAttributes(state: EditorState, typeOrName: string | NodeType): Record { +export function getNodeAttributes(state: EditorState, typeOrName: string | NodeType): Record { const type = getNodeType(typeOrName, state.schema) const { from, to } = state.selection const nodes: Node[] = [] diff --git a/packages/core/src/helpers/getNodeType.ts b/packages/core/src/helpers/getNodeType.ts index 27430105..00955340 100644 --- a/packages/core/src/helpers/getNodeType.ts +++ b/packages/core/src/helpers/getNodeType.ts @@ -1,6 +1,6 @@ import { NodeType, Schema } from 'prosemirror-model' -export default function getNodeType(nameOrType: string | NodeType, schema: Schema): NodeType { +export function getNodeType(nameOrType: string | NodeType, schema: Schema): NodeType { if (typeof nameOrType === 'string') { if (!schema.nodes[nameOrType]) { throw Error(`There is no node type named '${nameOrType}'. Maybe you forgot to add the extension?`) diff --git a/packages/core/src/helpers/getRenderedAttributes.ts b/packages/core/src/helpers/getRenderedAttributes.ts index 796b15b5..722c3140 100644 --- a/packages/core/src/helpers/getRenderedAttributes.ts +++ b/packages/core/src/helpers/getRenderedAttributes.ts @@ -1,8 +1,8 @@ import { Node, Mark } from 'prosemirror-model' import { ExtensionAttribute } from '../types' -import mergeAttributes from '../utilities/mergeAttributes' +import { mergeAttributes } from '../utilities/mergeAttributes' -export default function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): Record { +export function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): Record { return extensionAttributes .filter(item => item.attribute.rendered) .map(item => { diff --git a/packages/core/src/helpers/getSchema.ts b/packages/core/src/helpers/getSchema.ts index 34095798..ca639ce9 100644 --- a/packages/core/src/helpers/getSchema.ts +++ b/packages/core/src/helpers/getSchema.ts @@ -1,9 +1,9 @@ import { Schema } from 'prosemirror-model' -import getSchemaByResolvedExtensions from './getSchemaByResolvedExtensions' -import ExtensionManager from '../ExtensionManager' +import { getSchemaByResolvedExtensions } from './getSchemaByResolvedExtensions' +import { ExtensionManager } from '../ExtensionManager' import { Extensions } from '../types' -export default function getSchema(extensions: Extensions): Schema { +export function getSchema(extensions: Extensions): Schema { const resolvedExtensions = ExtensionManager.resolve(extensions) return getSchemaByResolvedExtensions(resolvedExtensions) diff --git a/packages/core/src/helpers/getSchemaByResolvedExtensions.ts b/packages/core/src/helpers/getSchemaByResolvedExtensions.ts index bf899c01..973eba36 100644 --- a/packages/core/src/helpers/getSchemaByResolvedExtensions.ts +++ b/packages/core/src/helpers/getSchemaByResolvedExtensions.ts @@ -1,13 +1,13 @@ import { NodeSpec, MarkSpec, Schema } from 'prosemirror-model' import { AnyConfig, Extensions } from '../types' import { NodeConfig, MarkConfig } from '..' -import splitExtensions from './splitExtensions' -import getAttributesFromExtensions from './getAttributesFromExtensions' -import getRenderedAttributes from './getRenderedAttributes' -import isEmptyObject from '../utilities/isEmptyObject' -import injectExtensionAttributesToParseRule from './injectExtensionAttributesToParseRule' -import callOrReturn from '../utilities/callOrReturn' -import getExtensionField from './getExtensionField' +import { splitExtensions } from './splitExtensions' +import { getAttributesFromExtensions } from './getAttributesFromExtensions' +import { getRenderedAttributes } from './getRenderedAttributes' +import { isEmptyObject } from '../utilities/isEmptyObject' +import { injectExtensionAttributesToParseRule } from './injectExtensionAttributesToParseRule' +import { callOrReturn } from '../utilities/callOrReturn' +import { getExtensionField } from './getExtensionField' function cleanUpSchemaItem(data: T) { return Object.fromEntries(Object.entries(data).filter(([key, value]) => { @@ -19,7 +19,7 @@ function cleanUpSchemaItem(data: T) { })) as T } -export default function getSchemaByResolvedExtensions(extensions: Extensions): Schema { +export function getSchemaByResolvedExtensions(extensions: Extensions): Schema { const allAttributes = getAttributesFromExtensions(extensions) const { nodeExtensions, markExtensions } = splitExtensions(extensions) const topNode = nodeExtensions.find(extension => getExtensionField(extension, 'topNode'))?.name diff --git a/packages/core/src/helpers/getSchemaTypeByName.ts b/packages/core/src/helpers/getSchemaTypeByName.ts index 63975e84..2e515426 100644 --- a/packages/core/src/helpers/getSchemaTypeByName.ts +++ b/packages/core/src/helpers/getSchemaTypeByName.ts @@ -1,5 +1,5 @@ import { MarkType, NodeType, Schema } from 'prosemirror-model' -export default function getSchemaTypeByName(name: string, schema: Schema): NodeType | MarkType | null { +export function getSchemaTypeByName(name: string, schema: Schema): NodeType | MarkType | null { return schema.nodes[name] || schema.marks[name] || null } diff --git a/packages/core/src/helpers/getSchemaTypeNameByName.ts b/packages/core/src/helpers/getSchemaTypeNameByName.ts index ec09cdc1..0ad2e4b0 100644 --- a/packages/core/src/helpers/getSchemaTypeNameByName.ts +++ b/packages/core/src/helpers/getSchemaTypeNameByName.ts @@ -1,6 +1,6 @@ import { Schema } from 'prosemirror-model' -export default function getSchemaTypeNameByName(name: string, schema: Schema): 'node' | 'mark' | null { +export function getSchemaTypeNameByName(name: string, schema: Schema): 'node' | 'mark' | null { if (schema.nodes[name]) { return 'node' } diff --git a/packages/core/src/helpers/getSplittedAttributes.ts b/packages/core/src/helpers/getSplittedAttributes.ts index bb9d670e..2a0977b4 100644 --- a/packages/core/src/helpers/getSplittedAttributes.ts +++ b/packages/core/src/helpers/getSplittedAttributes.ts @@ -1,6 +1,6 @@ import { ExtensionAttribute } from '../types' -export default function getSplittedAttributes( +export function getSplittedAttributes( extensionAttributes: ExtensionAttribute[], typeName: string, attributes: Record, diff --git a/packages/core/src/helpers/getText.ts b/packages/core/src/helpers/getText.ts index 94b2489b..d774a552 100644 --- a/packages/core/src/helpers/getText.ts +++ b/packages/core/src/helpers/getText.ts @@ -1,8 +1,8 @@ import { TextSerializer } from '../types' import { Node as ProseMirrorNode } from 'prosemirror-model' -import getTextBetween from './getTextBetween' +import { getTextBetween } from './getTextBetween' -export default function getText( +export function getText( node: ProseMirrorNode, options?: { blockSeparator?: string, diff --git a/packages/core/src/helpers/getTextBetween.ts b/packages/core/src/helpers/getTextBetween.ts index cd1233b1..f16ad2ff 100644 --- a/packages/core/src/helpers/getTextBetween.ts +++ b/packages/core/src/helpers/getTextBetween.ts @@ -1,7 +1,7 @@ import { Range, TextSerializer } from '../types' import { Node as ProseMirrorNode } from 'prosemirror-model' -export default function getTextBetween( +export function getTextBetween( startNode: ProseMirrorNode, range: Range, options?: { diff --git a/packages/core/src/helpers/getTextSeralizersFromSchema.ts b/packages/core/src/helpers/getTextSeralizersFromSchema.ts index fc9b16ef..2ced2520 100644 --- a/packages/core/src/helpers/getTextSeralizersFromSchema.ts +++ b/packages/core/src/helpers/getTextSeralizersFromSchema.ts @@ -1,7 +1,7 @@ import { Schema } from 'prosemirror-model' import { TextSerializer } from '../types' -export default function getTextSeralizersFromSchema(schema: Schema): Record { +export function getTextSeralizersFromSchema(schema: Schema): Record { return Object.fromEntries(Object .entries(schema.nodes) .filter(([, node]) => node.spec.toText) diff --git a/packages/core/src/helpers/injectExtensionAttributesToParseRule.ts b/packages/core/src/helpers/injectExtensionAttributesToParseRule.ts index 620f121d..9452647d 100644 --- a/packages/core/src/helpers/injectExtensionAttributesToParseRule.ts +++ b/packages/core/src/helpers/injectExtensionAttributesToParseRule.ts @@ -1,7 +1,7 @@ import { ParseRule } from 'prosemirror-model' import { ExtensionAttribute } from '../types' -import fromString from '../utilities/fromString' -import isObject from '../utilities/isObject' +import { fromString } from '../utilities/fromString' +import { isObject } from '../utilities/isObject' /** * This function merges extension attributes into parserule attributes (`attrs` or `getAttrs`). @@ -9,7 +9,7 @@ import isObject from '../utilities/isObject' * @param parseRule ProseMirror ParseRule * @param extensionAttributes List of attributes to inject */ -export default function injectExtensionAttributesToParseRule(parseRule: ParseRule, extensionAttributes: ExtensionAttribute[]): ParseRule { +export function injectExtensionAttributesToParseRule(parseRule: ParseRule, extensionAttributes: ExtensionAttribute[]): ParseRule { if (parseRule.style) { return parseRule } diff --git a/packages/core/src/helpers/isActive.ts b/packages/core/src/helpers/isActive.ts index e5eb011f..ea898cf4 100644 --- a/packages/core/src/helpers/isActive.ts +++ b/packages/core/src/helpers/isActive.ts @@ -1,9 +1,9 @@ import { EditorState } from 'prosemirror-state' -import isNodeActive from './isNodeActive' -import isMarkActive from './isMarkActive' -import getSchemaTypeNameByName from './getSchemaTypeNameByName' +import { isNodeActive } from './isNodeActive' +import { isMarkActive } from './isMarkActive' +import { getSchemaTypeNameByName } from './getSchemaTypeNameByName' -export default function isActive(state: EditorState, name: string | null, attributes: Record = {}): boolean { +export function isActive(state: EditorState, name: string | null, attributes: Record = {}): boolean { if (!name) { return isNodeActive(state, null, attributes) || isMarkActive(state, null, attributes) } diff --git a/packages/core/src/helpers/isExtensionRulesEnabled.ts b/packages/core/src/helpers/isExtensionRulesEnabled.ts index 8aaa27f5..56d54c7f 100644 --- a/packages/core/src/helpers/isExtensionRulesEnabled.ts +++ b/packages/core/src/helpers/isExtensionRulesEnabled.ts @@ -1,6 +1,6 @@ import { AnyExtension, EnableRules } from '../types' -export default function isExtensionRulesEnabled(extension: AnyExtension, enabled: EnableRules): boolean { +export function isExtensionRulesEnabled(extension: AnyExtension, enabled: EnableRules): boolean { if (Array.isArray(enabled)) { return enabled.some(enabledExtension => { const name = typeof enabledExtension === 'string' diff --git a/packages/core/src/helpers/isList.ts b/packages/core/src/helpers/isList.ts index 1705458d..f1c1335f 100644 --- a/packages/core/src/helpers/isList.ts +++ b/packages/core/src/helpers/isList.ts @@ -1,10 +1,10 @@ import { Extensions } from '../types' import { NodeConfig } from '..' -import splitExtensions from './splitExtensions' -import callOrReturn from '../utilities/callOrReturn' -import getExtensionField from '../helpers/getExtensionField' +import { splitExtensions } from './splitExtensions' +import { callOrReturn } from '../utilities/callOrReturn' +import { getExtensionField } from '../helpers/getExtensionField' -export default function isList(name: string, extensions: Extensions): boolean { +export function isList(name: string, extensions: Extensions): boolean { const { nodeExtensions } = splitExtensions(extensions) const extension = nodeExtensions.find(item => item.name === name) diff --git a/packages/core/src/helpers/isMarkActive.ts b/packages/core/src/helpers/isMarkActive.ts index 20e1902a..d5a2f349 100644 --- a/packages/core/src/helpers/isMarkActive.ts +++ b/packages/core/src/helpers/isMarkActive.ts @@ -1,10 +1,10 @@ import { EditorState } from 'prosemirror-state' import { MarkType } from 'prosemirror-model' -import objectIncludes from '../utilities/objectIncludes' -import getMarkType from './getMarkType' +import { objectIncludes } from '../utilities/objectIncludes' +import { getMarkType } from './getMarkType' import { MarkRange } from '../types' -export default function isMarkActive( +export function isMarkActive( state: EditorState, typeOrName: MarkType | string | null, attributes: Record = {}, diff --git a/packages/core/src/helpers/isNodeActive.ts b/packages/core/src/helpers/isNodeActive.ts index a5e3882f..b6c47827 100644 --- a/packages/core/src/helpers/isNodeActive.ts +++ b/packages/core/src/helpers/isNodeActive.ts @@ -1,10 +1,10 @@ import { EditorState } from 'prosemirror-state' import { NodeType } from 'prosemirror-model' -import objectIncludes from '../utilities/objectIncludes' -import getNodeType from './getNodeType' +import { objectIncludes } from '../utilities/objectIncludes' +import { getNodeType } from './getNodeType' import { NodeRange } from '../types' -export default function isNodeActive( +export function isNodeActive( state: EditorState, typeOrName: NodeType | string | null, attributes: Record = {}, diff --git a/packages/core/src/helpers/isNodeEmpty.ts b/packages/core/src/helpers/isNodeEmpty.ts index 86f3c4a1..6cbaa4cd 100644 --- a/packages/core/src/helpers/isNodeEmpty.ts +++ b/packages/core/src/helpers/isNodeEmpty.ts @@ -1,6 +1,6 @@ import { Node as ProseMirrorNode } from 'prosemirror-model' -export default function isNodeEmpty(node: ProseMirrorNode): boolean { +export function isNodeEmpty(node: ProseMirrorNode): boolean { const defaultContent = node.type.createAndFill()?.toJSON() const content = node.toJSON() diff --git a/packages/core/src/helpers/isNodeSelection.ts b/packages/core/src/helpers/isNodeSelection.ts index c1dc13d3..43a47a9a 100644 --- a/packages/core/src/helpers/isNodeSelection.ts +++ b/packages/core/src/helpers/isNodeSelection.ts @@ -1,6 +1,6 @@ import { NodeSelection } from 'prosemirror-state' -import isObject from '../utilities/isObject' +import { isObject } from '../utilities/isObject' -export default function isNodeSelection(value: unknown): value is NodeSelection { +export function isNodeSelection(value: unknown): value is NodeSelection { return isObject(value) && value instanceof NodeSelection } diff --git a/packages/core/src/helpers/isTextSelection.ts b/packages/core/src/helpers/isTextSelection.ts index b49a3d31..98542575 100644 --- a/packages/core/src/helpers/isTextSelection.ts +++ b/packages/core/src/helpers/isTextSelection.ts @@ -1,6 +1,6 @@ import { TextSelection } from 'prosemirror-state' -import isObject from '../utilities/isObject' +import { isObject } from '../utilities/isObject' -export default function isTextSelection(value: unknown): value is TextSelection { +export function isTextSelection(value: unknown): value is TextSelection { return isObject(value) && value instanceof TextSelection } diff --git a/packages/core/src/helpers/posToDOMRect.ts b/packages/core/src/helpers/posToDOMRect.ts index 98d7399f..3beb336f 100644 --- a/packages/core/src/helpers/posToDOMRect.ts +++ b/packages/core/src/helpers/posToDOMRect.ts @@ -1,7 +1,7 @@ import { EditorView } from 'prosemirror-view' -import minMax from '../utilities/minMax' +import { minMax } from '../utilities/minMax' -export default function posToDOMRect(view: EditorView, from: number, to: number): DOMRect { +export function posToDOMRect(view: EditorView, from: number, to: number): DOMRect { const minPos = 0 const maxPos = view.state.doc.content.size const resolvedFrom = minMax(from, minPos, maxPos) diff --git a/packages/core/src/helpers/resolveFocusPosition.ts b/packages/core/src/helpers/resolveFocusPosition.ts index 4bbc8eb8..a5e6ac49 100644 --- a/packages/core/src/helpers/resolveFocusPosition.ts +++ b/packages/core/src/helpers/resolveFocusPosition.ts @@ -1,9 +1,9 @@ import { Node as ProseMirrorNode } from 'prosemirror-model' import { Selection, TextSelection } from 'prosemirror-state' import { FocusPosition } from '../types' -import minMax from '../utilities/minMax' +import { minMax } from '../utilities/minMax' -export default function resolveFocusPosition( +export function resolveFocusPosition( doc: ProseMirrorNode, position: FocusPosition = null, ): Selection | null { diff --git a/packages/core/src/helpers/selectionToInsertionEnd.ts b/packages/core/src/helpers/selectionToInsertionEnd.ts index faa46365..41d051a3 100644 --- a/packages/core/src/helpers/selectionToInsertionEnd.ts +++ b/packages/core/src/helpers/selectionToInsertionEnd.ts @@ -2,7 +2,7 @@ import { Selection, Transaction } from 'prosemirror-state' import { ReplaceStep, ReplaceAroundStep } from 'prosemirror-transform' // source: https://github.com/ProseMirror/prosemirror-state/blob/master/src/selection.js#L466 -export default function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number) { +export function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number) { const last = tr.steps.length - 1 if (last < startLen) { diff --git a/packages/core/src/helpers/splitExtensions.ts b/packages/core/src/helpers/splitExtensions.ts index 91d4268f..34f02fa4 100644 --- a/packages/core/src/helpers/splitExtensions.ts +++ b/packages/core/src/helpers/splitExtensions.ts @@ -3,7 +3,7 @@ import { Extension } from '../Extension' import { Node } from '../Node' import { Mark } from '../Mark' -export default function splitExtensions(extensions: Extensions) { +export function splitExtensions(extensions: Extensions) { const baseExtensions = extensions.filter(extension => extension.type === 'extension') as Extension[] const nodeExtensions = extensions.filter(extension => extension.type === 'node') as Node[] const markExtensions = extensions.filter(extension => extension.type === 'mark') as Mark[] diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 65c7b252..a9028dfe 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -12,48 +12,48 @@ export * from './PasteRule' export * from './CommandManager' export * from './types' -export { default as nodeInputRule } from './inputRules/nodeInputRule' -export { default as markInputRule } from './inputRules/markInputRule' -export { default as textblockTypeInputRule } from './inputRules/textblockTypeInputRule' -export { default as textInputRule } from './inputRules/textInputRule' -export { default as wrappingInputRule } from './inputRules/wrappingInputRule' -export { default as markPasteRule } from './pasteRules/markPasteRule' -export { default as textPasteRule } from './pasteRules/textPasteRule' +export * from './inputRules/nodeInputRule' +export * from './inputRules/markInputRule' +export * from './inputRules/textblockTypeInputRule' +export * from './inputRules/textInputRule' +export * from './inputRules/wrappingInputRule' +export * from './pasteRules/markPasteRule' +export * from './pasteRules/textPasteRule' -export { default as callOrReturn } from './utilities/callOrReturn' -export { default as mergeAttributes } from './utilities/mergeAttributes' +export * from './utilities/callOrReturn' +export * from './utilities/mergeAttributes' -export { default as combineTransactionSteps } from './helpers/combineTransactionSteps' -export { default as defaultBlockAt } from './helpers/defaultBlockAt' -export { default as getExtensionField } from './helpers/getExtensionField' -export { default as findChildren } from './helpers/findChildren' -export { default as findChildrenInRange } from './helpers/findChildrenInRange' -export { default as findParentNode } from './helpers/findParentNode' -export { default as findParentNodeClosestToPos } from './helpers/findParentNodeClosestToPos' -export { default as generateHTML } from './helpers/generateHTML' -export { default as generateJSON } from './helpers/generateJSON' -export { default as generateText } from './helpers/generateText' -export { default as getChangedRanges } from './helpers/getChangedRanges' -export { default as getSchema } from './helpers/getSchema' -export { default as getHTMLFromFragment } from './helpers/getHTMLFromFragment' -export { default as getDebugJSON } from './helpers/getDebugJSON' -export { default as getAttributes } from './helpers/getAttributes' -export { default as getMarkAttributes } from './helpers/getMarkAttributes' -export { default as getMarkRange } from './helpers/getMarkRange' -export { default as getMarkType } from './helpers/getMarkType' -export { default as getMarksBetween } from './helpers/getMarksBetween' -export { default as getNodeAttributes } from './helpers/getNodeAttributes' -export { default as getNodeType } from './helpers/getNodeType' -export { default as getText } from './helpers/getText' -export { default as getTextBetween } from './helpers/getTextBetween' -export { default as isActive } from './helpers/isActive' -export { default as isList } from './helpers/isList' -export { default as isMarkActive } from './helpers/isMarkActive' -export { default as isNodeActive } from './helpers/isNodeActive' -export { default as isNodeEmpty } from './helpers/isNodeEmpty' -export { default as isNodeSelection } from './helpers/isNodeSelection' -export { default as isTextSelection } from './helpers/isTextSelection' -export { default as posToDOMRect } from './helpers/posToDOMRect' +export * from './helpers/combineTransactionSteps' +export * from './helpers/defaultBlockAt' +export * from './helpers/getExtensionField' +export * from './helpers/findChildren' +export * from './helpers/findChildrenInRange' +export * from './helpers/findParentNode' +export * from './helpers/findParentNodeClosestToPos' +export * from './helpers/generateHTML' +export * from './helpers/generateJSON' +export * from './helpers/generateText' +export * from './helpers/getChangedRanges' +export * from './helpers/getSchema' +export * from './helpers/getHTMLFromFragment' +export * from './helpers/getDebugJSON' +export * from './helpers/getAttributes' +export * from './helpers/getMarkAttributes' +export * from './helpers/getMarkRange' +export * from './helpers/getMarkType' +export * from './helpers/getMarksBetween' +export * from './helpers/getNodeAttributes' +export * from './helpers/getNodeType' +export * from './helpers/getText' +export * from './helpers/getTextBetween' +export * from './helpers/isActive' +export * from './helpers/isList' +export * from './helpers/isMarkActive' +export * from './helpers/isNodeActive' +export * from './helpers/isNodeEmpty' +export * from './helpers/isNodeSelection' +export * from './helpers/isTextSelection' +export * from './helpers/posToDOMRect' // eslint-disable-next-line export interface Commands {} diff --git a/packages/core/src/inputRules/markInputRule.ts b/packages/core/src/inputRules/markInputRule.ts index 42c8d77b..91663e34 100644 --- a/packages/core/src/inputRules/markInputRule.ts +++ b/packages/core/src/inputRules/markInputRule.ts @@ -1,14 +1,14 @@ import { InputRule, InputRuleFinder } from '../InputRule' import { MarkType } from 'prosemirror-model' -import getMarksBetween from '../helpers/getMarksBetween' -import callOrReturn from '../utilities/callOrReturn' +import { getMarksBetween } from '../helpers/getMarksBetween' +import { callOrReturn } from '../utilities/callOrReturn' import { ExtendedRegExpMatchArray } from '../types' /** * Build an input rule that adds a mark when the * matched text is typed into it. */ -export default function markInputRule(config: { +export function markInputRule(config: { find: InputRuleFinder, type: MarkType, getAttributes?: diff --git a/packages/core/src/inputRules/nodeInputRule.ts b/packages/core/src/inputRules/nodeInputRule.ts index a9e1bfcb..0dc14da4 100644 --- a/packages/core/src/inputRules/nodeInputRule.ts +++ b/packages/core/src/inputRules/nodeInputRule.ts @@ -1,13 +1,13 @@ import { NodeType } from 'prosemirror-model' import { InputRule, InputRuleFinder } from '../InputRule' import { ExtendedRegExpMatchArray } from '../types' -import callOrReturn from '../utilities/callOrReturn' +import { callOrReturn } from '../utilities/callOrReturn' /** * Build an input rule that adds a node when the * matched text is typed into it. */ -export default function nodeInputRule(config: { +export function nodeInputRule(config: { find: InputRuleFinder, type: NodeType, getAttributes?: diff --git a/packages/core/src/inputRules/textInputRule.ts b/packages/core/src/inputRules/textInputRule.ts index 6e21bea0..75414b03 100644 --- a/packages/core/src/inputRules/textInputRule.ts +++ b/packages/core/src/inputRules/textInputRule.ts @@ -4,7 +4,7 @@ import { InputRule, InputRuleFinder } from '../InputRule' * Build an input rule that replaces text when the * matched text is typed into it. */ -export default function textInputRule(config: { +export function textInputRule(config: { find: InputRuleFinder, replace: string, }) { diff --git a/packages/core/src/inputRules/textblockTypeInputRule.ts b/packages/core/src/inputRules/textblockTypeInputRule.ts index 9f08f189..f879082d 100644 --- a/packages/core/src/inputRules/textblockTypeInputRule.ts +++ b/packages/core/src/inputRules/textblockTypeInputRule.ts @@ -1,7 +1,7 @@ import { InputRule, InputRuleFinder } from '../InputRule' import { NodeType } from 'prosemirror-model' import { ExtendedRegExpMatchArray } from '../types' -import callOrReturn from '../utilities/callOrReturn' +import { callOrReturn } from '../utilities/callOrReturn' /** * Build an input rule that changes the type of a textblock when the @@ -9,7 +9,7 @@ import callOrReturn from '../utilities/callOrReturn' * probably want the regexp to start with `^`, so that the pattern can * only occur at the start of a textblock. */ -export default function textblockTypeInputRule(config: { +export function textblockTypeInputRule(config: { find: InputRuleFinder, type: NodeType, getAttributes?: diff --git a/packages/core/src/inputRules/wrappingInputRule.ts b/packages/core/src/inputRules/wrappingInputRule.ts index 79560f61..ba540e6a 100644 --- a/packages/core/src/inputRules/wrappingInputRule.ts +++ b/packages/core/src/inputRules/wrappingInputRule.ts @@ -2,7 +2,7 @@ import { InputRule, InputRuleFinder } from '../InputRule' import { NodeType, Node as ProseMirrorNode } from 'prosemirror-model' import { findWrapping, canJoin } from 'prosemirror-transform' import { ExtendedRegExpMatchArray } from '../types' -import callOrReturn from '../utilities/callOrReturn' +import { callOrReturn } from '../utilities/callOrReturn' /** * Build an input rule for automatically wrapping a textblock when a @@ -18,7 +18,7 @@ import callOrReturn from '../utilities/callOrReturn' * expression match and the node before the wrapped node, and can * return a boolean to indicate whether a join should happen. */ -export default function wrappingInputRule(config: { +export function wrappingInputRule(config: { find: InputRuleFinder, type: NodeType, getAttributes?: diff --git a/packages/core/src/pasteRules/markPasteRule.ts b/packages/core/src/pasteRules/markPasteRule.ts index b0dd30cf..6c0c9b1f 100644 --- a/packages/core/src/pasteRules/markPasteRule.ts +++ b/packages/core/src/pasteRules/markPasteRule.ts @@ -1,14 +1,14 @@ import { PasteRule, PasteRuleFinder } from '../PasteRule' import { MarkType } from 'prosemirror-model' -import getMarksBetween from '../helpers/getMarksBetween' -import callOrReturn from '../utilities/callOrReturn' +import { getMarksBetween } from '../helpers/getMarksBetween' +import { callOrReturn } from '../utilities/callOrReturn' import { ExtendedRegExpMatchArray } from '../types' /** * Build an paste rule that adds a mark when the * matched text is pasted into it. */ -export default function markPasteRule(config: { +export function markPasteRule(config: { find: PasteRuleFinder, type: MarkType, getAttributes?: diff --git a/packages/core/src/pasteRules/textPasteRule.ts b/packages/core/src/pasteRules/textPasteRule.ts index 199baf48..6e0d94c3 100644 --- a/packages/core/src/pasteRules/textPasteRule.ts +++ b/packages/core/src/pasteRules/textPasteRule.ts @@ -4,7 +4,7 @@ import { PasteRule, PasteRuleFinder } from '../PasteRule' * Build an paste rule that replaces text when the * matched text is pasted into it. */ -export default function textPasteRule(config: { +export function textPasteRule(config: { find: PasteRuleFinder, replace: string, }) { diff --git a/packages/core/src/style.ts b/packages/core/src/style.ts index e9c79919..8e3052b1 100644 --- a/packages/core/src/style.ts +++ b/packages/core/src/style.ts @@ -1,4 +1,4 @@ -const style = `.ProseMirror { +export const style = `.ProseMirror { position: relative; } @@ -73,5 +73,3 @@ img.ProseMirror-separator { .tippy-box[data-animation=fade][data-state=hidden] { opacity: 0 }` - -export default style diff --git a/packages/core/src/utilities/callOrReturn.ts b/packages/core/src/utilities/callOrReturn.ts index b4794927..fe312c05 100644 --- a/packages/core/src/utilities/callOrReturn.ts +++ b/packages/core/src/utilities/callOrReturn.ts @@ -1,5 +1,5 @@ import { MaybeReturnType } from '../types' -import isFunction from './isFunction' +import { isFunction } from './isFunction' /** * Optionally calls `value` as a function. @@ -8,7 +8,7 @@ import isFunction from './isFunction' * @param context Optional context to bind to function. * @param props Optional props to pass to function. */ -export default function callOrReturn(value: T, context: any = undefined, ...props: any[]): MaybeReturnType { +export function callOrReturn(value: T, context: any = undefined, ...props: any[]): MaybeReturnType { if (isFunction(value)) { if (context) { return value.bind(context)(...props) diff --git a/packages/core/src/utilities/createStyleTag.ts b/packages/core/src/utilities/createStyleTag.ts index 602cd831..59419261 100644 --- a/packages/core/src/utilities/createStyleTag.ts +++ b/packages/core/src/utilities/createStyleTag.ts @@ -1,4 +1,4 @@ -export default function createStyleTag(style: string): HTMLStyleElement { +export function createStyleTag(style: string): HTMLStyleElement { const tipTapStyleTag = (document.querySelector('style[data-tiptap-style]')) if (tipTapStyleTag !== null) { diff --git a/packages/core/src/utilities/deleteProps.ts b/packages/core/src/utilities/deleteProps.ts index c6e2934b..eea26350 100644 --- a/packages/core/src/utilities/deleteProps.ts +++ b/packages/core/src/utilities/deleteProps.ts @@ -3,7 +3,7 @@ * @param obj Object * @param key Key to remove */ -export default function deleteProps(obj: Record, propOrProps: string | string[]): Record { +export function deleteProps(obj: Record, propOrProps: string | string[]): Record { const props = typeof propOrProps === 'string' ? [propOrProps] : propOrProps diff --git a/packages/core/src/utilities/elementFromString.ts b/packages/core/src/utilities/elementFromString.ts index 5bbf3d1e..bbfd794b 100644 --- a/packages/core/src/utilities/elementFromString.ts +++ b/packages/core/src/utilities/elementFromString.ts @@ -1,4 +1,4 @@ -export default function elementFromString(value: string): HTMLElement { +export function elementFromString(value: string): HTMLElement { // add a wrapper to preserve leading and trailing whitespace const wrappedValue = `${value}` diff --git a/packages/core/src/utilities/findDuplicates.ts b/packages/core/src/utilities/findDuplicates.ts index 541c062f..8f1f0813 100644 --- a/packages/core/src/utilities/findDuplicates.ts +++ b/packages/core/src/utilities/findDuplicates.ts @@ -1,4 +1,4 @@ -export default function findDuplicates(items: any[]): any[] { +export function findDuplicates(items: any[]): any[] { const filtered = items.filter((el, index) => items.indexOf(el) !== index) return [...new Set(filtered)] diff --git a/packages/core/src/utilities/fromString.ts b/packages/core/src/utilities/fromString.ts index b07c6025..630a8ac4 100644 --- a/packages/core/src/utilities/fromString.ts +++ b/packages/core/src/utilities/fromString.ts @@ -1,4 +1,4 @@ -export default function fromString(value: any): any { +export function fromString(value: any): any { if (typeof value !== 'string') { return value } diff --git a/packages/core/src/utilities/isClass.ts b/packages/core/src/utilities/isClass.ts index d3d1f747..925fabd7 100644 --- a/packages/core/src/utilities/isClass.ts +++ b/packages/core/src/utilities/isClass.ts @@ -1,4 +1,4 @@ -export default function isClass(value: any): boolean { +export function isClass(value: any): boolean { if (value.constructor?.toString().substring(0, 5) !== 'class') { return false } diff --git a/packages/core/src/utilities/isEmptyObject.ts b/packages/core/src/utilities/isEmptyObject.ts index da956393..50ef3961 100644 --- a/packages/core/src/utilities/isEmptyObject.ts +++ b/packages/core/src/utilities/isEmptyObject.ts @@ -1,3 +1,3 @@ -export default function isEmptyObject(value = {}): boolean { +export function isEmptyObject(value = {}): boolean { return Object.keys(value).length === 0 && value.constructor === Object } diff --git a/packages/core/src/utilities/isFunction.ts b/packages/core/src/utilities/isFunction.ts index 1a08f665..92b379c4 100644 --- a/packages/core/src/utilities/isFunction.ts +++ b/packages/core/src/utilities/isFunction.ts @@ -1,3 +1,3 @@ -export default function isObject(value: any): value is Function { +export function isFunction(value: any): value is Function { return typeof value === 'function' } diff --git a/packages/core/src/utilities/isNumber.ts b/packages/core/src/utilities/isNumber.ts index 952c2feb..d0023e96 100644 --- a/packages/core/src/utilities/isNumber.ts +++ b/packages/core/src/utilities/isNumber.ts @@ -1,3 +1,3 @@ -export default function isNumber(value: any): value is number { +export function isNumber(value: any): value is number { return typeof value === 'number' } diff --git a/packages/core/src/utilities/isObject.ts b/packages/core/src/utilities/isObject.ts index f89f1c36..a5a17b65 100644 --- a/packages/core/src/utilities/isObject.ts +++ b/packages/core/src/utilities/isObject.ts @@ -1,6 +1,6 @@ -import isClass from './isClass' +import { isClass } from './isClass' -export default function isObject(value: any): boolean { +export function isObject(value: any): boolean { return ( value && typeof value === 'object' diff --git a/packages/core/src/utilities/isPlainObject.ts b/packages/core/src/utilities/isPlainObject.ts index 88931443..f7a2b3ef 100644 --- a/packages/core/src/utilities/isPlainObject.ts +++ b/packages/core/src/utilities/isPlainObject.ts @@ -4,7 +4,7 @@ function getType(value: any): string { return Object.prototype.toString.call(value).slice(8, -1) } -export default function isPlainObject(value: any): value is Record { +export function isPlainObject(value: any): value is Record { if (getType(value) !== 'Object') { return false } diff --git a/packages/core/src/utilities/isRegExp.ts b/packages/core/src/utilities/isRegExp.ts index 57feabef..f9ec25fe 100644 --- a/packages/core/src/utilities/isRegExp.ts +++ b/packages/core/src/utilities/isRegExp.ts @@ -1,3 +1,3 @@ -export default function isRegExp(value: any): value is RegExp { +export function isRegExp(value: any): value is RegExp { return Object.prototype.toString.call(value) === '[object RegExp]' } diff --git a/packages/core/src/utilities/isString.ts b/packages/core/src/utilities/isString.ts index b3ba5887..24e46e41 100644 --- a/packages/core/src/utilities/isString.ts +++ b/packages/core/src/utilities/isString.ts @@ -1,3 +1,3 @@ -export default function isString(value: any): value is string { +export function isString(value: any): value is string { return typeof value === 'string' } diff --git a/packages/core/src/utilities/isiOS.ts b/packages/core/src/utilities/isiOS.ts index 7e611e1b..2df2bd91 100644 --- a/packages/core/src/utilities/isiOS.ts +++ b/packages/core/src/utilities/isiOS.ts @@ -1,4 +1,4 @@ -export default function isiOS(): boolean { +export function isiOS(): boolean { return [ 'iPad Simulator', 'iPhone Simulator', diff --git a/packages/core/src/utilities/mergeAttributes.ts b/packages/core/src/utilities/mergeAttributes.ts index 7c00ce2c..72fc7084 100644 --- a/packages/core/src/utilities/mergeAttributes.ts +++ b/packages/core/src/utilities/mergeAttributes.ts @@ -1,4 +1,4 @@ -export default function mergeAttributes(...objects: Record[]): Record { +export function mergeAttributes(...objects: Record[]): Record { return objects .filter(item => !!item) .reduce((items, item) => { diff --git a/packages/core/src/utilities/mergeDeep.ts b/packages/core/src/utilities/mergeDeep.ts index 72c9c01e..4b54c326 100644 --- a/packages/core/src/utilities/mergeDeep.ts +++ b/packages/core/src/utilities/mergeDeep.ts @@ -1,6 +1,6 @@ -import isPlainObject from './isPlainObject' +import { isPlainObject } from './isPlainObject' -export default function mergeDeep(target: Record, source: Record): Record { +export function mergeDeep(target: Record, source: Record): Record { const output = { ...target } if (isPlainObject(target) && isPlainObject(source)) { diff --git a/packages/core/src/utilities/minMax.ts b/packages/core/src/utilities/minMax.ts index 47a22706..d13ce8bb 100644 --- a/packages/core/src/utilities/minMax.ts +++ b/packages/core/src/utilities/minMax.ts @@ -1,3 +1,3 @@ -export default function minMax(value = 0, min = 0, max = 0): number { +export function minMax(value = 0, min = 0, max = 0): number { return Math.min(Math.max(value, min), max) } diff --git a/packages/core/src/utilities/objectIncludes.ts b/packages/core/src/utilities/objectIncludes.ts index c9e01a3f..7dadc503 100644 --- a/packages/core/src/utilities/objectIncludes.ts +++ b/packages/core/src/utilities/objectIncludes.ts @@ -1,11 +1,11 @@ -import isRegExp from './isRegExp' +import { isRegExp } from './isRegExp' /** * Check if object1 includes object2 * @param object1 Object * @param object2 Object */ -export default function objectIncludes( +export function objectIncludes( object1: Record, object2: Record, options: { strict: boolean } = { strict: true }, diff --git a/packages/core/src/utilities/removeDuplicates.ts b/packages/core/src/utilities/removeDuplicates.ts index 73930ea7..2bae38fd 100644 --- a/packages/core/src/utilities/removeDuplicates.ts +++ b/packages/core/src/utilities/removeDuplicates.ts @@ -2,7 +2,7 @@ * Removes duplicated values within an array. * Supports numbers, strings and objects. */ -export default function removeDuplicates(array: T[], by = JSON.stringify): T[] { +export function removeDuplicates(array: T[], by = JSON.stringify): T[] { const seen: Record = {} return array.filter(item => { diff --git a/packages/extension-link/src/helpers/autolink.ts b/packages/extension-link/src/helpers/autolink.ts index 9fdee28e..4421c7b6 100644 --- a/packages/extension-link/src/helpers/autolink.ts +++ b/packages/extension-link/src/helpers/autolink.ts @@ -12,7 +12,7 @@ type AutolinkOptions = { type: MarkType, } -export default function autolink(options: AutolinkOptions): Plugin { +export function autolink(options: AutolinkOptions): Plugin { return new Plugin({ key: new PluginKey('autolink'), appendTransaction: (transactions, oldState, newState) => { diff --git a/packages/extension-link/src/helpers/clickHandler.ts b/packages/extension-link/src/helpers/clickHandler.ts index 5991f493..209412e6 100644 --- a/packages/extension-link/src/helpers/clickHandler.ts +++ b/packages/extension-link/src/helpers/clickHandler.ts @@ -6,7 +6,7 @@ type ClickHandlerOptions = { type: MarkType, } -export default function clickHandler(options: ClickHandlerOptions): Plugin { +export function clickHandler(options: ClickHandlerOptions): Plugin { return new Plugin({ key: new PluginKey('handleClickLink'), props: { diff --git a/packages/extension-link/src/helpers/pasteHandler.ts b/packages/extension-link/src/helpers/pasteHandler.ts index 6f0c9f44..fc06a206 100644 --- a/packages/extension-link/src/helpers/pasteHandler.ts +++ b/packages/extension-link/src/helpers/pasteHandler.ts @@ -8,7 +8,7 @@ type PasteHandlerOptions = { type: MarkType, } -export default function pasteHandler(options: PasteHandlerOptions): Plugin { +export function pasteHandler(options: PasteHandlerOptions): Plugin { return new Plugin({ key: new PluginKey('handlePasteLink'), props: { diff --git a/packages/extension-link/src/link.ts b/packages/extension-link/src/link.ts index 59fac262..51c3e2e5 100644 --- a/packages/extension-link/src/link.ts +++ b/packages/extension-link/src/link.ts @@ -1,8 +1,8 @@ import { Mark, markPasteRule, mergeAttributes } from '@tiptap/core' import { find } from 'linkifyjs' -import autolink from './helpers/autolink' -import clickHandler from './helpers/clickHandler' -import pasteHandler from './helpers/pasteHandler' +import { autolink } from './helpers/autolink' +import { clickHandler } from './helpers/clickHandler' +import { pasteHandler } from './helpers/pasteHandler' export interface LinkOptions { /** diff --git a/packages/html/src/generateHTML.ts b/packages/html/src/generateHTML.ts index 3e7579ca..9fec8cb4 100644 --- a/packages/html/src/generateHTML.ts +++ b/packages/html/src/generateHTML.ts @@ -1,8 +1,8 @@ import { Extensions, getSchema, JSONContent } from '@tiptap/core' import { Node } from 'prosemirror-model' -import getHTMLFromFragment from './getHTMLFromFragment' +import { getHTMLFromFragment } from './getHTMLFromFragment' -export default function generateHTML(doc: JSONContent, extensions: Extensions): string { +export function generateHTML(doc: JSONContent, extensions: Extensions): string { const schema = getSchema(extensions) const contentNode = Node.fromJSON(schema, doc) diff --git a/packages/html/src/generateJSON.ts b/packages/html/src/generateJSON.ts index 00d4d0a2..7f8a0ba4 100644 --- a/packages/html/src/generateJSON.ts +++ b/packages/html/src/generateJSON.ts @@ -2,7 +2,7 @@ import { DOMParser } from 'prosemirror-model' import { getSchema, Extensions } from '@tiptap/core' import { parseHTML } from 'zeed-dom' -export default function generateJSON(html: string, extensions: Extensions): Record { +export function generateJSON(html: string, extensions: Extensions): Record { const schema = getSchema(extensions) const dom = parseHTML(html) as unknown as Node diff --git a/packages/html/src/getHTMLFromFragment.ts b/packages/html/src/getHTMLFromFragment.ts index 77b86c28..96b7a777 100644 --- a/packages/html/src/getHTMLFromFragment.ts +++ b/packages/html/src/getHTMLFromFragment.ts @@ -1,7 +1,7 @@ import { Node, DOMSerializer, Schema } from 'prosemirror-model' import { createHTMLDocument, VHTMLDocument } from 'zeed-dom' -export default function getHTMLFromFragment(doc: Node, schema: Schema): string { +export function getHTMLFromFragment(doc: Node, schema: Schema): string { const document = DOMSerializer .fromSchema(schema) .serializeFragment(doc.content, { diff --git a/packages/html/src/index.ts b/packages/html/src/index.ts index 754f4da9..33db29a8 100644 --- a/packages/html/src/index.ts +++ b/packages/html/src/index.ts @@ -1,2 +1,2 @@ -export { default as generateHTML } from './generateHTML' -export { default as generateJSON } from './generateJSON' +export * from './generateHTML' +export * from './generateJSON' diff --git a/tests/cypress/integration/core/extendExtensions.spec.ts b/tests/cypress/integration/core/extendExtensions.spec.ts index b172fe6e..34531ef2 100644 --- a/tests/cypress/integration/core/extendExtensions.spec.ts +++ b/tests/cypress/integration/core/extendExtensions.spec.ts @@ -1,7 +1,7 @@ /// import { Extension } from '@tiptap/core/src/Extension' -import getExtensionField from '@tiptap/core/src/helpers/getExtensionField' +import { getExtensionField } from '@tiptap/core/src/helpers/getExtensionField' describe('extend extensions', () => { it('should define a config', () => { diff --git a/tests/cypress/integration/core/fromString.spec.ts b/tests/cypress/integration/core/fromString.spec.ts index b28d3ea9..92e3de55 100644 --- a/tests/cypress/integration/core/fromString.spec.ts +++ b/tests/cypress/integration/core/fromString.spec.ts @@ -1,6 +1,6 @@ /// -import fromString from '@tiptap/core/src/utilities/fromString' +import { fromString } from '@tiptap/core/src/utilities/fromString' describe('fromString', () => { it('should return a string', () => { diff --git a/tests/cypress/integration/core/isClass.spec.ts b/tests/cypress/integration/core/isClass.spec.ts index ae0ba947..d7f09c8f 100644 --- a/tests/cypress/integration/core/isClass.spec.ts +++ b/tests/cypress/integration/core/isClass.spec.ts @@ -1,6 +1,6 @@ /// -import isClass from '@tiptap/core/src/utilities/isClass' +import { isClass } from '@tiptap/core/src/utilities/isClass' describe('isClass', () => { it('returns true for classes', () => { diff --git a/tests/cypress/integration/core/mergeAttributes.spec.ts b/tests/cypress/integration/core/mergeAttributes.spec.ts index d904e6d9..2659d739 100644 --- a/tests/cypress/integration/core/mergeAttributes.spec.ts +++ b/tests/cypress/integration/core/mergeAttributes.spec.ts @@ -1,6 +1,6 @@ /// -import mergeAttributes from '@tiptap/core/src/utilities/mergeAttributes' +import { mergeAttributes } from '@tiptap/core/src/utilities/mergeAttributes' describe('mergeAttributes', () => { it('should merge two objects', () => { diff --git a/tests/cypress/integration/core/mergeDeep.spec.ts b/tests/cypress/integration/core/mergeDeep.spec.ts index 01f26fde..e3ef8ec9 100644 --- a/tests/cypress/integration/core/mergeDeep.spec.ts +++ b/tests/cypress/integration/core/mergeDeep.spec.ts @@ -1,6 +1,6 @@ /// -import mergeDeep from '@tiptap/core/src/utilities/mergeDeep' +import { mergeDeep } from '@tiptap/core/src/utilities/mergeDeep' describe('mergeDeep', () => { it('should merge', () => { diff --git a/tests/cypress/integration/extensions/codeBlockLowlight.spec.ts b/tests/cypress/integration/extensions/codeBlockLowlight.spec.ts index bd1b57fa..5380f8ba 100644 --- a/tests/cypress/integration/extensions/codeBlockLowlight.spec.ts +++ b/tests/cypress/integration/extensions/codeBlockLowlight.spec.ts @@ -1,8 +1,6 @@ /// -import { - CodeBlockLowlight, -} from '@tiptap/extension-code-block-lowlight' +import { CodeBlockLowlight } from '@tiptap/extension-code-block-lowlight' import { Text } from '@tiptap/extension-text' import { Paragraph } from '@tiptap/extension-paragraph' import { Document } from '@tiptap/extension-document'