zeitwerk 2.6.18 → 2.8.1

data/lib/zeitwerk/loader/config.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require "set"
-require "securerandom"
+require 'set'
+require 'securerandom'
 
 module Zeitwerk::Loader::Config
   extend Zeitwerk::Internal
   include Zeitwerk::RealModName
 
-  # @sig #camelize
+  #: camelize(String, String) -> String
   attr_accessor :inflector
 
-  # @sig #call | #debug | nil
+  #: call(String) -> void | debug(String) -> void | nil
   attr_accessor :logger
 
   # Absolute paths of the root directories, mapped to their respective root namespaces:
   #
-  #   "/Users/fxn/blog/app/channels" => Object,
-  #   "/Users/fxn/blog/app/adapters" => ActiveJob::QueueAdapters,
+  #   '/Users/fxn/blog/app/channels' => Object,
+  #   '/Users/fxn/blog/app/adapters' => ActiveJob::QueueAdapters,
   #   ...
   #
   # Stored in a hash to preserve order, easily handle duplicates, and have a
@@ -25,14 +25,19 @@ module Zeitwerk::Loader::Config
   # This is a private collection maintained by the loader. The public
   # interface for it is `push_dir` and `dirs`.
   #
-  # @sig Hash[String, Module]
+  #: Hash[String, Module]
   attr_reader :roots
   internal :roots
 
-  # Absolute paths of files, directories, or glob patterns to be totally
-  # ignored.
+  # Basename of files that define namespaces. For example, if `nsfile` is
+  # 'ns.rb', then `foo/ns.rb` defines the `Foo` namespace.
   #
-  # @sig Set[String]
+  #: String?
+  attr_reader :nsfile
+
+  # Absolute paths of files, directories, or glob patterns to be ignored.
+  #
+  #: Set[String]
   attr_reader :ignored_glob_patterns
   private :ignored_glob_patterns
 
@@ -40,59 +45,70 @@ module Zeitwerk::Loader::Config
   # ignored glob patterns were expanded. Computed on setup, and recomputed on
   # reload.
   #
-  # @sig Set[String]
+  #: Set[String]
   attr_reader :ignored_paths
   private :ignored_paths
 
   # Absolute paths of directories or glob patterns to be collapsed.
   #
-  # @sig Set[String]
+  #: Set[String]
   attr_reader :collapse_glob_patterns
   private :collapse_glob_patterns
 
   # The actual collection of absolute directory names at the time the collapse
-  # glob patterns were expanded. Computed on setup, and recomputed on reload.
+  # glob patterns were expanded. Computed on setup and recomputed on reload.
   #
-  # @sig Set[String]
+  #: Set[String]
   attr_reader :collapse_dirs
   private :collapse_dirs
 
+  # Absolute paths of directories that are parents of collapsed directories.
+  # This is a cache to optimize some tree walks. Computed on setup and
+  # recomputed on reload.
+  #
+  #: Set[String]
+  attr_reader :collapse_parents
+  private :collapse_parents
+
   # Absolute paths of files or directories not to be eager loaded.
   #
-  # @sig Set[String]
+  #: Set[String]
   attr_reader :eager_load_exclusions
   private :eager_load_exclusions
 
   # User-oriented callbacks to be fired on setup and on reload.
   #
-  # @sig Array[{ () -> void }]
+  #: Array[{ () -> void }]
   attr_reader :on_setup_callbacks
   private :on_setup_callbacks
 
   # User-oriented callbacks to be fired when a constant is loaded.
   #
-  # @sig Hash[String, Array[{ (Object, String) -> void }]]
-  #      Hash[Symbol, Array[{ (String, Object, String) -> void }]]
+  #: Hash[String, Array[{ (top, String) -> void }]]
+  #| Hash[Symbol, Array[{ (String, top, String) -> void }]]
   attr_reader :on_load_callbacks
   private :on_load_callbacks
 
   # User-oriented callbacks to be fired before constants are removed.
   #
-  # @sig Hash[String, Array[{ (Object, String) -> void }]]
-  #      Hash[Symbol, Array[{ (String, Object, String) -> void }]]
+  #: Hash[String, Array[{ (top, String) -> void }]]
+  #| Hash[Symbol, Array[{ (String, top, String) -> void }]]
   attr_reader :on_unload_callbacks
   private :on_unload_callbacks
 
+  #: () -> void
   def initialize
     @inflector              = Zeitwerk::Inflector.new
     @logger                 = self.class.default_logger
     @tag                    = SecureRandom.hex(3)
     @initialized_at         = Time.now
     @roots                  = {}
+    @nsfile                 = nil
     @ignored_glob_patterns  = Set.new
     @ignored_paths          = Set.new
     @collapse_glob_patterns = Set.new
     @collapse_dirs          = Set.new
+    @collapse_parents       = Set.new
     @eager_load_exclusions  = Set.new
     @reloading_enabled      = false
     @on_setup_callbacks     = []
@@ -106,20 +122,19 @@ module Zeitwerk::Loader::Config
   # the same process already manages that directory or one of its ascendants or
   # descendants.
   #
-  # @raise [Zeitwerk::Error]
-  # @sig (String | Pathname, Module) -> void
+  #: (String | Pathname, namespace: Module) -> void ! Zeitwerk::Error
   def push_dir(path, namespace: Object)
     unless namespace.is_a?(Module) # Note that Class < Module.
       raise Zeitwerk::Error, "#{namespace.inspect} is not a class or module object, should be"
     end
 
     unless real_mod_name(namespace)
-      raise Zeitwerk::Error, "root namespaces cannot be anonymous"
+      raise Zeitwerk::Error, 'root namespaces cannot be anonymous'
     end
 
     abspath = File.expand_path(path)
-    if dir?(abspath)
-      raise_if_conflicting_directory(abspath)
+    if @fs.dir?(abspath)
+      raise_if_conflicting_root_dir(abspath)
       roots[abspath] = namespace
     else
       raise Zeitwerk::Error, "the root directory #{abspath} does not exist"
@@ -131,18 +146,30 @@ module Zeitwerk::Loader::Config
   # Implemented as a method instead of via attr_reader for symmetry with the
   # writer below.
   #
-  # @sig () -> String
+  #: () -> String
   def tag
     @tag
   end
 
   # Sets a tag for the loader, useful for logging.
   #
-  # @sig (#to_s) -> void
+  #: (to_s() -> String) -> void
   def tag=(tag)
     @tag = tag.to_s
   end
 
+  #: (String?) -> void ! TypeError, ArgumentError
+  def nsfile=(nsfile)
+    unless nsfile.nil?
+      raise TypeError,     'nsfiles must be strings'              unless nsfile.is_a?(String)
+      raise ArgumentError, 'nsfiles must have .rb extension'      unless @fs.rb_extension?(nsfile)
+      raise ArgumentError, 'nsfiles must be basenames, not paths' unless File.basename(nsfile) == nsfile
+      raise ArgumentError, 'nsfiles cannot be hidden'             if @fs.hidden?(nsfile)
+    end
+
+    @nsfile = nsfile
+  end
+
   # If `namespaces` is falsey (default), returns an array with the absolute
   # paths of the root directories as strings. If truthy, returns a hash table
   # instead. Keys are the absolute paths of the root directories as strings,
@@ -152,7 +179,7 @@ module Zeitwerk::Loader::Config
   #
   # These are read-only collections, please add to them with `push_dir`.
   #
-  # @sig () -> Array[String] | Hash[String, Module]
+  #: (?namespaces: boolish, ?ignored: boolish) -> Array[String] | Hash[String, Module]
   def dirs(namespaces: false, ignored: false)
     if namespaces
       if ignored || ignored_paths.empty?
@@ -172,21 +199,20 @@ module Zeitwerk::Loader::Config
   # You need to call this method before setup in order to be able to reload.
   # There is no way to undo this, either you want to reload or you don't.
   #
-  # @raise [Zeitwerk::Error]
-  # @sig () -> void
+  #: () -> void ! Zeitwerk::Error
   def enable_reloading
     mutex.synchronize do
       break if @reloading_enabled
 
       if @setup
-        raise Zeitwerk::Error, "cannot enable reloading after setup"
+        raise Zeitwerk::Error, 'cannot enable reloading after setup'
       else
         @reloading_enabled = true
       end
     end
   end
 
-  # @sig () -> bool
+  #: () -> bool
   def reloading_enabled?
     @reloading_enabled
   end
@@ -194,14 +220,14 @@ module Zeitwerk::Loader::Config
   # Let eager load ignore the given files or directories. The constants defined
   # in those files are still autoloadable.
   #
-  # @sig (*(String | Pathname | Array[String | Pathname])) -> void
+  #: (*(String | Pathname | Array[String | Pathname])) -> void
   def do_not_eager_load(*paths)
     mutex.synchronize { eager_load_exclusions.merge(expand_paths(paths)) }
   end
 
   # Configure files, directories, or glob patterns to be totally ignored.
   #
-  # @sig (*(String | Pathname | Array[String | Pathname])) -> void
+  #: (*(String | Pathname | Array[String | Pathname])) -> void
   def ignore(*glob_patterns)
     glob_patterns = expand_paths(glob_patterns)
     mutex.synchronize do
@@ -212,19 +238,23 @@ module Zeitwerk::Loader::Config
 
   # Configure directories or glob patterns to be collapsed.
   #
-  # @sig (*(String | Pathname | Array[String | Pathname])) -> void
+  #: (*(String | Pathname | Array[String | Pathname])) -> void
   def collapse(*glob_patterns)
     glob_patterns = expand_paths(glob_patterns)
     mutex.synchronize do
       collapse_glob_patterns.merge(glob_patterns)
-      collapse_dirs.merge(expand_glob_patterns(glob_patterns))
+      new_collapse_dirs = expand_glob_patterns(glob_patterns)
+      collapse_dirs.merge(new_collapse_dirs)
+      new_collapse_dirs.each do |dir|
+        collapse_parents << File.dirname(dir)
+      end
     end
   end
 
   # Configure a block to be called after setup and on each reload.
   # If setup was already done, the block runs immediately.
   #
-  # @sig () { () -> void } -> void
+  #: () { () -> void } -> void
   def on_setup(&block)
     mutex.synchronize do
       on_setup_callbacks << block
@@ -236,8 +266,8 @@ module Zeitwerk::Loader::Config
   # Supports multiple callbacks, and if there are many, they are executed in
   # the order in which they were defined.
   #
-  #   loader.on_load("SomeApiClient") do |klass, _abspath|
-  #     klass.endpoint = "https://api.dev"
+  #   loader.on_load('SomeApiClient') do |klass, _abspath|
+  #     klass.endpoint = 'https://api.dev'
   #   end
   #
   # Can also be configured for any constant loaded:
@@ -246,11 +276,9 @@ module Zeitwerk::Loader::Config
   #     # ...
   #   end
   #
-  # @raise [TypeError]
-  # @sig (String) { (Object, String) -> void } -> void
-  #      (:ANY) { (String, Object, String) -> void } -> void
+  #: (String?) { (top, String) -> void } -> void ! TypeError
   def on_load(cpath = :ANY, &block)
-    raise TypeError, "on_load only accepts strings" unless cpath.is_a?(String) || cpath == :ANY
+    raise TypeError, 'on_load only accepts strings' unless cpath.is_a?(String) || cpath == :ANY
 
     mutex.synchronize do
       (on_load_callbacks[cpath] ||= []) << block
@@ -261,7 +289,7 @@ module Zeitwerk::Loader::Config
   # Supports multiple callbacks, and if there are many, they are executed in the
   # order in which they were defined.
   #
-  #   loader.on_unload("Country") do |klass, _abspath|
+  #   loader.on_unload('Country') do |klass, _abspath|
   #     klass.clear_cache
   #   end
   #
@@ -271,11 +299,9 @@ module Zeitwerk::Loader::Config
   #     # ...
   #   end
   #
-  # @raise [TypeError]
-  # @sig (String) { (Object) -> void } -> void
-  #      (:ANY) { (String, Object) -> void } -> void
+  #: (String?) { (top, String) -> void } -> void ! TypeError
   def on_unload(cpath = :ANY, &block)
-    raise TypeError, "on_unload only accepts strings" unless cpath.is_a?(String) || cpath == :ANY
+    raise TypeError, 'on_unload only accepts strings' unless cpath.is_a?(String) || cpath == :ANY
 
     mutex.synchronize do
       (on_unload_callbacks[cpath] ||= []) << block
@@ -284,7 +310,7 @@ module Zeitwerk::Loader::Config
 
   # Logs to `$stdout`, handy shortcut for debugging.
   #
-  # @sig () -> void
+  #: () -> void
   def log!
     @logger = ->(msg) { puts msg }
   end
@@ -292,73 +318,86 @@ module Zeitwerk::Loader::Config
   # Returns true if the argument has been configured to be ignored, or is a
   # descendant of an ignored directory.
   #
-  # @sig (String) -> bool
+  #: (String) -> bool
   internal def ignores?(abspath)
     # Common use case.
     return false if ignored_paths.empty?
 
-    walk_up(abspath) do |path|
+    @fs.walk_up(abspath) do |path|
       return true  if ignored_path?(path)
-      return false if roots.key?(path)
+      return false if root_dir?(path)
     end
 
     false
   end
 
-  # @sig (String) -> bool
-  private def ignored_path?(abspath)
+  #: (String) -> bool
+  internal def ignored_path?(abspath)
     ignored_paths.member?(abspath)
   end
 
-  # @sig () -> Array[String]
+  #: () -> Array[String]
   private def actual_roots
     roots.reject do |root_dir, _root_namespace|
-      !dir?(root_dir) || ignored_path?(root_dir)
+      !@fs.dir?(root_dir) || ignored_path?(root_dir)
     end
   end
 
-  # @sig (String) -> bool
-  private def root_dir?(dir)
+  #: (String) -> bool
+  internal def root_dir?(dir)
     roots.key?(dir)
   end
 
-  # @sig (String) -> bool
+  #: (String) -> bool
+  internal def collapse?(dir)
+    collapse_dirs.member?(dir)
+  end
+
+  #: (String) -> bool
+  internal def collapse_parent?(dir)
+    collapse_parents.member?(dir)
+  end
+
+  #: (String) -> bool
   private def excluded_from_eager_load?(abspath)
     # Optimize this common use case.
     return false if eager_load_exclusions.empty?
 
-    walk_up(abspath) do |path|
+    @fs.walk_up(abspath) do |path|
       return true  if eager_load_exclusions.member?(path)
-      return false if roots.key?(path)
+      return false if root_dir?(path)
     end
 
     false
   end
 
-  # @sig (String) -> bool
-  private def collapse?(dir)
-    collapse_dirs.member?(dir)
-  end
-
-  # @sig (String | Pathname | Array[String | Pathname]) -> Array[String]
+  #: (String | Pathname | Array[String | Pathname]) -> Array[String]
   private def expand_paths(paths)
     paths.flatten.map! { |path| File.expand_path(path) }
   end
 
-  # @sig (Array[String]) -> Array[String]
+  #: (Array[String]) -> Array[String]
   private def expand_glob_patterns(glob_patterns)
     # Note that Dir.glob works with regular file names just fine. That is,
     # glob patterns technically need no wildcards.
     glob_patterns.flat_map { |glob_pattern| Dir.glob(glob_pattern) }
   end
 
-  # @sig () -> void
+  #: () -> void
   private def recompute_ignored_paths
     ignored_paths.replace(expand_glob_patterns(ignored_glob_patterns))
   end
 
-  # @sig () -> void
+  #: () -> void
   private def recompute_collapse_dirs
     collapse_dirs.replace(expand_glob_patterns(collapse_glob_patterns))
   end
+
+  #: () -> void
+  private def recompute_collapse_parents
+    collapse_parents.clear
+    collapse_dirs.each do |dir|
+      collapse_parents << File.dirname(dir)
+    end
+  end
 end

data/lib/zeitwerk/loader/eager_load.rb

@@ -1,56 +1,55 @@
 module Zeitwerk::Loader::EagerLoad
   # Eager loads all files in the root directories, recursively. Files do not
-  # need to be in `$LOAD_PATH`, absolute file names are used. Ignored and
-  # shadowed files are not eager loaded. You can opt-out specifically in
-  # specific files and directories with `do_not_eager_load`, and that can be
-  # overridden passing `force: true`.
+  # need to be in `$LOAD_PATH`, absolute file names are used.
   #
-  # @sig (true | false) -> void
+  # Ignored files are not eager loaded. You can opt-out specifically in specific
+  # files and directories with `do_not_eager_load`, and that can be overridden
+  # passing `force: true`.
+  #
+  #: (?force: boolish) -> void
   def eager_load(force: false)
     mutex.synchronize do
       break if @eager_loaded
       raise Zeitwerk::SetupRequired unless @setup
 
-      log("eager load start") if logger
+      log { 'eager load start' }
 
       actual_roots.each do |root_dir, root_namespace|
         actual_eager_load_dir(root_dir, root_namespace, force: force)
       end
 
       autoloaded_dirs.each do |autoloaded_dir|
-        Zeitwerk::Registry.unregister_autoload(autoloaded_dir)
+        Zeitwerk::Registry.autoloads.unregister(autoloaded_dir)
       end
       autoloaded_dirs.clear
 
       @eager_loaded = true
 
-      log("eager load end") if logger
+      log { 'eager load end' }
     end
   end
 
-  # @sig (String | Pathname) -> void
+  #: (String | Pathname) -> void
   def eager_load_dir(path)
     raise Zeitwerk::SetupRequired unless @setup
 
     abspath = File.expand_path(path)
 
-    raise Zeitwerk::Error.new("#{abspath} is not a directory") unless dir?(abspath)
+    raise Zeitwerk::Error.new("#{abspath} is not a directory") unless @fs.dir?(abspath)
 
-    cnames = []
+    paths = []
 
     root_namespace = nil
-    walk_up(abspath) do |dir|
+    @fs.walk_up(abspath) do |dir|
       return if ignored_path?(dir)
       return if eager_load_exclusions.member?(dir)
 
       break if root_namespace = roots[dir]
 
       basename = File.basename(dir)
-      return if hidden?(basename)
+      return if @fs.hidden?(basename)
 
-      unless collapse?(dir)
-        cnames << inflector.camelize(basename, dir).to_sym
-      end
+      paths << [basename, dir] unless collapse?(dir)
     end
 
     raise Zeitwerk::Error.new("I do not manage #{abspath}") unless root_namespace
@@ -58,7 +57,8 @@ module Zeitwerk::Loader::EagerLoad
     return if @eager_loaded
 
     namespace = root_namespace
-    cnames.reverse_each do |cname|
+    paths.reverse_each do |basename, dir|
+      cname = cname_for(basename, dir)
       # Can happen if there are no Ruby files. This is not an error condition,
       # the directory is actually managed. Could have Ruby files later.
       return unless namespace.const_defined?(cname, false)
@@ -70,7 +70,7 @@ module Zeitwerk::Loader::EagerLoad
     actual_eager_load_dir(abspath, namespace)
   end
 
-  # @sig (Module) -> void
+  #: (Module) -> void
   def eager_load_namespace(mod)
     raise Zeitwerk::SetupRequired unless @setup
 
@@ -84,7 +84,7 @@ module Zeitwerk::Loader::EagerLoad
     return unless mod_name
 
     actual_roots.each do |root_dir, root_namespace|
-      if mod.equal?(Object)
+      if Object.equal?(mod)
         # A shortcircuiting test depends on the invocation of this method.
         # Please keep them in sync if refactored.
         actual_eager_load_dir(root_dir, root_namespace)
@@ -92,11 +92,11 @@ module Zeitwerk::Loader::EagerLoad
         eager_load_child_namespace(mod, mod_name, root_dir, root_namespace)
       else
         root_namespace_name = real_mod_name(root_namespace)
-        if root_namespace_name.start_with?(mod_name + "::")
+        if root_namespace_name.start_with?(mod_name + '::')
           actual_eager_load_dir(root_dir, root_namespace)
         elsif mod_name == root_namespace_name
           actual_eager_load_dir(root_dir, root_namespace)
-        elsif mod_name.start_with?(root_namespace_name + "::")
+        elsif mod_name.start_with?(root_namespace_name + '::')
           eager_load_child_namespace(mod, mod_name, root_dir, root_namespace)
         else
           # Unrelated constant hierarchies, do nothing.
@@ -112,60 +112,62 @@ module Zeitwerk::Loader::EagerLoad
   # The method is implemented as `constantize` for files, in a sense, to be able
   # to descend orderly and make sure the file is loadable.
   #
-  # @sig (String | Pathname) -> void
+  #: (String | Pathname) -> void
   def load_file(path)
     abspath = File.expand_path(path)
 
     raise Zeitwerk::Error.new("#{abspath} does not exist") unless File.exist?(abspath)
-    raise Zeitwerk::Error.new("#{abspath} is not a Ruby file") if dir?(abspath) || !ruby?(abspath)
+    raise Zeitwerk::Error.new("#{abspath} is not a Ruby file") if !@fs.rb_extension?(abspath)
     raise Zeitwerk::Error.new("#{abspath} is ignored") if ignored_path?(abspath)
 
-    basename = File.basename(abspath, ".rb")
-    raise Zeitwerk::Error.new("#{abspath} is ignored") if hidden?(basename)
-
-    base_cname = inflector.camelize(basename, abspath).to_sym
+    file_basename = File.basename(abspath)
+    raise Zeitwerk::Error.new("#{abspath} is ignored") if @fs.hidden?(file_basename)
 
     root_namespace = nil
-    cnames = []
+    paths = []
 
-    walk_up(File.dirname(abspath)) do |dir|
+    @fs.walk_up(File.dirname(abspath)) do |dir|
       raise Zeitwerk::Error.new("#{abspath} is ignored") if ignored_path?(dir)
 
       break if root_namespace = roots[dir]
 
       basename = File.basename(dir)
-      raise Zeitwerk::Error.new("#{abspath} is ignored") if hidden?(basename)
+      raise Zeitwerk::Error.new("#{abspath} is ignored") if @fs.hidden?(basename)
 
-      unless collapse?(dir)
-        cnames << inflector.camelize(basename, dir).to_sym
-      end
+      paths << [basename, dir] unless collapse?(dir)
     end
 
     raise Zeitwerk::Error.new("I do not manage #{abspath}") unless root_namespace
 
     namespace = root_namespace
-    cnames.reverse_each do |cname|
+    paths.reverse_each do |basename, dir|
+      cname = cname_for(basename, dir)
       namespace = namespace.const_get(cname, false)
     end
 
-    raise Zeitwerk::Error.new("#{abspath} is shadowed") if shadowed_file?(abspath)
-
-    namespace.const_get(base_cname, false)
+    if file_basename == @nsfile
+      namespace
+    elsif shadowed_file?(abspath)
+      raise Zeitwerk::Error.new("#{abspath} is shadowed")
+    else
+      cname = cname_for(file_basename.delete_suffix('.rb'), abspath)
+      namespace.const_get(cname, false)
+    end
   end
 
   # The caller is responsible for making sure `namespace` is the namespace that
   # corresponds to `dir`.
   #
-  # @sig (String, Module, Boolean) -> void
+  #: (String, Module, ?force: boolish) -> void
   private def actual_eager_load_dir(dir, namespace, force: false)
     honour_exclusions = !force
     return if honour_exclusions && excluded_from_eager_load?(dir)
 
-    log("eager load directory #{dir} start") if logger
+    log { "eager load directory #{dir} start" }
 
     queue = [[dir, namespace]]
     while (current_dir, namespace = queue.shift)
-      ls(current_dir) do |basename, abspath, ftype|
+      @fs.ls(current_dir) do |basename, abspath, ftype|
         next if honour_exclusions && eager_load_exclusions.member?(abspath)
 
         if ftype == :file
@@ -173,27 +175,23 @@ module Zeitwerk::Loader::EagerLoad
             cref.get
           end
         else
-          if collapse?(abspath)
-            queue << [abspath, namespace]
-          else
-            cname = inflector.camelize(basename, abspath).to_sym
-            queue << [abspath, namespace.const_get(cname, false)]
-          end
+          cname = cname_for(basename, abspath)
+          queue << [abspath, namespace.const_get(cname, false)]
         end
       end
     end
 
-    log("eager load directory #{dir} end") if logger
+    log { "eager load directory #{dir} end" }
   end
 
   # In order to invoke this method, the caller has to ensure `child` is a
   # strict namespace descendant of `root_namespace`.
   #
-  # @sig (Module, String, Module, Boolean) -> void
+  #: (Module, String, String, Module) -> void
   private def eager_load_child_namespace(child, child_name, root_dir, root_namespace)
     suffix = child_name
     unless root_namespace.equal?(Object)
-      suffix = suffix.delete_prefix(real_mod_name(root_namespace) + "::")
+      suffix = suffix.delete_prefix(real_mod_name(root_namespace) + '::')
     end
 
     # These directories are at the same namespace level, there may be more if
@@ -206,14 +204,10 @@ module Zeitwerk::Loader::EagerLoad
     dirs = [root_dir]
     next_dirs = []
 
-    suffix.split("::").each do |segment|
+    suffix.split('::').each do |segment|
       while (dir = dirs.shift)
-        ls(dir) do |basename, abspath, ftype|
-          next unless ftype == :directory
-
-          if collapse?(abspath)
-            dirs << abspath
-          elsif segment == inflector.camelize(basename, abspath)
+        @fs.ls(dir) do |basename, abspath, ftype|
+          if ftype == :directory && segment == cname_for(basename, abspath).to_s
             next_dirs << abspath
           end
         end