NO-ISSUE Merge branch 'master' into steep-http-client

Author: Yang-33

Gemfile

@@ -10,6 +10,7 @@ group :development, :test do
   gem 'rack', '~> 3.0'
   gem 'rbs', '~> 3.9.2'
   gem 'rubocop', '~> 1.75.0', require: false
+  gem 'steep', '~> 1.10.0'
   gem 'webrick', '~> 1.9.1'
   gem 'yard', '~> 0.9.20'
 end

Gemfile.lock

@@ -7,22 +7,51 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
       rexml
+    csv (3.3.3)
     diff-lcs (1.5.1)
+    drb (2.2.1)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    fileutils (1.7.3)
     hashdiff (1.1.2)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
     json (2.10.2)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.7.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    minitest (5.25.5)
     multipart-post (2.4.1)
     net-http (0.6.0)
       uri
+    mutex_m (0.3.0)
     parallel (1.26.3)
     parser (3.3.7.4)
       ast (~> 2.4.1)
@@ -33,6 +62,9 @@ GEM
     rack (3.1.12)
     rainbow (3.1.1)
     rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
     rbs (3.9.2)
       logger
     regexp_parser (2.10.0)
@@ -65,6 +97,29 @@ GEM
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    steep (1.10.0)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (~> 3.9)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 5)
+      uri (>= 0.12.0)
+    strscan (3.1.2)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
@@ -91,6 +146,7 @@ DEPENDENCIES
   rbs (~> 3.9.2)
   rspec (~> 3.13.0)
   rubocop (~> 1.75.0)
+  steep (~> 1.10.0)
   webmock (~> 3.25.0)
   webrick (~> 1.9.1)
   yard (~> 0.9.20)

Steepfile

@@ -0,0 +1,30 @@
+D = Steep::Diagnostic
+
+target :lib do
+  signature "sig/line/bot/v2"
+
+  check "lib/line/bot/v2"
+  # ignore "lib/templates/*.rb"
+
+  # library "pathname"              # Standard libraries
+  # library "strong_json"           # Gems
+  library "net-http"
+
+  # configure_code_diagnostics(D::Ruby.default)      # `default` diagnostics setting (applies by default)
+  # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
+  # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
+  # configure_code_diagnostics(D::Ruby.silent)       # `silent` diagnostics setting
+  # configure_code_diagnostics do |hash|             # You can setup everything yourself
+  #   hash[D::Ruby::NoMethod] = :information
+  # end
+end
+
+target :test do
+  unreferenced!                     # Skip type checking the `lib` code when types in `test` target is changed
+  signature "sig/test"              # Put RBS files for tests under `sig/test`
+  check "test"                      # Type check Ruby scripts under `test`
+
+  configure_code_diagnostics(D::Ruby.lenient)      # Weak type checking for test code
+
+  # library "pathname"              # Standard libraries
+end

generator/src/main/resources/line-bot-sdk-ruby-generator/api.pebble

@@ -114,7 +114,7 @@ module Line
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::{{ packageName | camelize }}::{{ response.content['application/json'].schema.complexType }}.new(**json)
+                     Line::Bot::V2::{{ packageName | camelize }}::{{ response.content['application/json'].schema.complexType }}.new(**json) # steep:ignore InsufficientKeywordArguments
                      {%- else %}
                      response.body
                      {%- endif %}{% endfor %}

generator/src/main/resources/line-bot-sdk-ruby-generator/model.pebble

@@ -80,7 +80,7 @@ module Line
               end
             end
             {%- elseif property.isModel -%}
-            @{{ property.name }} = {{ property.name }}.is_a?(Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}){% if not property.required %} || {{ property.name }}.nil?{% endif %} ? {{ property.name }} : Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}.create(**{{ property.name }})
+            @{{ property.name }} = {{ property.name }}.is_a?(Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}){% if not property.required %} || {{ property.name }}.nil?{% endif %} ? {{ property.name }} : Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}.create(**{{ property.name }}) # steep:ignore
             {%- elseif model.model.vendorExtensions.get("x-selector").propertyName != property.name -%}
             @{{ property.name }} = {{ property.name }}
             {%- endif -%}
@@ -99,17 +99,18 @@ module Line
             end
           end
 
-          def self.create(args){% if model.model.vendorExtensions.get("x-children") != null and model.model.vendorExtensions.get("x-discriminator-property") != null %}
-            klass = detect_class(args[:{{ model.model.vendorExtensions.get("x-discriminator-property") }}])
-            return klass.new(**args) if klass
-            {% endif %}
-            return new(**args)
+          def self.create(args) # steep:ignore
+            {%- if model.model.vendorExtensions.get("x-children") != null and model.model.vendorExtensions.get("x-discriminator-property") != null %}
+            klass = detect_class(type: args[:{{ model.model.vendorExtensions.get("x-discriminator-property") }}])
+            return klass.new(**args) if klass # steep:ignore
+            {%- endif %}
+            return new(**args) # steep:ignore
           end
           {%- if model.model.vendorExtensions.get("x-children") != null %}
 
           private
 
-          def self.detect_class(type)
+          def self.detect_class(type:)
             {
               {%- for child in model.model.vendorExtensions.get("x-children") %}
               {{ child.typeName }}: Line::Bot::V2::{{ packageName | camelize }}::{{ child.className }},

generator/src/main/resources/line-bot-sdk-ruby-rbs-generator/model.pebble

@@ -38,7 +38,7 @@ module Line
           {% endfor %}
           def initialize: (
             {% for variable in model.model.vars -%}
-            {% if model.model.vendorExtensions.get("x-selector").propertyName != variable.name or packageName == 'webhook' -%}
+            {% if model.model.vendorExtensions.get("x-selector").propertyName != variable.name -%}
             {% if variable.openApiType == 'array' -%}
             {% if variable.items.isModel -%}
             {{ variable.name }}: {{ "Array[#{variable.items.openApiType}]" }}{% if not variable.required %}?{% endif -%}

lib/line/bot/v2/channel_access_token/api/channel_access_token_client.rb

@@ -69,7 +69,7 @@ def gets_all_valid_channel_access_token_key_ids_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::ChannelAccessTokenKeyIdsResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::ChannelAccessTokenKeyIdsResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end
@@ -131,13 +131,13 @@ def issue_channel_token_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::IssueShortLivedChannelAccessTokenResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::IssueShortLivedChannelAccessTokenResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    when 400
                      json = Line::Bot::V2::Utils.deep_underscore(JSON.parse(response.body))
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::ErrorResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::ErrorResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end
@@ -202,7 +202,7 @@ def issue_channel_token_by_jwt_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::IssueChannelAccessTokenResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::IssueChannelAccessTokenResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end
@@ -272,7 +272,7 @@ def issue_stateless_channel_token_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::IssueStatelessChannelAccessTokenResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::IssueStatelessChannelAccessTokenResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end
@@ -444,7 +444,7 @@ def verify_channel_token_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::VerifyChannelAccessTokenResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::VerifyChannelAccessTokenResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end
@@ -495,7 +495,7 @@ def verify_channel_token_by_jwt_with_http_info(
                      json.transform_keys! do |key|
                        Line::Bot::V2::RESERVED_WORDS.include?(key) ? "_#{key}".to_sym : key
                      end
-                     Line::Bot::V2::ChannelAccessToken::VerifyChannelAccessTokenResponse.new(**json)
+                     Line::Bot::V2::ChannelAccessToken::VerifyChannelAccessTokenResponse.new(**json) # steep:ignore InsufficientKeywordArguments
                    else
                      response.body
                    end

lib/line/bot/v2/channel_access_token/model/channel_access_token_key_ids_response.rb

@@ -45,8 +45,8 @@ def initialize(
             end
           end
 
-          def self.create(args)
-            return new(**args)
+          def self.create(args) # steep:ignore
+            return new(**args) # steep:ignore
           end
         end
       end

lib/line/bot/v2/channel_access_token/model/error_response.rb

@@ -44,8 +44,8 @@ def initialize(
             end
           end
 
-          def self.create(args)
-            return new(**args)
+          def self.create(args) # steep:ignore
+            return new(**args) # steep:ignore
           end
         end
       end

lib/line/bot/v2/channel_access_token/model/issue_channel_access_token_response.rb

@@ -57,8 +57,8 @@ def initialize(
             end
           end
 
-          def self.create(args)
-            return new(**args)
+          def self.create(args) # steep:ignore
+            return new(**args) # steep:ignore
           end
         end
       end