macro simplify, prepare for making BeamContext a component

bevy_beam_sdk/src/api/accounts.rs

@@ -1,25 +1,25 @@
-use super::super::utils::macros::create_request_with_args;
+use super::super::utils::macros::beam_request;
 use beam_autogen_rs::apis::default_api::*;
 use beam_autogen_rs::*;
 use bevy::prelude::*;
 use models::{AccountPlayerView, AttachExternalIdentityApiResponse};
 
-create_request_with_args!(
+beam_request!(
     GetAccountMeTask,
     GetAccountMe,
     GetAccountMeCompletedEvent,
     beam_autogen_rs::apis::default_api::basic_accounts_me_get,
-    BasicAccountsMeGetParams,
     AccountPlayerView,
-    BasicAccountsMeGetError
+    BasicAccountsMeGetError,
+    BasicAccountsMeGetParams
 );
 
-create_request_with_args!(
+beam_request!(
     AttachFederatedIdentityTask,
     AttachFederatedIdentity,
     AttachFederatedIdentityCompletedEvent,
     beam_autogen_rs::apis::default_api::basic_accounts_external_identity_post,
-    BasicAccountsExternalIdentityPostParams,
     AttachExternalIdentityApiResponse,
-    BasicAccountsExternalIdentityPostError
+    BasicAccountsExternalIdentityPostError,
+    BasicAccountsExternalIdentityPostParams
 );

bevy_beam_sdk/src/api/common.rs

@@ -1,35 +1,35 @@
-use crate::utils::macros::create_request_with_args;
+use crate::utils::macros::beam_request;
 use beam_autogen_rs::apis::default_api::*;
 use beam_autogen_rs::*;
 use bevy::prelude::*;
 use models::{Token, TokenResponse};
 
-create_request_with_args!(
+beam_request!(
     CreateAnononymousUserTask,
     CreateAnononymousUser,
     CreateAnononymousUserCompletedEvent,
     beam_autogen_rs::apis::default_api::basic_auth_token_post,
-    BasicAuthTokenPostParams,
     TokenResponse,
-    BasicAuthTokenPostError
+    BasicAuthTokenPostError,
+    BasicAuthTokenPostParams
 );
 
-create_request_with_args!(
+beam_request!(
     GetTokenTask,
     GetToken,
     GetTokenEvent,
     beam_autogen_rs::apis::default_api::basic_auth_token_get,
-    BasicAuthTokenGetParams,
     Token,
-    BasicAuthTokenGetError
+    BasicAuthTokenGetError,
+    BasicAuthTokenGetParams
 );
 
-create_request_with_args!(
+beam_request!(
     PostTokenTask,
     PostToken,
     PostTokenEvent,
     beam_autogen_rs::apis::default_api::basic_auth_token_post,
-    BasicAuthTokenPostParams,
     TokenResponse,
-    BasicAuthTokenPostError
+    BasicAuthTokenPostError,
+    BasicAuthTokenPostParams
 );

bevy_beam_sdk/src/api/inventory.rs

@@ -1,25 +1,25 @@
-use crate::utils::macros::create_request_with_args;
+use crate::utils::macros::beam_request;
 use apis::default_api::{ObjectInventoryObjectIdGetError, ObjectInventoryObjectIdGetParams, ObjectInventoryObjectIdPutError, ObjectInventoryObjectIdPutParams};
 use beam_autogen_rs::*;
 use bevy::prelude::*;
 use models::{CommonResponse, InventoryView};
 
-create_request_with_args!(
+beam_request!(
     InventoryAddTask,
     InventoryAdd,
     InventoryAddCompletedEvent,
     beam_autogen_rs::apis::default_api::object_inventory_object_id_put,
-    ObjectInventoryObjectIdPutParams,
     CommonResponse,
-    ObjectInventoryObjectIdPutError
+    ObjectInventoryObjectIdPutError,
+    ObjectInventoryObjectIdPutParams
 );
 
-create_request_with_args!(
+beam_request!(
     InventoryGetTask,
     InventoryGet,
     InventoryGetCompletedEvent,
     beam_autogen_rs::apis::default_api::object_inventory_object_id_get,
-    ObjectInventoryObjectIdGetParams,
     InventoryView,
-    ObjectInventoryObjectIdGetError
+    ObjectInventoryObjectIdGetError,
+    ObjectInventoryObjectIdGetParams
 );

bevy_beam_sdk/src/api/mod.rs

@@ -37,13 +37,14 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .unwrap()
                 .get_x_beam_scope();
 
-            world.commands().add(common::CreateAnononymousUser(
-                beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
+            world.commands().add(common::CreateAnononymousUser {
+                data: beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
                     x_beam_scope,
                     x_beam_gamertag: None,
                     token_request_wrapper: Some(new_user),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -53,13 +54,14 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(common::CreateAnononymousUser(
-                beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
+            world.commands().add(common::CreateAnononymousUser {
+                data: beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
                     x_beam_scope,
                     x_beam_gamertag: None,
                     token_request_wrapper: Some(wrapper),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -72,13 +74,14 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(accounts::AttachFederatedIdentity(
-                beam_autogen_rs::apis::default_api::BasicAccountsExternalIdentityPostParams {
+            world.commands().add(accounts::AttachFederatedIdentity {
+                data: beam_autogen_rs::apis::default_api::BasicAccountsExternalIdentityPostParams {
                     x_beam_scope,
                     x_beam_gamertag: None,
                     attach_external_identity_api_request: Some(wrapper),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -88,12 +91,13 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(accounts::GetAccountMe(
-                beam_autogen_rs::apis::default_api::BasicAccountsMeGetParams {
+            world.commands().add(accounts::GetAccountMe {
+                data: beam_autogen_rs::apis::default_api::BasicAccountsMeGetParams {
                     x_beam_scope,
                     x_beam_gamertag: None,
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -103,13 +107,14 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(common::GetToken(
-                beam_autogen_rs::apis::default_api::BasicAuthTokenGetParams {
+            world.commands().add(common::GetToken {
+                data: beam_autogen_rs::apis::default_api::BasicAuthTokenGetParams {
                     x_beam_scope,
                     token,
                     x_beam_gamertag: None,
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -119,16 +124,17 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(common::PostToken(
-                beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
+            world.commands().add(common::PostToken {
+                data: beam_autogen_rs::apis::default_api::BasicAuthTokenPostParams {
                     x_beam_scope,
                     x_beam_gamertag: None,
                     token_request_wrapper: Some(TokenRequestWrapper {
                         refresh_token: Some(token),
                         ..Default::default()
                     }),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -139,14 +145,15 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(inventory::InventoryGet(
-                beam_autogen_rs::apis::default_api::ObjectInventoryObjectIdGetParams {
+            world.commands().add(inventory::InventoryGet {
+                data: beam_autogen_rs::apis::default_api::ObjectInventoryObjectIdGetParams {
                     x_beam_scope,
                     object_id: target_id,
                     x_beam_gamertag: None,
                     scope: Some(val),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }
@@ -176,14 +183,15 @@ impl<'w, 's> BeamableBasicApi for Commands<'w, 's> {
                 .get_resource::<crate::config::BeamableConfig>()
                 .unwrap()
                 .get_x_beam_scope();
-            world.commands().add(inventory::InventoryAdd(
-                beam_autogen_rs::apis::default_api::ObjectInventoryObjectIdPutParams {
+            world.commands().add(inventory::InventoryAdd {
+                data: beam_autogen_rs::apis::default_api::ObjectInventoryObjectIdPutParams {
                     x_beam_scope,
                     object_id: target_id,
                     x_beam_gamertag: None,
                     inventory_update_request: Some(data),
                 },
-            ))
+                entity: None,
+            })
         });
         self
     }