14 - the CommonMark subset moves under src/markdown/commonmark/

src/markdown/parse/blocks.test.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert/strict'
 import test from 'node:test'
 
 import type { Block } from './blocks.ts'
-import type { LinkDefinition } from '../link-syntax.ts'
+import type { LinkDefinition } from '../commonmark/link-syntax.ts'
 import { parseBlocks } from './blocks.ts'
 
 function definitions(markdown: string): [string, LinkDefinition][] {

src/markdown/parse/blocks.ts

@@ -1,6 +1,6 @@
 import type { ConvertFault, SourcePosition } from '../../result.ts'
 import type { DirectiveAttributes, DirectiveLine } from '../directive-syntax.ts'
-import type { LinkDefinition } from '../link-syntax.ts'
+import type { LinkDefinition } from '../commonmark/link-syntax.ts'
 import {
   atxHeading,
   claimsPipeLine,
@@ -17,11 +17,11 @@ import {
   setextHeadingLevel,
   thematicBreakTail,
   type ThematicBreakTail,
-} from '../commonmark-grammar.ts'
+} from '../commonmark/grammar.ts'
 import { blockDirectiveForm } from '../block-directive-forms.ts'
 import { directiveEscape, malformedDirective, readDirectiveLine, spellDirectiveCloser } from '../directive-syntax.ts'
 import { barePipeCells, isDelimiterRow, isPipeAlignment, isPipeDelimiter, malformedPipeTable, pipeCells } from '../pipe-table-syntax.ts'
-import { readLinkDefinitions } from '../link-reference-definitions.ts'
+import { readLinkDefinitions } from '../commonmark/link-reference-definitions.ts'
 
 export type Block = { position: SourcePosition } & (
   | { argument: string | undefined; attributes: DirectiveAttributes; blocks: Block[] | undefined; kind: 'directive'; name: string }

src/markdown/parse/inline-content.ts

@@ -1,17 +1,17 @@
 import type { AdfMark, AdfNode } from '../../adf/document.ts'
 import type { DirectiveSpan, NestedSpans } from '../directive-syntax.ts'
-import type { EmphasisPairing } from '../emphasis-matching.ts'
+import type { EmphasisPairing } from '../commonmark/emphasis-matching.ts'
 import type { LineContainer } from '../emit/line-escaping.ts'
-import type { LinkDefinition } from '../link-syntax.ts'
-import { backslashEscape, decodeTextEscapes, inlineHtmlConstruct, readBracketedAutolink, readEmailAutolink, trimTrailingSpace } from '../commonmark-grammar.ts'
-import { backtickRun, closingBacktickRun } from '../backtick-runs.ts'
+import type { LinkDefinition } from '../commonmark/link-syntax.ts'
+import { backslashEscape, decodeTextEscapes, inlineHtmlConstruct, readBracketedAutolink, readEmailAutolink, trimTrailingSpace } from '../commonmark/grammar.ts'
+import { backtickRun, closingBacktickRun } from '../commonmark/backtick-runs.ts'
 import { commonMarkLink } from '../mark-spellings.ts'
-import { delimiterFlags, matchEmphasis, runLength } from '../emphasis-matching.ts'
+import { delimiterFlags, matchEmphasis, runLength } from '../commonmark/emphasis-matching.ts'
 import { failure, faulted, success, type ConvertErrorPath, type Result } from '../../result.ts'
 import { inlineDirective } from '../../adf/inline-directives.ts'
 import { mergeAdjacentText } from '../../adf/editor-normal.ts'
 import { nodeAttrs, nodeMarks } from '../../adf/document.ts'
-import { normalizeLabel, readInlineTarget, readLabel } from '../link-syntax.ts'
+import { normalizeLabel, readInlineTarget, readLabel } from '../commonmark/link-syntax.ts'
 import { openingLinkTakesDirective } from '../emit/inline-line.ts'
 import { readCarriedInline } from '../opaque-carry.ts'
 import { readDirectiveMark } from './directive-marks.ts'