feat(compiler): Target-neutral emission and Rust code generation

.prettierignore

@@ -3,3 +3,6 @@ tree-sitter-plotnik/src/
 
 # Generated by `make wasm-web`
 web/src/lib/plotnik-wasm/
+
+# Generated by `make shot` through the VM-oracle exporter
+conformance/corpus/

Cargo.toml

@@ -11,14 +11,14 @@ members = [
 ]
 
 [workspace.package]
-version = "0.3.3"
+version = "0.4.0"
 license = "Apache-2.0"
 repository = "https://github.com/plotnik-lang/plotnik"
 edition = "2024"
 
 [workspace.dependencies]
-plotnik-lib = { path = "crates/plotnik-lib", version = "0.3.3" }
-plotnik-rt = { path = "crates/plotnik-rt", version = "0.3.3", default-features = false }
+plotnik-lib = { path = "crates/plotnik-lib", version = "0.4.0" }
+plotnik-rt = { path = "crates/plotnik-rt", version = "0.4.0", default-features = false }
 
 [workspace.lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }

README.md

@@ -75,7 +75,7 @@ dynamic values:
 
 ```toml
 [dependencies]
-plotnik = "0.3"
+plotnik = "0.4"
 tree-sitter-javascript = "0.25"
 ```
 

crates/plotnik-cli/Cargo.toml

@@ -254,7 +254,7 @@ lang-zsh = ["dep:arborium-zsh"]
 [dependencies]
 clap = { version = "4.5", features = ["derive", "string"] }
 clap_complete = "4.5"
-plotnik-lib = { path = "../plotnik-lib", version = "0.3.3", default-features = false, features = ["vm"] }
+plotnik-lib = { path = "../plotnik-lib", version = "0.4.0", default-features = false, features = ["vm"] }
 serde_json = "1"
 tree-sitter = "0.26.10"
 # @generated:lang-deps:begin
@@ -379,7 +379,7 @@ libc = "0.2"
 [build-dependencies]
 cargo_metadata = "0.23"
 flate2 = "1.1"
-plotnik-lib = { path = "../plotnik-lib", version = "0.3.3", default-features = false }
+plotnik-lib = { path = "../plotnik-lib", version = "0.4.0", default-features = false }
 
 [dev-dependencies]
 indoc = "=2.0.7"

crates/plotnik-cli/build.rs

@@ -76,6 +76,10 @@ fn main() {
             env_key,
             out_path.display()
         );
+        println!(
+            "cargo::rustc-env=PLOTNIK_GRAMMAR_SOURCE_{}={}@{}",
+            env_key, package.name, package.version
+        );
         println!("cargo::rerun-if-changed={grammar_path}");
     }
 

crates/plotnik-cli/src/cli/args.rs

@@ -8,6 +8,8 @@ use std::path::PathBuf;
 
 use clap::{Arg, ArgAction, value_parser};
 
+use crate::commands::generate::GenerateTarget;
+
 pub fn query_path_arg() -> Arg {
     Arg::new("query_path")
         .value_name("QUERY")
@@ -122,6 +124,24 @@ pub fn output_file_arg() -> Arg {
         .help("Write output to file")
 }
 
+pub fn target_arg() -> Arg {
+    Arg::new("target")
+        .long("target")
+        .value_name("TARGET")
+        .value_parser(value_parser!(GenerateTarget))
+        .required(true)
+        .help("Generated-code target (rust)")
+}
+
+pub fn grammar_arg() -> Arg {
+    Arg::new("grammar")
+        .long("grammar")
+        .value_name("GRAMMAR_JSON")
+        .value_parser(value_parser!(PathBuf))
+        .conflicts_with("lang")
+        .help("Link against this exact grammar.json instead of the registry")
+}
+
 pub fn compact_arg() -> Arg {
     Arg::new("compact")
         .long("compact")

crates/plotnik-cli/src/cli/commands.rs

@@ -71,13 +71,44 @@ Run 'plotnik <command> --help' for examples."#,
         .subcommand(check_command())
         .subcommand(ast_command())
         .subcommand(infer_command())
+        .subcommand(generate_command())
         .subcommand(dump_command())
         .subcommand(trace_command())
         .subcommand(inspect_command())
         .subcommand(lang_command())
         .subcommand(completions_command())
 }
 
+pub fn generate_command() -> Command {
+    Command::new("generate")
+        .about("Generate a compiled matcher module")
+        .override_usage(
+            "\
+  plotnik generate <QUERY> --target rust -l <LANG>
+  plotnik generate <QUERY> --target rust --grammar <grammar.json>
+  plotnik generate -q <TEXT> --target rust -l <LANG>",
+        )
+        .after_help(
+            r#"EXAMPLES:
+  plotnik generate query.ptk --target rust -l typescript
+  plotnik generate query.ptk --target rust --grammar node_modules/tree-sitter-typescript/typescript/src/grammar.json
+  plotnik generate query.ptk --target rust -l javascript -o query.rs
+
+The generated module depends on the `plotnik-rt` crate and records the exact
+grammar name, SHA-256, and source used during linking."#,
+        )
+        .arg(query_path_arg())
+        .next_help_heading("Input options")
+        .arg(query_text_arg())
+        .arg(lang_arg())
+        .arg(grammar_arg())
+        .next_help_heading("Generation options")
+        .arg(target_arg())
+        .arg(output_file_arg())
+        .next_help_heading("Global options")
+        .arg(color_arg())
+}
+
 pub fn ast_command() -> Command {
     let cmd = Command::new("ast")
         .about("Show AST of query and/or source file")

crates/plotnik-cli/src/cli/dispatch.rs

@@ -16,6 +16,7 @@ use super::limits::resolve_limit_spec;
 use crate::commands::ast::AstArgs;
 use crate::commands::check::CheckArgs;
 use crate::commands::dump::DumpArgs;
+use crate::commands::generate::{GenerateArgs, GenerateTarget};
 use crate::commands::infer::InferArgs;
 use crate::commands::inspect::InspectArgs;
 use crate::commands::run::RunArgs;
@@ -188,6 +189,47 @@ impl From<InferOpts> for InferArgs {
     }
 }
 
+pub struct GenerateOpts {
+    pub query_path: Option<PathBuf>,
+    pub query_text: Option<String>,
+    pub lang: Option<String>,
+    pub grammar: Option<PathBuf>,
+    pub target: GenerateTarget,
+    pub output: Option<PathBuf>,
+    pub color: ColorChoice,
+}
+
+impl GenerateOpts {
+    pub fn from_matches(m: &ArgMatches) -> Self {
+        Self {
+            query_path: m.get_one::<PathBuf>("query_path").cloned(),
+            query_text: m.get_one::<String>("query_text").cloned(),
+            lang: m.get_one::<String>("lang").cloned(),
+            grammar: m.get_one::<PathBuf>("grammar").cloned(),
+            target: m
+                .get_one::<GenerateTarget>("target")
+                .copied()
+                .expect("clap guarantees --target is present"),
+            output: m.get_one::<PathBuf>("output").cloned(),
+            color: ColorChoice::from_matches(m),
+        }
+    }
+}
+
+impl From<GenerateOpts> for GenerateArgs {
+    fn from(options: GenerateOpts) -> Self {
+        Self {
+            query_path: options.query_path,
+            query_text: options.query_text,
+            lang: options.lang,
+            grammar: options.grammar,
+            target: options.target,
+            output: options.output,
+            color: options.color.should_colorize(),
+        }
+    }
+}
+
 pub struct RunOpts {
     pub query_path: Option<PathBuf>,
     pub query_text: Option<String>,