From 62a9af05fdeda0a9c0a17fab1d55fcc80e97dda0 Mon Sep 17 00:00:00 2001 From: cflmy Date: Fri, 20 Nov 2026 10:36:07 +0800 Subject: [PATCH] feat(markdown,value): record code span delimiters, inert-executable code and profile refinements - md code nodes now carry `ticks` (delimiter length) so executable payload offsets inside code spans map back to exact source bytes instead of pointing at backticks; this keeps diagnostics precise for mixed text/code payloads. - value: add the markdown.inert_executable warning code and a small clippy fix, without changing the wire format. - spec: document the code-span tick metadata, declare strikethrough lazy, and make the inert-execution warning explicit for nodes outside any function. - workspace dependencies: add unicode-ident (grammar) and glob (capability path patterns) for the frontend/host layers. Tests: 15 markdown + 10 value + 2 span tests pass; fmt/clippy clean. --- Cargo.lock | 3 --- Cargo.toml | 2 ++ crates/marqdo-markdown/src/ast.rs | 12 ++++++++---- crates/marqdo-markdown/src/profile.rs | 8 ++++++-- crates/marqdo-markdown/src/text.rs | 6 +++--- crates/marqdo-value/src/diagnostic.rs | 3 +++ crates/marqdo-value/src/wire.rs | 2 +- spec/mapping.md | 9 ++++++++- spec/markdown-profile.md | 4 +++- 9 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9b9323..b951377 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -372,7 +372,6 @@ dependencies = [ "marqdo-markdown", "marqdo-span", "marqdo-value", - "serde", "serde_json", "sha2", "unicode-ident", @@ -421,13 +420,11 @@ dependencies = [ name = "marqdo-math" version = "0.1.0" dependencies = [ - "marqdo-span", "marqdo-value", "num-bigint 0.5.1", "num-rational", "num-traits", "serde", - "thiserror", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 87f6940..eee9af4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,4 +55,6 @@ tempfile = "3" thiserror = "2" clap = { version = "4", features = ["derive"] } walkdir = "2" +glob = "0.3" unicode-normalization = "0.1" +unicode-ident = "1" diff --git a/crates/marqdo-markdown/src/ast.rs b/crates/marqdo-markdown/src/ast.rs index 58f7570..1dc12fc 100644 --- a/crates/marqdo-markdown/src/ast.rs +++ b/crates/marqdo-markdown/src/ast.rs @@ -74,8 +74,12 @@ pub enum MdKind { Emph, /// GFM strikethrough. Strikethrough, - /// Inline code span. - Code, + /// Inline code span. `ticks` records the delimiter length so the literal + /// payload can be mapped back to exact source offsets. + Code { + /// Number of backtick delimiters. + ticks: usize, + }, /// Fenced or indented code block. CodeBlock { /// Whether the block was fenced. @@ -176,7 +180,7 @@ impl MdNode { | MdKind::Strong | MdKind::Emph | MdKind::Strikethrough - | MdKind::Code + | MdKind::Code { .. } | MdKind::Math { .. } | MdKind::Link { .. } | MdKind::Image { .. } @@ -208,7 +212,7 @@ impl MdKind { MdKind::Strong => "strong", MdKind::Emph => "emph", MdKind::Strikethrough => "strikethrough", - MdKind::Code => "code", + MdKind::Code { .. } => "code", MdKind::CodeBlock { .. } => "code_block", MdKind::Math { .. } => "math", MdKind::MathBlock => "math_block", diff --git a/crates/marqdo-markdown/src/profile.rs b/crates/marqdo-markdown/src/profile.rs index 304f7d7..e13ae34 100644 --- a/crates/marqdo-markdown/src/profile.rs +++ b/crates/marqdo-markdown/src/profile.rs @@ -169,7 +169,12 @@ fn map_value(value: &NodeValue) -> (MdKind, Option) { NodeValue::Strong(_) => (MdKind::Strong, None), NodeValue::Emph(_) => (MdKind::Emph, None), NodeValue::Strikethrough(_) => (MdKind::Strikethrough, None), - NodeValue::Code(code) => (MdKind::Code, Some(code.literal.clone())), + NodeValue::Code(code) => ( + MdKind::Code { + ticks: code.num_backticks, + }, + Some(code.literal.clone()), + ), NodeValue::CodeBlock(block) => ( MdKind::CodeBlock { fenced: block.fenced, @@ -209,7 +214,6 @@ fn map_value(value: &NodeValue) -> (MdKind, Option) { TableAlignment::Center => "center", TableAlignment::Right => "right", TableAlignment::None => "none", - _ => "none", } .to_string() }) diff --git a/crates/marqdo-markdown/src/text.rs b/crates/marqdo-markdown/src/text.rs index 320fc0b..9646e1a 100644 --- a/crates/marqdo-markdown/src/text.rs +++ b/crates/marqdo-markdown/src/text.rs @@ -44,7 +44,7 @@ pub fn executable_payload(node: &MdNode) -> Result { for child in &node.children { match &child.kind { MdKind::Text => payload.push_str(child.literal.as_deref().unwrap_or_default()), - MdKind::Code => payload.push_str(child.literal.as_deref().unwrap_or_default()), + MdKind::Code { .. } => payload.push_str(child.literal.as_deref().unwrap_or_default()), other => { return Err(PayloadError::new( child.span, @@ -72,7 +72,7 @@ pub fn plain_text(node: &MdNode) -> String { fn collect_plain_text(node: &MdNode, out: &mut String) { match &node.kind { - MdKind::Text | MdKind::Code | MdKind::Math { .. } | MdKind::MathBlock => { + MdKind::Text | MdKind::Code { .. } | MdKind::Math { .. } | MdKind::MathBlock => { out.push_str(node.literal.as_deref().unwrap_or_default()); } MdKind::SoftBreak | MdKind::LineBreak => out.push(' '), @@ -131,7 +131,7 @@ mod tests { None, vec![ node(MdKind::Text, Some("面积 = "), vec![]), - node(MdKind::Code, Some("计算(r=1)"), vec![]), + node(MdKind::Code { ticks: 1 }, Some("计算(r=1)"), vec![]), ], ); assert_eq!(executable_payload(&strong).unwrap(), "面积 = 计算(r=1)"); diff --git a/crates/marqdo-value/src/diagnostic.rs b/crates/marqdo-value/src/diagnostic.rs index 105824b..480e163 100644 --- a/crates/marqdo-value/src/diagnostic.rs +++ b/crates/marqdo-value/src/diagnostic.rs @@ -8,6 +8,9 @@ use serde::{Deserialize, Serialize}; pub mod codes { /// A Markdown AST node occupies an executable position but has an invalid shape. pub const MARKDOWN_INVALID_CONSTRUCT: &str = "markdown.invalid_construct"; + /// A node that would be executable appears outside any function body and is + /// therefore inert document content. + pub const MARKDOWN_INERT_EXECUTABLE: &str = "markdown.inert_executable"; /// Front matter is malformed or appears somewhere other than the document start. pub const FRONTMATTER_INVALID: &str = "frontmatter.invalid"; /// An executable payload failed to parse as an expression or statement. diff --git a/crates/marqdo-value/src/wire.rs b/crates/marqdo-value/src/wire.rs index e53f4e8..efe891b 100644 --- a/crates/marqdo-value/src/wire.rs +++ b/crates/marqdo-value/src/wire.rs @@ -172,7 +172,7 @@ fn decode(json: &Json, depth: usize, limits: &WireLimits) -> Result Ok(Value::Unit), diff --git a/spec/mapping.md b/spec/mapping.md index 5342963..843c2bb 100644 --- a/spec/mapping.md +++ b/spec/mapping.md @@ -50,6 +50,8 @@ content is never executed: * heading text (headings scope, they do not run) * `link` labels and `image` alt text * `table` cells (tables are document values) +* `strikethrough` wrappers: their content is inert prose and is not traversed + for execution; do not rely on formatting to hide executable nodes * `code_block` and inline `code` outside designated payload positions * `math` / `math_block` * `html_block` / `html_inline` @@ -78,7 +80,12 @@ including inside branch and loop bodies: Outside functions (module top-level prose) the same executable nodes are inert document content (S-03 in the blueprint: executable lists/strong/emph only run inside a function body). The single exception is `main` itself, which is a -function. +function. To make this explicit rather than silent, the frontend emits a +`markdown.inert_executable` **warning** for every would-be execution node found +outside a function body; the document still compiles and the node does nothing. + +Headings inside container blocks (block quotes, list items) or fenced code never +create functions and never execute inline markup. ### 4.1 Strict payload extraction diff --git a/spec/markdown-profile.md b/spec/markdown-profile.md index 76e0ac2..671fc91 100644 --- a/spec/markdown-profile.md +++ b/spec/markdown-profile.md @@ -97,7 +97,9 @@ Rules: `raw` payload of unmodelled nodes. * `link`/`image` embed `url` and `title`; `heading` embeds `level` and `setext`; `list` embeds `ordered`, optional `start` and `tight`; `table` - embeds column `alignments`; `table_row` embeds `header`. + embeds column `alignments`; `table_row` embeds `header`; inline `code` + embeds `ticks` (delimiter length) so payload offsets can be mapped back to + exact source bytes (a code span's source span includes its backticks). * Unmodelled parser nodes are preserved as `{"kind":"other","tag":"..."}` with their children and raw literal. They are inert for the language. * Attribute order in JSON is fixed by the serializer and goldens are