AGENTS.md

@@ -313,10 +313,10 @@ someone spells it or pins it.
   fields it claims (`isAdfDocument`); past it everything is typed. Make invalid states
   unrepresentable.
 - `src/adf/` holds ADF's own knowledge and imports no format. Each format directory (`markdown/`,
-  `html/`) parts into `emit/` (ADF→format) and `parse/` (format→ADF), its root holding what both
-  directions read. A construct's reader lives in that root beside the regex the emitter escapes
+  `html/`) parts into `emit/` (ADF→format) and `parse/` (format→ADF), the rest of it holding what
+  both directions read. A construct's reader lives there beside the regex the emitter escapes
   against, so the two cannot drift; a reader with no emit counterpart goes in `parse/`, unless it is
-  part of a construct the root already holds — a grammar stays in one file rather than splitting
+  part of a construct that side already holds — a grammar stays in one file rather than splitting
   across the seam. A rule both
   directions must answer alike — whether a list marker interrupts a paragraph — is one function
   there too, never a copy per direction, however conservative the copy would be. Where the rule is

src/markdown-property.test.ts

@@ -23,7 +23,7 @@ import {
   spellStringAttribute,
   spellVocabulary,
 } from './markdown/directive-syntax.ts'
-import { fencedCodeBlock } from './markdown/backtick-runs.ts'
+import { fencedCodeBlock } from './markdown/commonmark/backtick-runs.ts'
 import { inlineDirectives } from './adf/inline-directives.ts'
 import { listBreakName } from './markdown/list-break.ts'
 import { markAttributes } from './adf/mark-attributes.ts'

src/markdown/code-language.ts

@@ -1,7 +1,7 @@
 import type { JsonValue } from '../json-value.ts'
 import { carryName } from './opaque-carry.ts'
-import { holdsControlCharacter } from './commonmark-grammar.ts'
-import { holdsEntityReference } from './entity-references.ts'
+import { holdsControlCharacter } from './commonmark/grammar.ts'
+import { holdsEntityReference } from './commonmark/entity-references.ts'
 
 export type LanguageSlot = { info: string; kind: 'fence' } | { kind: 'attribute' } | { kind: 'none' }
 

src/markdown/commonmark/emphasis-matching.ts

@@ -1,4 +1,4 @@
-import { isUnicodeWhitespace } from './commonmark-grammar.ts'
+import { isUnicodeWhitespace } from './grammar.ts'
 
 type DelimiterRun = { canClose: boolean; canOpen: boolean; character: string; length: number }
 

src/markdown/commonmark/link-syntax.ts

@@ -1,4 +1,4 @@
-import { backslashEscape, decodeTextEscapes, holdsControlCharacter } from './commonmark-grammar.ts'
+import { backslashEscape, decodeTextEscapes, holdsControlCharacter } from './grammar.ts'
 import { holdsEntityReference } from './entity-references.ts'
 
 export type LinkDefinition = { destination: string; title?: string }

src/markdown/directive-syntax.ts

@@ -1,8 +1,8 @@
 import type { AttributeKind, VocabularyPair, VocabularyValue } from '../adf/attribute-vocabulary.ts'
 import type { ConvertFault } from '../result.ts'
 import type { JsonValue } from '../json-value.ts'
-import { backslashEscape } from './commonmark-grammar.ts'
-import { backtickRun, closingBacktickRun } from './backtick-runs.ts'
+import { backslashEscape } from './commonmark/grammar.ts'
+import { backtickRun, closingBacktickRun } from './commonmark/backtick-runs.ts'
 import { isJsonValue, overNested } from '../json-value.ts'
 import { largestNesting } from '../nesting.ts'
 import { serializeCanonicalJson } from '../canonical-json.ts'

src/markdown/emit/adf-to-markdown.ts

@@ -6,8 +6,8 @@ import { blockDirectiveForm } from '../block-directive-forms.ts'
 import { carriedBlock } from '../opaque-carry.ts'
 import { emitInlineLine } from './inline-line.ts'
 import { failure, faulted, success, type ConvertErrorPath, type Result } from '../../result.ts'
-import { fencedCodeBlock } from '../backtick-runs.ts'
-import { holdsNullCharacter, isBlankLine, isThematicBreak, markerInterruptsParagraph } from '../commonmark-grammar.ts'
+import { fencedCodeBlock } from '../commonmark/backtick-runs.ts'
+import { holdsNullCharacter, isBlankLine, isThematicBreak, markerInterruptsParagraph } from '../commonmark/grammar.ts'
 import { languageSlot } from '../code-language.ts'
 import { largestNesting } from '../../nesting.ts'
 import { listBreakSpelling } from '../list-break.ts'

src/markdown/emit/inline-line.ts

@@ -2,13 +2,13 @@ import type { AdfMark, AdfNode } from '../../adf/document.ts'
 import type { InlineDirective } from '../../adf/inline-directives.ts'
 import { assembleInlineLine, isSyntax, type InlineEscaping, type InlineSegment, type LineContainer, type NodeRange } from './line-escaping.ts'
 import { carriedInline } from '../opaque-carry.ts'
-import { claimsLine, holdsNullCharacter, trimTrailingSpace } from '../commonmark-grammar.ts'
+import { claimsLine, holdsNullCharacter, trimTrailingSpace } from '../commonmark/grammar.ts'
 import { commonMarkLink, markSpelling, spellMarkAttributes } from '../mark-spellings.ts'
-import { escapeUnbalanced, spellDestination } from '../link-syntax.ts'
+import { escapeUnbalanced, spellDestination } from '../commonmark/link-syntax.ts'
 import { failure, faulted, success, type ConvertErrorPath, type Result } from '../../result.ts'
 import { inlineDirective } from '../../adf/inline-directives.ts'
 import { largestNesting } from '../../nesting.ts'
-import { longestBacktickRun } from '../backtick-runs.ts'
+import { longestBacktickRun } from '../commonmark/backtick-runs.ts'
 import { nodeAttrs, nodeContent, nodeMarks } from '../../adf/document.ts'
 import { sameMark } from '../../adf/editor-normal.ts'
 import { slotLineEndingFault, spellInlineDirectiveOpener, spellInlineLeafDirective } from '../directive-syntax.ts'

src/markdown/emit/line-escaping.ts

@@ -1,10 +1,10 @@
-import { backtickRun, closingBacktickRun } from '../backtick-runs.ts'
-import { delimiterFlags, isWordCharacter, matchEmphasis, runLength } from '../emphasis-matching.ts'
-import { backslashEscape, escapesLineClaim, inlineHtmlConstruct, opensBracketedAutolink, opensEmailAutolink, type LinePosition } from '../commonmark-grammar.ts'
+import { backtickRun, closingBacktickRun } from '../commonmark/backtick-runs.ts'
+import { delimiterFlags, isWordCharacter, matchEmphasis, runLength } from '../commonmark/emphasis-matching.ts'
+import { backslashEscape, escapesLineClaim, inlineHtmlConstruct, opensBracketedAutolink, opensEmailAutolink, type LinePosition } from '../commonmark/grammar.ts'
 import { claimsDirectivePrefix } from '../directive-syntax.ts'
 import { isBareDelimiterRow } from '../pipe-table-syntax.ts'
-import { opensLinkDefinition } from '../link-reference-definitions.ts'
-import { readEntityReference } from '../entity-references.ts'
+import { opensLinkDefinition } from '../commonmark/link-reference-definitions.ts'
+import { readEntityReference } from '../commonmark/entity-references.ts'
 
 export type EmphasisRole = 'close' | 'open'
 

src/markdown/mark-spellings.ts

@@ -1,10 +1,10 @@
 import type { AdfAttributes, AdfMark, AdfNode } from '../adf/document.ts'
 import type { AttributeVocabulary } from '../adf/attribute-vocabulary.ts'
 import type { MarkType } from '../adf/mark-attributes.ts'
-import { escapeUnbalanced, spellLinkTarget } from './link-syntax.ts'
+import { escapeUnbalanced, spellLinkTarget } from './commonmark/link-syntax.ts'
 import { holdsDirectivePrefix, spellAttributes, spellVocabulary } from './directive-syntax.ts'
-import { holdsEntityReference } from './entity-references.ts'
-import { isAutolink } from './commonmark-grammar.ts'
+import { holdsEntityReference } from './commonmark/entity-references.ts'
+import { isAutolink } from './commonmark/grammar.ts'
 import { isMarkType, markAttributes } from '../adf/mark-attributes.ts'
 import { nodeAttrs, nodeMarks } from '../adf/document.ts'
 import { vocabularyPairs } from '../adf/attribute-vocabulary.ts'

src/markdown/opaque-carry.ts

@@ -4,7 +4,7 @@ import type { JsonSpelling } from '../canonical-json.ts'
 import { failure, success, type ConvertErrorPath, type Result } from '../result.ts'
 import { isAdfNode } from '../adf/document.ts'
 import { isJsonValue, nestingDepth, overNested } from '../json-value.ts'
-import { fencedCodeBlock } from './backtick-runs.ts'
+import { fencedCodeBlock } from './commonmark/backtick-runs.ts'
 import { largestNesting } from '../nesting.ts'
 import { malformedDirective, readSoleStringAttribute, spellAttributes, spellInlineLeafDirective, spellStringAttribute, unsupportedNodeShape } from './directive-syntax.ts'
 import { serializeCanonicalJson } from '../canonical-json.ts'

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'

src/markdown/pipe-table-syntax.ts

@@ -1,5 +1,5 @@
 import type { ConvertFault } from '../result.ts'
-import { backslashEscape, claimsPipeLine, trimSpace } from './commonmark-grammar.ts'
+import { backslashEscape, claimsPipeLine, trimSpace } from './commonmark/grammar.ts'
 
 const alignmentCell = /^:-+:?$|^-+:$/
 const delimiterCell = /^-+$/