Fix type checks

Author: kateinoigakukun

Steepfile

@@ -19,7 +19,6 @@ target :lib do
   library "logger"
   library "pathname"
   library "forwardable"
-  library "net/http"
 
   configure_code_diagnostics(D::Ruby.default)
 end

lib/ruby_wasm/build/executor.rb

@@ -149,10 +149,11 @@ def _print_command(args, env)
 
   class SilentExecutor
     def system(*args, chdir: nil, env: nil)
+      # @type var kwargs: Hash[Symbol, untyped]
       kwargs = {}
       kwargs[:chdir] = chdir if chdir
       kwargs[:exception] = true
-      env ? Kernel.system(env, *args, **kwargs) : Kernel.system(*args, **kwargs)
+      __skip__ = env ? Kernel.system(env, *args, **kwargs) : Kernel.system(*args, **kwargs)
     end
   end
 

lib/ruby_wasm/build/toolchain.rb

@@ -149,7 +149,7 @@ def download_url
         # @type var url: URI::HTTPS
         url = URI.parse(url_str)
         ok =
-          Net::HTTP.start(
+          __skip__ = Net::HTTP.start(
             url.host,
             url.port,
             use_ssl: url.scheme == "https"

lib/ruby_wasm/cli.rb

@@ -214,13 +214,15 @@ def compute_build_alias(options)
           end
           # FIXME: We should have a way to specify extensions to be included by users.
           # For now, assume all default extensions available in the head revision are available.
+          # @type var patches: Array[String]
+          patches = []
           return(
             {
               name: "local",
               src: {
                 type: "local",
                 path: src_name,
-                patches: []
+                patches: patches
               },
               all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS
             }

sig/ruby_wasm/build.rbs

@@ -249,7 +249,7 @@ module RubyWasm
     def ld: -> String
     def ar: -> String
 
-    def install: -> void
+    def install: (_CommandExecutor executor) -> void
   end
 
   class WASISDK < Toolchain
@@ -265,9 +265,8 @@ module RubyWasm
     def wasm_opt: -> String
     def wasi_sdk_path: -> String
     def download_url: () -> String
-    def binaryen_download_url: (Integer? version) -> String
-    def install_wasi_sdk: ->  void
-    def install_binaryen: ->  void
+    def install_wasi_sdk: (_CommandExecutor executor) -> void
+    def install: (_CommandExecutor executor) -> void
   end
 
   class Binaryen
@@ -280,8 +279,8 @@ module RubyWasm
     def wasm_opt: -> String
     def binaryen_path: -> String
     def binaryen_version: -> Integer
-    def download_url: (Integer? version) -> String
-    def install: -> void
+    def download_url: (Integer version) -> String
+    def install: (_CommandExecutor executor) -> void
   end
 
   class Emscripten < Toolchain
@@ -291,7 +290,12 @@ module RubyWasm
     def find_tool: (Symbol name) -> String
   end
 
+  interface _CommandExecutor
+    def system: (*_ToS args, ?chdir: String?, ?env: Hash[String, String]?) -> void
+  end
+
   class BuildExecutor
+    include _CommandExecutor
     @verbose: bool
     @github_actions_markup: bool
     @process_count: Integer
@@ -300,7 +304,6 @@ module RubyWasm
     attr_reader process_count: Integer
 
     def initialize: (?verbose: bool) -> void
-    def system: (*_ToS args, ?chdir: String?, ?env: Hash[String, String]?) -> void
     def rm_rf: (FileUtils::pathlist list) -> void
     def rm_f: (FileUtils::pathlist list) -> void
     def cp_r: (FileUtils::pathlist src, path dest) -> void
@@ -315,6 +318,10 @@ module RubyWasm
     private def _print_command: (Array[_ToS] command, Hash[String, String]? env) -> void
   end
 
+  class SilentExecutor
+    include _CommandExecutor
+  end
+
   class StatusPrinter
     @mutex: Mutex
     @counter: Integer

sig/ruby_wasm/cli.rbs

@@ -38,8 +38,8 @@ module RubyWasm
     private
 
     def build_config: (cli_options options) -> Packager::build_config
-    def compute_build_source: (cli_options options) -> [Packager::build_source, String?]
-    def self.build_source_aliases: (string root) -> Hash[string, Packager::build_source]
+    def compute_build_alias: (cli_options options) -> Packager::build_config
+    def self.build_config_aliases: (string root) -> Hash[string, Packager::build_config]
     def self.bundled_patches_path: () -> string
     def root: () -> string
 

sig/ruby_wasm/packager.rbs

@@ -13,18 +13,9 @@ class RubyWasm::Packager
     type: "local",
     path: String,
   }
-  type build_source = (build_source_github | build_source_tarball | build_source_local) & {
-    name: string,
-    patches: Array[String],
-  }
+  type build_source = untyped
 
-  type build_config = {
-    target: String,
-    src: RubyWasm::Packager::build_source,
-    default_exts: String,
-    suffix: String,
-    gem_home: String?,
-  }
+  type build_config = untyped
 
   type bytes = String