spree_api 6.0.0.rc4 → 6.0.0.rc6

data/app/serializers/concerns/spree/api/v3/digital_asset_details.rb

@@ -0,0 +1,70 @@
+module Spree
+  module Api
+    module V3
+      # What a panel shows about a downloadable file: its size, the limits
+      # that apply to it, and a short-lived link to check what was uploaded.
+      # Shared by the operator's and a seller's serializer, so both panels
+      # read the same fields.
+      module DigitalAssetDetails
+        extend ActiveSupport::Concern
+
+        # The store whose download settings apply: the request's, or the
+        # asset's own outside a request.
+        #
+        # @param digital_asset [Spree::DigitalAsset]
+        # @param params [Hash, nil] the serializer params
+        # @return [Spree::Store]
+        def self.store_for(digital_asset, params)
+          params&.dig(:store) || Spree::Current.store || digital_asset.store
+        end
+
+        included do
+          typelize byte_size: [:number, nullable: true],
+                   authorized_clicks: [:number, nullable: true],
+                   authorized_days: [:number, nullable: true],
+                   effective_authorized_clicks: :number,
+                   effective_authorized_days: :number,
+                   provider_type: [:string, nullable: true, comment: 'Digital asset provider; null is an uploaded file. Built-in: file. Extensions may register more.'],
+                   provider_name: [:string, comment: 'Digital asset provider name. Built-in: File. Extensions may register more.'],
+                   download_url: [:string, nullable: true]
+
+          attributes :authorized_clicks, :authorized_days, :byte_size
+          attributes created_at: :iso8601, updated_at: :iso8601
+
+          api_type_attributes :provider_type
+
+          # Human-readable source for the listing. Blank provider_type is the
+          # uploaded-file default, so this reads "File" there.
+          attribute :provider_name do |digital_asset|
+            digital_asset.provider_class.provider_name
+          end
+
+          # Lets a merchant check what they actually uploaded. Short-lived and
+          # panel-only: this is the file itself, not a customer's download
+          # grant, so it carries no counter and spends nobody's allowance.
+          # Nil for a provider-backed asset (no file to preview) and outside a
+          # request (the Disk service needs a host only a controller supplies).
+          attribute :download_url do |digital_asset, params|
+            next nil unless digital_asset.downloadable?
+
+            store = DigitalAssetDetails.store_for(digital_asset, params)
+            begin
+              digital_asset.download_url(expires_in: store.preferred_digital_asset_link_expire_time.seconds)
+            rescue ArgumentError
+              nil
+            end
+          end
+
+          # The limits actually applied, after the store-settings fallback.
+          attribute :effective_authorized_clicks do |digital_asset, params|
+            digital_asset.effective_authorized_clicks(DigitalAssetDetails.store_for(digital_asset, params))
+          end
+
+          attribute :effective_authorized_days do |digital_asset, params|
+            digital_asset.effective_authorized_days(DigitalAssetDetails.store_for(digital_asset, params))
+          end
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/address_owner_serializer.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Api
+    module V3
+      # Which address book an entry came out of. A checkout offering the
+      # buyer's own addresses beside their company's sites has to label the
+      # two, and the owner is the only thing that tells a warehouse from
+      # somebody's flat.
+      class AddressOwnerSerializer < BaseSerializer
+        typelize type: [:string, enum: %w[customer company seller], enum_type_name: 'AddressOwnerType'],
+                 name: [:string, nullable: true]
+
+        attribute :type do |owner|
+          Spree::Base.polymorphic_api_type(owner.class.to_s)
+        end
+
+        # What to call the book. A company node answers with its own name, so
+        # a division's own sites and the headquarters sites it inherits are
+        # told apart rather than filed under one heading. A customer's book is
+        # the caller's own and needs no name — "your addresses" is the client's
+        # word for it, in the shopper's language.
+        attribute :name do |owner|
+          owner.name if owner.is_a?(Spree::Company)
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/address_serializer.rb

@@ -12,7 +12,7 @@ module Spree
                  country_iso: [:string, deprecated: 'Use `country_code`. Removed in 6.1.'],
                  country_name: :string,
                  quick_checkout: :boolean, is_default_billing: :boolean, is_default_shipping: :boolean,
-                 label: [:string, nullable: true]
+                 label: [:string, nullable: true], owner: { nullable: true }
 
         # What the address is filed under in whichever book owns it — a
         # customer's ("Home") or a company node's ("Northern Warehouse").
@@ -31,6 +31,10 @@ module Spree
         attribute :state_name do |address|
           address.state_name.presence || address.state&.name
         end
+
+        # The address book the entry belongs to. Null for an address in no
+        # book: one a guest typed in, or the copy a placed order keeps.
+        one :owner, resource: proc { Spree.api.address_owner_serializer }
       end
     end
   end

data/app/serializers/spree/api/v3/admin/address_owner_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class AddressOwnerSerializer < V3::AddressOwnerSerializer
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/admin/address_serializer.rb

@@ -7,8 +7,6 @@ module Spree
           %i[state_abbr country_iso].each { |key| _attributes.delete(key) }
 
           typelize customer_id: [:string, nullable: true],
-                   owner_id: [:string, nullable: true],
-                   owner_type: [:string, nullable: true],
                    latitude: [:number, nullable: true],
                    longitude: [:number, nullable: true],
                    metadata: 'Record<string, unknown>'
@@ -29,14 +27,7 @@ module Spree
 
           prefixed_id_attributes customer_id: :customer_owner
 
-          # Who the row belongs to — a customer's book, a company node's, or a
-          # seller's billing address. `customer_id` above stays as the
-          # customer-only shorthand the customers surface reads.
-          prefixed_id_attributes :owner
-
-          attribute :owner_type do |address|
-            Spree::Base.polymorphic_api_type(address.owner_type)
-          end
+          one :owner, resource: proc { Spree.api.admin_address_owner_serializer }
         end
       end
     end

data/app/serializers/spree/api/v3/admin/api_key_serializer.rb

@@ -12,7 +12,7 @@ module Spree
         # via {#plaintext_token} below — it is `nil` everywhere else.
         class ApiKeySerializer < V3::BaseSerializer
           typelize name: :string,
-                   key_type: [:string, enum: Spree::ApiKey::KEY_TYPES],
+                   key_type: [:string, enum: Spree::ApiKey::KEY_TYPES, enum_type_name: 'ApiKeyType'],
                    token_prefix: [:string, nullable: true],
                    plaintext_token: [:string, nullable: true],
                    scopes: [:string, multi: true],

data/app/serializers/spree/api/v3/admin/catalog_assignment_serializer.rb

@@ -3,7 +3,7 @@ module Spree
     module V3
       module Admin
         class CatalogAssignmentSerializer < V3::BaseSerializer
-          typelize catalog_id: :string, assignable_type: :string, assignable_id: :string,
+          typelize catalog_id: :string, assignable_type: [:string, enum: Spree::CatalogAssignment::ASSIGNABLE_TYPES.map { |type| Spree::Base.polymorphic_api_type(type) }, enum_type_name: 'CatalogAssignableType'], assignable_id: :string,
                    assignable_name: [:string, nullable: true]
 
           attributes created_at: :iso8601

data/app/serializers/spree/api/v3/admin/catalog_price_serializer.rb

@@ -17,7 +17,7 @@ module Spree
           _attributes.delete(:id)
 
           typelize id: 'string | null', label: 'string | null', sku: 'string | null',
-                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], source: [:string, enum: Spree::CatalogPrice::SOURCES], break_count: :number
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], source: [:string, enum: Spree::CatalogPrice::SOURCES, enum_type_name: 'CatalogPriceSource'], break_count: :number
 
           # The variant this prices, so a row can name what it is showing —
           # a product's variants can be priced differently, and one figure

data/app/serializers/spree/api/v3/admin/collection_rule_serializer.rb

@@ -8,7 +8,7 @@ module Spree
         # wire shorthand (e.g. "tag"), matching every other typed-rule
         # serializer and what the writer accepts.
         class CollectionRuleSerializer < BaseSerializer
-          typelize type: [:string, comment: 'Rule type. Built-in: tag, available_on, sale. Extensions may register more.'], value: [:string, nullable: true], match_policy: [:string, enum: Spree::CollectionRule::MATCH_POLICIES]
+          typelize type: [:string, comment: 'Rule type. Built-in: tag, available_on, sale. Extensions may register more.'], value: [:string, nullable: true], match_policy: [:string, enum: Spree::CollectionRule::MATCH_POLICIES, enum_type_name: 'CollectionRuleMatchPolicy']
 
           attributes :value, :match_policy
 

data/app/serializers/spree/api/v3/admin/collection_serializer.rb

@@ -8,7 +8,7 @@ module Spree
         class CollectionSerializer < V3::CollectionSerializer
           include Spree::Api::V3::Admin::Translatable
 
-          typelize automatic: :boolean, rules_match_policy: [:string, enum: Spree::Collection::RULES_MATCH_POLICIES],
+          typelize automatic: :boolean, rules_match_policy: [:string, enum: Spree::Collection::RULES_MATCH_POLICIES, enum_type_name: 'MatchPolicy'],
                    metadata: 'Record<string, unknown>'
 
           attributes :automatic, :rules_match_policy, :metadata,

data/app/serializers/spree/api/v3/admin/commission_line_serializer.rb

@@ -19,8 +19,8 @@ module Spree
                    line_item_id: 'string | null',
                    fulfillment_id: 'string | null',
                    commission_rate_id: 'string | null',
-                   kind: [:string, enum: Spree::CommissionRate::KINDS],
-                   taxability_reason: 'string | null',
+                   kind: [:string, enum: Spree::CommissionRate::KINDS, enum_type_name: 'CommissionKind'],
+                   taxability_reason: [:string, nullable: true, enum: Spree::TaxLine::BUILT_IN_TAXABILITY_REASONS, enum_type_name: 'TaxabilityReason'],
                    country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    state_code: 'string | null',
                    currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode']

data/app/serializers/spree/api/v3/admin/commission_rate_serializer.rb

@@ -15,7 +15,7 @@ module Spree
                    enabled: :boolean,
                    position: :number,
                    global: :boolean,
-                   kind: [:string, enum: Spree::CommissionRate::KINDS],
+                   kind: [:string, enum: Spree::CommissionRate::KINDS, enum_type_name: 'CommissionKind'],
                    amounts: 'Record<string, string>',
                    bounds: 'Record<string, { min_amount: string | null; max_amount: string | null }>',
                    tax_inclusive: :boolean,

data/app/serializers/spree/api/v3/admin/consent_record_serializer.rb

@@ -5,7 +5,7 @@ module Spree
         # Admin API Consent Record Serializer
         # The evidence trail behind a customer's consent state.
         class ConsentRecordSerializer < BaseSerializer
-          typelize purpose: :string, source: [:string, enum: Spree::ConsentRecord::SOURCES], accepted: :boolean,
+          typelize purpose: :string, source: [:string, enum: Spree::ConsentRecord::SOURCES, enum_type_name: 'ConsentSource'], accepted: :boolean,
                    email: [:string, nullable: true],
                    ip_address: [:string, nullable: true],
                    recorded_at: [:string, nullable: true],

data/app/serializers/spree/api/v3/admin/delivery_origin_group_serializer.rb

@@ -19,11 +19,11 @@ module Spree
           end
 
           attribute :delivery_zones_count do |record|
-            record.delivery_zones.count
+            record.delivery_zones.size
           end
 
           attribute :delivery_methods_count do |record|
-            record.delivery_methods.count
+            record.delivery_methods.size
           end
         end
       end

data/app/serializers/spree/api/v3/admin/delivery_profile_serializer.rb

@@ -47,16 +47,14 @@ module Spree
             end
           end
 
-          attribute :products_count do |record|
-            record.products.count
-          end
+          attribute :products_count, &:products_count
 
           attribute :delivery_methods_count do |record|
-            record.delivery_methods.count
+            record.delivery_methods.size
           end
 
           attribute :delivery_zones_count do |record|
-            record.delivery_zones.count
+            record.delivery_zones.size
           end
         end
       end

data/app/serializers/spree/api/v3/admin/digital_asset_serializer.rb

@@ -5,55 +5,11 @@ module Spree
     module V3
       module Admin
         class DigitalAssetSerializer < V3::DigitalAssetSerializer
-          typelize byte_size: [:number, nullable: true],
-                   authorized_clicks: [:number, nullable: true],
-                   authorized_days: [:number, nullable: true],
-                   effective_authorized_clicks: :number,
-                   effective_authorized_days: :number,
-                   provider_type: [:string, nullable: true, comment: 'Digital asset provider; null is an uploaded file. Built-in: file. Extensions may register more.'],
-                   provider_name: [:string, comment: 'Digital asset provider name. Built-in: File. Extensions may register more.'],
-                   provider_settings: 'Record<string, unknown>',
-                   download_url: [:string, nullable: true]
+          include Spree::Api::V3::DigitalAssetDetails
 
-          attributes :authorized_clicks, :authorized_days, :byte_size, :provider_settings
-          attributes created_at: :iso8601, updated_at: :iso8601
+          typelize provider_settings: 'Record<string, unknown>'
 
-          api_type_attributes :provider_type
-
-          # Human-readable source for the admin listing. Blank provider_type is
-          # the uploaded-file default, so this reads "File" there.
-          attribute :provider_name do |digital_asset|
-            digital_asset.provider_class.provider_name
-          end
-
-          # Lets a merchant check what they actually uploaded. Short-lived and
-          # admin-only: this is the file itself, not a customer's download
-          # grant, so it carries no counter and spends nobody's allowance.
-          # Nil for a provider-backed asset (no file to preview) and outside a
-          # request (the Disk service needs a host only a controller supplies).
-          attribute :download_url do |digital_asset, params|
-            next nil unless digital_asset.downloadable?
-
-            store = params&.dig(:store) || Spree::Current.store || digital_asset.store
-            begin
-              digital_asset.download_url(expires_in: store.preferred_digital_asset_link_expire_time.seconds)
-            rescue ArgumentError
-              nil
-            end
-          end
-
-          # The limits actually applied, after the store-settings fallback. The
-          # request's store answers it — an admin request always carries one;
-          # the asset's own store covers serialization outside a request.
-          attribute :effective_authorized_clicks do |digital_asset, params|
-            store = params&.dig(:store) || Spree::Current.store || digital_asset.store
-            digital_asset.effective_authorized_clicks(store)
-          end
-
-          attribute :effective_authorized_days do |digital_asset, params|
-            store = params&.dig(:store) || Spree::Current.store || digital_asset.store
-            digital_asset.effective_authorized_days(store)
-          end
+          attributes :provider_settings
         end
       end
     end

data/app/serializers/spree/api/v3/admin/email_template_serializer.rb

@@ -7,7 +7,7 @@ module Spree
         # default, and the draft in progress.
         class EmailTemplateSerializer < V3::BaseSerializer
           typelize key: :string,
-                   kind: [:string, enum: Spree::Emails::EditableTemplates::KINDS.map(&:to_s)],
+                   kind: [:string, enum: Spree::Emails::EditableTemplates::KINDS.map(&:to_s), enum_type_name: 'EmailTemplateKind'],
                    language: :string,
                    customized: :boolean,
                    customized_languages: [:string, multi: true],

data/app/serializers/spree/api/v3/admin/newsletter_subscriber_serializer.rb

@@ -8,6 +8,7 @@ module Spree
         # Back-office surface, nested under the admin customer serializer. Extends the
         # customer-facing serializer so public fields stay in sync.
         class NewsletterSubscriberSerializer < V3::NewsletterSubscriberSerializer
+          prefixed_id_attributes :customer
         end
       end
     end

data/app/serializers/spree/api/v3/admin/order_serializer.rb

@@ -31,7 +31,7 @@ module Spree
                    total: [:string, nullable: false],
                    amount_due: [:string, nullable: false]
 
-          typelize status: [:string, enum: Spree::Order::STATUSES],
+          typelize status: [:string, enum: Spree::Order::STATUSES, enum_type_name: 'OrderStatus'],
                    last_ip_address: [:string, nullable: true],
                    considered_risky: :boolean, confirmation_delivered: :boolean,
                    store_owner_notification_delivered: [:boolean, nullable: true],

data/app/serializers/spree/api/v3/admin/package_type_serializer.rb

@@ -7,14 +7,14 @@ module Spree
         # only — a shopper never picks their packaging.
         class PackageTypeSerializer < V3::BaseSerializer
           typelize name: :string,
-                   kind: [:string, enum: Spree::PackageType::KINDS],
+                   kind: [:string, enum: Spree::PackageType::KINDS, enum_type_name: 'PackageTypeKind'],
                    length: [:string, nullable: true],
                    width: [:string, nullable: true],
                    height: [:string, nullable: true],
-                   dimensions_unit: [:string, enum: Spree::Variant::DIMENSION_UNITS],
+                   dimensions_unit: [:string, enum: Spree::Variant::DIMENSION_UNITS, enum_type_name: 'DimensionUnit'],
                    weight: [:string, nullable: true],
                    max_weight: [:string, nullable: true],
-                   weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS],
+                   weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS, enum_type_name: 'WeightUnit'],
                    volume: [:string, nullable: true],
                    default: :boolean,
                    seller_id: [:string, nullable: true],

data/app/serializers/spree/api/v3/admin/permission_serializer.rb

@@ -10,7 +10,7 @@ module Spree
           include Alba::Resource
           include Typelizer::DSL
 
-          typelize key: :string, resource: :string, kind: [:string, enum: %w[read write]], group: :string,
+          typelize key: :string, resource: :string, kind: [:string, enum: %w[read write], enum_type_name: 'PermissionKind'], group: :string,
                    group_label: :string, label: :string, description: :string
 
           attributes :key

data/app/serializers/spree/api/v3/admin/price_history_serializer.rb

@@ -13,7 +13,7 @@ module Spree
                    created_at: :string
 
           attribute :variant_id do |price_history|
-            price_history.variant.prefixed_id
+            Spree::Variant.prefixed_id_for(price_history.variant_id)
           end
 
           attribute :price_id do |price_history|

data/app/serializers/spree/api/v3/admin/price_list_serializer.rb

@@ -14,7 +14,7 @@ module Spree
                    starts_at: 'string | null',
                    ends_at: 'string | null',
                    deleted_at: 'string | null',
-                   match_policy: [:string, enum: Spree::PriceList::MATCH_POLICIES],
+                   match_policy: [:string, enum: Spree::PriceList::MATCH_POLICIES, enum_type_name: 'MatchPolicy'],
                    price_adjustment_percentage: 'string | null',
                    adjust_compare_at: :boolean,
                    automatic_pricing: :boolean,
@@ -34,13 +34,18 @@ module Spree
           attribute :currently_active, &:currently_active?
 
           # Cheap counts so the index can render "12 products / 36 prices"
-          # without forcing each row to expand the children.
+          # without forcing each row to expand the children. The index counts
+          # the whole page at once; a single list asks for its own.
           attribute :products_count do |pl|
-            pl.products.count
+            counts = params[:products_counts]
+
+            (counts || Spree::PriceList.products_count_by_list(pl.id)).fetch(pl.id, 0)
           end
 
           attribute :prices_count do |pl|
-            pl.prices.count
+            counts = params[:prices_counts]
+
+            counts ? counts.fetch(pl.id, 0) : pl.prices.count
           end
 
           # Always expanded: a list's bands are the rest of the sentence its

data/app/serializers/spree/api/v3/admin/price_serializer.rb

@@ -17,7 +17,7 @@ module Spree
           attributes :min_quantity
 
           attribute :variant_id do |price|
-            price&.variant&.prefixed_id
+            Spree::Variant.prefixed_id_for(price&.variant_id)
           end
 
           attributes created_at: :iso8601, updated_at: :iso8601

data/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb

@@ -6,7 +6,7 @@ module Spree
         # the merchant owes and expects, which no customer ever sees.
         class PurchaseOrderSerializer < V3::BaseSerializer
           typelize number: :string,
-                   status: :string,
+                   status: [:string, enum: Spree::PurchaseOrder.statuses, enum_type_name: 'PurchaseOrderStatus'],
                    currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    reference: 'string | null',
                    notes: 'string | null',

data/app/serializers/spree/api/v3/admin/seller_payout_serializer.rb

@@ -32,8 +32,8 @@ module Spree
           #
           # Read from a count the controller made for the whole page when there
           # is one; a single payout read falls back to asking for its own.
-          attribute(:transfers_count) do |payout, params|
-            counts = params && params[:transfer_counts]
+          attribute(:transfers_count) do |payout|
+            counts = params[:transfer_counts]
 
             counts ? counts.fetch(payout.id, 0) : payout.transfers.count
           end

data/app/serializers/spree/api/v3/admin/seller_requirement_status_serializer.rb

@@ -12,7 +12,7 @@ module Spree
 
           typelize id: :string, kind: [:string, comment: 'Requirement kind. Built-in: accept_terms, complete_profile, billing_address, returns_address, delivery_method, package_type, minimum_products, payout_account, required_custom_fields, policy, attestation, operator_review, document. Extensions may register more.'], name: :string,
                    description: [:string, nullable: true],
-                   required: :boolean, position: :number, status: [:string, enum: Spree::SellerRequirementStatus::STATUSES],
+                   required: :boolean, position: :number, status: [:string, enum: Spree::SellerRequirementStatus::STATUSES, enum_type_name: 'SellerRequirementState'],
                    blocking: :boolean, action_url: [:string, nullable: true],
                    blocker: ['{ state: string; message: string | null } | null'],
                    required_policy_name: [:string, nullable: true]

data/app/serializers/spree/api/v3/admin/seller_serializer.rb

@@ -10,8 +10,8 @@ module Spree
                    legal_name: [:string, nullable: true],
                    registration_number: [:string, nullable: true],
                    contact_email: [:string, nullable: true], billing_email: [:string, nullable: true],
-                   tax_remittance: :string,
-                   payouts_schedule_interval: [:string, nullable: true],
+                   tax_remittance: [:string, enum: Spree::Seller::TAX_REMITTANCES, enum_type_name: 'TaxRemittance'],
+                   payouts_schedule_interval: [:string, nullable: true, enum: Spree::Seller::PAYOUT_INTERVALS, enum_type_name: 'PayoutScheduleInterval'],
                    minimum_payout_amount: [:string, nullable: true],
                    holiday_mode_until: [:string, nullable: true],
                    terms_accepted_at: [:string, nullable: true],
@@ -54,9 +54,7 @@ module Spree
           # so the minimum-products requirement asks the same question free.
           attributes :products_count
 
-          attribute :users_count do |seller|
-            seller.users.size
-          end
+          attributes :users_count
 
           # How far through the marketplace's checklist this seller is — what
           # the list's progress column and the profile's badge render. The

data/app/serializers/spree/api/v3/admin/seller_transfer_serializer.rb

@@ -14,7 +14,7 @@ module Spree
                    refund_id: 'string | null',
                    seller_name: 'string | null',
                    order_number: 'string | null',
-                   kind: [:string, enum: Spree::SellerTransfer::KINDS],
+                   kind: [:string, enum: Spree::SellerTransfer::KINDS, enum_type_name: 'SellerTransferKind'],
                    status: [:string, enum: Spree::SellerTransfer.statuses, enum_type_name: 'SellerTransferStatus'],
                    provider: [:string, comment: 'Payout provider. Built-in: system. Provider gems register more (e.g. stripe).'],
                    amount: :string,

data/app/serializers/spree/api/v3/admin/shipping_label_serializer.rb

@@ -7,15 +7,15 @@ module Spree
         # The file is streamed through +download_url+, never linked to storage.
         class ShippingLabelSerializer < V3::BaseSerializer
           typelize owner_id: :string,
-                   owner_type: [:string, enum: Spree::ShippingLabel::OWNER_TYPES.map { |type| Spree::Base.polymorphic_api_type(type) }],
-                   source: [:string, enum: Spree::ShippingLabel::SOURCES],
+                   owner_type: [:string, enum: Spree::ShippingLabel::OWNER_TYPES.map { |type| Spree::Base.polymorphic_api_type(type) }, enum_type_name: 'ShippingLabelOwnerType'],
+                   source: [:string, enum: Spree::ShippingLabel::SOURCES, enum_type_name: 'ShippingLabelSource'],
                    status: [:string, enum: Spree::ShippingLabel.statuses, enum_type_name: 'ShippingLabelStatus'],
                    carrier: [:string, nullable: true],
                    carrier_name: [:string, nullable: true],
                    service: [:string, nullable: true],
                    tracking_number: [:string, nullable: true],
                    currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                   format: [:string, nullable: true],
+                   format: [:string, nullable: true, enum: Spree::ShippingLabel::FORMATS, enum_type_name: 'ShippingLabelFormat'],
                    external_id: [:string, nullable: true],
                    integration_id: [:string, nullable: true],
                    download_url: [:string, nullable: true],

data/app/serializers/spree/api/v3/admin/stock_location_serializer.rb

@@ -15,7 +15,7 @@ module Spree
                    address2: [:string, nullable: true], state_name: [:string, nullable: true],
                    phone: [:string, nullable: true], company: [:string, nullable: true],
                    kind: [:string, enum: Spree::StockLocation::KINDS, enum_type_name: 'StockLocationKind'],
-                   pickup_stock_policy: [:string, enum: Spree::StockLocation::PICKUP_STOCK_POLICIES],
+                   pickup_stock_policy: [:string, enum: Spree::StockLocation::PICKUP_STOCK_POLICIES, enum_type_name: 'PickupStockPolicy'],
                    pickup_ready_in_minutes: [:number, nullable: true],
                    pickup_instructions: [:string, nullable: true]
 

data/app/serializers/spree/api/v3/admin/stock_receipt_item_serializer.rb

@@ -7,9 +7,9 @@ module Spree
         class StockReceiptItemSerializer < V3::BaseSerializer
           typelize quantity_accepted: :number,
                    quantity_rejected: :number,
-                   rejection_reason: [:string, enum: Spree::StockReceiptItem::REJECTION_REASONS, nullable: true],
+                   rejection_reason: [:string, enum: Spree::StockReceiptItem::REJECTION_REASONS, nullable: true, enum_type_name: 'StockReceiptRejectionReason'],
                    notes: 'string | null',
-                   line_type: [:string, enum: %w[purchase_order_item stock_transfer_item]],
+                   line_type: [:string, enum: %w[purchase_order_item stock_transfer_item], enum_type_name: 'StockReceiptLineType'],
                    line_id: 'string | null',
                    product_id: 'string | null',
                    variant_id: 'string | null',

data/app/serializers/spree/api/v3/admin/stock_receipt_serializer.rb

@@ -9,7 +9,7 @@ module Spree
                    reference: 'string | null',
                    notes: 'string | null',
                    received_at: :string,
-                   receivable_type: [:string, enum: %w[purchase_order stock_transfer]],
+                   receivable_type: [:string, enum: %w[purchase_order stock_transfer], enum_type_name: 'StockReceiptReceivableType'],
                    receivable_id: :string,
                    received_by_id: 'string | null',
                    received_by_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],

data/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb

@@ -6,7 +6,7 @@ module Spree
         # has a middle: `shipped_at` is when the units left the source,
         # `received_at` when the destination finished counting them in.
         class StockTransferSerializer < V3::StockTransferSerializer
-          typelize status: :string,
+          typelize status: [:string, enum: Spree::StockTransfer.statuses, enum_type_name: 'StockTransferStatus'],
                    notes: 'string | null',
                    items_count: :number,
                    quantity_shipped_total: :number,

data/app/serializers/spree/api/v3/admin/store_credit_serializer.rb

@@ -7,6 +7,7 @@ module Spree
 
           typelize customer_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true],
+                   created_by_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],
                    memo: [:string, nullable: true],
                    amount: [:string, nullable: false], amount_used: [:string, nullable: false],
                    amount_remaining: [:string, nullable: false],
@@ -27,7 +28,8 @@ module Spree
           # money_attributes types its fields nullable for gated guests; the
           # Admin API never gates prices.
           typelize amount_authorized: [:string, nullable: false]
-          prefixed_id_attributes :customer, :created_by
+          prefixed_id_attributes :customer
+          actor_attributes :created_by
 
           # Why the credit exists: the return, exchange, claim or gift card
           # that issued it, or null when an admin issued it by hand. The type
@@ -50,10 +52,6 @@ module Spree
           one :customer,
               resource: proc { Spree.api.admin_customer_serializer },
               if: proc { expand?('customer') }
-
-          one :created_by,
-              resource: proc { Spree.api.admin_admin_user_serializer },
-              if: proc { expand?('created_by') }
         end
       end
     end

data/app/serializers/spree/api/v3/admin/store_serializer.rb

@@ -36,6 +36,7 @@ module Spree
           # and rate settings are formatted below.
           preference_attributes Spree::Store, except: %i[order_routing_strategy payout_provider
                                                          default_minimum_payout_amount default_commission_tax_rate]
+          typelize weight_unit: [:string, enum: Spree::Variant::WEIGHT_UNITS, enum_type_name: 'WeightUnit']
 
           # Once the counter has issued a number the starting value no longer
           # applies, so the settings page can say that instead of accepting a

data/app/serializers/spree/api/v3/admin/tax_identifier_serializer.rb

@@ -3,10 +3,10 @@ module Spree
     module V3
       module Admin
         class TaxIdentifierSerializer < V3::TaxIdentifierSerializer
-          typelize validation_status: [:string, nullable: true, enum: Spree::TaxIdentifier::VALIDATION_STATUSES],
+          typelize validation_status: [:string, nullable: true, enum: Spree::TaxIdentifier::VALIDATION_STATUSES, enum_type_name: 'TaxIdentifierValidationStatus'],
                    validated_at: [:string, nullable: true],
                    validation_evidence: ['Record<string, unknown>', nullable: true],
-                   source: [:string, nullable: true, enum: Spree::TaxIdentifier::SOURCES],
+                   source: [:string, nullable: true, enum: Spree::TaxIdentifier::SOURCES, enum_type_name: 'TaxIdentifierSource'],
                    validatable: :boolean,
                    customer_id: [:string, nullable: true],
                    cart_id: [:string, nullable: true],