Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
743 changes: 579 additions & 164 deletions Cargo.lock

Large diffs are not rendered by default.

50 changes: 37 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = ["crates/*", "cells/*", "xtask", "libs/marq"]
default-members = ["crates/*", "cells/*"]
members = ["crates/*", "cells/*", "xtask", "libs/marq", "libs/gingembre", "libs/gingembre-syntax", "libs/picante", "libs/picante-macros"]
default-members = ["crates/*", "cells/*", "libs/gingembre", "libs/gingembre-syntax", "libs/picante", "libs/picante-macros"]
exclude = [
"libs/aasvg",
"libs/fontcull/fontcull",
Expand Down Expand Up @@ -77,22 +77,30 @@ hotmeal = { path = "libs/hotmeal/hotmeal" }
hotmeal-server = { path = "libs/hotmeal/hotmeal-server", features = ["tracing"] }
hotmeal-wasm = { path = "libs/hotmeal/hotmeal-wasm" }

facet = { version = "0.50.0-rc.5", features = ["camino"] }
facet-default = "0.50.0-rc.5"
facet-format = "0.50.0-rc.5"
facet-json = "0.50.0-rc.5"
facet-postcard = "0.50.0-rc.5"
facet-toml = "0.50.0-rc.5"
facet-value = "0.50.0-rc.5"
facet-yaml = "0.50.0-rc.5"
gingembre = "0.0.1"
gingembre-syntax = "0.0.1"
cstree = { version = "0.14.0", features = ["derive"] }
divan = { package = "codspeed-divan-compat", version = "4.7.0" }
facet = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8", features = ["camino"] }
facet-core = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-hash = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-reflect = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-default = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-format = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-json = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-postcard = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-toml = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-value = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
facet-yaml = { git = "https://github.com/facet-rs/facet", rev = "5705fa6c51289bea49f5729c52dc5e23cedce4f8" }
gingembre = { path = "libs/gingembre", version = "0.0.1" }
gingembre-syntax = { path = "libs/gingembre-syntax", version = "0.0.1" }

facet-styx = "5.0.0-rc.5"
styx-embed = "5.0.0-rc.5"
styx-tree = "5.0.0-rc.5"

figue = "5.0.0-rc.5"
hashbrown = { version = "0.17", features = ["raw-entry"] }
heck = "0.5"
im = "15.1"

# RPC framework
# Minimal by default: protocol crates and the DevTools bridge need the service
Expand All @@ -106,7 +114,14 @@ vox-stream = "0.10.0-rc.5"
ur-taking-me-with-you = { version = "8.0.1", features = ["tokio"] }

# Incremental computation
picante = "3.0.0-rc.5"
picante = { path = "libs/picante", version = "3.0.0-rc.5" }
picante-macros = { path = "libs/picante-macros", version = "3.0.0-rc.5" }
parking_lot = "0.12.4"
proc-macro2 = "1"
quote = "1"
tokio-test-lite = "0.2"
trybuild = "1"
unsynn = "0.3"

# File system
fs-err = "3"
Expand Down Expand Up @@ -225,6 +240,15 @@ hakoniwa = "1.2"

[workspace.package]
rust-version = "1.92"
edition = "2024"
license = "MIT OR Apache-2.0"
repository = "https://github.com/bearcove/dodeca"

[workspace.lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(facet_no_doc)", "cfg(kani)"] }

[workspace.lints.clippy]
disallowed_methods = "deny"

# Force all direct and transitive Facet dependencies to use the local checkout
# while developing against unreleased facet-styx fixes.
Expand Down
18 changes: 18 additions & 0 deletions libs/gingembre-syntax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.0.1](https://github.com/facet-rs/facet/compare/gingembre-syntax-v0.0.0...gingembre-syntax-v0.0.1) - 2026-06-28

### Added

- copy gingembre and gingembre-syntax into facet workspace (step 1)

### Fixed

- fix CI for margin and gingembre
15 changes: 15 additions & 0 deletions libs/gingembre-syntax/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "gingembre-syntax"
version = "0.0.1"
edition = "2024"
rust-version = "1.91"
description = "Lossless cstree syntax for gingembre templates, shared by the engine and the authoring LSP"
license = "MIT OR Apache-2.0"

[package.metadata]

[package.metadata."docs.rs"]
rustdoc-args = ["--html-in-header", "arborium-header.html"]

[dependencies]
cstree = { workspace = true }
2 changes: 2 additions & 0 deletions libs/gingembre-syntax/arborium-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!-- Rustdoc doesn't highlight some languages natively -- let's do it ourselves: https://github.com/bearcove/arborium -->
<script defer src="https://cdn.jsdelivr.net/npm/@arborium/arborium@2/dist/arborium.iife.js"></script>
45 changes: 45 additions & 0 deletions libs/gingembre-syntax/examples/check_ftl.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//! Parse every .jinja template under a directory; report parse errors and any
//! lossless violations. Usage: cargo run -p gingembre-syntax --example check_ftl -- <dir>
use std::path::Path;

fn walk(dir: &Path, out: &mut Vec<std::path::PathBuf>) {
for e in std::fs::read_dir(dir).unwrap().flatten() {
let p = e.path();
if p.is_dir() {
walk(&p, out);
} else if p.extension().is_some_and(|x| x == "jinja") {
out.push(p);
}
}
}

fn main() {
let dir = std::env::args().nth(1).expect("need a dir");
let mut files = Vec::new();
walk(Path::new(&dir), &mut files);
files.sort();
let (mut ok, mut err_files) = (0usize, 0usize);
for f in &files {
let src = std::fs::read_to_string(f).unwrap();
let parse = gingembre_syntax::parse(&src);
let lossless = parse.syntax().to_string() == src;
if parse.errors.is_empty() && lossless {
ok += 1;
} else {
err_files += 1;
let rel = f.strip_prefix(&dir).unwrap_or(f).display();
if !lossless {
println!("LOSSLESS VIOLATION: {rel}");
}
for e in parse.errors.iter().take(4) {
println!(" {rel}:{} {}", e.offset, e.message);
}
}
}
println!(
"\n{} templates: {} clean, {} with issues",
files.len(),
ok,
err_files
);
}
Loading
Loading