a41400e532
Migrates parse-error usage-block rendering from the legacy `dsl::usage::matched_entry` (which scanned a `Vec<Token>` for the first matched Keyword) to walker-side lookup driven by each `CommandNode`'s `usage_ids` slice. `CommandNode.usage_id: Option<&'static str>` becomes `usage_ids: &'static [&'static str]`. Multi-form families (`drop`, `add`, `show`) carry every variant — `drop` lists table/column/relationship templates; `add` lists column / relationship; `show` lists data / table. The single-shape commands carry their single catalog key. App-lifecycle CommandNodes had pointed at non-existent `parse.usage.app.*` keys (never noticed because the field was unused); they now point at the real catalog entries (`parse.usage.quit`, `parse.usage.help`, …). New helpers in `dsl::grammar`: - `usage_keys_for_input(source) -> Option<(entry_word, usage_ids)>` resolves the first identifier-shape token to a CommandNode and returns its usage_ids list. Used by `app::render_usage_block` and `input_render::ambient_hint`. - `entry_words_alphabetised() -> Vec<&'static str>` replaces `dsl::usage::entry_keywords_alphabetised`. `dsl::usage` is deleted. The "available commands:" fallback in `render_usage_block` now formats entry words as `` `<word>` `` directly (matching the `parse.token.keyword.*` catalog renders); the per-keyword catalog wrappers will collapse in the next step (ADR-0024 §cleanup-pass §F). `parse_command` and `parse_tokens` slim down: - `parse_command(input)` no longer pre-lexes — the walker scans source bytes directly. - `parse_tokens` (internal-only `pub` for "future I3/I4 work") is removed; its body folded into `parse_command`. - `unknown_command_error` reads the walker registry directly. Touched modules also drop their `crate::dsl::lexer::lex` and `crate::dsl::usage` imports: `app.rs`, `input_render.rs`, `completion.rs`. Tests: 852 passing, 0 failing, 1 ignored (down from 860 because the 8 `dsl::usage::tests::*` tests are gone with the module).
263 lines
8.1 KiB
Rust
263 lines
8.1 KiB
Rust
//! App-lifecycle command nodes (ADR-0024 §migration Phase A).
|
|
//!
|
|
//! Eleven commands: quit, help, rebuild, save (+ save as), new,
|
|
//! load, export, import, mode, messages.
|
|
//!
|
|
//! Each block is one `CommandNode`: entry keyword, shape, AST
|
|
//! builder, help / usage references. The ast_builders match
|
|
//! against the `MatchedPath` items in declaration order.
|
|
|
|
use crate::dsl::command::{AppCommand, Command, MessagesValue, ModeValue};
|
|
use crate::dsl::grammar::{
|
|
CommandNode, IdentSource, IdentValidator, Node, ValidationError, Word,
|
|
};
|
|
use crate::dsl::walker::outcome::{MatchedKind, MatchedPath};
|
|
|
|
// --- Validators ----------------------------------------------------
|
|
//
|
|
// The catch-all `Ident` branches in `mode <value>` /
|
|
// `messages <value>` exist solely to convert any out-of-set
|
|
// identifier into a friendly `mode.unknown` / `messages.unknown`
|
|
// catalog wording. The known values are `Word` siblings in the
|
|
// same `Choice`, so they're never reached on the happy path —
|
|
// these validators always fail.
|
|
|
|
fn validate_unknown_mode(value: &str) -> Result<(), ValidationError> {
|
|
Err(ValidationError {
|
|
message_key: "mode.unknown",
|
|
args: vec![("value", value.to_string())],
|
|
})
|
|
}
|
|
|
|
fn validate_unknown_messages(value: &str) -> Result<(), ValidationError> {
|
|
Err(ValidationError {
|
|
message_key: "messages.unknown",
|
|
args: vec![("value", value.to_string())],
|
|
})
|
|
}
|
|
|
|
const UNKNOWN_MODE_VALIDATOR: IdentValidator = validate_unknown_mode;
|
|
const UNKNOWN_MESSAGES_VALIDATOR: IdentValidator = validate_unknown_messages;
|
|
|
|
// --- Shapes (constants are referenced by Optional/Choice slices) --
|
|
|
|
const SAVE_AS_WORD: Node = Node::Word(Word::keyword("as"));
|
|
|
|
const IMPORT_AS_TARGET: Node = Node::Seq(&[
|
|
Node::Word(Word::keyword("as")),
|
|
Node::Ident {
|
|
source: IdentSource::NewName,
|
|
role: "target",
|
|
validator: None,
|
|
highlight_override: None,
|
|
},
|
|
]);
|
|
const IMPORT_AS_TARGET_OPT: Node = Node::Optional(&IMPORT_AS_TARGET);
|
|
|
|
const IMPORT_PATH_AND_TARGET: Node = Node::Seq(&[Node::BarePath, IMPORT_AS_TARGET_OPT]);
|
|
|
|
const EXPORT_PATH_OPT: Node = Node::Optional(&Node::BarePath);
|
|
const IMPORT_BODY_OPT: Node = Node::Optional(&IMPORT_PATH_AND_TARGET);
|
|
|
|
// `mode <value>`: known keywords are surfaced as `Word` children
|
|
// so they appear in the walker's expected set (and feed the
|
|
// completion engine's keyword candidates). The trailing `Ident`
|
|
// child catches any other identifier shape and funnels it into
|
|
// the friendly `mode.unknown` validator.
|
|
const MODE_CHOICES: &[Node] = &[
|
|
Node::Word(Word::keyword("simple")),
|
|
Node::Word(Word::keyword("advanced")),
|
|
Node::Ident {
|
|
source: IdentSource::Free,
|
|
role: "mode_value",
|
|
validator: Some(UNKNOWN_MODE_VALIDATOR),
|
|
highlight_override: None,
|
|
},
|
|
];
|
|
const MODE_VALUE: Node = Node::Choice(MODE_CHOICES);
|
|
|
|
const MESSAGES_CHOICES: &[Node] = &[
|
|
Node::Word(Word::keyword("short")),
|
|
Node::Word(Word::keyword("verbose")),
|
|
Node::Ident {
|
|
source: IdentSource::Free,
|
|
role: "messages_value",
|
|
validator: Some(UNKNOWN_MESSAGES_VALIDATOR),
|
|
highlight_override: None,
|
|
},
|
|
];
|
|
const MESSAGES_VALUE: Node = Node::Choice(MESSAGES_CHOICES);
|
|
const MESSAGES_VALUE_OPT: Node = Node::Optional(&MESSAGES_VALUE);
|
|
|
|
const EMPTY_SEQ: Node = Node::Seq(&[]);
|
|
const SAVE_AS_OPT: Node = Node::Optional(&SAVE_AS_WORD);
|
|
|
|
// --- AST builders --------------------------------------------------
|
|
|
|
const fn build_quit(_path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
Ok(Command::App(AppCommand::Quit))
|
|
}
|
|
|
|
const fn build_help(_path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
Ok(Command::App(AppCommand::Help))
|
|
}
|
|
|
|
const fn build_rebuild(_path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
Ok(Command::App(AppCommand::Rebuild))
|
|
}
|
|
|
|
fn build_save(path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
if path.contains_word("as") {
|
|
Ok(Command::App(AppCommand::SaveAs))
|
|
} else {
|
|
Ok(Command::App(AppCommand::Save))
|
|
}
|
|
}
|
|
|
|
const fn build_new(_path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
Ok(Command::App(AppCommand::New))
|
|
}
|
|
|
|
const fn build_load(_path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
Ok(Command::App(AppCommand::Load))
|
|
}
|
|
|
|
fn build_export(path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
let bare = path
|
|
.find(|i| matches!(i.kind, MatchedKind::BarePath))
|
|
.map(|i| i.text.clone());
|
|
Ok(Command::App(AppCommand::Export { path: bare }))
|
|
}
|
|
|
|
fn build_import(path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
let bare_path = path
|
|
.find(|i| matches!(i.kind, MatchedKind::BarePath))
|
|
.map(|i| i.text.clone())
|
|
.unwrap_or_default();
|
|
let target = path
|
|
.find(|i| matches!(&i.kind, MatchedKind::Ident { role } if *role == "target"))
|
|
.map(|i| i.text.clone());
|
|
Ok(Command::App(AppCommand::Import {
|
|
path: bare_path,
|
|
target,
|
|
}))
|
|
}
|
|
|
|
fn build_mode(path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
// The Choice surfaces the matched value as either a `Word`
|
|
// (known) or an `Ident` (unknown). The unknown branch's
|
|
// validator always errors, so reaching the AST builder
|
|
// implies one of the Word branches matched.
|
|
let value = if path.contains_word("simple") {
|
|
ModeValue::Simple
|
|
} else if path.contains_word("advanced") {
|
|
ModeValue::Advanced
|
|
} else {
|
|
ModeValue::Simple
|
|
};
|
|
Ok(Command::App(AppCommand::Mode { value }))
|
|
}
|
|
|
|
fn build_messages(path: &MatchedPath) -> Result<Command, ValidationError> {
|
|
let value = if path.contains_word("short") {
|
|
Some(MessagesValue::Short)
|
|
} else if path.contains_word("verbose") {
|
|
Some(MessagesValue::Verbose)
|
|
} else {
|
|
None
|
|
};
|
|
Ok(Command::App(AppCommand::Messages { value }))
|
|
}
|
|
|
|
// --- Command nodes -------------------------------------------------
|
|
|
|
pub static QUIT: CommandNode = CommandNode {
|
|
entry: Word::keyword("quit"),
|
|
shape: EMPTY_SEQ,
|
|
ast_builder: build_quit,
|
|
help_id: Some("app.quit"),
|
|
usage_ids: &["parse.usage.quit"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static HELP: CommandNode = CommandNode {
|
|
entry: Word::keyword("help"),
|
|
shape: EMPTY_SEQ,
|
|
ast_builder: build_help,
|
|
help_id: Some("app.help"),
|
|
usage_ids: &["parse.usage.help"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static REBUILD: CommandNode = CommandNode {
|
|
entry: Word::keyword("rebuild"),
|
|
shape: EMPTY_SEQ,
|
|
ast_builder: build_rebuild,
|
|
help_id: Some("app.rebuild"),
|
|
usage_ids: &["parse.usage.rebuild"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static SAVE: CommandNode = CommandNode {
|
|
entry: Word::keyword("save"),
|
|
shape: SAVE_AS_OPT,
|
|
ast_builder: build_save,
|
|
help_id: Some("app.save"),
|
|
usage_ids: &["parse.usage.save"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static NEW: CommandNode = CommandNode {
|
|
entry: Word::keyword("new"),
|
|
shape: EMPTY_SEQ,
|
|
ast_builder: build_new,
|
|
help_id: Some("app.new"),
|
|
usage_ids: &["parse.usage.new"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static LOAD: CommandNode = CommandNode {
|
|
entry: Word::keyword("load"),
|
|
shape: EMPTY_SEQ,
|
|
ast_builder: build_load,
|
|
help_id: Some("app.load"),
|
|
usage_ids: &["parse.usage.load"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static EXPORT: CommandNode = CommandNode {
|
|
entry: Word::keyword("export"),
|
|
shape: EXPORT_PATH_OPT,
|
|
ast_builder: build_export,
|
|
help_id: Some("app.export"),
|
|
usage_ids: &["parse.usage.export"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static IMPORT: CommandNode = CommandNode {
|
|
entry: Word::keyword("import"),
|
|
shape: IMPORT_BODY_OPT,
|
|
ast_builder: build_import,
|
|
help_id: Some("app.import"),
|
|
usage_ids: &["parse.usage.import"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static MODE: CommandNode = CommandNode {
|
|
entry: Word::keyword("mode"),
|
|
shape: MODE_VALUE,
|
|
ast_builder: build_mode,
|
|
help_id: Some("app.mode"),
|
|
usage_ids: &["parse.usage.mode"],
|
|
hint_mode: None,
|
|
};
|
|
|
|
pub static MESSAGES: CommandNode = CommandNode {
|
|
entry: Word::keyword("messages"),
|
|
shape: MESSAGES_VALUE_OPT,
|
|
ast_builder: build_messages,
|
|
help_id: Some("app.messages"),
|
|
usage_ids: &["parse.usage.messages"],
|
|
hint_mode: None,
|
|
};
|