diff --git a/packages/schema/package.json b/packages/schema/package.json index 3fed912a..cc81b573 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -39,8 +39,9 @@ "@wordpress/wordcount": "^3.11.0", "js-yaml": "^4.1.0", "markdown-it": "^12.2.0", + "myst-common": "workspace:^", + "myst-parser": "workspace:^", "myst-spec": "^0.0.4", - "mystjs": "^0.0.15", "nanoid": "^3.3.4", "orderedmap": "^1.1.1", "prosemirror-collab": "^1.3.0", diff --git a/packages/schema/src/marks.ts b/packages/schema/src/marks.ts index 0da495b7..37b2f289 100644 --- a/packages/schema/src/marks.ts +++ b/packages/schema/src/marks.ts @@ -1,4 +1,4 @@ -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { MarkSpec } from 'prosemirror-model'; import type { MystNode, diff --git a/packages/schema/src/nodes/basic.ts b/packages/schema/src/nodes/basic.ts index d17bfbb9..fc8d68bb 100644 --- a/packages/schema/src/nodes/basic.ts +++ b/packages/schema/src/nodes/basic.ts @@ -1,5 +1,5 @@ import OrderedMap from 'orderedmap'; -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { NodeSpec } from 'prosemirror-model'; import { addListNodes } from 'prosemirror-schema-list'; import type { diff --git a/packages/schema/src/nodes/cite.ts b/packages/schema/src/nodes/cite.ts index d9a79b4b..1481b94e 100644 --- a/packages/schema/src/nodes/cite.ts +++ b/packages/schema/src/nodes/cite.ts @@ -1,4 +1,4 @@ -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { MdFormatSerialize, TexFormatSerialize } from '../serialize/types'; import type { Cite, CrossReference } from '../nodespec'; import type { MyNodeSpec } from './types'; diff --git a/packages/schema/src/nodes/figcaption.ts b/packages/schema/src/nodes/figcaption.ts index e8ce15e6..bd7730aa 100644 --- a/packages/schema/src/nodes/figcaption.ts +++ b/packages/schema/src/nodes/figcaption.ts @@ -1,4 +1,4 @@ -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { Caption, FlowContent } from '../nodespec'; import type { MdFormatSerialize } from '../serialize/types'; import { createLatexStatement } from '../serialize/tex/utils'; diff --git a/packages/schema/src/nodes/types.ts b/packages/schema/src/nodes/types.ts index eb117ff3..f6385928 100644 --- a/packages/schema/src/nodes/types.ts +++ b/packages/schema/src/nodes/types.ts @@ -1,4 +1,4 @@ -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { NodeSpec, AttributeSpec, ParseRule } from 'prosemirror-model'; import type { MystNode } from '../nodespec'; import type { MdastOptions } from '../serialize/types'; diff --git a/packages/schema/src/nodes/utils.ts b/packages/schema/src/nodes/utils.ts index d12df892..b84f283e 100644 --- a/packages/schema/src/nodes/utils.ts +++ b/packages/schema/src/nodes/utils.ts @@ -1,4 +1,4 @@ -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { Node } from 'prosemirror-model'; import { DEFAULT_IMAGE_WIDTH } from '../defaults'; import type { MdSerializerState } from '../types'; diff --git a/packages/schema/src/parse/markdown/index.ts b/packages/schema/src/parse/markdown/index.ts index 3448d3e6..b78f55dc 100644 --- a/packages/schema/src/parse/markdown/index.ts +++ b/packages/schema/src/parse/markdown/index.ts @@ -1,11 +1,10 @@ -import { MyST } from 'mystjs'; +import { mystParse } from 'myst-parser'; import type { Root } from '../../nodespec'; import { fromMdast } from '../mdast'; import type { UseSchema } from '../../schemas'; export function fromMarkdown(content: string, useSchema: UseSchema) { - const parser = new MyST(); - const tree = parser.parse(content); + const tree = mystParse(content); const doc = fromMdast(tree as Root, useSchema); return doc; } diff --git a/packages/schema/src/parse/mdast/index.ts b/packages/schema/src/parse/mdast/index.ts index 976f50af..b0558bd0 100644 --- a/packages/schema/src/parse/mdast/index.ts +++ b/packages/schema/src/parse/mdast/index.ts @@ -1,7 +1,8 @@ import type { Fragment, Node as ProsemirrorNode, NodeType, Schema } from 'prosemirror-model'; import { Mark } from 'prosemirror-model'; -import type { GenericNode } from 'mystjs'; -import { select, selectAll, remove } from 'mystjs'; +import type { GenericNode } from 'myst-common'; +import { select, selectAll } from 'unist-util-select'; +import { remove } from 'unist-util-remove'; import type { FlowContent, FootnoteDefinition, diff --git a/packages/schema/src/serialize/mdast/convertToMdast.ts b/packages/schema/src/serialize/mdast/convertToMdast.ts index 132d52c5..cf589dcb 100644 --- a/packages/schema/src/serialize/mdast/convertToMdast.ts +++ b/packages/schema/src/serialize/mdast/convertToMdast.ts @@ -1,7 +1,8 @@ import type { DOMOutputSpec, Mark, Node as ProsemirrorNode, Schema } from 'prosemirror-model'; import { DOMSerializer } from 'prosemirror-model'; -import type { GenericNode } from 'mystjs'; -import { selectAll } from 'mystjs'; +import type { GenericNode } from 'myst-common'; +import { selectAll } from 'unist-util-select'; + import type { FootnoteReference, FootnoteDefinition, diff --git a/packages/schema/src/serialize/mdast/index.ts b/packages/schema/src/serialize/mdast/index.ts index 70b8e75d..1dd2ac7a 100644 --- a/packages/schema/src/serialize/mdast/index.ts +++ b/packages/schema/src/serialize/mdast/index.ts @@ -1,5 +1,5 @@ import type { Node as ProsemirrorNode } from 'prosemirror-model'; -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; import type { Root } from '../../nodespec'; import { convertToMdast, convertToMdastSnippet } from './convertToMdast'; import type { MdastOptions } from '../types'; diff --git a/packages/schema/src/serialize/types.ts b/packages/schema/src/serialize/types.ts index 1088f3c7..c4d96300 100644 --- a/packages/schema/src/serialize/types.ts +++ b/packages/schema/src/serialize/types.ts @@ -1,6 +1,6 @@ import type { MarkdownSerializerState } from 'prosemirror-markdown'; import type { Node } from 'prosemirror-model'; -import type { GenericNode } from 'mystjs'; +import type { GenericNode } from 'myst-common'; export enum TexFormatTypes { 'tex' = 'tex',