From 536a1ed44fe9d60e0e821c779023cd675eccc081 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 4 Sep 2020 11:59:09 +0200 Subject: [PATCH] add separate types file --- packages/core/src/types.ts | 5 +++++ packages/core/src/utils/generateHtml.ts | 8 +++----- packages/core/src/utils/getSchema.ts | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 packages/core/src/types.ts diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts new file mode 100644 index 00000000..745605e5 --- /dev/null +++ b/packages/core/src/types.ts @@ -0,0 +1,5 @@ +import Extension from './Extension' +import Node from './Node' +import Mark from './Mark' + +export type Extensions = (Extension | Node | Mark)[] \ No newline at end of file diff --git a/packages/core/src/utils/generateHtml.ts b/packages/core/src/utils/generateHtml.ts index ae70cbbf..b11a402b 100644 --- a/packages/core/src/utils/generateHtml.ts +++ b/packages/core/src/utils/generateHtml.ts @@ -1,10 +1,8 @@ -import Extension from '../Extension' -import Node from '../Node' -import Mark from '../Mark' import getSchema from './getSchema' -import { Node as ProseMirrorNode, DOMSerializer } from "prosemirror-model" +import { Node as ProseMirrorNode, DOMSerializer } from 'prosemirror-model' +import { Extensions } from '../types' -export default function generateHtml(doc: object, extensions: (Extension | Node | Mark)[]): string { +export default function generateHtml(doc: object, extensions: Extensions): string { const schema = getSchema(extensions) let contentNode = ProseMirrorNode.fromJSON(schema, doc) diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts index ec8bae1c..9cd91aab 100644 --- a/packages/core/src/utils/getSchema.ts +++ b/packages/core/src/utils/getSchema.ts @@ -3,8 +3,9 @@ import Node from '../Node' import Mark from '../Mark' import { Schema } from 'prosemirror-model' import collect from 'collect.js' +import { Extensions } from '../types' -export default function getSchema(extensions: (Extension | Node | Mark)[]): Schema { +export default function getSchema(extensions: Extensions): Schema { return new Schema({ topNode: getTopNodeFromExtensions(extensions), nodes: getNodesFromExtensions(extensions),