registry made more universal

Author: milyin

prebindgen-ext/src/core/mod.rs

@@ -1,7 +1,8 @@
 //! Core: language-agnostic primitives for the Registry-based pipeline.
 //!
-//! Public entry point: [`registry::Registry::from_source`] scans a
-//! `prebindgen::Source` into a flat type table; [`registry::Registry::write_rust`]
+//! Public entry point: [`registry::Registry::from_items`] scans a stream
+//! of `(syn::Item, SourceLocation)` into a flat type table;
+//! [`registry::Registry::write_rust`]
 //! resolves every required type using the configured
 //! [`prebindgen_ext::PrebindgenExt`] and emits the bindings file. Kotlin
 //! emission for the JNI back-end lives in `crate::jni::JniExt::write_kotlin`.

prebindgen-ext/src/core/registry.rs

@@ -16,7 +16,7 @@
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 
-use prebindgen::{Source, SourceLocation};
+use prebindgen::SourceLocation;
 use quote::ToTokens;
 
 use crate::core::niches::Niches;
@@ -233,12 +233,20 @@ impl From<crate::core::write::WriteError> for WriteRustError {
 }
 
 impl Registry {
-    /// Construct a `Registry` by scanning a `prebindgen::Source`.
-    pub fn from_source(source: &Source) -> Result<Self, ScanError> {
+    /// Construct a `Registry` by scanning a stream of source items.
+    ///
+    /// Callers feed any `(syn::Item, SourceLocation)` iterator — typically
+    /// `source.items_all()`, `source.items_except_groups(...)`, or a
+    /// hand-rolled filter chain — so item-level selection happens upstream
+    /// of the registry rather than inside it.
+    pub fn from_items<I>(items: I) -> Result<Self, ScanError>
+    where
+        I: IntoIterator<Item = (syn::Item, SourceLocation)>,
+    {
         let mut registry = Registry::default();
 
         // Phase 1 — index all items.
-        for (item, loc) in source.items_all() {
+        for (item, loc) in items {
             registry.index_item(item, loc)?;
         }
 

prebindgen-ext/src/lib.rs

@@ -1,7 +1,9 @@
 //! Registry-based universal converter pipeline for `#[prebindgen]` items.
 //!
 //! Pipeline:
-//!   1. [`core::Registry::from_source`] scans a `prebindgen::Source`.
+//!   1. [`core::Registry::from_items`] scans a stream of
+//!      `(syn::Item, SourceLocation)` (typically `source.items_all()`,
+//!      with optional upstream filtering).
 //!   2. [`core::Registry::write_rust`] resolves every required type via
 //!      a configured [`core::prebindgen_ext::PrebindgenExt`] and writes
 //!      the generated Rust bindings file. Language-agnostic — any

zenoh-jni/build.rs

@@ -161,7 +161,7 @@ fn main() {
 
     // ── Write Rust bindings ───────────────────────────────────────────
     let source = prebindgen::Source::new(zenoh_flat::PREBINDGEN_OUT_DIR);
-    let mut registry = Registry::from_source(&source).expect("scan failed");
+    let mut registry = Registry::from_items(source.items_all()).expect("scan failed");
     let rust_path = registry
         .write_rust(&jni, "zenoh_flat_jni.rs")
         .expect("write rust failed");