From 42ab63a03bb2eb931cca3a9b4c3afd92facf5c55 Mon Sep 17 00:00:00 2001 From: Lilleman auf Larv Date: Fri, 18 Sep 2026 20:27:22 +0200 Subject: [PATCH] 14 - the CommonMark subset moves under src/markdown/commonmark/ --- src/markdown-property.test.ts | 2 +- src/markdown/code-language.ts | 4 ++-- src/markdown/{ => commonmark}/backtick-runs.ts | 0 src/markdown/{ => commonmark}/emphasis-matching.ts | 2 +- .../{ => commonmark}/entity-references.test.ts | 0 src/markdown/{ => commonmark}/entity-references.ts | 0 .../{commonmark-grammar.ts => commonmark/grammar.ts} | 0 .../{ => commonmark}/link-reference-definitions.ts | 0 src/markdown/{ => commonmark}/link-syntax.ts | 2 +- src/markdown/directive-syntax.ts | 4 ++-- src/markdown/emit/adf-to-markdown.ts | 4 ++-- src/markdown/emit/inline-line.ts | 6 +++--- src/markdown/emit/line-escaping.ts | 10 +++++----- src/markdown/mark-spellings.ts | 6 +++--- src/markdown/opaque-carry.ts | 2 +- src/markdown/parse/blocks.test.ts | 2 +- src/markdown/parse/blocks.ts | 6 +++--- src/markdown/parse/inline-content.ts | 12 ++++++------ src/markdown/pipe-table-syntax.ts | 2 +- 19 files changed, 32 insertions(+), 32 deletions(-) rename src/markdown/{ => commonmark}/backtick-runs.ts (100%) rename src/markdown/{ => commonmark}/emphasis-matching.ts (98%) rename src/markdown/{ => commonmark}/entity-references.test.ts (100%) rename src/markdown/{ => commonmark}/entity-references.ts (100%) rename src/markdown/{commonmark-grammar.ts => commonmark/grammar.ts} (100%) rename src/markdown/{ => commonmark}/link-reference-definitions.ts (100%) rename src/markdown/{ => commonmark}/link-syntax.ts (99%) diff --git a/src/markdown-property.test.ts b/src/markdown-property.test.ts index 768ba3a..44af8cf 100644 --- a/src/markdown-property.test.ts +++ b/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' diff --git a/src/markdown/code-language.ts b/src/markdown/code-language.ts index 27f3a07..223e75a 100644 --- a/src/markdown/code-language.ts +++ b/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' } diff --git a/src/markdown/backtick-runs.ts b/src/markdown/commonmark/backtick-runs.ts similarity index 100% rename from src/markdown/backtick-runs.ts rename to src/markdown/commonmark/backtick-runs.ts diff --git a/src/markdown/emphasis-matching.ts b/src/markdown/commonmark/emphasis-matching.ts similarity index 98% rename from src/markdown/emphasis-matching.ts rename to src/markdown/commonmark/emphasis-matching.ts index b8a8942..4af5b7a 100644 --- a/src/markdown/emphasis-matching.ts +++ b/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 } diff --git a/src/markdown/entity-references.test.ts b/src/markdown/commonmark/entity-references.test.ts similarity index 100% rename from src/markdown/entity-references.test.ts rename to src/markdown/commonmark/entity-references.test.ts diff --git a/src/markdown/entity-references.ts b/src/markdown/commonmark/entity-references.ts similarity index 100% rename from src/markdown/entity-references.ts rename to src/markdown/commonmark/entity-references.ts diff --git a/src/markdown/commonmark-grammar.ts b/src/markdown/commonmark/grammar.ts similarity index 100% rename from src/markdown/commonmark-grammar.ts rename to src/markdown/commonmark/grammar.ts diff --git a/src/markdown/link-reference-definitions.ts b/src/markdown/commonmark/link-reference-definitions.ts similarity index 100% rename from src/markdown/link-reference-definitions.ts rename to src/markdown/commonmark/link-reference-definitions.ts diff --git a/src/markdown/link-syntax.ts b/src/markdown/commonmark/link-syntax.ts similarity index 99% rename from src/markdown/link-syntax.ts rename to src/markdown/commonmark/link-syntax.ts index c34e58b..f07df24 100644 --- a/src/markdown/link-syntax.ts +++ b/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 } diff --git a/src/markdown/directive-syntax.ts b/src/markdown/directive-syntax.ts index 5ae76af..7c992da 100644 --- a/src/markdown/directive-syntax.ts +++ b/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' diff --git a/src/markdown/emit/adf-to-markdown.ts b/src/markdown/emit/adf-to-markdown.ts index 0484fd1..00190ab 100644 --- a/src/markdown/emit/adf-to-markdown.ts +++ b/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' diff --git a/src/markdown/emit/inline-line.ts b/src/markdown/emit/inline-line.ts index 0cddd44..19c4484 100644 --- a/src/markdown/emit/inline-line.ts +++ b/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' diff --git a/src/markdown/emit/line-escaping.ts b/src/markdown/emit/line-escaping.ts index 84b9955..6011ccf 100644 --- a/src/markdown/emit/line-escaping.ts +++ b/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' diff --git a/src/markdown/mark-spellings.ts b/src/markdown/mark-spellings.ts index 1970568..a19a75f 100644 --- a/src/markdown/mark-spellings.ts +++ b/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' diff --git a/src/markdown/opaque-carry.ts b/src/markdown/opaque-carry.ts index 63d0435..c79b4a9 100644 --- a/src/markdown/opaque-carry.ts +++ b/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' diff --git a/src/markdown/parse/blocks.test.ts b/src/markdown/parse/blocks.test.ts index 2866051..99ed905 100644 --- a/src/markdown/parse/blocks.test.ts +++ b/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][] { diff --git a/src/markdown/parse/blocks.ts b/src/markdown/parse/blocks.ts index b011452..a6a672e 100644 --- a/src/markdown/parse/blocks.ts +++ b/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 } diff --git a/src/markdown/parse/inline-content.ts b/src/markdown/parse/inline-content.ts index e969b79..8c7b281 100644 --- a/src/markdown/parse/inline-content.ts +++ b/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' diff --git a/src/markdown/pipe-table-syntax.ts b/src/markdown/pipe-table-syntax.ts index b8f365b..8d5fc58 100644 --- a/src/markdown/pipe-table-syntax.ts +++ b/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 = /^-+$/