Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
fix injecting serializers as association in another serializer (#14238)
Kacper Mękarskic7ebbddde25a
diff --git a/packages/admin-sdk/src/types/generated/PriceRule.ts b/packages/admin-sdk/src/types/generated/PriceRule.tsindex 0aca60d22b..a6d64716c7 100644--- a/packages/admin-sdk/src/types/generated/PriceRule.ts+++ b/packages/admin-sdk/src/types/generated/PriceRule.ts@@ -1,4 +1,4 @@-// Typelizer digest cbc9397d33f0e796562f7f1ef7586420+// Typelizer digest 712cc0859bcb5c6e23c806c75e8bd067//// DO NOT MODIFY: This file was automatically generated by Typelizer.import type {Market, CustomerGroup, Channel, Customer} from '@/types'diff --git a/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rbindex c36d93ab44..333084ea45 100644--- a/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/category_serializer.rb@@ -15,20 +15,20 @@ module Spree# Override inherited associations to use admin serializersone :parent,- resource: Spree.api.admin_category_serializer,+ resource: proc { Spree.api.admin_category_serializer },if: proc { expand?('parent') }many :children,- resource: Spree.api.admin_category_serializer,+ resource: proc { Spree.api.admin_category_serializer },if: proc { expand?('children') }many :ancestors,- resource: Spree.api.admin_category_serializer,+ resource: proc { Spree.api.admin_category_serializer },if: proc { expand?('ancestors') }many :metafields,key: :custom_fields,- resource: Spree.api.admin_custom_field_serializer,+ resource: proc { Spree.api.admin_custom_field_serializer },if: proc { expand?('custom_fields') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/country_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/country_serializer.rbindex fcf61eda8d..c73bd424d1 100644--- a/spree/api/app/serializers/spree/api/v3/admin/country_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/country_serializer.rb@@ -6,7 +6,7 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601many :states,- resource: Spree.api.admin_state_serializer,+ resource: proc { Spree.api.admin_state_serializer },if: proc { params[:expand]&.include?('states') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rbindex 3ac9dfa338..43db169627 100644--- a/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/customer_group_serializer.rb@@ -18,7 +18,7 @@ module Spree# whole list on every group fetch would explode the index payload.# Pass `expand=customers` when you need them inline (single-record reads only).many :customers,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('customers') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rbindex 27b2c765c8..32f6a23ce6 100644--- a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb@@ -81,16 +81,16 @@ module Spreeend# Override inherited associations to use admin serializers- many :addresses, resource: Spree.api.admin_address_serializer, if: proc { expand?('addresses') }- one :bill_address, key: :default_billing_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('default_billing_address') }- one :ship_address, key: :default_shipping_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('default_shipping_address') }+ many :addresses, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('addresses') }+ one :bill_address, key: :default_billing_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('default_billing_address') }+ one :ship_address, key: :default_shipping_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('default_shipping_address') }many :orders,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('orders') }many :store_credits,- resource: Spree.api.admin_store_credit_serializer,+ resource: proc { Spree.api.admin_store_credit_serializer },if: proc { expand?('store_credits') }attribute :customer_group_ids do |user|@@ -98,7 +98,7 @@ module Spreeendmany :customer_groups,- resource: Spree.api.admin_customer_group_serializer,+ resource: proc { Spree.api.admin_customer_group_serializer },if: proc { expand?('customer_groups') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rbindex d568bf0a03..689503d986 100644--- a/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb@@ -5,7 +5,7 @@ module Spreeclass DeliveryRateSerializer < V3::DeliveryRateSerializerattributes created_at: :iso8601, updated_at: :iso8601- one :shipping_method, key: :delivery_method, resource: Spree.api.admin_delivery_method_serializer, if: proc { expand?('delivery_method') }+ one :shipping_method, key: :delivery_method, resource: proc { Spree.api.admin_delivery_method_serializer }, if: proc { expand?('delivery_method') }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rbindex e8110914c9..cbe3f67df1 100644--- a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb@@ -21,16 +21,16 @@ module Spreeend# Override inherited associations to use admin serializers- one :shipping_method, key: :delivery_method, resource: Spree.api.admin_delivery_method_serializer, if: proc { expand?('delivery_method') }- one :stock_location, resource: Spree.api.admin_stock_location_serializer, if: proc { expand?('stock_location') }- many :shipping_rates, key: :delivery_rates, resource: Spree.api.admin_delivery_rate_serializer, if: proc { expand?('delivery_rates') }+ one :shipping_method, key: :delivery_method, resource: proc { Spree.api.admin_delivery_method_serializer }, if: proc { expand?('delivery_method') }+ one :stock_location, resource: proc { Spree.api.admin_stock_location_serializer }, if: proc { expand?('stock_location') }+ many :shipping_rates, key: :delivery_rates, resource: proc { Spree.api.admin_delivery_rate_serializer }, if: proc { expand?('delivery_rates') }one :order,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('order') }many :adjustments,- resource: Spree.api.admin_adjustment_serializer,+ resource: proc { Spree.api.admin_adjustment_serializer },if: proc { expand?('adjustments') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rbindex 6fe66d450c..1ae035520f 100644--- a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb@@ -24,12 +24,12 @@ module Spree# `expand=customer,created_by` to populate the row chips.one :user,key: :customer,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('customer') }# Admin who issued the card.one :created_by,- resource: Spree.api.admin_admin_user_serializer,+ resource: proc { Spree.api.admin_admin_user_serializer },if: proc { expand?('created_by') }# Batch the card was issued as part of (bulk-issue flow). The@@ -38,12 +38,12 @@ module Spree# column for read/write symmetry.one :batch,key: :gift_card_batch,- resource: Spree.api.admin_gift_card_batch_serializer,+ resource: proc { Spree.api.admin_gift_card_batch_serializer },if: proc { expand?('gift_card_batch') }# Orders that consumed the card. Detail-only — pass `expand=orders`.many :orders,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('orders') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rbindex 7279f22629..35faee9724 100644--- a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb@@ -21,19 +21,19 @@ module Spreeend# Override inherited associations to use admin serializers- many :option_values, resource: Spree.api.admin_option_value_serializer- many :digital_links, resource: Spree.api.admin_digital_link_serializer+ many :option_values, resource: proc { Spree.api.admin_option_value_serializer }+ many :digital_links, resource: proc { Spree.api.admin_digital_link_serializer }one :variant,- resource: Spree.api.admin_variant_serializer,+ resource: proc { Spree.api.admin_variant_serializer },if: proc { expand?('variant') }one :tax_category,- resource: Spree.api.admin_tax_category_serializer,+ resource: proc { Spree.api.admin_tax_category_serializer },if: proc { expand?('tax_category') }many :adjustments,- resource: Spree.api.admin_adjustment_serializer,+ resource: proc { Spree.api.admin_adjustment_serializer },if: proc { expand?('adjustments') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/market_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/market_serializer.rbindex e287d58cc1..b0d0a78cc9 100644--- a/spree/api/app/serializers/spree/api/v3/admin/market_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/market_serializer.rb@@ -6,7 +6,7 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601many :countries,- resource: Spree.api.admin_country_serializer,+ resource: proc { Spree.api.admin_country_serializer },if: proc { expand?(:countries) }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rbindex 776cabf57a..ee0b252051 100644--- a/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/option_type_serializer.rb@@ -11,7 +11,7 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601many :option_values,- resource: Spree.api.admin_option_value_serializer,+ resource: proc { Spree.api.admin_option_value_serializer },if: proc { expand?('option_values') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rbindex f318859ccd..e7c76d8ef0 100644--- a/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/option_value_serializer.rb@@ -9,7 +9,7 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601one :option_type,- resource: Spree.api.admin_option_type_serializer,+ resource: proc { Spree.api.admin_option_type_serializer },if: proc { expand?('option_type') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rbindex 9819c65acb..5e067f7034 100644--- a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb@@ -55,49 +55,49 @@ module Spreeend# Override inherited associations to use admin serializers- 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 :fulfillments, resource: Spree.api.admin_fulfillment_serializer, if: proc { expand?('fulfillments') }- many :payments, resource: Spree.api.admin_payment_serializer, if: proc { expand?('payments') }-- 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') }- one :gift_card, resource: Spree.api.admin_gift_card_serializer- one :market, resource: Spree.api.admin_market_serializer- one :channel, resource: Spree.api.admin_channel_serializer, if: proc { expand?('channel') }+ many :discounts, resource: proc { Spree.api.admin_discount_serializer }, if: proc { expand?('discounts') }+ many :line_items, key: :items, resource: proc { Spree.api.admin_line_item_serializer }, if: proc { expand?('items') }+ many :fulfillments, resource: proc { Spree.api.admin_fulfillment_serializer }, if: proc { expand?('fulfillments') }+ many :payments, resource: proc { Spree.api.admin_payment_serializer }, if: proc { expand?('payments') }++ one :billing_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('billing_address') }+ one :shipping_address, resource: proc { Spree.api.admin_address_serializer }, if: proc { expand?('shipping_address') }+ one :gift_card, resource: proc { Spree.api.admin_gift_card_serializer }+ one :market, resource: proc { Spree.api.admin_market_serializer }+ one :channel, resource: proc { Spree.api.admin_channel_serializer }, if: proc { expand?('channel') }one :preferred_stock_location,- resource: Spree.api.admin_stock_location_serializer,+ resource: proc { Spree.api.admin_stock_location_serializer },if: proc { expand?('preferred_stock_location') }- many :payment_methods, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_methods') }+ many :payment_methods, resource: proc { Spree.api.admin_payment_method_serializer }, if: proc { expand?('payment_methods') }one :user,key: :customer,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('customer') }one :approver,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('approver') }one :canceler,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('canceler') }one :created_by,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { expand?('created_by') }many :adjustments,- resource: Spree.api.admin_adjustment_serializer,+ resource: proc { Spree.api.admin_adjustment_serializer },if: proc { expand?('adjustments') }many :return_authorizations,- resource: Spree.api.admin_return_authorization_serializer,+ resource: proc { Spree.api.admin_return_authorization_serializer },if: proc { expand?('return_authorizations') }many :reimbursements,- resource: Spree.api.admin_reimbursement_serializer,+ resource: proc { Spree.api.admin_reimbursement_serializer },if: proc { expand?('reimbursements') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rbindex 109ccf9986..af30468074 100644--- a/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/payment_serializer.rb@@ -22,7 +22,7 @@ module Spreeend# Override inherited associations to use admin serializers- one :payment_method, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_method') }+ one :payment_method, resource: proc { Spree.api.admin_payment_method_serializer }, if: proc { expand?('payment_method') }attribute :source do |payment|next nil if payment.source.blank?@@ -40,11 +40,11 @@ module Spreeendone :order,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('order') }many :refunds,- resource: Spree.api.admin_refund_serializer,+ resource: proc { Spree.api.admin_refund_serializer },if: proc { expand?('refunds') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rbindex 7ed426a4ac..341f668803 100644--- a/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/price_list_serializer.rb@@ -42,7 +42,7 @@ module Spreeattribute :product_ids, &:product_prefixed_idsmany :price_rules,- resource: Spree.api.admin_price_rule_serializer,+ resource: proc { Spree.api.admin_price_rule_serializer },if: proc { expand?('price_rules') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/price_rule_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/price_rule_serializer.rbindex 7eae5078c0..01e33506d1 100644--- a/spree/api/app/serializers/spree/api/v3/admin/price_rule_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/price_rule_serializer.rb@@ -37,20 +37,20 @@ module Spree# Embeds skip rules that don't carry the association (e.g.# VolumeRule has no markets/customers — the keys are omitted).many :markets,- resource: Spree.api.admin_market_serializer,+ resource: proc { Spree.api.admin_market_serializer },if: proc { |rule| rule.respond_to?(:markets) }many :customer_groups,- resource: Spree.api.admin_customer_group_serializer,+ resource: proc { Spree.api.admin_customer_group_serializer },if: proc { |rule| rule.respond_to?(:customer_groups) }many :channels,- resource: Spree.api.admin_channel_serializer,+ resource: proc { Spree.api.admin_channel_serializer },if: proc { |rule| rule.respond_to?(:channels) }many :users,key: :customers,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { |rule| rule.respond_to?(:users) }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rbindex 6215173fe3..0371f7eb9d 100644--- a/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/price_serializer.rb@@ -16,7 +16,7 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601one :variant,- resource: Spree.api.admin_variant_serializer,+ resource: proc { Spree.api.admin_variant_serializer },if: proc { expand?('variant') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rbindex 298f78eaa2..09b262bb0c 100644--- a/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/product_serializer.rb@@ -39,28 +39,28 @@ module Spree# Admin uses admin variant serializermany :variants,- resource: Spree.api.admin_variant_serializer,+ resource: proc { Spree.api.admin_variant_serializer },if: proc { expand?('variants') }one :default_variant,- resource: Spree.api.admin_variant_serializer,+ resource: proc { Spree.api.admin_variant_serializer },if: proc { expand?('default_variant') }one :primary_media,- resource: Spree.api.admin_media_serializer,+ resource: proc { Spree.api.admin_media_serializer },if: proc { expand?('primary_media') }many :gallery_media,key: :media,- resource: Spree.api.admin_media_serializer,+ resource: proc { Spree.api.admin_media_serializer },if: proc { expand?('media') }many :option_types,- resource: Spree.api.admin_option_type_serializer,+ resource: proc { Spree.api.admin_option_type_serializer },if: proc { expand?('option_types') }many :option_values,- resource: Spree.api.admin_option_value_serializer,+ resource: proc { Spree.api.admin_option_value_serializer },if: proc { expand?('option_values') }many :taxons,@@ -68,20 +68,20 @@ module Spreetaxons.select { |t| t.taxonomy.store_id == params[:store].id }},key: :categories,- resource: Spree.api.admin_category_serializer,+ resource: proc { Spree.api.admin_category_serializer },if: proc { expand?('categories') }many :metafields,key: :custom_fields,- resource: Spree.api.admin_custom_field_serializer,+ resource: proc { Spree.api.admin_custom_field_serializer },if: proc { expand?('custom_fields') }many :product_publications,- resource: Spree.api.admin_product_publication_serializer,+ resource: proc { Spree.api.admin_product_publication_serializer },if: proc { expand?('product_publications') }many :channels,- resource: Spree.api.admin_channel_serializer,+ resource: proc { Spree.api.admin_channel_serializer },if: proc { expand?('channels') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rbindex 6d81adc842..69fa408e3e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rb@@ -58,25 +58,25 @@ module Spree# products) skip via `if:` and the key is omitted from the# payload.many :products,- resource: Spree.api.admin_product_serializer,+ resource: proc { Spree.api.admin_product_serializer },if: proc { |rule| rule.respond_to?(:products) }many :taxons,key: :categories,- resource: Spree.api.admin_category_serializer,+ resource: proc { Spree.api.admin_category_serializer },if: proc { |rule| rule.respond_to?(:taxons) }many :users,key: :customers,- resource: Spree.api.admin_customer_serializer,+ resource: proc { Spree.api.admin_customer_serializer },if: proc { |rule| rule.respond_to?(:users) }many :customer_groups,- resource: Spree.api.admin_customer_group_serializer,+ resource: proc { Spree.api.admin_customer_group_serializer },if: proc { |rule| rule.respond_to?(:customer_groups) }many :countries,- resource: Spree.api.admin_country_serializer,+ resource: proc { Spree.api.admin_country_serializer },if: proc { |rule| rule.respond_to?(:countries) }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rbindex 2a719a3383..0920aba83e 100644--- a/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/refund_serializer.rb@@ -12,11 +12,11 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601one :payment,- resource: Spree.api.admin_payment_serializer,+ resource: proc { Spree.api.admin_payment_serializer },if: proc { expand?('payment') }one :reimbursement,- resource: Spree.api.admin_reimbursement_serializer,+ resource: proc { Spree.api.admin_reimbursement_serializer },if: proc { expand?('reimbursement') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/reimbursement_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/reimbursement_serializer.rbindex bbb00a0172..0db322141a 100644--- a/spree/api/app/serializers/spree/api/v3/admin/reimbursement_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/reimbursement_serializer.rb@@ -6,7 +6,7 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601one :order,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('order') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/return_authorization_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/return_authorization_serializer.rbindex 0285967233..f9ca39d1b9 100644--- a/spree/api/app/serializers/spree/api/v3/admin/return_authorization_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/return_authorization_serializer.rb@@ -6,11 +6,11 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601one :order,- resource: Spree.api.admin_order_serializer,+ resource: proc { Spree.api.admin_order_serializer },if: proc { expand?('order') }one :stock_location,- resource: Spree.api.admin_stock_location_serializer,+ resource: proc { Spree.api.admin_stock_location_serializer },if: proc { expand?('stock_location') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_item_serializer.rbindex 3ff1aa572e..7acc4e11b1 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_item_serializer.rb@@ -21,11 +21,11 @@ module Spreeendone :stock_location,- resource: Spree.api.admin_stock_location_serializer,+ resource: proc { Spree.api.admin_stock_location_serializer },if: proc { expand?('stock_location') }one :variant,- resource: Spree.api.admin_variant_serializer,+ resource: proc { Spree.api.admin_variant_serializer },if: proc { expand?('variant') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rbindex c4d43095ae..068594ad6b 100644--- a/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/stock_transfer_serializer.rb@@ -24,11 +24,11 @@ module Spreeendone :source_location,- resource: Spree.api.admin_stock_location_serializer,+ resource: proc { Spree.api.admin_stock_location_serializer },if: proc { expand?('source_location') }one :destination_location,- resource: Spree.api.admin_stock_location_serializer,+ resource: proc { Spree.api.admin_stock_location_serializer },if: proc { expand?('destination_location') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rbindex 044a3847be..636d4e8f69 100644--- a/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/variant_serializer.rb@@ -45,28 +45,28 @@ module Spree# Override inherited associations to use admin serializersone :primary_media,- resource: Spree.api.admin_media_serializer,+ resource: proc { Spree.api.admin_media_serializer },if: proc { expand?('primary_media') }many :gallery_media,key: :media,- resource: Spree.api.admin_media_serializer,+ resource: proc { Spree.api.admin_media_serializer },if: proc { expand?('media') }- many :option_values, resource: Spree.api.admin_option_value_serializer+ many :option_values, resource: proc { Spree.api.admin_option_value_serializer }# All prices for this variant (for admin management)many :prices,- resource: Spree.api.admin_price_serializer,+ resource: proc { Spree.api.admin_price_serializer },if: proc { expand?('prices') }many :metafields,key: :custom_fields,- resource: Spree.api.admin_custom_field_serializer,+ resource: proc { Spree.api.admin_custom_field_serializer },if: proc { expand?('custom_fields') }many :stock_items,- resource: Spree.api.admin_stock_item_serializer,+ resource: proc { Spree.api.admin_stock_item_serializer },if: proc { expand?('stock_items') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/cart_serializer.rb b/spree/api/app/serializers/spree/api/v3/cart_serializer.rbindex 9d506d91cb..7c242ec460 100644--- a/spree/api/app/serializers/spree/api/v3/cart_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/cart_serializer.rb@@ -73,16 +73,16 @@ module Spreeorder.shipping_eq_billing_address?end- many :discounts, resource: Spree.api.discount_serializer- many :line_items, key: :items, resource: Spree.api.line_item_serializer- many :fulfillments, resource: Spree.api.fulfillment_serializer- many :payments, resource: Spree.api.payment_serializer- one :billing_address, resource: Spree.api.address_serializer- one :shipping_address, resource: Spree.api.address_serializer+ many :discounts, resource: proc { Spree.api.discount_serializer }+ many :line_items, key: :items, resource: proc { Spree.api.line_item_serializer }+ many :fulfillments, resource: proc { Spree.api.fulfillment_serializer }+ many :payments, resource: proc { Spree.api.payment_serializer }+ one :billing_address, resource: proc { Spree.api.address_serializer }+ one :shipping_address, resource: proc { Spree.api.address_serializer }- many :payment_methods, resource: Spree.api.payment_method_serializer- one :gift_card, resource: Spree.api.gift_card_serializer- one :market, resource: Spree.api.market_serializer+ many :payment_methods, resource: proc { Spree.api.payment_method_serializer }+ one :gift_card, resource: proc { Spree.api.gift_card_serializer }+ one :market, resource: proc { Spree.api.market_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/category_serializer.rb b/spree/api/app/serializers/spree/api/v3/category_serializer.rbindex e0511bebba..188338035d 100644--- a/spree/api/app/serializers/spree/api/v3/category_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/category_serializer.rb@@ -49,20 +49,20 @@ module Spree# Note: We pass empty expand to nested categories to prevent infinite recursion# (e.g., ancestors trying to load their own ancestors)one :parent,- resource: Spree.api.category_serializer,+ resource: proc { Spree.api.category_serializer },if: proc { expand?('parent') }many :children,- resource: Spree.api.category_serializer,+ resource: proc { Spree.api.category_serializer },if: proc { expand?('children') }many :ancestors,- resource: Spree.api.category_serializer,+ resource: proc { Spree.api.category_serializer },if: proc { expand?('ancestors') }many :public_metafields,key: :custom_fields,- resource: Spree.api.custom_field_serializer,+ resource: proc { Spree.api.custom_field_serializer },if: proc { expand?('custom_fields') }endenddiff --git a/spree/api/app/serializers/spree/api/v3/country_serializer.rb b/spree/api/app/serializers/spree/api/v3/country_serializer.rbindex 1aae63f890..44d97f8720 100644--- a/spree/api/app/serializers/spree/api/v3/country_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/country_serializer.rb@@ -12,7 +12,7 @@ module Spreeattributes :iso, :iso3, :name, :states_required, :zipcode_requiredmany :states,- resource: Spree.api.state_serializer,+ resource: proc { Spree.api.state_serializer },if: proc { params[:expand]&.include?('states') }attribute :market, if: proc { params[:expand]&.include?('market') } do |country|diff --git a/spree/api/app/serializers/spree/api/v3/customer_serializer.rb b/spree/api/app/serializers/spree/api/v3/customer_serializer.rbindex c3d9fbac15..a64c0fdb06 100644--- a/spree/api/app/serializers/spree/api/v3/customer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/customer_serializer.rb@@ -28,9 +28,9 @@ module SpreeSpree::Money.new(user.total_available_store_credit(currency, store), currency: currency).to_send- many :addresses, resource: Spree.api.address_serializer- one :bill_address, key: :default_billing_address, resource: Spree.api.address_serializer- one :ship_address, key: :default_shipping_address, resource: Spree.api.address_serializer+ many :addresses, resource: proc { Spree.api.address_serializer }+ one :bill_address, key: :default_billing_address, resource: proc { Spree.api.address_serializer }+ one :ship_address, key: :default_shipping_address, resource: proc { Spree.api.address_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb b/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rbindex 4cb72b17e8..ad28d1b6cf 100644--- a/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/delivery_rate_serializer.rb@@ -38,7 +38,7 @@ module Spreeshipping_rate.display_tax_total.to_send- one :shipping_method, key: :delivery_method, resource: Spree.api.delivery_method_serializer+ one :shipping_method, key: :delivery_method, resource: proc { Spree.api.delivery_method_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rbindex 0998d09ad8..9d47d3e750 100644--- a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb@@ -47,9 +47,9 @@ module Spreeendend- one :shipping_method, key: :delivery_method, resource: Spree.api.delivery_method_serializer- one :stock_location, resource: Spree.api.stock_location_serializer- many :shipping_rates, key: :delivery_rates, resource: Spree.api.delivery_rate_serializer+ one :shipping_method, key: :delivery_method, resource: proc { Spree.api.delivery_method_serializer }+ one :stock_location, resource: proc { Spree.api.stock_location_serializer }+ many :shipping_rates, key: :delivery_rates, resource: proc { Spree.api.delivery_rate_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rbindex 00787da208..3171277643 100644--- a/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/line_item_serializer.rb@@ -39,8 +39,8 @@ module Spreeimage_url_for(line_item.thumbnail)end- many :option_values, resource: Spree.api.option_value_serializer- many :digital_links, resource: Spree.api.digital_link_serializer+ many :option_values, resource: proc { Spree.api.option_value_serializer }+ many :digital_links, resource: proc { Spree.api.digital_link_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/market_serializer.rb b/spree/api/app/serializers/spree/api/v3/market_serializer.rbindex 98399d775c..a151fbcdff 100644--- a/spree/api/app/serializers/spree/api/v3/market_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/market_serializer.rb@@ -16,7 +16,7 @@ module Spreeendmany :countries,- resource: Spree.api.country_serializer,+ resource: proc { Spree.api.country_serializer },if: proc { expand?(:countries) }endenddiff --git a/spree/api/app/serializers/spree/api/v3/order_serializer.rb b/spree/api/app/serializers/spree/api/v3/order_serializer.rbindex 139a53691b..a3e4e26ae1 100644--- a/spree/api/app/serializers/spree/api/v3/order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/order_serializer.rb@@ -57,14 +57,14 @@ module Spreeorder.covered_by_store_credit?end- many :discounts, resource: Spree.api.discount_serializer- many :line_items, key: :items, resource: Spree.api.line_item_serializer- many :fulfillments, resource: Spree.api.fulfillment_serializer- many :payments, resource: Spree.api.payment_serializer- one :billing_address, resource: Spree.api.address_serializer- one :shipping_address, resource: Spree.api.address_serializer- one :gift_card, resource: Spree.api.gift_card_serializer- one :market, resource: Spree.api.market_serializer+ many :discounts, resource: proc { Spree.api.discount_serializer }+ many :line_items, key: :items, resource: proc { Spree.api.line_item_serializer }+ many :fulfillments, resource: proc { Spree.api.fulfillment_serializer }+ many :payments, resource: proc { Spree.api.payment_serializer }+ one :billing_address, resource: proc { Spree.api.address_serializer }+ one :shipping_address, resource: proc { Spree.api.address_serializer }+ one :gift_card, resource: proc { Spree.api.gift_card_serializer }+ one :market, resource: proc { Spree.api.market_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/payment_serializer.rb b/spree/api/app/serializers/spree/api/v3/payment_serializer.rbindex d76c8f2783..3c000b3059 100644--- a/spree/api/app/serializers/spree/api/v3/payment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/payment_serializer.rb@@ -50,7 +50,7 @@ module Spreeserializer.new(payment.source).to_hend- one :payment_method, resource: Spree.api.payment_method_serializer+ one :payment_method, resource: proc { Spree.api.payment_method_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb b/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rbindex 44f5cd237e..778107f033 100644--- a/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/payment_session_serializer.rb@@ -23,8 +23,8 @@ module Spreesession.order&.prefixed_idend- one :payment_method, resource: Spree.api.payment_method_serializer- one :payment, resource: Spree.api.payment_serializer,+ one :payment_method, resource: proc { Spree.api.payment_method_serializer }+ one :payment, resource: proc { Spree.api.payment_serializer },if: proc { |session| session.payment.present? }endenddiff --git a/spree/api/app/serializers/spree/api/v3/payment_setup_session_serializer.rb b/spree/api/app/serializers/spree/api/v3/payment_setup_session_serializer.rbindex a6f970b2b5..c22788c85e 100644--- a/spree/api/app/serializers/spree/api/v3/payment_setup_session_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/payment_setup_session_serializer.rb@@ -25,7 +25,7 @@ module Spreesession.customer&.prefixed_idend- one :payment_method, resource: Spree.api.payment_method_serializer+ one :payment_method, resource: proc { Spree.api.payment_method_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/product_serializer.rb b/spree/api/app/serializers/spree/api/v3/product_serializer.rbindex 2a68d2ad69..038cb61529 100644--- a/spree/api/app/serializers/spree/api/v3/product_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/product_serializer.rb@@ -80,28 +80,28 @@ module Spree# Conditional associationsone :primary_media,- resource: Spree.api.media_serializer,+ resource: proc { Spree.api.media_serializer },if: proc { expand?('primary_media') }many :gallery_media,key: :media,- resource: Spree.api.media_serializer,+ resource: proc { Spree.api.media_serializer },if: proc { expand?('media') }many :variants,- resource: Spree.api.variant_serializer,+ resource: proc { Spree.api.variant_serializer },if: proc { expand?('variants') }one :default_variant,- resource: Spree.api.variant_serializer,+ resource: proc { Spree.api.variant_serializer },if: proc { expand?('default_variant') }many :option_types,- resource: Spree.api.option_type_serializer,+ resource: proc { Spree.api.option_type_serializer },if: proc { expand?('option_types') }many :option_values,- resource: Spree.api.option_value_serializer,+ resource: proc { Spree.api.option_value_serializer },if: proc { expand?('option_values') }many :taxons,@@ -109,12 +109,12 @@ module Spreetaxons.select { |t| t.taxonomy.store_id == params[:store].id }},key: :categories,- resource: Spree.api.category_serializer,+ resource: proc { Spree.api.category_serializer },if: proc { expand?('categories') }many :public_metafields,key: :custom_fields,- resource: Spree.api.custom_field_serializer,+ resource: proc { Spree.api.custom_field_serializer },if: proc { expand?('custom_fields') }typelize prior_price: ['PriceHistory', nullable: true]diff --git a/spree/api/app/serializers/spree/api/v3/variant_serializer.rb b/spree/api/app/serializers/spree/api/v3/variant_serializer.rbindex 2ebc9de8fc..af63435912 100644--- a/spree/api/app/serializers/spree/api/v3/variant_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/variant_serializer.rb@@ -70,19 +70,19 @@ module Spree# Conditional associationsone :primary_media,- resource: Spree.api.media_serializer,+ resource: proc { Spree.api.media_serializer },if: proc { expand?('primary_media') }many :gallery_media,key: :media,- resource: Spree.api.media_serializer,+ resource: proc { Spree.api.media_serializer },if: proc { expand?('media') }- many :option_values, resource: Spree.api.option_value_serializer+ many :option_values, resource: proc { Spree.api.option_value_serializer }many :public_metafields,key: :custom_fields,- resource: Spree.api.custom_field_serializer,+ resource: proc { Spree.api.custom_field_serializer },if: proc { expand?('custom_fields') }typelize prior_price: ['PriceHistory', nullable: true]diff --git a/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rbindex b9f8f1801b..50792cb6a4 100644--- a/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/wishlist_item_serializer.rb@@ -14,7 +14,7 @@ module Spreeattributes :quantity- one :variant, resource: Spree.api.variant_serializer+ one :variant, resource: proc { Spree.api.variant_serializer }endendenddiff --git a/spree/api/app/serializers/spree/api/v3/wishlist_serializer.rb b/spree/api/app/serializers/spree/api/v3/wishlist_serializer.rbindex 84cfde6294..04bd9be78c 100644--- a/spree/api/app/serializers/spree/api/v3/wishlist_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/wishlist_serializer.rb@@ -16,7 +16,7 @@ module Spreemany :wished_items,key: :items,- resource: Spree.api.wishlist_item_serializer,+ resource: proc { Spree.api.wishlist_item_serializer },if: proc { expand?('items') }endenddiff --git a/spree/api/lib/spree/api.rb b/spree/api/lib/spree/api.rbindex d15287b578..5ec86fa1fe 100644--- a/spree/api/lib/spree/api.rb+++ b/spree/api/lib/spree/api.rb@@ -3,6 +3,8 @@ require 'pagy'require 'alba'require 'oj'require 'typelizer'+require 'typelizer/proc_resource_resolution'+require 'typelizer/always_register_type_hints'module Spreemodule Apidiff --git a/spree/api/lib/typelizer/always_register_type_hints.rb b/spree/api/lib/typelizer/always_register_type_hints.rbnew file mode 100644index 0000000000..843dc5cf7f--- /dev/null+++ b/spree/api/lib/typelizer/always_register_type_hints.rb@@ -0,0 +1,25 @@+module Typelizer+ module DSL+ # Spree generates OpenAPI schemas on demand and keeps Typelizer disabled at boot+ # (so types are not regenerated on every code reload). Upstream `typelize` only+ # records its type hints when Typelizer is enabled at the moment the serializer+ # class body runs — see `assign_type_information`'s `return unless Typelizer.enabled?`.+ # A serializer autoloaded while disabled (e.g. by an earlier spec) therefore loses+ # its hints, and schema generation later falls back to `object` for those attributes+ # (notably the `id`/`created_at`/`updated_at` declared on the shared BaseSerializer).+ #+ # Record the metadata unconditionally — it is harmless to store and is required for+ # on-demand schema generation. Boot-time file generation stays gated by `enabled?`.+ module AlwaysRegisterTypeHints+ def assign_type_information(attribute_name, attributes)+ attributes.each do |name, attrs|+ next unless name++ store_type(attribute_name, name, TypeParser.parse_declaration(attrs))+ end+ end+ end++ ClassMethods.prepend(AlwaysRegisterTypeHints)+ end+enddiff --git a/spree/api/lib/typelizer/proc_resource_resolution.rb b/spree/api/lib/typelizer/proc_resource_resolution.rbnew file mode 100644index 0000000000..a393791d6d--- /dev/null+++ b/spree/api/lib/typelizer/proc_resource_resolution.rb@@ -0,0 +1,14 @@+module Typelizer+ module ProcResourceResolution+ # V3 serializers declare association resources lazily as `proc { Spree.api.x_serializer }`+ # so host-app overrides registered in initializers are respected at render time. Alba+ # calls the proc per object, but Typelizer introspects the resource as a class. Resolve+ # the proc to its serializer class so schema generation works for lazy associations.+ def interface_for(serializer_class)+ serializer_class = serializer_class.call if serializer_class.is_a?(Proc)+ super+ end+ end+end++Typelizer::WriterContext.prepend(Typelizer::ProcResourceResolution)diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rbindex e4f318541e..518999687e 100644--- a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb@@ -1,5 +1,11 @@require 'spec_helper'+class TestAddressWithLandmarkSerializer < ::Spree::Api::V3::AddressSerializer+ attribute :landmark do |address|+ "near #{address.address1}"+ end+end+RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller dorender_views@@ -518,6 +524,33 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller doexpect(json_response['fulfillments']).to be_emptyendend++ context 'with a custom address serializer' do+ let(:cart) { create(:order_with_line_items, store: store) }++ before { request.headers['x-spree-token'] = cart.token }++ around do |example|+ # Force the cart serializer to load before swapping the dependency, mirroring+ # the real-world boot order where serializers are loaded before a host app's+ # initializer overrides Spree.api.address_serializer. Without lazy resolution+ # the eager `resource:` binding would have already captured the default class.+ Spree::Api::V3::CartSerializer+ original = Spree.api.address_serializer+ Spree.api.address_serializer = TestAddressWithLandmarkSerializer+ example.run+ Spree.api.address_serializer = original+ end++ it 'serializes the billing address with the configured serializer' do+ get :show, params: { id: cart.prefixed_id, expand: 'billing_address' }++ expect(response).to have_http_status(:ok)+ address_json = json_response['billing_address']+ expect(address_json['address1']).to eq(cart.bill_address.address1)+ expect(address_json['landmark']).to eq("near #{cart.bill_address.address1}")+ end+ endenddescribe 'PATCH #update' do