dependabot-npm_and_yarn 0.321.2 → 0.322.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771b8ea72b7f7a024e8f70897bc9f8cc950ddb04753c184852cff4830c8319ad
-  data.tar.gz: 2f3a64b55706976119011580025b65b199bc3e2e2e1fd7c54dd1f6506414fa9d
+  metadata.gz: 5696d15f208114a1f4afe849864fd02e55b43b635ba5712ae75d0028d753c780
+  data.tar.gz: 3e3e0bca818a95047184b22c4ca282757cba9cf2e7c233cc7299bb737169c587
 SHA512:
-  metadata.gz: 21949d32ba7c9745436c576a7ec2e3c6fab3a2f5727bbfd84cae0b5fba60d438895a7dbccb806c26fdb5df2592b20f3a338360d49b54ef894c66ef35b9651866
-  data.tar.gz: f60d5b3bc19476bf60b85203a7441f694e557f1fe9b9419dfce2369fc271e1e4fad7f76a78f0885453c8aa0e98512ff06af816292f25c6e06a8a7fe89466e5dd
+  metadata.gz: 771b5ce91963efee5347d1810af25099e029d0176e8add5848078bfcf4f2b6c2d028f12dda1734e576025e849223909b204047c969d10114108aa2160c459955
+  data.tar.gz: 7ea48759951bca676405704fd02070e55ebee6816fdb5ca624155bb950373e7ca0fbc8aa357ed29f931a013ab6f7e153751d7f94c03269b0ac4264fb8dbdc949

data/lib/dependabot/npm_and_yarn/file_parser.rb

@@ -508,7 +508,7 @@ module Dependabot
           type: "git",
           url: "https://#{host}/#{details['username']}/#{details['repo']}",
           branch: nil,
-          ref: details["ref"] || "master"
+          ref: details["ref"]
         }
       end
 

data/lib/dependabot/npm_and_yarn/package/package_details_fetcher.rb

@@ -173,13 +173,11 @@ module Dependabot
 
             package_type = infer_package_type(details)
 
-            deprecated = fetch_value_from_hash(details, RELEASE_DEPRECATION_KEY)
-
             Dependabot::Package::PackageRelease.new(
               version: Version.new(version),
               released_at: time_data[version] ? Time.parse(time_data[version]) : nil,
-              yanked: deprecated ? true : false,
-              yanked_reason: deprecated.is_a?(String) ? deprecated : nil,
+              yanked: false,
+              yanked_reason: nil,
               downloads: nil,
               latest: latest_version.to_s == version,
               url: package_version_url(version),

data/lib/dependabot/npm_and_yarn/update_checker/latest_version_finder.rb

@@ -74,12 +74,14 @@ module Dependabot
           override.params(language_version: T.nilable(T.any(String, Dependabot::Version)))
                   .returns(T.nilable(Dependabot::Version))
         end
-        def latest_version_with_no_unlock(language_version: nil)
+        def latest_version_with_no_unlock(language_version: nil) # rubocop:disable Lint/UnusedMethodArgument
           with_custom_registry_rescue do
             return unless valid_npm_details?
             return version_from_dist_tags&.version if specified_dist_tag_requirement?
 
-            super
+            releases = possible_releases
+            in_range_versions = filter_out_of_range_versions(releases)
+            in_range_versions.find { |r| !yanked_version?(r.version) }&.version
           end
         end
 
@@ -96,7 +98,7 @@ module Dependabot
           params(language_version: T.nilable(T.any(String, Dependabot::Version)))
             .returns(T.nilable(Dependabot::Version))
         end
-        def fetch_latest_version(language_version: nil)
+        def fetch_latest_version(language_version: nil) # rubocop:disable Lint/UnusedMethodArgument
           with_custom_registry_rescue do
             return unless valid_npm_details?
 
@@ -105,7 +107,7 @@ module Dependabot
 
             return if specified_dist_tag_requirement?
 
-            super
+            possible_releases.find { |r| !yanked_version?(r.version) }&.version
           end
         end
 
@@ -114,65 +116,16 @@ module Dependabot
             .params(language_version: T.nilable(T.any(String, Dependabot::Version)))
             .returns(T.nilable(Dependabot::Version))
         end
-        def fetch_latest_version_with_no_unlock(language_version: nil)
+        def fetch_latest_version_with_no_unlock(language_version: nil) # rubocop:disable Lint/UnusedMethodArgument
           with_custom_registry_rescue do
             return unless valid_npm_details?
             return version_from_dist_tags&.version if specified_dist_tag_requirement?
 
-            super
-          end
-        end
-
-        sig do
-          override
-            .params(releases: T::Array[Dependabot::Package::PackageRelease])
-            .returns(T::Array[Dependabot::Package::PackageRelease])
-        end
-        def apply_post_fetch_latest_versions_filter(releases)
-          original_count = releases.count
-          filtered_versions = lazy_filter_yanked_versions_by_min_max(releases, check_max: true)
-
-          # Log the filter if any versions were removed
-          if original_count > filtered_versions.count
-            Dependabot.logger.info(
-              "Filtered out #{original_count - filtered_versions.count} " \
-              "yanked (not found) versions after fetching latest versions"
-            )
-          end
-
-          filtered_versions
-        end
-
-        sig do
-          params(
-            releases: T::Array[Dependabot::Package::PackageRelease],
-            check_max: T::Boolean
-          ).returns(T::Array[Dependabot::Package::PackageRelease])
-        end
-        def lazy_filter_yanked_versions_by_min_max(releases, check_max: true)
-          # Sort the versions based on the check_max flag (max -> descending, min -> ascending)
-          sorted_releases = if check_max
-                              releases.sort_by(&:version).reverse
-                            else
-                              releases.sort_by(&:version)
-                            end
-
-          filtered_versions = []
+            releases = possible_releases
 
-          not_yanked = T.let(false, T::Boolean)
-
-          # Iterate through the sorted versions lazily, filtering out yanked versions
-          sorted_releases.each do |release|
-            next if !not_yanked && yanked_version?(release.version)
-
-            not_yanked = true
-
-            # Once we find a valid (non-yanked) version, add it to the filtered list
-            filtered_versions << release
-            break
+            in_range_versions = filter_out_of_range_versions(releases)
+            in_range_versions.find { |r| !yanked_version?(r.version) }&.version
           end
-
-          filtered_versions
         end
 
         sig do
@@ -200,11 +153,10 @@ module Dependabot
             secure_versions = filter_ignored_versions(secure_versions)
             secure_versions = filter_lower_versions(secure_versions)
 
-            # Apply lazy filtering for yanked versions (min or max logic)
-            secure_versions = lazy_filter_yanked_versions_by_min_max(secure_versions, check_max: false)
-
-            # Return the lowest non-yanked version
-            secure_versions.max_by(&:version)&.version
+            # Find first non-yanked version
+            secure_versions.sort_by(&:version).find do |version|
+              !yanked_version?(version.version)
+            end&.version
           end
         end
 
@@ -213,17 +165,16 @@ module Dependabot
             .returns(T::Array[Dependabot::Package::PackageRelease])
         end
         def filter_prerelease_versions(releases)
-          filtered = releases.reject do |release|
+          releases.reject do |release|
             release.version.prerelease? && !related_to_current_pre?(release.version)
           end
+        end
 
-          if releases.count > filtered.count
-            Dependabot.logger.info(
-              "Filtered out #{releases.count - filtered.count} unrelated pre-release versions"
-            )
-          end
-
-          filtered
+        sig do
+          override.returns(T.nilable(T::Array[Dependabot::Package::PackageRelease]))
+        end
+        def available_versions
+          possible_releases
         end
 
         sig do
@@ -271,7 +222,9 @@ module Dependabot
             .returns(T::Array[Dependabot::Package::PackageRelease])
         end
         def possible_releases(filter_ignored: true)
-          releases = possible_previous_releases.reject(&:yanked?)
+          releases = possible_previous_releases.reject do |r|
+            r.details["deprecated"]
+          end
 
           return filter_releases(releases) if filter_ignored
 
@@ -298,13 +251,13 @@ module Dependabot
         sig { returns(T::Array[[Dependabot::Version, T::Hash[String, T.nilable(String)]]]) }
         def possible_previous_versions_with_details
           possible_previous_releases.map do |r|
-            [r.version, { "deprecated" => r.yanked? ? "yanked" : nil }]
+            [r.version, r.details]
           end
         end
 
         sig { override.returns(T::Boolean) }
         def cooldown_enabled?
-          Dependabot::Experiments.enabled?(:enable_cooldown_for_npm_and_yarn)
+          true
         end
 
         private
@@ -334,20 +287,24 @@ module Dependabot
                                    .find { |r| dist_tags.include?(r[:requirement]) }
                                    &.fetch(:requirement)
 
-          releases = package_details&.releases
+          # For cooldown filtering, use filtered releases
+          releases = available_versions
 
           releases = filter_by_cooldown(releases) if releases
 
           if dist_tag_req
             release = find_dist_tag_release(dist_tag_req, releases)
-            return release if release && !release.yanked?
+            return release unless release&.version && yanked_version?(release.version)
           end
 
-          latest_release = find_dist_tag_release("latest", releases)
+          return nil unless dist_tags["latest"]
 
-          return nil unless latest_release
+          latest_version = Version.new(dist_tags["latest"])
 
-          return latest_release if wants_latest_dist_tag?(latest_release.version) && !latest_release.yanked?
+          if wants_latest_dist_tag?(latest_version)
+            # Find the release object for this version, even if deprecated
+            return possible_previous_releases.find { |r| r.version == latest_version }
+          end
 
           nil
         end
@@ -440,527 +397,19 @@ module Dependabot
         def yanked_version?(version)
           package_fetcher.yanked?(version)
         end
-      end
-
-      class LatestVersionFinder # rubocop:disable Metrics/ClassLength
-        extend T::Sig
-
-        sig do
-          params(
-            dependency: Dependabot::Dependency,
-            dependency_files: T::Array[Dependabot::DependencyFile],
-            credentials: T::Array[Dependabot::Credential],
-            ignored_versions: T::Array[String],
-            security_advisories: T::Array[Dependabot::SecurityAdvisory],
-            raise_on_ignored: T::Boolean
-          ).void
-        end
-        def initialize(
-          dependency:,
-          dependency_files:,
-          credentials:,
-          ignored_versions:,
-          security_advisories:,
-          raise_on_ignored: false
-        )
-          @dependency          = dependency
-          @credentials         = credentials
-          @dependency_files    = dependency_files
-          @ignored_versions    = ignored_versions
-          @raise_on_ignored    = raise_on_ignored
-          @security_advisories = security_advisories
-
-          @possible_previous_versions_with_details = T.let(nil, T.nilable(T::Array[T::Array[T.untyped]]))
-          @yanked = T.let({}, T::Hash[Version, T.nilable(T::Boolean)])
-          @npm_details = T.let(nil, T.nilable(T::Hash[String, T.untyped]))
-          @registry_finder = T.let(nil, T.nilable(Package::RegistryFinder))
-          @version_endpoint_working = T.let(nil, T.nilable(T::Boolean))
-        end
-
-        sig { returns(T.nilable(Version)) }
-        def latest_version_from_registry
-          return unless valid_npm_details?
-          return version_from_dist_tags if version_from_dist_tags
-          return if specified_dist_tag_requirement?
-
-          possible_versions.find { |v| !yanked?(v) }
-        rescue Excon::Error::Socket, Excon::Error::Timeout, RegistryError
-          raise if dependency_registry == "registry.npmjs.org"
-          # Custom registries can be flaky. We don't want to make that
-          # our problem, so we quietly return `nil` here.
-        end
-
-        sig { returns(T.nilable(Version)) }
-        def latest_version_with_no_unlock
-          return unless valid_npm_details?
-          return version_from_dist_tags if specified_dist_tag_requirement?
-
-          in_range_versions = filter_out_of_range_versions(possible_versions)
-          in_range_versions.find { |version| !yanked?(version) }
-        rescue Excon::Error::Socket, Excon::Error::Timeout
-          raise if dependency_registry == "registry.npmjs.org"
-          # Sometimes custom registries are flaky. We don't want to make that
-          # our problem, so we quietly return `nil` here.
-        end
-
-        sig { returns(T.nilable(Version)) }
-        def lowest_security_fix_version
-          return unless valid_npm_details?
-
-          secure_versions =
-            if specified_dist_tag_requirement?
-              [version_from_dist_tags].compact
-            else
-              possible_versions(filter_ignored: false)
-            end
-
-          secure_versions = Dependabot::UpdateCheckers::VersionFilters
-                            .filter_vulnerable_versions(
-                              secure_versions,
-                              security_advisories
-                            )
-          secure_versions = filter_ignored_versions(secure_versions)
-          secure_versions = filter_lower_versions(secure_versions)
-
-          secure_versions.reverse.find { |version| !yanked?(version) }
-        rescue Excon::Error::Socket, Excon::Error::Timeout
-          raise if dependency_registry == "registry.npmjs.org"
-          # Sometimes custom registries are flaky. We don't want to make that
-          # our problem, so we quietly return `nil` here.
-        end
-
-        sig { returns(T::Array[T::Array[T.untyped]]) }
-        def possible_previous_versions_with_details # rubocop:disable Metrics/PerceivedComplexity
-          return @possible_previous_versions_with_details if @possible_previous_versions_with_details
-
-          @possible_previous_versions_with_details =
-            npm_details&.fetch("versions", {})
-                       &.transform_keys { |k| version_class.new(k) }
-                       &.reject do |v, _|
-              v.prerelease? && !related_to_current_pre?(v)
-            end&.sort_by(&:first)&.reverse
-          @possible_previous_versions_with_details
-        end
-
-        sig do
-          params(filter_ignored: T::Boolean)
-            .returns(T::Array[T::Array[T.untyped]])
-        end
-        def possible_versions_with_details(filter_ignored: true)
-          versions = possible_previous_versions_with_details
-                     .reject { |_, details| details["deprecated"] }
-
-          return filter_ignored_versions(versions) if filter_ignored
-
-          versions
-        end
 
         sig do
-          params(filter_ignored: T::Boolean)
-            .returns(T::Array[Version])
-        end
-        def possible_versions(filter_ignored: true)
-          possible_versions_with_details(filter_ignored: filter_ignored)
-            .map(&:first)
-        end
-
-        private
-
-        sig { returns(Dependabot::Dependency) }
-        attr_reader :dependency
-        sig { returns(T::Array[Dependabot::Credential]) }
-        attr_reader :credentials
-        sig { returns(T::Array[Dependabot::DependencyFile]) }
-        attr_reader :dependency_files
-        sig { returns(T::Array[String]) }
-        attr_reader :ignored_versions
-        sig { returns(T::Array[Dependabot::SecurityAdvisory]) }
-        attr_reader :security_advisories
-
-        sig { returns(T::Boolean) }
-        def valid_npm_details?
-          !npm_details&.fetch("dist-tags", nil).nil?
-        end
-
-        sig { params(versions_array: T::Array[T.untyped]).returns(T::Array[T.untyped]) }
-        def filter_ignored_versions(versions_array)
-          filtered = versions_array.reject do |v, _|
-            ignore_requirements.any? { |r| r.satisfied_by?(v) }
-          end
-
-          if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(versions_array).any?
-            raise AllVersionsIgnored
-          end
-
-          if versions_array.count > filtered.count
-            diff = versions_array.count - filtered.count
-            Dependabot.logger.info("Filtered out #{diff} ignored versions")
-          end
-
-          filtered
+          params(releases: T::Array[Dependabot::Package::PackageRelease])
+            .returns(T::Array[Dependabot::Package::PackageRelease])
         end
-
-        sig { params(versions_array: T::Array[T.untyped]).returns(T::Array[T.untyped]) }
-        def filter_out_of_range_versions(versions_array)
+        def filter_out_of_range_versions(releases)
           reqs = dependency.requirements.filter_map do |r|
             NpmAndYarn::Requirement.requirements_array(r.fetch(:requirement))
           end
 
-          versions_array
-            .select { |v| reqs.all? { |r| r.any? { |o| o.satisfied_by?(v) } } }
-        end
-
-        sig { params(versions_array: T::Array[T.untyped]).returns(T::Array[T.untyped]) }
-        def filter_lower_versions(versions_array)
-          return versions_array unless dependency.numeric_version
-
-          versions_array
-            .select { |version, _| version > dependency.numeric_version }
-        end
-
-        sig { returns(T.nilable(Version)) }
-        def version_from_dist_tags
-          details = npm_details
-
-          return nil unless details
-
-          dist_tags = details["dist-tags"].keys
-
-          # Check if a dist tag was specified as a requirement. If it was, and
-          # it exists, use it.
-          dist_tag_req = dependency.requirements
-                                   .find { |r| dist_tags.include?(r[:requirement]) }
-                                   &.fetch(:requirement)
-
-          if dist_tag_req
-            tag_vers =
-              version_class.new(details["dist-tags"][dist_tag_req])
-            return tag_vers unless yanked?(tag_vers)
-          end
-
-          # Use the latest dist tag unless there's a reason not to
-          return nil unless details["dist-tags"]["latest"]
-
-          latest = version_class.new(details["dist-tags"]["latest"])
-
-          wants_latest_dist_tag?(latest) ? latest : nil
-        end
-
-        sig { params(version: Version).returns(T::Boolean) }
-        def related_to_current_pre?(version)
-          current_version = dependency.numeric_version
-          if current_version&.prerelease? &&
-             current_version.release == version.release
-            return true
+          releases.select do |release|
+            reqs.all? { |r| r.any? { |o| o.satisfied_by?(release.version) } }
           end
-
-          dependency.requirements.any? do |req|
-            next unless req[:requirement]&.match?(/\d-[A-Za-z]/)
-
-            NpmAndYarn::Requirement
-              .requirements_array(req.fetch(:requirement))
-              .any? do |r|
-                r.requirements.any? { |a| a.last.release == version.release }
-              end
-          rescue Gem::Requirement::BadRequirementError
-            false
-          end
-        end
-
-        sig { returns(T::Boolean) }
-        def specified_dist_tag_requirement?
-          dependency.requirements.any? do |req|
-            next false if req[:requirement].nil?
-            next false unless req[:requirement].match?(/^[A-Za-z]/)
-
-            !req[:requirement].match?(/^v\d/i)
-          end
-        end
-
-        sig { params(latest_version: Version).returns(T::Boolean) }
-        def wants_latest_dist_tag?(latest_version)
-          ver = latest_version
-          return false if related_to_current_pre?(ver) ^ ver.prerelease?
-          return false if current_version_greater_than?(ver)
-          return false if current_requirement_greater_than?(ver)
-          return false if ignore_requirements.any? { |r| r.satisfied_by?(ver) }
-          return false if yanked?(ver)
-
-          true
-        end
-
-        sig { params(version: Version).returns(T::Boolean) }
-        def current_version_greater_than?(version)
-          return false unless dependency.numeric_version
-
-          T.must(dependency.numeric_version) > version
-        end
-
-        sig { params(version: Version).returns(T::Boolean) }
-        def current_requirement_greater_than?(version)
-          dependency.requirements.any? do |req|
-            next false unless req[:requirement]
-
-            req_version = req[:requirement].sub(/^\^|~|>=?/, "")
-            next false unless version_class.correct?(req_version)
-
-            version_class.new(req_version) > version
-          end
-        end
-
-        sig { params(version: Version).returns(T::Boolean) }
-        def yanked?(version)
-          return @yanked[version] || false if @yanked.key?(version)
-
-          @yanked[version] =
-            begin
-              if dependency_registry == "registry.npmjs.org"
-                status = Dependabot::RegistryClient.head(
-                  url: registry_finder.tarball_url(version),
-                  headers: registry_auth_headers
-                ).status
-              else
-                status = Dependabot::RegistryClient.get(
-                  url: dependency_url + "/#{version}",
-                  headers: registry_auth_headers
-                ).status
-
-                if status == 404
-                  # Some registries don't handle escaped package names properly
-                  status = Dependabot::RegistryClient.get(
-                    url: dependency_url.gsub("%2F", "/") + "/#{version}",
-                    headers: registry_auth_headers
-                  ).status
-                end
-              end
-
-              version_not_found = status == 404
-              version_not_found && version_endpoint_working?
-            rescue Excon::Error::Timeout, Excon::Error::Socket
-              # Give the benefit of the doubt if the registry is playing up
-              false
-            end
-
-          @yanked[version] || false
-        end
-
-        sig { returns(T.nilable(T::Boolean)) }
-        def version_endpoint_working?
-          return true if dependency_registry == "registry.npmjs.org"
-
-          return @version_endpoint_working if @version_endpoint_working
-
-          @version_endpoint_working =
-            begin
-              Dependabot::RegistryClient.get(
-                url: dependency_url + "/latest",
-                headers: registry_auth_headers
-              ).status < 400
-            rescue Excon::Error::Timeout, Excon::Error::Socket
-              # Give the benefit of the doubt if the registry is playing up
-              true
-            end
-          @version_endpoint_working
-        end
-
-        sig { returns(T.nilable(T::Hash[String, T.untyped])) }
-        def npm_details
-          return @npm_details if @npm_details
-
-          @npm_details = fetch_npm_details
-        end
-
-        sig { returns(T.nilable(T::Hash[String, T.untyped])) }
-        def fetch_npm_details
-          npm_response = fetch_npm_response
-
-          return nil unless npm_response
-
-          check_npm_response(npm_response)
-          JSON.parse(npm_response.body)
-        rescue JSON::ParserError,
-               Excon::Error::Timeout,
-               Excon::Error::Socket,
-               RegistryError => e
-          if git_dependency?
-            nil
-          else
-            raise_npm_details_error(e)
-          end
-        end
-
-        sig { returns(T.nilable(Excon::Response)) }
-        def fetch_npm_response
-          response = Dependabot::RegistryClient.get(
-            url: dependency_url,
-            headers: registry_auth_headers
-          )
-          return response unless response.status == 500
-          return response unless registry_auth_headers["Authorization"]
-
-          auth = registry_auth_headers["Authorization"]
-          return response unless auth&.start_with?("Basic")
-
-          decoded_token = Base64.decode64(auth.gsub("Basic ", ""))
-          return unless decoded_token.include?(":")
-
-          username, password = decoded_token.split(":")
-          Dependabot::RegistryClient.get(
-            url: dependency_url,
-            options: {
-              user: username,
-              password: password
-            }
-          )
-        rescue URI::InvalidURIError => e
-          raise DependencyFileNotResolvable, e.message
-        end
-
-        sig { params(npm_response: Excon::Response).void }
-        def check_npm_response(npm_response)
-          return if git_dependency?
-
-          if private_dependency_not_reachable?(npm_response)
-            raise PrivateSourceAuthenticationFailure, dependency_registry
-          end
-
-          # handles scenario when private registry returns a server error 5xx
-          if private_dependency_server_error?(npm_response)
-            msg = "Server error #{npm_response.status} returned while accessing registry" \
-                  " #{dependency_registry}."
-            raise DependencyFileNotResolvable, msg
-          end
-
-          status = npm_response.status
-
-          # handles issue when status 200 is returned from registry but with an invalid JSON object
-          if status.to_s.start_with?("2") && response_invalid_json?(npm_response)
-            msg = "Invalid JSON object returned from registry #{dependency_registry}."
-            Dependabot.logger.warn("#{msg} Response body (truncated) : #{npm_response.body[0..500]}...")
-            raise DependencyFileNotResolvable, msg
-          end
-
-          return if status.to_s.start_with?("2")
-
-          # Ignore 404s from the registry for updates where a lockfile doesn't
-          # need to be generated. The 404 won't cause problems later.
-          return if status == 404 && dependency.version.nil?
-
-          msg = "Got #{status} response with body #{npm_response.body}"
-          raise RegistryError.new(status, msg)
-        end
-
-        sig { params(error: Exception).void }
-        def raise_npm_details_error(error)
-          raise if dependency_registry == "registry.npmjs.org"
-          raise unless error.is_a?(Excon::Error::Timeout)
-
-          raise PrivateSourceTimedOut, dependency_registry
-        end
-
-        sig { params(npm_response: Excon::Response).returns(T::Boolean) }
-        def private_dependency_not_reachable?(npm_response)
-          return true if npm_response.body.start_with?(/user ".*?" is not a /)
-          return false unless [401, 402, 403, 404].include?(npm_response.status)
-
-          # Check whether this dependency is (likely to be) private
-          if dependency_registry == "registry.npmjs.org"
-            return false unless dependency.name.start_with?("@")
-
-            web_response = Dependabot::RegistryClient.get(url: "https://www.npmjs.com/package/#{dependency.name}")
-            # NOTE: returns 429 when the login page is rate limited
-            return web_response.body.include?("Forgot password?") ||
-                   web_response.status == 429
-          end
-
-          true
-        end
-
-        sig { params(npm_response: Excon::Response).returns(T::Boolean) }
-        def private_dependency_server_error?(npm_response)
-          if [500, 501, 502, 503].include?(npm_response.status)
-            Dependabot.logger.warn("#{dependency_registry} returned code #{npm_response.status} with " \
-                                   "body #{npm_response.body}.")
-            return true
-          end
-          false
-        end
-
-        sig { params(npm_response: Excon::Response).returns(T::Boolean) }
-        def response_invalid_json?(npm_response)
-          result = JSON.parse(npm_response.body)
-          result.is_a?(Hash) || result.is_a?(Array)
-          false
-        rescue JSON::ParserError, TypeError
-          true
-        end
-
-        sig { returns(String) }
-        def dependency_url
-          registry_finder.dependency_url
-        end
-
-        sig { returns(String) }
-        def dependency_registry
-          registry_finder.registry
-        end
-
-        sig { returns(T::Hash[String, String]) }
-        def registry_auth_headers
-          registry_finder.auth_headers
-        end
-
-        sig { returns(Package::RegistryFinder) }
-        def registry_finder
-          return @registry_finder if @registry_finder
-
-          @registry_finder = Package::RegistryFinder.new(
-            dependency: dependency,
-            credentials: credentials,
-            npmrc_file: npmrc_file,
-            yarnrc_file: yarnrc_file,
-            yarnrc_yml_file: yarnrc_yml_file
-          )
-          @registry_finder
-        end
-
-        sig { returns(T::Array[Dependabot::Requirement]) }
-        def ignore_requirements
-          ignored_versions.flat_map { |req| requirement_class.requirements_array(req) }
-        end
-
-        sig { returns(T.class_of(Version)) }
-        def version_class
-          Dependabot::NpmAndYarn::Version
-        end
-
-        sig { returns(T.class_of(Requirement)) }
-        def requirement_class
-          Dependabot::NpmAndYarn::Requirement
-        end
-
-        sig { returns(T.nilable(Dependabot::DependencyFile)) }
-        def npmrc_file
-          dependency_files.find { |f| f.name.end_with?(".npmrc") }
-        end
-
-        sig { returns(T.nilable(Dependabot::DependencyFile)) }
-        def yarnrc_file
-          dependency_files.find { |f| f.name.end_with?(".yarnrc") }
-        end
-
-        sig { returns(T.nilable(Dependabot::DependencyFile)) }
-        def yarnrc_yml_file
-          dependency_files.find { |f| f.name.end_with?(".yarnrc.yml") }
-        end
-
-        sig { returns(T::Boolean) }
-        def git_dependency?
-          # ignored_version/raise_on_ignored are irrelevant.
-          GitCommitChecker.new(
-            dependency: dependency,
-            credentials: credentials
-          ).git_dependency?
         end
       end
     end

data/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb

@@ -97,7 +97,7 @@ module Dependabot
             dependency_files: T::Array[Dependabot::DependencyFile],
             credentials: T::Array[Dependabot::Credential],
             latest_allowable_version: T.nilable(T.any(String, Gem::Version)),
-            latest_version_finder: T.any(LatestVersionFinder, PackageLatestVersionFinder),
+            latest_version_finder: PackageLatestVersionFinder,
             repo_contents_path: T.nilable(String),
             dependency_group: T.nilable(Dependabot::DependencyGroup),
             raise_on_ignored: T::Boolean,
@@ -116,11 +116,7 @@ module Dependabot
           @latest_allowable_version = latest_allowable_version
           @dependency_group = dependency_group
 
-          @latest_version_finder = T.let(
-            {},
-            T::Hash[Dependabot::Dependency, T.any(LatestVersionFinder, PackageLatestVersionFinder)
-          ]
-          )
+          @latest_version_finder = T.let({}, T::Hash[Dependabot::Dependency, PackageLatestVersionFinder])
           @latest_version_finder[dependency] = latest_version_finder
           @repo_contents_path = repo_contents_path
           @raise_on_ignored = raise_on_ignored
@@ -228,34 +224,18 @@ module Dependabot
         sig { returns(T::Boolean) }
         attr_reader :raise_on_ignored
 
-        sig { params(dep: Dependabot::Dependency) .returns(T.any(LatestVersionFinder, PackageLatestVersionFinder)) }
+        sig { params(dep: Dependabot::Dependency) .returns(PackageLatestVersionFinder) }
         def latest_version_finder(dep)
           @latest_version_finder[dep] ||=
-            if enable_cooldown?
-              PackageLatestVersionFinder.new(
-                dependency: dep,
-                dependency_files: dependency_files,
-                credentials: credentials,
-                cooldown_options: update_cooldown,
-                ignored_versions: [],
-                security_advisories: [],
-                raise_on_ignored: raise_on_ignored
-              )
-            else
-              LatestVersionFinder.new(
-                dependency: dep,
-                credentials: credentials,
-                dependency_files: dependency_files,
-                ignored_versions: [],
-                security_advisories: [],
-                raise_on_ignored: raise_on_ignored
-              )
-            end
-        end
-
-        sig { returns(T::Boolean) }
-        def enable_cooldown?
-          Dependabot::Experiments.enabled?(:enable_cooldown_for_npm_and_yarn)
+            PackageLatestVersionFinder.new(
+              dependency: dep,
+              dependency_files: dependency_files,
+              credentials: credentials,
+              cooldown_options: update_cooldown,
+              ignored_versions: [],
+              security_advisories: [],
+              raise_on_ignored: raise_on_ignored
+            )
         end
 
         # rubocop:disable Metrics/PerceivedComplexity

data/lib/dependabot/npm_and_yarn/update_checker.rb

@@ -49,9 +49,7 @@ module Dependabot
         @latest_version_for_git_dependency = T.let(nil, T.nilable(T.any(String, Gem::Version)))
         @latest_released_version = T.let(nil, T.nilable(Gem::Version))
         @latest_version_details = T.let(nil, T.nilable(T::Hash[Symbol, T.untyped]))
-        @latest_version_finder = T.let(
-          nil, T.nilable(T.any(LatestVersionFinder, PackageLatestVersionFinder))
-        )
+        @latest_version_finder = T.let(nil, T.nilable(PackageLatestVersionFinder))
         @version_resolver = T.let(nil, T.nilable(VersionResolver))
         @subdependency_version_resolver = T.let(nil, T.nilable(SubdependencyVersionResolver))
         @library = T.let(nil, T.nilable(T::Boolean))
@@ -138,9 +136,7 @@ module Dependabot
       sig { override.returns(T.nilable(T.any(String, Dependabot::Version))) }
       def latest_resolvable_version_with_no_unlock
         unless dependency.top_level?
-          # TODO: We should use `Dependabot::Version` everywhere
-          return T.cast(latest_resolvable_version,
-                        T.nilable(T.any(String, Dependabot::Version)))
+          return T.cast(latest_resolvable_version, T.nilable(T.any(String, Dependabot::Version)))
         end
 
         return latest_resolvable_version_with_no_unlock_for_git_dependency if git_dependency?
@@ -411,34 +407,17 @@ module Dependabot
           end
       end
 
-      sig { returns(T.any(LatestVersionFinder, PackageLatestVersionFinder)) }
+      sig { returns(PackageLatestVersionFinder) }
       def latest_version_finder
-        @latest_version_finder ||=
-          if enable_cooldown?
-            PackageLatestVersionFinder.new(
-              dependency: dependency,
-              credentials: credentials,
-              dependency_files: dependency_files,
-              ignored_versions: ignored_versions,
-              raise_on_ignored: raise_on_ignored,
-              security_advisories: security_advisories,
-              cooldown_options: @update_cooldown
-            )
-          else
-            LatestVersionFinder.new(
-              dependency: dependency,
-              credentials: credentials,
-              dependency_files: dependency_files,
-              ignored_versions: ignored_versions,
-              raise_on_ignored: raise_on_ignored,
-              security_advisories: security_advisories
-            )
-          end
-      end
-
-      sig { returns(T::Boolean) }
-      def enable_cooldown?
-        Dependabot::Experiments.enabled?(:enable_cooldown_for_npm_and_yarn)
+        @latest_version_finder ||= PackageLatestVersionFinder.new(
+          dependency: dependency,
+          credentials: credentials,
+          dependency_files: dependency_files,
+          ignored_versions: ignored_versions,
+          raise_on_ignored: raise_on_ignored,
+          security_advisories: security_advisories,
+          cooldown_options: @update_cooldown
+        )
       end
 
       sig { returns(VersionResolver) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.321.2
+  version: 0.322.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.321.2
+        version: 0.322.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.321.2
+        version: 0.322.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -356,7 +356,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.321.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.322.0
 rdoc_options: []
 require_paths:
 - lib