shopify_api 14.0.0 → 14.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d335207bd3fc2cf7798f48f3b7a0ff9ea05c05969e189423a9cd89a06c9d155b
-  data.tar.gz: 873f2d725e8e1b84e4d8fc617e1b9aa6d3ddec6a9791646a76fb2f946d39ac9b
+  metadata.gz: 2a0006cbbd93fb9880c4677510cd1223b6119c18176f7fc821c56f46d9220eb2
+  data.tar.gz: 6b1bddbea59b7255f64659ec45cf2d9cd2e4fccf5aaf4a8804d526e37ff0a79c
 SHA512:
-  metadata.gz: 994fa799e6f84043aeec3ffd7c49789588299cf55d40de6bfe091b1b3d935fa99312666d78addb4238532345d6cae97d65f3785ef4fc38a576dfdc9eaa127ca9
-  data.tar.gz: 2ff189f2ecb5bb7a9ead4852162857c6e13a29f5fa2229e15378b1ba05ff92cd9c0a3e663161f4f17285a843a88882b53a358c1070ca881e49ba185be98184e7
+  metadata.gz: 888a1c8560873f27a0d4c73460ab15145410392c6d35818b728e81a5e10813da1032e6638aed8445611dfc46fb2fa08e9afddaf2f54ca762c1a534725d571dc4
+  data.tar.gz: 79bbf5792589e217f4bae76db4d31a9d5b6c9b5e516c200037fd7d624f71a2f462015f264faf378244b73c661de76cbc2f751c278a0c4a60eb61c4b381c7c034

data/.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -6,35 +6,41 @@ labels: "Type: Bug 🐛"
 
 # Issue summary
 
-<!--
-
-Write a short description of the issue here. Please provide any details or logs that
-can help us debug it.
+Before opening this issue, I have:
+
+- [ ] Upgraded to the latest version of the package
+  - `shopify_api` version:
+  - Ruby version:
+  - Operating system:
+- [ ] Set `log_level: :debug` [in my configuration](https://github.com/Shopify/shopify-api-ruby#setup-shopify-context), if applicable
+- [ ] Found a reliable way to reproduce the problem that indicates it's a problem with the package
+- [ ] Looked for similar issues in this repository
+- [ ] Checked that this isn't an issue with a Shopify API
+  - If it is, please create a post in the [Shopify community forums](https://community.shopify.com/c/partners-and-developers/ct-p/appdev) or report it to [Shopify Partner Support](https://help.shopify.com/en/support/partners/org-select)
 
-Increase the logs as described in the README by setting log_level to :debug, and paste the relevant portion here.
-
-Learn more: https://github.com/Shopify/shopify-api-ruby#setup-shopify-context
+<!--
+Write a short description of the issue here.
 
+We can only fix issues for which there is a clear reproduction scenario.
+The more context you can provide, the easier it becomes for us to investigate and fix the issue.
 -->
 
-- `shopify_api` version:
-- Ruby version:
-- Operating system:
-
-```
-// Paste any relevant logs here
-```
-
 ## Expected behavior
 
-<!-- What do you think should happen? -->
+What do you think should happen?
 
 ## Actual behavior
 
-<!-- What actually happens? -->
+What actually happens?
 
 ## Steps to reproduce the problem
 
 1.
 1.
 1.
+
+## Debug logs
+
+```
+// Paste any relevant logs here
+```

data/.github/workflows/build.yml

@@ -13,6 +13,8 @@ jobs:
         version:
           - 3.0
           - 3.1
+          - 3.2
+          - 3.3
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.version }}

data/.rubocop.yml

@@ -5,7 +5,6 @@ require:
   - rubocop-sorbet
 
 AllCops:
-  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - "sorbet/**/*"

data/.ruby-version

@@ -0,0 +1 @@
+3.0.6

data/CHANGELOG.md

@@ -4,6 +4,19 @@ Note: For changes to the API, see https://shopify.dev/changelog?filter=api
 
 ## Unreleased
 
+
+## 14.1.0
+- [#1071](https://github.com/Shopify/shopify-api-ruby/issues/1071) Fix FulfillmentEvent class types
+- Fix: InventoryItem class `harmonized_system_code` attribute type which can be either integer, string or nil
+- Fix: Variant class `inventory_quantity` attribute type which can be either integer, string or nil
+- [1293](https://github.com/Shopify/shopify-api-ruby/issues/1293) Add support for using Storefront private access tokens.
+- [1302](https://github.com/Shopify/shopify-api-ruby/pull/1302) Deprecated passing the public Storefront access token as a positional parameter to the Storefront GraphQL client in favor of using the named parameter. (You probably want to use the private access token for this client anyway.)
+- [1305](https://github.com/Shopify/shopify-api-ruby/pull/1305/) Adds support for the `2024-04` API version.
+
+## 14.0.1
+- [#1288](https://github.com/Shopify/shopify-api-ruby/pull/1288) Fix FeatureDeprecatedError being raised without a message.
+- [1290](https://github.com/Shopify/shopify-api-ruby/pull/1290) Move deprecation of `ShopifyAPI::Webhooks::Handler#handle` to version 15.0.0
+
 ## 14.0.0
 - [#1274](https://github.com/Shopify/shopify-api-ruby/pull/1274) ⚠️ [Breaking] Update sorbet and rbi dependencies. Remove support for ruby 2.7. Minimum required Ruby version is 3.0
 - [#1282](https://github.com/Shopify/shopify-api-ruby/pull/1282) Fixes a bug where diffing attributes to update not take into account of Array changes and required ids.

data/Gemfile

@@ -4,10 +4,22 @@ source "https://rubygems.org"
 
 gemspec
 
+group :test, :development do
+  gem "pry-byebug"
+end
+
+group :development do
+  gem "rake"
+  gem "rubocop"
+  gem "rubocop-shopify"
+  gem "rubocop-sorbet"
+  gem "sorbet"
+  gem "tapioca"
+end
+
 group :test do
   gem "minitest"
   gem "fakefs", require: false
   gem "webmock"
   gem "mocha"
-  gem "pry-byebug"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_api (14.0.0)
+    shopify_api (14.1.0)
       activesupport
       concurrent-ruby
       hash_diff
@@ -16,7 +16,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -30,15 +30,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     erubi (1.12.0)
     fakefs (1.4.1)
     hash_diff (1.1.1)
@@ -46,10 +45,12 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    jwt (2.7.1)
+    json (2.7.1)
+    jwt (2.8.1)
+      base64
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.15.0)
@@ -79,26 +80,26 @@ GEM
     rbi (0.1.8)
       prism (>= 0.18.0, < 0.22)
       sorbet-runtime (>= 0.5.9204)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.62.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-shopify (2.10.1)
       rubocop (~> 1.35)
     rubocop-sorbet (0.6.11)
       rubocop (>= 0.90.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
+    ruby-progressbar (1.13.0)
     securerandom (0.3.1)
     sorbet (0.5.11230)
       sorbet-static (= 0.5.11230)
@@ -115,19 +116,19 @@ GEM
       thor (>= 0.19.2)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    tapioca (0.12.0)
+    tapioca (0.13.1)
       bundler (>= 2.2.25)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
       rbi (>= 0.1.4, < 0.2)
-      sorbet-static-and-runtime (>= 0.5.10820)
-      spoom (~> 1.2.0, >= 1.2.0)
+      sorbet-static-and-runtime (>= 0.5.11087)
+      spoom (>= 1.2.0)
       thor (>= 1.2.0)
       yard-sorbet
     thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -140,6 +141,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
   universal-darwin-22
   x86_64-linux
 

data/dev.yml

@@ -3,7 +3,7 @@ name: shopify-api
 type: ruby
 
 up:
-  - ruby: 3.0.6
+  - ruby
   - bundler:
       gemfile: Gemfile
 

data/docs/usage/custom_apps.md

@@ -10,7 +10,7 @@ You can follow instructions for [initializing the session object](#initializing-
 Following is a basic example to construct a simple Session object. You can see full list of parameters for this object in the [class definition](https://github.com/Shopify/shopify-api-ruby/blob/main/lib/shopify_api/auth/session.rb)
 ```ruby
 session = ShopifyAPI::Auth::Session.new(
-  shop: "#{your_shop_name}.myshopify.com"
+  shop: "#{your_shop_name}.myshopify.com",
   access_token: "the_token_for_your_custom_app_found_in_admin"
 )
 
@@ -23,7 +23,7 @@ Example:
 def make_api_request(shop)
   # 1. create session object
     session = ShopifyAPI::Auth::Session.new(
-      shop: "#{your_shop_name}.myshopify.com"
+      shop: "#{your_shop_name}.myshopify.com",
       access_token: "the_token_for_your_custom_app_found_in_admin"
     )
 
@@ -49,7 +49,7 @@ Example:
 def configure_app
   # This method is called before making authenticated API calls
   session = ShopifyAPI::Auth::Session.new(
-      shop: "#{your_shop_name}.myshopify.com"
+      shop: "#{your_shop_name}.myshopify.com",
       access_token: "the_token_for_your_custom_app_found_in_admin"
     )
 

data/docs/usage/graphql_storefront.md

@@ -1,6 +1,6 @@
 # Make a Storefront API call
 
-The library also allows you to send GraphQL requests to the [Shopify Storefront API](https://shopify.dev/docs/api/storefront). To do that, you can use `ShopifyAPI::Clients::Graphql::Storefront` with the current session and a `storefrontAccessToken`.
+The library also allows you to send GraphQL requests to the [Shopify Storefront API](https://shopify.dev/docs/api/storefront). To do that, you can use `ShopifyAPI::Clients::Graphql::Storefront` with either a [private or public Storefront access token](https://shopify.dev/docs/api/usage/authentication#access-tokens-for-the-storefront-api).
 
 You can obtain Storefront API access tokens for both private apps and sales channels. Please read [our documentation](https://shopify.dev/docs/custom-storefronts/building-with-the-storefront-api/getting-started) to learn more about Storefront Access Tokens.
 
@@ -8,12 +8,14 @@ Below is an example of how you may query the Storefront API:
 
 ```ruby
 # Load the access token as per instructions above
-storefront_access_token = ''
+storefront_private_access_token = ''
 # your shop domain
 shop_url = 'shop.myshopify.com'
 
-# initialize the client with session and storefront access token
-client = ShopifyAPI::Clients::Graphql::Storefront.new(shop_url, storefront_access_token)
+# initialize the client with session and a private Storefront access token
+client = ShopifyAPI::Clients::Graphql::Storefront.new(shop_url, private_token: storefront_private_access_token)
+# or, alternatively with a public Storefront access token:
+# client = ShopifyAPI::Clients::Graphql::Storefront.new(shop_url, public_token: storefront_public_access_token)
 
 query = <<~QUERY
   {
@@ -35,14 +37,19 @@ query = <<~QUERY
   }
 QUERY
 
-response = client.query(query: query)
+# You may not need the "Shopify-Storefront-Buyer-IP" header, see its documentation: 
+# https://shopify.dev/docs/api/usage/authentication#making-server-side-requests
+response = client.query(query: query, headers: { "Shopify-Storefront-Buyer-IP": request.ip })
 # do something with the returned data
 ```
 
 By default, the client uses the API version configured in `ShopifyAPI`.  To use a different API version, set the optional `api_version` parameter.  To experiment with prerelease API features, use `"unstable"` for the API version.
 
 ```ruby
-client = ShopifyAPI::Clients::Graphql::Storefront.new(shop_url, storefront_access_token, api_version: "unstable")
+client = ShopifyAPI::Clients::Graphql::Storefront.new(shop_url,
+  private_token: storefront_private_access_token,
+  api_version: "unstable"
+)
 ```
 
 Want to make calls to the Admin API? Click [here](graphql.md)

data/docs/usage/rest.md

@@ -218,7 +218,7 @@ If the request is successful these methods will all return a [`ShopifyAPI::Clien
 | Methods | Type | Notes |
 |---------|------|-------|
 | `code`  |`Integer`| HTTP Response code, e.g. `200`|
-| `header` |`Hash{String, [String]}` | HTTP Response headers |
+| `headers` |`Hash{String, [String]}` | HTTP Response headers |
 | `body`  | `Hash{String, Untyped}`  | HTTP Response body |
 | `prev_page_info` | `String` | See [Pagination](#pagination)|
 | `next_page_info` | `String` | See [Pagination](#pagination)|

data/docs/usage/webhooks.md

@@ -18,10 +18,10 @@ If you want to register for an http webhook you need to implement a webhook hand
 
 ```ruby
 module WebhookHandler
-  extend ShopifyAPI::Webhooks::Handler
+  extend ShopifyAPI::Webhooks::WebhookHandler
 
   class << self
-    def handle_webhook(data)
+    def handle_webhook(data:)
       puts "Received webhook! topic: #{data.topic} shop: #{data.shop} body: #{data.body} webhook_id: #{data.webhook_id} api_version: #{data.api_version"
     end
   end

data/lib/shopify_api/admin_versions.rb

@@ -5,6 +5,7 @@ module ShopifyAPI
   module AdminVersions
     SUPPORTED_ADMIN_VERSIONS = T.let([
       "unstable",
+      "2024-04",
       "2024-01",
       "2023-10",
       "2023-07",
@@ -16,7 +17,7 @@ module ShopifyAPI
       "2022-01",
     ], T::Array[String])
 
-    LATEST_SUPPORTED_ADMIN_VERSION = T.let("2024-01", String)
+    LATEST_SUPPORTED_ADMIN_VERSION = T.let("2024-04", String)
   end
 
   SUPPORTED_ADMIN_VERSIONS = ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS

data/lib/shopify_api/auth/session.rb

@@ -130,8 +130,8 @@ module ShopifyAPI
       sig { params(other: T.nilable(Session)).returns(T::Boolean) }
       def ==(other)
         if other
-          (
-            id == other.id &&
+
+          id == other.id &&
             shop == other.shop &&
             state == other.state &&
             scope == other.scope &&
@@ -140,7 +140,7 @@ module ShopifyAPI
             online? == other.online? &&
             associated_user == other.associated_user &&
             shopify_session_id == other.shopify_session_id
-          )
+
         else
           false
         end

data/lib/shopify_api/clients/graphql/storefront.rb

@@ -5,8 +5,26 @@ module ShopifyAPI
   module Clients
     module Graphql
       class Storefront < Client
-        sig { params(shop: String, storefront_access_token: String, api_version: T.nilable(String)).void }
-        def initialize(shop, storefront_access_token, api_version: nil)
+        sig do
+          params(
+            shop: String,
+            storefront_access_token: T.nilable(String),
+            private_token: T.nilable(String),
+            public_token: T.nilable(String),
+            api_version: T.nilable(String),
+          ).void
+        end
+        def initialize(shop, storefront_access_token = nil, private_token: nil, public_token: nil, api_version: nil)
+          unless storefront_access_token.nil?
+            warning = <<~WARNING
+              DEPRECATED: Use the named parameters for the Storefront token instead of passing
+              the public token as the second argument. Also, you may want to look into using
+              the Storefront private access token instead:
+              https://shopify.dev/docs/api/usage/authentication#getting-started-with-private-access
+            WARNING
+            ShopifyAPI::Logger.deprecated(warning, "15.0.0")
+          end
+
           session = Auth::Session.new(
             id: shop,
             shop: shop,
@@ -14,7 +32,11 @@ module ShopifyAPI
             is_online: false,
           )
           super(session: session, base_path: "/api", api_version: api_version)
-          @storefront_access_token = storefront_access_token
+          @storefront_access_token = T.let(T.must(private_token || public_token || storefront_access_token), String)
+          @storefront_auth_header = T.let(
+            private_token.nil? ? "X-Shopify-Storefront-Access-Token" : "Shopify-Storefront-Private-Token",
+            String,
+          )
         end
 
         sig do
@@ -26,7 +48,7 @@ module ShopifyAPI
           ).returns(HttpResponse)
         end
         def query(query:, variables: nil, headers: {}, tries: 1)
-          T.must(headers).merge!({ "X-Shopify-Storefront-Access-Token": @storefront_access_token })
+          T.must(headers).merge!({ @storefront_auth_header => @storefront_access_token })
           super(query: query, variables: variables, headers: headers, tries: tries)
         end
       end

data/lib/shopify_api/logger.rb

@@ -33,7 +33,7 @@ module ShopifyAPI
       def deprecated(message, version)
         return unless enabled_for_log_level?(:warn)
 
-        raise Errors::FeatureDeprecatedError unless valid_version(version)
+        raise Errors::FeatureDeprecatedError, message unless valid_version(version)
 
         send_to_logger(:warn, message)
       end

data/lib/shopify_api/rest/resources/2022_04/fulfillment_event.rb

@@ -20,7 +20,7 @@ module ShopifyAPI
 
       @address1 = T.let(nil, T.nilable(String))
       @city = T.let(nil, T.nilable(String))
-      @country = T.let(nil, T.nilable(Country))
+      @country = T.let(nil, T.nilable(String))
       @created_at = T.let(nil, T.nilable(String))
       @estimated_delivery_at = T.let(nil, T.nilable(String))
       @fulfillment_id = T.let(nil, T.nilable(Integer))
@@ -30,7 +30,7 @@ module ShopifyAPI
       @longitude = T.let(nil, T.nilable(Float))
       @message = T.let(nil, T.nilable(String))
       @order_id = T.let(nil, T.nilable(Integer))
-      @province = T.let(nil, T.nilable(Province))
+      @province = T.let(nil, T.nilable(String))
       @shop_id = T.let(nil, T.nilable(Integer))
       @status = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
@@ -39,10 +39,7 @@ module ShopifyAPI
       super(session: session, from_hash: from_hash)
     end
 
-    @has_one = T.let({
-      country: Country,
-      province: Province
-    }, T::Hash[Symbol, Class])
+    @has_one = T.let({}, T::Hash[Symbol, Class])
     @has_many = T.let({}, T::Hash[Symbol, Class])
     @paths = T.let([
       {http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
@@ -55,7 +52,7 @@ module ShopifyAPI
     attr_reader :address1
     sig { returns(T.nilable(String)) }
     attr_reader :city
-    sig { returns(T.nilable(Country)) }
+    sig { returns(T.nilable(String)) }
     attr_reader :country
     sig { returns(T.nilable(String)) }
     attr_reader :created_at
@@ -75,7 +72,7 @@ module ShopifyAPI
     attr_reader :message
     sig { returns(T.nilable(Integer)) }
     attr_reader :order_id
-    sig { returns(T.nilable(Province)) }
+    sig { returns(T.nilable(String)) }
     attr_reader :province
     sig { returns(T.nilable(Integer)) }
     attr_reader :shop_id

data/lib/shopify_api/rest/resources/2022_04/inventory_item.rb

@@ -22,7 +22,7 @@ module ShopifyAPI
       @country_code_of_origin = T.let(nil, T.nilable(String))
       @country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
       @created_at = T.let(nil, T.nilable(String))
-      @harmonized_system_code = T.let(nil, T.nilable(Integer))
+      @harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
       @id = T.let(nil, T.nilable(Integer))
       @province_code_of_origin = T.let(nil, T.nilable(String))
       @requires_shipping = T.let(nil, T.nilable(T::Boolean))
@@ -49,7 +49,7 @@ module ShopifyAPI
     attr_reader :country_harmonized_system_codes
     sig { returns(T.nilable(String)) }
     attr_reader :created_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :harmonized_system_code
     sig { returns(T.nilable(Integer)) }
     attr_reader :id

data/lib/shopify_api/rest/resources/2022_04/variant.rb

@@ -28,9 +28,9 @@ module ShopifyAPI
       @inventory_item_id = T.let(nil, T.nilable(Integer))
       @inventory_management = T.let(nil, T.nilable(String))
       @inventory_policy = T.let(nil, T.nilable(String))
-      @inventory_quantity = T.let(nil, T.nilable(Integer))
-      @inventory_quantity_adjustment = T.let(nil, T.nilable(Integer))
-      @old_inventory_quantity = T.let(nil, T.nilable(Integer))
+      @inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
+      @inventory_quantity_adjustment = T.let(nil, T.nilable(T.any(Integer, String)))
+      @old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
       @option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
       @position = T.let(nil, T.nilable(Integer))
       @presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
@@ -83,11 +83,11 @@ module ShopifyAPI
     attr_reader :inventory_management
     sig { returns(T.nilable(String)) }
     attr_reader :inventory_policy
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :inventory_quantity
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :inventory_quantity_adjustment
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :old_inventory_quantity
     sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
     attr_reader :option

data/lib/shopify_api/rest/resources/2022_07/fulfillment_event.rb

@@ -20,7 +20,7 @@ module ShopifyAPI
 
       @address1 = T.let(nil, T.nilable(String))
       @city = T.let(nil, T.nilable(String))
-      @country = T.let(nil, T.nilable(Country))
+      @country = T.let(nil, T.nilable(String))
       @created_at = T.let(nil, T.nilable(String))
       @estimated_delivery_at = T.let(nil, T.nilable(String))
       @fulfillment_id = T.let(nil, T.nilable(Integer))
@@ -30,7 +30,7 @@ module ShopifyAPI
       @longitude = T.let(nil, T.nilable(Float))
       @message = T.let(nil, T.nilable(String))
       @order_id = T.let(nil, T.nilable(Integer))
-      @province = T.let(nil, T.nilable(Province))
+      @province = T.let(nil, T.nilable(String))
       @shop_id = T.let(nil, T.nilable(Integer))
       @status = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
@@ -39,10 +39,7 @@ module ShopifyAPI
       super(session: session, from_hash: from_hash)
     end
 
-    @has_one = T.let({
-      country: Country,
-      province: Province
-    }, T::Hash[Symbol, Class])
+    @has_one = T.let({}, T::Hash[Symbol, Class])
     @has_many = T.let({}, T::Hash[Symbol, Class])
     @paths = T.let([
       {http_method: :delete, operation: :delete, ids: [:order_id, :fulfillment_id, :id], path: "orders/<order_id>/fulfillments/<fulfillment_id>/events/<id>.json"},
@@ -55,7 +52,7 @@ module ShopifyAPI
     attr_reader :address1
     sig { returns(T.nilable(String)) }
     attr_reader :city
-    sig { returns(T.nilable(Country)) }
+    sig { returns(T.nilable(String)) }
     attr_reader :country
     sig { returns(T.nilable(String)) }
     attr_reader :created_at
@@ -75,7 +72,7 @@ module ShopifyAPI
     attr_reader :message
     sig { returns(T.nilable(Integer)) }
     attr_reader :order_id
-    sig { returns(T.nilable(Province)) }
+    sig { returns(T.nilable(String)) }
     attr_reader :province
     sig { returns(T.nilable(Integer)) }
     attr_reader :shop_id

data/lib/shopify_api/rest/resources/2022_07/inventory_item.rb

@@ -22,7 +22,7 @@ module ShopifyAPI
       @country_code_of_origin = T.let(nil, T.nilable(String))
       @country_harmonized_system_codes = T.let(nil, T.nilable(T::Array[T.untyped]))
       @created_at = T.let(nil, T.nilable(String))
-      @harmonized_system_code = T.let(nil, T.nilable(Integer))
+      @harmonized_system_code = T.let(nil, T.nilable(T.any(Integer, String)))
       @id = T.let(nil, T.nilable(Integer))
       @province_code_of_origin = T.let(nil, T.nilable(String))
       @requires_shipping = T.let(nil, T.nilable(T::Boolean))
@@ -49,7 +49,7 @@ module ShopifyAPI
     attr_reader :country_harmonized_system_codes
     sig { returns(T.nilable(String)) }
     attr_reader :created_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :harmonized_system_code
     sig { returns(T.nilable(Integer)) }
     attr_reader :id

data/lib/shopify_api/rest/resources/2022_07/variant.rb

@@ -28,9 +28,9 @@ module ShopifyAPI
       @inventory_item_id = T.let(nil, T.nilable(Integer))
       @inventory_management = T.let(nil, T.nilable(String))
       @inventory_policy = T.let(nil, T.nilable(String))
-      @inventory_quantity = T.let(nil, T.nilable(Integer))
-      @inventory_quantity_adjustment = T.let(nil, T.nilable(Integer))
-      @old_inventory_quantity = T.let(nil, T.nilable(Integer))
+      @inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
+      @inventory_quantity_adjustment = T.let(nil, T.nilable(T.any(Integer, String)))
+      @old_inventory_quantity = T.let(nil, T.nilable(T.any(Integer, String)))
       @option = T.let(nil, T.nilable(T::Hash[T.untyped, T.untyped]))
       @position = T.let(nil, T.nilable(Integer))
       @presentment_prices = T.let(nil, T.nilable(T::Array[T.untyped]))
@@ -83,11 +83,11 @@ module ShopifyAPI
     attr_reader :inventory_management
     sig { returns(T.nilable(String)) }
     attr_reader :inventory_policy
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :inventory_quantity
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :inventory_quantity_adjustment
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(T.any(Integer, String))) }
     attr_reader :old_inventory_quantity
     sig { returns(T.nilable(T::Hash[T.untyped, T.untyped])) }
     attr_reader :option