From 4b9139d7f417285e39a4d770429979fc5b311579 Mon Sep 17 00:00:00 2001 From: Orual Date: Tue, 14 Oct 2025 18:56:15 -0400 Subject: [PATCH] reworked codegen builder choices, added feature-gated tracing --- Cargo.lock | 4 + Cargo.toml | 3 + .../src/app_blebbit/authr/folder.rs | 19 +- .../app_blebbit/authr/folder/create_folder.rs | 21 +- .../folder/create_folder_relationship.rs | 15 +- .../folder/delete_folder_relationship.rs | 17 +- .../app_blebbit/authr/folder/get_folder.rs | 3 +- .../app_blebbit/authr/folder/get_folders.rs | 3 +- .../app_blebbit/authr/folder/update_folder.rs | 21 +- .../folder/update_folder_relationship.rs | 15 +- .../src/app_blebbit/authr/group.rs | 29 +-- .../app_blebbit/authr/group/create_group.rs | 25 +-- .../authr/group/create_group_relationship.rs | 15 +- .../authr/group/delete_group_relationship.rs | 17 +- .../src/app_blebbit/authr/group/get_group.rs | 3 +- .../src/app_blebbit/authr/group/get_groups.rs | 3 +- .../app_blebbit/authr/group/update_group.rs | 25 +-- .../authr/group/update_group_relationship.rs | 15 +- .../src/app_blebbit/authr/page.rs | 22 +- .../src/app_blebbit/authr/page/create_page.rs | 21 +- .../authr/page/create_page_relationship.rs | 15 +- .../authr/page/delete_page_relationship.rs | 17 +- .../src/app_blebbit/authr/page/get_page.rs | 3 +- .../src/app_blebbit/authr/page/get_pages.rs | 3 +- .../src/app_blebbit/authr/page/update_page.rs | 21 +- .../authr/page/update_page_relationship.rs | 15 +- crates/jacquard-api/src/app_bsky/actor.rs | 122 ++++------- crates/jacquard-api/src/app_bsky/feed.rs | 65 +++--- .../app_bsky/feed/describe_feed_generator.rs | 8 +- .../src/app_bsky/feed/postgate.rs | 2 +- .../src/app_bsky/feed/send_interactions.rs | 3 +- .../src/app_bsky/feed/threadgate.rs | 6 +- crates/jacquard-api/src/app_bsky/graph.rs | 8 +- crates/jacquard-api/src/app_bsky/labeler.rs | 5 +- .../jacquard-api/src/app_bsky/notification.rs | 2 +- .../notification/put_preferences_v2.rs | 69 +++--- .../src/app_bsky/richtext/facet.rs | 3 +- crates/jacquard-api/src/app_bsky/unspecced.rs | 20 +- .../src/app_bsky/unspecced/get_config.rs | 3 +- .../app_bsky/unspecced/init_age_assurance.rs | 15 +- .../src/app_ocho/auth/authorize.rs | 3 +- .../src/app_ocho/auth/update_email.rs | 19 +- .../jacquard-api/src/app_ocho/auth/whoami.rs | 3 +- .../src/app_ocho/edu/get_verification_url.rs | 3 +- .../jacquard-api/src/app_ocho/message/send.rs | 14 +- .../src/app_ocho/payment/get_stripe_intent.rs | 3 +- crates/jacquard-api/src/app_ocho/plugin.rs | 105 ++++------ .../src/app_ocho/plugin/put_hosting_url.rs | 13 +- .../src/app_ocho/push/register.rs | 13 +- .../src/app_ocho/server/get_launch_token.rs | 3 +- .../src/app_ocho/server/get_token.rs | 3 +- .../src/app_ocho/server/swap_launch_token.rs | 3 +- .../src/app_ocho/state/get_config.rs | 3 +- .../jacquard-api/src/app_ocho/state/login.rs | 3 +- crates/jacquard-api/src/blog_pckt/blog.rs | 28 +-- crates/jacquard-api/src/blog_pckt/theme.rs | 7 +- crates/jacquard-api/src/blue_linkat/board.rs | 11 +- .../src/blue_zio/atfile/finger.rs | 22 +- .../jacquard-api/src/blue_zio/atfile/meta.rs | 5 +- .../src/chat_bsky/actor/delete_account.rs | 3 +- crates/jacquard-api/src/chat_bsky/convo.rs | 29 +-- .../src/chat_bsky/convo/accept_convo.rs | 16 +- .../src/chat_bsky/convo/add_reaction.rs | 15 +- .../convo/delete_message_for_self.rs | 14 +- .../src/chat_bsky/convo/leave_convo.rs | 16 +- .../src/chat_bsky/convo/mute_convo.rs | 13 +- .../src/chat_bsky/convo/remove_reaction.rs | 15 +- .../src/chat_bsky/convo/unmute_convo.rs | 13 +- .../src/chat_bsky/convo/update_all_read.rs | 15 +- .../src/chat_bsky/convo/update_read.rs | 16 +- crates/jacquard-api/src/com_atproto/admin.rs | 4 +- .../com_atproto/admin/disable_invite_codes.rs | 18 +- .../get_recommended_did_credentials.rs | 3 +- .../identity/sign_plc_operation.rs | 27 +-- crates/jacquard-api/src/com_atproto/label.rs | 3 +- .../src/com_atproto/label/subscribe_labels.rs | 6 +- .../com_atproto/moderation/create_report.rs | 6 +- .../src/com_atproto/repo/apply_writes.rs | 5 +- .../src/com_atproto/repo/delete_record.rs | 3 +- .../src/com_atproto/server/confirm_email.rs | 14 +- .../com_atproto/server/create_app_password.rs | 16 +- .../com_atproto/server/create_invite_code.rs | 3 +- .../src/com_atproto/server/create_session.rs | 20 +- .../com_atproto/server/deactivate_account.rs | 15 +- .../src/com_atproto/server/describe_server.rs | 13 +- .../com_atproto/server/get_service_auth.rs | 3 +- .../server/request_password_reset.rs | 13 +- .../com_atproto/server/reserve_signing_key.rs | 18 +- .../src/com_atproto/server/reset_password.rs | 14 +- .../com_atproto/server/revoke_app_password.rs | 13 +- .../src/com_atproto/server/update_email.rs | 19 +- .../src/com_atproto/sync/get_host_status.rs | 3 +- .../src/com_atproto/sync/list_hosts.rs | 12 +- .../src/com_atproto/sync/notify_of_update.rs | 13 +- .../src/com_atproto/sync/request_crawl.rs | 13 +- .../src/com_atproto/sync/subscribe_repos.rs | 6 +- .../com_atproto/temp/add_reserved_handle.rs | 16 +- .../temp/check_handle_availability.rs | 2 +- .../src/com_atproto/temp/dereference_scope.rs | 3 +- .../temp/request_phone_verification.rs | 13 +- .../src/com_shinolabs/pinksea/oekaki.rs | 5 +- crates/jacquard-api/src/com_whtwnd/blog.rs | 6 +- .../com_whtwnd/blog/notify_of_new_entry.rs | 3 +- .../src/community_lexicon/location/address.rs | 18 +- .../src/community_lexicon/location/fsq.rs | 12 +- .../src/community_lexicon/location/geo.rs | 10 +- .../src/community_lexicon/location/hthree.rs | 6 +- .../automation/invoke_webhook.rs | 3 +- .../ngerakines/helloworld/hello.rs | 3 +- crates/jacquard-api/src/my_skylights.rs | 4 +- crates/jacquard-api/src/my_skylights/list.rs | 12 +- .../src/my_skylights/list_item.rs | 5 +- .../src/net_anisota/beta/game/collection.rs | 22 +- .../src/net_anisota/beta/game/inventory.rs | 11 +- .../src/net_anisota/beta/game/log.rs | 120 ++++------- .../src/net_anisota/beta/game/pack.rs | 22 +- .../src/net_anisota/beta/game/progress.rs | 36 ++-- .../src/net_anisota/beta/game/session.rs | 75 +++---- .../src/net_anisota/graph/list_mute.rs | 14 +- .../src/net_anisota/graph/mute.rs | 14 +- .../slice/clear_slice_records.rs | 16 +- .../slice/delete_o_auth_client.rs | 16 +- .../src/network_slices/slice/get_actors.rs | 22 +- .../network_slices/slice/get_slice_records.rs | 25 +-- .../src/network_slices/slice/start_sync.rs | 33 +-- .../slice/sync_user_collections.rs | 16 +- .../slice/update_o_auth_client.rs | 34 +-- crates/jacquard-api/src/place_stream.rs | 3 +- .../place_stream/graph/get_following_user.rs | 3 +- .../src/place_stream/live/get_live_users.rs | 3 +- .../src/place_stream/live/get_segments.rs | 3 +- .../jacquard-api/src/place_stream/server.rs | 4 +- .../src/place_stream/server/delete_webhook.rs | 13 +- .../src/place_stream/server/update_webhook.rs | 40 +--- .../src/pub_leaflet/blocks/blockquote.rs | 6 +- .../src/pub_leaflet/blocks/code.rs | 9 +- .../src/pub_leaflet/blocks/header.rs | 9 +- .../src/pub_leaflet/blocks/horizontal_rule.rs | 2 +- .../src/pub_leaflet/blocks/math.rs | 3 +- .../src/pub_leaflet/blocks/text.rs | 6 +- .../src/pub_leaflet/pages/linear_document.rs | 7 +- .../src/pub_leaflet/publication.rs | 31 +-- .../src/pub_leaflet/richtext/facet.rs | 17 +- .../src/sh_tangled/git/ref_update.rs | 10 +- .../src/sh_tangled/knot/version.rs | 3 +- .../src/sh_tangled/label/definition.rs | 7 +- .../jacquard-api/src/sh_tangled/pipeline.rs | 20 +- .../jacquard-api/src/sh_tangled/repo/blob.rs | 3 +- .../src/sh_tangled/repo/create.rs | 19 +- .../src/sh_tangled/repo/merge_check.rs | 4 +- .../jacquard-api/src/sh_tangled/repo/pull.rs | 7 +- .../jacquard-api/src/sh_tangled/repo/tree.rs | 4 +- .../jacquard-api/src/sh_weaver/edit/cursor.rs | 4 +- crates/jacquard-api/src/sh_weaver/notebook.rs | 5 +- .../jacquard-api/src/social_clippr/actor.rs | 3 +- .../src/social_psky/richtext/facet.rs | 3 +- .../communication/create_template.rs | 21 +- .../communication/delete_template.rs | 13 +- .../communication/update_template.rs | 31 +-- .../hosting/get_account_history.rs | 16 +- .../src/tools_ozone/moderation.rs | 196 +++++++----------- .../tools_ozone/moderation/schedule_action.rs | 25 +-- .../src/tools_ozone/safelink/query_events.rs | 27 +-- .../src/tools_ozone/safelink/query_rules.rs | 36 +--- .../src/tools_ozone/server/get_config.rs | 13 +- crates/jacquard-api/src/tools_ozone/set.rs | 6 +- .../src/tools_ozone/set/delete_set.rs | 16 +- .../src/tools_ozone/set/upsert_set.rs | 9 - .../jacquard-api/src/tools_ozone/setting.rs | 10 +- .../src/tools_ozone/setting/remove_options.rs | 3 +- .../jacquard-api/src/tools_ozone/signature.rs | 4 +- .../src/uk_skyblur/post/decrypt_by_cid.rs | 3 +- .../src/uk_skyblur/post/encrypt.rs | 17 +- .../src/uk_skyblur/post/get_post.rs | 3 +- crates/jacquard-api/src/win_tomo_x/pushat.rs | 10 +- .../src/win_tomo_x/pushat/push_notify.rs | 3 +- crates/jacquard-common/Cargo.toml | 2 + crates/jacquard-common/src/xrpc.rs | 1 + crates/jacquard-identity/Cargo.toml | 2 + crates/jacquard-identity/src/lib.rs | 10 + .../jacquard-lexicon/src/codegen/structs.rs | 51 ++++- crates/jacquard-lexicon/src/codegen/xrpc.rs | 76 ++++++- crates/jacquard-oauth/Cargo.toml | 2 + crates/jacquard-oauth/src/client.rs | 11 + crates/jacquard-oauth/src/request.rs | 5 +- crates/jacquard/Cargo.toml | 4 + crates/jacquard/src/client.rs | 18 ++ .../jacquard/src/client/credential_session.rs | 6 + crates/jacquard/src/client/vec_update.rs | 3 +- justfile | 2 +- 190 files changed, 1046 insertions(+), 1870 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 435e80743..8f89828d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1757,6 +1757,7 @@ dependencies = [ "smol_str", "thiserror 2.0.17", "tokio", + "tracing", "url", ] @@ -1882,6 +1883,7 @@ dependencies = [ "smol_str", "thiserror 2.0.17", "tokio", + "tracing", "url", ] @@ -1956,6 +1958,7 @@ dependencies = [ "serde_json", "thiserror 2.0.17", "tokio", + "tracing", "url", "urlencoding", ] @@ -2017,6 +2020,7 @@ dependencies = [ "smol_str", "thiserror 2.0.17", "tokio", + "tracing", "trait-variant", "url", "webbrowser", diff --git a/Cargo.toml b/Cargo.toml index edfdf94a0..5599d20a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,6 +62,9 @@ reqwest = { version = "0.12", default-features = false } async-trait = "0.1" tokio = "1" +# Observability +tracing = "0.1" + # Encoding and crypto building blocks base64 = "0.22" percent-encoding = "2.3" diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder.rs index d4da4078a..a0a9a01eb 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder.rs @@ -24,17 +24,15 @@ pub mod update_folder_relationship; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FolderForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -46,19 +44,16 @@ pub struct FolderForm<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FolderView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cuid: Option>, + pub cuid: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs index ec34ecc7e..f5e0bdcf9 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs @@ -13,26 +13,16 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateFolder<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -43,7 +33,8 @@ pub struct CreateFolder<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct CreateFolderOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs index b3891da4d..d075130c6 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateFolderRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs index 3a5375c8d..cae5de258 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs @@ -13,29 +13,18 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteFolderRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub relation: Option>, + pub relation: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs index 19494c778..26ea8f828 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folder.rs @@ -31,7 +31,8 @@ pub struct GetFolder<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetFolderOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs index f2178ed87..b292f2878 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/get_folders.rs @@ -34,7 +34,8 @@ pub struct GetFolders<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetFoldersOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs index 7c529d80d..0e8feb7a5 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs @@ -32,26 +32,16 @@ pub struct UpdateFolderParams<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateFolder<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -62,7 +52,8 @@ pub struct UpdateFolder<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct UpdateFolderOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs index 57e527b56..b90bb4e55 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateFolderRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/group.rs b/crates/jacquard-api/src/app_blebbit/authr/group.rs index 13975dac7..285f62853 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group.rs @@ -24,24 +24,20 @@ pub mod update_group_relationship; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct GroupForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub display: Option>, + pub display: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -53,27 +49,22 @@ pub struct GroupForm<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct GroupView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cuid: Option>, + pub cuid: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub display: Option>, + pub display: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs index f1bb446e5..acbe0df0b 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs @@ -13,33 +13,21 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateGroup<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub display: Option>, + pub display: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -50,7 +38,8 @@ pub struct CreateGroup<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct CreateGroupOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs index 10daf9bc0..03db4fe16 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/create_group_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateGroupRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs index 053278e6a..cad10692e 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs @@ -13,29 +13,18 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteGroupRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub relation: Option>, + pub relation: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs index adf9ecc9a..81695f2b6 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/get_group.rs @@ -31,7 +31,8 @@ pub struct GetGroup<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetGroupOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs b/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs index 7f74b7ff1..f8877ace7 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/get_groups.rs @@ -34,7 +34,8 @@ pub struct GetGroups<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetGroupsOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs index a64cde24a..aebc44bb2 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs @@ -32,33 +32,21 @@ pub struct UpdateGroupParams<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateGroup<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub display: Option>, + pub display: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -69,7 +57,8 @@ pub struct UpdateGroup<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct UpdateGroupOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs index 8b54bdd55..673af45b8 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/update_group_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateGroupRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/page.rs b/crates/jacquard-api/src/app_blebbit/authr/page.rs index ddb2a7f3a..0be283ccc 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page.rs @@ -24,17 +24,15 @@ pub mod update_page_relationship; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PageForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -46,23 +44,19 @@ pub struct PageForm<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PageView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub content: Option>, + pub content: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cuid: Option>, + pub cuid: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, + pub public: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs index fdf54953c..525c7c92d 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs @@ -13,26 +13,16 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreatePage<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -43,7 +33,8 @@ pub struct CreatePage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct CreatePageOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs index e524faaf4..511566b78 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/create_page_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreatePageRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs index 7e4686ebf..ec9c56213 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs @@ -13,29 +13,18 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeletePageRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub relation: Option>, + pub relation: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs index 046f9d3e5..d2f74c310 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/get_page.rs @@ -31,7 +31,8 @@ pub struct GetPage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetPageOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs b/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs index 49d7b7549..8ffdda358 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/get_pages.rs @@ -34,7 +34,8 @@ pub struct GetPages<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetPagesOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs index b5042abde..cb755e47f 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs @@ -32,26 +32,16 @@ pub struct UpdatePageParams<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdatePage<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub public: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub public: std::option::Option, } #[jacquard_derive::lexicon] @@ -62,7 +52,8 @@ pub struct UpdatePage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct UpdatePageOutput<'a> { diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs index a1df84194..1d1b042db 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/update_page_relationship.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdatePageRelationship<'a> { #[serde(borrow)] - #[builder(into)] pub relation: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub resource: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/app_bsky/actor.rs b/crates/jacquard-api/src/app_bsky/actor.rs index f5805cc8b..82b5ebd31 100644 --- a/crates/jacquard-api/src/app_bsky/actor.rs +++ b/crates/jacquard-api/src/app_bsky/actor.rs @@ -41,12 +41,11 @@ pub struct AdultContentPref<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct BskyAppProgressGuide<'a> { #[serde(borrow)] - #[builder(into)] pub guide: jacquard_common::CowStr<'a>, } @@ -60,24 +59,23 @@ pub struct BskyAppProgressGuide<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct BskyAppStatePref<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub active_progress_guide: Option>, + pub active_progress_guide: std::option::Option< + crate::app_bsky::actor::BskyAppProgressGuide<'a>, + >, /// Storage for NUXs the user has encountered. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub nuxs: Option>>, + pub nuxs: std::option::Option>>, /// An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub queued_nudges: Option>>, + pub queued_nudges: std::option::Option>>, } #[jacquard_derive::lexicon] @@ -89,20 +87,17 @@ pub struct BskyAppStatePref<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ContentLabelPref<'a> { #[serde(borrow)] - #[builder(into)] pub label: jacquard_common::CowStr<'a>, /// Which labeler does this preference apply to? If undefined, applies globally. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub labeler_did: Option>, + pub labeler_did: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub visibility: jacquard_common::CowStr<'a>, } @@ -115,34 +110,28 @@ pub struct ContentLabelPref<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FeedViewPref<'a> { /// The URI of the feed, or an identifier which describes the feed. #[serde(borrow)] - #[builder(into)] pub feed: jacquard_common::CowStr<'a>, /// Hide quote posts in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_quote_posts: Option, + pub hide_quote_posts: std::option::Option, /// Hide replies in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_replies: Option, + pub hide_replies: std::option::Option, /// Hide replies in the feed if they do not have this number of likes. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_replies_by_like_count: Option, + pub hide_replies_by_like_count: std::option::Option, /// Hide replies in the feed if they are not by followed users. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_replies_by_unfollowed: Option, + pub hide_replies_by_unfollowed: std::option::Option, /// Hide reposts in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_reposts: Option, + pub hide_reposts: std::option::Option, } #[jacquard_derive::lexicon] @@ -402,14 +391,13 @@ pub struct Nux<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PersonalDetailsPref<'a> { /// The birth date of account owner. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub birth_date: Option, + pub birth_date: std::option::Option, } /// Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. @@ -422,22 +410,20 @@ pub struct PersonalDetailsPref<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PostInteractionSettingsPref<'a> { /// Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub postgate_embedding_rules: Option< + pub postgate_embedding_rules: std::option::Option< Vec>, >, /// Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub threadgate_allow_rules: Option< + pub threadgate_allow_rules: std::option::Option< Vec>, >, } @@ -520,32 +506,26 @@ pub type Preferences<'a> = Vec>; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociated<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub activity_subscription: Option< + pub activity_subscription: std::option::Option< crate::app_bsky::actor::ProfileAssociatedActivitySubscription<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub chat: Option>, + pub chat: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub feedgens: Option, + pub feedgens: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub labeler: Option, + pub labeler: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub lists: Option, + pub lists: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub starter_packs: Option, + pub starter_packs: std::option::Option, } #[jacquard_derive::lexicon] @@ -557,12 +537,11 @@ pub struct ProfileAssociated<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociatedActivitySubscription<'a> { #[serde(borrow)] - #[builder(into)] pub allow_subscriptions: jacquard_common::CowStr<'a>, } @@ -575,12 +554,11 @@ pub struct ProfileAssociatedActivitySubscription<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociatedChat<'a> { #[serde(borrow)] - #[builder(into)] pub allow_incoming: jacquard_common::CowStr<'a>, } @@ -894,19 +872,17 @@ pub struct StatusView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreadViewPref<'a> { /// Show followed users at the top of all replies. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub prioritize_followed_users: Option, + pub prioritize_followed_users: std::option::Option, /// Sorting mode for threads. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sort: Option>, + pub sort: std::option::Option>, } /// Preferences for how verified accounts appear in the app. @@ -919,14 +895,13 @@ pub struct ThreadViewPref<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct VerificationPrefs<'a> { /// Hide the blue check badges for verified accounts and trusted verifiers. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub hide_badges: Option, + pub hide_badges: std::option::Option, } /// Represents the verification information about the user this object is attached to. @@ -992,46 +967,37 @@ pub struct VerificationView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ViewerState<'a> { /// This property is present only in selected cases, as an optimization. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub activity_subscription: Option< + pub activity_subscription: std::option::Option< crate::app_bsky::notification::ActivitySubscription<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub blocked_by: Option, + pub blocked_by: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub blocking: Option>, + pub blocking: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub blocking_by_list: Option>, + pub blocking_by_list: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub followed_by: Option>, + pub followed_by: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub following: Option>, + pub following: std::option::Option>, /// This property is present only in selected cases, as an optimization. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub known_followers: Option>, + pub known_followers: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub muted: Option, + pub muted: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub muted_by_list: Option>, + pub muted_by_list: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/feed.rs b/crates/jacquard-api/src/app_bsky/feed.rs index 79c775559..b5deb4121 100644 --- a/crates/jacquard-api/src/app_bsky/feed.rs +++ b/crates/jacquard-api/src/app_bsky/feed.rs @@ -299,14 +299,13 @@ pub struct GeneratorView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct GeneratorViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub like: Option>, + pub like: std::option::Option>, } #[jacquard_derive::lexicon] @@ -318,28 +317,24 @@ pub struct GeneratorViewerState<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Interaction<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub event: Option>, + pub event: std::option::Option>, /// Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub feed_context: Option>, + pub feed_context: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub item: Option>, + pub item: std::option::Option>, /// Unique identifier per request that may be passed back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub req_id: Option>, + pub req_id: std::option::Option>, } /// User liked the feed item @@ -557,7 +552,7 @@ pub enum PostViewEmbed<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ReasonPin<'a> {} @@ -743,7 +738,7 @@ pub enum SkeletonFeedPostReason<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SkeletonReasonPin<'a> {} @@ -774,14 +769,13 @@ pub struct SkeletonReasonRepost<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreadContext<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub root_author_like: Option>, + pub root_author_like: std::option::Option>, } #[jacquard_derive::lexicon] @@ -864,26 +858,22 @@ pub enum ThreadViewPostRepliesItem<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreadgateView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cid: Option>, + pub cid: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub lists: Option>>, + pub lists: std::option::Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub record: Option>, + pub record: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub uri: Option>, + pub uri: std::option::Option>, } /// Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. @@ -896,31 +886,24 @@ pub struct ThreadgateView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub bookmarked: Option, + pub bookmarked: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub embedding_disabled: Option, + pub embedding_disabled: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub like: Option>, + pub like: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub pinned: Option, + pub pinned: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reply_disabled: Option, + pub reply_disabled: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub repost: Option>, + pub repost: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub thread_muted: Option, + pub thread_muted: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs index f65d275c0..030a7655b 100644 --- a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs +++ b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs @@ -31,18 +31,16 @@ pub struct Feed<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Links<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub privacy_policy: Option>, + pub privacy_policy: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub terms_of_service: Option>, + pub terms_of_service: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_bsky/feed/postgate.rs b/crates/jacquard-api/src/app_bsky/feed/postgate.rs index 8fbf7610b..30872d664 100644 --- a/crates/jacquard-api/src/app_bsky/feed/postgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/postgate.rs @@ -15,7 +15,7 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct DisableRule<'a> {} diff --git a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs index fc865df98..9ea9d54ff 100644 --- a/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs +++ b/crates/jacquard-api/src/app_bsky/feed/send_interactions.rs @@ -38,7 +38,8 @@ pub struct SendInteractions<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct SendInteractionsOutput<'a> {} diff --git a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs index c76ab6562..8048f2dbf 100644 --- a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs @@ -15,7 +15,7 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FollowerRule<'a> {} @@ -29,7 +29,7 @@ pub struct FollowerRule<'a> {} PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FollowingRule<'a> {} @@ -156,7 +156,7 @@ impl From> for Threadgate<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct MentionRule<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/graph.rs b/crates/jacquard-api/src/app_bsky/graph.rs index a15ee7d7f..9048111d3 100644 --- a/crates/jacquard-api/src/app_bsky/graph.rs +++ b/crates/jacquard-api/src/app_bsky/graph.rs @@ -259,17 +259,15 @@ pub struct ListViewBasic<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ListViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub blocked: Option>, + pub blocked: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub muted: Option, + pub muted: std::option::Option, } /// A list of actors to apply an aggregate moderation action (mute/block) on. diff --git a/crates/jacquard-api/src/app_bsky/labeler.rs b/crates/jacquard-api/src/app_bsky/labeler.rs index 622065d3c..9a70fc394 100644 --- a/crates/jacquard-api/src/app_bsky/labeler.rs +++ b/crates/jacquard-api/src/app_bsky/labeler.rs @@ -125,12 +125,11 @@ pub struct LabelerViewDetailed<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LabelerViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub like: Option>, + pub like: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/notification.rs b/crates/jacquard-api/src/app_bsky/notification.rs index cbfd2f99c..4220ed865 100644 --- a/crates/jacquard-api/src/app_bsky/notification.rs +++ b/crates/jacquard-api/src/app_bsky/notification.rs @@ -140,7 +140,7 @@ pub struct Preferences<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RecordDeleted<'a> {} diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs index b06941a00..d2d8f1318 100644 --- a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs +++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs @@ -13,73 +13,70 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct PutPreferencesV2<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub chat: Option>, + pub chat: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub follow: Option>, + pub follow: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub like: Option>, + pub like: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub like_via_repost: Option>, + pub like_via_repost: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub mention: Option>, + pub mention: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub quote: Option>, + pub quote: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub reply: Option>, + pub reply: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub repost: Option>, + pub repost: std::option::Option< + crate::app_bsky::notification::FilterablePreference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub repost_via_repost: Option< + pub repost_via_repost: std::option::Option< crate::app_bsky::notification::FilterablePreference<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub starterpack_joined: Option>, + pub starterpack_joined: std::option::Option< + crate::app_bsky::notification::Preference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub subscribed_post: Option>, + pub subscribed_post: std::option::Option< + crate::app_bsky::notification::Preference<'a>, + >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub unverified: Option>, + pub unverified: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub verified: Option>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub verified: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_bsky/richtext/facet.rs b/crates/jacquard-api/src/app_bsky/richtext/facet.rs index a3688b1b6..d3a0da65e 100644 --- a/crates/jacquard-api/src/app_bsky/richtext/facet.rs +++ b/crates/jacquard-api/src/app_bsky/richtext/facet.rs @@ -110,11 +110,10 @@ pub struct Mention<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Tag<'a> { #[serde(borrow)] - #[builder(into)] pub tag: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced.rs b/crates/jacquard-api/src/app_bsky/unspecced.rs index 3007b7697..4e39b0818 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced.rs @@ -89,17 +89,15 @@ pub struct AgeAssuranceEvent<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceState<'a> { /// The timestamp when this state was last updated. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub last_initiated_at: Option, + pub last_initiated_at: std::option::Option, /// The status of the age assurance process. #[serde(borrow)] - #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -216,7 +214,7 @@ pub struct ThreadItemBlocked<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreadItemNoUnauthenticated<'a> {} @@ -229,7 +227,7 @@ pub struct ThreadItemNoUnauthenticated<'a> {} PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreadItemNotFound<'a> {} @@ -305,22 +303,18 @@ pub struct TrendView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct TrendingTopic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub display_name: Option>, + pub display_name: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub link: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub topic: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs index db4275b34..bf9736f9f 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs @@ -32,7 +32,8 @@ pub struct LiveNowConfig<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetConfigOutput<'a> { diff --git a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs index 1b627e2e8..6fcf3c2a6 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs @@ -13,31 +13,20 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct InitAgeAssurance<'a> { /// An ISO 3166-1 alpha-2 code of the user's location. #[serde(borrow)] - #[builder(into)] pub country_code: jacquard_common::CowStr<'a>, /// The user's email address to receive assurance instructions. #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, /// The user's preferred language for communication during the assurance process. #[serde(borrow)] - #[builder(into)] pub language: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_ocho/auth/authorize.rs b/crates/jacquard-api/src/app_ocho/auth/authorize.rs index 9386e3fde..d6f7aca56 100644 --- a/crates/jacquard-api/src/app_ocho/auth/authorize.rs +++ b/crates/jacquard-api/src/app_ocho/auth/authorize.rs @@ -41,7 +41,8 @@ pub struct Authorize<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct AuthorizeOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/auth/update_email.rs b/crates/jacquard-api/src/app_ocho/auth/update_email.rs index 4e530869b..54801e37a 100644 --- a/crates/jacquard-api/src/app_ocho/auth/update_email.rs +++ b/crates/jacquard-api/src/app_ocho/auth/update_email.rs @@ -13,30 +13,19 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateEmail<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub email_auth_factor: Option, + pub email_auth_factor: std::option::Option, /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub token: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub token: std::option::Option>, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/app_ocho/auth/whoami.rs b/crates/jacquard-api/src/app_ocho/auth/whoami.rs index ead4d41f7..4a7d1bc41 100644 --- a/crates/jacquard-api/src/app_ocho/auth/whoami.rs +++ b/crates/jacquard-api/src/app_ocho/auth/whoami.rs @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct WhoamiOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs index 11158f45a..b8a0e1be5 100644 --- a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs +++ b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs @@ -32,7 +32,8 @@ pub struct GetVerificationUrl<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetVerificationUrlOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/message/send.rs b/crates/jacquard-api/src/app_ocho/message/send.rs index f6d648b78..36d15958b 100644 --- a/crates/jacquard-api/src/app_ocho/message/send.rs +++ b/crates/jacquard-api/src/app_ocho/message/send.rs @@ -13,27 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct Send<'a> { /// The user to send the message to. #[serde(borrow)] - #[builder(into)] pub did: jacquard_common::CowStr<'a>, /// The message to send to the user. #[serde(borrow)] - #[builder(into)] pub message: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs index 61df1e98c..a8ecba64c 100644 --- a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs +++ b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs @@ -39,7 +39,8 @@ pub struct GetStripeIntent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetStripeIntentOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/plugin.rs b/crates/jacquard-api/src/app_ocho/plugin.rs index 05a0591f7..671c7c96c 100644 --- a/crates/jacquard-api/src/app_ocho/plugin.rs +++ b/crates/jacquard-api/src/app_ocho/plugin.rs @@ -19,24 +19,23 @@ pub mod service; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AdaptiveIcon<'a> { /// The background color of the adaptive icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub background_color: Option>, + pub background_color: std::option::Option>, /// The URL to the foreground image of the adaptive icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub foreground_image: Option>, + pub foreground_image: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub foreground_image_blob: Option>, + pub foreground_image_blob: std::option::Option< + jacquard_common::types::blob::Blob<'a>, + >, } #[jacquard_derive::lexicon] @@ -48,19 +47,17 @@ pub struct AdaptiveIcon<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Android<'a> { /// Configuration for the adaptive icon on Android. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub adaptive_icon: Option>, + pub adaptive_icon: std::option::Option>, /// Whether edge-to-edge mode is enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub edge_to_edge_enabled: Option, + pub edge_to_edge_enabled: std::option::Option, } /// Android status bar configuration. @@ -73,15 +70,14 @@ pub struct Android<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AndroidStatusBar<'a> { /// The background color of the Android status bar. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub background_color: Option>, + pub background_color: std::option::Option>, } #[jacquard_derive::lexicon] @@ -123,13 +119,12 @@ pub struct Asset<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Db<'a> { /// The ID of the database. #[serde(borrow)] - #[builder(into)] pub id: jacquard_common::CowStr<'a>, } @@ -142,13 +137,12 @@ pub struct Db<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Developer<'a> { /// The tool used for development, e.g., 'expo-cli'. #[serde(borrow)] - #[builder(into)] pub tool: jacquard_common::CowStr<'a>, } @@ -161,97 +155,81 @@ pub struct Developer<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ExpoClient<'a> { /// Android-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub android: Option>, + pub android: std::option::Option>, /// Configuration for the Android status bar. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub android_status_bar: Option>, + pub android_status_bar: std::option::Option< + crate::app_ocho::plugin::AndroidStatusBar<'a>, + >, /// Experimental features enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub expirements: Option>, + pub expirements: std::option::Option>, /// Additional configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub extra: Option>, + pub extra: std::option::Option>, /// The URL to the app icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub icon: Option>, + pub icon: std::option::Option>, /// ios-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub ios: Option>, + pub ios: std::option::Option>, /// Localization settings for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub locales: Option>, + pub locales: std::option::Option>, /// The name of the Expo client application. #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, /// Whether the new architecture is enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub new_arch_enabled: Option, + pub new_arch_enabled: std::option::Option, /// The default orientation of the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub orientation: Option>, + pub orientation: std::option::Option>, /// The platforms supported by the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub platforms: Option>>, + pub platforms: std::option::Option>>, /// A list of plugins used by the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub plugins: Option>, + pub plugins: std::option::Option>, /// The custom URI scheme for deep linking. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub scheme: Option>, + pub scheme: std::option::Option>, /// The SDK version of the Expo client. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sdk_version: Option>, + pub sdk_version: std::option::Option>, /// A URL-friendly identifier for the app. #[serde(borrow)] - #[builder(into)] pub slug: jacquard_common::CowStr<'a>, /// The default user interface style. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub user_interface_style: Option>, + pub user_interface_style: std::option::Option>, /// The version of the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub version: Option>, + pub version: std::option::Option>, /// Web-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub web: Option>, + pub web: std::option::Option>, } #[jacquard_derive::lexicon] @@ -281,14 +259,13 @@ pub struct ExpoGo<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Ios<'a> { /// Whether the app supports iPad. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub supports_tablet: Option, + pub supports_tablet: std::option::Option, } #[jacquard_derive::lexicon] @@ -401,27 +378,23 @@ pub type StringId<'a> = jacquard_common::CowStr<'a>; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Web<'a> { /// The bundler used for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub bundler: Option>, + pub bundler: std::option::Option>, /// The URL to the favicon for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub favicon: Option>, + pub favicon: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub favicon_blob: Option>, + pub favicon_blob: std::option::Option>, /// The output directory for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub output: Option>, + pub output: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs index 498f2a0a7..370399809 100644 --- a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs +++ b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct PutHostingUrl<'a> { /// The expo push token #[serde(borrow)] - #[builder(into)] pub url: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_ocho/push/register.rs b/crates/jacquard-api/src/app_ocho/push/register.rs index 8add09e4b..0555dab1c 100644 --- a/crates/jacquard-api/src/app_ocho/push/register.rs +++ b/crates/jacquard-api/src/app_ocho/push/register.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct Register<'a> { /// The expo push token #[serde(borrow)] - #[builder(into)] pub push_token: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs b/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs index 309de507d..cdc044c78 100644 --- a/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs +++ b/crates/jacquard-api/src/app_ocho/server/get_launch_token.rs @@ -30,7 +30,8 @@ pub struct GetLaunchToken<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetLaunchTokenOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/server/get_token.rs b/crates/jacquard-api/src/app_ocho/server/get_token.rs index d79154cbc..c46a11b89 100644 --- a/crates/jacquard-api/src/app_ocho/server/get_token.rs +++ b/crates/jacquard-api/src/app_ocho/server/get_token.rs @@ -30,7 +30,8 @@ pub struct GetToken<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetTokenOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs index eccbab2cf..3ec8fa400 100644 --- a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs +++ b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs @@ -31,7 +31,8 @@ pub struct SwapLaunchToken<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct SwapLaunchTokenOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/state/get_config.rs b/crates/jacquard-api/src/app_ocho/state/get_config.rs index fce894b4a..072dec823 100644 --- a/crates/jacquard-api/src/app_ocho/state/get_config.rs +++ b/crates/jacquard-api/src/app_ocho/state/get_config.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetConfigOutput<'a> { diff --git a/crates/jacquard-api/src/app_ocho/state/login.rs b/crates/jacquard-api/src/app_ocho/state/login.rs index eff9121b4..3d4ce24f5 100644 --- a/crates/jacquard-api/src/app_ocho/state/login.rs +++ b/crates/jacquard-api/src/app_ocho/state/login.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct LoginOutput<'a> { diff --git a/crates/jacquard-api/src/blog_pckt/blog.rs b/crates/jacquard-api/src/blog_pckt/blog.rs index c06b9ad54..522e0b71f 100644 --- a/crates/jacquard-api/src/blog_pckt/blog.rs +++ b/crates/jacquard-api/src/blog_pckt/blog.rs @@ -97,30 +97,25 @@ impl From> for Blog<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Palette<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub accent: Option>, + pub accent: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub background: Option>, + pub background: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub link: Option>, + pub link: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub surface_hover: Option>, + pub surface_hover: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub text: Option>, + pub text: std::option::Option>, } #[jacquard_derive::lexicon] @@ -132,20 +127,17 @@ pub struct Palette<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Theme<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub dark: Option>, + pub dark: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub font: Option>, + pub font: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub light: Option>, + pub light: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blog_pckt/theme.rs b/crates/jacquard-api/src/blog_pckt/theme.rs index 00430f38e..7f5f87f83 100644 --- a/crates/jacquard-api/src/blog_pckt/theme.rs +++ b/crates/jacquard-api/src/blog_pckt/theme.rs @@ -84,28 +84,23 @@ impl From> for Theme<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Palette<'a> { /// Accent color (hex value) #[serde(borrow)] - #[builder(into)] pub accent: jacquard_common::CowStr<'a>, /// Background color (hex value) #[serde(borrow)] - #[builder(into)] pub background: jacquard_common::CowStr<'a>, /// Link color (hex value) #[serde(borrow)] - #[builder(into)] pub link: jacquard_common::CowStr<'a>, /// Surface hover color (hex value) #[serde(borrow)] - #[builder(into)] pub surface_hover: jacquard_common::CowStr<'a>, /// Primary text color (hex value) #[serde(borrow)] - #[builder(into)] pub text: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue_linkat/board.rs b/crates/jacquard-api/src/blue_linkat/board.rs index ce1fac96a..1e43e3830 100644 --- a/crates/jacquard-api/src/blue_linkat/board.rs +++ b/crates/jacquard-api/src/blue_linkat/board.rs @@ -14,25 +14,22 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Card<'a> { /// Emoji of the card #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub emoji: Option>, + pub emoji: std::option::Option>, /// Text of the card #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub text: Option>, + pub text: std::option::Option>, /// URL of the link #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub url: Option>, + pub url: std::option::Option>, } /// Record containing a cards of your profile. diff --git a/crates/jacquard-api/src/blue_zio/atfile/finger.rs b/crates/jacquard-api/src/blue_zio/atfile/finger.rs index fca4d0967..7dff87d5c 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/finger.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/finger.rs @@ -15,18 +15,16 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Browser<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub id: Option>, + pub id: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub user_agent: Option>, + pub user_agent: std::option::Option>, } /// A fingerprint of a machine upload. @@ -39,24 +37,20 @@ pub struct Browser<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Machine<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub app: Option>, + pub app: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub host: Option>, + pub host: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub id: Option>, + pub id: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub os: Option>, + pub os: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue_zio/atfile/meta.rs b/crates/jacquard-api/src/blue_zio/atfile/meta.rs index 24542318c..8c243637a 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/meta.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/meta.rs @@ -15,12 +15,11 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Unknown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub reason: Option>, + pub reason: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs index 91fde17b2..0d6776472 100644 --- a/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs +++ b/crates/jacquard-api/src/chat_bsky/actor/delete_account.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DeleteAccountOutput<'a> {} diff --git a/crates/jacquard-api/src/chat_bsky/convo.rs b/crates/jacquard-api/src/chat_bsky/convo.rs index ca3f54782..a00c5acfe 100644 --- a/crates/jacquard-api/src/chat_bsky/convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo.rs @@ -112,15 +112,13 @@ pub struct DeletedMessageView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LogAcceptConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -177,15 +175,13 @@ pub enum LogAddReactionMessage<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LogBeginConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -282,15 +278,13 @@ pub enum LogDeleteMessageMessage<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LogLeaveConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -303,15 +297,13 @@ pub struct LogLeaveConvo<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LogMuteConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -410,15 +402,13 @@ pub enum LogRemoveReactionMessage<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LogUnmuteConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -450,21 +440,18 @@ pub struct MessageAndReactionView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct MessageInput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub embed: Option>, + pub embed: std::option::Option>, /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub facets: Option>>, + pub facets: std::option::Option>>, #[serde(borrow)] - #[builder(into)] pub text: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs index fab72ce0c..d540d041c 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct AcceptConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -39,7 +30,8 @@ pub struct AcceptConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct AcceptConvoOutput<'a> { diff --git a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs index d12cc00ca..fef409eb2 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct AddReaction<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub message_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs index 167a025ca..db309c33c 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/delete_message_for_self.rs @@ -13,25 +13,15 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteMessageForSelf<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub message_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs index 06af4153f..26d471763 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/leave_convo.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct LeaveConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -39,7 +30,8 @@ pub struct LeaveConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct LeaveConvoOutput<'a> { diff --git a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs index ea65f06a1..a3b1ba0c2 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/mute_convo.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct MuteConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs index f4c69b251..b1675143c 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs @@ -13,28 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct RemoveReaction<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub message_id: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs index 62ed920d5..00aa90182 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/unmute_convo.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UnmuteConvo<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs index f726266ef..303037f7e 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateAllRead<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub status: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub status: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs index 1af49167c..8804dd974 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs @@ -13,26 +13,16 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateRead<'a> { #[serde(borrow)] - #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub message_id: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub message_id: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_atproto/admin.rs b/crates/jacquard-api/src/com_atproto/admin.rs index 70909ba6d..3ef05ad88 100644 --- a/crates/jacquard-api/src/com_atproto/admin.rs +++ b/crates/jacquard-api/src/com_atproto/admin.rs @@ -143,14 +143,12 @@ pub struct StatusAttr<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ThreatSignature<'a> { #[serde(borrow)] - #[builder(into)] pub property: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs index 43c3a991c..57587e7a6 100644 --- a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs +++ b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs @@ -13,27 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DisableInviteCodes<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub accounts: Option>>, + pub accounts: std::option::Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub codes: Option>>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub codes: std::option::Option>>, } ///Response type for diff --git a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs index 858f7104c..6ca019213 100644 --- a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs +++ b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetRecommendedDidCredentialsOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs index f93198ae9..2c4d56311 100644 --- a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs +++ b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs @@ -13,39 +13,28 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct SignPlcOperation<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub also_known_as: Option>>, + pub also_known_as: std::option::Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub rotation_keys: Option>>, + pub rotation_keys: std::option::Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub services: Option>, + pub services: std::option::Option>, /// A token received through com.atproto.identity.requestPlcOperationSignature #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub token: Option>, + pub token: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub verification_methods: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, + pub verification_methods: std::option::Option< + jacquard_common::types::value::Data<'a>, >, } diff --git a/crates/jacquard-api/src/com_atproto/label.rs b/crates/jacquard-api/src/com_atproto/label.rs index 973cc4963..98ad2a52d 100644 --- a/crates/jacquard-api/src/com_atproto/label.rs +++ b/crates/jacquard-api/src/com_atproto/label.rs @@ -253,13 +253,12 @@ pub struct LabelValueDefinitionStrings<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SelfLabel<'a> { /// The short string name of the value or type of this label. #[serde(borrow)] - #[builder(into)] pub val: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs index f4ab550e3..b08daf5ab 100644 --- a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs +++ b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs @@ -14,16 +14,14 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Info<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub message: Option>, + pub message: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs index 4a80cd744..7b824f537 100644 --- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs +++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs @@ -145,17 +145,15 @@ impl jacquard_common::xrpc::XrpcEndpoint for CreateReportRequest { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModTool<'a> { /// Additional arbitrary metadata about the source #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub meta: Option>, + pub meta: std::option::Option>, /// Name/identifier of the source (e.g., 'bsky-app/android', 'bsky-web/chrome') #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs index bec4be6e7..eb5602eb2 100644 --- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs +++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs @@ -88,7 +88,7 @@ pub struct Delete<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct DeleteResult<'a> {} @@ -157,7 +157,8 @@ pub enum ApplyWritesWritesItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct ApplyWritesOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs index de2d2b86c..c30c8ab9c 100644 --- a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs +++ b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs @@ -57,7 +57,8 @@ pub struct DeleteRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DeleteRecordOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs index f08bb6cf8..0c1c659a0 100644 --- a/crates/jacquard-api/src/com_atproto/server/confirm_email.rs +++ b/crates/jacquard-api/src/com_atproto/server/confirm_email.rs @@ -13,25 +13,15 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct ConfirmEmail<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub token: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs index df88ce192..e4b594d7d 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs @@ -38,27 +38,17 @@ pub struct AppPassword<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateAppPassword<'a> { /// A short name for the App Password, to help distinguish them. #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, /// If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub privileged: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub privileged: std::option::Option, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs index 9025eaac3..6305bb0a1 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs @@ -41,7 +41,8 @@ pub struct CreateInviteCode<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct CreateInviteCodeOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server/create_session.rs b/crates/jacquard-api/src/com_atproto/server/create_session.rs index dac9b440f..d9b3b6e23 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_session.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_session.rs @@ -13,34 +13,22 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateSession<'a> { /// When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub allow_takendown: Option, + pub allow_takendown: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub auth_factor_token: Option>, + pub auth_factor_token: std::option::Option>, /// Handle or other identifier supported by the server for the authenticating user. #[serde(borrow)] - #[builder(into)] pub identifier: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub password: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs index 97f56fd01..ebfc2d6af 100644 --- a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs +++ b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeactivateAccount<'a> { /// A recommendation to server as to how long they should hold onto the deactivated account before deleting. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub delete_after: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub delete_after: std::option::Option, } ///Response type for diff --git a/crates/jacquard-api/src/com_atproto/server/describe_server.rs b/crates/jacquard-api/src/com_atproto/server/describe_server.rs index 6a9ccb520..104491921 100644 --- a/crates/jacquard-api/src/com_atproto/server/describe_server.rs +++ b/crates/jacquard-api/src/com_atproto/server/describe_server.rs @@ -14,14 +14,13 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Contact<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub email: Option>, + pub email: std::option::Option>, } #[jacquard_derive::lexicon] @@ -33,18 +32,16 @@ pub struct Contact<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Links<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub privacy_policy: Option>, + pub privacy_policy: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub terms_of_service: Option>, + pub terms_of_service: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs index a2594434f..95b69cb03 100644 --- a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs +++ b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs @@ -35,7 +35,8 @@ pub struct GetServiceAuth<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetServiceAuthOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs index 8827df876..d83e5fe39 100644 --- a/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs +++ b/crates/jacquard-api/src/com_atproto/server/request_password_reset.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct RequestPasswordReset<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs index 3be968854..22c08526f 100644 --- a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs +++ b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs @@ -13,24 +13,15 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct ReserveSigningKey<'a> { /// The DID to reserve a key for. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub did: Option>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub did: std::option::Option>, } #[jacquard_derive::lexicon] @@ -41,7 +32,8 @@ pub struct ReserveSigningKey<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct ReserveSigningKeyOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server/reset_password.rs b/crates/jacquard-api/src/com_atproto/server/reset_password.rs index 6223763b8..166c0f31e 100644 --- a/crates/jacquard-api/src/com_atproto/server/reset_password.rs +++ b/crates/jacquard-api/src/com_atproto/server/reset_password.rs @@ -13,25 +13,15 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct ResetPassword<'a> { #[serde(borrow)] - #[builder(into)] pub password: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub token: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs index f2876a94f..7656c5f4a 100644 --- a/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs +++ b/crates/jacquard-api/src/com_atproto/server/revoke_app_password.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct RevokeAppPassword<'a> { #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/com_atproto/server/update_email.rs b/crates/jacquard-api/src/com_atproto/server/update_email.rs index 039b12d9d..dd4705271 100644 --- a/crates/jacquard-api/src/com_atproto/server/update_email.rs +++ b/crates/jacquard-api/src/com_atproto/server/update_email.rs @@ -13,30 +13,19 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateEmail<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub email_auth_factor: Option, + pub email_auth_factor: std::option::Option, /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub token: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub token: std::option::Option>, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs index cf0ba6578..eecc73c10 100644 --- a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs +++ b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs @@ -31,7 +31,8 @@ pub struct GetHostStatus<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetHostStatusOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs index 0b1814538..8c05e1962 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs @@ -14,25 +14,21 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Host<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub account_count: Option, + pub account_count: std::option::Option, /// hostname of server; not a URL (no scheme) #[serde(borrow)] - #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, /// Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub seq: Option, + pub seq: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub status: Option>, + pub status: std::option::Option>, } #[derive( diff --git a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs index 1f57e87d5..fec156f97 100644 --- a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs +++ b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct NotifyOfUpdate<'a> { /// Hostname of the current service (usually a PDS) that is notifying of update. #[serde(borrow)] - #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs index 43176b489..9fc66cbf9 100644 --- a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs +++ b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct RequestCrawl<'a> { /// Hostname of the current service (eg, PDS) that is requesting to be crawled. #[serde(borrow)] - #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs index f81232ac7..3e3de7d63 100644 --- a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs +++ b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs @@ -111,16 +111,14 @@ pub struct Identity<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Info<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub message: Option>, + pub message: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs index 95289c87c..9a74d92f2 100644 --- a/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs +++ b/crates/jacquard-api/src/com_atproto/temp/add_reserved_handle.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct AddReservedHandle<'a> { #[serde(borrow)] - #[builder(into)] pub handle: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -39,7 +30,8 @@ pub struct AddReservedHandle<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct AddReservedHandleOutput<'a> {} diff --git a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs index 3c27693e7..65354ded4 100644 --- a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs +++ b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs @@ -141,7 +141,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for CheckHandleAvailabilityRequest { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ResultAvailable<'a> {} diff --git a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs index 066231b89..d90e6e6b7 100644 --- a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs +++ b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs @@ -31,7 +31,8 @@ pub struct DereferenceScope<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DereferenceScopeOutput<'a> { diff --git a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs index 5e8a31001..51b0b82bf 100644 --- a/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs +++ b/crates/jacquard-api/src/com_atproto/temp/request_phone_verification.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct RequestPhoneVerification<'a> { #[serde(borrow)] - #[builder(into)] pub phone_number: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs index ba47b9c6e..e4f025621 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs @@ -35,15 +35,14 @@ pub struct Image<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ImageLink<'a> { /// Alt text description of the image, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub alt: Option>, + pub alt: std::option::Option>, } /// An oekaki post. diff --git a/crates/jacquard-api/src/com_whtwnd/blog.rs b/crates/jacquard-api/src/com_whtwnd/blog.rs index e70ce08f9..8de01ccec 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog.rs @@ -41,16 +41,14 @@ pub struct BlobMetadata<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct BlogEntry<'a> { #[serde(borrow)] - #[builder(into)] pub content: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub created_at: Option, + pub created_at: std::option::Option, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs index 7b9847082..3838e7695 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog/notify_of_new_entry.rs @@ -38,7 +38,8 @@ pub struct NotifyOfNewEntry<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct NotifyOfNewEntryOutput<'a> {} diff --git a/crates/jacquard-api/src/community_lexicon/location/address.rs b/crates/jacquard-api/src/community_lexicon/location/address.rs index 522a8d784..20a33b1b2 100644 --- a/crates/jacquard-api/src/community_lexicon/location/address.rs +++ b/crates/jacquard-api/src/community_lexicon/location/address.rs @@ -15,37 +15,31 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Address<'a> { /// The ISO 3166 country code. Preferably the 2-letter code. #[serde(borrow)] - #[builder(into)] pub country: jacquard_common::CowStr<'a>, /// The locality of the region. For example, a city in the USA. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub locality: Option>, + pub locality: std::option::Option>, /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, /// The postal code of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub postal_code: Option>, + pub postal_code: std::option::Option>, /// The administrative region of the country. For example, a state in the USA. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub region: Option>, + pub region: std::option::Option>, /// The street address. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub street: Option>, + pub street: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/fsq.rs b/crates/jacquard-api/src/community_lexicon/location/fsq.rs index 71e25197b..fc8d73be6 100644 --- a/crates/jacquard-api/src/community_lexicon/location/fsq.rs +++ b/crates/jacquard-api/src/community_lexicon/location/fsq.rs @@ -15,25 +15,21 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Fsq<'a> { /// The unique identifier of a Foursquare POI. #[serde(borrow)] - #[builder(into)] pub fsq_place_id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub latitude: Option>, + pub latitude: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub longitude: Option>, + pub longitude: std::option::Option>, /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/geo.rs b/crates/jacquard-api/src/community_lexicon/location/geo.rs index 46999b155..163f39039 100644 --- a/crates/jacquard-api/src/community_lexicon/location/geo.rs +++ b/crates/jacquard-api/src/community_lexicon/location/geo.rs @@ -15,23 +15,19 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Geo<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub altitude: Option>, + pub altitude: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub latitude: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub longitude: jacquard_common::CowStr<'a>, /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/hthree.rs b/crates/jacquard-api/src/community_lexicon/location/hthree.rs index 9a2d90022..3e0b18e9c 100644 --- a/crates/jacquard-api/src/community_lexicon/location/hthree.rs +++ b/crates/jacquard-api/src/community_lexicon/location/hthree.rs @@ -15,17 +15,15 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Hthree<'a> { /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, /// The h3 encoded location. #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/events_smokesignal/automation/invoke_webhook.rs b/crates/jacquard-api/src/events_smokesignal/automation/invoke_webhook.rs index cf547f74d..a740a5fe5 100644 --- a/crates/jacquard-api/src/events_smokesignal/automation/invoke_webhook.rs +++ b/crates/jacquard-api/src/events_smokesignal/automation/invoke_webhook.rs @@ -43,7 +43,8 @@ pub struct InvokeWebhook<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct InvokeWebhookOutput<'a> {} diff --git a/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs b/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs index 8223dd732..0fd9ddff7 100644 --- a/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs +++ b/crates/jacquard-api/src/garden_lexicon/ngerakines/helloworld/hello.rs @@ -33,7 +33,8 @@ pub struct Hello<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct HelloOutput<'a> { diff --git a/crates/jacquard-api/src/my_skylights.rs b/crates/jacquard-api/src/my_skylights.rs index 85b80154b..63a22b52e 100644 --- a/crates/jacquard-api/src/my_skylights.rs +++ b/crates/jacquard-api/src/my_skylights.rs @@ -18,14 +18,12 @@ pub mod rel; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Item<'a> { #[serde(borrow)] - #[builder(into)] pub r#ref: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/my_skylights/list.rs b/crates/jacquard-api/src/my_skylights/list.rs index 2b1edf4c9..327f6e3fe 100644 --- a/crates/jacquard-api/src/my_skylights/list.rs +++ b/crates/jacquard-api/src/my_skylights/list.rs @@ -14,22 +14,18 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct List<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub created_at: Option, + pub created_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sort_by: Option>, + pub sort_by: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub title: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/my_skylights/list_item.rs b/crates/jacquard-api/src/my_skylights/list_item.rs index f64f2100b..3199209c4 100644 --- a/crates/jacquard-api/src/my_skylights/list_item.rs +++ b/crates/jacquard-api/src/my_skylights/list_item.rs @@ -32,14 +32,13 @@ impl std::fmt::Display for Abandoned { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Builtin<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub r#type: Option>, + pub r#type: std::option::Option>, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs index 54b4f1676..08dd1bc54 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs @@ -148,29 +148,25 @@ impl From> for Collection<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SourceDetails<'a> { /// Number of attempts before successful capture #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub attempts: Option, + pub attempts: std::option::Option, /// Probability used when catching this specimen (decimal string, e.g. '0.75') #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub catch_probability: Option>, + pub catch_probability: std::option::Option>, /// URI of the game card that provided this specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub game_card_uri: Option>, + pub game_card_uri: std::option::Option>, /// Location where specimen was found or observed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub location: Option>, + pub location: std::option::Option>, } /// Complete specimen information @@ -183,18 +179,16 @@ pub struct SourceDetails<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SpecimenData<'a> { /// Scientific authorship of the species #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub authorship: Option>, + pub authorship: std::option::Option>, /// Detailed description of the specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs index 600daaa13..1d336d918 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs @@ -135,22 +135,19 @@ impl From> for Inventory<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SourceDetails<'a> { /// URI of the game card that provided this item #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub game_card_uri: Option>, + pub game_card_uri: std::option::Option>, /// ID of the quest that rewarded this item #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub quest_id: Option>, + pub quest_id: std::option::Option>, /// Daily reward streak when item was acquired #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reward_streak: Option, + pub reward_streak: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/log.rs b/crates/jacquard-api/src/net_anisota/beta/game/log.rs index a71149d21..a87d7af11 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/log.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/log.rs @@ -15,42 +15,35 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct CollectionData<'a> { /// Catch probability for specimens (decimal string between 0.0 and 1.0) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub catch_probability: Option>, + pub catch_probability: std::option::Option>, /// URI of the created inventory record #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub inventory_record_uri: Option>, + pub inventory_record_uri: std::option::Option>, /// How the item was obtained #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub method: Option>, + pub method: std::option::Option>, /// URI of the created specimen record #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub specimen_record_uri: Option>, + pub specimen_record_uri: std::option::Option>, /// Whether collection was successful #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub success: Option, + pub success: std::option::Option, /// Milliseconds between card generation and collection #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub time_since_generation: Option, + pub time_since_generation: std::option::Option, /// Milliseconds between card being viewed and collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub time_since_viewed: Option, + pub time_since_viewed: std::option::Option, } /// Details about daily rewards claim @@ -63,26 +56,24 @@ pub struct CollectionData<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct DailyRewardsData<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub reward_items: Option>>, + pub reward_items: std::option::Option< + Vec>, + >, /// Number of rewards claimed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub rewards_count: Option, + pub rewards_count: std::option::Option, /// Current daily reward streak #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub streak: Option, + pub streak: std::option::Option, /// Milliseconds since last claim #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub time_since_last_claim: Option, + pub time_since_last_claim: std::option::Option, } /// Context about the feed when event occurred @@ -95,27 +86,23 @@ pub struct DailyRewardsData<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct FeedContext<'a> { /// URI of the feed being viewed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub feed_uri: Option>, + pub feed_uri: std::option::Option>, /// Number of game cards injected #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub game_card_count: Option, + pub game_card_count: std::option::Option, /// Number of posts in the feed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub post_count: Option, + pub post_count: std::option::Option, /// User's scroll position or card index #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub scroll_position: Option, + pub scroll_position: std::option::Option, } /// Details about game cards generated or interacted with @@ -128,43 +115,36 @@ pub struct FeedContext<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct GameCardData<'a> { /// Type of game card #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub card_type: Option>, + pub card_type: std::option::Option>, /// Unique identifier for the game card #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub card_uri: Option>, + pub card_uri: std::option::Option>, /// Random seed used for generation (for verification) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub generation_seed: Option>, + pub generation_seed: std::option::Option>, /// Position where card was injected in feed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub injection_position: Option, + pub injection_position: std::option::Option, /// ID of the item/specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub item_id: Option>, + pub item_id: std::option::Option>, /// Quantity of items #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quantity: Option, + pub quantity: std::option::Option, /// Rarity of the item/specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub rarity: Option>, + pub rarity: std::option::Option>, } /// Details about item usage @@ -177,33 +157,28 @@ pub struct GameCardData<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ItemUsageData<'a> { /// Effect that was applied #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub effect_applied: Option>, + pub effect_applied: std::option::Option>, /// URI of the modified inventory record #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub inventory_record_uri: Option>, + pub inventory_record_uri: std::option::Option>, /// ID of the item used #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub item_id: Option>, + pub item_id: std::option::Option>, /// Quantity of the item used #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quantity_used: Option, + pub quantity_used: std::option::Option, /// Remaining quantity after use #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub remaining_quantity: Option, + pub remaining_quantity: std::option::Option, } /// A log record for tracking game events and user actions for provenance and anti-bot analysis @@ -334,29 +309,27 @@ impl From> for Log<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { /// Version of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub client_version: Option>, + pub client_version: std::option::Option>, /// Network latency in milliseconds #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub network_latency: Option, + pub network_latency: std::option::Option, /// Performance timing data #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub performance_timings: Option>, + pub performance_timings: std::option::Option< + jacquard_common::types::value::Data<'a>, + >, /// Platform (web, mobile, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub platform: Option>, + pub platform: std::option::Option>, } /// Item received as a reward @@ -369,19 +342,16 @@ pub struct Metadata<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RewardItem<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub item_id: Option>, + pub item_id: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quantity: Option, + pub quantity: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub rarity: Option>, + pub rarity: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs index b1cca15d0..b37ef3646 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs @@ -96,25 +96,22 @@ impl From> for Pack<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PackHistoryEntry<'a> { /// Items received from this pack #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub items_received: Option< + pub items_received: std::option::Option< Vec>, >, /// When this pack was opened #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub open_time: Option, + pub open_time: std::option::Option, /// Streak count at time of opening #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub streak_count: Option, + pub streak_count: std::option::Option, } /// An item received from a pack opening @@ -127,22 +124,19 @@ pub struct PackHistoryEntry<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ReceivedItem<'a> { /// ID of the item received #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub item_id: Option>, + pub item_id: std::option::Option>, /// Quantity received #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quantity: Option, + pub quantity: std::option::Option, /// Rarity of the item #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub rarity: Option>, + pub rarity: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs index d14adc2f3..6a778def8 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs @@ -131,20 +131,18 @@ impl From> for Progress<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { /// Version of the client when this progress was recorded #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub client_version: Option>, + pub client_version: std::option::Option>, /// Platform where the level up occurred (web, mobile, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub platform: Option>, + pub platform: std::option::Option>, } /// Game-specific statistics and metrics @@ -157,40 +155,34 @@ pub struct Metadata<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Stats<'a> { /// Total daily rewards claimed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub daily_rewards_claimed: Option, + pub daily_rewards_claimed: std::option::Option, /// Total items collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub items_collected: Option, + pub items_collected: std::option::Option, /// Date when posts read today was last updated (for daily reset tracking) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub last_post_read_date: Option, + pub last_post_read_date: std::option::Option< + jacquard_common::types::string::Datetime, + >, /// Posts read today (resets daily) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts_read_today: Option, + pub posts_read_today: std::option::Option, /// Total posts read (all time, cumulative) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts_read_total: Option, + pub posts_read_total: std::option::Option, /// Total posts viewed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts_viewed: Option, + pub posts_viewed: std::option::Option, /// Total shuffles performed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub shuffles_performed: Option, + pub shuffles_performed: std::option::Option, /// Total specimens collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub specimens_collected: Option, + pub specimens_collected: std::option::Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/session.rs b/crates/jacquard-api/src/net_anisota/beta/game/session.rs index c22ba0879..3ee3bf0b8 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/session.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/session.rs @@ -15,35 +15,31 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ActivitySummary<'a> { /// Player's current level at the time of this session update #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub current_level: Option, + pub current_level: std::option::Option, /// Player's total XP at the time of this session update #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub current_xp: Option, + pub current_xp: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub game_actions: Option>, + pub game_actions: std::option::Option< + crate::net_anisota::beta::game::session::GameActions<'a>, + >, /// List of unique pages/routes visited #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub pages_visited: Option>>, + pub pages_visited: std::option::Option>>, /// Total number of events logged in this session #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub total_events: Option, + pub total_events: std::option::Option, /// Total XP gained during this specific session #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub xp_gained_this_session: Option, + pub xp_gained_this_session: std::option::Option, } /// Game-specific actions performed @@ -56,28 +52,22 @@ pub struct ActivitySummary<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct GameActions<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub daily_rewards_claimed: Option, + pub daily_rewards_claimed: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub feeds_loaded: Option, + pub feeds_loaded: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub items_collected: Option, + pub items_collected: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub level_ups: Option, + pub level_ups: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts_viewed: Option, + pub posts_viewed: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub specimens_collected: Option, + pub specimens_collected: std::option::Option, } /// A game session record tracking a continuous period of user engagement with the application @@ -223,24 +213,21 @@ impl From> for Session<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { /// List of features used during the session #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub features: Option>>, + pub features: std::option::Option>>, /// Network condition during session #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub network_condition: Option>, + pub network_condition: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub performance_metrics: Option< + pub performance_metrics: std::option::Option< crate::net_anisota::beta::game::session::PerformanceMetrics<'a>, >, } @@ -255,18 +242,16 @@ pub struct Metadata<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PerformanceMetrics<'a> { /// Average API response time in milliseconds (rounded to nearest integer) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub average_response_time: Option, + pub average_response_time: std::option::Option, /// Number of errors encountered #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub error_count: Option, + pub error_count: std::option::Option, } /// Context about how the session started @@ -279,27 +264,23 @@ pub struct PerformanceMetrics<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SessionContext<'a> { /// How the user was authenticated #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub authentication_method: Option>, + pub authentication_method: std::option::Option>, /// How the user entered the app #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub entry_point: Option>, + pub entry_point: std::option::Option>, /// Whether this was a new user's first session #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub is_new_user: Option, + pub is_new_user: std::option::Option, /// Referrer URL if applicable #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub referrer: Option>, + pub referrer: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs index e6e2b302e..7ce710377 100644 --- a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs @@ -15,26 +15,22 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ContentTypes<'a> { /// Mute regular posts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts: Option, + pub posts: std::option::Option, /// Mute quote posts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quotes: Option, + pub quotes: std::option::Option, /// Mute replies from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub replies: Option, + pub replies: std::option::Option, /// Mute reposts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reposts: Option, + pub reposts: std::option::Option, } /// A record for muting content from all accounts on a list with fine-grained control over content types, duration, and feed targeting diff --git a/crates/jacquard-api/src/net_anisota/graph/mute.rs b/crates/jacquard-api/src/net_anisota/graph/mute.rs index 01b9b8d08..5df8ff529 100644 --- a/crates/jacquard-api/src/net_anisota/graph/mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/mute.rs @@ -15,26 +15,22 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ContentTypes<'a> { /// Mute regular posts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub posts: Option, + pub posts: std::option::Option, /// Mute quote posts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub quotes: Option, + pub quotes: std::option::Option, /// Mute replies from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub replies: Option, + pub replies: std::option::Option, /// Mute reposts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reposts: Option, + pub reposts: std::option::Option, } /// A record for muting content from a specific account with fine-grained control over content types and duration diff --git a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs index 5e236d57e..e883a1996 100644 --- a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs +++ b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct ClearSliceRecords<'a> { /// AT-URI of the slice to clear #[serde(borrow)] - #[builder(into)] pub slice: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -40,7 +31,8 @@ pub struct ClearSliceRecords<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct ClearSliceRecordsOutput<'a> { diff --git a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs index fde970c09..ab035add7 100644 --- a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs +++ b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteOAuthClient<'a> { /// OAuth client ID to delete #[serde(borrow)] - #[builder(into)] pub client_id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -40,7 +31,8 @@ pub struct DeleteOAuthClient<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DeleteOAuthClientOutput<'a> { diff --git a/crates/jacquard-api/src/network_slices/slice/get_actors.rs b/crates/jacquard-api/src/network_slices/slice/get_actors.rs index c304a818c..442f1e827 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_actors.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_actors.rs @@ -42,37 +42,25 @@ pub struct Actor<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct GetActors<'a> { /// Pagination cursor from previous response #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cursor: Option>, + pub cursor: std::option::Option>, /// Maximum number of actors to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub limit: Option, + pub limit: std::option::Option, /// AT-URI of the slice to query #[serde(borrow)] - #[builder(into)] pub slice: jacquard_common::CowStr<'a>, /// Flexible filtering conditions for querying actors #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub r#where: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub r#where: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs index a481c7658..0b756a793 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs @@ -45,42 +45,29 @@ pub struct IndexedRecord<'a> { Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct GetSliceRecords<'a> { /// Pagination cursor from previous response #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cursor: Option>, + pub cursor: std::option::Option>, /// Maximum number of records to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub limit: Option, + pub limit: std::option::Option, /// AT-URI of the slice to query #[serde(borrow)] - #[builder(into)] pub slice: jacquard_common::CowStr<'a>, /// Sorting configuration for result ordering #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sort_by: Option>, + pub sort_by: std::option::Option>, /// Flexible filtering conditions for querying records #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub r#where: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub r#where: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/network_slices/slice/start_sync.rs b/crates/jacquard-api/src/network_slices/slice/start_sync.rs index 0b115eb12..b801da1d8 100644 --- a/crates/jacquard-api/src/network_slices/slice/start_sync.rs +++ b/crates/jacquard-api/src/network_slices/slice/start_sync.rs @@ -13,46 +13,34 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct StartSync<'a> { /// List of collection NSIDs to sync (primary collections matching slice domain) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub collections: Option>>, + pub collections: std::option::Option>>, /// List of external collection NSIDs to sync (collections outside slice domain) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub external_collections: Option>>, + pub external_collections: std::option::Option< + Vec>, + >, /// Maximum number of records to sync per repository #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub limit_per_repo: Option, + pub limit_per_repo: std::option::Option, /// List of specific repository DIDs to sync from #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub repos: Option>>, + pub repos: std::option::Option>>, /// Skip lexicon validation during sync #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub skip_validation: Option, + pub skip_validation: std::option::Option, /// AT-URI of the slice to sync data into #[serde(borrow)] - #[builder(into)] pub slice: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -63,7 +51,8 @@ pub struct StartSync<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct StartSyncOutput<'a> { diff --git a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs index b7e6c23eb..39183c0fc 100644 --- a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs +++ b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs @@ -13,27 +13,17 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct SyncUserCollections<'a> { /// AT-URI of the slice to sync user data into #[serde(borrow)] - #[builder(into)] pub slice: jacquard_common::CowStr<'a>, /// Timeout in seconds for the sync operation #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub timeout_seconds: Option, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub timeout_seconds: std::option::Option, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs index 728846997..2124f7f50 100644 --- a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs +++ b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs @@ -13,58 +13,42 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateOAuthClient<'a> { /// OAuth client ID to update #[serde(borrow)] - #[builder(into)] pub client_id: jacquard_common::CowStr<'a>, /// New human-readable name of the OAuth client #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub client_name: Option>, + pub client_name: std::option::Option>, /// New URI of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub client_uri: Option>, + pub client_uri: std::option::Option>, /// New URI of the client logo #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub logo_uri: Option>, + pub logo_uri: std::option::Option>, /// New URI of the privacy policy #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub policy_uri: Option>, + pub policy_uri: std::option::Option>, /// New allowed redirect URIs for OAuth flow #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub redirect_uris: Option>>, + pub redirect_uris: std::option::Option>>, /// New OAuth scope #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub scope: Option>, + pub scope: std::option::Option>, /// New URI of the terms of service #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub tos_uri: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub tos_uri: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/place_stream.rs b/crates/jacquard-api/src/place_stream.rs index 39dfc0ef0..531765b4d 100644 --- a/crates/jacquard-api/src/place_stream.rs +++ b/crates/jacquard-api/src/place_stream.rs @@ -47,12 +47,11 @@ pub struct BlockView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Rendition<'a> { #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/place_stream/graph/get_following_user.rs b/crates/jacquard-api/src/place_stream/graph/get_following_user.rs index 77e2975ce..a6383b795 100644 --- a/crates/jacquard-api/src/place_stream/graph/get_following_user.rs +++ b/crates/jacquard-api/src/place_stream/graph/get_following_user.rs @@ -32,7 +32,8 @@ pub struct GetFollowingUser<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetFollowingUserOutput<'a> { diff --git a/crates/jacquard-api/src/place_stream/live/get_live_users.rs b/crates/jacquard-api/src/place_stream/live/get_live_users.rs index 2974749b6..4aa204342 100644 --- a/crates/jacquard-api/src/place_stream/live/get_live_users.rs +++ b/crates/jacquard-api/src/place_stream/live/get_live_users.rs @@ -33,7 +33,8 @@ pub struct GetLiveUsers { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetLiveUsersOutput<'a> { diff --git a/crates/jacquard-api/src/place_stream/live/get_segments.rs b/crates/jacquard-api/src/place_stream/live/get_segments.rs index b0374a4f1..77aee7a6d 100644 --- a/crates/jacquard-api/src/place_stream/live/get_segments.rs +++ b/crates/jacquard-api/src/place_stream/live/get_segments.rs @@ -35,7 +35,8 @@ pub struct GetSegments<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetSegmentsOutput<'a> { diff --git a/crates/jacquard-api/src/place_stream/server.rs b/crates/jacquard-api/src/place_stream/server.rs index ac9d4c13b..e7e6fbcda 100644 --- a/crates/jacquard-api/src/place_stream/server.rs +++ b/crates/jacquard-api/src/place_stream/server.rs @@ -21,17 +21,15 @@ pub mod update_webhook; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RewriteRule<'a> { /// Text to search for and replace. #[serde(borrow)] - #[builder(into)] pub from: jacquard_common::CowStr<'a>, /// Text to replace with. #[serde(borrow)] - #[builder(into)] pub to: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs index 0203ac4e7..b142a27e9 100644 --- a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteWebhook<'a> { /// The ID of the webhook to delete. #[serde(borrow)] - #[builder(into)] pub id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/place_stream/server/update_webhook.rs b/crates/jacquard-api/src/place_stream/server/update_webhook.rs index 7b8412915..64df16552 100644 --- a/crates/jacquard-api/src/place_stream/server/update_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/update_webhook.rs @@ -13,67 +13,49 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateWebhook<'a> { /// Whether this webhook should be active. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub active: Option, + pub active: std::option::Option, /// A description of what this webhook is used for. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, /// The types of events this webhook should receive. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub events: Option>>, + pub events: std::option::Option>>, /// The ID of the webhook to update. #[serde(borrow)] - #[builder(into)] pub id: jacquard_common::CowStr<'a>, /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub mute_words: Option>>, + pub mute_words: std::option::Option>>, /// A user-friendly name for this webhook. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, /// Text to prepend to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub prefix: Option>, + pub prefix: std::option::Option>, /// Text replacement rules for webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub rewrite: Option>>, + pub rewrite: std::option::Option>>, /// Text to append to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub suffix: Option>, + pub suffix: std::option::Option>, /// The webhook URL where events will be sent. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub url: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub url: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs index 9c1385e48..83adc12c1 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs @@ -14,15 +14,13 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Blockquote<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub facets: Option>>, + pub facets: std::option::Option>>, #[serde(borrow)] - #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/code.rs b/crates/jacquard-api/src/pub_leaflet/blocks/code.rs index 9b441f2d0..fafaa3f95 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/code.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/code.rs @@ -14,19 +14,16 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Code<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub language: Option>, + pub language: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub syntax_highlighting_theme: Option>, + pub syntax_highlighting_theme: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/header.rs b/crates/jacquard-api/src/pub_leaflet/blocks/header.rs index 1b8fd521b..f9560834b 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/header.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/header.rs @@ -14,18 +14,15 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Header<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub facets: Option>>, + pub facets: std::option::Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub level: Option, + pub level: std::option::Option, #[serde(borrow)] - #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs b/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs index a136b2fb6..bb029843c 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs @@ -14,7 +14,7 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct HorizontalRule<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/math.rs b/crates/jacquard-api/src/pub_leaflet/blocks/math.rs index f22918ce8..1650ee07d 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/math.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/math.rs @@ -14,11 +14,10 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Math<'a> { #[serde(borrow)] - #[builder(into)] pub tex: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/text.rs b/crates/jacquard-api/src/pub_leaflet/blocks/text.rs index 341cdbd42..3a2a48050 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/text.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/text.rs @@ -14,15 +14,13 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Text<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub facets: Option>>, + pub facets: std::option::Option>>, #[serde(borrow)] - #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs index 5067fee66..fafcac181 100644 --- a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs +++ b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs @@ -72,14 +72,15 @@ pub enum BlockBlock<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LinearDocument<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub blocks: Option>>, + pub blocks: std::option::Option< + Vec>, + >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/pub_leaflet/publication.rs b/crates/jacquard-api/src/pub_leaflet/publication.rs index 1b71e8563..24034df69 100644 --- a/crates/jacquard-api/src/pub_leaflet/publication.rs +++ b/crates/jacquard-api/src/pub_leaflet/publication.rs @@ -95,16 +95,14 @@ impl From> for Publication<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Preferences<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub show_comments: Option, + pub show_comments: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub show_in_discover: Option, + pub show_in_discover: std::option::Option, } #[jacquard_derive::lexicon] @@ -116,39 +114,32 @@ pub struct Preferences<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Theme<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub accent_background: Option>, + pub accent_background: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub accent_text: Option>, + pub accent_text: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub background_color: Option>, + pub background_color: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub background_image: Option< + pub background_image: std::option::Option< crate::pub_leaflet::theme::background_image::BackgroundImage<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub page_background: Option>, + pub page_background: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub primary: Option>, + pub primary: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub show_page_background: Option, + pub show_page_background: std::option::Option, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs index e5d91d0ab..75bea2584 100644 --- a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs +++ b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs @@ -15,7 +15,7 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Bold<'a> {} @@ -47,7 +47,7 @@ pub struct ByteSlice<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Code<'a> {} @@ -61,7 +61,7 @@ pub struct Code<'a> {} PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Highlight<'a> {} @@ -75,14 +75,13 @@ pub struct Highlight<'a> {} PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Id<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub id: Option>, + pub id: std::option::Option>, } /// Facet feature for italic text @@ -95,7 +94,7 @@ pub struct Id<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Italic<'a> {} @@ -178,7 +177,7 @@ pub enum FacetFeaturesItem<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Strikethrough<'a> {} @@ -192,7 +191,7 @@ pub struct Strikethrough<'a> {} PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Underline<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs index d03b478d0..f8049f75d 100644 --- a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs +++ b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs @@ -14,14 +14,13 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct CommitCountBreakdown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub by_email: Option< + pub by_email: std::option::Option< Vec>, >, } @@ -73,14 +72,13 @@ pub struct IndividualLanguageSize<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct LangBreakdown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub inputs: Option< + pub inputs: std::option::Option< Vec>, >, } diff --git a/crates/jacquard-api/src/sh_tangled/knot/version.rs b/crates/jacquard-api/src/sh_tangled/knot/version.rs index 758362791..0a2616d3b 100644 --- a/crates/jacquard-api/src/sh_tangled/knot/version.rs +++ b/crates/jacquard-api/src/sh_tangled/knot/version.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct VersionOutput<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/label/definition.rs b/crates/jacquard-api/src/sh_tangled/label/definition.rs index 7d602dcd4..1ef1e483e 100644 --- a/crates/jacquard-api/src/sh_tangled/label/definition.rs +++ b/crates/jacquard-api/src/sh_tangled/label/definition.rs @@ -91,21 +91,18 @@ impl From> for Definition<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ValueType<'a> { /// Closed set of values that this label can take. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub r#enum: Option>>, + pub r#enum: std::option::Option>>, /// An optional constraint that can be applied on string concrete types. #[serde(borrow)] - #[builder(into)] pub format: jacquard_common::CowStr<'a>, /// The concrete type of this label's value. #[serde(borrow)] - #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/pipeline.rs b/crates/jacquard-api/src/sh_tangled/pipeline.rs index d12ea1007..b8b4a4229 100644 --- a/crates/jacquard-api/src/sh_tangled/pipeline.rs +++ b/crates/jacquard-api/src/sh_tangled/pipeline.rs @@ -95,14 +95,13 @@ impl From> for Pipeline<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ManualTriggerData<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub inputs: Option>>, + pub inputs: std::option::Option>>, } #[jacquard_derive::lexicon] @@ -114,15 +113,13 @@ pub struct ManualTriggerData<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Pair<'a> { #[serde(borrow)] - #[builder(into)] pub key: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -135,21 +132,17 @@ pub struct Pair<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PullRequestTriggerData<'a> { #[serde(borrow)] - #[builder(into)] pub action: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub source_branch: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub source_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub target_branch: jacquard_common::CowStr<'a>, } @@ -162,18 +155,15 @@ pub struct PullRequestTriggerData<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PushTriggerData<'a> { #[serde(borrow)] - #[builder(into)] pub new_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub old_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub r#ref: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/blob.rs b/crates/jacquard-api/src/sh_tangled/repo/blob.rs index 200ea6ee1..8e37253d4 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/blob.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/blob.rs @@ -74,7 +74,8 @@ pub struct Blob<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct BlobOutput<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/repo/create.rs b/crates/jacquard-api/src/sh_tangled/repo/create.rs index 0ce40b552..83231cfb6 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/create.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/create.rs @@ -13,33 +13,22 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct Create<'a> { /// Default branch to push to #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub default_branch: Option>, + pub default_branch: std::option::Option>, /// Rkey of the repository record #[serde(borrow)] - #[builder(into)] pub rkey: jacquard_common::CowStr<'a>, /// A source URL to clone from, populate this when forking or importing a repository. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub source: Option>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub source: std::option::Option>, } ///Response type for diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs index 652caa629..4e3ea12cc 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs @@ -14,17 +14,15 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ConflictInfo<'a> { /// Name of the conflicted file #[serde(borrow)] - #[builder(into)] pub filename: jacquard_common::CowStr<'a>, /// Reason for the conflict #[serde(borrow)] - #[builder(into)] pub reason: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull.rs b/crates/jacquard-api/src/sh_tangled/repo/pull.rs index 0bcaa0487..da19b710c 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull.rs @@ -91,19 +91,16 @@ impl From> for Pull<'_> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Source<'a> { #[serde(borrow)] - #[builder(into)] pub branch: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub repo: Option>, + pub repo: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub sha: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/tree.rs b/crates/jacquard-api/src/sh_tangled/repo/tree.rs index d29e8afea..10e6dac91 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/tree.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/tree.rs @@ -187,17 +187,15 @@ impl jacquard_common::xrpc::XrpcEndpoint for TreeRequest { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Readme<'a> { /// Contents of the readme file #[serde(borrow)] - #[builder(into)] pub contents: jacquard_common::CowStr<'a>, /// Name of the readme file #[serde(borrow)] - #[builder(into)] pub filename: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs index 31d5ff01c..5f671eb21 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs @@ -172,14 +172,12 @@ pub struct NormalContainerId<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RootContainerId<'a> { #[serde(borrow)] - #[builder(into)] pub container_type: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook.rs index aae124e9d..d91eae753 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook.rs @@ -92,15 +92,14 @@ pub struct BookEntryView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ContentFormat<'a> { /// The format of the content. This is used to determine how to render the content. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub markdown: Option>, + pub markdown: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/social_clippr/actor.rs b/crates/jacquard-api/src/social_clippr/actor.rs index e0046c13c..2fc1a08a9 100644 --- a/crates/jacquard-api/src/social_clippr/actor.rs +++ b/crates/jacquard-api/src/social_clippr/actor.rs @@ -82,12 +82,11 @@ pub struct ProfileView<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PublishingScopesPref<'a> { /// What publishing scope to mark a clip as by default #[serde(borrow)] - #[builder(into)] pub default_scope: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_psky/richtext/facet.rs b/crates/jacquard-api/src/social_psky/richtext/facet.rs index 75d090f0e..0cc2d2896 100644 --- a/crates/jacquard-api/src/social_psky/richtext/facet.rs +++ b/crates/jacquard-api/src/social_psky/richtext/facet.rs @@ -110,11 +110,10 @@ pub struct Mention<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Room<'a> { #[serde(borrow)] - #[builder(into)] pub room: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs index 1daec06a5..68dec8c4d 100644 --- a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs +++ b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs @@ -13,40 +13,27 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct CreateTemplate<'a> { /// Content of the template, markdown supported, can contain variable placeholders. #[serde(borrow)] - #[builder(into)] pub content_markdown: jacquard_common::CowStr<'a>, /// DID of the user who is creating the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub created_by: Option>, + pub created_by: std::option::Option>, /// Message language. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub lang: Option, + pub lang: std::option::Option, /// Name of the template. #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, /// Subject of the message, used in emails. #[serde(borrow)] - #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs index e65c89ec3..ee80e74f7 100644 --- a/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs +++ b/crates/jacquard-api/src/tools_ozone/communication/delete_template.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteTemplate<'a> { #[serde(borrow)] - #[builder(into)] pub id: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } ///Response type for diff --git a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs index 5eb4eea40..adb6be896 100644 --- a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs +++ b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs @@ -13,50 +13,35 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpdateTemplate<'a> { /// Content of the template, markdown supported, can contain variable placeholders. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub content_markdown: Option>, + pub content_markdown: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub disabled: Option, + pub disabled: std::option::Option, /// ID of the template to be updated. #[serde(borrow)] - #[builder(into)] pub id: jacquard_common::CowStr<'a>, /// Message language. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub lang: Option, + pub lang: std::option::Option, /// Name of the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub name: Option>, + pub name: std::option::Option>, /// Subject of the message, used in emails. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub subject: Option>, + pub subject: std::option::Option>, /// DID of the user who is updating the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub updated_by: Option>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub updated_by: std::option::Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs index c37bc93db..77588e66c 100644 --- a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs +++ b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs @@ -14,18 +14,16 @@ PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AccountCreated<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub email: Option>, + pub email: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub handle: Option>, + pub handle: std::option::Option>, } #[jacquard_derive::lexicon] @@ -37,12 +35,11 @@ pub struct AccountCreated<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct EmailConfirmed<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, } @@ -55,12 +52,11 @@ pub struct EmailConfirmed<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct EmailUpdated<'a> { #[serde(borrow)] - #[builder(into)] pub email: jacquard_common::CowStr<'a>, } @@ -218,7 +214,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetAccountHistoryRequest { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct PasswordUpdated<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/moderation.rs b/crates/jacquard-api/src/tools_ozone/moderation.rs index d1020be5e..05d6095c1 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation.rs @@ -57,28 +57,22 @@ pub struct AccountEvent<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AccountHosting<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub created_at: Option, + pub created_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub deactivated_at: Option, + pub deactivated_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub deleted_at: Option, + pub deleted_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reactivated_at: Option, + pub reactivated_at: std::option::Option, #[serde(borrow)] - #[builder(into)] pub status: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub updated_at: Option, + pub updated_at: std::option::Option, } /// Statistics about a particular account subject @@ -91,30 +85,25 @@ pub struct AccountHosting<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AccountStats<'a> { /// Total number of appeals against a moderation action on the account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub appeal_count: Option, + pub appeal_count: std::option::Option, /// Number of times the account was escalated #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub escalate_count: Option, + pub escalate_count: std::option::Option, /// Total number of reports on the account #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub report_count: Option, + pub report_count: std::option::Option, /// Number of times the account was suspended #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub suspend_count: Option, + pub suspend_count: std::option::Option, /// Number of times the account was taken down #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub takedown_count: Option, + pub takedown_count: std::option::Option, } /// Age assurance info coming directly from users. Only works on DID subjects. @@ -173,17 +162,15 @@ pub struct AgeAssuranceEvent<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceOverrideEvent<'a> { /// Comment describing the reason for the override. #[serde(borrow)] - #[builder(into)] pub comment: jacquard_common::CowStr<'a>, /// The status to be set for the user decided by a moderator, overriding whatever value the user had previously. Use reset to default to original state. #[serde(borrow)] - #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -246,14 +233,13 @@ pub enum BlobViewDetails<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct CancelScheduledTakedownEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. @@ -314,18 +300,16 @@ pub struct ImageDetails<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventAcknowledge<'a> { /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub acknowledge_account_subjects: Option, + pub acknowledge_account_subjects: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Add a comment to a subject. An empty comment will clear any previously set sticky comment. @@ -338,18 +322,16 @@ pub struct ModEventAcknowledge<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventComment<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, /// Make the comment persistent on the subject #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub sticky: Option, + pub sticky: std::option::Option, } /// Divert a record's blobs to a 3rd party service for further scanning/tagging @@ -362,14 +344,13 @@ pub struct ModEventComment<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventDivert<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Keep a log of outgoing email to a user @@ -382,23 +363,20 @@ pub struct ModEventDivert<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventEmail<'a> { /// Additional comment about the outgoing comm. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, /// The content of the email sent to the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub content: Option>, + pub content: std::option::Option>, /// The subject line of the email sent to the user. #[serde(borrow)] - #[builder(into)] pub subject_line: jacquard_common::CowStr<'a>, } @@ -411,14 +389,13 @@ pub struct ModEventEmail<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventEscalate<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Apply/Negate labels on a subject @@ -481,18 +458,16 @@ pub struct ModEventMute<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventMuteReporter<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, /// Indicates how long the account should remain muted. Falsy value here means a permanent mute. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub duration_in_hours: Option, + pub duration_in_hours: std::option::Option, } /// Set priority score of the subject. Higher score means higher priority. @@ -552,15 +527,14 @@ pub struct ModEventReport<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventResolveAppeal<'a> { /// Describe resolution. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Revert take down action on a subject @@ -573,15 +547,14 @@ pub struct ModEventResolveAppeal<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventReverseTakedown<'a> { /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Add/Remove a tag on a subject @@ -621,27 +594,23 @@ pub struct ModEventTag<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventTakedown<'a> { /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub acknowledge_account_subjects: Option, + pub acknowledge_account_subjects: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, /// Indicates how long the takedown should be in effect before automatically expiring. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub duration_in_hours: Option, + pub duration_in_hours: std::option::Option, /// Names/Keywords of the policies that drove the decision. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub policies: Option>>, + pub policies: std::option::Option>>, } /// Unmute action on a subject @@ -654,15 +623,14 @@ pub struct ModEventTakedown<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventUnmute<'a> { /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } /// Unmute incoming reports from an account @@ -675,15 +643,14 @@ pub struct ModEventUnmute<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModEventUnmuteReporter<'a> { /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, } #[jacquard_derive::lexicon] @@ -964,18 +931,16 @@ pub enum ModEventViewDetailSubject<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModTool<'a> { /// Additional arbitrary metadata about the source #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub meta: Option>, + pub meta: std::option::Option>, /// Name/identifier of the source (e.g., 'automod', 'ozone/workspace') #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -988,14 +953,15 @@ pub struct ModTool<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Moderation<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub subject_status: Option>, + pub subject_status: std::option::Option< + crate::tools_ozone::moderation::SubjectStatusView<'a>, + >, } #[jacquard_derive::lexicon] @@ -1007,14 +973,15 @@ pub struct Moderation<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ModerationDetail<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub subject_status: Option>, + pub subject_status: std::option::Option< + crate::tools_ozone::moderation::SubjectStatusView<'a>, + >, } /// Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. @@ -1054,22 +1021,18 @@ pub struct RecordEvent<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RecordHosting<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub created_at: Option, + pub created_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub deleted_at: Option, + pub deleted_at: std::option::Option, #[serde(borrow)] - #[builder(into)] pub status: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub updated_at: Option, + pub updated_at: std::option::Option, } #[jacquard_derive::lexicon] @@ -1159,42 +1122,34 @@ pub struct RecordViewNotFound<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RecordsStats<'a> { /// Number of items that were appealed at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub appealed_count: Option, + pub appealed_count: std::option::Option, /// Number of items that were escalated at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub escalated_count: Option, + pub escalated_count: std::option::Option, /// Number of item currently in "reviewOpen" or "reviewEscalated" state #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub pending_count: Option, + pub pending_count: std::option::Option, /// Number of item currently in "reviewNone" or "reviewClosed" state #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub processed_count: Option, + pub processed_count: std::option::Option, /// Number of items that were reported at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub reported_count: Option, + pub reported_count: std::option::Option, /// Total number of item in the set #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub subject_count: Option, + pub subject_count: std::option::Option, /// Number of item currently taken down #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub takendown_count: Option, + pub takendown_count: std::option::Option, /// Cumulative sum of the number of reports on the items in the set #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub total_reports: Option, + pub total_reports: std::option::Option, } #[jacquard_derive::lexicon] @@ -1432,13 +1387,12 @@ impl std::fmt::Display for ReviewOpen { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct RevokeAccountCredentialsEvent<'a> { /// Comment describing the reason for the revocation. #[serde(borrow)] - #[builder(into)] pub comment: jacquard_common::CowStr<'a>, } @@ -1452,23 +1406,19 @@ pub struct RevokeAccountCredentialsEvent<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ScheduleTakedownEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_after: Option, + pub execute_after: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_at: Option, + pub execute_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_until: Option, + pub execute_until: std::option::Option, } /// View of a scheduled moderation action diff --git a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs index 30a3585f0..6b82dd519 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs @@ -144,22 +144,19 @@ pub struct ScheduledActionResults<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SchedulingConfig<'a> { /// Earliest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_after: Option, + pub execute_after: std::option::Option, /// Exact time to execute the action #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_at: Option, + pub execute_at: std::option::Option, /// Latest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub execute_until: Option, + pub execute_until: std::option::Option, } /// Schedule a takedown action @@ -172,25 +169,21 @@ pub struct SchedulingConfig<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Takedown<'a> { /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub acknowledge_account_subjects: Option, + pub acknowledge_account_subjects: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub comment: Option>, + pub comment: std::option::Option>, /// Indicates how long the takedown should be in effect before automatically expiring. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub duration_in_hours: Option, + pub duration_in_hours: std::option::Option, /// Names/Keywords of the policies that drove the decision. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub policies: Option>>, + pub policies: std::option::Option>>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs index 217246ded..6b1cbdb27 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs @@ -13,43 +13,30 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct QueryEvents<'a> { /// Cursor for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cursor: Option>, + pub cursor: std::option::Option>, /// Maximum number of results to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub limit: Option, + pub limit: std::option::Option, /// Filter by pattern type #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub pattern_type: Option>, + pub pattern_type: std::option::Option>, /// Sort direction #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sort_direction: Option>, + pub sort_direction: std::option::Option>, /// Filter by specific URLs or domains #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub urls: Option>>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub urls: std::option::Option>>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs index 7ac434ad8..06a289186 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs @@ -13,58 +13,42 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct QueryRules<'a> { /// Filter by action types #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub actions: Option>>, + pub actions: std::option::Option>>, /// Filter by rule creator #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub created_by: Option>, + pub created_by: std::option::Option>, /// Cursor for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub cursor: Option>, + pub cursor: std::option::Option>, /// Maximum number of results to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - pub limit: Option, + pub limit: std::option::Option, /// Filter by pattern type #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub pattern_type: Option>, + pub pattern_type: std::option::Option>, /// Filter by reason type #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub reason: Option>, + pub reason: std::option::Option>, /// Sort direction #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub sort_direction: Option>, + pub sort_direction: std::option::Option>, /// Filter by specific URLs or domains #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] - #[serde(borrow)] - pub urls: Option>>, - #[serde(flatten)] #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, + pub urls: std::option::Option>>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/tools_ozone/server/get_config.rs b/crates/jacquard-api/src/tools_ozone/server/get_config.rs index 0cba1e254..ac5b91d40 100644 --- a/crates/jacquard-api/src/tools_ozone/server/get_config.rs +++ b/crates/jacquard-api/src/tools_ozone/server/get_config.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetConfigOutput<'a> { @@ -85,14 +86,13 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetConfigRequest { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ServiceConfig<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub url: Option>, + pub url: std::option::Option>, } #[jacquard_derive::lexicon] @@ -104,12 +104,11 @@ pub struct ServiceConfig<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct ViewerConfig<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub role: Option>, + pub role: std::option::Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/set.rs b/crates/jacquard-api/src/tools_ozone/set.rs index 30221dafc..b419c6583 100644 --- a/crates/jacquard-api/src/tools_ozone/set.rs +++ b/crates/jacquard-api/src/tools_ozone/set.rs @@ -21,16 +21,14 @@ pub mod upsert_set; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct Set<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub description: Option>, + pub description: std::option::Option>, #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs index 8505c6cd5..ab1c39492 100644 --- a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs +++ b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs @@ -13,23 +13,14 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct DeleteSet<'a> { /// Name of the set to delete #[serde(borrow)] - #[builder(into)] pub name: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] @@ -40,7 +31,8 @@ pub struct DeleteSet<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DeleteSetOutput<'a> {} diff --git a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs index 835584ef5..7b6aaa40b 100644 --- a/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs +++ b/crates/jacquard-api/src/tools_ozone/set/upsert_set.rs @@ -13,22 +13,13 @@ Clone, PartialEq, Eq, - bon::Builder, jacquard_derive::IntoStatic )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct UpsertSet<'a> { #[serde(flatten)] #[serde(borrow)] pub value: crate::tools_ozone::set::Set<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/tools_ozone/setting.rs b/crates/jacquard-api/src/tools_ozone/setting.rs index d6eba80b1..f84b17294 100644 --- a/crates/jacquard-api/src/tools_ozone/setting.rs +++ b/crates/jacquard-api/src/tools_ozone/setting.rs @@ -11,7 +11,13 @@ pub mod upsert_option; #[jacquard_derive::lexicon] #[derive( - serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, + serde::Serialize, + serde::Deserialize, + Debug, + Clone, + PartialEq, + Eq, + jacquard_derive::IntoStatic )] #[serde(rename_all = "camelCase")] pub struct Option<'a> { @@ -37,4 +43,4 @@ pub struct Option<'a> { pub updated_at: std::option::Option, #[serde(borrow)] pub value: jacquard_common::types::value::Data<'a>, -} +} \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs index cb5271d70..f9c60c17b 100644 --- a/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs +++ b/crates/jacquard-api/src/tools_ozone/setting/remove_options.rs @@ -41,7 +41,8 @@ pub struct RemoveOptions<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct RemoveOptionsOutput<'a> {} diff --git a/crates/jacquard-api/src/tools_ozone/signature.rs b/crates/jacquard-api/src/tools_ozone/signature.rs index e8b416fdc..c279dee69 100644 --- a/crates/jacquard-api/src/tools_ozone/signature.rs +++ b/crates/jacquard-api/src/tools_ozone/signature.rs @@ -18,14 +18,12 @@ pub mod search_accounts; PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct SigDetail<'a> { #[serde(borrow)] - #[builder(into)] pub property: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs index 6e128ccd6..72e087fdb 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs @@ -46,7 +46,8 @@ pub struct DecryptByCid<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct DecryptByCidOutput<'a> { diff --git a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs index 4aa910364..96eca742e 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs @@ -13,25 +13,15 @@ Clone, PartialEq, Eq, - bon::Builder, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] -#[builder(start_fn = new)] pub struct Encrypt<'a> { #[serde(borrow)] - #[builder(into)] pub body: jacquard_common::CowStr<'a>, #[serde(borrow)] - #[builder(into)] pub password: jacquard_common::CowStr<'a>, - #[serde(flatten)] - #[serde(borrow)] - #[builder(default)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'a>, - >, } /// Returns the encrypted result. @@ -43,7 +33,8 @@ pub struct Encrypt<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct EncryptOutput<'a> { diff --git a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs index c7d43d167..8b3495a92 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs @@ -44,7 +44,8 @@ pub struct GetPost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct GetPostOutput<'a> { diff --git a/crates/jacquard-api/src/win_tomo_x/pushat.rs b/crates/jacquard-api/src/win_tomo_x/pushat.rs index 06fe19a40..b9ce34786 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat.rs @@ -38,26 +38,22 @@ pub struct DeviceListItem<'a> { PartialEq, Eq, jacquard_derive::IntoStatic, - bon::Builder + Default )] #[serde(rename_all = "camelCase")] pub struct NotifyBody<'a> { /// Body text of the notification. #[serde(borrow)] - #[builder(into)] pub body: jacquard_common::CowStr<'a>, /// The URI of the icon displayed in the notification. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub icon: Option>, + pub icon: std::option::Option>, /// Experimental — do not use. The URI to open when the notification is clicked. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[builder(into)] #[serde(borrow)] - pub link: Option>, + pub link: std::option::Option>, /// Title text of the notification. #[serde(borrow)] - #[builder(into)] pub title: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs index f29a117e2..d0bb343d1 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs @@ -41,7 +41,8 @@ pub struct PushNotify<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + Default )] #[serde(rename_all = "camelCase")] pub struct PushNotifyOutput<'a> {} diff --git a/crates/jacquard-common/Cargo.toml b/crates/jacquard-common/Cargo.toml index d7a1ee1aa..de310395e 100644 --- a/crates/jacquard-common/Cargo.toml +++ b/crates/jacquard-common/Cargo.toml @@ -38,6 +38,7 @@ tokio = { workspace = true, features = ["sync"] } reqwest = { workspace = true, optional = true, features = ["charset", "http2", "json", "system-proxy", "gzip", "rustls-tls"] } serde_ipld_dagcbor.workspace = true signature = { version = "2", optional = true } +tracing = { workspace = true, optional = true } [features] default = ["service-auth", "reqwest-client", "crypto"] @@ -47,6 +48,7 @@ crypto-k256 = ["crypto", "dep:k256", "k256/ecdsa"] crypto-p256 = ["crypto", "dep:p256", "p256/ecdsa"] service-auth = ["crypto-k256", "crypto-p256", "dep:signature"] reqwest-client = ["dep:reqwest"] +tracing = ["dep:tracing"] [dependencies.ed25519-dalek] version = "2" diff --git a/crates/jacquard-common/src/xrpc.rs b/crates/jacquard-common/src/xrpc.rs index e8cd8c7b7..303647fa9 100644 --- a/crates/jacquard-common/src/xrpc.rs +++ b/crates/jacquard-common/src/xrpc.rs @@ -305,6 +305,7 @@ impl<'a, C: HttpClient> XrpcCall<'a, C> { /// inspect the header for `error="invalid_token"` or `error="use_dpop_nonce"` and react /// (refresh/retry). If the header is absent, the 401 body flows through to `Response` and /// can be parsed/mapped to `AuthError` as appropriate. + #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self, request), fields(nsid = R::NSID)))] pub async fn send(self, request: &R) -> XrpcResult::Response>> where R: XrpcRequest + Send + Sync, diff --git a/crates/jacquard-identity/Cargo.toml b/crates/jacquard-identity/Cargo.toml index e1ba879fc..3a4464179 100644 --- a/crates/jacquard-identity/Cargo.toml +++ b/crates/jacquard-identity/Cargo.toml @@ -14,6 +14,7 @@ description = "ATProto identity resolution utilities for Jacquard" [features] dns = ["dep:hickory-resolver"] +tracing = ["dep:tracing"] [dependencies] async-trait.workspace = true @@ -33,3 +34,4 @@ miette.workspace = true http.workspace = true serde_html_form.workspace = true urlencoding.workspace = true +tracing = { workspace = true, optional = true } diff --git a/crates/jacquard-identity/src/lib.rs b/crates/jacquard-identity/src/lib.rs index bda3d1566..8a0808b74 100644 --- a/crates/jacquard-identity/src/lib.rs +++ b/crates/jacquard-identity/src/lib.rs @@ -102,6 +102,14 @@ pub struct JacquardResolver { impl JacquardResolver { /// Create a new instance of the default resolver with all options (except DNS) up front pub fn new(http: reqwest::Client, opts: ResolverOptions) -> Self { + #[cfg(feature = "tracing")] + tracing::info!( + public_fallback = opts.public_fallback_for_handle, + validate_doc_id = opts.validate_doc_id, + plc_source = ?opts.plc_source, + "jacquard resolver created" + ); + Self { http, opts, @@ -333,6 +341,7 @@ impl IdentityResolver for JacquardResolver { fn options(&self) -> &ResolverOptions { &self.opts } + #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self), fields(handle = %handle)))] async fn resolve_handle(&self, handle: &Handle<'_>) -> Result, IdentityError> { let host = handle.as_str(); for step in &self.opts.handle_order { @@ -421,6 +430,7 @@ impl IdentityResolver for JacquardResolver { Err(IdentityError::InvalidWellKnown) } + #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self), fields(did = %did)))] async fn resolve_did_doc(&self, did: &Did<'_>) -> Result { let s = did.as_str(); for step in &self.opts.did_order { diff --git a/crates/jacquard-lexicon/src/codegen/structs.rs b/crates/jacquard-lexicon/src/codegen/structs.rs index a7ab3908a..930e1ae56 100644 --- a/crates/jacquard-lexicon/src/codegen/structs.rs +++ b/crates/jacquard-lexicon/src/codegen/structs.rs @@ -21,10 +21,39 @@ pub(super) enum EnumVariantKind { /// Check if a type name conflicts with types referenced by bon::Builder macro. /// bon::Builder generates code that uses unqualified `Option` and `Result`, /// so structs with these names cause compilation errors. -fn conflicts_with_builder_macro(type_name: &str) -> bool { +pub(crate) fn conflicts_with_builder_macro(type_name: &str) -> bool { matches!(type_name, "Option" | "Result") } +/// Count the number of required fields in a lexicon object. +/// Used to determine whether to generate builders or Default impls. +pub(crate) fn count_required_fields(obj: &LexObject<'static>) -> usize { + let required = obj.required.as_ref().map(|r| r.as_slice()).unwrap_or(&[]); + required.len() +} + +/// Check if a field property is a plain string that can default to empty. +/// Returns true for bare CowStr fields (no format constraints). +fn is_defaultable_string(prop: &LexObjectProperty<'static>) -> bool { + matches!(prop, LexObjectProperty::String(s) if s.format.is_none()) +} + +/// Check if all required fields in an object are defaultable strings. +pub(crate) fn all_required_are_defaultable_strings(obj: &LexObject<'static>) -> bool { + let required = obj.required.as_ref().map(|r| r.as_slice()).unwrap_or(&[]); + + if required.is_empty() { + return false; // Handled separately by count check + } + + required.iter().all(|field_name| { + let field_name_str: &str = field_name.as_ref(); + obj.properties.get(field_name_str) + .map(is_defaultable_string) + .unwrap_or(false) + }) +} + impl<'c> CodeGenerator<'c> { pub(super) fn generate_record( &self, @@ -199,8 +228,14 @@ impl<'c> CodeGenerator<'c> { // Objects always get a lifetime since they have the #[lexicon] attribute // which adds extra_data: BTreeMap<..., Data<'a>> - // Skip bon::Builder for types that conflict with the macro's unqualified type references - let has_builder = !conflicts_with_builder_macro(&type_name); + + // Smart heuristics for builder generation: + // - 0 required fields: Default instead of builder + // - All required fields are bare strings: Default instead of builder + // - 1+ required fields (not all strings): bon::Builder (but not if name conflicts) + let required_count = count_required_fields(obj); + let has_default = required_count == 0 || all_required_are_defaultable_strings(obj); + let has_builder = required_count >= 1 && !has_default && !conflicts_with_builder_macro(&type_name); let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?; let doc = self.generate_doc_comment(obj.description.as_ref()); @@ -215,6 +250,16 @@ impl<'c> CodeGenerator<'c> { #fields } } + } else if has_default { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } } else { quote! { #doc diff --git a/crates/jacquard-lexicon/src/codegen/xrpc.rs b/crates/jacquard-lexicon/src/codegen/xrpc.rs index 44d4c3623..cab2b4d82 100644 --- a/crates/jacquard-lexicon/src/codegen/xrpc.rs +++ b/crates/jacquard-lexicon/src/codegen/xrpc.rs @@ -410,8 +410,22 @@ impl<'c> CodeGenerator<'c> { // Check if this is a binary body (no schema, just raw bytes) let is_binary_body = body.schema.is_none(); + // Determine if we should derive Default or bon::Builder + // Binary bodies always get builder, schema-based inputs use heuristics + let (has_default, has_builder) = if is_binary_body { + (false, true) + } else if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { + use crate::codegen::structs::{count_required_fields, all_required_are_defaultable_strings, conflicts_with_builder_macro}; + let required_count = count_required_fields(obj); + let can_default = required_count == 0 || all_required_are_defaultable_strings(obj); + let can_builder = required_count >= 1 && !can_default && !conflicts_with_builder_macro(type_base); + (can_default, can_builder) + } else { + (false, false) + }; + let fields = if let Some(schema) = &body.schema { - self.generate_body_fields("", type_base, schema, true)? + self.generate_body_fields("", type_base, schema, has_builder)? } else { // Binary body: just a bytes field quote! { @@ -432,8 +446,8 @@ impl<'c> CodeGenerator<'c> { #fields } } - } else { - // Input structs with schemas: manually add extra_data field with #[builder(default)] + } else if has_builder { + // Input structs with schemas and builders: manually add extra_data field with #[builder(default)] // for bon compatibility. The #[lexicon] macro will see it exists and skip adding it. quote! { #doc @@ -452,6 +466,26 @@ impl<'c> CodeGenerator<'c> { >, } } + } else if has_default { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } + } else { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } }; // Generate union types if schema is an Object @@ -509,15 +543,37 @@ impl<'c> CodeGenerator<'c> { let doc = self.generate_doc_comment(body.description.as_ref()); + // Determine if we should derive Default + // Check if schema is an Object and apply heuristics + let has_default = if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { + use crate::codegen::structs::{count_required_fields, all_required_are_defaultable_strings}; + let required_count = count_required_fields(obj); + required_count == 0 || all_required_are_defaultable_strings(obj) + } else { + false + }; + // Output structs always get a lifetime since they have the #[lexicon] attribute // which adds extra_data: BTreeMap<..., Data<'a>> - let struct_def = quote! { - #doc - #[jacquard_derive::lexicon] - #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] - #[serde(rename_all = "camelCase")] - pub struct #ident<'a> { - #fields + let struct_def = if has_default { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, Default)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } + } else { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } } }; diff --git a/crates/jacquard-oauth/Cargo.toml b/crates/jacquard-oauth/Cargo.toml index eaf214ecb..51f180d6c 100644 --- a/crates/jacquard-oauth/Cargo.toml +++ b/crates/jacquard-oauth/Cargo.toml @@ -40,8 +40,10 @@ reqwest.workspace = true trait-variant.workspace = true webbrowser = { version = "0.8", optional = true } rouille = { version = "3.6.2", optional = true } +tracing = { workspace = true, optional = true } [features] default = [] loopback = ["dep:rouille"] browser-open = ["dep:webbrowser"] +tracing = ["dep:tracing"] diff --git a/crates/jacquard-oauth/src/client.rs b/crates/jacquard-oauth/src/client.rs index c6c47f733..ed46dbf22 100644 --- a/crates/jacquard-oauth/src/client.rs +++ b/crates/jacquard-oauth/src/client.rs @@ -93,6 +93,14 @@ where S: ClientAuthStore, { pub fn new_from_resolver(store: S, client: T, client_data: ClientData<'static>) -> Self { + #[cfg(feature = "tracing")] + tracing::info!( + redirect_uris = ?client_data.config.redirect_uris, + scopes = ?client_data.config.scopes, + has_keyset = client_data.keyset.is_some(), + "oauth client created" + ); + let client = Arc::new(client); let registry = Arc::new(SessionRegistry::new(store, client.clone(), client_data)); Self { registry, client } @@ -125,6 +133,7 @@ where .map(|keyset| keyset.public_jwks()) .unwrap_or_default() } + #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip(self, input), fields(input = input.as_ref())))] pub async fn start_auth( &self, input: impl AsRef, @@ -168,6 +177,7 @@ where .unwrap()) } + #[cfg_attr(feature = "tracing", tracing::instrument(level = "info", skip_all, fields(state = params.state.as_ref().map(|s| s.as_ref()))))] pub async fn callback(&self, params: CallbackParams<'_>) -> Result> { let Some(state_key) = params.state else { return Err(CallbackError::MissingState.into()); @@ -372,6 +382,7 @@ where S: ClientAuthStore + Send + Sync + 'static, T: OAuthResolver + DpopExt + Send + Sync + 'static, { + #[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))] pub async fn refresh(&self) -> Result> { // Read identifiers without holding the lock across await let (did, sid) = { diff --git a/crates/jacquard-oauth/src/request.rs b/crates/jacquard-oauth/src/request.rs index 8eab74b8d..a7d17e5b4 100644 --- a/crates/jacquard-oauth/src/request.rs +++ b/crates/jacquard-oauth/src/request.rs @@ -180,6 +180,7 @@ impl OAuthMetadata { } } +#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all, fields(login_hint = login_hint.as_ref().map(|h| h.as_ref()))))] pub async fn par<'r, T: OAuthResolver + DpopExt + Send + Sync + 'static>( client: &T, login_hint: Option>, @@ -207,7 +208,6 @@ pub async fn par<'r, T: OAuthResolver + DpopExt + Send + Sync + 'static>( login_hint: login_hint, prompt: prompt.map(CowStr::from), }; - println!("Parameters: {:?}", parameters); if metadata .server_metadata .pushed_authorization_request_endpoint @@ -255,6 +255,7 @@ pub async fn par<'r, T: OAuthResolver + DpopExt + Send + Sync + 'static>( } } +#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all, fields(did = %session_data.account_did)))] pub async fn refresh<'r, T>( client: &T, mut session_data: ClientSessionData<'r>, @@ -313,6 +314,7 @@ where Ok(session_data) } +#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))] pub async fn exchange_code<'r, T, D>( client: &T, data_source: &'r mut D, @@ -371,6 +373,7 @@ where }) } +#[cfg_attr(feature = "tracing", tracing::instrument(level = "debug", skip_all))] pub async fn revoke<'r, T, D>( client: &T, data_source: &'r mut D, diff --git a/crates/jacquard/Cargo.toml b/crates/jacquard/Cargo.toml index 39cb9698f..d16c6c697 100644 --- a/crates/jacquard/Cargo.toml +++ b/crates/jacquard/Cargo.toml @@ -25,6 +25,8 @@ api_all = ["api_full", "jacquard-api/ufos"] dns = ["jacquard-identity/dns"] # Propagate loopback to oauth (server + browser helper) loopback = ["jacquard-oauth/loopback", "jacquard-oauth/browser-open"] +# Enable tracing instrumentation +tracing = ["dep:tracing", "jacquard-common/tracing", "jacquard-oauth/tracing", "jacquard-identity/tracing"] [[example]] @@ -66,6 +68,7 @@ path = "../../examples/resolve_did.rs" [[example]] name = "update_preferences" path = "../../examples/update_preferences.rs" +required-features = ["api_bluesky"] [dependencies] jacquard-api = { version = "0.5", path = "../jacquard-api" } @@ -92,6 +95,7 @@ percent-encoding.workspace = true jose-jwk = { workspace = true, features = ["p256"] } p256 = { workspace = true, features = ["ecdsa"] } rand_core.workspace = true +tracing = { workspace = true, optional = true } [dev-dependencies] clap.workspace = true diff --git a/crates/jacquard/src/client.rs b/crates/jacquard/src/client.rs index 423ed0c1c..987ca42d6 100644 --- a/crates/jacquard/src/client.rs +++ b/crates/jacquard/src/client.rs @@ -408,6 +408,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { R: Collection + serde::Serialize, { async move { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("create_record", collection = %R::nsid()).entered(); + use jacquard_api::com_atproto::repo::create_record::CreateRecord; use jacquard_common::types::ident::AtIdentifier; use jacquard_common::types::value::to_data; @@ -473,6 +476,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { R: Collection, { async move { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("get_record", collection = %R::nsid(), uri = %uri).entered(); + // Validate that URI's collection matches the expected type if let Some(uri_collection) = uri.collection() { if uri_collection.as_str() != R::nsid().as_str() { @@ -568,6 +574,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { R: for<'a> From<<::Record as XrpcResp>::Output<'a>>, { async move { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("update_record", collection = %R::nsid(), uri = %uri).entered(); + // Fetch the record - Response where R::Record::Output<'de> = R<'de> let response = self.get_record::(uri.clone()).await?; @@ -613,6 +622,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { R: Collection, { async { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("delete_record", collection = %R::nsid()).entered(); + use jacquard_api::com_atproto::repo::delete_record::DeleteRecord; use jacquard_common::types::ident::AtIdentifier; @@ -650,6 +662,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { R: Collection + serde::Serialize, { async move { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("put_record", collection = %R::nsid()).entered(); + use jacquard_api::com_atproto::repo::put_record::PutRecord; use jacquard_common::types::ident::AtIdentifier; use jacquard_common::types::value::to_data; @@ -707,6 +722,9 @@ pub trait AgentSessionExt: AgentSession + IdentityResolver { mime_type: MimeType<'_>, ) -> impl std::future::Future, AgentError>> { async move { + #[cfg(feature = "tracing")] + let _span = tracing::debug_span!("upload_blob", mime_type = %mime_type).entered(); + use http::header::CONTENT_TYPE; use jacquard_api::com_atproto::repo::upload_blob::UploadBlob; diff --git a/crates/jacquard/src/client/credential_session.rs b/crates/jacquard/src/client/credential_session.rs index c9b9194de..6ff733ca6 100644 --- a/crates/jacquard/src/client/credential_session.rs +++ b/crates/jacquard/src/client/credential_session.rs @@ -167,6 +167,9 @@ where where S: Any + 'static, { + #[cfg(feature = "tracing")] + let _span = tracing::info_span!("credential_session_login", identifier = %identifier).entered(); + // Resolve PDS base let pds = if identifier.as_ref().starts_with("http://") || identifier.as_ref().starts_with("https://") @@ -268,6 +271,9 @@ where where S: Any + 'static, { + #[cfg(feature = "tracing")] + let _span = tracing::info_span!("credential_session_restore", did = %did, session_id = %session_id).entered(); + let key = (did.clone().into_static(), session_id.clone().into_static()); let Some(sess) = self.store.get(&key).await else { return Err(ClientError::Auth(AuthError::NotAuthenticated)); diff --git a/crates/jacquard/src/client/vec_update.rs b/crates/jacquard/src/client/vec_update.rs index 1ca5fdadb..dfbe63cf7 100644 --- a/crates/jacquard/src/client/vec_update.rs +++ b/crates/jacquard/src/client/vec_update.rs @@ -1,6 +1,7 @@ /// Bluesky actor preferences implementation +#[cfg(feature = "api_bluesky")] pub mod preferences; - +#[cfg(feature = "api_bluesky")] pub use preferences::PreferencesUpdate; use jacquard_common::IntoStatic; diff --git a/justfile b/justfile index 464fdd07e..50a08cce9 100644 --- a/justfile +++ b/justfile @@ -51,7 +51,7 @@ example NAME *ARGS: cargo run -p jacquard --example {{NAME}} -- {{ARGS}} elif cargo metadata --format-version=1 --no-deps | \ jq -e '.packages[] | select(.name == "jacquard-axum") | .targets[] | select(.kind[] == "example" and .name == "{{NAME}}")' > /dev/null; then - cargo run -p jacquard-axum --example {{NAME}} -- {{ARGS}} + cargo run -p jacquard-axum --example {{NAME}} --features api_bluesky -- {{ARGS}} else echo "Example '{{NAME}}' not found." echo "" -- 2.51.2