zeitwerk 2.6.18 → 2.8.1

data/lib/zeitwerk/loader.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require "monitor"
-require "set"
+require 'monitor'
+require 'set'
 
 module Zeitwerk
   class Loader
-    require_relative "loader/helpers"
-    require_relative "loader/callbacks"
-    require_relative "loader/config"
-    require_relative "loader/eager_load"
+    require_relative 'loader/helpers'
+    require_relative 'loader/callbacks'
+    require_relative 'loader/config'
+    require_relative 'loader/eager_load'
+    require_relative 'loader/file_system'
 
     extend Internal
 
@@ -18,111 +19,118 @@ module Zeitwerk
     include Config
     include EagerLoad
 
-    MUTEX = Mutex.new
-    private_constant :MUTEX
-
     # Maps absolute paths for which an autoload has been set ---and not
     # executed--- to their corresponding Zeitwerk::Cref object.
     #
-    #   "/Users/fxn/blog/app/models/user.rb"          => #<Zeitwerk::Cref:... @mod=Object, @cname=:User, ...>,
-    #   "/Users/fxn/blog/app/models/hotel/pricing.rb" => #<Zeitwerk::Cref:... @mod=Hotel, @cname=:Pricing, ...>,
+    #   '/Users/fxn/blog/app/models/user.rb'          => #<Zeitwerk::Cref:... @mod=Object, @cname=:User, ...>,
+    #   '/Users/fxn/blog/app/models/hotel/pricing.rb' => #<Zeitwerk::Cref:... @mod=Hotel, @cname=:Pricing, ...>,
     #   ...
     #
-    # @sig Hash[String, Zeitwerk::Cref]
+    #: Hash[String, Zeitwerk::Cref]
     attr_reader :autoloads
     internal :autoloads
 
+    # When the path passed to Module#autoload is in the stack of features being
+    # loaded at the moment, Ruby passes. For example, Module#autoload? returns
+    # `nil` even if the autoload has not been attempted. See
+    #
+    #     https://bugs.ruby-lang.org/issues/21035
+    #
+    # We call these "inceptions".
+    #
+    # A common case is the entry point of gems managed by Zeitwerk. Their main
+    # file is normally required and, while doing so, the loader sets an autoload
+    # on the gem namespace. That autoload hits this edge case.
+    #
+    # There is some logic that needs to know if an autoload for a given constant
+    # already exists. We check Module#autoload? first, and fallback to the
+    # inceptions just in case.
+    #
+    # This map keeps track of pairs (cref, autoload_path) found by the loader.
+    # The object Zeitwerk::Registry.inceptions, on the other hand, acts as a
+    # global registry for them.
+    #
+    #: Zeitwerk::Cref::Map[String]
+    attr_reader :inceptions
+    internal :inceptions
+
     # We keep track of autoloaded directories to remove them from the registry
     # at the end of eager loading.
     #
     # Files are removed as they are autoloaded, but directories need to wait due
     # to concurrency (see why in Zeitwerk::Loader::Callbacks#on_dir_autoloaded).
     #
-    # @sig Array[String]
+    #: Array[String]
     attr_reader :autoloaded_dirs
     internal :autoloaded_dirs
 
-    # Stores metadata needed for unloading. Its entries look like this:
-    #
-    #   "Admin::Role" => [
-    #     ".../admin/role.rb",
-    #     #<Zeitwerk::Cref:... @mod=Admin, @cname=:Role, ...>
-    #   ]
+    # If reloading is enabled, this collection maps autoload paths to their
+    # autoloaded crefs.
     #
-    # The cpath as key helps implementing unloadable_cpath? The file name is
-    # stored in order to be able to delete it from $LOADED_FEATURES, and the
-    # cref is used to remove the constant from the parent class or module.
+    # On unload, the autoload paths are passed to callbacks, files deleted from
+    # $LOADED_FEATURES, and the crefs are deleted.
     #
-    # If reloading is enabled, this hash is filled as constants are autoloaded
-    # or eager loaded. Otherwise, the collection remains empty.
-    #
-    # @sig Hash[String, [String, Zeitwerk::Cref]]
+    #: Hash[String, Zeitwerk::Cref]
     attr_reader :to_unload
     internal :to_unload
 
-    # Maps namespace constant paths to their respective directories.
-    #
-    # For example, given this mapping:
-    #
-    #   "Admin" => [
-    #     "/Users/fxn/blog/app/controllers/admin",
-    #     "/Users/fxn/blog/app/models/admin",
-    #     ...
-    #   ]
+    # Maps namespace crefs to the directories that conform the namespace.
     #
-    # when `Admin` gets defined we know that it plays the role of a namespace
-    # and that its children are spread over those directories. We'll visit them
-    # to set up the corresponding autoloads.
+    # When these crefs get defined we know their children are spread over those
+    # directories. We'll visit them to set up the corresponding autoloads.
     #
-    # @sig Hash[String, Array[String]]
+    #: Zeitwerk::Cref::Map[String]
     attr_reader :namespace_dirs
     internal :namespace_dirs
 
     # A shadowed file is a file managed by this loader that is ignored when
     # setting autoloads because its matching constant is already taken.
     #
-    # This private set is populated as we descend. For example, if the loader
-    # has only scanned the top-level, `shadowed_files` does not have shadowed
-    # files that may exist deep in the project tree yet.
+    # This private set is populated lazily, as we descend. For example, if the
+    # loader has only scanned the top-level, `shadowed_files` does not have the
+    # shadowed files that may exist deep in the project tree.
     #
-    # @sig Set[String]
+    #: Set[String]
     attr_reader :shadowed_files
     internal :shadowed_files
 
-    # @sig Mutex
+    #: Mutex
     attr_reader :mutex
     private :mutex
 
-    # @sig Monitor
+    #: Monitor
     attr_reader :dirs_autoload_monitor
     private :dirs_autoload_monitor
 
+    #: () -> void
     def initialize
       super
 
       @autoloads       = {}
+      @inceptions      = Zeitwerk::Cref::Map.new
       @autoloaded_dirs = []
       @to_unload       = {}
-      @namespace_dirs  = Hash.new { |h, cpath| h[cpath] = [] }
+      @namespace_dirs  = Zeitwerk::Cref::Map.new
       @shadowed_files  = Set.new
       @setup           = false
       @eager_loaded    = false
+      @fs              = FileSystem.new(self)
 
       @mutex = Mutex.new
       @dirs_autoload_monitor = Monitor.new
 
-      Registry.register_loader(self)
+      Registry.loaders.register(self)
     end
 
     # Sets autoloads in the root namespaces.
     #
-    # @sig () -> void
+    #: () -> void
     def setup
       mutex.synchronize do
         break if @setup
 
         actual_roots.each do |root_dir, root_namespace|
-          define_autoloads_for_dir(root_dir, root_namespace)
+          define_autoloads_for_dir(root_dir, root_namespace, external: true)
         end
 
         on_setup_callbacks.each(&:call)
@@ -142,75 +150,83 @@ module Zeitwerk
     # means `unload` + `setup`. This one is available to be used together with
     # `unregister`, which is undocumented too.
     #
-    # @sig () -> void
+    #: () -> void
     def unload
       mutex.synchronize do
         raise SetupRequired unless @setup
+        __unload
+      end
+    end
 
-        # We are going to keep track of the files that were required by our
-        # autoloads to later remove them from $LOADED_FEATURES, thus making them
-        # loadable by Kernel#require again.
-        #
-        # Directories are not stored in $LOADED_FEATURES, keeping track of files
-        # is enough.
-        unloaded_files = Set.new
+    # This is an internal method.
+    #
+    #: () -> void
+    def __unload
+      # We are going to keep track of the files that were required by our
+      # autoloads to later remove them from $LOADED_FEATURES, thus making them
+      # loadable by Kernel#require again.
+      #
+      # Directories are not stored in $LOADED_FEATURES, keeping track of files
+      # is enough.
+      unloaded_files = Set.new
+
+      autoloads.each do |abspath, cref|
+        if cref.autoload?
+          unload_autoload(cref)
+        else
+          # Could happen if loaded with require_relative. That is unsupported,
+          # and the constant path would escape unloadable_cpath? This is just
+          # defensive code to clean things up as much as we are able to.
+          unload_cref(cref)
+          unloaded_files.add(abspath) if @fs.rb_extension?(abspath)
+        end
+      end
 
-        autoloads.each do |abspath, cref|
-          if cref.autoload?
-            unload_autoload(cref)
+      to_unload.each do |abspath, cref|
+        unless on_unload_callbacks.empty?
+          begin
+            value = cref.get
+          rescue ::NameError
+            # Perhaps the user deleted the constant by hand, or perhaps an
+            # autoload failed to define the expected constant but the user
+            # rescued the exception.
           else
-            # Could happen if loaded with require_relative. That is unsupported,
-            # and the constant path would escape unloadable_cpath? This is just
-            # defensive code to clean things up as much as we are able to.
-            unload_cref(cref)
-            unloaded_files.add(abspath) if ruby?(abspath)
+            run_on_unload_callbacks(cref, value, abspath)
           end
         end
 
-        to_unload.each do |cpath, (abspath, cref)|
-          unless on_unload_callbacks.empty?
-            begin
-              value = cref.get
-            rescue ::NameError
-              # Perhaps the user deleted the constant by hand, or perhaps an
-              # autoload failed to define the expected constant but the user
-              # rescued the exception.
-            else
-              run_on_unload_callbacks(cpath, value, abspath)
-            end
-          end
+        unload_cref(cref)
+        unloaded_files.add(abspath) if @fs.rb_extension?(abspath)
+      end
 
-          unload_cref(cref)
-          unloaded_files.add(abspath) if ruby?(abspath)
-        end
+      unless unloaded_files.empty?
+        # Bootsnap decorates Kernel#require to speed it up using a cache and
+        # this optimization does not check if $LOADED_FEATURES has the file.
+        #
+        # To make it aware of changes, the gem defines singleton methods in
+        # $LOADED_FEATURES:
+        #
+        #   https://github.com/rails/bootsnap/blob/main/lib/bootsnap/load_path_cache/core_ext/loaded_features.rb
+        #
+        # Rails applications may depend on bootsnap, so for unloading to work
+        # in that setting it is preferable that we restrict our API choice to
+        # one of those methods.
+        $LOADED_FEATURES.reject! { |file| unloaded_files.member?(file) }
+      end
 
-        unless unloaded_files.empty?
-          # Bootsnap decorates Kernel#require to speed it up using a cache and
-          # this optimization does not check if $LOADED_FEATURES has the file.
-          #
-          # To make it aware of changes, the gem defines singleton methods in
-          # $LOADED_FEATURES:
-          #
-          #   https://github.com/Shopify/bootsnap/blob/master/lib/bootsnap/load_path_cache/core_ext/loaded_features.rb
-          #
-          # Rails applications may depend on bootsnap, so for unloading to work
-          # in that setting it is preferable that we restrict our API choice to
-          # one of those methods.
-          $LOADED_FEATURES.reject! { |file| unloaded_files.member?(file) }
-        end
+      autoloads.clear
+      autoloaded_dirs.clear
+      to_unload.clear
+      namespace_dirs.clear
+      shadowed_files.clear
 
-        autoloads.clear
-        autoloaded_dirs.clear
-        to_unload.clear
-        namespace_dirs.clear
-        shadowed_files.clear
+      unregister_inceptions
+      unregister_explicit_namespaces
 
-        Registry.on_unload(self)
-        ExplicitNamespace.__unregister_loader(self)
+      Registry.autoloads.unregister_loader(self)
 
-        @setup        = false
-        @eager_loaded = false
-      end
+      @setup        = false
+      @eager_loaded = false
     end
 
     # Unloads all loaded code, and calls setup again so that the loader is able
@@ -219,22 +235,24 @@ module Zeitwerk
     # This method is not thread-safe, please see how this can be achieved by
     # client code in the README of the project.
     #
-    # @raise [Zeitwerk::Error]
-    # @sig () -> void
+    #: () -> void ! Zeitwerk::Error
     def reload
       raise ReloadingDisabledError unless reloading_enabled?
       raise SetupRequired unless @setup
 
       unload
+
       recompute_ignored_paths
       recompute_collapse_dirs
+      recompute_collapse_parents
+
       setup
     end
 
     # Returns a hash that maps the absolute paths of the managed files and
     # directories to their respective expected constant paths.
     #
-    # @sig () -> Hash[String, String]
+    #: () -> Hash[String, String]
     def all_expected_cpaths
       result = {}
 
@@ -244,18 +262,20 @@ module Zeitwerk
         while (dir, cpath = queue.shift)
           result[dir] = cpath
 
-          prefix = cpath == "Object" ? "" : cpath + "::"
+          prefix = cpath == 'Object' ? '' : cpath + '::'
 
-          ls(dir) do |basename, abspath, ftype|
+          @fs.ls(dir, collapse: false) do |basename, abspath, ftype|
             if ftype == :file
-              basename.delete_suffix!(".rb")
-              result[abspath] = prefix + inflector.camelize(basename, abspath)
-            else
-              if collapse?(abspath)
-                queue << [abspath, cpath]
+              if basename == @nsfile
+                result[abspath] = cpath
               else
-                queue << [abspath, prefix + inflector.camelize(basename, abspath)]
+                basename.delete_suffix!('.rb')
+                result[abspath] = "#{prefix}#{cname_for(basename, abspath)}"
               end
+            elsif collapse?(abspath)
+              queue.unshift([abspath, cpath])
+            else
+              queue.push([abspath, "#{prefix}#{cname_for(basename, abspath)}"])
             end
           end
         end
@@ -264,22 +284,24 @@ module Zeitwerk
       result
     end
 
-    # @sig (String | Pathname) -> String?
+    #: (String | Pathname) -> String?
     def cpath_expected_at(path)
       abspath = File.expand_path(path)
 
       raise Zeitwerk::Error.new("#{abspath} does not exist") unless File.exist?(abspath)
 
-      return unless dir?(abspath) || ruby?(abspath)
+      ftype = @fs.supported_ftype?(abspath)
+      return unless ftype
+
       return if ignored_path?(abspath)
 
       paths = []
 
-      if ruby?(abspath)
-        basename = File.basename(abspath, ".rb")
-        return if hidden?(basename)
+      if ftype == :file
+        basename = File.basename(abspath)
+        return if @fs.hidden?(basename)
 
-        paths << [basename, abspath]
+        paths << [basename.delete_suffix('.rb'), abspath] unless basename == @nsfile
         walk_up_from = File.dirname(abspath)
       else
         walk_up_from = abspath
@@ -287,14 +309,14 @@ module Zeitwerk
 
       root_namespace = nil
 
-      walk_up(walk_up_from) do |dir|
+      @fs.walk_up(walk_up_from) do |dir|
         break if root_namespace = roots[dir]
         return if ignored_path?(dir)
 
         basename = File.basename(dir)
-        return if hidden?(basename)
+        return if @fs.hidden?(basename)
 
-        paths << [basename, abspath] unless collapse?(dir)
+        paths << [basename, dir] unless collapse?(dir)
       end
 
       return unless root_namespace
@@ -302,12 +324,12 @@ module Zeitwerk
       if paths.empty?
         real_mod_name(root_namespace)
       else
-        cnames = paths.reverse_each.map { |b, a| cname_for(b, a) }
+        cnames = paths.reverse_each.map { cname_for(_1, _2) }
 
         if root_namespace == Object
-          cnames.join("::")
+          cnames.join('::')
         else
-          "#{real_mod_name(root_namespace)}::#{cnames.join("::")}"
+          "#{real_mod_name(root_namespace)}::#{cnames.join('::')}"
         end
       end
     end
@@ -315,50 +337,69 @@ module Zeitwerk
     # Says if the given constant path would be unloaded on reload. This
     # predicate returns `false` if reloading is disabled.
     #
-    # @sig (String) -> bool
+    # This is an undocumented method that I wrote to help transition from the
+    # classic autoloader in Rails. Its usage was removed from Rails in 7.0.
+    #
+    #: (String) -> bool
     def unloadable_cpath?(cpath)
-      to_unload.key?(cpath)
+      unloadable_cpaths.include?(cpath)
     end
 
     # Returns an array with the constant paths that would be unloaded on reload.
     # This predicate returns an empty array if reloading is disabled.
     #
-    # @sig () -> Array[String]
+    # This is an undocumented method that I wrote to help transition from the
+    # classic autoloader in Rails. Its usage was removed from Rails in 7.0.
+    #
+    #: () -> Array[String]
     def unloadable_cpaths
-      to_unload.keys.freeze
+      to_unload.values.map(&:path)
     end
 
     # This is a dangerous method.
     #
     # @experimental
-    # @sig () -> void
+    #: () -> void
     def unregister
+      unregister_inceptions
+      unregister_explicit_namespaces
+      Registry.loaders.unregister(self)
+      Registry.autoloads.unregister_loader(self)
       Registry.unregister_loader(self)
-      ExplicitNamespace.__unregister_loader(self)
     end
 
     # The return value of this predicate is only meaningful if the loader has
     # scanned the file. This is the case in the spots where we use it.
     #
-    # @sig (String) -> Boolean
+    #: (String) -> bool
     internal def shadowed_file?(file)
       shadowed_files.member?(file)
     end
 
+    #: { () -> String } -> void
+    internal def log
+      return unless logger
+
+      message = yield
+      method_name = logger.respond_to?(:debug) ? :debug : :call
+      logger.send(method_name, "Zeitwerk@#{tag}: #{message}")
+    end
+
+
     # --- Class methods ---------------------------------------------------------------------------
 
     class << self
       include RealModName
 
-      # @sig #call | #debug | nil
+      #: call(String) -> void | debug(String) -> void | nil
       attr_accessor :default_logger
 
       # This is a shortcut for
       #
-      #   require "zeitwerk"
+      #   require 'zeitwerk'
       #
       #   loader = Zeitwerk::Loader.new
-      #   loader.tag = File.basename(__FILE__, ".rb")
+      #   loader.tag = File.basename(__FILE__, '.rb')
       #   loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
       #   loader.push_dir(__dir__)
       #
@@ -368,7 +409,7 @@ module Zeitwerk
       # This method returns a subclass of Zeitwerk::Loader, but the exact type
       # is private, client code can only rely on the interface.
       #
-      # @sig (bool) -> Zeitwerk::GemLoader
+      #: (?warn_on_extra_files: boolish) -> Zeitwerk::GemLoader
       def for_gem(warn_on_extra_files: true)
         called_from = caller_locations(1, 1).first.path
         Registry.loader_for_gem(called_from, namespace: Object, warn_on_extra_files: warn_on_extra_files)
@@ -376,10 +417,10 @@ module Zeitwerk
 
       # This is a shortcut for
       #
-      #   require "zeitwerk"
+      #   require 'zeitwerk'
       #
       #   loader = Zeitwerk::Loader.new
-      #   loader.tag = namespace.name + "-" + File.basename(__FILE__, ".rb")
+      #   loader.tag = namespace.name + '-' + File.basename(__FILE__, '.rb')
       #   loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
       #   loader.push_dir(__dir__, namespace: namespace)
       #
@@ -389,14 +430,14 @@ module Zeitwerk
       # This method returns a subclass of Zeitwerk::Loader, but the exact type
       # is private, client code can only rely on the interface.
       #
-      # @sig (bool) -> Zeitwerk::GemLoader
+      #: (Module) -> Zeitwerk::GemLoader
       def for_gem_extension(namespace)
         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, "extending anonymous namespaces is unsupported"
+          raise Zeitwerk::Error, 'extending anonymous namespaces is unsupported'
         end
 
         called_from = caller_locations(1, 1).first.path
@@ -406,7 +447,7 @@ module Zeitwerk
       # Broadcasts `eager_load` to all loaders. Those that have not been setup
       # are skipped.
       #
-      # @sig () -> void
+      #: () -> void
       def eager_load_all
         Registry.loaders.each do |loader|
           begin
@@ -420,7 +461,7 @@ module Zeitwerk
       # Broadcasts `eager_load_namespace` to all loaders. Those that have not
       # been setup are skipped.
       #
-      # @sig (Module) -> void
+      #: (Module) -> void
       def eager_load_namespace(mod)
         Registry.loaders.each do |loader|
           begin
@@ -434,164 +475,198 @@ module Zeitwerk
       # Returns an array with the absolute paths of the root directories of all
       # registered loaders. This is a read-only collection.
       #
-      # @sig () -> Array[String]
+      #: () -> Array[String]
       def all_dirs
-        Registry.loaders.flat_map(&:dirs).freeze
+        dirs = []
+        Registry.loaders.each do |loader|
+          dirs.concat(loader.dirs)
+        end
+        dirs.freeze
       end
     end
 
-    # @sig (String, Module) -> void
-    private def define_autoloads_for_dir(dir, parent)
-      ls(dir) do |basename, abspath, ftype|
+    # Scans `dir` and sets autoloads in `mod` for the constants its contents are
+    # expected to define.
+    #
+    # The `external` flag indicates whether `mod` has been externally defined,
+    # as is the case with root namespaces or reopened third-party namespaces.
+    #
+    #: (String, Module, external: boolish) -> void
+    private def define_autoloads_for_dir(dir, mod, external:)
+      @fs.ls(dir) do |basename, abspath, ftype|
         if ftype == :file
-          basename.delete_suffix!(".rb")
-          cref = Cref.new(parent, cname_for(basename, abspath))
-          autoload_file(cref, abspath)
-        else
-          if collapse?(abspath)
-            define_autoloads_for_dir(abspath, parent)
-          else
-            cref = Cref.new(parent, cname_for(basename, abspath))
-            autoload_subdir(cref, abspath)
+          if basename == @nsfile
+            if external
+              cpath = real_mod_name(mod)
+              location = Object.const_source_location(cpath)&.join(':')
+              location = nil if location&.empty?
+              raise Zeitwerk::ConflictingNamespaceDefinitionError.new(cpath, location: location, conflicting_file: abspath)
+            end
+            next # Pass if this is a managed namespace, the nsfile was already probed when visiting the parent directory.
           end
-        end
-      end
-    end
 
-    # @sig (Module, Symbol, String) -> void
-    private def autoload_subdir(cref, subdir)
-      if autoload_path = autoload_path_set_by_me_for?(cref)
-        if ruby?(autoload_path)
-          # Scanning visited a Ruby file first, and now a directory for the same
-          # constant has been found. This means we are dealing with an explicit
-          # namespace whose definition was seen first.
-          #
-          # Registering is idempotent, and we have to keep the autoload pointing
-          # to the file. This may run again if more directories are found later
-          # on, no big deal.
-          register_explicit_namespace(cref.path)
+          basename.delete_suffix!('.rb')
+          cref = Cref.new(mod, cname_for(basename, abspath))
+          visit_file(cref, abspath)
+        else
+          cref = Cref.new(mod, cname_for(basename, abspath))
+          visit_subdir(cref, abspath, external:)
         end
-        # If the existing autoload points to a file, it has to be preserved, if
-        # not, it is fine as it is. In either case, we do not need to override.
-        # Just remember the subdirectory conforms this namespace.
-        namespace_dirs[cref.path] << subdir
-      elsif !cref.defined?
-        # First time we find this namespace, set an autoload for it.
-        namespace_dirs[cref.path] << subdir
-        define_autoload(cref, subdir)
-      else
-        # For whatever reason the constant that corresponds to this namespace has
-        # already been defined, we have to recurse.
-        log("the namespace #{cref.path} already exists, descending into #{subdir}") if logger
-        define_autoloads_for_dir(subdir, cref.get)
       end
     end
 
-    # @sig (Module, Symbol, String) -> void
-    private def autoload_file(cref, file)
-      if autoload_path = cref.autoload? || Registry.inception?(cref.path)
-        # First autoload for a Ruby file wins, just ignore subsequent ones.
-        if ruby?(autoload_path)
+    #: (Zeitwerk::Cref, String) -> void
+    private def visit_file(cref, file)
+      if autoload_path = cref.autoload? || Registry.inceptions.registered?(cref)
+        if @fs.rb_extension?(autoload_path)
+          if File.basename(autoload_path) == @nsfile && autoload_path_set_by_me_for?(cref)
+            raise Zeitwerk::ConflictingNamespaceDefinitionError.new(cref.path, location: autoload_path, conflicting_file: file)
+          end
           shadowed_files << file
-          log("file #{file} is ignored because #{autoload_path} has precedence") if logger
+          log { "file #{file} is ignored because #{autoload_path} has precedence" }
         else
           promote_namespace_from_implicit_to_explicit(dir: autoload_path, file: file, cref: cref)
         end
       elsif cref.defined?
         shadowed_files << file
-        log("file #{file} is ignored because #{cref.path} is already defined") if logger
+        if location = cref.location
+          log { "file #{file} is ignored because #{cref} is already defined in #{location}" }
+        else
+          log { "file #{file} is ignored because #{cref} is already defined (unknown location)" }
+        end
       else
         define_autoload(cref, file)
       end
     end
 
+    #: (Zeitwerk::Cref, String, external: boolish) -> void
+    private def visit_subdir(cref, subdir, external:)
+      if autoload_path = autoload_path_set_by_me_for?(cref)
+        if @fs.rb_extension?(autoload_path)
+          # The namespace that corresponds to this subdirectory is defined in a
+          # file, either regular or nsfile. Therefore, a nsfile would be a
+          # duplication.
+          if nsfile_abspath = @fs.has_exactly_one_nsfile?(cref, subdir)
+            raise Zeitwerk::ConflictingNamespaceDefinitionError.new(cref.path, location: autoload_path, conflicting_file: nsfile_abspath)
+          end
+          # Scanning visited a Ruby file first, and now a directory for the same
+          # constant has been found. This is an explicit namespace.
+          #
+          # The namespace may be spread over multiple directories and perhaps it
+          # was already registered, but registering is idempotent, just do it.
+          register_explicit_namespace(cref)
+        elsif nsfile_abspath = @fs.has_exactly_one_nsfile?(cref, subdir)
+          # Scanning found a matching directory first, and now we saw a nsfile.
+          promote_namespace_from_implicit_to_explicit(dir: subdir, file: nsfile_abspath, cref: cref)
+        end
+        namespace_dirs.get_or_set(cref) { [] } << subdir
+      elsif !cref.defined?
+        if nsfile_abspath = @fs.has_exactly_one_nsfile?(cref, subdir)
+          define_autoload(cref, nsfile_abspath)
+          register_explicit_namespace(cref)
+        else
+          define_autoload(cref, subdir)
+        end
+        namespace_dirs.get_or_set(cref) { [] } << subdir
+      else
+        # For whatever reason the constant that corresponds to this namespace has
+        # already been defined, we have to recurse.
+        log { "the namespace #{cref} already exists, descending into #{subdir}" }
+        define_autoloads_for_dir(subdir, cref.get, external:)
+      end
+    end
+
     # `dir` is the directory that would have autovivified a namespace. `file` is
     # the file where we've found the namespace is explicitly defined.
     #
-    # @sig (dir: String, file: String, cref: Zeitwerk::Cref) -> void
+    #: (dir: String, file: String, cref: Zeitwerk::Cref) -> void
     private def promote_namespace_from_implicit_to_explicit(dir:, file:, cref:)
       autoloads.delete(dir)
-      Registry.unregister_autoload(dir)
+      Registry.autoloads.unregister(dir)
 
-      log("earlier autoload for #{cref.path} discarded, it is actually an explicit namespace defined in #{file}") if logger
+      log { "earlier autoload for #{cref} discarded, it is actually an explicit namespace defined in #{file}" }
 
+      # Order matters: When Module#const_added is triggered by the autoload, we
+      # don't want the namespace to be registered yet.
       define_autoload(cref, file)
-      register_explicit_namespace(cref.path)
+      register_explicit_namespace(cref)
     end
 
-    # @sig (Module, Symbol, String) -> void
+    #: (Zeitwerk::Cref, String) -> void
     private def define_autoload(cref, abspath)
       cref.autoload(abspath)
 
       if logger
-        if ruby?(abspath)
-          log("autoload set for #{cref.path}, to be loaded from #{abspath}")
+        if @fs.rb_extension?(abspath)
+          log { "autoload set for #{cref}, to be loaded from #{abspath}" }
         else
-          log("autoload set for #{cref.path}, to be autovivified from #{abspath}")
+          log { "autoload set for #{cref}, to be autovivified from #{abspath}" }
         end
       end
 
       autoloads[abspath] = cref
-      Registry.register_autoload(self, abspath)
+      Registry.autoloads.register(abspath, self)
 
-      # See why in the documentation of Zeitwerk::Registry.inceptions.
-      unless cref.autoload?
-        Registry.register_inception(cref.path, abspath, self)
-      end
+      register_inception(cref, abspath) unless cref.autoload?
     end
 
-    # @sig (Module, Symbol) -> String?
+    #: (Zeitwerk::Cref) -> String?
     private def autoload_path_set_by_me_for?(cref)
       if autoload_path = cref.autoload?
         autoload_path if autoloads.key?(autoload_path)
       else
-        Registry.inception?(cref.path, self)
+        inceptions[cref]
       end
     end
 
-    # @sig (String) -> void
-    private def register_explicit_namespace(cpath)
-      ExplicitNamespace.__register(cpath, self)
+    #: (Zeitwerk::Cref) -> void
+    private def register_explicit_namespace(cref)
+      Registry.explicit_namespaces.register(cref, self)
     end
 
-    # @sig (String) -> void
-    private def raise_if_conflicting_directory(dir)
-      MUTEX.synchronize do
-        dir_slash = dir + "/"
+    #: () -> void
+    private def unregister_explicit_namespaces
+      Registry.explicit_namespaces.unregister_loader(self)
+    end
 
-        Registry.loaders.each do |loader|
-          next if loader == self
-          next if loader.__ignores?(dir)
-
-          loader.__roots.each_key do |root_dir|
-            next if ignores?(root_dir)
-
-            root_dir_slash = root_dir + "/"
-            if dir_slash.start_with?(root_dir_slash) || root_dir_slash.start_with?(dir_slash)
-              require "pp" # Needed for pretty_inspect, even in Ruby 2.5.
-              raise Error,
-                "loader\n\n#{pretty_inspect}\n\nwants to manage directory #{dir}," \
-                " which is already managed by\n\n#{loader.pretty_inspect}\n"
-            end
-          end
-        end
+    #: (Zeitwerk::Cref, String) -> void
+    private def register_inception(cref, abspath)
+      inceptions[cref] = abspath
+      Registry.inceptions.register(cref, abspath)
+    end
+
+    #: () -> void
+    private def unregister_inceptions
+      inceptions.each_key do |cref|
+        Registry.inceptions.unregister(cref)
+      end
+      inceptions.clear
+    end
+
+    #: (String) -> void
+    private def raise_if_conflicting_root_dir(root_dir)
+      if loader = Registry.conflicting_root_dir?(self, root_dir)
+        require 'pp' # Needed to have pretty_inspect available.
+        raise Error,
+          "loader\n\n#{pretty_inspect}\n\nwants to manage directory #{root_dir}," \
+          " which is already managed by\n\n#{loader.pretty_inspect}\n"
       end
     end
 
-    # @sig (String, Object, String) -> void
-    private def run_on_unload_callbacks(cpath, value, abspath)
+    #: (String, top, String) -> void
+    private def run_on_unload_callbacks(cref, value, abspath)
       # Order matters. If present, run the most specific one.
-      on_unload_callbacks[cpath]&.each { |c| c.call(value, abspath) }
-      on_unload_callbacks[:ANY]&.each { |c| c.call(cpath, value, abspath) }
+      on_unload_callbacks[cref.path]&.each { |c| c.call(value, abspath) }
+      on_unload_callbacks[:ANY]&.each { |c| c.call(cref.path, value, abspath) }
     end
 
-    # @sig (Module, Symbol) -> void
+    #: (Zeitwerk::Cref) -> void
     private def unload_autoload(cref)
       cref.remove
-      log("autoload for #{cref.path} removed") if logger
+      log { "autoload for #{cref} removed" }
     end
 
-    # @sig (Module, Symbol) -> void
+    #: (Zeitwerk::Cref) -> void
     private def unload_cref(cref)
       # Let's optimistically remove_const. The way we use it, this is going to
       # succeed always if all is good.
@@ -600,7 +675,7 @@ module Zeitwerk
       # There are a few edge scenarios in which this may happen. If the constant
       # is gone, that is OK, anyway.
     else
-      log("#{cref.path} unloaded") if logger
+      log { "#{cref} unloaded" }
     end
   end
 end