fix: compiler with --release induced issue

elbywan · Feb 4, 2024 · 18525da · 18525da
1 parent 93d5416
commit 18525da
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/commands/install/protocol/file/file.cr b/src/commands/install/protocol/file/file.cr
@@ -6,6 +6,7 @@ struct Zap::Commands::Install::Protocol::File < Zap::Commands::Install::Protocol
   def self.normalize?(str : String, path_info : PathInfo?) : {String?, String?}?
     return nil unless path_info
     path_str = path_info.path.to_s
+
     if path_info.dir?
       # npm install <folder>
       return "file:#{path_info.relative_path}", nil

diff --git a/src/commands/install/protocol/git/git.cr b/src/commands/install/protocol/git/git.cr
@@ -23,6 +23,8 @@ struct Zap::Commands::Install::Protocol::Git < Zap::Commands::Install::Protocol:
       # <git remote url>
       # <githubname>/<githubrepo>[#<commit-ish>]
       return str, nil
+    else
+      return nil
     end
   end
 

diff --git a/src/commands/install/protocol/protocol.cr b/src/commands/install/protocol/protocol.cr
@@ -9,12 +9,12 @@ require "./workspace"
 module Zap::Commands::Install::Protocol
   Log = Zap::Log.for(self)
 
-  PROTOCOLS = [
+  PROTOCOLS = {
     Protocol::Workspace,
     Protocol::Alias,
     Protocol::File,
     Protocol::Git,
     Protocol::TarballUrl,
     Protocol::Registry,
-  ]
+  }
 end
diff --git a/src/commands/install/protocol/registry/registry.cr b/src/commands/install/protocol/registry/registry.cr
@@ -8,9 +8,9 @@ struct Zap::Commands::Install::Protocol::Registry < Zap::Commands::Install::Prot
   def self.normalize?(str : String, path_info : PathInfo?) : {String?, String?}?
     parts = str.split('@')
     if parts.size == 1 || (parts.size == 2 && str.starts_with?('@'))
-      return nil, str
+      return {nil, str}
     else
-      return parts.last, parts[...-1].join('@')
+      return {parts.last, parts[...-1].join('@')}
     end
   end
 

diff --git a/src/commands/install/resolver.cr b/src/commands/install/resolver.cr
@@ -355,11 +355,12 @@ module Zap::Commands::Install::Resolver
   # See: https://docs.npmjs.com/cli/v9/commands/npm-install?v=true#description
   # Returns a {version, name} tuple
   private def self.parse_new_package(cli_input : String, *, directory : String) : {String?, String?}
-    result = Protocol::PROTOCOLS.reduce(nil) do |acc, protocol|
-      next acc unless acc.nil?
-      next protocol.normalize?(cli_input, Protocol::PathInfo.from_str(cli_input, directory))
+    result = nil
+    Protocol::PROTOCOLS.each do |protocol|
+      result = protocol.normalize?(cli_input, Protocol::PathInfo.from_str(cli_input, directory))
+      break if result && (result[0] || result[1])
     end
-    raise "Could not parse #{cli_input}" unless result
+    raise "Could not parse #{cli_input}" if result.nil? || (result[0].nil? && result[1].nil?)
     result
   end
 end