From 39c38e6eb84803fa93b1f1281ccc3b66472b57cd Mon Sep 17 00:00:00 2001
From: Peter Hayman <peteyhayman@gmail.com>
Date: Sat, 9 Nov 2024 15:51:47 +1100
Subject: [PATCH] refactor: populated, single

---
 .../src/components/camera_distance.rs         |  9 ++---
 .../src/components/collectable.rs             |  2 +-
 .../src/components/follow_cursor.rs           | 35 ++++++-------------
 .../src/components/randomize_position.rs      |  2 +-
 .../src/components/wrap_around.rs             |  4 +--
 crates/beet_flow/examples/derive_action.rs    |  2 +-
 .../examples/derive_action_generic.rs         |  6 ++--
 .../examples/derive_action_systems.rs         |  5 ++-
 crates/beet_flow/examples/observer_test.rs    |  2 +-
 crates/beet_flow/examples/observers.rs        |  8 ++---
 10 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/crates/beet_examples/src/components/camera_distance.rs b/crates/beet_examples/src/components/camera_distance.rs
index 63cdec01..c86775ca 100644
--- a/crates/beet_examples/src/components/camera_distance.rs
+++ b/crates/beet_examples/src/components/camera_distance.rs
@@ -26,7 +26,7 @@ impl CameraDistance {
 
 pub fn camera_distance(
 	mut resize: EventReader<WindowResized>,
-	main_window: Query<&Window, With<PrimaryWindow>>,
+	main_window: Single<&Window, With<PrimaryWindow>>,
 	camera_added: Query<
 		(),
 		(
@@ -34,16 +34,13 @@ pub fn camera_distance(
 			Or<(Added<Camera>, Added<CameraDistance>)>,
 		),
 	>,
-	mut query: Query<(&mut Transform, &Projection, &CameraDistance)>,
+	mut query: Populated<(&mut Transform, &Projection, &CameraDistance)>,
 ) {
 	if camera_added.iter().count() == 0 && resize.read().count() == 0 {
 		return;
 	}
-	let Ok(window) = main_window.get_single() else {
-		return;
-	};
 
-	let aspect_ratio = window.width() as f32 / window.height() as f32;
+	let aspect_ratio = main_window.width() as f32 / main_window.height() as f32;
 
 	for (mut transform, projection, camera_distance) in query.iter_mut() {
 		let Projection::Perspective(perspective) = projection else {
diff --git a/crates/beet_examples/src/components/collectable.rs b/crates/beet_examples/src/components/collectable.rs
index bad0436a..253ac6bc 100644
--- a/crates/beet_examples/src/components/collectable.rs
+++ b/crates/beet_examples/src/components/collectable.rs
@@ -12,7 +12,7 @@ const TURNS_PER_SECOND: f32 = 0.5;
 
 pub fn rotate_collectables(
 	time: Res<Time>,
-	mut query: Query<&mut Transform, With<Collectable>>,
+	mut query: Populated<&mut Transform, With<Collectable>>,
 ) {
 	for mut transform in query.iter_mut() {
 		let angle = time.delta_secs() * TAU * TURNS_PER_SECOND;
diff --git a/crates/beet_examples/src/components/follow_cursor.rs b/crates/beet_examples/src/components/follow_cursor.rs
index 6c4eac74..c13bc4a7 100644
--- a/crates/beet_examples/src/components/follow_cursor.rs
+++ b/crates/beet_examples/src/components/follow_cursor.rs
@@ -5,20 +5,13 @@ use bevy::prelude::*;
 pub struct FollowCursor2d;
 
 pub fn follow_cursor_2d(
-	camera_query: Query<(&Camera, &GlobalTransform)>,
-	mut cursor_query: Query<&mut Transform, With<FollowCursor2d>>,
-	windows: Query<&Window>,
+	camera_query: Single<(&Camera, &GlobalTransform)>,
+	windows: Single<&Window>,
+	mut cursor_query: Populated<&mut Transform, With<FollowCursor2d>>,
 ) {
-	let Ok((camera, camera_transform)) = camera_query.get_single() else {
-		return;
-	};
+	let (camera, camera_transform) = *camera_query;
 
-	let Some(cursor_position) = windows
-		.get_single()
-		.ok()
-		.map(|w| w.cursor_position())
-		.flatten()
-	else {
+	let Some(cursor_position) = windows.cursor_position() else {
 		return;
 	};
 
@@ -80,22 +73,16 @@ impl Default for FollowCursor3d {
 }
 
 pub fn follow_cursor_3d(
-	camera_query: Query<(&Camera, &GlobalTransform)>,
-	mut cursor_query: Query<(&mut Transform, &FollowCursor3d)>,
-	windows: Query<&Window>,
+	camera_query: Single<(&Camera, &GlobalTransform)>,
+	windows: Single<&Window>,
+	mut cursor_query: Populated<(&mut Transform, &FollowCursor3d)>,
 ) {
-	let Ok((camera, camera_transform)) = camera_query.get_single() else {
-		return;
-	};
+	let (camera, camera_transform) = *camera_query;
 
-	let Some(cursor_position) = windows
-		.get_single()
-		.ok()
-		.map(|w| w.cursor_position())
-		.flatten()
-	else {
+	let Some(cursor_position) = windows.cursor_position() else {
 		return;
 	};
+
 	let Ok(ray) = camera.viewport_to_world(camera_transform, cursor_position)
 	else {
 		return;
diff --git a/crates/beet_examples/src/components/randomize_position.rs b/crates/beet_examples/src/components/randomize_position.rs
index eff6611e..0d9a44d5 100644
--- a/crates/beet_examples/src/components/randomize_position.rs
+++ b/crates/beet_examples/src/components/randomize_position.rs
@@ -19,7 +19,7 @@ impl Default for RandomizePosition {
 
 pub fn randomize_position(
 	mut commands: Commands,
-	mut query: Query<
+	mut query: Populated<
 		(Entity, &mut Transform, &RandomizePosition),
 		Added<RandomizePosition>,
 	>,
diff --git a/crates/beet_examples/src/components/wrap_around.rs b/crates/beet_examples/src/components/wrap_around.rs
index 3e6ced39..c2b1f004 100644
--- a/crates/beet_examples/src/components/wrap_around.rs
+++ b/crates/beet_examples/src/components/wrap_around.rs
@@ -32,7 +32,7 @@ impl WrapAround {
 
 pub fn wrap_around(
 	wrap: Res<WrapAround>,
-	mut query: Query<&mut Transform, Changed<Transform>>,
+	mut query: Populated<&mut Transform, Changed<Transform>>,
 ) {
 	for mut transform in query.iter_mut() {
 		if transform.translation.x > wrap.half_extents.x {
@@ -62,7 +62,7 @@ pub fn wrap_around(
 
 pub fn update_wrap_around(
 	mut wrap_around: ResMut<WrapAround>,
-	windows: Query<&Window, Changed<Window>>,
+	windows: Populated<&Window, Changed<Window>>,
 ) {
 	for window in windows.iter() {
 		wrap_around.set_if_neq(WrapAround::from_window_size(window.size()));
diff --git a/crates/beet_flow/examples/derive_action.rs b/crates/beet_flow/examples/derive_action.rs
index 4e9fe3e0..3c118f48 100644
--- a/crates/beet_flow/examples/derive_action.rs
+++ b/crates/beet_flow/examples/derive_action.rs
@@ -7,7 +7,7 @@ use bevy::prelude::*;
 #[global_observers(log_name_on_run, log_name_on_run)]
 struct LogOnRun(pub String);
 
-fn log_name_on_run(trigger: Trigger<OnRun>, query: Query<&LogOnRun>) {
+fn log_name_on_run(trigger: Trigger<OnRun>, query: Populated<&LogOnRun>) {
 	let name = query.get(trigger.entity()).map(|n| n.0.as_str()).unwrap();
 	println!("log_name_on_run: {name}");
 }
diff --git a/crates/beet_flow/examples/derive_action_generic.rs b/crates/beet_flow/examples/derive_action_generic.rs
index a5dfc63a..56614d67 100644
--- a/crates/beet_flow/examples/derive_action_generic.rs
+++ b/crates/beet_flow/examples/derive_action_generic.rs
@@ -7,7 +7,7 @@ struct LogOnRun<T: 'static + Send + Sync + ToString>(pub T);
 
 fn log_on_run<T: 'static + Send + Sync + ToString>(
 	trigger: Trigger<OnRun>,
-	query: Query<&LogOnRun<T>>,
+	query: Populated<&LogOnRun<T>>,
 ) {
 	let name = query
 		.get(trigger.entity())
@@ -16,11 +16,11 @@ fn log_on_run<T: 'static + Send + Sync + ToString>(
 	println!("log_on_run: {name}");
 }
 
-fn log_name_on_run(trigger: Trigger<OnRun>, query: Query<&Name>) {
+fn log_name_on_run(trigger: Trigger<OnRun>, query: Populated<&Name>) {
 	let name = query
 		.get(trigger.entity())
 		.map(|n| n.as_str())
-		.unwrap_or("");
+		.unwrap_or("unnamed");
 	println!("log_name_on_run: {name}");
 }
 
diff --git a/crates/beet_flow/examples/derive_action_systems.rs b/crates/beet_flow/examples/derive_action_systems.rs
index 2862de8c..a76e3818 100644
--- a/crates/beet_flow/examples/derive_action_systems.rs
+++ b/crates/beet_flow/examples/derive_action_systems.rs
@@ -7,9 +7,8 @@ use bevy::prelude::*;
 #[category(ActionCategory::Agent)]
 struct LogOnRun(pub String);
 
-fn log_on_run(query: Query<&LogOnRun, Added<Running>>) {
-	let name = &query.single().0;
-	println!("log_on_run: {name}");
+fn log_on_run(query: Single<&LogOnRun, Added<Running>>) {
+	println!("log_on_run: {}", &query.0);
 }
 
 fn main() {
diff --git a/crates/beet_flow/examples/observer_test.rs b/crates/beet_flow/examples/observer_test.rs
index 4959b737..d8337c89 100644
--- a/crates/beet_flow/examples/observer_test.rs
+++ b/crates/beet_flow/examples/observer_test.rs
@@ -16,7 +16,7 @@ pub struct Event2;
 
 fn main() {
 	let mut world = World::new();
-	world.add_observer(|_trigger: Trigger<Event2>, query: Query<&Foo>| {
+	world.add_observer(|_trigger: Trigger<Event2>, query: Populated<&Foo>| {
 		println!("Event2 triggered, num components: {}", query.iter().len());
 	});
 	world.add_observer(|_trigger: Trigger<Event1>, mut commands: Commands| {
diff --git a/crates/beet_flow/examples/observers.rs b/crates/beet_flow/examples/observers.rs
index 37203ec4..a051c764 100644
--- a/crates/beet_flow/examples/observers.rs
+++ b/crates/beet_flow/examples/observers.rs
@@ -17,7 +17,7 @@ enum OnRunResult {
 fn sequence_start(
 	trigger: Trigger<OnRun>,
 	mut commands: Commands,
-	query: Query<&Children>,
+	query: Populated<&Children>,
 ) {
 	if let Ok(children) = query.get(trigger.entity()) {
 		if let Some(first_child) = children.iter().next() {
@@ -28,7 +28,7 @@ fn sequence_start(
 fn sequence_next(
 	trigger: Trigger<OnChildResult>,
 	mut commands: Commands,
-	query: Query<&Children>,
+	query: Populated<&Children>,
 ) {
 	if trigger.event().result == OnRunResult::Failure {
 		commands.trigger_targets(OnRunResult::Failure, trigger.entity());
@@ -48,7 +48,7 @@ fn sequence_next(
 	}
 }
 
-fn log_on_run(trigger: Trigger<OnRun>, names: Query<&Name>) {
+fn log_on_run(trigger: Trigger<OnRun>, names: Populated<&Name>) {
 	let name = names
 		.get(trigger.entity())
 		.map(|n| n.as_str())
@@ -59,7 +59,7 @@ fn log_on_run(trigger: Trigger<OnRun>, names: Query<&Name>) {
 fn succeed_on_run(
 	trigger: Trigger<OnRun>,
 	mut commands: Commands,
-	parents: Query<&Parent>,
+	parents: Populated<&Parent>,
 ) {
 	commands.trigger_targets(OnRunResult::Success, trigger.entity());
 	if let Some(parent) = parents.get(trigger.entity()).ok() {