From 117b66ade1632ecba80b22bca633bb72d8ea2595 Mon Sep 17 00:00:00 2001 From: Orual Date: Mon, 27 Oct 2025 11:19:35 -0400 Subject: [PATCH] api generation post more cleanup --- .../src/app_blebbit/authr/folder.rs | 4 +- .../src/app_blebbit/authr/folder/record.rs | 2 +- .../src/app_blebbit/authr/group.rs | 4 +- .../src/app_blebbit/authr/group/record.rs | 2 +- .../src/app_blebbit/authr/page.rs | 4 +- .../src/app_blebbit/authr/page/record.rs | 2 +- crates/jacquard-api/src/app_bsky/actor.rs | 198 +++++++---- .../src/app_bsky/actor/profile.rs | 38 +- .../jacquard-api/src/app_bsky/actor/status.rs | 8 +- crates/jacquard-api/src/app_bsky/bookmark.rs | 4 +- crates/jacquard-api/src/app_bsky/embed.rs | 14 +- .../src/app_bsky/embed/external.rs | 8 +- .../jacquard-api/src/app_bsky/embed/images.rs | 20 +- .../jacquard-api/src/app_bsky/embed/record.rs | 12 +- .../src/app_bsky/embed/record_with_media.rs | 4 +- .../jacquard-api/src/app_bsky/embed/video.rs | 36 +- crates/jacquard-api/src/app_bsky/feed.rs | 84 +++-- .../app_bsky/feed/describe_feed_generator.rs | 4 +- .../src/app_bsky/feed/generator.rs | 26 +- .../src/app_bsky/feed/get_likes.rs | 2 +- crates/jacquard-api/src/app_bsky/feed/like.rs | 2 +- crates/jacquard-api/src/app_bsky/feed/post.rs | 44 ++- .../src/app_bsky/feed/postgate.rs | 16 +- .../jacquard-api/src/app_bsky/feed/repost.rs | 2 +- .../src/app_bsky/feed/threadgate.rs | 22 +- crates/jacquard-api/src/app_bsky/graph.rs | 106 ++++-- .../jacquard-api/src/app_bsky/graph/block.rs | 2 +- .../jacquard-api/src/app_bsky/graph/follow.rs | 2 +- .../graph/get_lists_with_membership.rs | 2 +- .../get_starter_packs_with_membership.rs | 2 +- .../jacquard-api/src/app_bsky/graph/list.rs | 26 +- .../src/app_bsky/graph/listblock.rs | 2 +- .../src/app_bsky/graph/listitem.rs | 2 +- .../src/app_bsky/graph/starterpack.rs | 40 ++- .../src/app_bsky/graph/verification.rs | 2 +- crates/jacquard-api/src/app_bsky/labeler.rs | 20 +- .../src/app_bsky/labeler/service.rs | 2 +- .../jacquard-api/src/app_bsky/notification.rs | 14 +- .../src/app_bsky/notification/declaration.rs | 2 +- .../notification/list_notifications.rs | 2 +- .../src/app_bsky/richtext/facet.rs | 34 +- crates/jacquard-api/src/app_bsky/unspecced.rs | 24 +- .../src/app_bsky/unspecced/get_config.rs | 2 +- .../unspecced/get_post_thread_other_v2.rs | 2 +- .../app_bsky/unspecced/get_post_thread_v2.rs | 2 +- .../unspecced/get_tagged_suggestions.rs | 2 +- crates/jacquard-api/src/app_bsky/video.rs | 14 +- crates/jacquard-api/src/app_ocho/auth.rs | 2 +- .../src/app_ocho/edu/verification.rs | 2 +- crates/jacquard-api/src/app_ocho/plugin.rs | 26 +- .../src/app_ocho/plugin/service.rs | 2 +- crates/jacquard-api/src/app_rocksky/actor.rs | 4 +- crates/jacquard-api/src/app_rocksky/album.rs | 60 ++-- crates/jacquard-api/src/app_rocksky/apikey.rs | 2 +- crates/jacquard-api/src/app_rocksky/artist.rs | 54 ++- crates/jacquard-api/src/app_rocksky/charts.rs | 4 +- .../jacquard-api/src/app_rocksky/dropbox.rs | 6 +- crates/jacquard-api/src/app_rocksky/feed.rs | 6 +- .../src/app_rocksky/googledrive.rs | 4 +- crates/jacquard-api/src/app_rocksky/like.rs | 2 +- crates/jacquard-api/src/app_rocksky/player.rs | 2 +- .../jacquard-api/src/app_rocksky/playlist.rs | 36 +- crates/jacquard-api/src/app_rocksky/radio.rs | 42 ++- .../jacquard-api/src/app_rocksky/scrobble.rs | 108 ++++-- crates/jacquard-api/src/app_rocksky/shout.rs | 18 +- crates/jacquard-api/src/app_rocksky/song.rs | 138 +++++--- .../jacquard-api/src/app_rocksky/spotify.rs | 2 +- crates/jacquard-api/src/app_rocksky/stats.rs | 2 +- .../src/beauty_cybernetic/trustcow/review.rs | 26 +- .../beauty_cybernetic/trustcow/transaction.rs | 20 +- .../src/beauty_cybernetic/trustcow/warrant.rs | 8 +- crates/jacquard-api/src/blog_pckt/blog.rs | 6 +- crates/jacquard-api/src/blog_pckt/post.rs | 2 +- .../jacquard-api/src/blog_pckt/publication.rs | 20 +- crates/jacquard-api/src/blog_pckt/theme.rs | 40 ++- crates/jacquard-api/src/blue__2048.rs | 2 +- crates/jacquard-api/src/blue__2048/game.rs | 2 +- crates/jacquard-api/src/blue__2048/key.rs | 4 +- .../jacquard-api/src/blue__2048/key/game.rs | 2 +- .../src/blue__2048/key/player/stats.rs | 2 +- .../src/blue__2048/player/profile.rs | 2 +- .../src/blue__2048/player/stats.rs | 2 +- .../src/blue__2048/verification.rs | 2 +- .../src/blue__2048/verification/game.rs | 2 +- .../src/blue__2048/verification/stats.rs | 2 +- .../src/blue_atplane/fav_client.rs | 8 +- crates/jacquard-api/src/blue_linkat/board.rs | 4 +- .../src/blue_rito/feed/bookmark.rs | 46 ++- .../jacquard-api/src/blue_rito/feed/like.rs | 2 +- .../src/blue_rito/service/get_schema.rs | 2 +- .../src/blue_rito/service/schema.rs | 2 +- .../src/blue_zio/atfile/finger.rs | 4 +- .../jacquard-api/src/blue_zio/atfile/lock.rs | 2 +- .../jacquard-api/src/blue_zio/atfile/meta.rs | 2 +- crates/jacquard-api/src/buzz_bookhive.rs | 94 +++-- crates/jacquard-api/src/buzz_bookhive/book.rs | 44 ++- crates/jacquard-api/src/buzz_bookhive/buzz.rs | 14 +- .../src/buzz_bookhive/hive_book.rs | 44 ++- crates/jacquard-api/src/chat_bsky/actor.rs | 14 +- .../src/chat_bsky/actor/declaration.rs | 2 +- crates/jacquard-api/src/chat_bsky/convo.rs | 62 ++-- .../src/chat_bsky/convo/send_message_batch.rs | 2 +- .../moderation/get_actor_metadata.rs | 2 +- .../src/club_stellz/evm/address_control.rs | 34 +- crates/jacquard-api/src/com_atproto/admin.rs | 10 +- .../jacquard-api/src/com_atproto/identity.rs | 2 +- crates/jacquard-api/src/com_atproto/label.rs | 64 ++-- .../src/com_atproto/label/subscribe_labels.rs | 4 +- .../src/com_atproto/lexicon/schema.rs | 2 +- .../com_atproto/moderation/create_report.rs | 2 +- crates/jacquard-api/src/com_atproto/repo.rs | 2 +- .../src/com_atproto/repo/apply_writes.rs | 18 +- .../com_atproto/repo/list_missing_blobs.rs | 2 +- .../src/com_atproto/repo/list_records.rs | 2 +- .../src/com_atproto/repo/strong_ref.rs | 2 +- crates/jacquard-api/src/com_atproto/server.rs | 4 +- .../com_atproto/server/create_app_password.rs | 2 +- .../com_atproto/server/create_invite_codes.rs | 2 +- .../src/com_atproto/server/describe_server.rs | 4 +- .../com_atproto/server/list_app_passwords.rs | 2 +- .../src/com_atproto/sync/list_hosts.rs | 2 +- .../src/com_atproto/sync/list_repos.rs | 2 +- .../sync/list_repos_by_collection.rs | 2 +- .../src/com_atproto/sync/subscribe_repos.rs | 18 +- .../temp/check_handle_availability.rs | 6 +- .../src/com_crabdance/nandi/post.rs | 38 +- .../com_shinolabs/pinksea/app_view_defs.rs | 12 +- .../src/com_shinolabs/pinksea/oekaki.rs | 12 +- .../src/com_shinolabs/pinksea/profile.rs | 46 ++- crates/jacquard-api/src/com_whtwnd/blog.rs | 20 +- .../jacquard-api/src/com_whtwnd/blog/entry.rs | 20 +- .../community_lexicon/bookmarks/bookmark.rs | 2 +- .../src/community_lexicon/calendar/event.rs | 4 +- .../src/community_lexicon/calendar/rsvp.rs | 2 +- .../src/community_lexicon/interaction/like.rs | 2 +- .../src/community_lexicon/location/address.rs | 14 +- .../src/community_lexicon/location/fsq.rs | 2 +- .../src/community_lexicon/location/geo.rs | 2 +- .../src/community_lexicon/location/hthree.rs | 2 +- .../payments/web_monetization.rs | 2 +- .../src/dev_baileytownsend/health/calories.rs | 2 +- .../src/dev_baileytownsend/health/rings.rs | 2 +- .../src/dev_baileytownsend/health/steps.rs | 2 +- .../src/dev_baileytownsend/health/workout.rs | 2 +- .../experimental/atforumv1/feed/post.rs | 32 +- .../experimental/atforumv1/feed/reply.rs | 8 +- .../atforumv1/forum/announcement.rs | 26 +- .../experimental/atforumv1/forum/category.rs | 26 +- .../experimental/atforumv1/forum/group.rs | 20 +- .../experimental/atforumv1/forum/identity.rs | 26 +- .../src/dev_ocbwoy3/blueboard/board.rs | 14 +- .../src/dev_ocbwoy3/blueboard/post.rs | 8 +- .../src/dev_regnault/webfishing/savefile.rs | 2 +- .../jacquard-api/src/fm_teal/alpha/actor.rs | 6 +- .../src/fm_teal/alpha/actor/profile.rs | 28 +- .../src/fm_teal/alpha/actor/profile_status.rs | 2 +- .../src/fm_teal/alpha/actor/status.rs | 2 +- crates/jacquard-api/src/fm_teal/alpha/feed.rs | 64 ++-- .../src/fm_teal/alpha/feed/play.rs | 68 ++-- .../jacquard-api/src/fm_teal/alpha/stats.rs | 6 +- .../src/fyi_frontpage/feed/comment.rs | 8 +- .../src/fyi_frontpage/feed/post.rs | 16 +- .../src/fyi_frontpage/feed/vote.rs | 2 +- .../src/fyi_frontpage/richtext/block.rs | 16 +- .../src/fyi_unravel/frontpage/comment.rs | 14 +- .../src/fyi_unravel/frontpage/post.rs | 14 +- .../src/fyi_unravel/frontpage/vote.rs | 2 +- .../src/moe_karashiiro/kpaste/paste.rs | 14 +- crates/jacquard-api/src/my_skylights.rs | 2 +- crates/jacquard-api/src/my_skylights/list.rs | 2 +- .../src/my_skylights/list_item.rs | 4 +- crates/jacquard-api/src/my_skylights/rel.rs | 18 +- .../src/net_aftertheinter/coolthingtwo.rs | 20 +- crates/jacquard-api/src/net_altq/aqfile.rs | 42 ++- .../src/net_anisota/beta/game/collection.rs | 48 ++- .../src/net_anisota/beta/game/inventory.rs | 40 ++- .../src/net_anisota/beta/game/log.rs | 106 ++++-- .../src/net_anisota/beta/game/pack.rs | 30 +- .../src/net_anisota/beta/game/progress.rs | 78 +++-- .../src/net_anisota/beta/game/session.rs | 90 +++-- .../src/net_anisota/feed/draft.rs | 28 +- .../jacquard-api/src/net_anisota/feed/like.rs | 2 +- .../jacquard-api/src/net_anisota/feed/list.rs | 20 +- .../src/net_anisota/feed/list_item.rs | 2 +- .../jacquard-api/src/net_anisota/feed/post.rs | 28 +- .../src/net_anisota/feed/repost.rs | 2 +- .../src/net_anisota/graph/list_mute.rs | 16 +- .../src/net_anisota/graph/mute.rs | 16 +- .../src/net_bnewbold/demo/mushies.rs | 26 +- .../src/net_bnewbold/demo/mushroom.rs | 26 +- crates/jacquard-api/src/net_bnewbold/m.rs | 26 +- .../jacquard-api/src/net_mmatt/right/now.rs | 2 +- .../jacquard-api/src/net_mmatt/vitals/car.rs | 2 +- .../jacquard-api/src/network_slices/actor.rs | 26 +- .../src/network_slices/actor/profile.rs | 26 +- .../src/network_slices/lexicon.rs | 14 +- .../jacquard-api/src/network_slices/slice.rs | 24 +- .../src/network_slices/slice/get_actors.rs | 2 +- .../src/network_slices/slice/get_job_logs.rs | 2 +- .../network_slices/slice/get_job_status.rs | 4 +- .../slice/get_o_auth_clients.rs | 2 +- .../network_slices/slice/get_slice_records.rs | 2 +- .../network_slices/slice/get_sparklines.rs | 2 +- .../network_slices/slice/get_sync_summary.rs | 2 +- .../src/network_slices/slice/stats.rs | 2 +- .../src/network_slices/waitlist.rs | 4 +- .../src/network_slices/waitlist/invite.rs | 2 +- .../src/network_slices/waitlist/request.rs | 2 +- .../jacquard-api/src/org_devcon/event/test.rs | 2 +- .../src/org_robocracy/demo/fungus.rs | 26 +- .../src/org_robocracy/demo/mushies.rs | 26 +- .../src/place_atwork/endorsement.rs | 14 +- .../src/place_atwork/endorsement_proof.rs | 2 +- .../src/place_atwork/get_listings.rs | 2 +- .../jacquard-api/src/place_atwork/listing.rs | 20 +- .../jacquard-api/src/place_atwork/profile.rs | 26 +- .../src/place_atwork/search_listings.rs | 2 +- crates/jacquard-api/src/place_stream.rs | 6 +- .../src/place_stream/broadcast.rs | 2 +- .../src/place_stream/broadcast/origin.rs | 8 +- .../src/place_stream/broadcast/syndication.rs | 2 +- crates/jacquard-api/src/place_stream/chat.rs | 2 +- .../src/place_stream/chat/gate.rs | 2 +- .../src/place_stream/chat/message.rs | 16 +- .../src/place_stream/chat/profile.rs | 40 ++- crates/jacquard-api/src/place_stream/key.rs | 14 +- .../src/place_stream/livestream.rs | 22 +- .../place_stream/metadata/configuration.rs | 2 +- .../place_stream/metadata/content_rights.rs | 2 +- .../place_stream/metadata/content_warnings.rs | 2 +- .../metadata/distribution_policy.rs | 2 +- .../src/place_stream/richtext/facet.rs | 2 +- .../jacquard-api/src/place_stream/segment.rs | 10 +- .../jacquard-api/src/place_stream/server.rs | 46 ++- .../src/place_stream/server/settings.rs | 2 +- crates/jacquard-api/src/place_wisp/fs.rs | 32 +- .../src/pub_leaflet/blocks/blockquote.rs | 2 +- .../src/pub_leaflet/blocks/bsky_post.rs | 2 +- .../src/pub_leaflet/blocks/code.rs | 2 +- .../src/pub_leaflet/blocks/header.rs | 14 +- .../src/pub_leaflet/blocks/horizontal_rule.rs | 2 +- .../src/pub_leaflet/blocks/iframe.rs | 14 +- .../src/pub_leaflet/blocks/image.rs | 4 +- .../src/pub_leaflet/blocks/math.rs | 2 +- .../src/pub_leaflet/blocks/page.rs | 2 +- .../src/pub_leaflet/blocks/poll.rs | 2 +- .../src/pub_leaflet/blocks/text.rs | 2 +- .../src/pub_leaflet/blocks/unordered_list.rs | 4 +- .../src/pub_leaflet/blocks/website.rs | 2 +- .../jacquard-api/src/pub_leaflet/comment.rs | 6 +- .../jacquard-api/src/pub_leaflet/document.rs | 26 +- .../src/pub_leaflet/graph/subscription.rs | 2 +- .../src/pub_leaflet/pages/canvas.rs | 8 +- .../src/pub_leaflet/pages/linear_document.rs | 8 +- .../src/pub_leaflet/poll/definition.rs | 28 +- .../jacquard-api/src/pub_leaflet/poll/vote.rs | 2 +- .../src/pub_leaflet/publication.rs | 18 +- .../src/pub_leaflet/richtext/facet.rs | 32 +- .../src/pub_leaflet/theme/background_image.rs | 2 +- .../src/pub_leaflet/theme/color.rs | 88 +++-- .../src/sh_tangled/actor/profile.rs | 62 ++-- .../src/sh_tangled/feed/reaction.rs | 2 +- .../jacquard-api/src/sh_tangled/feed/star.rs | 2 +- .../src/sh_tangled/git/ref_update.rs | 48 ++- .../src/sh_tangled/graph/follow.rs | 2 +- crates/jacquard-api/src/sh_tangled/knot.rs | 2 +- .../src/sh_tangled/knot/list_keys.rs | 8 +- .../src/sh_tangled/knot/member.rs | 2 +- .../src/sh_tangled/label/definition.rs | 16 +- .../jacquard-api/src/sh_tangled/label/op.rs | 4 +- .../jacquard-api/src/sh_tangled/pipeline.rs | 54 +-- .../src/sh_tangled/pipeline/status.rs | 2 +- .../jacquard-api/src/sh_tangled/public_key.rs | 8 +- crates/jacquard-api/src/sh_tangled/repo.rs | 14 +- .../src/sh_tangled/repo/artifact.rs | 2 +- .../jacquard-api/src/sh_tangled/repo/blob.rs | 4 +- .../src/sh_tangled/repo/branch.rs | 2 +- .../src/sh_tangled/repo/collaborator.rs | 2 +- .../src/sh_tangled/repo/get_default_branch.rs | 2 +- .../jacquard-api/src/sh_tangled/repo/issue.rs | 2 +- .../src/sh_tangled/repo/issue/comment.rs | 2 +- .../src/sh_tangled/repo/issue/state.rs | 2 +- .../src/sh_tangled/repo/languages.rs | 2 +- .../src/sh_tangled/repo/list_secrets.rs | 14 +- .../src/sh_tangled/repo/merge_check.rs | 2 +- .../jacquard-api/src/sh_tangled/repo/pull.rs | 18 +- .../src/sh_tangled/repo/pull/comment.rs | 2 +- .../src/sh_tangled/repo/pull/status.rs | 2 +- .../jacquard-api/src/sh_tangled/repo/tree.rs | 6 +- crates/jacquard-api/src/sh_tangled/spindle.rs | 2 +- .../src/sh_tangled/spindle/member.rs | 2 +- crates/jacquard-api/src/sh_tangled/string.rs | 26 +- crates/jacquard-api/src/sh_weaver/actor.rs | 128 ++++--- .../src/sh_weaver/actor/profile.rs | 50 ++- crates/jacquard-api/src/sh_weaver/edit.rs | 6 +- .../jacquard-api/src/sh_weaver/edit/cursor.rs | 12 +- .../jacquard-api/src/sh_weaver/edit/diff.rs | 2 +- .../jacquard-api/src/sh_weaver/edit/root.rs | 2 +- crates/jacquard-api/src/sh_weaver/embed.rs | 4 +- .../src/sh_weaver/embed/external.rs | 14 +- .../src/sh_weaver/embed/images.rs | 16 +- .../src/sh_weaver/embed/record_with_media.rs | 4 +- .../src/sh_weaver/embed/records.rs | 18 +- .../jacquard-api/src/sh_weaver/embed/video.rs | 36 +- crates/jacquard-api/src/sh_weaver/notebook.rs | 14 +- .../src/sh_weaver/notebook/authors.rs | 4 +- .../src/sh_weaver/notebook/book.rs | 2 +- .../src/sh_weaver/notebook/chapter.rs | 2 +- .../src/sh_weaver/notebook/entry.rs | 8 +- .../src/sh_weaver/publish/blob.rs | 2 +- .../jacquard-api/src/social_clippr/actor.rs | 28 +- .../src/social_clippr/actor/profile.rs | 26 +- crates/jacquard-api/src/social_clippr/feed.rs | 4 +- .../src/social_clippr/feed/clip.rs | 56 ++- .../src/social_clippr/feed/tag.rs | 38 +- .../src/social_flockfeeds/lexical/action.rs | 2 +- .../lexical/aggregaterating.rs | 2 +- .../lexical/alignmentobject.rs | 2 +- .../src/social_flockfeeds/lexical/audience.rs | 2 +- .../social_flockfeeds/lexical/audioobject.rs | 2 +- .../src/social_flockfeeds/lexical/brand.rs | 2 +- .../lexical/breadcrumblist.rs | 2 +- .../social_flockfeeds/lexical/categorycode.rs | 2 +- .../lexical/certification.rs | 2 +- .../src/social_flockfeeds/lexical/claim.rs | 2 +- .../src/social_flockfeeds/lexical/clip.rs | 2 +- .../src/social_flockfeeds/lexical/comment.rs | 2 +- .../lexical/correctioncomment.rs | 2 +- .../src/social_flockfeeds/lexical/country.rs | 2 +- .../social_flockfeeds/lexical/creativework.rs | 2 +- .../lexical/creativeworkseason.rs | 2 +- .../social_flockfeeds/lexical/definedterm.rs | 2 +- .../src/social_flockfeeds/lexical/demand.rs | 2 +- .../src/social_flockfeeds/lexical/distance.rs | 2 +- .../src/social_flockfeeds/lexical/duration.rs | 2 +- .../lexical/energyconsumptiondetails.rs | 2 +- .../src/social_flockfeeds/lexical/episode.rs | 2 +- .../src/social_flockfeeds/lexical/event.rs | 2 +- .../src/social_flockfeeds/lexical/grant.rs | 2 +- .../social_flockfeeds/lexical/howtosection.rs | 2 +- .../social_flockfeeds/lexical/howtostep.rs | 2 +- .../social_flockfeeds/lexical/howtosupply.rs | 2 +- .../social_flockfeeds/lexical/howtotool.rs | 2 +- .../social_flockfeeds/lexical/imageobject.rs | 2 +- .../lexical/interactioncounter.rs | 2 +- .../lexical/iptcdigitalsourceenumeration.rs | 2 +- .../src/social_flockfeeds/lexical/itemlist.rs | 2 +- .../src/social_flockfeeds/lexical/language.rs | 2 +- .../src/social_flockfeeds/lexical/listitem.rs | 2 +- .../src/social_flockfeeds/lexical/mass.rs | 2 +- .../social_flockfeeds/lexical/mediaobject.rs | 2 +- .../lexical/merchantreturnpolicy.rs | 2 +- .../lexical/monetaryamount.rs | 2 +- .../social_flockfeeds/lexical/musicgroup.rs | 2 +- .../lexical/musicrecording.rs | 2 +- .../social_flockfeeds/lexical/newsarticle.rs | 2 +- .../lexical/nutritioninformation.rs | 2 +- .../src/social_flockfeeds/lexical/offer.rs | 2 +- .../lexical/offeritemcondition.rs | 2 +- .../social_flockfeeds/lexical/organization.rs | 2 +- .../lexical/performinggroup.rs | 2 +- .../src/social_flockfeeds/lexical/person.rs | 2 +- .../lexical/physicalactivitycategory.rs | 2 +- .../src/social_flockfeeds/lexical/place.rs | 2 +- .../src/social_flockfeeds/lexical/product.rs | 2 +- .../social_flockfeeds/lexical/productgroup.rs | 2 +- .../social_flockfeeds/lexical/productmodel.rs | 2 +- .../lexical/propertyvalue.rs | 2 +- .../lexical/publicationevent.rs | 2 +- .../lexical/quantitativevalue.rs | 2 +- .../src/social_flockfeeds/lexical/rating.rs | 2 +- .../src/social_flockfeeds/lexical/recipe.rs | 2 +- .../lexical/restricteddiet.rs | 2 +- .../src/social_flockfeeds/lexical/review.rs | 2 +- .../src/social_flockfeeds/lexical/service.rs | 2 +- .../lexical/sizespecification.rs | 2 +- .../lexical/socialmediaposting.rs | 2 +- .../lexical/speakablespecification.rs | 2 +- .../social_flockfeeds/lexical/textobject.rs | 2 +- .../src/social_flockfeeds/lexical/thing.rs | 2 +- .../social_flockfeeds/lexical/videoobject.rs | 2 +- .../social_flockfeeds/lexical/webcontent.rs | 2 +- .../src/social_flockfeeds/lexical/webpage.rs | 2 +- crates/jacquard-api/src/social_grain.rs | 14 +- crates/jacquard-api/src/social_grain/actor.rs | 26 +- .../src/social_grain/actor/profile.rs | 26 +- .../jacquard-api/src/social_grain/favorite.rs | 2 +- .../jacquard-api/src/social_grain/gallery.rs | 16 +- .../src/social_grain/gallery/item.rs | 2 +- crates/jacquard-api/src/social_grain/photo.rs | 6 +- .../src/social_grain/photo/exif.rs | 2 +- .../jacquard-api/src/social_pmsky/proposal.rs | 8 +- crates/jacquard-api/src/social_pmsky/vote.rs | 2 +- .../src/social_psky/actor/profile.rs | 14 +- .../src/social_psky/chat/message.rs | 14 +- .../jacquard-api/src/social_psky/chat/room.rs | 40 ++- .../src/social_psky/richtext/facet.rs | 34 +- .../src/tools_ozone/communication.rs | 2 +- .../hosting/get_account_history.rs | 12 +- .../src/tools_ozone/moderation.rs | 122 ++++--- .../moderation/cancel_scheduled_actions.rs | 4 +- .../moderation/get_account_timeline.rs | 4 +- .../tools_ozone/moderation/schedule_action.rs | 14 +- .../jacquard-api/src/tools_ozone/safelink.rs | 4 +- .../src/tools_ozone/server/get_config.rs | 4 +- crates/jacquard-api/src/tools_ozone/set.rs | 52 ++- .../jacquard-api/src/tools_ozone/setting.rs | 14 +- .../jacquard-api/src/tools_ozone/signature.rs | 2 +- .../signature/find_related_accounts.rs | 2 +- crates/jacquard-api/src/tools_ozone/team.rs | 2 +- .../src/tools_ozone/verification.rs | 2 +- .../verification/grant_verifications.rs | 4 +- .../verification/revoke_verifications.rs | 2 +- .../tools_smokesignal/blahg/content/post.rs | 22 +- crates/jacquard-api/src/uk_ewancroft/now.rs | 14 +- crates/jacquard-api/src/uk_skyblur/post.rs | 38 +- .../jacquard-api/src/uk_skyblur/preference.rs | 16 +- crates/jacquard-api/src/us_polhem/blog.rs | 14 +- .../src/us_polhem/blog/content.rs | 14 +- .../jacquard-api/src/us_polhem/blog/post.rs | 26 +- crates/jacquard-api/src/us_polhem/blog/tag.rs | 20 +- crates/jacquard-api/src/win_tomo_x/pushat.rs | 16 +- .../src/win_tomo_x/pushat/allow.rs | 2 +- crates/jacquard-lexicon/src/codegen.rs | 4 +- .../src/codegen/builder_heuristics.rs | 76 ++++ .../jacquard-lexicon/src/codegen/lifetime.rs | 5 - crates/jacquard-lexicon/src/codegen/names.rs | 14 +- .../src/codegen/schema_impl.rs | 2 +- .../jacquard-lexicon/src/codegen/structs.rs | 330 +++++------------- crates/jacquard-lexicon/src/codegen/types.rs | 45 +-- .../src/codegen/union_codegen.rs | 184 ++++++++++ crates/jacquard-lexicon/src/codegen/utils.rs | 60 +++- crates/jacquard-lexicon/src/codegen/xrpc.rs | 225 +++--------- .../src/derive_impl/doc_to_tokens.rs | 24 +- .../src/derive_impl/lexicon_schema.rs | 4 +- crates/jacquard-lexicon/src/schema.rs | 71 +--- crates/jacquard-lexicon/src/validation.rs | 7 + crates/jacquard-lexicon/tests/schema_tests.rs | 11 +- justfile | 4 +- 439 files changed, 3997 insertions(+), 2719 deletions(-) create mode 100644 crates/jacquard-lexicon/src/codegen/builder_heuristics.rs create mode 100644 crates/jacquard-lexicon/src/codegen/union_codegen.rs diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder.rs index 50845c79..3a6815c3 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder.rs @@ -149,7 +149,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FolderForm<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -189,7 +189,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FolderView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs index 979217ed..96294593 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs @@ -104,7 +104,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Record<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_blebbit/authr/group.rs b/crates/jacquard-api/src/app_blebbit/authr/group.rs index bdc3b985..a0b5c235 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group.rs @@ -220,7 +220,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GroupForm<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -266,7 +266,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GroupView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs index b2a0e52f..b1583026 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs @@ -112,7 +112,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Record<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_blebbit/authr/page.rs b/crates/jacquard-api/src/app_blebbit/authr/page.rs index 99301934..077c2f75 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page.rs @@ -164,7 +164,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PageForm<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -207,7 +207,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PageView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs index 4b40b806..5c9d94ce 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs @@ -108,7 +108,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Record<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/actor.rs b/crates/jacquard-api/src/app_bsky/actor.rs index bafd8206..64b6b9bb 100644 --- a/crates/jacquard-api/src/app_bsky/actor.rs +++ b/crates/jacquard-api/src/app_bsky/actor.rs @@ -2397,7 +2397,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AdultContentPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2432,13 +2432,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BskyAppProgressGuide<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.guide; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "guide", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "guide", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -2489,12 +2491,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BskyAppStatePref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.nuxs { #[allow(unused_comparisons)] if value.len() > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "nuxs", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nuxs", + ), max: 100usize, actual: value.len(), }); @@ -2503,8 +2507,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BskyAppStatePref<'a> { if let Some(ref value) = self.queued_nudges { #[allow(unused_comparisons)] if value.len() > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "queued_nudges", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "queued_nudges", + ), max: 1000usize, actual: value.len(), }); @@ -2549,7 +2555,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentLabelPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2599,7 +2605,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedViewPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2634,7 +2640,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiddenPostsPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2669,13 +2675,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for InterestsPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.tags; #[allow(unused_comparisons)] if value.len() > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 100usize, actual: value.len(), }); @@ -2716,13 +2724,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for KnownFollowers<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.followers; #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "followers", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "followers", + ), max: 5usize, actual: value.len(), }); @@ -2732,8 +2742,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for KnownFollowers<'a> { let value = &self.followers; #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "followers", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "followers", + ), min: 0usize, actual: value.len(), }); @@ -2772,7 +2784,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelerPrefItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2806,7 +2818,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelersPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2859,13 +2871,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MutedWord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.value; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "value", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "value", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -2880,8 +2894,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MutedWord<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "value", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "value", + ), max: 1000usize, actual: count, }); @@ -2998,7 +3014,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MutedWordsPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3044,12 +3060,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Nux<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.data { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "data", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "data", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -3063,8 +3081,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Nux<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "data", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "data", + ), max: 300usize, actual: count, }); @@ -3075,8 +3095,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Nux<'a> { let value = &self.id; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "id", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -3116,7 +3138,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PersonalDetailsPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3184,12 +3206,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PostInteractionSettingsPr } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.postgate_embedding_rules { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "postgate_embedding_rules", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "postgate_embedding_rules", + ), max: 5usize, actual: value.len(), }); @@ -3198,8 +3222,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PostInteractionSettingsPr if let Some(ref value) = self.threadgate_allow_rules { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "threadgate_allow_rules", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "threadgate_allow_rules", + ), max: 5usize, actual: value.len(), }); @@ -3298,7 +3324,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileAssociated<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3333,7 +3359,7 @@ for ProfileAssociatedActivitySubscription<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3367,7 +3393,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileAssociatedChat<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3445,12 +3471,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -3464,8 +3492,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -3475,8 +3505,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -3490,8 +3522,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -3568,12 +3602,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -3587,8 +3623,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -3699,12 +3737,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -3718,8 +3758,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewDetailed<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -3729,8 +3771,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewDetailed<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -3744,8 +3788,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewDetailed<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -3793,7 +3839,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SavedFeed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3832,7 +3878,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SavedFeedsPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3866,7 +3912,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SavedFeedsPrefV2<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3917,7 +3963,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StatusView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3956,7 +4002,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadViewPref<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -3992,7 +4038,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationPrefs<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4036,7 +4082,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4079,7 +4125,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4141,7 +4187,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewerState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/actor/profile.rs b/crates/jacquard-api/src/app_bsky/actor/profile.rs index cd01b399..bc3587a8 100644 --- a/crates/jacquard-api/src/app_bsky/actor/profile.rs +++ b/crates/jacquard-api/src/app_bsky/actor/profile.rs @@ -140,12 +140,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -159,8 +161,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -170,8 +174,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -185,8 +191,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -196,8 +204,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.pronouns { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "pronouns", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pronouns", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -211,8 +221,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 20usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "pronouns", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pronouns", + ), max: 20usize, actual: count, }); diff --git a/crates/jacquard-api/src/app_bsky/actor/status.rs b/crates/jacquard-api/src/app_bsky/actor/status.rs index fad721f0..38450370 100644 --- a/crates/jacquard-api/src/app_bsky/actor/status.rs +++ b/crates/jacquard-api/src/app_bsky/actor/status.rs @@ -126,11 +126,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Status<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.duration_minutes { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "duration_minutes", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "duration_minutes", + ), min: 1i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_bsky/bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark.rs index 4616338c..5605ef51 100644 --- a/crates/jacquard-api/src/app_bsky/bookmark.rs +++ b/crates/jacquard-api/src/app_bsky/bookmark.rs @@ -141,7 +141,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bookmark<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -202,7 +202,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BookmarkView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed.rs b/crates/jacquard-api/src/app_bsky/embed.rs index d86c6e75..44c4fb96 100644 --- a/crates/jacquard-api/src/app_bsky/embed.rs +++ b/crates/jacquard-api/src/app_bsky/embed.rs @@ -100,12 +100,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.height; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "height", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "height", + ), min: 1i64, actual: *value, }); @@ -114,8 +116,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { { let value = &self.width; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "width", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "width", + ), min: 1i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_bsky/embed/external.rs b/crates/jacquard-api/src/app_bsky/embed/external.rs index 545763a1..8a54f21c 100644 --- a/crates/jacquard-api/src/app_bsky/embed/external.rs +++ b/crates/jacquard-api/src/app_bsky/embed/external.rs @@ -274,7 +274,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for External<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -309,7 +309,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ExternalRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -343,7 +343,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -387,7 +387,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewExternal<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed/images.rs b/crates/jacquard-api/src/app_bsky/embed/images.rs index 7214c082..d03288d9 100644 --- a/crates/jacquard-api/src/app_bsky/embed/images.rs +++ b/crates/jacquard-api/src/app_bsky/embed/images.rs @@ -258,7 +258,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Image<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -292,13 +292,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Images<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.images; #[allow(unused_comparisons)] if value.len() > 4usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "images", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "images", + ), max: 4usize, actual: value.len(), }); @@ -337,13 +339,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.images; #[allow(unused_comparisons)] if value.len() > 4usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "images", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "images", + ), max: 4usize, actual: value.len(), }); @@ -394,7 +398,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewImage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed/record.rs b/crates/jacquard-api/src/app_bsky/embed/record.rs index 7845806b..a2bcdce8 100644 --- a/crates/jacquard-api/src/app_bsky/embed/record.rs +++ b/crates/jacquard-api/src/app_bsky/embed/record.rs @@ -418,7 +418,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Record<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -483,7 +483,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -520,7 +520,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewBlocked<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -555,7 +555,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewDetached<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -590,7 +590,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewNotFound<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -677,7 +677,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs index 55257cc9..98d495eb 100644 --- a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs +++ b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs @@ -150,7 +150,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordWithMedia<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -207,7 +207,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed/video.rs b/crates/jacquard-api/src/app_bsky/embed/video.rs index 97c9cbe0..cadb01fb 100644 --- a/crates/jacquard-api/src/app_bsky/embed/video.rs +++ b/crates/jacquard-api/src/app_bsky/embed/video.rs @@ -255,7 +255,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Caption<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -303,12 +303,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.alt { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -322,8 +324,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 1000usize, actual: count, }); @@ -333,8 +337,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { if let Some(ref value) = self.captions { #[allow(unused_comparisons)] if value.len() > 20usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "captions", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "captions", + ), max: 20usize, actual: value.len(), }); @@ -387,12 +393,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.alt { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -406,8 +414,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 1000usize, actual: count, }); diff --git a/crates/jacquard-api/src/app_bsky/feed.rs b/crates/jacquard-api/src/app_bsky/feed.rs index c96c85da..5f5db602 100644 --- a/crates/jacquard-api/src/app_bsky/feed.rs +++ b/crates/jacquard-api/src/app_bsky/feed.rs @@ -1444,7 +1444,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlockedAuthor<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1481,7 +1481,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlockedPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1660,12 +1660,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedViewPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.feed_context { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "feed_context", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feed_context", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -1674,8 +1676,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedViewPost<'a> { if let Some(ref value) = self.req_id { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "req_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "req_id", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -1754,12 +1758,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GeneratorView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -1773,8 +1779,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GeneratorView<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -1783,8 +1791,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GeneratorView<'a> { } if let Some(ref value) = self.like_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "like_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "like_count", + ), min: 0i64, actual: *value, }); @@ -1824,7 +1834,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GeneratorViewerState<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1870,12 +1880,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Interaction<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.feed_context { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "feed_context", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feed_context", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -1884,8 +1896,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Interaction<'a> { if let Some(ref value) = self.req_id { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "req_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "req_id", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -2033,7 +2047,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotFoundPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2130,7 +2144,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PostView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2160,7 +2174,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReasonPin<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2203,7 +2217,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReasonRepost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2286,7 +2300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2384,12 +2398,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonFeedPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.feed_context { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "feed_context", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feed_context", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -2424,7 +2440,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonReasonPin<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2458,7 +2474,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonReasonRepost<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2494,7 +2510,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadContext<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2582,7 +2598,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadViewPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2626,7 +2642,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadgateView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2675,7 +2691,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewerState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 ea18c9be..40e7ad9b 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 @@ -137,7 +137,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Feed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -175,7 +175,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Links<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/feed/generator.rs b/crates/jacquard-api/src/app_bsky/feed/generator.rs index 084bfe32..9cde1f14 100644 --- a/crates/jacquard-api/src/app_bsky/feed/generator.rs +++ b/crates/jacquard-api/src/app_bsky/feed/generator.rs @@ -125,12 +125,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Generator<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -144,8 +146,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Generator<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -156,8 +160,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Generator<'a> { let value = &self.display_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 240usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 240usize, actual: ::len(value.as_ref()), }); @@ -172,8 +178,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Generator<'a> { ) .count(); if count > 24usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 24usize, actual: count, }); diff --git a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs index 346ed8d6..d889ebfb 100644 --- a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs +++ b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs @@ -208,7 +208,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/feed/like.rs b/crates/jacquard-api/src/app_bsky/feed/like.rs index 92bef8fc..bbbd3223 100644 --- a/crates/jacquard-api/src/app_bsky/feed/like.rs +++ b/crates/jacquard-api/src/app_bsky/feed/like.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/feed/post.rs b/crates/jacquard-api/src/app_bsky/feed/post.rs index bf922b24..26b4a292 100644 --- a/crates/jacquard-api/src/app_bsky/feed/post.rs +++ b/crates/jacquard-api/src/app_bsky/feed/post.rs @@ -388,7 +388,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entity<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -545,12 +545,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.langs { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "langs", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "langs", + ), max: 3usize, actual: value.len(), }); @@ -559,8 +561,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 8usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 8usize, actual: value.len(), }); @@ -570,8 +574,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -586,8 +592,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 300usize, actual: count, }); @@ -629,7 +637,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -664,12 +672,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TextSlice<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.end; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "end", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "end", + ), min: 0i64, actual: *value, }); @@ -678,8 +688,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TextSlice<'a> { { let value = &self.start; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "start", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "start", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_bsky/feed/postgate.rs b/crates/jacquard-api/src/app_bsky/feed/postgate.rs index c9108b39..9d6d75cc 100644 --- a/crates/jacquard-api/src/app_bsky/feed/postgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/postgate.rs @@ -178,7 +178,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DisableRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -286,12 +286,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Postgate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.detached_embedding_uris { #[allow(unused_comparisons)] if value.len() > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "detached_embedding_uris", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "detached_embedding_uris", + ), max: 50usize, actual: value.len(), }); @@ -300,8 +302,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Postgate<'a> { if let Some(ref value) = self.embedding_rules { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "embedding_rules", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "embedding_rules", + ), max: 5usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/app_bsky/feed/repost.rs b/crates/jacquard-api/src/app_bsky/feed/repost.rs index f06abdd9..20d7a3eb 100644 --- a/crates/jacquard-api/src/app_bsky/feed/repost.rs +++ b/crates/jacquard-api/src/app_bsky/feed/repost.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs index 39c310e2..067a937a 100644 --- a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs @@ -249,7 +249,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FollowerRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -280,7 +280,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FollowingRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -315,7 +315,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -446,12 +446,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Threadgate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.allow { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "allow", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "allow", + ), max: 5usize, actual: value.len(), }); @@ -460,8 +462,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Threadgate<'a> { if let Some(ref value) = self.hidden_replies { #[allow(unused_comparisons)] if value.len() > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "hidden_replies", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "hidden_replies", + ), max: 300usize, actual: value.len(), }); @@ -497,7 +501,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MentionRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 2470a5d4..dae65bef 100644 --- a/crates/jacquard-api/src/app_bsky/graph.rs +++ b/crates/jacquard-api/src/app_bsky/graph.rs @@ -994,7 +994,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListItemView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1146,12 +1146,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -1165,8 +1167,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -1175,8 +1179,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> { } if let Some(ref value) = self.list_item_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "list_item_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "list_item_count", + ), min: 0i64, actual: *value, }); @@ -1186,8 +1192,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -1197,8 +1205,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -1262,11 +1272,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.list_item_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "list_item_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "list_item_count", + ), min: 0i64, actual: *value, }); @@ -1276,8 +1288,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListViewBasic<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -1287,8 +1301,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListViewBasic<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -1330,7 +1346,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListViewerState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1384,7 +1400,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotFoundActor<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1447,7 +1463,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Relationship<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1510,12 +1526,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.feeds { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "feeds", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feeds", + ), max: 3usize, actual: value.len(), }); @@ -1523,8 +1541,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackView<'a> { } if let Some(ref value) = self.joined_all_time_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "joined_all_time_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "joined_all_time_count", + ), min: 0i64, actual: *value, }); @@ -1532,8 +1552,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackView<'a> { } if let Some(ref value) = self.joined_week_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "joined_week_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "joined_week_count", + ), min: 0i64, actual: *value, }); @@ -1542,8 +1564,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackView<'a> { if let Some(ref value) = self.list_items_sample { #[allow(unused_comparisons)] if value.len() > 12usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "list_items_sample", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "list_items_sample", + ), max: 12usize, actual: value.len(), }); @@ -1602,11 +1626,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackViewBasic<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.joined_all_time_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "joined_all_time_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "joined_all_time_count", + ), min: 0i64, actual: *value, }); @@ -1614,8 +1640,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackViewBasic<'a> } if let Some(ref value) = self.joined_week_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "joined_week_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "joined_week_count", + ), min: 0i64, actual: *value, }); @@ -1623,8 +1651,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackViewBasic<'a> } if let Some(ref value) = self.list_item_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "list_item_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "list_item_count", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_bsky/graph/block.rs b/crates/jacquard-api/src/app_bsky/graph/block.rs index a22f8936..c3ad4993 100644 --- a/crates/jacquard-api/src/app_bsky/graph/block.rs +++ b/crates/jacquard-api/src/app_bsky/graph/block.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Block<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/graph/follow.rs b/crates/jacquard-api/src/app_bsky/graph/follow.rs index 5e263dca..0f00370b 100644 --- a/crates/jacquard-api/src/app_bsky/graph/follow.rs +++ b/crates/jacquard-api/src/app_bsky/graph/follow.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Follow<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs index c39dfa02..9b565031 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs @@ -185,7 +185,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListWithMembership<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs index 57a3b403..9f3ce243 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs @@ -238,7 +238,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StarterPackWithMembership } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/graph/list.rs b/crates/jacquard-api/src/app_bsky/graph/list.rs index 2aa55d6c..56f23ff8 100644 --- a/crates/jacquard-api/src/app_bsky/graph/list.rs +++ b/crates/jacquard-api/src/app_bsky/graph/list.rs @@ -118,12 +118,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -137,8 +139,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -149,8 +153,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -160,8 +166,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/app_bsky/graph/listblock.rs b/crates/jacquard-api/src/app_bsky/graph/listblock.rs index feaf1e31..3ccbc1a9 100644 --- a/crates/jacquard-api/src/app_bsky/graph/listblock.rs +++ b/crates/jacquard-api/src/app_bsky/graph/listblock.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listblock<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/graph/listitem.rs b/crates/jacquard-api/src/app_bsky/graph/listitem.rs index 294e9694..f50ba89e 100644 --- a/crates/jacquard-api/src/app_bsky/graph/listitem.rs +++ b/crates/jacquard-api/src/app_bsky/graph/listitem.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listitem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs index 1a0db310..efeccab3 100644 --- a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs +++ b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs @@ -212,7 +212,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -326,12 +326,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -345,8 +347,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -356,8 +360,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { if let Some(ref value) = self.feeds { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "feeds", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feeds", + ), max: 3usize, actual: value.len(), }); @@ -367,8 +373,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -378,8 +386,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -394,8 +404,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Starterpack<'a> { ) .count(); if count > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 50usize, actual: count, }); diff --git a/crates/jacquard-api/src/app_bsky/graph/verification.rs b/crates/jacquard-api/src/app_bsky/graph/verification.rs index 8ce6eab2..d407daf1 100644 --- a/crates/jacquard-api/src/app_bsky/graph/verification.rs +++ b/crates/jacquard-api/src/app_bsky/graph/verification.rs @@ -106,7 +106,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Verification<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/labeler.rs b/crates/jacquard-api/src/app_bsky/labeler.rs index 31c66e12..4f9de313 100644 --- a/crates/jacquard-api/src/app_bsky/labeler.rs +++ b/crates/jacquard-api/src/app_bsky/labeler.rs @@ -461,7 +461,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelerPolicies<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -511,11 +511,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelerView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.like_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "like_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "like_count", + ), min: 0i64, actual: *value, }); @@ -587,11 +589,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelerViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.like_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "like_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "like_count", + ), min: 0i64, actual: *value, }); @@ -631,7 +635,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelerViewerState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/labeler/service.rs b/crates/jacquard-api/src/app_bsky/labeler/service.rs index b5aa2864..5cd85714 100644 --- a/crates/jacquard-api/src/app_bsky/labeler/service.rs +++ b/crates/jacquard-api/src/app_bsky/labeler/service.rs @@ -116,7 +116,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Service<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/notification.rs b/crates/jacquard-api/src/app_bsky/notification.rs index 09ff22f0..fc5c2a4d 100644 --- a/crates/jacquard-api/src/app_bsky/notification.rs +++ b/crates/jacquard-api/src/app_bsky/notification.rs @@ -433,7 +433,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ActivitySubscription<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -469,7 +469,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ChatPreference<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -506,7 +506,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FilterablePreference<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -540,7 +540,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Preference<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -598,7 +598,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Preferences<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -628,7 +628,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordDeleted<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -665,7 +665,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SubjectActivitySubscripti } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/notification/declaration.rs b/crates/jacquard-api/src/app_bsky/notification/declaration.rs index bc5c586b..c3c03884 100644 --- a/crates/jacquard-api/src/app_bsky/notification/declaration.rs +++ b/crates/jacquard-api/src/app_bsky/notification/declaration.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Declaration<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs index ea848b19..554a503d 100644 --- a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs +++ b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs @@ -396,7 +396,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Notification<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/richtext/facet.rs b/crates/jacquard-api/src/app_bsky/richtext/facet.rs index 62b26386..f90b8e9a 100644 --- a/crates/jacquard-api/src/app_bsky/richtext/facet.rs +++ b/crates/jacquard-api/src/app_bsky/richtext/facet.rs @@ -248,12 +248,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.byte_end; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_end", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_end", + ), min: 0i64, actual: *value, }); @@ -262,8 +264,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { { let value = &self.byte_start; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_start", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_start", + ), min: 0i64, actual: *value, }); @@ -303,7 +307,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Link<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -361,7 +365,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Facet<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -396,7 +400,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mention<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -431,13 +435,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.tag; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tag", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tag", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -452,8 +458,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "tag", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tag", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/app_bsky/unspecced.rs b/crates/jacquard-api/src/app_bsky/unspecced.rs index ee1c0b72..a0b222c2 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced.rs @@ -964,7 +964,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AgeAssuranceEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1003,7 +1003,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AgeAssuranceState<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1037,7 +1037,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonSearchActor<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1071,7 +1071,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonSearchPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1105,7 +1105,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonSearchStarterPack } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1158,7 +1158,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonTrend<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1192,7 +1192,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItemBlocked<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1222,7 +1222,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItemNoUnauthenticat } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1252,7 +1252,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItemNotFound<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1296,7 +1296,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItemPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1349,7 +1349,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TrendView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1391,7 +1391,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TrendingTopic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 1f7df7d1..2448c2fa 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs @@ -115,7 +115,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LiveNowConfig<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs index 3a1e5fa2..36b7eb43 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs @@ -229,7 +229,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs index 35526d3f..d5f54d09 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs @@ -325,7 +325,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs index cf137f69..e150e47a 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs @@ -199,7 +199,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Suggestion<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/video.rs b/crates/jacquard-api/src/app_bsky/video.rs index 45a187d1..677f426d 100644 --- a/crates/jacquard-api/src/app_bsky/video.rs +++ b/crates/jacquard-api/src/app_bsky/video.rs @@ -195,11 +195,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for JobStatus<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.progress { if *value > 100i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "progress", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "progress", + ), max: 100i64, actual: *value, }); @@ -207,8 +209,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for JobStatus<'a> { } if let Some(ref value) = self.progress { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "progress", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "progress", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_ocho/auth.rs b/crates/jacquard-api/src/app_ocho/auth.rs index 162ae367..c3f37b23 100644 --- a/crates/jacquard-api/src/app_ocho/auth.rs +++ b/crates/jacquard-api/src/app_ocho/auth.rs @@ -151,7 +151,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AuthCallback<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/edu/verification.rs b/crates/jacquard-api/src/app_ocho/edu/verification.rs index 19ac61c3..49170e61 100644 --- a/crates/jacquard-api/src/app_ocho/edu/verification.rs +++ b/crates/jacquard-api/src/app_ocho/edu/verification.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Verification<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_ocho/plugin.rs b/crates/jacquard-api/src/app_ocho/plugin.rs index ab2de069..6573067c 100644 --- a/crates/jacquard-api/src/app_ocho/plugin.rs +++ b/crates/jacquard-api/src/app_ocho/plugin.rs @@ -1023,7 +1023,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AdaptiveIcon<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1062,7 +1062,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Android<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1099,7 +1099,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AndroidStatusBar<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1146,7 +1146,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Asset<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1181,7 +1181,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Db<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1216,7 +1216,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Developer<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1319,7 +1319,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ExpoClient<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1354,7 +1354,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ExpoGo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1389,7 +1389,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Ios<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1432,7 +1432,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LaunchAsset<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1482,7 +1482,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Manifest<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1518,7 +1518,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ManifestExtra<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1588,7 +1588,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Web<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/plugin/service.rs b/crates/jacquard-api/src/app_ocho/plugin/service.rs index 18344cf7..29d1a82d 100644 --- a/crates/jacquard-api/src/app_ocho/plugin/service.rs +++ b/crates/jacquard-api/src/app_ocho/plugin/service.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Service<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_rocksky/actor.rs b/crates/jacquard-api/src/app_rocksky/actor.rs index 758be99a..bc87b51e 100644 --- a/crates/jacquard-api/src/app_rocksky/actor.rs +++ b/crates/jacquard-api/src/app_rocksky/actor.rs @@ -397,7 +397,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -455,7 +455,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/album.rs b/crates/jacquard-api/src/app_rocksky/album.rs index 3f539b85..9b08e2a3 100644 --- a/crates/jacquard-api/src/app_rocksky/album.rs +++ b/crates/jacquard-api/src/app_rocksky/album.rs @@ -155,13 +155,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Album<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -171,8 +173,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Album<'a> { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -181,8 +185,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Album<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -192,8 +198,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Album<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -203,8 +211,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Album<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -1028,11 +1038,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AlbumViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -1040,8 +1052,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AlbumViewBasic<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); @@ -1122,11 +1136,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AlbumViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -1134,8 +1150,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AlbumViewDetailed<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_rocksky/apikey.rs b/crates/jacquard-api/src/app_rocksky/apikey.rs index 9a8dd405..43fbbc44 100644 --- a/crates/jacquard-api/src/app_rocksky/apikey.rs +++ b/crates/jacquard-api/src/app_rocksky/apikey.rs @@ -162,7 +162,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ApiKeyView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/artist.rs b/crates/jacquard-api/src/app_rocksky/artist.rs index c3b0ac59..3625d4b5 100644 --- a/crates/jacquard-api/src/app_rocksky/artist.rs +++ b/crates/jacquard-api/src/app_rocksky/artist.rs @@ -133,12 +133,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.bio { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "bio", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "bio", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -147,8 +149,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { if let Some(ref value) = self.born_in { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "born_in", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "born_in", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -158,8 +162,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -169,8 +175,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -713,11 +721,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ArtistViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -725,8 +735,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ArtistViewBasic<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); @@ -789,11 +801,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ArtistViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -801,8 +815,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ArtistViewDetailed<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_rocksky/charts.rs b/crates/jacquard-api/src/app_rocksky/charts.rs index ce1fa61c..d5e7e9eb 100644 --- a/crates/jacquard-api/src/app_rocksky/charts.rs +++ b/crates/jacquard-api/src/app_rocksky/charts.rs @@ -128,7 +128,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ChartsView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -166,7 +166,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScrobbleViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/dropbox.rs b/crates/jacquard-api/src/app_rocksky/dropbox.rs index f9e613a6..82ccdbcf 100644 --- a/crates/jacquard-api/src/app_rocksky/dropbox.rs +++ b/crates/jacquard-api/src/app_rocksky/dropbox.rs @@ -260,7 +260,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FileListView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -314,7 +314,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -350,7 +350,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TemporaryLinkView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/feed.rs b/crates/jacquard-api/src/app_rocksky/feed.rs index 26d77bf6..0a6d9dbf 100644 --- a/crates/jacquard-api/src/app_rocksky/feed.rs +++ b/crates/jacquard-api/src/app_rocksky/feed.rs @@ -462,7 +462,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NowPlayingView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -499,7 +499,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NowPlayingsView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -567,7 +567,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SearchResultsView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/googledrive.rs b/crates/jacquard-api/src/app_rocksky/googledrive.rs index 15e6df6e..de7021f8 100644 --- a/crates/jacquard-api/src/app_rocksky/googledrive.rs +++ b/crates/jacquard-api/src/app_rocksky/googledrive.rs @@ -113,7 +113,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FileListView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -149,7 +149,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/like.rs b/crates/jacquard-api/src/app_rocksky/like.rs index fa01fa84..7ee25de7 100644 --- a/crates/jacquard-api/src/app_rocksky/like.rs +++ b/crates/jacquard-api/src/app_rocksky/like.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/app_rocksky/player.rs b/crates/jacquard-api/src/app_rocksky/player.rs index b5f61bdf..7d13f7f0 100644 --- a/crates/jacquard-api/src/app_rocksky/player.rs +++ b/crates/jacquard-api/src/app_rocksky/player.rs @@ -92,7 +92,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CurrentlyPlayingViewDetai } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/playlist.rs b/crates/jacquard-api/src/app_rocksky/playlist.rs index 7e75f349..6c6c8fe6 100644 --- a/crates/jacquard-api/src/app_rocksky/playlist.rs +++ b/crates/jacquard-api/src/app_rocksky/playlist.rs @@ -138,12 +138,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Playlist<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -152,8 +154,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Playlist<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -163,8 +167,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Playlist<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -174,8 +180,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Playlist<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -985,11 +993,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlaylistViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.track_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "track_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_count", + ), min: 0i64, actual: *value, }); @@ -1074,7 +1084,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlaylistViewDetailed<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/radio.rs b/crates/jacquard-api/src/app_rocksky/radio.rs index 15844f7b..998cdef2 100644 --- a/crates/jacquard-api/src/app_rocksky/radio.rs +++ b/crates/jacquard-api/src/app_rocksky/radio.rs @@ -123,12 +123,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -137,8 +139,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -147,8 +151,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -157,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -168,8 +176,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -179,8 +189,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Radio<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -689,7 +701,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RadioViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -752,7 +764,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RadioViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/scrobble.rs b/crates/jacquard-api/src/app_rocksky/scrobble.rs index 19f69cb0..94222866 100644 --- a/crates/jacquard-api/src/app_rocksky/scrobble.rs +++ b/crates/jacquard-api/src/app_rocksky/scrobble.rs @@ -199,13 +199,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.album; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "album", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -215,8 +217,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.album; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "album", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -226,8 +230,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.album_artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "album_artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album_artist", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -237,8 +243,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.album_artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "album_artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album_artist", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -248,8 +256,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -259,8 +269,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -269,8 +281,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.composer { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "composer", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "composer", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -279,8 +293,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.copyright_message { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "copyright_message", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "copyright_message", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -288,8 +304,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { } if let Some(ref value) = self.disc_number { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "disc_number", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "disc_number", + ), min: 1i64, actual: *value, }); @@ -298,8 +316,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { { let value = &self.duration; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "duration", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "duration", + ), min: 1i64, actual: *value, }); @@ -308,8 +328,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -318,8 +340,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.label { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "label", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "label", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -328,8 +352,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.lyrics { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "lyrics", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "lyrics", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -339,8 +365,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -350,8 +378,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -359,8 +389,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { } if let Some(ref value) = self.track_number { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "track_number", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_number", + ), min: 1i64, actual: *value, }); @@ -369,8 +401,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Scrobble<'a> { if let Some(ref value) = self.wiki { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "wiki", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "wiki", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -1441,7 +1475,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScrobbleViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1522,7 +1556,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScrobbleViewDetailed<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/shout.rs b/crates/jacquard-api/src/app_rocksky/shout.rs index 30226c82..ba839be0 100644 --- a/crates/jacquard-api/src/app_rocksky/shout.rs +++ b/crates/jacquard-api/src/app_rocksky/shout.rs @@ -116,13 +116,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Shout<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.message; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "message", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "message", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -132,8 +134,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Shout<'a> { let value = &self.message; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "message", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "message", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -523,7 +527,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Author<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -574,7 +578,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ShoutView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/song.rs b/crates/jacquard-api/src/app_rocksky/song.rs index 1bb6138e..271284d0 100644 --- a/crates/jacquard-api/src/app_rocksky/song.rs +++ b/crates/jacquard-api/src/app_rocksky/song.rs @@ -199,13 +199,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.album; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "album", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -215,8 +217,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.album; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "album", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -226,8 +230,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.album_artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "album_artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album_artist", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -237,8 +243,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.album_artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "album_artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "album_artist", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -248,8 +256,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -259,8 +269,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.artist; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "artist", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -269,8 +281,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.composer { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "composer", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "composer", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -279,8 +293,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.copyright_message { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "copyright_message", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "copyright_message", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -288,8 +304,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { } if let Some(ref value) = self.disc_number { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "disc_number", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "disc_number", + ), min: 1i64, actual: *value, }); @@ -298,8 +316,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { { let value = &self.duration; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "duration", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "duration", + ), min: 1i64, actual: *value, }); @@ -308,8 +328,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -318,8 +340,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.genre { #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "genre", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genre", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -328,8 +352,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.label { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "label", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "label", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -338,8 +364,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.lyrics { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "lyrics", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "lyrics", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -349,8 +377,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -360,8 +390,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -369,8 +401,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { } if let Some(ref value) = self.track_number { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "track_number", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_number", + ), min: 1i64, actual: *value, }); @@ -379,8 +413,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Song<'a> { if let Some(ref value) = self.wiki { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "wiki", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "wiki", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -1570,11 +1606,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SongViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -1582,8 +1620,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SongViewBasic<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); @@ -1678,11 +1718,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SongViewDetailed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.play_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "play_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "play_count", + ), min: 0i64, actual: *value, }); @@ -1690,8 +1732,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SongViewDetailed<'a> { } if let Some(ref value) = self.unique_listeners { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "unique_listeners", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "unique_listeners", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/app_rocksky/spotify.rs b/crates/jacquard-api/src/app_rocksky/spotify.rs index 0222e537..85b88ca4 100644 --- a/crates/jacquard-api/src/app_rocksky/spotify.rs +++ b/crates/jacquard-api/src/app_rocksky/spotify.rs @@ -198,7 +198,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SpotifyTrackView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_rocksky/stats.rs b/crates/jacquard-api/src/app_rocksky/stats.rs index 4dfaf317..84358cd0 100644 --- a/crates/jacquard-api/src/app_rocksky/stats.rs +++ b/crates/jacquard-api/src/app_rocksky/stats.rs @@ -136,7 +136,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StatsView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs index b519991a..71a6ef88 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs @@ -117,12 +117,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -131,8 +133,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { { let value = &self.rating; if *value > 5i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), max: 5i64, actual: *value, }); @@ -141,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { { let value = &self.rating; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), min: 1i64, actual: *value, }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { if let Some(ref value) = self.title { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 100usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs index e29b5616..b8280585 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs @@ -123,12 +123,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Transaction<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.currency { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "currency", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "currency", + ), max: 10usize, actual: ::len(value.as_ref()), }); @@ -137,8 +139,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Transaction<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -148,8 +152,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Transaction<'a> { let value = &self.transaction_id; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "transaction_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "transaction_id", + ), max: 128usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs index 8462d3ee..dec1aa26 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs @@ -119,12 +119,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Warrant<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/blog_pckt/blog.rs b/crates/jacquard-api/src/blog_pckt/blog.rs index 8bb1e396..6eaa6a5c 100644 --- a/crates/jacquard-api/src/blog_pckt/blog.rs +++ b/crates/jacquard-api/src/blog_pckt/blog.rs @@ -119,7 +119,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Blog<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -434,7 +434,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -475,7 +475,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Theme<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blog_pckt/post.rs b/crates/jacquard-api/src/blog_pckt/post.rs index 89399035..00229928 100644 --- a/crates/jacquard-api/src/blog_pckt/post.rs +++ b/crates/jacquard-api/src/blog_pckt/post.rs @@ -124,7 +124,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blog_pckt/publication.rs b/crates/jacquard-api/src/blog_pckt/publication.rs index 082939f9..e46bdbe5 100644 --- a/crates/jacquard-api/src/blog_pckt/publication.rs +++ b/crates/jacquard-api/src/blog_pckt/publication.rs @@ -129,12 +129,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publication<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -143,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publication<'a> { if let Some(ref value) = self.extensions { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "extensions", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "extensions", + ), max: 10usize, actual: value.len(), }); @@ -154,8 +158,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publication<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 200usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/blog_pckt/theme.rs b/crates/jacquard-api/src/blog_pckt/theme.rs index 178ff6f7..3efd83a2 100644 --- a/crates/jacquard-api/src/blog_pckt/theme.rs +++ b/crates/jacquard-api/src/blog_pckt/theme.rs @@ -105,12 +105,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Theme<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.font { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "font", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "font", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -359,13 +361,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.accent; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "accent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "accent", + ), max: 7usize, actual: ::len(value.as_ref()), }); @@ -375,8 +379,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { let value = &self.background; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "background", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "background", + ), max: 7usize, actual: ::len(value.as_ref()), }); @@ -386,8 +392,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { let value = &self.link; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "link", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "link", + ), max: 7usize, actual: ::len(value.as_ref()), }); @@ -397,8 +405,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { let value = &self.surface_hover; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "surface_hover", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "surface_hover", + ), max: 7usize, actual: ::len(value.as_ref()), }); @@ -408,8 +418,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Palette<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 7usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/blue__2048.rs b/crates/jacquard-api/src/blue__2048.rs index 0d734c09..d41cef77 100644 --- a/crates/jacquard-api/src/blue__2048.rs +++ b/crates/jacquard-api/src/blue__2048.rs @@ -150,7 +150,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SyncStatus<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/game.rs b/crates/jacquard-api/src/blue__2048/game.rs index f5dff641..381a6b59 100644 --- a/crates/jacquard-api/src/blue__2048/game.rs +++ b/crates/jacquard-api/src/blue__2048/game.rs @@ -108,7 +108,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Game<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/key.rs b/crates/jacquard-api/src/blue__2048/key.rs index 1e42328b..73e6ae82 100644 --- a/crates/jacquard-api/src/blue__2048/key.rs +++ b/crates/jacquard-api/src/blue__2048/key.rs @@ -196,7 +196,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Key<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -238,7 +238,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SignatureRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/key/game.rs b/crates/jacquard-api/src/blue__2048/key/game.rs index cf02289b..c6d12d67 100644 --- a/crates/jacquard-api/src/blue__2048/key/game.rs +++ b/crates/jacquard-api/src/blue__2048/key/game.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Game<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/key/player/stats.rs b/crates/jacquard-api/src/blue__2048/key/player/stats.rs index a6fdbddf..f44c586e 100644 --- a/crates/jacquard-api/src/blue__2048/key/player/stats.rs +++ b/crates/jacquard-api/src/blue__2048/key/player/stats.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/player/profile.rs b/crates/jacquard-api/src/blue__2048/player/profile.rs index 1fbad277..4eaecb07 100644 --- a/crates/jacquard-api/src/blue__2048/player/profile.rs +++ b/crates/jacquard-api/src/blue__2048/player/profile.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/player/stats.rs b/crates/jacquard-api/src/blue__2048/player/stats.rs index 80c3ee52..5d7ecce9 100644 --- a/crates/jacquard-api/src/blue__2048/player/stats.rs +++ b/crates/jacquard-api/src/blue__2048/player/stats.rs @@ -112,7 +112,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/verification.rs b/crates/jacquard-api/src/blue__2048/verification.rs index 71946276..90a132c6 100644 --- a/crates/jacquard-api/src/blue__2048/verification.rs +++ b/crates/jacquard-api/src/blue__2048/verification.rs @@ -195,7 +195,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/verification/game.rs b/crates/jacquard-api/src/blue__2048/verification/game.rs index 3b7f153b..8947fbf6 100644 --- a/crates/jacquard-api/src/blue__2048/verification/game.rs +++ b/crates/jacquard-api/src/blue__2048/verification/game.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Game<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue__2048/verification/stats.rs b/crates/jacquard-api/src/blue__2048/verification/stats.rs index 261cb0be..755477df 100644 --- a/crates/jacquard-api/src/blue__2048/verification/stats.rs +++ b/crates/jacquard-api/src/blue__2048/verification/stats.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue_atplane/fav_client.rs b/crates/jacquard-api/src/blue_atplane/fav_client.rs index 03322d00..e6a192b9 100644 --- a/crates/jacquard-api/src/blue_atplane/fav_client.rs +++ b/crates/jacquard-api/src/blue_atplane/fav_client.rs @@ -98,13 +98,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FavClient<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.fav_client; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "fav_client", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "fav_client", + ), max: 32usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/blue_linkat/board.rs b/crates/jacquard-api/src/blue_linkat/board.rs index ffcc6290..a793a144 100644 --- a/crates/jacquard-api/src/blue_linkat/board.rs +++ b/crates/jacquard-api/src/blue_linkat/board.rs @@ -162,7 +162,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Card<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -259,7 +259,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Board<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs index 215a96e4..a8670451 100644 --- a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs +++ b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs @@ -292,12 +292,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Locale<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.comment { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -311,8 +313,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Locale<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 10000usize, actual: count, }); @@ -323,8 +327,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Locale<'a> { let value = &self.lang; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 6usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "lang", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "lang", + ), max: 6usize, actual: ::len(value.as_ref()), }); @@ -334,8 +340,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Locale<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -350,8 +358,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Locale<'a> { ) .count(); if count > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 50usize, actual: count, }); @@ -477,13 +487,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bookmark<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.comments; #[allow(unused_comparisons)] if value.len() < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "comments", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comments", + ), min: 1usize, actual: value.len(), }); @@ -492,8 +504,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bookmark<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 10usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/blue_rito/feed/like.rs b/crates/jacquard-api/src/blue_rito/feed/like.rs index 8159980a..66177066 100644 --- a/crates/jacquard-api/src/blue_rito/feed/like.rs +++ b/crates/jacquard-api/src/blue_rito/feed/like.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue_rito/service/get_schema.rs b/crates/jacquard-api/src/blue_rito/service/get_schema.rs index 1d4d7cf6..f25fa7c9 100644 --- a/crates/jacquard-api/src/blue_rito/service/get_schema.rs +++ b/crates/jacquard-api/src/blue_rito/service/get_schema.rs @@ -191,7 +191,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Langs<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue_rito/service/schema.rs b/crates/jacquard-api/src/blue_rito/service/schema.rs index 0850ae93..16aff9f5 100644 --- a/crates/jacquard-api/src/blue_rito/service/schema.rs +++ b/crates/jacquard-api/src/blue_rito/service/schema.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Schema<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue_zio/atfile/finger.rs b/crates/jacquard-api/src/blue_zio/atfile/finger.rs index 0d443645..121bfe60 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/finger.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/finger.rs @@ -180,7 +180,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Browser<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -225,7 +225,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Machine<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue_zio/atfile/lock.rs b/crates/jacquard-api/src/blue_zio/atfile/lock.rs index ea03ed37..84bbf5d5 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/lock.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/lock.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Lock<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/blue_zio/atfile/meta.rs b/crates/jacquard-api/src/blue_zio/atfile/meta.rs index ba1619da..4ca796cd 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/meta.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/meta.rs @@ -83,7 +83,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Unknown<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/buzz_bookhive.rs b/crates/jacquard-api/src/buzz_bookhive.rs index b3a143bd..27302f38 100644 --- a/crates/jacquard-api/src/buzz_bookhive.rs +++ b/crates/jacquard-api/src/buzz_bookhive.rs @@ -799,7 +799,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Activity<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -849,13 +849,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.comment; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -870,8 +872,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 10000usize, actual: count, }); @@ -961,12 +965,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.books_read; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "books_read", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "books_read", + ), min: 0i64, actual: *value, }); @@ -975,8 +981,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { { let value = &self.reviews; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "reviews", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "reviews", + ), min: 0i64, actual: *value, }); @@ -1049,7 +1057,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1133,13 +1141,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2048usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), max: 2048usize, actual: ::len(value.as_ref()), }); @@ -1149,8 +1159,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -1159,8 +1171,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 5000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 5000usize, actual: ::len(value.as_ref()), }); @@ -1168,8 +1182,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { } if let Some(ref value) = self.rating { if *value > 1000i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), max: 1000i64, actual: *value, }); @@ -1177,8 +1193,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { } if let Some(ref value) = self.rating { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), min: 0i64, actual: *value, }); @@ -1192,8 +1210,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { ) .count(); if count > 15000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "review", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "review", + ), max: 15000usize, actual: count, }); @@ -1202,8 +1222,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { } if let Some(ref value) = self.stars { if *value > 10i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "stars", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stars", + ), max: 10i64, actual: *value, }); @@ -1211,8 +1233,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { } if let Some(ref value) = self.stars { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "stars", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stars", + ), min: 1i64, actual: *value, }); @@ -1222,8 +1246,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -1233,8 +1259,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UserBook<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/buzz_bookhive/book.rs b/crates/jacquard-api/src/buzz_bookhive/book.rs index b30f29a1..39deca55 100644 --- a/crates/jacquard-api/src/buzz_bookhive/book.rs +++ b/crates/jacquard-api/src/buzz_bookhive/book.rs @@ -133,13 +133,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2048usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), max: 2048usize, actual: ::len(value.as_ref()), }); @@ -149,8 +151,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -164,8 +168,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { ) .count(); if count > 15000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "review", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "review", + ), max: 15000usize, actual: count, }); @@ -174,8 +180,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { } if let Some(ref value) = self.stars { if *value > 10i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "stars", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stars", + ), max: 10i64, actual: *value, }); @@ -183,8 +191,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { } if let Some(ref value) = self.stars { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "stars", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stars", + ), min: 1i64, actual: *value, }); @@ -194,8 +204,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -205,8 +217,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/buzz_bookhive/buzz.rs b/crates/jacquard-api/src/buzz_bookhive/buzz.rs index 1074e34f..5df18017 100644 --- a/crates/jacquard-api/src/buzz_bookhive/buzz.rs +++ b/crates/jacquard-api/src/buzz_bookhive/buzz.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Buzz<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.comment; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Buzz<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "comment", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "comment", + ), max: 10000usize, actual: count, }); diff --git a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs index c41a77ba..881cee07 100644 --- a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs +++ b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs @@ -145,13 +145,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -161,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { let value = &self.authors; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "authors", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "authors", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -171,8 +175,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 5000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 5000usize, actual: ::len(value.as_ref()), }); @@ -180,8 +186,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { } if let Some(ref value) = self.rating { if *value > 1000i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), max: 1000i64, actual: *value, }); @@ -189,8 +197,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { } if let Some(ref value) = self.rating { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "rating", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rating", + ), min: 0i64, actual: *value, }); @@ -200,8 +210,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -211,8 +223,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HiveBook<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/chat_bsky/actor.rs b/crates/jacquard-api/src/chat_bsky/actor.rs index 1c0ce997..b4826db3 100644 --- a/crates/jacquard-api/src/chat_bsky/actor.rs +++ b/crates/jacquard-api/src/chat_bsky/actor.rs @@ -224,12 +224,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -243,8 +245,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs index 8a404edf..8fc2bb27 100644 --- a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs +++ b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Declaration<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/chat_bsky/convo.rs b/crates/jacquard-api/src/chat_bsky/convo.rs index e429d83c..0a8f039e 100644 --- a/crates/jacquard-api/src/chat_bsky/convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo.rs @@ -1296,7 +1296,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ConvoView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1337,7 +1337,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DeletedMessageView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1373,7 +1373,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogAcceptConvo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1434,7 +1434,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogAddReaction<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1470,7 +1470,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogBeginConvo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1529,7 +1529,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogCreateMessage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1588,7 +1588,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogDeleteMessage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1624,7 +1624,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogLeaveConvo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1660,7 +1660,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogMuteConvo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1719,7 +1719,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogReadMessage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1780,7 +1780,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogRemoveReaction<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1816,7 +1816,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogUnmuteConvo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1852,7 +1852,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageAndReactionView<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1893,13 +1893,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageInput<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -1914,8 +1916,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageInput<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 1000usize, actual: count, }); @@ -1961,7 +1965,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2019,13 +2023,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -2040,8 +2046,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageView<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 1000usize, actual: count, }); @@ -2081,7 +2089,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageViewSender<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2119,7 +2127,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReactionView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -2153,7 +2161,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReactionViewSender<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs index bca7aa0e..a760b8c8 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs @@ -137,7 +137,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BatchItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs index b973876b..7115bd55 100644 --- a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs +++ b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs @@ -226,7 +226,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Metadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/club_stellz/evm/address_control.rs b/crates/jacquard-api/src/club_stellz/evm/address_control.rs index 628e73ca..8de688fe 100644 --- a/crates/jacquard-api/src/club_stellz/evm/address_control.rs +++ b/crates/jacquard-api/src/club_stellz/evm/address_control.rs @@ -295,7 +295,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AddressControl<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -354,13 +354,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SiweMessage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.address; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 42usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "address", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "address", + ), max: 42usize, actual: ::len(value.as_ref()), }); @@ -370,8 +372,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SiweMessage<'a> { let value = &self.address; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 42usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "address", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "address", + ), min: 42usize, actual: ::len(value.as_ref()), }); @@ -381,8 +385,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SiweMessage<'a> { let value = &self.nonce; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "nonce", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nonce", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -392,8 +398,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SiweMessage<'a> { let value = &self.nonce; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 8usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "nonce", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nonce", + ), min: 8usize, actual: ::len(value.as_ref()), }); @@ -403,8 +411,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SiweMessage<'a> { let value = &self.statement; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 78usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "statement", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "statement", + ), min: 78usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/com_atproto/admin.rs b/crates/jacquard-api/src/com_atproto/admin.rs index 16bce334..a1c815a8 100644 --- a/crates/jacquard-api/src/com_atproto/admin.rs +++ b/crates/jacquard-api/src/com_atproto/admin.rs @@ -496,7 +496,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -536,7 +536,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoBlobRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -570,7 +570,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -607,7 +607,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StatusAttr<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -643,7 +643,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreatSignature<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/identity.rs b/crates/jacquard-api/src/com_atproto/identity.rs index 31567297..eb9f7f61 100644 --- a/crates/jacquard-api/src/com_atproto/identity.rs +++ b/crates/jacquard-api/src/com_atproto/identity.rs @@ -128,7 +128,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for IdentityInfo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/label.rs b/crates/jacquard-api/src/com_atproto/label.rs index ac4cc856..207d6bf7 100644 --- a/crates/jacquard-api/src/com_atproto/label.rs +++ b/crates/jacquard-api/src/com_atproto/label.rs @@ -559,13 +559,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Label<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.val; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "val", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "val", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -747,13 +749,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinition<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.identifier; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "identifier", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "identifier", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -768,8 +772,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinition<'a> ) .count(); if count > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "identifier", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "identifier", + ), max: 100usize, actual: count, }); @@ -818,13 +824,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinitionStrin } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.description; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -839,8 +847,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinitionStrin ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10000usize, actual: count, }); @@ -851,8 +861,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinitionStrin let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -867,8 +879,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LabelValueDefinitionStrin ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: count, }); @@ -910,13 +924,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SelfLabel<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.val; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "val", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "val", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -956,13 +972,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SelfLabels<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.values; #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "values", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "values", + ), max: 10usize, actual: value.len(), }); 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 fe5dbe6a..4963ebc6 100644 --- a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs +++ b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs @@ -171,7 +171,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Info<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -206,7 +206,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Labels<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs index 749adf89..ed034bcf 100644 --- a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs +++ b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Schema<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 00d35f2c..1861b43a 100644 --- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs +++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs @@ -309,7 +309,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModTool<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo.rs b/crates/jacquard-api/src/com_atproto/repo.rs index a45d239f..d56d532f 100644 --- a/crates/jacquard-api/src/com_atproto/repo.rs +++ b/crates/jacquard-api/src/com_atproto/repo.rs @@ -114,7 +114,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CommitMeta<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 48b37aac..cc976557 100644 --- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs +++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs @@ -506,12 +506,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Create<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.rkey { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "rkey", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rkey", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -556,7 +558,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CreateResult<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -595,7 +597,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Delete<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -625,7 +627,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DeleteResult<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -829,7 +831,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Update<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -869,7 +871,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UpdateResult<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs index 758df4ef..946c4889 100644 --- a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs +++ b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs @@ -217,7 +217,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordBlob<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo/list_records.rs b/crates/jacquard-api/src/com_atproto/repo/list_records.rs index 302fae2d..21921b78 100644 --- a/crates/jacquard-api/src/com_atproto/repo/list_records.rs +++ b/crates/jacquard-api/src/com_atproto/repo/list_records.rs @@ -287,7 +287,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Record<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs index aa26d2c8..97c017a0 100644 --- a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs +++ b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StrongRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/server.rs b/crates/jacquard-api/src/com_atproto/server.rs index 988de2ce..6ef7eecf 100644 --- a/crates/jacquard-api/src/com_atproto/server.rs +++ b/crates/jacquard-api/src/com_atproto/server.rs @@ -265,7 +265,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for InviteCode<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -300,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for InviteCodeUse<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 433ee48c..43181f8c 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 @@ -197,7 +197,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AppPassword<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs index d30e2963..c506d049 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs @@ -189,7 +189,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountCodes<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 762e65d7..385b9ee3 100644 --- a/crates/jacquard-api/src/com_atproto/server/describe_server.rs +++ b/crates/jacquard-api/src/com_atproto/server/describe_server.rs @@ -138,7 +138,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Contact<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -176,7 +176,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Links<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs index 36a391d7..9507a1cf 100644 --- a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs +++ b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs @@ -125,7 +125,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AppPassword<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 258d6d41..6341adbd 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs @@ -172,7 +172,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Host<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs index d7a4a7c3..70758cc8 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs @@ -274,7 +274,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs index d37bdbb5..9e1e4bf6 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs @@ -220,7 +220,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 59844dac..afddaacd 100644 --- a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs +++ b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs @@ -675,7 +675,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Account<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -737,13 +737,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Commit<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.ops; #[allow(unused_comparisons)] if value.len() > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "ops", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "ops", + ), max: 200usize, actual: value.len(), }); @@ -790,7 +792,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Identity<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -827,7 +829,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Info<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1027,7 +1029,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoOp<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1073,7 +1075,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Sync<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 984ef52e..07228c20 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 @@ -370,7 +370,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ResultAvailable<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -408,7 +408,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ResultUnavailable<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -446,7 +446,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Suggestion<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_crabdance/nandi/post.rs b/crates/jacquard-api/src/com_crabdance/nandi/post.rs index 9bb46cb6..ce5e485c 100644 --- a/crates/jacquard-api/src/com_crabdance/nandi/post.rs +++ b/crates/jacquard-api/src/com_crabdance/nandi/post.rs @@ -119,13 +119,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -135,8 +137,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -145,8 +149,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.summary { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "summary", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "summary", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -155,8 +161,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 10usize, actual: value.len(), }); @@ -166,8 +174,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -177,8 +187,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs index 7de944f8..e39fcb29 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs @@ -324,7 +324,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Author<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -382,12 +382,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HydratedOekaki<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 10usize, actual: value.len(), }); @@ -428,7 +430,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for OekakiTombstone<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs index 1a92d54a..a3da8a81 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs @@ -220,7 +220,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Image<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -257,7 +257,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ImageLink<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -369,12 +369,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Oekaki<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 10usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs index 968a57df..5c6520f5 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs @@ -114,12 +114,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.bio { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "bio", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "bio", + ), max: 2400usize, actual: ::len(value.as_ref()), }); @@ -133,8 +135,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 240usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "bio", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "bio", + ), max: 240usize, actual: count, }); @@ -144,8 +148,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), max: 5usize, actual: value.len(), }); @@ -154,8 +160,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.nickname { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "nickname", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nickname", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -169,8 +177,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "nickname", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nickname", + ), max: 64usize, actual: count, }); @@ -374,13 +384,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileLink<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -395,8 +407,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileLink<'a> { ) .count(); if count > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 50usize, actual: count, }); diff --git a/crates/jacquard-api/src/com_whtwnd/blog.rs b/crates/jacquard-api/src/com_whtwnd/blog.rs index 16e6c8a4..2a59eb61 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog.rs @@ -250,7 +250,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlobMetadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -286,13 +286,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlogEntry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -334,13 +336,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -385,7 +389,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Ogp<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs index 2adc3dea..754bf0db 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs @@ -129,13 +129,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -144,8 +146,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> { if let Some(ref value) = self.subtitle { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "subtitle", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "subtitle", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -154,8 +158,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> { if let Some(ref value) = self.title { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 1000usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs index 88e20224..99535411 100644 --- a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs +++ b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bookmark<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/community_lexicon/calendar/event.rs b/crates/jacquard-api/src/community_lexicon/calendar/event.rs index d74f6803..79d322af 100644 --- a/crates/jacquard-api/src/community_lexicon/calendar/event.rs +++ b/crates/jacquard-api/src/community_lexicon/calendar/event.rs @@ -212,7 +212,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Event<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -906,7 +906,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Uri<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs index b15d3d77..4d09dd37 100644 --- a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs +++ b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs @@ -135,7 +135,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rsvp<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/community_lexicon/interaction/like.rs b/crates/jacquard-api/src/community_lexicon/interaction/like.rs index 581187cf..4d874f7c 100644 --- a/crates/jacquard-api/src/community_lexicon/interaction/like.rs +++ b/crates/jacquard-api/src/community_lexicon/interaction/like.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/community_lexicon/location/address.rs b/crates/jacquard-api/src/community_lexicon/location/address.rs index bd135ac3..57ed4009 100644 --- a/crates/jacquard-api/src/community_lexicon/location/address.rs +++ b/crates/jacquard-api/src/community_lexicon/location/address.rs @@ -204,13 +204,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Address<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.country; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "country", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "country", + ), max: 10usize, actual: ::len(value.as_ref()), }); @@ -220,8 +222,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Address<'a> { let value = &self.country; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 2usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "country", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "country", + ), min: 2usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/community_lexicon/location/fsq.rs b/crates/jacquard-api/src/community_lexicon/location/fsq.rs index a790c63f..0a929d21 100644 --- a/crates/jacquard-api/src/community_lexicon/location/fsq.rs +++ b/crates/jacquard-api/src/community_lexicon/location/fsq.rs @@ -154,7 +154,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fsq<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 635f5e2b..ad59208d 100644 --- a/crates/jacquard-api/src/community_lexicon/location/geo.rs +++ b/crates/jacquard-api/src/community_lexicon/location/geo.rs @@ -147,7 +147,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Geo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 3f74f159..01c88999 100644 --- a/crates/jacquard-api/src/community_lexicon/location/hthree.rs +++ b/crates/jacquard-api/src/community_lexicon/location/hthree.rs @@ -112,7 +112,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Hthree<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs index 3747c520..82a54357 100644 --- a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs +++ b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for WebMonetization<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs index f419d16f..fe4cefef 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Calories<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs index f2b2c67e..018181f2 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs @@ -107,7 +107,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rings<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs index 86f6e871..0f17e24e 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs @@ -95,7 +95,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Steps<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs index dd2fd41c..30d20158 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs @@ -111,7 +111,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Workout<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs index 7e556b6b..65d66cf8 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs @@ -114,13 +114,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -141,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.tags; #[allow(unused_comparisons)] if value.len() > 20usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 20usize, actual: value.len(), }); @@ -152,8 +158,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -163,8 +171,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs index 9c69a097..7ed9fc55 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs @@ -103,13 +103,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Reply<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 10000usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs index c14d59cc..915d3df1 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs @@ -102,13 +102,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Announcement<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.body; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "body", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "body", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -118,8 +120,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Announcement<'a> { let value = &self.body; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "body", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "body", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -129,8 +133,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Announcement<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -140,8 +146,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Announcement<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs index f41c893f..a3ac42d0 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs @@ -106,13 +106,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Category<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.category_type; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 30usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "category_type", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "category_type", + ), max: 30usize, actual: ::len(value.as_ref()), }); @@ -121,8 +123,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Category<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -132,8 +136,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Category<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -143,8 +149,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Category<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs index 21037371..67b762e8 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs @@ -101,12 +101,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Group<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -116,8 +118,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Group<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -127,8 +131,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Group<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs index 186f069e..9625199d 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs @@ -105,12 +105,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Identity<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.accent { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "accent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "accent", + ), max: 7usize, actual: ::len(value.as_ref()), }); @@ -119,8 +121,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Identity<'a> { if let Some(ref value) = self.accent { #[allow(unused_comparisons)] if ::len(value.as_ref()) < 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "accent", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "accent", + ), min: 7usize, actual: ::len(value.as_ref()), }); @@ -129,8 +133,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Identity<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -140,8 +146,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Identity<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs index b404b73f..8e515f0c 100644 --- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs +++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs @@ -105,7 +105,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Board<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.description; { @@ -115,8 +115,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Board<'a> { ) .count(); if count > 30usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 30usize, actual: count, }); @@ -127,8 +129,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Board<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 10usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs index a893a740..1a9d7a9d 100644 --- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs +++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs @@ -107,13 +107,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 1000usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs index 7405cefc..6ad26975 100644 --- a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs +++ b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Savefile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor.rs b/crates/jacquard-api/src/fm_teal/alpha/actor.rs index 4d10d8b8..4e14998c 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/actor.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/actor.rs @@ -380,7 +380,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MiniProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -448,7 +448,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -490,7 +490,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StatusView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs index da457925..de3e6a17 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs @@ -234,7 +234,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeaturedItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -360,12 +360,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -379,8 +381,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -390,8 +394,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -405,8 +411,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs index eecf81ec..a195e292 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs @@ -106,7 +106,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileStatus<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs index 8b4cf4cc..752f3575 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Status<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed.rs b/crates/jacquard-api/src/fm_teal/alpha/feed.rs index be90b647..a71daf51 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/feed.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/feed.rs @@ -372,13 +372,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.artist_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "artist_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist_name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -388,8 +390,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { let value = &self.artist_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "artist_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist_name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -404,8 +408,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artist<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "artist_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "artist_name", + ), max: 2560usize, actual: count, }); @@ -498,12 +504,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.release_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "release_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -517,8 +525,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "release_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_name", + ), max: 2560usize, actual: count, }); @@ -528,8 +538,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { if let Some(ref value) = self.submission_client_agent { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "submission_client_agent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "submission_client_agent", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -543,8 +555,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "submission_client_agent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "submission_client_agent", + ), max: 2560usize, actual: count, }); @@ -555,8 +569,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { let value = &self.track_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -566,8 +582,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { let value = &self.track_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -582,8 +600,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlayView<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), max: 2560usize, actual: count, }); diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs index d504f55a..811deaad 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs @@ -170,12 +170,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.release_discriminant { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "release_discriminant", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_discriminant", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -189,8 +191,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { ) .count(); if count > 1280usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "release_discriminant", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_discriminant", + ), max: 1280usize, actual: count, }); @@ -200,8 +204,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { if let Some(ref value) = self.release_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "release_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -215,8 +221,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "release_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "release_name", + ), max: 2560usize, actual: count, }); @@ -226,8 +234,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { if let Some(ref value) = self.submission_client_agent { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "submission_client_agent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "submission_client_agent", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -241,8 +251,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "submission_client_agent", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "submission_client_agent", + ), max: 2560usize, actual: count, }); @@ -252,8 +264,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { if let Some(ref value) = self.track_discriminant { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "track_discriminant", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_discriminant", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -267,8 +281,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { ) .count(); if count > 1280usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "track_discriminant", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_discriminant", + ), max: 1280usize, actual: count, }); @@ -279,8 +295,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { let value = &self.track_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -290,8 +308,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { let value = &self.track_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -306,8 +326,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Play<'a> { ) .count(); if count > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "track_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "track_name", + ), max: 2560usize, actual: count, }); diff --git a/crates/jacquard-api/src/fm_teal/alpha/stats.rs b/crates/jacquard-api/src/fm_teal/alpha/stats.rs index 93f15d02..a8b705af 100644 --- a/crates/jacquard-api/src/fm_teal/alpha/stats.rs +++ b/crates/jacquard-api/src/fm_teal/alpha/stats.rs @@ -269,7 +269,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ArtistView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -311,7 +311,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordingView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -353,7 +353,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReleaseView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs index 79d99231..57babf19 100644 --- a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs +++ b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs @@ -105,13 +105,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.blocks; #[allow(unused_comparisons)] if value.len() > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "blocks", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "blocks", + ), max: 50usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs index 63b6e3d8..e176d12a 100644 --- a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs +++ b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs @@ -105,13 +105,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -126,8 +128,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 300usize, actual: count, }); @@ -296,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UrlSubject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs b/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs index f9fec1bb..4f6ec68c 100644 --- a/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs +++ b/crates/jacquard-api/src/fyi_frontpage/feed/vote.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Vote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs b/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs index 207789a7..3c549564 100644 --- a/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs +++ b/crates/jacquard-api/src/fyi_frontpage/richtext/block.rs @@ -104,7 +104,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Block<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -138,13 +138,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlaintextParagraph<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -159,8 +161,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PlaintextParagraph<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 10000usize, actual: count, }); diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs index 9a2daa96..c2eb5e17 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs @@ -106,13 +106,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -127,8 +129,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 10000usize, actual: count, }); diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs index 3cf89877..fe19f411 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs @@ -103,13 +103,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -124,8 +126,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 300usize, actual: count, }); diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs index 8844ec3d..054e1067 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Vote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs index 71519950..db1eb6c0 100644 --- a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs +++ b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs @@ -112,12 +112,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Paste<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.language { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "language", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "language", + ), max: 50usize, actual: ::len(value.as_ref()), }); @@ -126,8 +128,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Paste<'a> { if let Some(ref value) = self.title { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 200usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/my_skylights.rs b/crates/jacquard-api/src/my_skylights.rs index 3f1c145f..3719bf10 100644 --- a/crates/jacquard-api/src/my_skylights.rs +++ b/crates/jacquard-api/src/my_skylights.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Item<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 fce0bf63..e3ce826c 100644 --- a/crates/jacquard-api/src/my_skylights/list.rs +++ b/crates/jacquard-api/src/my_skylights/list.rs @@ -136,7 +136,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 4c551afd..f98a639f 100644 --- a/crates/jacquard-api/src/my_skylights/list_item.rs +++ b/crates/jacquard-api/src/my_skylights/list_item.rs @@ -236,7 +236,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Builtin<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -319,7 +319,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/my_skylights/rel.rs b/crates/jacquard-api/src/my_skylights/rel.rs index 07b1029a..f8838570 100644 --- a/crates/jacquard-api/src/my_skylights/rel.rs +++ b/crates/jacquard-api/src/my_skylights/rel.rs @@ -106,7 +106,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rel<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -344,7 +344,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Note<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -378,12 +378,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rating<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.value; if *value > 10i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "value", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "value", + ), max: 10i64, actual: *value, }); @@ -392,8 +394,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rating<'a> { { let value = &self.value; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "value", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "value", + ), min: 1i64, actual: *value, }); diff --git a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs index 559781ab..fb5dbd4e 100644 --- a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs +++ b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs @@ -97,13 +97,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Coolthingtwo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.status; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "status", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "status", + ), max: 32usize, actual: ::len(value.as_ref()), }); @@ -113,8 +115,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Coolthingtwo<'a> { let value = &self.status; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "status", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "status", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -129,8 +133,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Coolthingtwo<'a> { ) .count(); if count > 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "status", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "status", + ), max: 1usize, actual: count, }); diff --git a/crates/jacquard-api/src/net_altq/aqfile.rs b/crates/jacquard-api/src/net_altq/aqfile.rs index ceac98c5..0997aa63 100644 --- a/crates/jacquard-api/src/net_altq/aqfile.rs +++ b/crates/jacquard-api/src/net_altq/aqfile.rs @@ -303,13 +303,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Checksum<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.algo; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "algo", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "algo", + ), max: 32usize, actual: ::len(value.as_ref()), }); @@ -319,8 +321,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Checksum<'a> { let value = &self.hash; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "hash", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "hash", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -373,12 +377,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.mime_type { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 255usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "mime_type", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "mime_type", + ), max: 255usize, actual: ::len(value.as_ref()), }); @@ -388,8 +394,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 512usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 512usize, actual: ::len(value.as_ref()), }); @@ -398,8 +406,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> { { let value = &self.size; if *value > 1000000000i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "size", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "size", + ), max: 1000000000i64, actual: *value, }); @@ -408,8 +418,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> { { let value = &self.size; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "size", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "size", + ), min: 0i64, actual: *value, }); @@ -526,7 +538,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Aqfile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 b4999ed4..62af3b05 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs @@ -169,12 +169,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.common_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -183,8 +185,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { if let Some(ref value) = self.family { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "family", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "family", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -193,8 +197,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { if let Some(ref value) = self.genus { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "genus", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "genus", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -203,8 +209,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { { let value = &self.quantity; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "quantity", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "quantity", + ), min: 1i64, actual: *value, }); @@ -213,8 +221,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { if let Some(ref value) = self.scientific_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "scientific_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "scientific_name", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -223,8 +233,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -234,8 +246,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collection<'a> { let value = &self.specimen_id; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "specimen_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "specimen_id", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -798,7 +812,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SourceDetails<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -839,7 +853,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SpecimenData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 2d4be2e5..ba90eb6d 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs @@ -156,13 +156,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.item_id; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "item_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "item_id", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -171,8 +173,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { if let Some(ref value) = self.item_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "item_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "item_name", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -181,8 +185,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { if let Some(ref value) = self.item_type { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "item_type", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "item_type", + ), max: 50usize, actual: ::len(value.as_ref()), }); @@ -190,8 +196,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { } if let Some(ref value) = self.item_value { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "item_value", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "item_value", + ), min: 0i64, actual: *value, }); @@ -199,8 +207,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { } if let Some(ref value) = self.max_stack { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "max_stack", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "max_stack", + ), min: 1i64, actual: *value, }); @@ -209,8 +219,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Inventory<'a> { { let value = &self.quantity; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "quantity", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "quantity", + ), min: 1i64, actual: *value, }); @@ -629,7 +641,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SourceDetails<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 d7660a6e..5fb23713 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/log.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/log.rs @@ -982,11 +982,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CollectionData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.time_since_generation { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "time_since_generation", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "time_since_generation", + ), min: 0i64, actual: *value, }); @@ -994,8 +996,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CollectionData<'a> { } if let Some(ref value) = self.time_since_viewed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "time_since_viewed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "time_since_viewed", + ), min: 0i64, actual: *value, }); @@ -1047,11 +1051,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DailyRewardsData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.rewards_count { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "rewards_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "rewards_count", + ), min: 1i64, actual: *value, }); @@ -1059,8 +1065,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DailyRewardsData<'a> { } if let Some(ref value) = self.streak { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "streak", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "streak", + ), min: 1i64, actual: *value, }); @@ -1068,8 +1076,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DailyRewardsData<'a> { } if let Some(ref value) = self.time_since_last_claim { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "time_since_last_claim", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "time_since_last_claim", + ), min: 0i64, actual: *value, }); @@ -1120,11 +1130,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedContext<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.game_card_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "game_card_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "game_card_count", + ), min: 0i64, actual: *value, }); @@ -1132,8 +1144,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedContext<'a> { } if let Some(ref value) = self.post_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "post_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "post_count", + ), min: 0i64, actual: *value, }); @@ -1141,8 +1155,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedContext<'a> { } if let Some(ref value) = self.scroll_position { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "scroll_position", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "scroll_position", + ), min: 0i64, actual: *value, }); @@ -1206,11 +1222,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameCardData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.injection_position { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "injection_position", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "injection_position", + ), min: 0i64, actual: *value, }); @@ -1218,8 +1236,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameCardData<'a> { } if let Some(ref value) = self.quantity { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "quantity", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "quantity", + ), min: 1i64, actual: *value, }); @@ -1275,11 +1295,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ItemUsageData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.quantity_used { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "quantity_used", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "quantity_used", + ), min: 1i64, actual: *value, }); @@ -1287,8 +1309,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ItemUsageData<'a> { } if let Some(ref value) = self.remaining_quantity { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "remaining_quantity", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "remaining_quantity", + ), min: 0i64, actual: *value, }); @@ -1447,13 +1471,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Log<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.session_id; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "session_id", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "session_id", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -1508,11 +1534,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Metadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.network_latency { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "network_latency", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "network_latency", + ), min: 0i64, actual: *value, }); @@ -1558,11 +1586,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RewardItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.quantity { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "quantity", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "quantity", + ), min: 1i64, actual: *value, }); 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 f629dc72..9dfc460f 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs @@ -117,11 +117,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pack<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.longest_streak { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "longest_streak", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "longest_streak", + ), min: 0i64, actual: *value, }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pack<'a> { if let Some(ref value) = self.pack_history { #[allow(unused_comparisons)] if value.len() > 30usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "pack_history", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pack_history", + ), max: 30usize, actual: value.len(), }); @@ -140,8 +144,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pack<'a> { { let value = &self.streak; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "streak", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "streak", + ), min: 0i64, actual: *value, }); @@ -150,8 +156,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pack<'a> { { let value = &self.total_opens; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "total_opens", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "total_opens", + ), min: 0i64, actual: *value, }); @@ -505,7 +513,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PackHistoryEntry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -549,7 +557,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReceivedItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 945cc62a..942d2bae 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs @@ -152,12 +152,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Progress<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.level; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "level", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "level", + ), min: 1i64, actual: *value, }); @@ -165,8 +167,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Progress<'a> { } if let Some(ref value) = self.previous_level { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "previous_level", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "previous_level", + ), min: 1i64, actual: *value, }); @@ -175,8 +179,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Progress<'a> { { let value = &self.total_xp; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "total_xp", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "total_xp", + ), min: 0i64, actual: *value, }); @@ -184,8 +190,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Progress<'a> { } if let Some(ref value) = self.xp_gained_since_last_save { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "xp_gained_since_last_save", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "xp_gained_since_last_save", + ), min: 0i64, actual: *value, }); @@ -194,8 +202,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Progress<'a> { { let value = &self.xp_to_next_level; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "xp_to_next_level", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "xp_to_next_level", + ), min: 0i64, actual: *value, }); @@ -723,7 +733,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Metadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -782,11 +792,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.daily_rewards_claimed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "daily_rewards_claimed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "daily_rewards_claimed", + ), min: 0i64, actual: *value, }); @@ -794,8 +806,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.items_collected { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "items_collected", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "items_collected", + ), min: 0i64, actual: *value, }); @@ -803,8 +817,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.posts_read_today { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "posts_read_today", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "posts_read_today", + ), min: 0i64, actual: *value, }); @@ -812,8 +828,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.posts_read_total { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "posts_read_total", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "posts_read_total", + ), min: 0i64, actual: *value, }); @@ -821,8 +839,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.posts_viewed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "posts_viewed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "posts_viewed", + ), min: 0i64, actual: *value, }); @@ -830,8 +850,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.shuffles_performed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "shuffles_performed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "shuffles_performed", + ), min: 0i64, actual: *value, }); @@ -839,8 +861,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Stats<'a> { } if let Some(ref value) = self.specimens_collected { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "specimens_collected", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "specimens_collected", + ), min: 0i64, actual: *value, }); 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 5fd5a413..840e28c0 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/session.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/session.rs @@ -834,11 +834,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ActivitySummary<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.current_level { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "current_level", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "current_level", + ), min: 1i64, actual: *value, }); @@ -846,8 +848,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ActivitySummary<'a> { } if let Some(ref value) = self.current_xp { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "current_xp", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "current_xp", + ), min: 0i64, actual: *value, }); @@ -855,8 +859,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ActivitySummary<'a> { } if let Some(ref value) = self.total_events { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "total_events", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "total_events", + ), min: 0i64, actual: *value, }); @@ -864,8 +870,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ActivitySummary<'a> { } if let Some(ref value) = self.xp_gained_this_session { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "xp_gained_this_session", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "xp_gained_this_session", + ), min: 0i64, actual: *value, }); @@ -915,11 +923,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.daily_rewards_claimed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "daily_rewards_claimed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "daily_rewards_claimed", + ), min: 0i64, actual: *value, }); @@ -927,8 +937,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } if let Some(ref value) = self.feeds_loaded { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "feeds_loaded", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "feeds_loaded", + ), min: 0i64, actual: *value, }); @@ -936,8 +948,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } if let Some(ref value) = self.items_collected { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "items_collected", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "items_collected", + ), min: 0i64, actual: *value, }); @@ -945,8 +959,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } if let Some(ref value) = self.level_ups { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "level_ups", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "level_ups", + ), min: 0i64, actual: *value, }); @@ -954,8 +970,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } if let Some(ref value) = self.posts_viewed { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "posts_viewed", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "posts_viewed", + ), min: 0i64, actual: *value, }); @@ -963,8 +981,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> { } if let Some(ref value) = self.specimens_collected { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "specimens_collected", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "specimens_collected", + ), min: 0i64, actual: *value, }); @@ -1138,11 +1158,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Session<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.duration { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "duration", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "duration", + ), min: 0i64, actual: *value, }); @@ -1193,7 +1215,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Metadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1232,11 +1254,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PerformanceMetrics<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.average_response_time { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "average_response_time", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "average_response_time", + ), min: 0i64, actual: *value, }); @@ -1244,8 +1268,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PerformanceMetrics<'a> { } if let Some(ref value) = self.error_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "error_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "error_count", + ), min: 0i64, actual: *value, }); @@ -1298,7 +1324,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SessionContext<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/feed/draft.rs b/crates/jacquard-api/src/net_anisota/feed/draft.rs index 53d7c39f..5727f12c 100644 --- a/crates/jacquard-api/src/net_anisota/feed/draft.rs +++ b/crates/jacquard-api/src/net_anisota/feed/draft.rs @@ -156,12 +156,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Draft<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.langs { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "langs", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "langs", + ), max: 3usize, actual: value.len(), }); @@ -170,8 +172,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Draft<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 8usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 8usize, actual: value.len(), }); @@ -181,8 +185,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Draft<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -197,8 +203,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Draft<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 300usize, actual: count, }); @@ -485,7 +493,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/feed/like.rs b/crates/jacquard-api/src/net_anisota/feed/like.rs index 80a7eb2e..1ebb044d 100644 --- a/crates/jacquard-api/src/net_anisota/feed/like.rs +++ b/crates/jacquard-api/src/net_anisota/feed/like.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Like<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/net_anisota/feed/list.rs b/crates/jacquard-api/src/net_anisota/feed/list.rs index c9b70850..0d54ba44 100644 --- a/crates/jacquard-api/src/net_anisota/feed/list.rs +++ b/crates/jacquard-api/src/net_anisota/feed/list.rs @@ -115,12 +115,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -140,8 +144,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for List<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 10usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/net_anisota/feed/list_item.rs b/crates/jacquard-api/src/net_anisota/feed/list_item.rs index c8eb2ed2..84ab7aa9 100644 --- a/crates/jacquard-api/src/net_anisota/feed/list_item.rs +++ b/crates/jacquard-api/src/net_anisota/feed/list_item.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/net_anisota/feed/post.rs b/crates/jacquard-api/src/net_anisota/feed/post.rs index 7cd1ae37..26ee6055 100644 --- a/crates/jacquard-api/src/net_anisota/feed/post.rs +++ b/crates/jacquard-api/src/net_anisota/feed/post.rs @@ -152,12 +152,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.langs { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "langs", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "langs", + ), max: 3usize, actual: value.len(), }); @@ -166,8 +168,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 8usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 8usize, actual: value.len(), }); @@ -177,8 +181,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -193,8 +199,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 300usize, actual: count, }); @@ -458,7 +466,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/feed/repost.rs b/crates/jacquard-api/src/net_anisota/feed/repost.rs index 5ab8f220..a957fed1 100644 --- a/crates/jacquard-api/src/net_anisota/feed/repost.rs +++ b/crates/jacquard-api/src/net_anisota/feed/repost.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 a3886ce8..b47c639d 100644 --- a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs @@ -260,7 +260,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentTypes<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -378,12 +378,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListMute<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.reason { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "reason", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "reason", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -392,8 +394,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListMute<'a> { if let Some(ref value) = self.target_feeds { #[allow(unused_comparisons)] if value.len() > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "target_feeds", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "target_feeds", + ), max: 50usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/net_anisota/graph/mute.rs b/crates/jacquard-api/src/net_anisota/graph/mute.rs index 008a8ef0..fc753b91 100644 --- a/crates/jacquard-api/src/net_anisota/graph/mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/mute.rs @@ -260,7 +260,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentTypes<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -378,12 +378,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mute<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.reason { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "reason", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "reason", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -392,8 +394,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mute<'a> { if let Some(ref value) = self.target_feeds { #[allow(unused_comparisons)] if value.len() > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "target_feeds", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "target_feeds", + ), max: 50usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs index 02514f93..19b957dc 100644 --- a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs +++ b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.common_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 256usize, actual: count, }); @@ -136,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 256usize, actual: count, }); diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs index 51e7a382..71524cb3 100644 --- a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs +++ b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushroom<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.common_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushroom<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 256usize, actual: count, }); @@ -136,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushroom<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushroom<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 256usize, actual: count, }); diff --git a/crates/jacquard-api/src/net_bnewbold/m.rs b/crates/jacquard-api/src/net_bnewbold/m.rs index e02ed945..71734ce4 100644 --- a/crates/jacquard-api/src/net_bnewbold/m.rs +++ b/crates/jacquard-api/src/net_bnewbold/m.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for M<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.common_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for M<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 256usize, actual: count, }); @@ -136,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for M<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for M<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 256usize, actual: count, }); diff --git a/crates/jacquard-api/src/net_mmatt/right/now.rs b/crates/jacquard-api/src/net_mmatt/right/now.rs index 2af4cd66..e02428ea 100644 --- a/crates/jacquard-api/src/net_mmatt/right/now.rs +++ b/crates/jacquard-api/src/net_mmatt/right/now.rs @@ -105,7 +105,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Now<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/net_mmatt/vitals/car.rs b/crates/jacquard-api/src/net_mmatt/vitals/car.rs index 84111bcc..10abb265 100644 --- a/crates/jacquard-api/src/net_mmatt/vitals/car.rs +++ b/crates/jacquard-api/src/net_mmatt/vitals/car.rs @@ -121,7 +121,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Car<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/actor.rs b/crates/jacquard-api/src/network_slices/actor.rs index 13f3a31d..2ce82f41 100644 --- a/crates/jacquard-api/src/network_slices/actor.rs +++ b/crates/jacquard-api/src/network_slices/actor.rs @@ -171,12 +171,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -190,8 +192,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -201,8 +205,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -216,8 +222,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/network_slices/actor/profile.rs b/crates/jacquard-api/src/network_slices/actor/profile.rs index 0af3d74e..d0ecaaf4 100644 --- a/crates/jacquard-api/src/network_slices/actor/profile.rs +++ b/crates/jacquard-api/src/network_slices/actor/profile.rs @@ -111,12 +111,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -141,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -156,8 +162,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/network_slices/lexicon.rs b/crates/jacquard-api/src/network_slices/lexicon.rs index caf176d4..5c6323ae 100644 --- a/crates/jacquard-api/src/network_slices/lexicon.rs +++ b/crates/jacquard-api/src/network_slices/lexicon.rs @@ -119,12 +119,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Lexicon<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -134,8 +136,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Lexicon<'a> { let value = &self.nsid; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "nsid", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nsid", + ), max: 256usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/network_slices/slice.rs b/crates/jacquard-api/src/network_slices/slice.rs index 36af25a4..06e5e592 100644 --- a/crates/jacquard-api/src/network_slices/slice.rs +++ b/crates/jacquard-api/src/network_slices/slice.rs @@ -120,13 +120,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Slice<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.domain; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "domain", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "domain", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -136,8 +138,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Slice<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 256usize, actual: ::len(value.as_ref()), }); @@ -582,7 +586,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SliceView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -616,12 +620,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SparklinePoint<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.count; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "count", + ), min: 0i64, actual: *value, }); 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 985d1818..b7b14cd5 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_actors.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_actors.rs @@ -250,7 +250,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Actor<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs index 72404a20..61d4eb47 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs @@ -307,7 +307,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LogEntry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs index 232582f0..6cbdb1f3 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs @@ -387,7 +387,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for JobStatus<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -493,7 +493,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SyncJobResult<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs index 092cd770..9ff7f34f 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs @@ -516,7 +516,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for OauthClientDetails<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 9018203c..c4d3a6d3 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 @@ -295,7 +295,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for IndexedRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs index d5da2e57..b11efd3b 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs @@ -287,7 +287,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SparklineEntry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs index 6315f7be..2422dad4 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs @@ -217,7 +217,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CollectionSummary<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/slice/stats.rs b/crates/jacquard-api/src/network_slices/slice/stats.rs index 841ee5f1..c7d5164f 100644 --- a/crates/jacquard-api/src/network_slices/slice/stats.rs +++ b/crates/jacquard-api/src/network_slices/slice/stats.rs @@ -162,7 +162,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CollectionStats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/waitlist.rs b/crates/jacquard-api/src/network_slices/waitlist.rs index 63c5c244..676a8ad6 100644 --- a/crates/jacquard-api/src/network_slices/waitlist.rs +++ b/crates/jacquard-api/src/network_slices/waitlist.rs @@ -289,7 +289,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for InviteView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -332,7 +332,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RequestView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/waitlist/invite.rs b/crates/jacquard-api/src/network_slices/waitlist/invite.rs index 1ffdb8e6..fd952efc 100644 --- a/crates/jacquard-api/src/network_slices/waitlist/invite.rs +++ b/crates/jacquard-api/src/network_slices/waitlist/invite.rs @@ -106,7 +106,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Invite<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/network_slices/waitlist/request.rs b/crates/jacquard-api/src/network_slices/waitlist/request.rs index 8fb9e0a2..d1e2e49d 100644 --- a/crates/jacquard-api/src/network_slices/waitlist/request.rs +++ b/crates/jacquard-api/src/network_slices/waitlist/request.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Request<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/org_devcon/event/test.rs b/crates/jacquard-api/src/org_devcon/event/test.rs index 08e2588f..30882dca 100644 --- a/crates/jacquard-api/src/org_devcon/event/test.rs +++ b/crates/jacquard-api/src/org_devcon/event/test.rs @@ -119,7 +119,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Test<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs index c59bf871..6b9202d6 100644 --- a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs +++ b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fungus<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.common_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fungus<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 256usize, actual: count, }); @@ -136,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fungus<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fungus<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 256usize, actual: count, }); diff --git a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs index 995610d4..6944d41b 100644 --- a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs +++ b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.common_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "common_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "common_name", + ), max: 256usize, actual: count, }); @@ -136,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { if let Some(ref value) = self.species { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -151,8 +157,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mushies<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "species", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "species", + ), max: 256usize, actual: count, }); diff --git a/crates/jacquard-api/src/place_atwork/endorsement.rs b/crates/jacquard-api/src/place_atwork/endorsement.rs index ef13b541..8bb64478 100644 --- a/crates/jacquard-api/src/place_atwork/endorsement.rs +++ b/crates/jacquard-api/src/place_atwork/endorsement.rs @@ -111,13 +111,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Endorsement<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -132,8 +134,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Endorsement<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 1000usize, actual: count, }); diff --git a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs index 79fcc4db..0681e880 100644 --- a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs +++ b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for EndorsementProof<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_atwork/get_listings.rs b/crates/jacquard-api/src/place_atwork/get_listings.rs index 7d15890e..ec680cdc 100644 --- a/crates/jacquard-api/src/place_atwork/get_listings.rs +++ b/crates/jacquard-api/src/place_atwork/get_listings.rs @@ -191,7 +191,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListingRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_atwork/listing.rs b/crates/jacquard-api/src/place_atwork/listing.rs index bfc4db14..8375cafc 100644 --- a/crates/jacquard-api/src/place_atwork/listing.rs +++ b/crates/jacquard-api/src/place_atwork/listing.rs @@ -126,13 +126,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listing<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.description; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -147,8 +149,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listing<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10000usize, actual: count, }); @@ -159,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listing<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 200usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/place_atwork/profile.rs b/crates/jacquard-api/src/place_atwork/profile.rs index 896ababc..af2af7fc 100644 --- a/crates/jacquard-api/src/place_atwork/profile.rs +++ b/crates/jacquard-api/src/place_atwork/profile.rs @@ -170,12 +170,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -189,8 +191,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2000usize, actual: count, }); @@ -200,8 +204,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 200usize, actual: ::len(value.as_ref()), }); @@ -215,8 +221,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 200usize, actual: count, }); diff --git a/crates/jacquard-api/src/place_atwork/search_listings.rs b/crates/jacquard-api/src/place_atwork/search_listings.rs index e982294b..91da4300 100644 --- a/crates/jacquard-api/src/place_atwork/search_listings.rs +++ b/crates/jacquard-api/src/place_atwork/search_listings.rs @@ -174,7 +174,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListingRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_stream.rs b/crates/jacquard-api/src/place_stream.rs index 5850c0db..1c3e6ff7 100644 --- a/crates/jacquard-api/src/place_stream.rs +++ b/crates/jacquard-api/src/place_stream.rs @@ -218,7 +218,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlockView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -252,7 +252,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rendition<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -286,7 +286,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Renditions<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/broadcast.rs b/crates/jacquard-api/src/place_stream/broadcast.rs index f12258b1..067d7db8 100644 --- a/crates/jacquard-api/src/place_stream/broadcast.rs +++ b/crates/jacquard-api/src/place_stream/broadcast.rs @@ -128,7 +128,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BroadcastOriginView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/broadcast/origin.rs b/crates/jacquard-api/src/place_stream/broadcast/origin.rs index 9969dc3a..af046382 100644 --- a/crates/jacquard-api/src/place_stream/broadcast/origin.rs +++ b/crates/jacquard-api/src/place_stream/broadcast/origin.rs @@ -112,12 +112,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Origin<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.iroh_ticket { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2048usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "iroh_ticket", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "iroh_ticket", + ), max: 2048usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/place_stream/broadcast/syndication.rs b/crates/jacquard-api/src/place_stream/broadcast/syndication.rs index eca5b235..372ef3cf 100644 --- a/crates/jacquard-api/src/place_stream/broadcast/syndication.rs +++ b/crates/jacquard-api/src/place_stream/broadcast/syndication.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Syndication<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_stream/chat.rs b/crates/jacquard-api/src/place_stream/chat.rs index 06266fd4..e2046b37 100644 --- a/crates/jacquard-api/src/place_stream/chat.rs +++ b/crates/jacquard-api/src/place_stream/chat.rs @@ -207,7 +207,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/chat/gate.rs b/crates/jacquard-api/src/place_stream/chat/gate.rs index 7e40abca..5f2c37f5 100644 --- a/crates/jacquard-api/src/place_stream/chat/gate.rs +++ b/crates/jacquard-api/src/place_stream/chat/gate.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Gate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_stream/chat/message.rs b/crates/jacquard-api/src/place_stream/chat/message.rs index 8f413f21..ddc6bde9 100644 --- a/crates/jacquard-api/src/place_stream/chat/message.rs +++ b/crates/jacquard-api/src/place_stream/chat/message.rs @@ -112,13 +112,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Message<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -133,8 +135,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Message<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 300usize, actual: count, }); @@ -344,7 +348,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/chat/profile.rs b/crates/jacquard-api/src/place_stream/chat/profile.rs index e6600491..d778e453 100644 --- a/crates/jacquard-api/src/place_stream/chat/profile.rs +++ b/crates/jacquard-api/src/place_stream/chat/profile.rs @@ -135,12 +135,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.blue; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "blue", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "blue", + ), max: 255i64, actual: *value, }); @@ -149,8 +151,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { { let value = &self.blue; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "blue", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "blue", + ), min: 0i64, actual: *value, }); @@ -159,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { { let value = &self.green; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "green", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "green", + ), max: 255i64, actual: *value, }); @@ -169,8 +175,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { { let value = &self.green; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "green", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "green", + ), min: 0i64, actual: *value, }); @@ -179,8 +187,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { { let value = &self.red; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "red", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "red", + ), max: 255i64, actual: *value, }); @@ -189,8 +199,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> { { let value = &self.red; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "red", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "red", + ), min: 0i64, actual: *value, }); @@ -293,7 +305,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/key.rs b/crates/jacquard-api/src/place_stream/key.rs index b2d6b596..97b33f2b 100644 --- a/crates/jacquard-api/src/place_stream/key.rs +++ b/crates/jacquard-api/src/place_stream/key.rs @@ -105,13 +105,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Key<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.signing_key; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 57usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "signing_key", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "signing_key", + ), max: 57usize, actual: ::len(value.as_ref()), }); @@ -121,8 +123,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Key<'a> { let value = &self.signing_key; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 57usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "signing_key", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "signing_key", + ), min: 57usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/place_stream/livestream.rs b/crates/jacquard-api/src/place_stream/livestream.rs index 3c3251fd..01be45c3 100644 --- a/crates/jacquard-api/src/place_stream/livestream.rs +++ b/crates/jacquard-api/src/place_stream/livestream.rs @@ -401,7 +401,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LivestreamView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -531,13 +531,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Livestream<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 1400usize, actual: ::len(value.as_ref()), }); @@ -552,8 +554,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Livestream<'a> { ) .count(); if count > 140usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 140usize, actual: count, }); @@ -594,7 +598,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotificationSettings<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -655,7 +659,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for StreamplaceAnything<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -688,7 +692,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewerCount<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/metadata/configuration.rs b/crates/jacquard-api/src/place_stream/metadata/configuration.rs index 829c8c4a..e1c77c82 100644 --- a/crates/jacquard-api/src/place_stream/metadata/configuration.rs +++ b/crates/jacquard-api/src/place_stream/metadata/configuration.rs @@ -112,7 +112,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Configuration<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_stream/metadata/content_rights.rs b/crates/jacquard-api/src/place_stream/metadata/content_rights.rs index f4eb4e67..1348af48 100644 --- a/crates/jacquard-api/src/place_stream/metadata/content_rights.rs +++ b/crates/jacquard-api/src/place_stream/metadata/content_rights.rs @@ -369,7 +369,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentRights<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/metadata/content_warnings.rs b/crates/jacquard-api/src/place_stream/metadata/content_warnings.rs index ce0be7ac..12028ea7 100644 --- a/crates/jacquard-api/src/place_stream/metadata/content_warnings.rs +++ b/crates/jacquard-api/src/place_stream/metadata/content_warnings.rs @@ -258,7 +258,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentWarnings<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_stream/metadata/distribution_policy.rs b/crates/jacquard-api/src/place_stream/metadata/distribution_policy.rs index 7c5e9049..4d8f7a76 100644 --- a/crates/jacquard-api/src/place_stream/metadata/distribution_policy.rs +++ b/crates/jacquard-api/src/place_stream/metadata/distribution_policy.rs @@ -113,7 +113,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DistributionPolicy<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/richtext/facet.rs b/crates/jacquard-api/src/place_stream/richtext/facet.rs index 6c3867dc..2d3ebef1 100644 --- a/crates/jacquard-api/src/place_stream/richtext/facet.rs +++ b/crates/jacquard-api/src/place_stream/richtext/facet.rs @@ -118,7 +118,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Facet<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/segment.rs b/crates/jacquard-api/src/place_stream/segment.rs index 4eba035a..cc1e9e69 100644 --- a/crates/jacquard-api/src/place_stream/segment.rs +++ b/crates/jacquard-api/src/place_stream/segment.rs @@ -451,7 +451,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Audio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -485,7 +485,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Framerate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -625,7 +625,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Segment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -661,7 +661,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SegmentView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -705,7 +705,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/server.rs b/crates/jacquard-api/src/place_stream/server.rs index ebde6ffa..dfc18a38 100644 --- a/crates/jacquard-api/src/place_stream/server.rs +++ b/crates/jacquard-api/src/place_stream/server.rs @@ -415,13 +415,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RewriteRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.from; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "from", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "from", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -431,8 +433,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RewriteRule<'a> { let value = &self.from; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "from", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "from", + ), min: 1usize, actual: ::len(value.as_ref()), }); @@ -442,8 +446,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RewriteRule<'a> { let value = &self.to; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "to", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "to", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -537,12 +543,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webhook<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -551,8 +559,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webhook<'a> { if let Some(ref value) = self.name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -561,8 +571,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webhook<'a> { if let Some(ref value) = self.prefix { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "prefix", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "prefix", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -571,8 +583,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webhook<'a> { if let Some(ref value) = self.suffix { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "suffix", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "suffix", + ), max: 100usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/place_stream/server/settings.rs b/crates/jacquard-api/src/place_stream/server/settings.rs index eb61ff3f..ba4a6f4c 100644 --- a/crates/jacquard-api/src/place_stream/server/settings.rs +++ b/crates/jacquard-api/src/place_stream/server/settings.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Settings<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/place_wisp/fs.rs b/crates/jacquard-api/src/place_wisp/fs.rs index ac00387d..e25f4706 100644 --- a/crates/jacquard-api/src/place_wisp/fs.rs +++ b/crates/jacquard-api/src/place_wisp/fs.rs @@ -261,13 +261,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Directory<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.entries; #[allow(unused_comparisons)] if value.len() > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "entries", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "entries", + ), max: 500usize, actual: value.len(), }); @@ -328,13 +330,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 255usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 255usize, actual: ::len(value.as_ref()), }); @@ -377,7 +381,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -480,11 +484,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fs<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.file_count { if *value > 1000i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "file_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "file_count", + ), max: 1000i64, actual: *value, }); @@ -492,8 +498,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Fs<'a> { } if let Some(ref value) = self.file_count { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "file_count", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "file_count", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs index 35365b03..38c071b8 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Blockquote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs index a3d250d0..56dbe734 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs @@ -73,7 +73,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BskyPost<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 c06545cd..cbf205ec 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/code.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/code.rs @@ -121,7 +121,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Code<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 a64bb10d..7923893c 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/header.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/header.rs @@ -113,11 +113,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Header<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.level { if *value > 6i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "level", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "level", + ), max: 6i64, actual: *value, }); @@ -125,8 +127,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Header<'a> { } if let Some(ref value) = self.level { if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "level", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "level", + ), min: 1i64, actual: *value, }); 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 4e493f73..857ea294 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs @@ -58,7 +58,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HorizontalRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs index c15337dd..270b46da 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs @@ -95,11 +95,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Iframe<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.height { if *value > 1600i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "height", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "height", + ), max: 1600i64, actual: *value, }); @@ -107,8 +109,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Iframe<'a> { } if let Some(ref value) = self.height { if *value < 16i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "height", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "height", + ), min: 16i64, actual: *value, }); diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs index e21febd4..32c1c28a 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs @@ -143,7 +143,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -184,7 +184,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Image<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 75829618..586f5247 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/math.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/math.rs @@ -79,7 +79,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Math<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/page.rs b/crates/jacquard-api/src/pub_leaflet/blocks/page.rs index 73be06ab..831b515c 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/page.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/page.rs @@ -79,7 +79,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Page<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs b/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs index 65c57516..f6ecef2d 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/poll.rs @@ -73,7 +73,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Poll<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 d922a469..018d6a7a 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/text.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/text.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Text<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs index c86f482e..e142f962 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs @@ -142,7 +142,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -176,7 +176,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UnorderedList<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs index 7ef36bc9..99badfda 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs @@ -135,7 +135,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Website<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/comment.rs b/crates/jacquard-api/src/pub_leaflet/comment.rs index 2e2916b3..c7cc3905 100644 --- a/crates/jacquard-api/src/pub_leaflet/comment.rs +++ b/crates/jacquard-api/src/pub_leaflet/comment.rs @@ -255,7 +255,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LinearDocumentQuote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -371,7 +371,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -405,7 +405,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReplyRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/document.rs b/crates/jacquard-api/src/pub_leaflet/document.rs index f2b33028..5090c9c4 100644 --- a/crates/jacquard-api/src/pub_leaflet/document.rs +++ b/crates/jacquard-api/src/pub_leaflet/document.rs @@ -133,12 +133,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Document<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -152,8 +154,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Document<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 300usize, actual: count, }); @@ -164,8 +168,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Document<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1280usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 1280usize, actual: ::len(value.as_ref()), }); @@ -180,8 +186,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Document<'a> { ) .count(); if count > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 128usize, actual: count, }); diff --git a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs index 5ec491fe..8a1c5316 100644 --- a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs +++ b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Subscription<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs index 1946581a..43645b16 100644 --- a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs +++ b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs @@ -330,7 +330,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Block<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -368,7 +368,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Canvas<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -402,7 +402,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Position<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -438,7 +438,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Quote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 22a3ca3e..03421634 100644 --- a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs +++ b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs @@ -285,7 +285,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Block<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -323,7 +323,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LinearDocument<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -357,7 +357,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Position<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -393,7 +393,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Quote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs index 66b1b535..19f7ed1e 100644 --- a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs +++ b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs @@ -102,13 +102,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definition<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -123,8 +125,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definition<'a> { ) .count(); if count > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: count, }); @@ -276,12 +280,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DefinitionOption<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.text { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 500usize, actual: ::len(value.as_ref()), }); @@ -295,8 +301,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DefinitionOption<'a> { ) .count(); if count > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 50usize, actual: count, }); diff --git a/crates/jacquard-api/src/pub_leaflet/poll/vote.rs b/crates/jacquard-api/src/pub_leaflet/poll/vote.rs index e9713ffa..cc79fd70 100644 --- a/crates/jacquard-api/src/pub_leaflet/poll/vote.rs +++ b/crates/jacquard-api/src/pub_leaflet/poll/vote.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Vote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/pub_leaflet/publication.rs b/crates/jacquard-api/src/pub_leaflet/publication.rs index 7b4e86c9..36e415ca 100644 --- a/crates/jacquard-api/src/pub_leaflet/publication.rs +++ b/crates/jacquard-api/src/pub_leaflet/publication.rs @@ -117,12 +117,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publication<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -132,8 +134,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publication<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -417,7 +421,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Preferences<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -566,7 +570,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Theme<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs index 7863be17..52069999 100644 --- a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs +++ b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs @@ -311,7 +311,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bold<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -346,12 +346,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.byte_end; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_end", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_end", + ), min: 0i64, actual: *value, }); @@ -360,8 +362,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { { let value = &self.byte_start; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_start", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_start", + ), min: 0i64, actual: *value, }); @@ -397,7 +401,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Code<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -428,7 +432,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Highlight<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -464,7 +468,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Id<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -495,7 +499,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Italic<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -530,7 +534,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Link<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -598,7 +602,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Facet<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -629,7 +633,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Strikethrough<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -660,7 +664,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Underline<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs index 104558bd..f087958b 100644 --- a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs +++ b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BackgroundImage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/theme/color.rs b/crates/jacquard-api/src/pub_leaflet/theme/color.rs index 8ff525d2..330491ae 100644 --- a/crates/jacquard-api/src/pub_leaflet/theme/color.rs +++ b/crates/jacquard-api/src/pub_leaflet/theme/color.rs @@ -166,12 +166,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.b; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "b", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "b", + ), max: 255i64, actual: *value, }); @@ -180,8 +182,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { { let value = &self.b; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "b", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "b", + ), min: 0i64, actual: *value, }); @@ -190,8 +194,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { { let value = &self.g; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "g", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "g", + ), max: 255i64, actual: *value, }); @@ -200,8 +206,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { { let value = &self.g; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "g", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "g", + ), min: 0i64, actual: *value, }); @@ -210,8 +218,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { { let value = &self.r; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "r", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "r", + ), max: 255i64, actual: *value, }); @@ -220,8 +230,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgb<'a> { { let value = &self.r; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "r", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "r", + ), min: 0i64, actual: *value, }); @@ -262,12 +274,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.a; if *value > 100i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "a", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "a", + ), max: 100i64, actual: *value, }); @@ -276,8 +290,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.a; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "a", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "a", + ), min: 0i64, actual: *value, }); @@ -286,8 +302,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.b; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "b", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "b", + ), max: 255i64, actual: *value, }); @@ -296,8 +314,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.b; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "b", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "b", + ), min: 0i64, actual: *value, }); @@ -306,8 +326,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.g; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "g", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "g", + ), max: 255i64, actual: *value, }); @@ -316,8 +338,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.g; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "g", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "g", + ), min: 0i64, actual: *value, }); @@ -326,8 +350,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.r; if *value > 255i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "r", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "r", + ), max: 255i64, actual: *value, }); @@ -336,8 +362,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rgba<'a> { { let value = &self.r; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "r", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "r", + ), min: 0i64, actual: *value, }); diff --git a/crates/jacquard-api/src/sh_tangled/actor/profile.rs b/crates/jacquard-api/src/sh_tangled/actor/profile.rs index 685cafa6..8d410e76 100644 --- a/crates/jacquard-api/src/sh_tangled/actor/profile.rs +++ b/crates/jacquard-api/src/sh_tangled/actor/profile.rs @@ -119,12 +119,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -138,8 +140,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -149,8 +153,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), max: 5usize, actual: value.len(), }); @@ -159,8 +165,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), min: 0usize, actual: value.len(), }); @@ -169,8 +177,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.location { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 400usize, actual: ::len(value.as_ref()), }); @@ -184,8 +194,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 40usize, actual: count, }); @@ -195,8 +207,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.pinned_repositories { #[allow(unused_comparisons)] if value.len() > 6usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "pinned_repositories", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pinned_repositories", + ), max: 6usize, actual: value.len(), }); @@ -205,8 +219,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.pinned_repositories { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "pinned_repositories", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pinned_repositories", + ), min: 0usize, actual: value.len(), }); @@ -215,8 +231,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.stats { #[allow(unused_comparisons)] if value.len() > 2usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "stats", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stats", + ), max: 2usize, actual: value.len(), }); @@ -225,8 +243,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.stats { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "stats", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stats", + ), min: 0usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs index ac3e56bb..a6deb4f1 100644 --- a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs +++ b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Reaction<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/feed/star.rs b/crates/jacquard-api/src/sh_tangled/feed/star.rs index bd2276aa..cd408820 100644 --- a/crates/jacquard-api/src/sh_tangled/feed/star.rs +++ b/crates/jacquard-api/src/sh_tangled/feed/star.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Star<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } 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 06bcf741..6fce2dd0 100644 --- a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs +++ b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs @@ -400,7 +400,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CommitCountBreakdown<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -436,7 +436,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for IndividualEmailCommitCoun } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -472,7 +472,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for IndividualLanguageSize<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -509,7 +509,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LangBreakdown<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -627,13 +627,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.new_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "new_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "new_sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -643,8 +645,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { let value = &self.new_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "new_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "new_sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -654,8 +658,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { let value = &self.old_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "old_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "old_sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -665,8 +671,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { let value = &self.old_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "old_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "old_sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -676,8 +684,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { let value = &self.r#ref; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "ref", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "ref", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -692,8 +702,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RefUpdate<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "ref", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "ref", + ), max: 256usize, actual: count, }); @@ -738,7 +750,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Meta<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/graph/follow.rs b/crates/jacquard-api/src/sh_tangled/graph/follow.rs index 69c630fa..25bbf010 100644 --- a/crates/jacquard-api/src/sh_tangled/graph/follow.rs +++ b/crates/jacquard-api/src/sh_tangled/graph/follow.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Follow<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/knot.rs b/crates/jacquard-api/src/sh_tangled/knot.rs index c84cb802..c28ce738 100644 --- a/crates/jacquard-api/src/sh_tangled/knot.rs +++ b/crates/jacquard-api/src/sh_tangled/knot.rs @@ -98,7 +98,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Knot<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs index 414e2429..bef6b27e 100644 --- a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs +++ b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs @@ -286,13 +286,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PublicKey<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.key; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 4096usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "key", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "key", + ), max: 4096usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/sh_tangled/knot/member.rs b/crates/jacquard-api/src/sh_tangled/knot/member.rs index 0ad2004f..3c2639f7 100644 --- a/crates/jacquard-api/src/sh_tangled/knot/member.rs +++ b/crates/jacquard-api/src/sh_tangled/knot/member.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Member<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/label/definition.rs b/crates/jacquard-api/src/sh_tangled/label/definition.rs index f15a8efc..19f34528 100644 --- a/crates/jacquard-api/src/sh_tangled/label/definition.rs +++ b/crates/jacquard-api/src/sh_tangled/label/definition.rs @@ -113,7 +113,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definition<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.name; { @@ -123,8 +123,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definition<'a> { ) .count(); if count > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 40usize, actual: count, }); @@ -140,8 +142,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definition<'a> { ) .count(); if count < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 1usize, actual: count, }); @@ -410,7 +414,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ValueType<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/label/op.rs b/crates/jacquard-api/src/sh_tangled/label/op.rs index 46f01568..a28332f0 100644 --- a/crates/jacquard-api/src/sh_tangled/label/op.rs +++ b/crates/jacquard-api/src/sh_tangled/label/op.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Op<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -301,7 +301,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Operand<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 8308fd95..4d15826e 100644 --- a/crates/jacquard-api/src/sh_tangled/pipeline.rs +++ b/crates/jacquard-api/src/sh_tangled/pipeline.rs @@ -597,7 +597,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CloneOpts<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -694,7 +694,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pipeline<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -729,7 +729,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ManualTriggerData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -765,7 +765,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pair<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -805,13 +805,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PullRequestTriggerData<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.source_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "source_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "source_sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -821,8 +823,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PullRequestTriggerData<'a let value = &self.source_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "source_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "source_sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -865,13 +869,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PushTriggerData<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.new_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "new_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "new_sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -881,8 +887,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PushTriggerData<'a> { let value = &self.new_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "new_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "new_sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -892,8 +900,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PushTriggerData<'a> { let value = &self.old_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "old_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "old_sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -903,8 +913,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PushTriggerData<'a> { let value = &self.old_sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "old_sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "old_sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -958,7 +970,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TriggerMetadata<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1001,7 +1013,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TriggerRepo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -1044,7 +1056,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Workflow<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs index dc6a60ee..cd9aad11 100644 --- a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs +++ b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs @@ -114,7 +114,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Status<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/public_key.rs b/crates/jacquard-api/src/sh_tangled/public_key.rs index 50687876..6f771150 100644 --- a/crates/jacquard-api/src/sh_tangled/public_key.rs +++ b/crates/jacquard-api/src/sh_tangled/public_key.rs @@ -103,13 +103,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PublicKey<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.key; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 4096usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "key", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "key", + ), max: 4096usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/sh_tangled/repo.rs b/crates/jacquard-api/src/sh_tangled/repo.rs index aed6811d..7eef2d48 100644 --- a/crates/jacquard-api/src/sh_tangled/repo.rs +++ b/crates/jacquard-api/src/sh_tangled/repo.rs @@ -149,7 +149,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { { let count = ::unicode_segmentation::UnicodeSegmentation::graphemes( @@ -158,8 +158,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repo<'a> { ) .count(); if count > 140usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 140usize, actual: count, }); @@ -174,8 +176,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Repo<'a> { ) .count(); if count < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MinGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), min: 1usize, actual: count, }); diff --git a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs index 16f20a65..d8ee41e1 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs @@ -107,7 +107,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Artifact<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/blob.rs b/crates/jacquard-api/src/sh_tangled/repo/blob.rs index ac0059cf..2d42031a 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/blob.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/blob.rs @@ -326,7 +326,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LastCommit<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -527,7 +527,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Signature<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/branch.rs b/crates/jacquard-api/src/sh_tangled/repo/branch.rs index 010d7981..45b840e2 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/branch.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/branch.rs @@ -329,7 +329,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Signature<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs index 6a7b20f1..c1e23b79 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Collaborator<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs index 9d15280b..6cdbf144 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs @@ -293,7 +293,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Signature<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue.rs b/crates/jacquard-api/src/sh_tangled/repo/issue.rs index 3563b339..f81179ac 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue.rs @@ -106,7 +106,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Issue<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs index d8e98d29..0062788f 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs index 7300865f..bc3a3eba 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for State<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/languages.rs b/crates/jacquard-api/src/sh_tangled/repo/languages.rs index 6cb22d19..1172f089 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/languages.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/languages.rs @@ -250,7 +250,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Language<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs index bf00139d..0d334dec 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs @@ -244,13 +244,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Secret<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.key; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 50usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "key", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "key", + ), max: 50usize, actual: ::len(value.as_ref()), }); @@ -260,8 +262,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Secret<'a> { let value = &self.key; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "key", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "key", + ), min: 1usize, actual: ::len(value.as_ref()), }); 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 47001d5b..cdebe528 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs @@ -221,7 +221,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ConflictInfo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull.rs b/crates/jacquard-api/src/sh_tangled/repo/pull.rs index f0d429b9..bf007997 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull.rs @@ -113,7 +113,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Pull<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -384,13 +384,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Source<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "sha", + ), max: 40usize, actual: ::len(value.as_ref()), }); @@ -400,8 +402,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Source<'a> { let value = &self.sha; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "sha", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "sha", + ), min: 40usize, actual: ::len(value.as_ref()), }); @@ -443,7 +447,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Target<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs index 9845a55a..955bc4d4 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs index 8dfa10ea..66e703e5 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Status<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/repo/tree.rs b/crates/jacquard-api/src/sh_tangled/repo/tree.rs index 939ec7c9..64a931c3 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/tree.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/tree.rs @@ -361,7 +361,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LastCommit<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -547,7 +547,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Readme<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -597,7 +597,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TreeEntry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/spindle.rs b/crates/jacquard-api/src/sh_tangled/spindle.rs index 4c848c08..4f09680c 100644 --- a/crates/jacquard-api/src/sh_tangled/spindle.rs +++ b/crates/jacquard-api/src/sh_tangled/spindle.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Spindle<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/spindle/member.rs b/crates/jacquard-api/src/sh_tangled/spindle/member.rs index c43d949c..15657a48 100644 --- a/crates/jacquard-api/src/sh_tangled/spindle/member.rs +++ b/crates/jacquard-api/src/sh_tangled/spindle/member.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Member<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_tangled/string.rs b/crates/jacquard-api/src/sh_tangled/string.rs index e95011f3..25684cef 100644 --- a/crates/jacquard-api/src/sh_tangled/string.rs +++ b/crates/jacquard-api/src/sh_tangled/string.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledString<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.contents; { @@ -113,8 +113,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledString<'a> { ) .count(); if count < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinGraphemes { - field: "contents", + return Err(::jacquard_lexicon::validation::ConstraintError::MinGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "contents", + ), min: 1usize, actual: count, }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledString<'a> { ) .count(); if count > 280usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 280usize, actual: count, }); @@ -147,8 +151,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledString<'a> { ) .count(); if count > 140usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "filename", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "filename", + ), max: 140usize, actual: count, }); @@ -164,8 +170,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledString<'a> { ) .count(); if count < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinGraphemes { - field: "filename", + return Err(::jacquard_lexicon::validation::ConstraintError::MinGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "filename", + ), min: 1usize, actual: count, }); diff --git a/crates/jacquard-api/src/sh_weaver/actor.rs b/crates/jacquard-api/src/sh_weaver/actor.rs index 627bb72a..d8054334 100644 --- a/crates/jacquard-api/src/sh_weaver/actor.rs +++ b/crates/jacquard-api/src/sh_weaver/actor.rs @@ -543,12 +543,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Author<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -562,8 +564,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Author<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -622,7 +626,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileDataView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -694,12 +698,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -713,8 +719,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -724,8 +732,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -739,8 +749,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -750,8 +762,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), max: 5usize, actual: value.len(), }); @@ -760,8 +774,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), min: 0usize, actual: value.len(), }); @@ -770,8 +786,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.location { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 400usize, actual: ::len(value.as_ref()), }); @@ -785,8 +803,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 40usize, actual: count, }); @@ -853,12 +873,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -872,8 +894,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -883,8 +907,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), max: 5usize, actual: value.len(), }); @@ -893,8 +919,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), min: 0usize, actual: value.len(), }); @@ -903,8 +931,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.location { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 400usize, actual: ::len(value.as_ref()), }); @@ -918,8 +948,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { ) .count(); if count > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 40usize, actual: count, }); @@ -929,8 +961,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.pinned_repositories { #[allow(unused_comparisons)] if value.len() > 6usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "pinned_repositories", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pinned_repositories", + ), max: 6usize, actual: value.len(), }); @@ -939,8 +973,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.pinned_repositories { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "pinned_repositories", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "pinned_repositories", + ), min: 0usize, actual: value.len(), }); @@ -949,8 +985,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.stats { #[allow(unused_comparisons)] if value.len() > 2usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "stats", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stats", + ), max: 2usize, actual: value.len(), }); @@ -959,8 +997,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TangledProfileView<'a> { if let Some(ref value) = self.stats { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "stats", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "stats", + ), min: 0usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/sh_weaver/actor/profile.rs b/crates/jacquard-api/src/sh_weaver/actor/profile.rs index dc671c39..22b6abb4 100644 --- a/crates/jacquard-api/src/sh_weaver/actor/profile.rs +++ b/crates/jacquard-api/src/sh_weaver/actor/profile.rs @@ -137,12 +137,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -156,8 +158,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -167,8 +171,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -182,8 +188,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -193,8 +201,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), max: 5usize, actual: value.len(), }); @@ -203,8 +213,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.links { #[allow(unused_comparisons)] if value.len() < 0usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "links", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "links", + ), min: 0usize, actual: value.len(), }); @@ -213,8 +225,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.location { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 400usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 400usize, actual: ::len(value.as_ref()), }); @@ -228,8 +242,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 40usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "location", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "location", + ), max: 40usize, actual: count, }); diff --git a/crates/jacquard-api/src/sh_weaver/edit.rs b/crates/jacquard-api/src/sh_weaver/edit.rs index cd210060..b5b95f0f 100644 --- a/crates/jacquard-api/src/sh_weaver/edit.rs +++ b/crates/jacquard-api/src/sh_weaver/edit.rs @@ -150,7 +150,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DocRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -184,7 +184,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for EntryRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -218,7 +218,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotebookRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs index 47731738..a8918d93 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs @@ -317,7 +317,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContainerId<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -351,7 +351,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CursorSide<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -385,7 +385,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Id<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -489,7 +489,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Cursor<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -526,7 +526,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NormalContainerId<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -562,7 +562,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RootContainerId<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/edit/diff.rs b/crates/jacquard-api/src/sh_weaver/edit/diff.rs index b2569f67..92a9404f 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/diff.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/diff.rs @@ -100,7 +100,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Diff<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_weaver/edit/root.rs b/crates/jacquard-api/src/sh_weaver/edit/root.rs index b9fe8319..43b0116c 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/root.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/root.rs @@ -102,7 +102,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Root<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_weaver/embed.rs b/crates/jacquard-api/src/sh_weaver/embed.rs index 9c6398b6..ff2deb6d 100644 --- a/crates/jacquard-api/src/sh_weaver/embed.rs +++ b/crates/jacquard-api/src/sh_weaver/embed.rs @@ -144,7 +144,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PercentSize<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -179,7 +179,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PixelSize<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/embed/external.rs b/crates/jacquard-api/src/sh_weaver/embed/external.rs index 5a3d93b9..4484d891 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/external.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/external.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for External<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -307,13 +307,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ExternalRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.embeds; #[allow(unused_comparisons)] if value.len() > 48usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "embeds", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "embeds", + ), max: 48usize, actual: value.len(), }); @@ -352,7 +354,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -396,7 +398,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewExternal<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/embed/images.rs b/crates/jacquard-api/src/sh_weaver/embed/images.rs index 88be5027..7ea6c917 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/images.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/images.rs @@ -188,12 +188,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Image<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.blurhash { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "blurhash", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "blurhash", + ), max: 32usize, actual: ::len(value.as_ref()), }); @@ -232,13 +234,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Images<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.images; #[allow(unused_comparisons)] if value.len() > 48usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "images", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "images", + ), max: 48usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs index 8e12deca..9894c5ad 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs @@ -181,7 +181,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordWithMedia<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -261,7 +261,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/embed/records.rs b/crates/jacquard-api/src/sh_weaver/embed/records.rs index c05d0a6a..c9d20f6b 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/records.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/records.rs @@ -425,13 +425,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Records<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.records; #[allow(unused_comparisons)] if value.len() > 48usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "records", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "records", + ), max: 48usize, actual: value.len(), }); @@ -501,7 +503,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -538,7 +540,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewBlocked<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -573,7 +575,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewDetached<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -608,7 +610,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewNotFound<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -697,7 +699,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewRecord<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/embed/video.rs b/crates/jacquard-api/src/sh_weaver/embed/video.rs index 0bf0bdea..e14ee16b 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/video.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/video.rs @@ -255,7 +255,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Caption<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -303,12 +303,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.alt { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -322,8 +324,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 1000usize, actual: count, }); @@ -333,8 +337,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> { if let Some(ref value) = self.captions { #[allow(unused_comparisons)] if value.len() > 20usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "captions", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "captions", + ), max: 20usize, actual: value.len(), }); @@ -387,12 +393,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.alt { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -406,8 +414,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for View<'a> { ) .count(); if count > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "alt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "alt", + ), max: 1000usize, actual: count, }); diff --git a/crates/jacquard-api/src/sh_weaver/notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook.rs index 6b28cedb..92696f89 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook.rs @@ -541,7 +541,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AuthorListView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -575,7 +575,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BookEntryRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -619,7 +619,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BookEntryView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -656,7 +656,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ContentFormat<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -711,7 +711,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for EntryView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -762,7 +762,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotebookView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -801,7 +801,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RenderedView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs index c6bf26bb..cd03e67d 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs @@ -177,7 +177,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AuthorListItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -276,7 +276,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Authors<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/notebook/book.rs b/crates/jacquard-api/src/sh_weaver/notebook/book.rs index 00cd8d01..0a04d593 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/book.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/book.rs @@ -110,7 +110,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Book<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs index a02dc155..8da96f98 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs @@ -111,7 +111,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Chapter<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs index d6cc13d6..378b5df6 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs @@ -111,13 +111,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 200000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 200000usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/sh_weaver/publish/blob.rs b/crates/jacquard-api/src/sh_weaver/publish/blob.rs index dd8a26b0..012445a1 100644 --- a/crates/jacquard-api/src/sh_weaver/publish/blob.rs +++ b/crates/jacquard-api/src/sh_weaver/publish/blob.rs @@ -97,7 +97,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Blob<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_clippr/actor.rs b/crates/jacquard-api/src/social_clippr/actor.rs index 8a4082a3..b2b4dde4 100644 --- a/crates/jacquard-api/src/social_clippr/actor.rs +++ b/crates/jacquard-api/src/social_clippr/actor.rs @@ -307,12 +307,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 5000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 5000usize, actual: ::len(value.as_ref()), }); @@ -326,8 +328,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 500usize, actual: count, }); @@ -338,8 +342,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { let value = &self.display_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -354,8 +360,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); @@ -397,7 +405,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PublishingScopesPref<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_clippr/actor/profile.rs b/crates/jacquard-api/src/social_clippr/actor/profile.rs index 379d4695..a102f65c 100644 --- a/crates/jacquard-api/src/social_clippr/actor/profile.rs +++ b/crates/jacquard-api/src/social_clippr/actor/profile.rs @@ -110,12 +110,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 5000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 5000usize, actual: ::len(value.as_ref()), }); @@ -129,8 +131,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 500usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 500usize, actual: count, }); @@ -141,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { let value = &self.display_name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -157,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_clippr/feed.rs b/crates/jacquard-api/src/social_clippr/feed.rs index 4bc448f1..d463403b 100644 --- a/crates/jacquard-api/src/social_clippr/feed.rs +++ b/crates/jacquard-api/src/social_clippr/feed.rs @@ -274,7 +274,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ClipView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -321,7 +321,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TagView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_clippr/feed/clip.rs b/crates/jacquard-api/src/social_clippr/feed/clip.rs index 4df453a4..307bb7e9 100644 --- a/crates/jacquard-api/src/social_clippr/feed/clip.rs +++ b/crates/jacquard-api/src/social_clippr/feed/clip.rs @@ -127,13 +127,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.description; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 40960usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 40960usize, actual: ::len(value.as_ref()), }); @@ -148,8 +150,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { ) .count(); if count > 4096usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 4096usize, actual: count, }); @@ -159,8 +163,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { if let Some(ref value) = self.languages { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "languages", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "languages", + ), max: 5usize, actual: value.len(), }); @@ -169,8 +175,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { if let Some(ref value) = self.notes { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "notes", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "notes", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -184,8 +192,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "notes", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "notes", + ), max: 10000usize, actual: count, }); @@ -196,8 +206,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 20480usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 20480usize, actual: ::len(value.as_ref()), }); @@ -212,8 +224,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { ) .count(); if count > 2048usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 2048usize, actual: count, }); @@ -224,8 +238,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { let value = &self.url; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 20000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "url", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "url", + ), max: 20000usize, actual: ::len(value.as_ref()), }); @@ -240,8 +256,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { ) .count(); if count > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "url", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "url", + ), max: 2000usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_clippr/feed/tag.rs b/crates/jacquard-api/src/social_clippr/feed/tag.rs index 6c0f14ba..dfa96f45 100644 --- a/crates/jacquard-api/src/social_clippr/feed/tag.rs +++ b/crates/jacquard-api/src/social_clippr/feed/tag.rs @@ -110,12 +110,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.color { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 70usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "color", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "color", + ), max: 70usize, actual: ::len(value.as_ref()), }); @@ -129,8 +131,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { ) .count(); if count > 7usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "color", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "color", + ), max: 7usize, actual: count, }); @@ -140,8 +144,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 50000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 50000usize, actual: ::len(value.as_ref()), }); @@ -155,8 +161,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { ) .count(); if count > 5000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 5000usize, actual: count, }); @@ -167,8 +175,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -183,8 +193,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/action.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/action.rs index 0b599e07..d9d7f9a2 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/action.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/action.rs @@ -547,7 +547,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Action<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/aggregaterating.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/aggregaterating.rs index 6259b3e4..4dd84cce 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/aggregaterating.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/aggregaterating.rs @@ -356,7 +356,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Aggregaterating<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/alignmentobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/alignmentobject.rs index 95dd53b9..2d45157c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/alignmentobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/alignmentobject.rs @@ -300,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Alignmentobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/audience.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/audience.rs index 13bb8326..6df7595b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/audience.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/audience.rs @@ -300,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Audience<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/audioobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/audioobject.rs index 598db623..011ec838 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/audioobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/audioobject.rs @@ -2592,7 +2592,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Audioobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/brand.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/brand.rs index 7f610e16..3d2e9591 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/brand.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/brand.rs @@ -352,7 +352,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Brand<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/breadcrumblist.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/breadcrumblist.rs index a755bcba..8878475f 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/breadcrumblist.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/breadcrumblist.rs @@ -218,7 +218,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Breadcrumblist<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/categorycode.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/categorycode.rs index 1f6dc9bf..e84c826b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/categorycode.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/categorycode.rs @@ -327,7 +327,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Categorycode<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/certification.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/certification.rs index c62f1042..d1e1895c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/certification.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/certification.rs @@ -2447,7 +2447,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Certification<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/claim.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/claim.rs index c5f4b95a..f4c98340 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/claim.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/claim.rs @@ -2366,7 +2366,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Claim<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/clip.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/clip.rs index 23ab09ec..0310ba40 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/clip.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/clip.rs @@ -2537,7 +2537,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Clip<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/comment.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/comment.rs index 61948167..fd72894d 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/comment.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/comment.rs @@ -2346,7 +2346,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/correctioncomment.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/correctioncomment.rs index b382d1b1..3b40b722 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/correctioncomment.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/correctioncomment.rs @@ -2346,7 +2346,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Correctioncomment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/country.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/country.rs index 01df4e1f..17c701aa 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/country.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/country.rs @@ -1069,7 +1069,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Country<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/creativework.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/creativework.rs index d37ddb69..dfef9fc5 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/creativework.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/creativework.rs @@ -2288,7 +2288,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Creativework<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/creativeworkseason.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/creativeworkseason.rs index ddc62374..51f71306 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/creativeworkseason.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/creativeworkseason.rs @@ -2475,7 +2475,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Creativeworkseason<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/definedterm.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/definedterm.rs index b6887ca0..833e51a1 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/definedterm.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/definedterm.rs @@ -300,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Definedterm<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/demand.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/demand.rs index b7327a4b..3b4ab586 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/demand.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/demand.rs @@ -854,7 +854,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Demand<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/distance.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/distance.rs index 6fbfc54e..f1d0f106 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/distance.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/distance.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Distance<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/duration.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/duration.rs index c2ff94c3..3ad404bb 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/duration.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/duration.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Duration<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/energyconsumptiondetails.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/energyconsumptiondetails.rs index 780546cc..a66225ab 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/energyconsumptiondetails.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/energyconsumptiondetails.rs @@ -288,7 +288,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Energyconsumptiondetails< } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/episode.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/episode.rs index 5acb6b12..11425b9e 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/episode.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/episode.rs @@ -2545,7 +2545,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Episode<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/event.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/event.rs index 52dba0a7..daac3a98 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/event.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/event.rs @@ -1074,7 +1074,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Event<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/grant.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/grant.rs index 04a64e69..bf997fc0 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/grant.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/grant.rs @@ -362,7 +362,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Grant<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/howtosection.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/howtosection.rs index 4dbd72d7..a1d42500 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/howtosection.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/howtosection.rs @@ -118,7 +118,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Howtosection<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/howtostep.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/howtostep.rs index 8eac5146..d2ec927f 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/howtostep.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/howtostep.rs @@ -92,7 +92,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Howtostep<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/howtosupply.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/howtosupply.rs index e6d13c99..17c2a4ac 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/howtosupply.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/howtosupply.rs @@ -402,7 +402,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Howtosupply<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/howtotool.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/howtotool.rs index fad0a3bc..51e44c8b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/howtotool.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/howtotool.rs @@ -376,7 +376,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Howtotool<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/imageobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/imageobject.rs index 6e4860b3..8a2a871a 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/imageobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/imageobject.rs @@ -2617,7 +2617,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Imageobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/interactioncounter.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/interactioncounter.rs index daab0aaf..f8d12abc 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/interactioncounter.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/interactioncounter.rs @@ -357,7 +357,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Interactioncounter<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/iptcdigitalsourceenumeration.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/iptcdigitalsourceenumeration.rs index 9ef95d05..c8e6178a 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/iptcdigitalsourceenumeration.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/iptcdigitalsourceenumeration.rs @@ -203,7 +203,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Iptcdigitalsourceenumerat } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/itemlist.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/itemlist.rs index c83f466c..7f9d582f 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/itemlist.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/itemlist.rs @@ -349,7 +349,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Itemlist<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/language.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/language.rs index a58a048f..d0c5b402 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/language.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/language.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Language<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/listitem.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/listitem.rs index d6e028ac..b31f4f6c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/listitem.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/listitem.rs @@ -350,7 +350,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Listitem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/mass.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/mass.rs index a63a76d7..1c2bd605 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/mass.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/mass.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mass<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/mediaobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/mediaobject.rs index 1f872ff9..dc56027b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/mediaobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/mediaobject.rs @@ -2558,7 +2558,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mediaobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/merchantreturnpolicy.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/merchantreturnpolicy.rs index 5c0028a3..625acef7 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/merchantreturnpolicy.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/merchantreturnpolicy.rs @@ -590,7 +590,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Merchantreturnpolicy<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/monetaryamount.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/monetaryamount.rs index 8b00de79..d58c10df 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/monetaryamount.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/monetaryamount.rs @@ -316,7 +316,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Monetaryamount<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/musicgroup.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/musicgroup.rs index a50e7add..9f00243b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/musicgroup.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/musicgroup.rs @@ -1892,7 +1892,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Musicgroup<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/musicrecording.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/musicrecording.rs index 2312132e..14e6539d 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/musicrecording.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/musicrecording.rs @@ -2413,7 +2413,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Musicrecording<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/newsarticle.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/newsarticle.rs index 0be673a7..81e669f2 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/newsarticle.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/newsarticle.rs @@ -1235,7 +1235,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Newsarticle<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/nutritioninformation.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/nutritioninformation.rs index 642d7c99..51ba270c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/nutritioninformation.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/nutritioninformation.rs @@ -540,7 +540,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Nutritioninformation<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/offer.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/offer.rs index fd41ca6e..54eb9ff1 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/offer.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/offer.rs @@ -1206,7 +1206,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Offer<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/offeritemcondition.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/offeritemcondition.rs index 61c4844c..9898c1bb 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/offeritemcondition.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/offeritemcondition.rs @@ -295,7 +295,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Offeritemcondition<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/organization.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/organization.rs index 760fe0dd..95c4f010 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/organization.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/organization.rs @@ -1767,7 +1767,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Organization<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/performinggroup.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/performinggroup.rs index 7de681c8..dfb52158 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/performinggroup.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/performinggroup.rs @@ -1769,7 +1769,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Performinggroup<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/person.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/person.rs index 336661f4..8d2913eb 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/person.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/person.rs @@ -1534,7 +1534,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Person<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/physicalactivitycategory.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/physicalactivitycategory.rs index e91e7650..75e1c324 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/physicalactivitycategory.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/physicalactivitycategory.rs @@ -295,7 +295,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Physicalactivitycategory< } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/place.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/place.rs index a9c8de1a..de874cd1 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/place.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/place.rs @@ -1069,7 +1069,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Place<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/product.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/product.rs index 89a4995b..48f15c21 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/product.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/product.rs @@ -1302,7 +1302,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Product<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/productgroup.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/productgroup.rs index 807a46d2..2a03a3ff 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/productgroup.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/productgroup.rs @@ -1361,7 +1361,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Productgroup<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/productmodel.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/productmodel.rs index afe583be..5b818c52 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/productmodel.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/productmodel.rs @@ -1354,7 +1354,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Productmodel<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/propertyvalue.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/propertyvalue.rs index a5899cd8..1b890df1 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/propertyvalue.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/propertyvalue.rs @@ -408,7 +408,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Propertyvalue<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/publicationevent.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/publicationevent.rs index 1f48bb0c..062629a0 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/publicationevent.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/publicationevent.rs @@ -1126,7 +1126,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Publicationevent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/quantitativevalue.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/quantitativevalue.rs index 9deb1e1c..5cdabf57 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/quantitativevalue.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/quantitativevalue.rs @@ -372,7 +372,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Quantitativevalue<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/rating.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/rating.rs index ce45465e..ffb6ccb6 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/rating.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/rating.rs @@ -324,7 +324,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Rating<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/recipe.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/recipe.rs index 2e6c8db3..c1a369dc 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/recipe.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/recipe.rs @@ -2688,7 +2688,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Recipe<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/restricteddiet.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/restricteddiet.rs index 77ecac9a..076049a2 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/restricteddiet.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/restricteddiet.rs @@ -295,7 +295,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Restricteddiet<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/review.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/review.rs index 92fed4fe..017309c6 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/review.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/review.rs @@ -2479,7 +2479,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Review<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/service.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/service.rs index 987acce0..b6680a13 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/service.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/service.rs @@ -815,7 +815,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Service<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/sizespecification.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/sizespecification.rs index a7b0cf47..0e5fb27a 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/sizespecification.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/sizespecification.rs @@ -629,7 +629,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Sizespecification<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/socialmediaposting.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/socialmediaposting.rs index a4e86f61..598caafc 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/socialmediaposting.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/socialmediaposting.rs @@ -1211,7 +1211,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Socialmediaposting<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/speakablespecification.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/speakablespecification.rs index 78f03b17..bc554b7c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/speakablespecification.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/speakablespecification.rs @@ -190,7 +190,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Speakablespecification<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/textobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/textobject.rs index e2eebc7d..27480604 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/textobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/textobject.rs @@ -2558,7 +2558,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Textobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/thing.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/thing.rs index 96228732..2952536c 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/thing.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/thing.rs @@ -273,7 +273,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Thing<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/videoobject.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/videoobject.rs index b63d4a2e..07c957fa 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/videoobject.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/videoobject.rs @@ -2728,7 +2728,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Videoobject<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/webcontent.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/webcontent.rs index 20178fe4..346fc35b 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/webcontent.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/webcontent.rs @@ -2288,7 +2288,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webcontent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_flockfeeds/lexical/webpage.rs b/crates/jacquard-api/src/social_flockfeeds/lexical/webpage.rs index a2c6a062..e0b60127 100644 --- a/crates/jacquard-api/src/social_flockfeeds/lexical/webpage.rs +++ b/crates/jacquard-api/src/social_flockfeeds/lexical/webpage.rs @@ -2469,7 +2469,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Webpage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_grain.rs b/crates/jacquard-api/src/social_grain.rs index 54b91c8d..6e088e9b 100644 --- a/crates/jacquard-api/src/social_grain.rs +++ b/crates/jacquard-api/src/social_grain.rs @@ -97,12 +97,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.height; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "height", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "height", + ), min: 1i64, actual: *value, }); @@ -111,8 +113,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { { let value = &self.width; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "width", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "width", + ), min: 1i64, actual: *value, }); diff --git a/crates/jacquard-api/src/social_grain/actor.rs b/crates/jacquard-api/src/social_grain/actor.rs index 2e28545e..e065b272 100644 --- a/crates/jacquard-api/src/social_grain/actor.rs +++ b/crates/jacquard-api/src/social_grain/actor.rs @@ -208,12 +208,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -227,8 +229,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -238,8 +242,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -253,8 +259,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_grain/actor/profile.rs b/crates/jacquard-api/src/social_grain/actor/profile.rs index 2feae878..4a717322 100644 --- a/crates/jacquard-api/src/social_grain/actor/profile.rs +++ b/crates/jacquard-api/src/social_grain/actor/profile.rs @@ -111,12 +111,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 256usize, actual: count, }); @@ -141,8 +145,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { if let Some(ref value) = self.display_name { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -156,8 +162,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "display_name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "display_name", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_grain/favorite.rs b/crates/jacquard-api/src/social_grain/favorite.rs index 14bfed5b..a7521b14 100644 --- a/crates/jacquard-api/src/social_grain/favorite.rs +++ b/crates/jacquard-api/src/social_grain/favorite.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Favorite<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_grain/gallery.rs b/crates/jacquard-api/src/social_grain/gallery.rs index cda02648..25873e23 100644 --- a/crates/jacquard-api/src/social_grain/gallery.rs +++ b/crates/jacquard-api/src/social_grain/gallery.rs @@ -108,12 +108,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Gallery<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -123,8 +125,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Gallery<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -413,7 +417,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GalleryView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_grain/gallery/item.rs b/crates/jacquard-api/src/social_grain/gallery/item.rs index bdcec0af..c34bcc84 100644 --- a/crates/jacquard-api/src/social_grain/gallery/item.rs +++ b/crates/jacquard-api/src/social_grain/gallery/item.rs @@ -101,7 +101,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Item<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_grain/photo.rs b/crates/jacquard-api/src/social_grain/photo.rs index 9a7a1caf..55bdfdd2 100644 --- a/crates/jacquard-api/src/social_grain/photo.rs +++ b/crates/jacquard-api/src/social_grain/photo.rs @@ -108,7 +108,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Photo<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -675,7 +675,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ExifView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -730,7 +730,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PhotoView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_grain/photo/exif.rs b/crates/jacquard-api/src/social_grain/photo/exif.rs index 14acb447..8e12293f 100644 --- a/crates/jacquard-api/src/social_grain/photo/exif.rs +++ b/crates/jacquard-api/src/social_grain/photo/exif.rs @@ -132,7 +132,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Exif<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_pmsky/proposal.rs b/crates/jacquard-api/src/social_pmsky/proposal.rs index 0e25650a..4922c00b 100644 --- a/crates/jacquard-api/src/social_pmsky/proposal.rs +++ b/crates/jacquard-api/src/social_pmsky/proposal.rs @@ -137,13 +137,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Proposal<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.val; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "val", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "val", + ), max: 128usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/social_pmsky/vote.rs b/crates/jacquard-api/src/social_pmsky/vote.rs index 391fcbba..60419657 100644 --- a/crates/jacquard-api/src/social_pmsky/vote.rs +++ b/crates/jacquard-api/src/social_pmsky/vote.rs @@ -122,7 +122,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Vote<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/social_psky/actor/profile.rs b/crates/jacquard-api/src/social_psky/actor/profile.rs index d8469972..2cb19e9f 100644 --- a/crates/jacquard-api/src/social_psky/actor/profile.rs +++ b/crates/jacquard-api/src/social_psky/actor/profile.rs @@ -98,12 +98,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.nickname { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 320usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "nickname", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nickname", + ), max: 320usize, actual: ::len(value.as_ref()), }); @@ -117,8 +119,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Profile<'a> { ) .count(); if count > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "nickname", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "nickname", + ), max: 32usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_psky/chat/message.rs b/crates/jacquard-api/src/social_psky/chat/message.rs index d9a2229c..86422499 100644 --- a/crates/jacquard-api/src/social_psky/chat/message.rs +++ b/crates/jacquard-api/src/social_psky/chat/message.rs @@ -109,13 +109,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Message<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 20480usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 20480usize, actual: ::len(value.as_ref()), }); @@ -130,8 +132,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Message<'a> { ) .count(); if count > 2048usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 2048usize, actual: count, }); diff --git a/crates/jacquard-api/src/social_psky/chat/room.rs b/crates/jacquard-api/src/social_psky/chat/room.rs index 0813608e..cfccb726 100644 --- a/crates/jacquard-api/src/social_psky/chat/room.rs +++ b/crates/jacquard-api/src/social_psky/chat/room.rs @@ -119,12 +119,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.languages { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "languages", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "languages", + ), max: 3usize, actual: value.len(), }); @@ -134,8 +136,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 320usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 320usize, actual: ::len(value.as_ref()), }); @@ -150,8 +154,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { ) .count(); if count > 32usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 32usize, actual: count, }); @@ -161,8 +167,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { if let Some(ref value) = self.tags { #[allow(unused_comparisons)] if value.len() > 20usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "tags", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "tags", + ), max: 20usize, actual: value.len(), }); @@ -171,8 +179,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { if let Some(ref value) = self.topic { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2560usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "topic", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "topic", + ), max: 2560usize, actual: ::len(value.as_ref()), }); @@ -186,8 +196,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { ) .count(); if count > 256usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "topic", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "topic", + ), max: 256usize, actual: count, }); @@ -412,7 +424,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModlistRef<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 ed4a7c8e..82fe370a 100644 --- a/crates/jacquard-api/src/social_psky/richtext/facet.rs +++ b/crates/jacquard-api/src/social_psky/richtext/facet.rs @@ -248,12 +248,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.byte_end; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_end", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_end", + ), min: 0i64, actual: *value, }); @@ -262,8 +264,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ByteSlice<'a> { { let value = &self.byte_start; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "byte_start", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "byte_start", + ), min: 0i64, actual: *value, }); @@ -303,7 +307,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Link<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -361,7 +365,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Facet<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -396,7 +400,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Mention<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -431,13 +435,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.room; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 640usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "room", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "room", + ), max: 640usize, actual: ::len(value.as_ref()), }); @@ -452,8 +458,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Room<'a> { ) .count(); if count > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "room", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "room", + ), max: 64usize, actual: count, }); diff --git a/crates/jacquard-api/src/tools_ozone/communication.rs b/crates/jacquard-api/src/tools_ozone/communication.rs index fa33dde5..f3224bf0 100644 --- a/crates/jacquard-api/src/tools_ozone/communication.rs +++ b/crates/jacquard-api/src/tools_ozone/communication.rs @@ -263,7 +263,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TemplateView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 04e333e1..03814026 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 @@ -360,7 +360,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountCreated<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -394,7 +394,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for EmailConfirmed<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -428,7 +428,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for EmailUpdated<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -501,7 +501,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Event<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -535,7 +535,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for HandleUpdated<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -637,7 +637,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for PasswordUpdated<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 7a3cf56f..410b32ec 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation.rs @@ -4328,7 +4328,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4372,7 +4372,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountHosting<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4420,7 +4420,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AccountStats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4483,7 +4483,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AgeAssuranceEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4522,7 +4522,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AgeAssuranceOverrideEvent } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4588,7 +4588,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for BlobView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4624,7 +4624,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CancelScheduledTakedownEv } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4673,7 +4673,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for IdentityEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4707,7 +4707,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ImageDetails<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4745,7 +4745,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventAcknowledge<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4784,7 +4784,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventComment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4820,7 +4820,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventDivert<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4864,7 +4864,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventEmail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4899,7 +4899,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventEscalate<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4944,7 +4944,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventLabel<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -4983,7 +4983,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventMute<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5022,7 +5022,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventMuteReporter<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5060,12 +5060,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventPriorityScore<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.score; if *value > 100i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "score", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "score", + ), max: 100i64, actual: *value, }); @@ -5074,8 +5076,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventPriorityScore<'a> { let value = &self.score; if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "score", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "score", + ), min: 0i64, actual: *value, }); @@ -5123,7 +5127,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventReport<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5160,7 +5164,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventResolveAppeal<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5197,7 +5201,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventReverseTakedown<' } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5241,7 +5245,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventTag<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5287,12 +5291,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventTakedown<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.policies { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "policies", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "policies", + ), max: 5usize, actual: value.len(), }); @@ -5334,7 +5340,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventUnmute<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5371,7 +5377,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventUnmuteReporter<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5525,7 +5531,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5673,7 +5679,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventViewDetail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5713,7 +5719,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModTool<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5750,7 +5756,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Moderation<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5787,7 +5793,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModerationDetail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5832,7 +5838,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5872,7 +5878,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordHosting<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5917,7 +5923,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -5966,7 +5972,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordViewDetail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6000,7 +6006,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordViewNotFound<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6057,7 +6063,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordsStats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6120,7 +6126,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6194,7 +6200,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoViewDetail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6228,7 +6234,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoViewNotFound<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6278,7 +6284,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ReporterStats<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6387,7 +6393,7 @@ for RevokeAccountCredentialsEvent<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6429,7 +6435,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScheduleTakedownEvent<'a> } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6518,7 +6524,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScheduledActionView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6760,11 +6766,13 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SubjectStatusView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.priority_score { if *value > 100i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: "priority_score", + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "priority_score", + ), max: 100i64, actual: *value, }); @@ -6772,8 +6780,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SubjectStatusView<'a> { } if let Some(ref value) = self.priority_score { if *value < 0i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "priority_score", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "priority_score", + ), min: 0i64, actual: *value, }); @@ -6832,7 +6842,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SubjectView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -6921,7 +6931,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VideoDetails<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs index 078aa486..e39a615d 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs @@ -266,7 +266,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CancellationResults<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -307,7 +307,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FailedCancellation<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs index cef4978c..357a99f9 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs @@ -300,7 +300,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TimelineItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -339,7 +339,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for TimelineItemSummary<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 3ccd7e42..ff9e88f0 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs @@ -459,7 +459,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FailedScheduling<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -581,7 +581,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ScheduledActionResults<'a } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -623,7 +623,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SchedulingConfig<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -669,12 +669,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Takedown<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.policies { #[allow(unused_comparisons)] if value.len() > 5usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "policies", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "policies", + ), max: 5usize, actual: value.len(), }); diff --git a/crates/jacquard-api/src/tools_ozone/safelink.rs b/crates/jacquard-api/src/tools_ozone/safelink.rs index ba954dd7..0e9f2209 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink.rs @@ -522,7 +522,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Event<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -820,7 +820,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for UrlRule<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file 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 c9da9d4f..6ff2001d 100644 --- a/crates/jacquard-api/src/tools_ozone/server/get_config.rs +++ b/crates/jacquard-api/src/tools_ozone/server/get_config.rs @@ -189,7 +189,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ServiceConfig<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -224,7 +224,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ViewerConfig<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ 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 de3255a4..0804b402 100644 --- a/crates/jacquard-api/src/tools_ozone/set.rs +++ b/crates/jacquard-api/src/tools_ozone/set.rs @@ -207,12 +207,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Set<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10240usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10240usize, actual: ::len(value.as_ref()), }); @@ -226,8 +228,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Set<'a> { ) .count(); if count > 1024usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1024usize, actual: count, }); @@ -238,8 +242,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Set<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -249,8 +255,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Set<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 3usize, actual: ::len(value.as_ref()), }); @@ -297,12 +305,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SetView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10240usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10240usize, actual: ::len(value.as_ref()), }); @@ -316,8 +326,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SetView<'a> { ) .count(); if count > 1024usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1024usize, actual: count, }); @@ -328,8 +340,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SetView<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 128usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 128usize, actual: ::len(value.as_ref()), }); @@ -339,8 +353,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SetView<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), min: 3usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/tools_ozone/setting.rs b/crates/jacquard-api/src/tools_ozone/setting.rs index 6e1be6ee..7862e77e 100644 --- a/crates/jacquard-api/src/tools_ozone/setting.rs +++ b/crates/jacquard-api/src/tools_ozone/setting.rs @@ -265,12 +265,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DefsOption<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10240usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10240usize, actual: ::len(value.as_ref()), }); @@ -284,8 +286,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DefsOption<'a> { ) .count(); if count > 1024usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 1024usize, actual: count, }); diff --git a/crates/jacquard-api/src/tools_ozone/signature.rs b/crates/jacquard-api/src/tools_ozone/signature.rs index 711c2e89..2db98abd 100644 --- a/crates/jacquard-api/src/tools_ozone/signature.rs +++ b/crates/jacquard-api/src/tools_ozone/signature.rs @@ -103,7 +103,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SigDetail<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs index ae419f22..341e360d 100644 --- a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs +++ b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs @@ -230,7 +230,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RelatedAccount<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/team.rs b/crates/jacquard-api/src/tools_ozone/team.rs index ee68f0e6..a7f2f5bc 100644 --- a/crates/jacquard-api/src/tools_ozone/team.rs +++ b/crates/jacquard-api/src/tools_ozone/team.rs @@ -220,7 +220,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Member<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-api/src/tools_ozone/verification.rs b/crates/jacquard-api/src/tools_ozone/verification.rs index 8e0f7bb0..db4aa427 100644 --- a/crates/jacquard-api/src/tools_ozone/verification.rs +++ b/crates/jacquard-api/src/tools_ozone/verification.rs @@ -405,7 +405,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationView<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs index 3e0b7be6..c53b6ead 100644 --- a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs +++ b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs @@ -275,7 +275,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GrantError<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -395,7 +395,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for VerificationInput<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs index 423acd98..1cef2066 100644 --- a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs +++ b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs @@ -282,7 +282,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RevokeError<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs index 33302449..26d0168f 100644 --- a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs +++ b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs @@ -199,7 +199,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Attachment<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -315,12 +315,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.langs { #[allow(unused_comparisons)] if value.len() > 3usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "langs", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "langs", + ), max: 3usize, actual: value.len(), }); @@ -329,8 +331,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.title { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 2000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 2000usize, actual: ::len(value.as_ref()), }); @@ -344,8 +348,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 200usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 200usize, actual: count, }); diff --git a/crates/jacquard-api/src/uk_ewancroft/now.rs b/crates/jacquard-api/src/uk_ewancroft/now.rs index 9b943410..22c84803 100644 --- a/crates/jacquard-api/src/uk_ewancroft/now.rs +++ b/crates/jacquard-api/src/uk_ewancroft/now.rs @@ -99,13 +99,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Now<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 64usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 64usize, actual: ::len(value.as_ref()), }); @@ -115,8 +117,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Now<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) < 1usize { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), min: 1usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/uk_skyblur/post.rs b/crates/jacquard-api/src/uk_skyblur/post.rs index 9156b92a..5efaef54 100644 --- a/crates/jacquard-api/src/uk_skyblur/post.rs +++ b/crates/jacquard-api/src/uk_skyblur/post.rs @@ -120,12 +120,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.additional { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "additional", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "additional", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -139,8 +141,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "additional", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "additional", + ), max: 10000usize, actual: count, }); @@ -151,8 +155,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.text; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 3000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 3000usize, actual: ::len(value.as_ref()), }); @@ -167,8 +173,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "text", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "text", + ), max: 300usize, actual: count, }); @@ -179,8 +187,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.visibility; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "visibility", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "visibility", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -195,8 +205,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { ) .count(); if count > 10usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "visibility", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "visibility", + ), max: 10usize, actual: count, }); diff --git a/crates/jacquard-api/src/uk_skyblur/preference.rs b/crates/jacquard-api/src/uk_skyblur/preference.rs index 3274bd0a..d03e09f3 100644 --- a/crates/jacquard-api/src/uk_skyblur/preference.rs +++ b/crates/jacquard-api/src/uk_skyblur/preference.rs @@ -96,7 +96,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Preference<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } @@ -233,12 +233,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MyPage<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { if let Some(ref value) = self.description { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 10000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 10000usize, actual: ::len(value.as_ref()), }); @@ -252,8 +254,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MyPage<'a> { ) .count(); if count > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 100000usize, actual: count, }); diff --git a/crates/jacquard-api/src/us_polhem/blog.rs b/crates/jacquard-api/src/us_polhem/blog.rs index ecdddb27..9eb771d7 100644 --- a/crates/jacquard-api/src/us_polhem/blog.rs +++ b/crates/jacquard-api/src/us_polhem/blog.rs @@ -98,12 +98,14 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.height; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "height", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "height", + ), min: 1i64, actual: *value, }); @@ -112,8 +114,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for AspectRatio<'a> { { let value = &self.width; if *value < 1i64 { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: "width", + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "width", + ), min: 1i64, actual: *value, }); diff --git a/crates/jacquard-api/src/us_polhem/blog/content.rs b/crates/jacquard-api/src/us_polhem/blog/content.rs index 84b49adf..5393f6f2 100644 --- a/crates/jacquard-api/src/us_polhem/blog/content.rs +++ b/crates/jacquard-api/src/us_polhem/blog/content.rs @@ -105,13 +105,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Content<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -121,8 +123,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Content<'a> { let value = &self.slug; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "slug", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "slug", + ), max: 100usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/us_polhem/blog/post.rs b/crates/jacquard-api/src/us_polhem/blog/post.rs index 2cc95735..e8a7fb24 100644 --- a/crates/jacquard-api/src/us_polhem/blog/post.rs +++ b/crates/jacquard-api/src/us_polhem/blog/post.rs @@ -125,13 +125,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.content; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "content", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "content", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -140,8 +142,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { if let Some(ref value) = self.excerpt { #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "excerpt", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "excerpt", + ), max: 1000usize, actual: ::len(value.as_ref()), }); @@ -151,8 +155,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.slug; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "slug", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "slug", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -162,8 +168,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Post<'a> { let value = &self.title; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 1000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "title", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "title", + ), max: 1000usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/us_polhem/blog/tag.rs b/crates/jacquard-api/src/us_polhem/blog/tag.rs index 6489919e..359458b8 100644 --- a/crates/jacquard-api/src/us_polhem/blog/tag.rs +++ b/crates/jacquard-api/src/us_polhem/blog/tag.rs @@ -104,13 +104,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.description; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100000usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "description", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "description", + ), max: 100000usize, actual: ::len(value.as_ref()), }); @@ -120,8 +122,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 100usize, actual: ::len(value.as_ref()), }); @@ -131,8 +135,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Tag<'a> { let value = &self.slug; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 100usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "slug", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "slug", + ), max: 100usize, actual: ::len(value.as_ref()), }); diff --git a/crates/jacquard-api/src/win_tomo_x/pushat.rs b/crates/jacquard-api/src/win_tomo_x/pushat.rs index fcc2bc0c..834cc3d2 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat.rs @@ -225,13 +225,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DeviceListItem<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { { let value = &self.name; #[allow(unused_comparisons)] if ::len(value.as_ref()) > 300usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 300usize, actual: ::len(value.as_ref()), }); @@ -246,8 +248,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for DeviceListItem<'a> { ) .count(); if count > 30usize { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: "name", + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field( + "name", + ), max: 30usize, actual: count, }); @@ -299,7 +303,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotifyBody<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } \ No newline at end of file diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs index 17ee706c..e520e151 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs @@ -99,7 +99,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Allow<'a> { } fn validate( &self, - ) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + ) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-lexicon/src/codegen.rs b/crates/jacquard-lexicon/src/codegen.rs index 6ae11a07..0af46c40 100644 --- a/crates/jacquard-lexicon/src/codegen.rs +++ b/crates/jacquard-lexicon/src/codegen.rs @@ -4,6 +4,7 @@ use crate::lexicon::{LexArrayItem, LexUserType}; use proc_macro2::TokenStream; use quote::quote; +pub mod builder_heuristics; pub mod lifetime; pub mod names; pub mod nsid_utils; @@ -11,6 +12,7 @@ pub mod output; pub mod schema_impl; pub mod structs; pub mod types; +pub mod union_codegen; pub mod utils; pub mod xrpc; @@ -100,7 +102,7 @@ impl<'c> CodeGenerator<'c> { #shared_fn_ident() } - fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { #validation_code } } diff --git a/crates/jacquard-lexicon/src/codegen/builder_heuristics.rs b/crates/jacquard-lexicon/src/codegen/builder_heuristics.rs new file mode 100644 index 00000000..35e104ff --- /dev/null +++ b/crates/jacquard-lexicon/src/codegen/builder_heuristics.rs @@ -0,0 +1,76 @@ +use crate::lexicon::{LexObject, LexObjectProperty}; + +/// Decision about whether to generate builder and/or Default impl for a struct. +#[derive(Debug, Clone, Copy)] +pub struct BuilderDecision { + /// Whether to generate a bon::Builder derive + pub has_builder: bool, + /// Whether to generate a Default derive + pub has_default: bool, +} + +/// Determine whether a struct should have builder and/or Default based on heuristics. +/// +/// Rules: +/// - 0 required fields → Default (no builder) +/// - All required fields are bare strings → Default (no builder) +/// - 1+ required fields (not all strings) → Builder (no Default) +/// - Type name conflicts with bon::Builder → no builder regardless +/// +/// # Parameters +/// - `type_name`: Name of the generated struct (to check for conflicts) +/// - `obj`: Lexicon object schema +/// +/// # Returns +/// Decision about builder and Default generation +pub fn should_generate_builder(type_name: &str, obj: &LexObject<'static>) -> BuilderDecision { + 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); + + BuilderDecision { + has_builder, + has_default, + } +} + +/// 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. +/// +/// This is public for cases where a struct always wants a builder (like records) +/// but needs to check for conflicts. +pub 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. +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. +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) + }) +} diff --git a/crates/jacquard-lexicon/src/codegen/lifetime.rs b/crates/jacquard-lexicon/src/codegen/lifetime.rs index dd9f6b20..cfdb4fe4 100644 --- a/crates/jacquard-lexicon/src/codegen/lifetime.rs +++ b/crates/jacquard-lexicon/src/codegen/lifetime.rs @@ -132,11 +132,6 @@ impl<'c> CodeGenerator<'c> { } } - /// Check if a lexicon def needs a lifetime parameter - pub(super) fn def_needs_lifetime(&self, def: &LexUserType<'_>) -> bool { - def.needs_lifetime(self) - } - /// Check if xrpc params need a lifetime parameter pub(super) fn params_need_lifetime( &self, diff --git a/crates/jacquard-lexicon/src/codegen/names.rs b/crates/jacquard-lexicon/src/codegen/names.rs index 2a327658..c3957127 100644 --- a/crates/jacquard-lexicon/src/codegen/names.rs +++ b/crates/jacquard-lexicon/src/codegen/names.rs @@ -1,5 +1,5 @@ use super::nsid_utils::NsidPath; -use super::utils::sanitize_name; +use super::utils::{namespace_prefix, sanitize_name, sanitize_name_cow}; use super::CodeGenerator; use heck::{ToPascalCase, ToSnakeCase}; @@ -140,7 +140,7 @@ impl<'c> CodeGenerator<'c> { if nsid_path.is_defs() && parts.len() >= 3 { // defs go in parent module: com.atproto.label.defs → com_atproto/label.rs - let first_two = format!("{}_{}", sanitize_name(parts[0]), sanitize_name(parts[1])); + let first_two = namespace_prefix(parts[0], parts[1]); if parts.len() == 3 { // com.atproto.defs → com_atproto.rs format!("{}.rs", first_two).into() @@ -149,21 +149,21 @@ impl<'c> CodeGenerator<'c> { let middle: Vec<&str> = parts[2..parts.len() - 1].iter().copied().collect(); let mut path = std::path::PathBuf::from(first_two); for segment in &middle[..middle.len() - 1] { - path.push(sanitize_name(segment)); + path.push(sanitize_name_cow(segment).as_ref()); } - path.push(format!("{}.rs", sanitize_name(middle.last().unwrap()))); + path.push(format!("{}.rs", sanitize_name_cow(middle.last().unwrap()))); path } } else { // Regular path: app.bsky.feed.post → app_bsky/feed/post.rs - let first_two = format!("{}_{}", sanitize_name(parts[0]), sanitize_name(parts[1])); + let first_two = namespace_prefix(parts[0], parts[1]); let mut path = std::path::PathBuf::from(first_two); for segment in &parts[2..parts.len() - 1] { - path.push(sanitize_name(segment)); + path.push(sanitize_name_cow(segment).as_ref()); } - path.push(format!("{}.rs", sanitize_name(&last.to_snake_case()))); + path.push(format!("{}.rs", sanitize_name_cow(&last.to_snake_case()))); path } } diff --git a/crates/jacquard-lexicon/src/codegen/schema_impl.rs b/crates/jacquard-lexicon/src/codegen/schema_impl.rs index 99a02be1..b4fce1b8 100644 --- a/crates/jacquard-lexicon/src/codegen/schema_impl.rs +++ b/crates/jacquard-lexicon/src/codegen/schema_impl.rs @@ -54,7 +54,7 @@ pub fn generate_schema_impl( #doc_literal } - fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { #validation_code } } diff --git a/crates/jacquard-lexicon/src/codegen/structs.rs b/crates/jacquard-lexicon/src/codegen/structs.rs index fccaca57..bbf95270 100644 --- a/crates/jacquard-lexicon/src/codegen/structs.rs +++ b/crates/jacquard-lexicon/src/codegen/structs.rs @@ -2,11 +2,12 @@ use crate::error::Result; use crate::lexicon::{ LexArrayItem, LexInteger, LexObject, LexObjectProperty, LexRecord, LexString, }; -use heck::{ToPascalCase, ToSnakeCase}; +use heck::ToSnakeCase; +use jacquard_common::smol_str::SmolStr; use proc_macro2::TokenStream; use quote::quote; +use std::collections::BTreeMap; -use super::nsid_utils::{NsidPath, RefPath}; use super::CodeGenerator; use super::utils::{make_ident, value_to_variant_name}; @@ -19,44 +20,78 @@ pub(super) enum EnumVariantKind { Struct(Vec), } -/// 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. -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()) -} +impl<'c> CodeGenerator<'c> { + /// Generate all nested type definitions (unions, objects) for an object's properties. + /// This consolidates the pattern of iterating properties to find unions and nested objects + /// that need their own type definitions. + /// + /// # Parameters + /// - `include_nested_objects`: If false, skips generating nested object types (used by XRPC) + pub(super) fn generate_nested_types( + &self, + nsid: &str, + parent_type_name: &str, + properties: &BTreeMap>, + include_nested_objects: bool, + ) -> Result> { + let mut nested = Vec::new(); -/// 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(&[]); + for (field_name, field_type) in properties { + match field_type { + LexObjectProperty::Union(union) => { + // Skip empty, single-variant unions unless they're self-referential + if !union.refs.is_empty() + && (union.refs.len() > 1 + || self.is_self_referential_union(nsid, parent_type_name, &union)) + { + let union_name = + self.generate_field_type_name(nsid, parent_type_name, field_name, ""); + let refs: Vec<_> = union.refs.iter().cloned().collect(); + let union_def = self.generate_union( + nsid, + &union_name, + &refs, + None, + union.closed, + )?; + nested.push(union_def); + } + } + LexObjectProperty::Object(nested_obj) if include_nested_objects => { + let object_name = + self.generate_field_type_name(nsid, parent_type_name, field_name, ""); + let obj_def = self.generate_object(nsid, &object_name, &nested_obj)?; + nested.push(obj_def); + } + LexObjectProperty::Array(array) => { + if let LexArrayItem::Union(union) = &array.items { + // Skip single-variant array unions + if union.refs.len() > 1 { + let union_name = self.generate_field_type_name( + nsid, + parent_type_name, + field_name, + "Item", + ); + let refs: Vec<_> = union.refs.iter().cloned().collect(); + let union_def = self.generate_union( + nsid, + &union_name, + &refs, + None, + union.closed, + )?; + nested.push(union_def); + } + } + } + _ => {} + } + } - if required.is_empty() { - return false; // Handled separately by count check + Ok(nested) } - 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, nsid: &str, @@ -71,7 +106,8 @@ impl<'c> CodeGenerator<'c> { // Records 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); + let has_builder = + !super::builder_heuristics::conflicts_with_builder_macro(&type_name); // Generate main struct fields let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?; @@ -100,56 +136,7 @@ impl<'c> CodeGenerator<'c> { }; // Generate union types and nested object types for this record - let mut unions = Vec::new(); - for (field_name, field_type) in &obj.properties { - match field_type { - LexObjectProperty::Union(union) => { - // Skip empty, single-variant unions unless they're self-referential - if !union.refs.is_empty() - && (union.refs.len() > 1 - || self.is_self_referential_union(nsid, &type_name, union)) - { - let union_name = - self.generate_field_type_name(nsid, &type_name, field_name, ""); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - LexObjectProperty::Object(nested_obj) => { - let object_name = - self.generate_field_type_name(nsid, &type_name, field_name, ""); - let obj_def = self.generate_object(nsid, &object_name, nested_obj)?; - unions.push(obj_def); - } - LexObjectProperty::Array(array) => { - if let LexArrayItem::Union(union) = &array.items { - // Skip single-variant array unions - if union.refs.len() > 1 { - let union_name = self.generate_field_type_name( - nsid, &type_name, field_name, "Item", - ); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - } - _ => {} - } - } + let unions = self.generate_nested_types(nsid, &type_name, &obj.properties, true)?; // Generate typed GetRecordOutput wrapper let output_type_name = format!("{}GetRecordOutput", type_name); @@ -257,10 +244,9 @@ impl<'c> CodeGenerator<'c> { // - 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 decision = super::builder_heuristics::should_generate_builder(&type_name, obj); + let has_builder = decision.has_builder; + let has_default = decision.has_default; let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?; let doc = self.generate_doc_comment(obj.description.as_ref()); @@ -298,45 +284,7 @@ impl<'c> CodeGenerator<'c> { }; // Generate union types and nested object types for this object - let mut unions = Vec::new(); - for (field_name, field_type) in &obj.properties { - match field_type { - LexObjectProperty::Union(union) => { - // Skip empty, single-variant unions unless they're self-referential - if !union.refs.is_empty() - && (union.refs.len() > 1 - || self.is_self_referential_union(nsid, &type_name, union)) - { - let union_name = - self.generate_field_type_name(nsid, &type_name, field_name, ""); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = - self.generate_union(nsid, &union_name, &refs, None, union.closed)?; - unions.push(union_def); - } - } - LexObjectProperty::Object(nested_obj) => { - let object_name = - self.generate_field_type_name(nsid, &type_name, field_name, ""); - let obj_def = self.generate_object(nsid, &object_name, nested_obj)?; - unions.push(obj_def); - } - LexObjectProperty::Array(array) => { - if let LexArrayItem::Union(union) = &array.items { - // Skip single-variant array unions - if union.refs.len() > 1 { - let union_name = - self.generate_field_type_name(nsid, &type_name, field_name, "Item"); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = - self.generate_union(nsid, &union_name, &refs, None, union.closed)?; - unions.push(union_def); - } - } - } - _ => {} - } - } + let unions = self.generate_nested_types(nsid, &type_name, &obj.properties, true)?; // Generate LexiconSchema impl with shared lexicon_doc function let (shared_fn, schema_impl) = @@ -467,121 +415,15 @@ impl<'c> CodeGenerator<'c> { ) -> Result { let enum_ident = syn::Ident::new(union_name, proc_macro2::Span::call_site()); - // Extract namespace prefix from current NSID (first two segments: "sh.weaver" from "sh.weaver.embed.recordWithMedia") - let current_nsid_path = NsidPath::parse(current_nsid); - let current_namespace = current_nsid_path.namespace(); - - // First pass: collect all variant names and detect collisions - #[derive(Debug)] - struct VariantInfo { - ref_str: String, - ref_nsid: String, - simple_name: String, - is_current_namespace: bool, - } - - let mut variant_infos = Vec::new(); - for ref_str in refs { - // Normalize local refs (starting with #) by prepending current NSID - let normalized_ref = RefPath::normalize(ref_str, current_nsid); - - // Parse ref to get NSID and def name - let ref_path = RefPath::parse(&normalized_ref, None); - let ref_nsid_str = ref_path.nsid(); - let ref_def = ref_path.def(); - - // Skip unknown refs - they'll be handled by Unknown variant - if !self.corpus.ref_exists(&normalized_ref) { - continue; - } - - // Check if ref is in current namespace and if it's the same module - let is_current_namespace = ref_nsid_str.starts_with(¤t_namespace); - let is_same_module = ref_nsid_str == current_nsid; - - // Generate simple variant name (without namespace prefix) - let last_segment = ref_nsid_str.split('.').last().unwrap(); - let simple_name = if ref_def == "main" { - // For main, use the last NSID segment - // e.g. app.bsky.embed.images#main -> Images - last_segment.to_pascal_case() - } else if last_segment == "defs" { - // For defs modules, just use the fragment name without "Defs" prefix - // e.g. app.bsky.embed.defs#images -> Images (not DefsImages) - ref_def.to_pascal_case() - } else if is_same_module { - // For same-module refs, just use the fragment name to avoid redundancy - // e.g. sh.weaver.embed.records#viewRecord in records.rs -> ViewRecord (not RecordsViewRecord) - ref_def.to_pascal_case() - } else { - // For other fragments, include the last NSID segment to avoid collisions - // e.g. app.bsky.embed.images#view -> ImagesView - // app.bsky.embed.video#view -> VideoView - format!( - "{}{}", - last_segment.to_pascal_case(), - ref_def.to_pascal_case() - ) - }; - - variant_infos.push(VariantInfo { - ref_str: normalized_ref.clone(), - ref_nsid: ref_nsid_str.to_string(), - simple_name, - is_current_namespace, - }); - } - - // Second pass: detect collisions and disambiguate - use std::collections::HashMap; - let mut name_counts: HashMap = HashMap::new(); - for info in &variant_infos { - *name_counts.entry(info.simple_name.clone()).or_insert(0) += 1; - } - - let mut variants = Vec::new(); - for info in variant_infos { - let has_collision = name_counts.get(&info.simple_name).copied().unwrap_or(0) > 1; - - // Track namespace dependency for foreign refs - if !info.is_current_namespace { - let ref_nsid_path = NsidPath::parse(&info.ref_nsid); - let foreign_namespace = ref_nsid_path.namespace(); - self.namespace_deps - .borrow_mut() - .entry(current_namespace.clone()) - .or_default() - .insert(foreign_namespace); - } - - // Disambiguate: add second NSID segment prefix only to foreign refs when there's a collision - let variant_name = if has_collision && !info.is_current_namespace { - // Get second segment (namespace identifier: "bsky" from "app.bsky.embed.images") - let ref_nsid_path = NsidPath::parse(&info.ref_nsid); - let segments = ref_nsid_path.segments(); - let prefix = if segments.len() >= 2 { - segments[1].to_pascal_case() - } else { - // Fallback: use first segment if only one exists - segments[0].to_pascal_case() - }; - format!("{}{}", prefix, info.simple_name) - } else { - info.simple_name.clone() - }; - - let variant_ident = syn::Ident::new(&variant_name, proc_macro2::Span::call_site()); - - // Get the Rust type for this ref - let rust_type = self.ref_to_rust_type(&info.ref_str)?; + // Build variants using the union_codegen module + let ctx = super::union_codegen::UnionGenContext { + corpus: self.corpus, + namespace_deps: &self.namespace_deps, + current_nsid, + }; - // Add serde rename for the full NSID - let ref_str_literal = &info.ref_str; - variants.push(quote! { - #[serde(rename = #ref_str_literal)] - #variant_ident(Box<#rust_type>) - }); - } + let union_variants = ctx.build_union_variants(refs, |ref_str| self.ref_to_rust_type(ref_str))?; + let variants = super::union_codegen::generate_variant_tokens(&union_variants); let doc = description .map(|d| quote! { #[doc = #d] }) diff --git a/crates/jacquard-lexicon/src/codegen/types.rs b/crates/jacquard-lexicon/src/codegen/types.rs index 09833b5a..33173041 100644 --- a/crates/jacquard-lexicon/src/codegen/types.rs +++ b/crates/jacquard-lexicon/src/codegen/types.rs @@ -4,8 +4,9 @@ use heck::ToSnakeCase; use proc_macro2::TokenStream; use quote::quote; -use super::nsid_utils::{NsidPath, RefPath}; use super::CodeGenerator; +use super::nsid_utils::{NsidPath, RefPath}; +use super::utils::{join_module_path, join_path_parts, namespace_prefix, sanitize_name_cow}; impl<'c> CodeGenerator<'c> { /// Convert a property type to Rust type @@ -178,7 +179,6 @@ impl<'c> CodeGenerator<'c> { /// Convert ref to Rust type path pub(super) fn ref_to_rust_type(&self, ref_str: &str) -> Result { - use super::utils::sanitize_name; use crate::error::CodegenError; // Parse ref to get NSID and def @@ -205,40 +205,28 @@ impl<'c> CodeGenerator<'c> { let path_str = if nsid_path.is_defs() && parts.len() >= 3 { // defs types go in parent module - let first_two = format!("{}_{}", sanitize_name(parts[0]), sanitize_name(parts[1])); + let first_two = namespace_prefix(parts[0], parts[1]); if parts.len() == 3 { // com.atproto.defs -> com_atproto::TypeName - format!("{}::{}::{}", self.root_module, first_two, type_name) + join_path_parts(&[&self.root_module, &first_two, &type_name]) } else { // app.bsky.actor.defs -> app_bsky::actor::TypeName - let middle: Vec<_> = parts[2..parts.len() - 1] - .iter() - .copied() - .map(|s| sanitize_name(s)) - .collect(); - format!( - "{}::{}::{}::{}", - self.root_module, - first_two, - middle.join("::"), - type_name - ) + let middle = &parts[2..parts.len() - 1]; + let middle_path = join_module_path(middle); + join_path_parts(&[&self.root_module, &first_two, &middle_path, &type_name]) } } else { // Regular types go in their own module file let (module_path, file_module) = if parts.len() >= 3 { // Join first two segments with underscore - let first_two = format!("{}_{}", sanitize_name(parts[0]), sanitize_name(parts[1])); - let file_name = sanitize_name(last_segment).to_snake_case(); + let first_two = namespace_prefix(parts[0], parts[1]); + let file_name = sanitize_name_cow(last_segment).to_string().to_snake_case(); if parts.len() > 3 { // Middle segments form the module path - let middle: Vec<_> = parts[2..parts.len() - 1] - .iter() - .copied() - .map(|s| sanitize_name(s)) - .collect(); - let base_path = format!("{}::{}", first_two, middle.join("::")); + let middle = &parts[2..parts.len() - 1]; + let middle_path = join_module_path(middle); + let base_path = join_path_parts(&[&first_two, &middle_path]); (base_path, file_name) } else { // Only 3 parts: com.atproto.label -> com_atproto, file: label @@ -246,17 +234,14 @@ impl<'c> CodeGenerator<'c> { } } else if parts.len() == 2 { // e.g., "com.example" -> "com_example", file: example - let first = sanitize_name(parts[0]); - let file_name = sanitize_name(parts[1]).to_snake_case(); + let first = sanitize_name_cow(parts[0]).to_string(); + let file_name = sanitize_name_cow(parts[1]).to_string().to_snake_case(); (first, file_name) } else { (parts[0].to_string(), "main".to_string()) }; - format!( - "{}::{}::{}::{}", - self.root_module, module_path, file_module, type_name - ) + join_path_parts(&[&self.root_module, &module_path, &file_module, &type_name]) }; let path: syn::Path = syn::parse_str(&path_str).map_err(|e| CodegenError::Other { diff --git a/crates/jacquard-lexicon/src/codegen/union_codegen.rs b/crates/jacquard-lexicon/src/codegen/union_codegen.rs new file mode 100644 index 00000000..6dbc7e9b --- /dev/null +++ b/crates/jacquard-lexicon/src/codegen/union_codegen.rs @@ -0,0 +1,184 @@ +use crate::codegen::nsid_utils::{NsidPath, RefPath}; +use crate::corpus::LexiconCorpus; +use crate::error::Result; +use heck::ToPascalCase; +use jacquard_common::CowStr; +use proc_macro2::TokenStream; +use quote::quote; +use std::cell::RefCell; +use std::collections::{HashMap, HashSet}; + +/// Information about a union variant +#[derive(Debug, Clone)] +pub struct UnionVariant { + /// The original ref string (normalized) + pub ref_str: String, + /// The variant name (may be disambiguated) + pub variant_name: String, + /// The Rust type for this variant + pub rust_type: TokenStream, +} + +/// Context for tracking namespace dependencies during union generation +pub struct UnionGenContext<'a> { + pub corpus: &'a LexiconCorpus, + pub namespace_deps: &'a RefCell>>, + pub current_nsid: &'a str, +} + +impl<'a> UnionGenContext<'a> { + /// Build variants for a union with collision detection and disambiguation + pub fn build_union_variants( + &self, + refs: &[CowStr<'static>], + ref_to_rust_type: impl Fn(&str) -> Result, + ) -> Result> { + let current_nsid_path = NsidPath::parse(self.current_nsid); + let current_namespace = current_nsid_path.namespace(); + + // First pass: collect all variant names and detect collisions + #[derive(Debug)] + struct VariantInfo { + ref_str: String, + ref_nsid: String, + simple_name: String, + is_current_namespace: bool, + } + + let mut variant_infos = Vec::new(); + for ref_str in refs { + let normalized_ref = RefPath::normalize(ref_str, self.current_nsid); + let ref_path = RefPath::parse(&normalized_ref, None); + let ref_nsid_str = ref_path.nsid(); + let ref_def = ref_path.def(); + + // Skip unknown refs + if !self.corpus.ref_exists(&normalized_ref) { + continue; + } + + let is_current_namespace = ref_nsid_str.starts_with(¤t_namespace); + let is_same_module = ref_nsid_str == self.current_nsid; + + // Generate simple variant name + let last_segment = ref_nsid_str.split('.').last().unwrap(); + let simple_name = if ref_def == "main" { + last_segment.to_pascal_case() + } else if last_segment == "defs" { + ref_def.to_pascal_case() + } else if is_same_module { + ref_def.to_pascal_case() + } else { + format!( + "{}{}", + last_segment.to_pascal_case(), + ref_def.to_pascal_case() + ) + }; + + variant_infos.push(VariantInfo { + ref_str: normalized_ref.clone(), + ref_nsid: ref_nsid_str.to_string(), + simple_name, + is_current_namespace, + }); + } + + // Second pass: detect collisions and disambiguate + let mut name_counts: HashMap = HashMap::new(); + for info in &variant_infos { + *name_counts.entry(info.simple_name.clone()).or_insert(0) += 1; + } + + let mut variants = Vec::new(); + for info in variant_infos { + let has_collision = name_counts.get(&info.simple_name).copied().unwrap_or(0) > 1; + + // Track namespace dependency for foreign refs + if !info.is_current_namespace { + let ref_nsid_path = NsidPath::parse(&info.ref_nsid); + let foreign_namespace = ref_nsid_path.namespace(); + self.namespace_deps + .borrow_mut() + .entry(current_namespace.clone()) + .or_default() + .insert(foreign_namespace); + } + + // Disambiguate: add second NSID segment prefix only to foreign refs when there's a collision + let variant_name = if has_collision && !info.is_current_namespace { + let ref_nsid_path = NsidPath::parse(&info.ref_nsid); + let segments = ref_nsid_path.segments(); + let prefix = if segments.len() >= 2 { + segments[1].to_pascal_case() + } else { + segments[0].to_pascal_case() + }; + format!("{}{}", prefix, info.simple_name) + } else { + info.simple_name.clone() + }; + + let rust_type = ref_to_rust_type(&info.ref_str)?; + + variants.push(UnionVariant { + ref_str: info.ref_str, + variant_name, + rust_type, + }); + } + + Ok(variants) + } + + /// Build variants for a union without collision detection (simple mode) + pub fn build_simple_union_variants( + &self, + refs: &[CowStr<'static>], + ref_to_rust_type: impl Fn(&str) -> Result, + ) -> Result> { + let mut variants = Vec::new(); + + for ref_str in refs { + let ref_str_s = ref_str.as_ref(); + let normalized_ref = RefPath::normalize(ref_str, self.current_nsid); + let ref_path = RefPath::parse(&normalized_ref, None); + let ref_nsid = ref_path.nsid(); + let ref_def = ref_path.def(); + + let variant_name = if ref_def == "main" { + let ref_nsid_path = NsidPath::parse(ref_nsid); + ref_nsid_path.last_segment().to_pascal_case() + } else { + ref_def.to_pascal_case() + }; + + let rust_type = ref_to_rust_type(&normalized_ref)?; + + variants.push(UnionVariant { + ref_str: ref_str_s.to_string(), + variant_name, + rust_type, + }); + } + + Ok(variants) + } +} + +/// Generate variant tokens for a union enum +pub fn generate_variant_tokens(variants: &[UnionVariant]) -> Vec { + variants + .iter() + .map(|variant| { + let variant_ident = syn::Ident::new(&variant.variant_name, proc_macro2::Span::call_site()); + let ref_str_literal = &variant.ref_str; + let rust_type = &variant.rust_type; + + quote! { + #[serde(rename = #ref_str_literal)] + #variant_ident(Box<#rust_type>) + } + }) + .collect() +} diff --git a/crates/jacquard-lexicon/src/codegen/utils.rs b/crates/jacquard-lexicon/src/codegen/utils.rs index 49e24259..11e0057b 100644 --- a/crates/jacquard-lexicon/src/codegen/utils.rs +++ b/crates/jacquard-lexicon/src/codegen/utils.rs @@ -19,10 +19,34 @@ pub(super) fn value_to_variant_name(value: &str) -> String { } } -/// Sanitize a string to be safe for identifiers and filenames -pub(super) fn sanitize_name(s: &str) -> String { +/// Check if a string is already a valid identifier (alphanumeric + underscore, not starting with digit) +#[inline] +fn is_valid_identifier(s: &str) -> bool { + if s.is_empty() { + return false; + } + + let mut chars = s.chars(); + let first = chars.next().unwrap(); + + // Must start with letter or underscore + if !first.is_ascii_alphabetic() && first != '_' { + return false; + } + + // Rest must be alphanumeric or underscore + chars.all(|c| c.is_ascii_alphanumeric() || c == '_') +} + +/// Sanitize a string to be safe for identifiers and filenames, returning CowStr. +/// Borrows if already valid, allocates if modifications needed. +pub(super) fn sanitize_name_cow(s: &str) -> CowStr<'_> { + if is_valid_identifier(s) { + return CowStr::Borrowed(s); + } + if s.is_empty() { - return "unknown".to_string(); + return CowStr::Owned(jacquard_common::smol_str::SmolStr::new_static("unknown")); } // Replace invalid characters with underscores @@ -46,7 +70,37 @@ pub(super) fn sanitize_name(s: &str) -> String { sanitized = format!("_{}", sanitized); } + CowStr::Owned(sanitized.into()) +} + +/// Sanitize a string to be safe for identifiers and filenames, always returning String. +/// Convenience wrapper around sanitize_name_cow for existing callsites. +pub(super) fn sanitize_name(s: &str) -> String { + sanitize_name_cow(s).to_string() +} + +/// Build namespace prefix from first two NSID segments (e.g., "com", "atproto" → "com_atproto") +pub(super) fn namespace_prefix(first: &str, second: &str) -> String { + format!("{}_{}", sanitize_name_cow(first), sanitize_name_cow(second)) +} + +/// Join NSID segments into a module path (e.g., ["repo", "admin"] → "repo::admin") +pub(super) fn join_module_path(segments: &[&str]) -> String { + let sanitized: Vec<_> = segments.iter().map(|s| sanitize_name_cow(s)).collect(); sanitized + .iter() + .map(|s| s.as_ref()) + .collect::>() + .join("::") +} + +/// Join already-processed strings into a Rust module path (e.g., ["crate", "foo", "Bar"] → "crate::foo::Bar") +pub(super) fn join_path_parts(parts: &[impl AsRef]) -> String { + parts + .iter() + .map(|p| p.as_ref()) + .collect::>() + .join("::") } /// Create an identifier, using raw identifier if necessary for keywords diff --git a/crates/jacquard-lexicon/src/codegen/xrpc.rs b/crates/jacquard-lexicon/src/codegen/xrpc.rs index cd93925f..f95ad106 100644 --- a/crates/jacquard-lexicon/src/codegen/xrpc.rs +++ b/crates/jacquard-lexicon/src/codegen/xrpc.rs @@ -1,13 +1,12 @@ use crate::error::Result; use crate::lexicon::{ - LexArrayItem, LexObjectProperty, LexXrpcBody, LexXrpcBodySchema, LexXrpcError, - LexXrpcProcedure, LexXrpcQuery, LexXrpcSubscription, LexXrpcSubscriptionMessageSchema, + LexXrpcBody, LexXrpcBodySchema, LexXrpcError, LexXrpcProcedure, LexXrpcQuery, + LexXrpcSubscription, LexXrpcSubscriptionMessageSchema, }; use heck::{ToPascalCase, ToSnakeCase}; use proc_macro2::TokenStream; use quote::quote; -use super::nsid_utils::{NsidPath, RefPath}; use super::CodeGenerator; use super::utils::make_ident; @@ -224,43 +223,31 @@ impl<'c> CodeGenerator<'c> { let enum_name = format!("{}Message", type_base); let enum_ident = syn::Ident::new(&enum_name, proc_macro2::Span::call_site()); - let mut variants = Vec::new(); - let mut decode_arms = Vec::new(); - - for ref_str in &union.refs { - let ref_str_s = ref_str.as_ref(); - - // Normalize local refs (starting with #) by prepending current NSID - let normalized_ref = RefPath::normalize(ref_str, nsid); - - // Parse ref to get NSID and def name - let ref_path = RefPath::parse(&normalized_ref, None); - let ref_nsid = ref_path.nsid(); - let ref_def = ref_path.def(); + // Build variants using the union_codegen module (simple mode, no collision detection) + let ctx = super::union_codegen::UnionGenContext { + corpus: self.corpus, + namespace_deps: &self.namespace_deps, + current_nsid: nsid, + }; - let variant_name = if ref_def == "main" { - let ref_nsid_path = NsidPath::parse(ref_nsid); - ref_nsid_path.last_segment().to_pascal_case() - } else { - ref_def.to_pascal_case() - }; - let variant_ident = - syn::Ident::new(&variant_name, proc_macro2::Span::call_site()); - let type_path = self.ref_to_rust_type(&normalized_ref)?; - - variants.push(quote! { - #[serde(rename = #ref_str_s)] - #variant_ident(Box<#type_path>) - }); - - // Generate decode arm for framed decoding - decode_arms.push(quote! { - #ref_str_s => { - let variant = serde_ipld_dagcbor::from_slice(body)?; - Ok(Self::#variant_ident(Box::new(variant))) + let union_variants = ctx.build_simple_union_variants(&union.refs, |ref_str| self.ref_to_rust_type(ref_str))?; + let variants = super::union_codegen::generate_variant_tokens(&union_variants); + + // Generate decode arms for framed decoding + let decode_arms: Vec<_> = union_variants + .iter() + .map(|variant| { + let ref_str_literal = &variant.ref_str; + let variant_ident = + syn::Ident::new(&variant.variant_name, proc_macro2::Span::call_site()); + quote! { + #ref_str_literal => { + let variant = serde_ipld_dagcbor::from_slice(body)?; + Ok(Self::#variant_ident(Box::new(variant))) + } } - }); - } + }) + .collect(); let doc = self.generate_doc_comment(union.description.as_ref()); @@ -314,57 +301,7 @@ impl<'c> CodeGenerator<'c> { }; // Generate union types for this message - let mut unions = Vec::new(); - for (field_name, field_type) in &obj.properties { - match field_type { - LexObjectProperty::Union(union) => { - // Skip empty, single-variant unions unless they're self-referential - if !union.refs.is_empty() - && (union.refs.len() > 1 - || self.is_self_referential_union(nsid, &struct_name, union)) - { - let union_name = self.generate_field_type_name( - nsid, - &struct_name, - field_name, - "", - ); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - LexObjectProperty::Array(array) => { - if let LexArrayItem::Union(union) = &array.items { - // Skip single-variant array unions - if union.refs.len() > 1 { - let union_name = self.generate_field_type_name( - nsid, - &struct_name, - field_name, - "Item", - ); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - } - _ => {} - } - } + let unions = self.generate_nested_types(nsid, &struct_name, &obj.properties, false)?; Ok(quote! { #struct_def @@ -496,15 +433,8 @@ impl<'c> CodeGenerator<'c> { 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::{ - all_required_are_defaultable_strings, conflicts_with_builder_macro, - count_required_fields, - }; - 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) + let decision = super::builder_heuristics::should_generate_builder(type_base, obj); + (decision.has_default, decision.has_builder) } else { (false, false) }; @@ -574,46 +504,11 @@ impl<'c> CodeGenerator<'c> { }; // Generate union types if schema is an Object - let mut unions = Vec::new(); - if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { - for (field_name, field_type) in &obj.properties { - match field_type { - LexObjectProperty::Union(union) => { - // Skip empty, single-variant unions unless they're self-referential - if !union.refs.is_empty() - && (union.refs.len() > 1 - || self.is_self_referential_union(nsid, type_base, union)) - { - let union_name = - self.generate_field_type_name(nsid, type_base, field_name, ""); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = - self.generate_union(nsid, &union_name, &refs, None, union.closed)?; - unions.push(union_def); - } - } - LexObjectProperty::Array(array) => { - if let LexArrayItem::Union(union) = &array.items { - // Skip single-variant array unions - if union.refs.len() > 1 { - let union_name = self - .generate_field_type_name(nsid, type_base, field_name, "Item"); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - } - _ => {} - } - } - } + let unions = if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { + self.generate_nested_types(nsid, type_base, &obj.properties, false)? + } else { + Vec::new() + }; Ok(quote! { #struct_def @@ -645,11 +540,7 @@ impl<'c> CodeGenerator<'c> { // 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::{ - all_required_are_defaultable_strings, count_required_fields, - }; - let required_count = count_required_fields(obj); - required_count == 0 || all_required_are_defaultable_strings(obj) + super::builder_heuristics::should_generate_builder(&struct_name, obj).has_default } else { false }; @@ -688,49 +579,11 @@ impl<'c> CodeGenerator<'c> { }; // Generate union types if schema is an Object - let mut unions = Vec::new(); - if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { - for (field_name, field_type) in &obj.properties { - match field_type { - LexObjectProperty::Union(union) => { - // Skip single-variant unions unless they're self-referential - if union.refs.len() > 1 - || self.is_self_referential_union(nsid, &struct_name, union) - { - let union_name = - self.generate_field_type_name(nsid, &struct_name, field_name, ""); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = - self.generate_union(nsid, &union_name, &refs, None, union.closed)?; - unions.push(union_def); - } - } - LexObjectProperty::Array(array) => { - if let LexArrayItem::Union(union) = &array.items { - // Skip single-variant array unions - if union.refs.len() > 1 { - let union_name = self.generate_field_type_name( - nsid, - &struct_name, - field_name, - "Item", - ); - let refs: Vec<_> = union.refs.iter().cloned().collect(); - let union_def = self.generate_union( - nsid, - &union_name, - &refs, - None, - union.closed, - )?; - unions.push(union_def); - } - } - } - _ => {} - } - } - } + let unions = if let Some(crate::lexicon::LexXrpcBodySchema::Object(obj)) = &body.schema { + self.generate_nested_types(nsid, &struct_name, &obj.properties, false)? + } else { + Vec::new() + }; Ok(quote! { #struct_def diff --git a/crates/jacquard-lexicon/src/derive_impl/doc_to_tokens.rs b/crates/jacquard-lexicon/src/derive_impl/doc_to_tokens.rs index 5942768f..255f8a69 100644 --- a/crates/jacquard-lexicon/src/derive_impl/doc_to_tokens.rs +++ b/crates/jacquard-lexicon/src/derive_impl/doc_to_tokens.rs @@ -795,8 +795,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { ConstraintCheck::MaxLength { max } => quote! { #[allow(unused_comparisons)] if #len_expr > #max { - return Err(::jacquard_lexicon::schema::ValidationError::MaxLength { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::MaxLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), max: #max, actual: #len_expr, }); @@ -805,8 +805,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { ConstraintCheck::MinLength { min } => quote! { #[allow(unused_comparisons)] if #len_expr < #min { - return Err(::jacquard_lexicon::schema::ValidationError::MinLength { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::MinLength { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), min: #min, actual: #len_expr, }); @@ -819,8 +819,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { true ).count(); if count > #max { - return Err(::jacquard_lexicon::schema::ValidationError::MaxGraphemes { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::MaxGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), max: #max, actual: count, }); @@ -834,8 +834,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { true ).count(); if count < #min { - return Err(::jacquard_lexicon::schema::ValidationError::MinGraphemes { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::MinGraphemes { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), min: #min, actual: count, }); @@ -844,8 +844,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { }, ConstraintCheck::Maximum { max } => quote! { if *value > #max { - return Err(::jacquard_lexicon::schema::ValidationError::Maximum { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::Maximum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), max: #max, actual: *value, }); @@ -853,8 +853,8 @@ pub fn validations_to_tokens(checks: &[ValidationCheck]) -> TokenStream { }, ConstraintCheck::Minimum { min } => quote! { if *value < #min { - return Err(::jacquard_lexicon::schema::ValidationError::Minimum { - field: #field_name_literal, + return Err(::jacquard_lexicon::validation::ConstraintError::Minimum { + path: ::jacquard_lexicon::validation::ValidationPath::from_field(#field_name_literal), min: #min, actual: *value, }); diff --git a/crates/jacquard-lexicon/src/derive_impl/lexicon_schema.rs b/crates/jacquard-lexicon/src/derive_impl/lexicon_schema.rs index 4e2958a6..65c3e978 100644 --- a/crates/jacquard-lexicon/src/derive_impl/lexicon_schema.rs +++ b/crates/jacquard-lexicon/src/derive_impl/lexicon_schema.rs @@ -96,7 +96,7 @@ fn impl_for_struct(input: &DeriveInput) -> syn::Result { #doc_tokens } - fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { #validation_tokens } } @@ -150,7 +150,7 @@ fn impl_for_enum(input: &DeriveInput) -> syn::Result { #doc_tokens } - fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::schema::ValidationError> { + fn validate(&self) -> ::std::result::Result<(), ::jacquard_lexicon::validation::ConstraintError> { Ok(()) } } diff --git a/crates/jacquard-lexicon/src/schema.rs b/crates/jacquard-lexicon/src/schema.rs index fd1cc74d..11f6c356 100644 --- a/crates/jacquard-lexicon/src/schema.rs +++ b/crates/jacquard-lexicon/src/schema.rs @@ -122,67 +122,12 @@ pub trait LexiconSchema { /// /// Checks runtime constraints like `max_length`, `max_graphemes`, `minimum`, etc. /// Returns `Ok(())` if valid, `Err` with details if invalid. - fn validate(&self) -> Result<(), ValidationError> { + fn validate(&self) -> Result<(), crate::validation::ConstraintError> { // Default impl: no constraints to check Ok(()) } } -/// Error type for validation failures -#[derive(Debug, Clone, thiserror::Error, miette::Diagnostic)] -pub enum ValidationError { - #[error("field `{field}` exceeds maximum length: {actual} > {max}")] - MaxLength { - field: &'static str, - max: usize, - actual: usize, - }, - - #[error("field `{field}` exceeds maximum grapheme count: {actual} > {max}")] - MaxGraphemes { - field: &'static str, - max: usize, - actual: usize, - }, - - #[error("field `{field}` below minimum length: {actual} < {min}")] - MinLength { - field: &'static str, - min: usize, - actual: usize, - }, - - #[error("field `{field}` below minimum grapheme count: {actual} < {min}")] - MinGraphemes { - field: &'static str, - min: usize, - actual: usize, - }, - - #[error("field `{field}` value {actual} exceeds maximum: {max}")] - Maximum { - field: &'static str, - max: i64, - actual: i64, - }, - - #[error("field `{field}` value {actual} below minimum: {min}")] - Minimum { - field: &'static str, - min: i64, - actual: i64, - }, - - #[error("field `{field}` has invalid value: {message}")] - InvalidValue { - field: &'static str, - message: String, - }, - - #[error("multiple validation errors: {0:?}")] - Multiple(Vec), -} - /// Registry entry for schema discovery via inventory /// /// Generated automatically by `#[derive(LexiconSchema)]` to enable runtime schema discovery. @@ -284,25 +229,25 @@ pub fn global_registry() -> &'static SchemaRegistry { #[cfg(test)] mod tests { - use super::*; + use crate::validation::{ConstraintError, ValidationPath}; #[test] fn test_validation_max_length() { - let err = ValidationError::MaxLength { - field: "text", + let err = ConstraintError::MaxLength { + path: ValidationPath::from_field("text"), max: 100, actual: 150, }; - assert!(err.to_string().contains("exceeds maximum length")); + assert!(err.to_string().contains("exceeds max length")); } #[test] fn test_validation_max_graphemes() { - let err = ValidationError::MaxGraphemes { - field: "text", + let err = ConstraintError::MaxGraphemes { + path: ValidationPath::from_field("text"), max: 50, actual: 75, }; - assert!(err.to_string().contains("exceeds maximum grapheme count")); + assert!(err.to_string().contains("exceeds max graphemes")); } } diff --git a/crates/jacquard-lexicon/src/validation.rs b/crates/jacquard-lexicon/src/validation.rs index 3b6cba33..59bad3bc 100644 --- a/crates/jacquard-lexicon/src/validation.rs +++ b/crates/jacquard-lexicon/src/validation.rs @@ -47,6 +47,13 @@ impl ValidationPath { } } + /// Create a path with a single field segment + pub fn from_field(name: &str) -> Self { + let mut path = Self::new(); + path.push_field(name); + path + } + /// Add a field segment to the path pub fn push_field(&mut self, name: &str) { self.segments.push(PathSegment::Field(name.into())); diff --git a/crates/jacquard-lexicon/tests/schema_tests.rs b/crates/jacquard-lexicon/tests/schema_tests.rs index e46f97d0..22e314f4 100644 --- a/crates/jacquard-lexicon/tests/schema_tests.rs +++ b/crates/jacquard-lexicon/tests/schema_tests.rs @@ -4,7 +4,8 @@ use jacquard_lexicon::lexicon::{ LexObject, LexObjectProperty, LexRecord, LexRecordRecord, LexString, LexStringFormat, LexUserType, Lexicon, LexiconDoc, }; -use jacquard_lexicon::schema::{LexiconSchema, ValidationError}; +use jacquard_lexicon::schema::LexiconSchema; +use jacquard_lexicon::validation::{ConstraintError, ValidationPath}; use std::collections::BTreeMap; // Simple test type @@ -80,11 +81,11 @@ impl LexiconSchema for SimpleRecord<'_> { } } - fn validate(&self) -> Result<(), ValidationError> { + fn validate(&self) -> Result<(), ConstraintError> { // Check text length if self.text.len() > 1000 { - return Err(ValidationError::MaxLength { - field: "text", + return Err(ConstraintError::MaxLength { + path: ValidationPath::from_field("text"), max: 1000, actual: self.text.len(), }); @@ -122,7 +123,7 @@ fn test_validation_works() { assert!(result.is_err()); let err = result.unwrap_err(); - assert!(matches!(err, ValidationError::MaxLength { .. })); + assert!(matches!(err, ConstraintError::MaxLength { .. })); } #[test] diff --git a/justfile b/justfile index 8899f7fd..9f54fec8 100644 --- a/justfile +++ b/justfile @@ -21,7 +21,7 @@ update-api: cargo run -p jacquard-lexgen --bin lex-fetch -- -v generate-api: - cargo run -p jacquard-lexgen --bin jacquard-codegen -- -i crates/jacquard-api/lexicons -o crates/jacquard-api/src -r crate + cargo run -p jacquard-lexgen --bin jacquard-codegen -- -i crates/jacquard-api/lexicons -o crates/jacquard-api/src lex-gen *ARGS: cargo run -p jacquard-lexgen --bin lex-fetch -- {{ARGS}} @@ -30,7 +30,7 @@ lex-fetch *ARGS: cargo run -p jacquard-lexgen --bin lex-fetch -- --no-codegen {{ARGS}} codegen *ARGS: - cargo run -p jacquard-lexgen --bin jacquard-codegen -- -r crate {{ARGS}} + cargo run -p jacquard-lexgen --bin jacquard-codegen -- {{ARGS}} # Package binaries for distribution (creates tar.xz archives) package-binaries: -- 2.51.2