remove builder argument in select_buffers; add test for select_buffers with json buffers

Signed-off-by: Teo Koon Peng <[email protected]>

Author: koonpeng

macros/src/buffer.rs

@@ -35,14 +35,13 @@ pub(crate) fn impl_joined_value(input_struct: &ItemStruct) -> Result<TokenStream
 
         impl #impl_generics #struct_ident #ty_generics #where_clause {
             fn select_buffers(
-                builder: &mut ::bevy_impulse::Builder,
                 #(
-                    #field_ident: impl ::bevy_impulse::Bufferable<BufferType = ::bevy_impulse::Buffer<#field_type>>,
+                    #field_ident: ::bevy_impulse::Buffer<#field_type>,
                 )*
             ) -> #buffer_struct_ident #ty_generics {
                 #buffer_struct_ident {
                     #(
-                        #field_ident: #field_ident.into_buffer(builder),
+                        #field_ident,
                     )*
                 }
             }

src/buffer/buffer_map.rs

@@ -375,7 +375,6 @@ mod tests {
             let buffer_generic = builder.create_buffer(BufferSettings::default());
 
             let buffers = TestJoinedValue::select_buffers(
-                builder,
                 buffer_i64,
                 buffer_f64,
                 buffer_string,
@@ -407,6 +406,55 @@ mod tests {
         assert!(context.no_unhandled_errors());
     }
 
+    #[test]
+    fn test_select_buffers_json() {
+        let mut context = TestingContext::minimal_plugins();
+
+        let workflow = context.spawn_io_workflow(|scope, builder| {
+            let buffer_i64 =
+                JsonBuffer::from(builder.create_buffer::<i64>(BufferSettings::default()));
+            let buffer_f64 =
+                JsonBuffer::from(builder.create_buffer::<f64>(BufferSettings::default()));
+            let buffer_string =
+                JsonBuffer::from(builder.create_buffer::<String>(BufferSettings::default()));
+            let buffer_generic =
+                JsonBuffer::from(builder.create_buffer::<String>(BufferSettings::default()));
+
+            let buffers = TestJoinedValue::select_buffers(
+                buffer_i64.downcast_for_message().unwrap(),
+                buffer_f64.downcast_for_message().unwrap(),
+                buffer_string.downcast_for_message().unwrap(),
+                buffer_generic.downcast_for_message().unwrap(),
+            );
+
+            scope.input.chain(builder).fork_unzip((
+                |chain: Chain<_>| chain.connect(buffers.integer.input_slot()),
+                |chain: Chain<_>| chain.connect(buffers.float.input_slot()),
+                |chain: Chain<_>| chain.connect(buffers.string.input_slot()),
+                |chain: Chain<_>| chain.connect(buffers.generic.input_slot()),
+            ));
+
+            builder.join(buffers).connect(scope.terminate);
+        });
+
+        let mut promise = context.command(|commands| {
+            commands
+                .request(
+                    (5_i64, 3.14_f64, "hello".to_string(), "world".to_string()),
+                    workflow,
+                )
+                .take_response()
+        });
+
+        context.run_with_conditions(&mut promise, Duration::from_secs(2));
+        let value: TestJoinedValue<String> = promise.take().available().unwrap();
+        assert_eq!(value.integer, 5);
+        assert_eq!(value.float, 3.14);
+        assert_eq!(value.string, "hello");
+        assert_eq!(value.generic, "world");
+        assert!(context.no_unhandled_errors());
+    }
+
     #[derive(Clone, JoinedValue)]
     #[buffers(struct_name = FooBuffers)]
     struct TestDeriveWithConfig {}