Repository navigation
build(deps)!: move to fig 7 and twig 6 - #2
Merged
Merged
Conversation
prov, flower and leaf have all moved to fig 7 and twig 6, which are pure Rust and keep embedding in twig (`twig::meta`) rather than fig. provui names fig directly and sits on all three, so it moves with them, onto one fig, one twig and one fig-schema. - fig 5 -> 7. `ProvBackend::set_body` no longer goes through fig's `Embed::replace_body`, which is gone: it keeps the text up to the end of the block's closing fence, as prov's `Document::split` finds it, and puts the new body after it. The comment ops reach fig's editor through prov's `MetaEditor`, whose fenced arm is twig's `Embed` now. - leaf comes from its twig 6 branch (`cc/modest-mendel-tw57ql`, diaryx-org/leaf#11) until that merges; the headings outline converts leaf's own `Format` to twig's handle. - fig-schema is patched to crates.io 0.5 for as long as prov's `main` takes it from git and flower from crates.io; otherwise the two `FieldType`s are different types. - The config schema offers what prov reads now: `metadata.embed` is `delimited` or `separate`, and `metadata.format` is a closed yaml/json/toml/figl, since no prov build lacks a format any more. - CI and the README stop installing and mentioning Zig. Behavioural-change: A document whose metadata is a `;;;` JSON block, a fenced code block, or an HTML `<script>`/`<pre><code>` island opens with no metadata, its whole text the body; only `---`, `+++` and `---<lang>` frontmatter is read, as in prov. Behavioural-change: The config schema no longer offers `code_block`, `html_script` or `html_code` for `metadata.embed`, and offers `figl` where it offered `fig` for `metadata.format`, which is now a closed choice: a value outside yaml/json/toml/figl is flagged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves provui to the new stack: prov
main(fig 7, twig 6), flowermain(fig 7, fig-schema 0.5), and leaf's twig 6 port. The build now has one fig 7.0.0, one twig-doc 6.0.0, one fig-schema 0.5.0 and one leaf-core (cargo tree -d).Before merging
Two temporary lines in
Cargo.tomlto undo:branch = "cc/modest-mendel-tw57ql", the branch of build(deps)!: move to twig 6 leaf#11. After that merges, set both tobranch = "main", remove the TEMPORARY comments, and runcargo update -p leaf-core -p leaf-ratatui.[patch."https://github.com/diaryx-org/fig-schema"]block at the bottom maps prov's git fig-schema onto 0.5 from crates.io, because provmainstill takes it from git while flower uses crates.io. After build(deps): take fig-schema 0.5 from crates.io prov#14 merges, delete that block and runcargo update -p prov.Changes
fig = "7"(was 5). prov and flower are updated onmain.ProvBackend:set_bodyno longer uses fig 5'sEmbed::replace_body, which is gone. It keeps the text through the closing fence (located withprov::Document::split) and puts the new body after it. New test.with_fig!macro is replaced byfig_editor/fig_editor_mut, which reach fig's editor through twig'sEmbedor prov's whole-file editor.session.rs: the headings outline converts leaf's ownFormatwith.twig().metadata.embedpicker offers onlydelimitedandseparate.metadata.formatis now a closed choice of yaml, json, toml and figl. It used to be open only because prov's format features were optional.FieldSpec.payloadandTerm.also_readsfields, and the JSON-comments test uses---json..config/ship.figlcomments and the README.Behavioural changes
Also recorded as
Behavioural-change:trailers on the commit.;;;JSON block, a fenced block or an HTML island opens with no metadata, and its whole text is the body. This matches prov.code_block,html_scriptorhtml_code. It offersfiglin place offig, and flags anymetadata.formatoutside yaml, json, toml and figl.Checks
Every job in
.config/ship.figlpasses locally:-D warnings)Generated by Claude Code