wip

Author: NathanFlurry

.github/workflows/pkg-pr-new.yaml

@@ -1,5 +1,8 @@
 on:
   pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   publish:
@@ -15,5 +18,5 @@ jobs:
         run: pnpm build
         working-directory: ./typescript
       - name: Publish preview packages
-        run: pnpm dlx pkg-pr-new publish 'compiler' 'vbare' --packageManager pnpm
+        run: pnpm dlx pkg-pr-new publish 'vbare-compiler' 'vbare' --packageManager pnpm
         working-directory: ./typescript

rust/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["bare-gen", "compiler", "vbare"]
+members = ["bare-gen", "vbare-compiler", "vbare"]
 resolver = "2"
 
 [workspace.package]

rust/compiler/src/lib.rs

@@ -1,5 +1,5 @@
 [package]
-name = "compiler"
+name = "vbare-compiler"
 version.workspace = true
 edition.workspace = true
 

rust/compiler/Cargo.toml renamed to rust/vbare-compiler/Cargo.toml

@@ -0,0 +1,58 @@
+use std::{fs, path::Path};
+use indoc::formatdoc;
+
+/// Process BARE schema files and generate Rust code.
+///
+/// This function is designed to be called from a build.rs script.
+/// It automatically uses the OUT_DIR environment variable and sets up
+/// cargo:rerun-if-changed for the schema directory.
+pub fn process_schemas(schema_dir: &Path) -> Result<(), Box<dyn std::error::Error>> {
+    let out_dir = std::env::var("OUT_DIR")?;
+    let out_path = Path::new(&out_dir);
+
+    println!("cargo:rerun-if-changed={}", schema_dir.display());
+
+    let mut all_names = Vec::new();
+
+    for entry in fs::read_dir(schema_dir)?.flatten() {
+        let path = entry.path();
+
+        if path.is_dir() {
+            continue;
+        }
+
+        let bare_name = path
+            .file_name()
+            .ok_or("No file name")?
+            .to_str()
+            .ok_or("Invalid UTF-8 in file name")?
+            .rsplit_once('.')
+            .ok_or("No file extension")?
+            .0;
+
+        let tokens = bare_gen::bare_schema(&path);
+        let ast = syn::parse2(tokens)?;
+        let content = prettyplease::unparse(&ast);
+
+        fs::write(out_path.join(format!("{bare_name}_generated.rs")), content)?;
+
+        all_names.push(bare_name.to_string());
+    }
+
+    let mut mod_content = String::new();
+    mod_content.push_str("// Auto-generated module file for schemas\n\n");
+
+    for name in all_names {
+        mod_content.push_str(&formatdoc!(
+            r#"
+            pub mod {name} {{
+                include!(concat!(env!("OUT_DIR"), "/{name}_generated.rs"));
+            }}
+            "#,
+        ));
+    }
+
+    fs::write(out_path.join("combined_imports.rs"), mod_content)?;
+
+    Ok(())
+}

rust/compiler/examples/build_script_usage.rs renamed to rust/vbare-compiler/examples/build_script_usage.rs

@@ -1,3 +1,3 @@
 packages:
-  - 'compiler'
+  - 'vbare-compiler'
   - 'vbare'