spree_api 5.4.0.beta9 → 5.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7630000b76a8d6596d6a94e2e5ef3b928ad55035995a777d79a855da0b83e707
-  data.tar.gz: 5621ebbdb257e9c69518e3ad71a9368954c0fbf7db6ad7a3b4adb237b00cb83b
+  metadata.gz: 4378e0d0d201591ada81caa1958a92ca6aa55d8e2ff79d8b90b58016ff1b834b
+  data.tar.gz: 32fddc14b53ae38f7c80192be53a456e84b4862f58ddc3492a499ccbf2e67d53
 SHA512:
-  metadata.gz: ecdbc7f8b2e6792a1e8641ebaabfcc69423705f032435bb960ff3f2ae36eb19c89dc224b8af79278b3e74536ca95112442139278e847cca9710f437300d9395e
-  data.tar.gz: 8264257bdf243e8bc504880ceed1f99233baaf09bf6e7264714ab9395b59429e0c9c553269012015d9e870dd3dc797b19224d204b7a33518681878533200e71e
+  metadata.gz: 8f597f0fcb3d074cb90593a0feb619220642e13dbeefc994839b208f7639eabd0273e5b4a8223e8c4aa6ebbe9bd05add4559a9c6aac0de50cd837ee56060dcec
+  data.tar.gz: 03e32f252a79ec570e5d91fc5ed4113367b6892c384c7bc49eb0772b3f00c899d2007fc3be6424676cdbab7522b00f6db550425c9c68e932b761f582061bda14

data/Rakefile

@@ -46,6 +46,23 @@ namespace :typelizer do
 
     # Writer config is in config/initializers/typelizer.rb
     Typelizer::Generator.call(force: true)
+
+    # Post-process: convert `type Foo = {` to `interface Foo {` for declaration merging support.
+    # This lets SDK consumers extend generated types via `declare module '@spree/sdk' { interface Product { ... } }`.
+    api_root = Spree::Api::Engine.root
+    [
+      api_root.join('../../packages/sdk/src/types/generated'),
+      api_root.join('../../packages/admin-sdk/src/types/generated')
+    ].each do |dir|
+      Dir[File.join(dir, '*.ts')].each do |file|
+        next if File.basename(file) == 'index.ts'
+
+        content = File.read(file)
+        updated = content.gsub(/^type (\w+) = \{/, 'interface \1 {')
+        File.write(file, updated) if updated != content
+      end
+    end
+
     puts "Generated types → packages/sdk/src/types/generated/ & packages/admin-sdk/src/types/generated/"
   end
 

data/app/controllers/concerns/spree/api/v3/http_caching.rb

@@ -72,7 +72,7 @@ module Spree
         # Includes: latest updated_at, total count, query params, pagination, expand, currency, locale
         def collection_cache_key(collection)
           # For ActiveRecord collections use updated_at, for plain arrays use store's updated_at as proxy
-          latest_updated_at = if collection.first.respond_to?(:updated_at)
+          latest_updated_at = if collection.first&.respond_to?(:updated_at)
                                 collection.map(&:updated_at).max&.to_i
                               else
                                 current_store&.updated_at&.to_i

data/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        module SearchProviderSupport
+          extend ActiveSupport::Concern
+
+          private
+
+          def search_query
+            params.dig(:q, :search)
+          end
+
+          def search_filters
+            q = params[:q]&.to_unsafe_h || params[:q] || {}
+            q = q.to_h if q.respond_to?(:to_h) && !q.is_a?(Hash)
+            q.except('search').presence
+          end
+
+          def search_provider
+            @search_provider ||= Spree.search_provider.constantize.new(current_store)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v3/store/carts_controller.rb

@@ -140,13 +140,14 @@ module Spree
           def permitted_params
             params.permit(
               :email,
-              :special_instructions,
+              :customer_note,
               :currency,
               :locale,
-              :ship_address_id,
-              :bill_address_id,
-              ship_address: address_params,
-              bill_address: address_params,
+              :shipping_address_id,
+              :billing_address_id,
+              :use_shipping,
+              shipping_address: address_params,
+              billing_address: address_params,
               metadata: {},
               items: item_params
             )
@@ -154,8 +155,9 @@ module Spree
 
           def address_params
             [
-              :id, :firstname, :lastname, :address1, :address2,
-              :city, :zipcode, :phone, :company,
+              :id, :first_name, :last_name,
+              :address1, :address2,
+              :city, :postal_code, :phone, :company,
               :country_iso, :state_abbr, :state_name, :quick_checkout
             ]
           end

data/app/controllers/spree/api/v3/store/customer/addresses_controller.rb

@@ -73,8 +73,8 @@ module Spree
 
             def permitted_params
               params.permit(
-                :firstname, :lastname, :address1, :address2, :city,
-                :zipcode, :phone, :company, :country_iso, :state_abbr, :state_name
+                :first_name, :last_name, :address1, :address2, :city,
+                :postal_code, :phone, :company, :country_iso, :state_abbr, :state_name
               )
             end
           end

data/app/controllers/spree/api/v3/store/products/filters_controller.rb

@@ -4,29 +4,33 @@ module Spree
       module Store
         module Products
           class FiltersController < Store::BaseController
+            include Spree::Api::V3::Store::SearchProviderSupport
+
             def index
-              aggregator = Spree::Api::V3::FiltersAggregator.new(
+              result = search_provider.search_and_filter(
                 scope: filters_scope,
-                currency: current_currency,
-                category: category
+                query: search_query,
+                filters: (search_filters || {}).merge('_category' => category),
+                page: 1,
+                limit: 0
               )
-              render json: aggregator.call
+
+              render json: {
+                filters: result.filters,
+                sort_options: result.sort_options,
+                default_sort: result.default_sort,
+                total_count: result.total_count
+              }
             end
 
             private
 
-            # Build scope from category and/or ransack params
-            # @return [ActiveRecord::Relation]
             def filters_scope
               scope = current_store.products.active(current_currency)
               scope = scope.in_category(category) if category.present?
-              scope = scope.ransack(params[:q]).result if params[:q].present?
               scope.accessible_by(current_ability, :show)
             end
 
-            # Fetches category from params
-            # @param [String] category_id
-            # @return [Spree::Category]
             def category
               category_id = params[:category_id]
               @category ||= category_id.present? ? current_store.categories.find_by_param(category_id) : nil

data/app/controllers/spree/api/v3/store/products_controller.rb

@@ -4,13 +4,7 @@ module Spree
       module Store
         class ProductsController < ResourceController
           include Spree::Api::V3::HttpCaching
-
-          # Sort values that require special scopes (not plain Ransack column sorts).
-          CUSTOM_SORT_SCOPES = {
-            'price' => :ascend_by_price,
-            '-price' => :descend_by_price,
-            'best_selling' => :by_best_selling
-          }.freeze
+          include Spree::Api::V3::Store::SearchProviderSupport
 
           protected
 
@@ -47,37 +41,23 @@ module Spree
             ]
           end
 
-          # Applies sorting from the unified `sort` param.
-          # Custom values ('price', '-price', 'best_selling') use product-specific scopes.
-          # Standard Ransack values ('name', '-created_at') are handled by base ResourceController.
-          def apply_collection_sort(collection)
-            sort_value = sort_param
-            return collection unless sort_value.present?
-
-            scope_method = CUSTOM_SORT_SCOPES[sort_value]
-            return collection unless scope_method
-
-            sorted = collection.reorder(nil)
-            sorted.send(scope_method)
-          end
-
-          # Skip base Ransack sort injection for custom sort scopes
-          def ransack_params
-            rp = super
-
-            # Remove Ransack sort when a custom scope handles it
-            if sort_param.present? && CUSTOM_SORT_SCOPES.key?(sort_param)
-              rp = rp.is_a?(Hash) ? rp.dup : rp.to_unsafe_h
-              rp.delete('s')
-            end
-
-            rp
-          end
+          # Override collection to use search provider.
+          # The provider handles search, filtering, sorting, pagination, and returns a Pagy object.
+          def collection
+            return @collection if @collection.present?
 
-          private
+            result = search_provider.search_and_filter(
+              scope: scope.includes(collection_includes).preload_associations_lazily.accessible_by(current_ability, :show),
+              query: search_query,
+              filters: search_filters,
+              sort: sort_param,
+              page: page,
+              limit: limit
+            )
 
-          def custom_sort_requested?
-            CUSTOM_SORT_SCOPES.key?(sort_param)
+            @search_result = result
+            @pagy = result.pagy
+            @collection = result.products
           end
         end
       end

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

@@ -2,15 +2,15 @@ module Spree
   module Api
     module V3
       class AddressSerializer < BaseSerializer
-        typelize firstname: [:string, nullable: true], lastname: [:string, nullable: true], full_name: :string,
+        typelize first_name: [:string, nullable: true], last_name: [:string, nullable: true], full_name: :string,
                  address1: [:string, nullable: true], address2: [:string, nullable: true],
-                 city: [:string, nullable: true], zipcode: [:string, nullable: true], phone: [:string, nullable: true],
+                 city: [:string, nullable: true], postal_code: [:string, nullable: true], phone: [:string, nullable: true],
                  company: [:string, nullable: true], state_abbr: [:string, nullable: true], state_name: [:string, nullable: true],
                  state_text: [:string, nullable: true], country_iso: :string, country_name: :string,
                  quick_checkout: :boolean
 
-        attributes :firstname, :lastname, :full_name, :address1, :address2,
-                   :city, :zipcode, :phone, :company, :country_name, :country_iso, :state_text,
+        attributes :first_name, :last_name, :full_name, :address1, :address2, :postal_code,
+                   :city, :phone, :company, :country_name, :country_iso, :state_text,
                    :state_abbr, :quick_checkout
 
         # State name - used for countries without predefined states

data/app/serializers/spree/api/v3/admin/{order_promotion_serializer.rb → discount_serializer.rb}

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       module Admin
-        class OrderPromotionSerializer < V3::OrderPromotionSerializer
+        class DiscountSerializer < V3::DiscountSerializer
         end
       end
     end

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

@@ -43,13 +43,13 @@ module Spree
           end
 
           # Override inherited associations to use admin serializers
-          many :order_promotions, key: :promotions, resource: Spree.api.admin_order_promotion_serializer, if: proc { expand?('promotions') }
+          many :discounts, resource: Spree.api.admin_discount_serializer, if: proc { expand?('discounts') }
           many :line_items, key: :items, resource: Spree.api.admin_line_item_serializer, if: proc { expand?('items') }
-          many :shipments, key: :fulfillments, resource: Spree.api.admin_fulfillment_serializer, if: proc { expand?('fulfillments') }
+          many :fulfillments, resource: Spree.api.admin_fulfillment_serializer, if: proc { expand?('fulfillments') }
           many :payments, resource: Spree.api.admin_payment_serializer, if: proc { expand?('payments') }
 
-          one :bill_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('bill_address') }
-          one :ship_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('ship_address') }
+          one :billing_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('billing_address') }
+          one :shipping_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('shipping_address') }
 
           many :payment_methods, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_methods') }
 

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

@@ -5,39 +5,34 @@ module Spree
       # Pre-purchase cart data with checkout progression info
       class CartSerializer < BaseSerializer
         typelize number: :string, current_step: :string, completed_steps: 'string[]', token: :string, email: [:string, nullable: true],
-                 special_instructions: [:string, nullable: true], currency: :string, locale: [:string, nullable: true], item_count: :number,
+                 customer_note: [:string, nullable: true], currency: :string, locale: [:string, nullable: true], total_quantity: :number,
                  requirements: 'Array<{step: string, field: string, message: string}>',
                  item_total: :string, display_item_total: :string,
                  delivery_total: :string, display_delivery_total: :string,
                  adjustment_total: :string, display_adjustment_total: :string,
-                 promo_total: :string, display_promo_total: :string,
+                 discount_total: :string, display_discount_total: :string,
                  tax_total: :string, display_tax_total: :string,
                  included_tax_total: :string, display_included_tax_total: :string,
                  additional_tax_total: :string, display_additional_tax_total: :string,
                  total: :string, display_total: :string,
-                 bill_address: { nullable: true }, ship_address: { nullable: true }
+                 shipping_eq_billing_address: :boolean,
+                 billing_address: { nullable: true }, shipping_address: { nullable: true }
 
         # Override ID to use cart_ prefix
         attribute :id do |order|
           "cart_#{Spree::PrefixedId::SQIDS.encode([order.id])}"
         end
 
-        attributes :number, :token, :email, :special_instructions,
-                   :currency, :locale, :item_count,
+        attributes :number, :token, :email, :customer_note,
+                   :currency, :locale, :total_quantity,
                    :item_total, :display_item_total,
-                   :adjustment_total, :display_adjustment_total, :promo_total, :display_promo_total,
+                   :adjustment_total, :display_adjustment_total,
+                   :discount_total, :display_discount_total,
                    :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
                    :additional_tax_total, :display_additional_tax_total, :total, :display_total,
+                   :delivery_total, :display_delivery_total,
                    created_at: :iso8601, updated_at: :iso8601
 
-        attribute :delivery_total do |order|
-          order.ship_total
-        end
-
-        attribute :display_delivery_total do |order|
-          order.display_ship_total.to_s
-        end
-
         attribute :current_step do |order|
           order.current_checkout_step
         end
@@ -50,12 +45,16 @@ module Spree
           Spree::Checkout::Requirements.new(order).call
         end
 
-        many :cart_promotions, key: :promotions, resource: Spree.api.cart_promotion_serializer
+        attribute :shipping_eq_billing_address do |order|
+          order.shipping_eq_billing_address?
+        end
+
+        many :discounts, resource: Spree.api.discount_serializer
         many :line_items, key: :items, resource: Spree.api.line_item_serializer
-        many :shipments, key: :fulfillments, resource: Spree.api.fulfillment_serializer
+        many :fulfillments, resource: Spree.api.fulfillment_serializer
         many :payments, resource: Spree.api.payment_serializer
-        one :bill_address, resource: Spree.api.address_serializer
-        one :ship_address, resource: Spree.api.address_serializer
+        one :billing_address, resource: Spree.api.address_serializer
+        one :shipping_address, resource: Spree.api.address_serializer
 
         many :payment_methods, resource: Spree.api.payment_method_serializer
       end

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

@@ -2,10 +2,11 @@ module Spree
   module Api
     module V3
       class CreditCardSerializer < BaseSerializer
-        typelize cc_type: :string, last_digits: :string, month: :number, year: :number,
-                 name: [:string, nullable: true], default: :boolean, gateway_payment_profile_id: [:string, nullable: true]
+        typelize brand: :string, last4: :string, month: :number, year: :number,
+                 name: [:string, nullable: true], default: :boolean,
+                 gateway_payment_profile_id: [:string, nullable: true]
 
-        attributes :cc_type, :last_digits, :month, :year, :name, :default, :gateway_payment_profile_id
+        attributes :brand, :last4, :month, :year, :name, :default, :gateway_payment_profile_id
       end
     end
   end

data/app/serializers/spree/api/v3/{cart_promotion_serializer.rb → discount_serializer.rb}

@@ -1,14 +1,14 @@
 module Spree
   module Api
     module V3
-      # Cart-facing promotion serializer.
-      # Same data as OrderPromotionSerializer but IDs use the cp_ prefix.
-      class CartPromotionSerializer < BaseSerializer
+      # Unified discount serializer for applied promotions on Cart and Order.
+      # Replaces CartPromotionSerializer and OrderPromotionSerializer.
+      class DiscountSerializer < BaseSerializer
         typelize name: :string, description: [:string, nullable: true], code: [:string, nullable: true],
                  amount: :string, display_amount: :string, promotion_id: :string
 
-        attribute :promotion_id do |cart_promotion|
-          cart_promotion.promotion&.prefixed_id
+        attribute :promotion_id do |record|
+          record.promotion&.prefixed_id
         end
 
         attributes :name, :description, :code, :amount, :display_amount

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

@@ -8,7 +8,7 @@ module Spree
                  adjustment_total: :string, display_adjustment_total: :string,
                  additional_tax_total: :string, display_additional_tax_total: :string,
                  included_tax_total: :string, display_included_tax_total: :string,
-                 promo_total: :string, display_promo_total: :string,
+                 discount_total: :string, display_discount_total: :string,
                  pre_tax_amount: :string, display_pre_tax_amount: :string,
                  discounted_amount: :string, display_discounted_amount: :string,
                  compare_at_amount: [:string, nullable: true], display_compare_at_amount: [:string, nullable: true],
@@ -23,7 +23,7 @@ module Spree
                    :adjustment_total, :display_adjustment_total,
                    :additional_tax_total, :display_additional_tax_total,
                    :included_tax_total, :display_included_tax_total,
-                   :promo_total, :display_promo_total,
+                   :discount_total, :display_discount_total,
                    :pre_tax_amount, :display_pre_tax_amount,
                    :discounted_amount, :display_discounted_amount,
                    :display_compare_at_amount,

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

@@ -2,9 +2,9 @@ module Spree
   module Api
     module V3
       class OptionTypeSerializer < BaseSerializer
-        typelize name: :string, presentation: :string, position: :number
+        typelize name: :string, label: :string, position: :number
 
-        attributes :name, :presentation, :position
+        attributes :name, :label, :position
       end
     end
   end

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

@@ -2,21 +2,21 @@ module Spree
   module Api
     module V3
       class OptionValueSerializer < BaseSerializer
-        typelize name: :string, presentation: :string, position: :number, option_type_id: :string,
-                 option_type_name: :string, option_type_presentation: :string
+        typelize name: :string, label: :string, position: :number, option_type_id: :string,
+                 option_type_name: :string, option_type_label: :string
 
         attribute :option_type_id do |option_value|
           option_value.option_type&.prefixed_id
         end
 
-        attributes :name, :presentation, :position
+        attributes :name, :label, :position
 
         attribute :option_type_name do |option_value|
           option_value.option_type.name
         end
 
-        attribute :option_type_presentation do |option_value|
-          option_value.option_type.presentation
+        attribute :option_type_label do |option_value|
+          option_value.option_type.label
         end
       end
     end

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

@@ -5,48 +5,34 @@ module Spree
       # Post-purchase order data (completed orders)
       class OrderSerializer < BaseSerializer
         typelize number: :string, email: :string,
-                 special_instructions: [:string, nullable: true], currency: :string, locale: [:string, nullable: true], item_count: :number,
+                 customer_note: [:string, nullable: true], currency: :string, locale: [:string, nullable: true], total_quantity: :number,
                  fulfillment_status: [:string, nullable: true], payment_status: [:string, nullable: true],
                  item_total: :string, display_item_total: :string,
                  delivery_total: :string, display_delivery_total: :string,
                  adjustment_total: :string, display_adjustment_total: :string,
-                 promo_total: :string, display_promo_total: :string,
+                 discount_total: :string, display_discount_total: :string,
                  tax_total: :string, display_tax_total: :string,
                  included_tax_total: :string, display_included_tax_total: :string,
                  additional_tax_total: :string, display_additional_tax_total: :string,
                  total: :string, display_total: :string, completed_at: [:string, nullable: true],
-                 bill_address: { nullable: true }, ship_address: { nullable: true }
+                 billing_address: { nullable: true }, shipping_address: { nullable: true }
 
-        attributes :number, :email, :special_instructions,
-                   :currency, :locale, :item_count,
+        attributes :number, :email, :customer_note,
+                   :currency, :locale, :total_quantity,
                    :item_total, :display_item_total,
-                   :adjustment_total, :display_adjustment_total, :promo_total, :display_promo_total,
+                   :adjustment_total, :display_adjustment_total,
+                   :discount_total, :display_discount_total,
                    :tax_total, :display_tax_total, :included_tax_total, :display_included_tax_total,
                    :additional_tax_total, :display_additional_tax_total, :total, :display_total,
+                   :delivery_total, :display_delivery_total, :fulfillment_status, :payment_status,
                    completed_at: :iso8601, created_at: :iso8601, updated_at: :iso8601
 
-        attribute :fulfillment_status do |order|
-          order.shipment_state
-        end
-
-        attribute :payment_status do |order|
-          order.payment_state
-        end
-
-        attribute :delivery_total do |order|
-          order.ship_total
-        end
-
-        attribute :display_delivery_total do |order|
-          order.display_ship_total.to_s
-        end
-
-        many :order_promotions, key: :promotions, resource: Spree.api.order_promotion_serializer
+        many :discounts, resource: Spree.api.discount_serializer
         many :line_items, key: :items, resource: Spree.api.line_item_serializer
-        many :shipments, key: :fulfillments, resource: Spree.api.fulfillment_serializer
+        many :fulfillments, resource: Spree.api.fulfillment_serializer
         many :payments, resource: Spree.api.payment_serializer
-        one :bill_address, resource: Spree.api.address_serializer
-        one :ship_address, resource: Spree.api.address_serializer
+        one :billing_address, resource: Spree.api.address_serializer
+        one :shipping_address, resource: Spree.api.address_serializer
       end
     end
   end

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

@@ -4,9 +4,7 @@ module Spree
       class PaymentSourceSerializer < BaseSerializer
         typelize gateway_payment_profile_id: [:string, nullable: true]
 
-        attribute :gateway_payment_profile_id do |source|
-          source.try(:gateway_payment_profile_id)
-        end
+        attributes :gateway_payment_profile_id
       end
     end
   end

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

@@ -3,25 +3,13 @@
 module Spree
   module Api
     module V3
+      # Store API Promotion Serializer
+      # Minimal public-facing promotion info. Full details in Admin serializer.
       class PromotionSerializer < BaseSerializer
         typelize name: :string, description: [:string, nullable: true],
-                 code: [:string, nullable: true], type: [:string, nullable: true],
-                 kind: [:string, nullable: true], path: [:string, nullable: true],
-                 match_policy: [:string, nullable: true], usage_limit: [:number, nullable: true],
-                 advertise: :boolean, multi_codes: :boolean,
-                 code_prefix: [:string, nullable: true], number_of_codes: [:number, nullable: true],
-                 starts_at: [:string, nullable: true], expires_at: [:string, nullable: true],
-                 promotion_category_id: [:string, nullable: true]
+                 code: [:string, nullable: true]
 
-        attributes :name, :description, :code, :type, :kind, :path,
-                   :match_policy, :usage_limit, :advertise, :multi_codes,
-                   :code_prefix, :number_of_codes,
-                   starts_at: :iso8601, expires_at: :iso8601,
-                   created_at: :iso8601, updated_at: :iso8601
-
-        attribute :promotion_category_id do |promotion|
-          promotion.promotion_category&.prefixed_id
-        end
+        attributes :name, :description, :code
       end
     end
   end

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

@@ -4,13 +4,13 @@ module Spree
   module Api
     module V3
       class ReturnAuthorizationSerializer < BaseSerializer
-        typelize number: :string, state: :string,
+        typelize number: :string, status: :string,
                  order_id: [:string, nullable: true], stock_location_id: [:string, nullable: true],
                  return_authorization_reason_id: [:string, nullable: true]
 
         attributes :number, created_at: :iso8601, updated_at: :iso8601
 
-        attribute :state do |return_authorization|
+        attribute :status do |return_authorization|
           return_authorization.state.to_s
         end
 

data/app/serializers/spree/api/v3/{wished_item_serializer.rb → wishlist_item_serializer.rb}

@@ -1,7 +1,7 @@
 module Spree
   module Api
     module V3
-      class WishedItemSerializer < BaseSerializer
+      class WishlistItemSerializer < BaseSerializer
         typelize variant_id: :string, wishlist_id: :string, quantity: :number
 
         attribute :variant_id do |wished_item|

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

@@ -17,7 +17,7 @@ module Spree
 
         many :wished_items,
              key: :items,
-             resource: Spree.api.wished_item_serializer,
+             resource: Spree.api.wishlist_item_serializer,
              if: proc { expand?('items') }
       end
     end

data/app/services/spree/api/v3/filters_aggregator.rb

@@ -85,7 +85,7 @@ module Spree
               id: option_type.prefixed_id,
               type: 'option',
               name: option_type.name,
-              presentation: option_type.presentation,
+              label: option_type.label,
               options: values.map { |ov| option_value_data(option_type, ov) }
             }
           end
@@ -105,7 +105,7 @@ module Spree
           {
             id: option_value.prefixed_id,
             name: option_value.name,
-            presentation: option_value.presentation,
+            label: option_value.label,
             position: option_value.position,
             count: count
           }

data/config/initializers/typelizer.rb

@@ -10,10 +10,22 @@ Rails.application.config.after_initialize do
     config.comments = true
     config.listen = false
 
+    # Serializers that exist only for Admin API or events — no Store API controller
+    store_excluded = %w[
+      Asset CartPromotion OrderPromotion
+      StockItem StockMovement StockTransfer ShippingCategory
+      Reimbursement Report Export Import ImportRow
+      TaxCategory CustomerReturn
+    ].to_set
+
     # Store SDK — no prefix, package provides namespace
     config.writer(:store) do |c|
       c.output_dir = api_root.join('../../packages/sdk/src/types/generated')
-      c.reject_class = ->(serializer:) { serializer.name.to_s.include?('::Admin::') }
+      c.reject_class = ->(serializer:) {
+        name = serializer.name.to_s
+        name.include?('::Admin::') ||
+          store_excluded.include?(name.sub(/\ASpree::Api::V3::/, '').sub(/Serializer\z/, ''))
+      }
       c.serializer_name_mapper = ->(serializer) {
         serializer.name.to_s
           .sub(/\ASpree::Api::V3::/, '')

data/lib/spree/api/dependencies.rb

@@ -115,7 +115,8 @@ module Spree
         market_serializer: 'Spree::Api::V3::MarketSerializer',
         state_serializer: 'Spree::Api::V3::StateSerializer',
         wishlist_serializer: 'Spree::Api::V3::WishlistSerializer',
-        wished_item_serializer: 'Spree::Api::V3::WishedItemSerializer',
+        wishlist_item_serializer: 'Spree::Api::V3::WishlistItemSerializer',
+        wished_item_serializer: 'Spree::Api::V3::WishlistItemSerializer',
         payment_method_serializer: 'Spree::Api::V3::PaymentMethodSerializer',
         shipping_method_serializer: 'Spree::Api::V3::DeliveryMethodSerializer',
         shipping_rate_serializer: 'Spree::Api::V3::DeliveryRateSerializer',
@@ -123,8 +124,7 @@ module Spree
         delivery_rate_serializer: 'Spree::Api::V3::DeliveryRateSerializer',
         stock_location_serializer: 'Spree::Api::V3::StockLocationSerializer',
         category_serializer: 'Spree::Api::V3::CategorySerializer',
-        cart_promotion_serializer: 'Spree::Api::V3::CartPromotionSerializer',
-        order_promotion_serializer: 'Spree::Api::V3::OrderPromotionSerializer',
+        discount_serializer: 'Spree::Api::V3::DiscountSerializer',
         digital_link_serializer: 'Spree::Api::V3::DigitalLinkSerializer',
         gift_card_serializer: 'Spree::Api::V3::GiftCardSerializer',
         currency_serializer: 'Spree::Api::V3::CurrencySerializer',
@@ -154,6 +154,7 @@ module Spree
         stock_transfer_serializer: 'Spree::Api::V3::StockTransferSerializer',
 
         # v3 admin serializers (API v3 Admin)
+        admin_discount_serializer: 'Spree::Api::V3::Admin::DiscountSerializer',
         admin_customer_serializer: 'Spree::Api::V3::Admin::CustomerSerializer',
         admin_order_serializer: 'Spree::Api::V3::Admin::OrderSerializer',
         admin_product_serializer: 'Spree::Api::V3::Admin::ProductSerializer',
@@ -183,7 +184,6 @@ module Spree
         admin_stock_location_serializer: 'Spree::Api::V3::Admin::StockLocationSerializer',
         admin_shipping_rate_serializer: 'Spree::Api::V3::Admin::DeliveryRateSerializer',
         admin_delivery_rate_serializer: 'Spree::Api::V3::Admin::DeliveryRateSerializer',
-        admin_order_promotion_serializer: 'Spree::Api::V3::Admin::OrderPromotionSerializer',
         admin_payment_method_serializer: 'Spree::Api::V3::Admin::PaymentMethodSerializer',
         admin_credit_card_serializer: 'Spree::Api::V3::Admin::CreditCardSerializer',
         admin_store_credit_serializer: 'Spree::Api::V3::Admin::StoreCreditSerializer',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta9
+  version: 5.4.0.rc1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-17 00:00:00.000000000 Z
+date: 2026-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta9
+        version: 5.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta9
+        version: 5.4.0.rc1
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -114,6 +114,7 @@ files:
 - app/controllers/concerns/spree/api/v3/rate_limit_headers.rb
 - app/controllers/concerns/spree/api/v3/resource_serializer.rb
 - app/controllers/concerns/spree/api/v3/security_headers.rb
+- app/controllers/concerns/spree/api/v3/store/search_provider_support.rb
 - app/controllers/spree/api/v3/admin/base_controller.rb
 - app/controllers/spree/api/v3/admin/resource_controller.rb
 - app/controllers/spree/api/v3/base_controller.rb
@@ -164,13 +165,13 @@ files:
 - app/serializers/spree/api/v3/admin/delivery_method_serializer.rb
 - app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb
 - app/serializers/spree/api/v3/admin/digital_link_serializer.rb
+- app/serializers/spree/api/v3/admin/discount_serializer.rb
 - app/serializers/spree/api/v3/admin/fulfillment_serializer.rb
 - app/serializers/spree/api/v3/admin/line_item_serializer.rb
 - app/serializers/spree/api/v3/admin/media_serializer.rb
 - app/serializers/spree/api/v3/admin/metafield_serializer.rb
 - app/serializers/spree/api/v3/admin/option_type_serializer.rb
 - app/serializers/spree/api/v3/admin/option_value_serializer.rb
-- app/serializers/spree/api/v3/admin/order_promotion_serializer.rb
 - app/serializers/spree/api/v3/admin/order_serializer.rb
 - app/serializers/spree/api/v3/admin/payment_method_serializer.rb
 - app/serializers/spree/api/v3/admin/payment_serializer.rb
@@ -188,7 +189,6 @@ files:
 - app/serializers/spree/api/v3/admin/variant_serializer.rb
 - app/serializers/spree/api/v3/asset_serializer.rb
 - app/serializers/spree/api/v3/base_serializer.rb
-- app/serializers/spree/api/v3/cart_promotion_serializer.rb
 - app/serializers/spree/api/v3/cart_serializer.rb
 - app/serializers/spree/api/v3/category_serializer.rb
 - app/serializers/spree/api/v3/country_serializer.rb
@@ -200,6 +200,7 @@ files:
 - app/serializers/spree/api/v3/delivery_rate_serializer.rb
 - app/serializers/spree/api/v3/digital_link_serializer.rb
 - app/serializers/spree/api/v3/digital_serializer.rb
+- app/serializers/spree/api/v3/discount_serializer.rb
 - app/serializers/spree/api/v3/export_serializer.rb
 - app/serializers/spree/api/v3/fulfillment_serializer.rb
 - app/serializers/spree/api/v3/gift_card_batch_serializer.rb
@@ -215,7 +216,6 @@ files:
 - app/serializers/spree/api/v3/newsletter_subscriber_serializer.rb
 - app/serializers/spree/api/v3/option_type_serializer.rb
 - app/serializers/spree/api/v3/option_value_serializer.rb
-- app/serializers/spree/api/v3/order_promotion_serializer.rb
 - app/serializers/spree/api/v3/order_serializer.rb
 - app/serializers/spree/api/v3/payment_method_serializer.rb
 - app/serializers/spree/api/v3/payment_serializer.rb
@@ -239,7 +239,7 @@ files:
 - app/serializers/spree/api/v3/store_credit_serializer.rb
 - app/serializers/spree/api/v3/tax_category_serializer.rb
 - app/serializers/spree/api/v3/variant_serializer.rb
-- app/serializers/spree/api/v3/wished_item_serializer.rb
+- app/serializers/spree/api/v3/wishlist_item_serializer.rb
 - app/serializers/spree/api/v3/wishlist_serializer.rb
 - app/services/spree/api/v3/filters_aggregator.rb
 - app/services/spree/webhooks/deliver_webhook.rb
@@ -268,9 +268,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta9
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta9
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,16 +0,0 @@
-module Spree
-  module Api
-    module V3
-      class OrderPromotionSerializer < BaseSerializer
-        typelize name: :string, description: [:string, nullable: true], code: [:string, nullable: true],
-                 amount: :string, display_amount: :string, promotion_id: :string
-
-        attribute :promotion_id do |order_promotion|
-          order_promotion.promotion&.prefixed_id
-        end
-
-        attributes :name, :description, :code, :amount, :display_amount
-      end
-    end
-  end
-end