feat: Rust CLI improvements and HTTP lockfile example (#72)

* feat: combined CLI

* refactor and add example http lock

* http lock example

* include `search/witness.json`

* fix tests

* clean up basic lock file

.gitignore

@@ -9,4 +9,5 @@ circuits/test/*.circom
 circuits/main/*
 
 # Rust generated
-inputs/**/*.json
+inputs/**/*.json
+!inputs/search/witness.json

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "witness"
+name = "wpbuild"
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.204", features = ["derive"] }
-serde_json = "1.0.120"
-clap = { version = "4.5.14", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
+serde_json = "1.0.127"
+clap = { version = "4.5.16", features = ["derive"] }

circuits/test/json/extractor/extractor.test.ts

@@ -5,9 +5,9 @@ import { spawn } from "child_process";
 
 function executeCodegen(inputFilename: string, outputFilename: string) {
     return new Promise((resolve, reject) => {
-        const inputPath = join(__dirname, "..", "..", "..", "..", "examples", "json", "test", "codegen", inputFilename);
+        const inputPath = join(__dirname, "..", "..", "..", "..", "examples", "extractor", inputFilename);
 
-        const codegen = spawn("cargo", ["run", "--bin", "codegen", "--", "--json-file", inputPath, "--output-filename", outputFilename]);
+        const codegen = spawn("cargo", ["run", "extractor", "--template", inputPath, "--output-filename", outputFilename]);
 
         codegen.stdout.on('data', (data) => {
             console.log(`stdout: ${data}`);

examples/lockfile/test.lock.json

@@ -0,0 +1,27 @@
+{
+    "request": {
+        "method": "GET",
+        "target": "/api",
+        "version": "HTTP/1.1",
+        "headers": [
+            [
+                "Host",
+                "localhost"
+            ],
+            [
+                "Accept",
+                "application/json"
+            ]
+        ]
+    },
+    "response": {
+        "version": "HTTP/1.1",
+        "status": "200",
+        "headers": [
+            [
+                "Content-Type",
+                "application/json"
+            ]
+        ]
+    }
+}

src/bin/codegen.rs → src/extractor.rs

@@ -1,23 +1,14 @@
-use clap::Parser;
-use serde::{Deserialize, Serialize};
-use std::fs::{self, create_dir_all};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-#[derive(Parser, Debug)]
-#[command(name = "codegen")]
-struct Args {
-    /// Path to the JSON file
-    #[arg(short, long)]
-    json_file: PathBuf,
-
-    /// Output circuit file name
-    #[arg(short, long, default_value = "extractor")]
-    output_filename: String,
-}
+use std::{
+    fs::{self, create_dir_all},
+    str::FromStr,
+};
+
+use super::*;
+
+const PRAGMA: &str = "pragma circom 2.1.9;\n\n";
 
 #[derive(Debug, Deserialize)]
-enum ValueType {
+pub enum ValueType {
     #[serde(rename = "string")]
     String,
     #[serde(rename = "number")]
@@ -26,19 +17,17 @@ enum ValueType {
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(untagged)]
-enum Key {
+pub enum Key {
     String(String),
     Num(i64),
 }
 
 #[derive(Debug, Deserialize)]
-struct Data {
+pub struct Data {
     keys: Vec<Key>,
     value_type: ValueType,
 }
 
-const PRAGMA: &str = "pragma circom 2.1.9;\n\n";
-
 fn extract_string(data: Data, circuit_buffer: &mut String) {
     *circuit_buffer += "template ExtractStringValue(DATA_BYTES, MAX_STACK_HEIGHT, ";
     for (i, key) in data.keys.iter().enumerate() {
@@ -500,10 +489,8 @@ fn parse_json_request(
     Ok(())
 }
 
-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args = Args::parse();
-
-    let data = std::fs::read(&args.json_file)?;
+pub fn extractor(args: ExtractorArgs) -> Result<(), Box<dyn std::error::Error>> {
+    let data = std::fs::read(&args.template)?;
     let json_data: Data = serde_json::from_slice(&data)?;
 
     parse_json_request(json_data, args.output_filename)?;