spree_api 6.0.0.rc4 → 6.0.0.rc5

data/lib/spree/api/typelizer_generation.rb

@@ -9,6 +9,11 @@ module Spree
       def self.call(serializer_dirs)
         serializer_dirs.each { |dir| Rails.autoloaders.main.eager_load_dir(dir.to_s) }
 
+        # Before the SDK types, so two serializers disagreeing on a list's
+        # values stop generation instead of one of them silently winning.
+        require Spree::Api::Engine.root.join('lib/spree/api/enum_types').to_s
+        Spree::Api::EnumTypes.new.write!(Spree::Api::Engine.root.join('../..'))
+
         require 'typelizer/generator'
         Typelizer::Generator.call(force: true)
 

data/lib/typelizer/open_enums.rb

@@ -8,23 +8,41 @@ module Typelizer
   # from either still accepts an added value while every built-in value stays
   # documented and autocompletable.
   #
-  # ISO lists are the exception: a named type several serializers and the
-  # request types share, but closed, since nothing outside the standard can
-  # add a country or a currency, and markets only accept the locales
-  # `Spree::Locales::ALL` lists. The SDKs define them once, as values and
-  # types, in `@spree/sdk-core` (generated from the API reference by
-  # `pnpm generate:iso-codes`), so each SDK's `Enums.ts` re-exports that
-  # definition instead of carrying a copy of the list.
+  # Every named list is defined once, as values and type, in `@spree/core`, and
+  # each SDK's `Enums.ts` re-exports it through `@spree/sdk-core` instead of
+  # carrying a copy. {Spree::Api::EnumTypes} writes them there.
+  #
+  # A name in `CLOSED_LIST_NAMES` keeps its list closed — named only so it is
+  # defined once — and both contracts stay exactly what `enum:` alone gives.
+  # Shared code lists are closed too, but come from the API reference
+  # (`pnpm generate:code-lists`) rather than the serializers: nothing outside
+  # the standard can add a country, a currency or a unit, and markets only
+  # accept the locales `Spree::Locales::ALL` lists.
   module OpenEnums
-    CLOSED_TYPE_NAMES = %w[CountryCode CurrencyCode LocaleCode].freeze
+    CLOSED_TYPE_NAMES = %w[CountryCode CurrencyCode LocaleCode WeightUnit DimensionUnit].freeze
+
+    CLOSED_LIST_NAMES = %w[
+      ApiKeyType CaptureMethod CatalogAssignableType CatalogPriceSource ClaimResolution
+      CollectionRuleMatchPolicy CollectionSortOrder CommissionKind CompanyInvitationStatus CompanyKind
+      ConsentSource DataRequestKind DeliveryStatus DeliveryZoneMemberType DiscountKind DocumentNumberFormat
+      EmailFont EmailTemplateKind FileUploadVisibility FulfillmentType MatchPolicy MediaType OptionTypeKind
+      OrderFulfillmentStatus OrderPaymentStatus OrderStatus PackageTypeKind PaymentSourceType
+      PayoutScheduleInterval PermissionKind PickupStockPolicy ProviderFailurePolicy PurchaseUnit
+      SellerRequirementState SellerTransferKind ShippingLabelFormat ShippingLabelOwnerType ShippingLabelSource
+      StockAvailability StockMovementKind StockReceiptLineType StockReceiptReceivableType
+      StockReceiptRejectionReason StorefrontAccess TaxIdentifierSource TaxIdentifierValidationStatus
+      TaxRemittance UnitSystem
+    ].freeze
+
+    # @param name [String, nil] a list's `enum_type_name`
+    # @return [Boolean] whether the list is closed: no value outside it is valid
+    def self.closed?(name)
+      CLOSED_TYPE_NAMES.include?(name) || CLOSED_LIST_NAMES.include?(name)
+    end
 
     module Property
       def enum_definition(...)
-        definition = super
-        return definition unless definition
-        return "type { #{enum_type_name} } from '@spree/sdk-core'" if CLOSED_TYPE_NAMES.include?(enum_type_name)
-
-        "#{definition} | (string & {})"
+        super && "type { #{enum_type_name} } from '@spree/sdk-core'"
       end
 
       # Typelizer skips rewriting a file whose digest is unchanged, and the
@@ -32,7 +50,7 @@ module Typelizer
       # the re-export in makes a checkout that still carries the old inline
       # list regenerate.
       def fingerprint
-        return super unless CLOSED_TYPE_NAMES.include?(enum_type_name)
+        return super unless enum_type_name
 
         [super, enum_definition].inspect
       end
@@ -43,10 +61,16 @@ module Typelizer
 
       def inline_schema(definition, property, openapi_version:)
         return super unless property.enum_type_name && property.enum.is_a?(Array) && !property.multi
-        return super if CLOSED_TYPE_NAMES.include?(property.enum_type_name)
+        return super if OpenEnums.closed?(property.enum_type_name)
 
         open = { anyOf: [{ type: :string, enum: property.enum.compact }, { type: :string }] }
-        apply_nullable(open, property, openapi_version: openapi_version)
+        # OpenAPI 3.0 ignores `nullable` beside `anyOf`, which is where
+        # Typelizer puts it, so the free-string branch carries it instead.
+        if property.nullable && !v31?(openapi_version)
+          open[:anyOf].last[:nullable] = true
+        else
+          apply_nullable(open, property, openapi_version: openapi_version)
+        end
         apply_metadata(open, property)
         open[:description] ||= OPEN_ENUM_DESCRIPTION
         open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc4
+  version: 6.0.0.rc5
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-19 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc4
+        version: 6.0.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc4
+        version: 6.0.0.rc5
 description: Spree Commerce Store / Admin API and HTTP webhooks
 email:
 - hello@spreecommerce.org
@@ -75,6 +75,7 @@ files:
 - app/controllers/concerns/spree/api/v3/admin/subclassed_resource.rb
 - app/controllers/concerns/spree/api/v3/admin/validation_details.rb
 - app/controllers/concerns/spree/api/v3/admin_authentication.rb
+- app/controllers/concerns/spree/api/v3/allowed_redirect_url.rb
 - app/controllers/concerns/spree/api/v3/api_key_authentication.rb
 - app/controllers/concerns/spree/api/v3/authentication_strategies.rb
 - app/controllers/concerns/spree/api/v3/bulk_operations.rb
@@ -328,6 +329,7 @@ files:
 - app/controllers/spree/api/v3/store/account/companies_controller.rb
 - app/controllers/spree/api/v3/store/auth_controller.rb
 - app/controllers/spree/api/v3/store/base_controller.rb
+- app/controllers/spree/api/v3/store/carts/addresses_controller.rb
 - app/controllers/spree/api/v3/store/carts/discount_codes_controller.rb
 - app/controllers/spree/api/v3/store/carts/fulfillments_controller.rb
 - app/controllers/spree/api/v3/store/carts/gift_cards_controller.rb
@@ -363,7 +365,9 @@ files:
 - app/controllers/spree/api/v3/store/customer/tax_identifiers_controller.rb
 - app/controllers/spree/api/v3/store/customers_controller.rb
 - app/controllers/spree/api/v3/store/data_feeds_controller.rb
+- app/controllers/spree/api/v3/store/data_request_confirmations_controller.rb
 - app/controllers/spree/api/v3/store/data_request_downloads_controller.rb
+- app/controllers/spree/api/v3/store/data_requests_controller.rb
 - app/controllers/spree/api/v3/store/delivery_methods_controller.rb
 - app/controllers/spree/api/v3/store/digital_links_controller.rb
 - app/controllers/spree/api/v3/store/locales_controller.rb
@@ -405,10 +409,13 @@ files:
 - app/request_schemas/spree/api/v3/admin/promotion_rule_request_schema.rb
 - app/request_schemas/spree/api/v3/admin/reason_request_schema.rb
 - app/request_schemas/spree/api/v3/admin/tax_identifier_request_schema.rb
+- app/request_schemas/spree/api/v3/admin/variant_request_schema.rb
 - app/request_schemas/spree/api/v3/custom_field_value_request_schema.rb
 - app/request_schemas/spree/api/v3/file_upload_request_schema.rb
 - app/request_schemas/spree/api/v3/media_request_schema.rb
 - app/request_schemas/spree/api/v3/price_request_schema.rb
+- app/request_schemas/spree/api/v3/seller/price_request_schema.rb
+- app/request_schemas/spree/api/v3/seller/variant_request_schema.rb
 - app/request_schemas/spree/api/v3/stock_level_request_schema.rb
 - app/request_schemas/spree/api/v3/store/address_request_schema.rb
 - app/request_schemas/spree/api/v3/tax_identifier_request_schema.rb
@@ -416,8 +423,10 @@ files:
 - app/request_schemas/spree/api/v3/variant_request_schema.rb
 - app/serializers/concerns/spree/api/v3/admin/translatable.rb
 - app/serializers/concerns/spree/api/v3/purchase_summary.rb
+- app/serializers/spree/api/v3/address_owner_serializer.rb
 - app/serializers/spree/api/v3/address_serializer.rb
 - app/serializers/spree/api/v3/admin/actor_serializer.rb
+- app/serializers/spree/api/v3/admin/address_owner_serializer.rb
 - app/serializers/spree/api/v3/admin/address_serializer.rb
 - app/serializers/spree/api/v3/admin/admin_user_serializer.rb
 - app/serializers/spree/api/v3/admin/allowed_origin_serializer.rb
@@ -593,6 +602,7 @@ files:
 - app/serializers/spree/api/v3/custom_field_serializer.rb
 - app/serializers/spree/api/v3/customer_group_serializer.rb
 - app/serializers/spree/api/v3/customer_serializer.rb
+- app/serializers/spree/api/v3/data_request_confirmation_requested_event_serializer.rb
 - app/serializers/spree/api/v3/data_request_event_serializer.rb
 - app/serializers/spree/api/v3/data_request_serializer.rb
 - app/serializers/spree/api/v3/delivery_method_serializer.rb
@@ -788,6 +798,7 @@ files:
 - lib/spree/api/configuration.rb
 - lib/spree/api/dependencies.rb
 - lib/spree/api/engine.rb
+- lib/spree/api/enum_types.rb
 - lib/spree/api/extension_fields.rb
 - lib/spree/api/middleware/request_size_limit.rb
 - lib/spree/api/oauth.rb
@@ -812,9 +823,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc5
 post_install_message:
 rdoc_options: []
 require_paths: