fencedCodeBlock had its language test inverted, reporting Nothing for a
fence that names a language and Just "" for one that doesn't.
listBlock's child parser needed a try. optional only recovers from a
failure that consumed nothing, and the child parser eats the next item's
indentation before finding out the item belongs to this list's level
rather than the child's, so any nested list with two or more items killed
the enclosing list and the whole thing came back as a paragraph.
element required a blockEnding, so every block had to be followed by a
blank line or EOF. Paragraphs and headings hid that by swallowing the
following line into their own text; a list has nowhere to put it, and
since listItem already consumed its trailing newline the failure came
with input consumed and escaped document's many, failing the entire
parse. "- a\n:" was a hard error. The ending is optional now and a block
that ends without a blank line is the next block's problem.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The suite is now one tasty binary over shared modules, so the Djot
tests can sit next to the Markdown ones without another copy of the
harness:
tests/Main.hs the TestTree
tests/Test/Harness.hs running a parser inside a property
tests/Test/Gen.hs generators, shrinkers, escaping
tests/Test/Gen/Document.hs whole document generation
tests/Markdown/Parse.hs the Markdown properties
Generated values moved from `pick` to `Arbitrary` instances on
newtypes. `pick` embeds its value with `forAll (return a)` and cannot
shrink; going through Arbitrary gets shrinking back at the cost of
hand written shrinkers, which have to preserve the invariants their
generator established.
IR now derives Eq, and the properties assert against a complete
expected tree rather than pattern matching. The old patterns bound
fresh names that shadowed the generated ones, so they only ever
checked the shape of the tree and never its content.
Test.Gen.Document generates a description of a document which renders
to source and derives its own expected tree, so the two stay in step
while shrinking. Rendering goes through a Syntax record so Djot can
reuse the spec and the expectations. Escaping is a generator level
concern: an Escaper says which characters are special and how (or
whether) they can be written literally.
Two properties fail, both on parser bugs rather than test bugs:
code_block fencedCodeBlock inverts its language test, so a
fence naming a language reports Nothing. Djot.hs
gets this right at src/Djot.hs:354.
document_round_trip a nested list with more than one item makes the
whole list fail to parse and fall back to a
paragraph. In listBlock's child parser the second
alternative has no `try`, so it fails having
consumed the first item's indentation. The
existing nesting tests only ever used one nested
item.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The test suite now runs on tasty + tasty-quickcheck. Translation is
mechanical: `property`/`forAll`/`lift` become
`monadicIO`/`pick`/`run`, `success`/`fail` become `pure ()`/`stop`
with a counterexample, and Hedgehog's ranged generators are replaced
by a `linear` helper that scales with QuickCheck's size parameter.
Shrinking is dropped since QuickCheck can't shrink these while keeping
the generated text within the ranges the assertions assume.
The expected-value patterns were also stale relative to the IR
(`LI`'s `child` field is gone, blocks carry a trailing `Attrs`, list
types carry a `style`), so they've been updated to match. The
structural checks are otherwise unchanged.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The reference form of the image syntax had nowhere to go: Image only has a
url, so the parser was putting the label there and `![a][b]` came out
identical to ``, with nothing downstream aware the url still needed
resolving against a RefDef.
Adds a ReferenceImage constructor mirroring ReferenceLink and has the djot
parser emit it. As with reference links, an empty label falls back to the
alt text.
Note HTML.hs still renders neither reference form.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Fills out src/Djot.hs, which was a skeleton of `error "todo"` stubs.
Three layers, so container prefixes and indentation never have to be
threaded through the parser state:
- line primitives (rawLine/peekLine/lineWhen/dedent): block parsers peek
at the next line, decide whether they want it, then consume it
- container blocks strip their prefix off the lines they own and re-parse
the result with subParse, a rank-2 helper that runs a polymorphic parser
at Identity and shifts error offsets back into the outer input
- inline content is a second pass over the text a block collected
Blocks: headings, paragraphs, block quotes, fenced code, raw blocks, divs,
tables (alignments, `^` captions, escaped pipes), footnote and reference
definitions, block attributes, thematic breaks, and lists -- bullet,
ordered (decimal/alpha/roman, `.`/`)`/`(n)`), task, and definition. Tight
lists unwrap their paragraphs to Transparent.
Inlines: emphasis and its braced forms, verbatim, raw inline, math, links,
reference links, images, autolinks, spans, footnote references, symbols,
escapes, hard breaks, attribute sets, and smart punctuation.
Two spots where the IR came up short:
- there is no reference image, so for `![alt][ref]` the label lands in
the url field
- unordered lists get style = Nothing rather than the bullet character,
which HTML.hs would otherwise emit as an invalid type="-"
Also includes the psb.cabal fix dropping OverloadedRecordUpdate, without
which Psb.Main does not build.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
lists and task lists are a PITA to handle, I may need to handle them
myself in the future but that'll probably become clear via testing
rather than simply doing it as is because the parsing logic is annoying
This commit gets bundling to the point where it can be used now
TODO:
- Get ESBuild Stdout/stderr to not pop up in psb output
- figure out how to split off map files so I'm not shunting them into
script tags
Fixed three type errors preventing compilation:
- template_char: properly convert Tokens s to s for string literals and eol
- regex_literal: correctly apply fromString to parser result, not parser itself
- reg_first_char: use explicit list notation to resolve noneOf ambiguity
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
