feat(cli): marqdo init/run/call/check/inspect/fmt/plugin/lock/sync
Composition root wiring the frontend, runtime, host and package layers: - Project loader: deterministic project-root discovery, explicit front-matter imports only (`@dependency` or relative `.mq.md`), recursive module loading with cycle diagnostics, resolved import edges and cross-module call checks. Loading never executes anything. - run/call: sandbox mode enforcement (strict refuses when unavailable), explicit capability grants, fuel/stack/output/timeout overrides, typed `--arg name=value` constants, program stdout separated from diagnostics, and machine-readable JSON output that embeds program output without mixing. - check: static diagnostics only, human-readable locations with source lines and stable machine codes in JSON. - inspect: canonical AST, heading units, signatures (explicit/inferred), executable IR, static reference edges (including cross-file links analysed without execution) and platform capability report. - fmt: conservative, AST-preserving normalisation of line endings and trailing newlines; --check mode. - plugin inspect: manifest/ABI/artifact validation and hash verification, never loading plugin code. - init: minimal project (manifest, entry document, .gitignore). - lock/sync --locked: deterministic path-dependency lockfile, stale lock or changed dependency content is an error (no silent upgrades). - examples: hello, factorial, math formula, Python foreign call, static references and a two-module project with an explicit import.
This commit is contained in:
1 parent
2e49c7b855
commit
e1ba630068
18 files changed
+1803
-28
No files matched your search
@@ -0,0 +1,97 @@
|
||||
//! Conversion of `--arg name=value` CLI arguments into typed values.
|
||||
//!
|
||||
//! Arguments use the expression grammar restricted to compile-time constants:
|
||||
//! `--arg n=3`, `--arg name="小明"`, `--arg flags=[1, 2]`. There is no implicit
|
||||
//! text fallback: invalid values are usage errors.
|
||||
|
||||
use marqdo_expression::{parse_expression, Expr, UnaryOp};
|
||||
use marqdo_value::Value;
|
||||
|
||||
/// Parse one `name=value` argument pair.
|
||||
pub fn parse_named_arg(raw: &str) -> Result<(String, Value), String> {
|
||||
let Some((name, value)) = raw.split_once('=') else {
|
||||
return Err(format!("argument `{raw}` must be `name=value`"));
|
||||
};
|
||||
let name = name.trim();
|
||||
if name.is_empty() {
|
||||
return Err(format!("argument `{raw}` has an empty name"));
|
||||
}
|
||||
let value = parse_const_value(value.trim())?;
|
||||
Ok((name.to_string(), value))
|
||||
}
|
||||
|
||||
/// Parse a constant expression into a value.
|
||||
pub fn parse_const_value(text: &str) -> Result<Value, String> {
|
||||
let expr = parse_expression(text).map_err(|error| {
|
||||
format!(
|
||||
"invalid argument value `{text}`: {} (strings need double quotes)",
|
||||
error.message
|
||||
)
|
||||
})?;
|
||||
const_value(&expr).ok_or_else(|| {
|
||||
format!("argument value `{text}` must be a literal constant (no calls or variables)")
|
||||
})
|
||||
}
|
||||
|
||||
fn const_value(expr: &Expr) -> Option<Value> {
|
||||
match expr {
|
||||
Expr::Int(value) => Some(Value::Int(value.clone())),
|
||||
Expr::Float(value) => Some(Value::Float(*value)),
|
||||
Expr::Text(value) => Some(Value::Text(value.clone())),
|
||||
Expr::Bool(value) => Some(Value::Bool(*value)),
|
||||
Expr::None => Some(Value::None),
|
||||
Expr::List(items) => items
|
||||
.iter()
|
||||
.map(const_value)
|
||||
.collect::<Option<Vec<Value>>>()
|
||||
.map(Value::List),
|
||||
Expr::Record(entries) => {
|
||||
let mut map = std::collections::BTreeMap::new();
|
||||
for entry in entries {
|
||||
map.insert(entry.key.clone(), const_value(&entry.value)?);
|
||||
}
|
||||
Some(Value::Map(map))
|
||||
}
|
||||
Expr::Unary {
|
||||
op: UnaryOp::Neg,
|
||||
operand,
|
||||
..
|
||||
} => match const_value(operand)? {
|
||||
Value::Int(value) => Some(Value::Int(-value)),
|
||||
Value::Float(value) => Some(Value::Float(-value)),
|
||||
_ => None,
|
||||
},
|
||||
Expr::Unary {
|
||||
op: UnaryOp::Pos,
|
||||
operand,
|
||||
..
|
||||
} => const_value(operand),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parses_typed_arguments() {
|
||||
assert_eq!(parse_named_arg("n=3").unwrap().1, Value::int(3));
|
||||
assert_eq!(
|
||||
parse_named_arg("s=\"你好\"").unwrap().1,
|
||||
Value::text("你好")
|
||||
);
|
||||
assert_eq!(parse_named_arg("f=-1.5").unwrap().1, Value::Float(-1.5));
|
||||
assert!(matches!(
|
||||
parse_named_arg("l=[1, 2]").unwrap().1,
|
||||
Value::List(_)
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_non_constant_and_malformed_arguments() {
|
||||
assert!(parse_named_arg("n=f(1)").is_err());
|
||||
assert!(parse_named_arg("n=裸文本").is_err());
|
||||
assert!(parse_named_arg("plain").is_err());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user