zeitwerk 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85bb1028371436b80651c897670fef7158dcca7a916b10f6cb8584684c44442
-  data.tar.gz: c07fec548ab787daa28b10260beb022d7375aff90a506daa9bfecdc2f5bd6e5c
+  metadata.gz: 1f424f7f7538a469affa93fbe0c24533d146eb8dfe7289f3c5167b36abd0e362
+  data.tar.gz: 8aa11ee61f57a965e3fbb705713f6a4dcf0e3586dc8a3e90f35801b8e8ff9e12
 SHA512:
-  metadata.gz: d01e5091fa868cdc80c4dd6eb82cc3ace4e21e0704aa2128e0ef5098a52140884daa62e9da862490104e31d393e06b33e29170e6d3f6fd3e44aa5111b25a06f1
-  data.tar.gz: 055d861fe2440f465277fbfce4c2bd9b7460d38f14dc5435449c6655d1be97f7e24fb7154b64102267c020e45d52f0bff21fbc7fc35eec0063b2dac2a92197bd
+  metadata.gz: 70022bbaa975835042e6550a3e1f8ca8e09e7e1f764d29c659adc9d6c727765fea276da4425ae43e7f4baaaaae6f167d9f4c567e63c0d322ac553603f2d6063b
+  data.tar.gz: 7144f057043a326be20b866b2a23dc3c2b5cd3274a084a73770e6b643f65e308ba2eacfbf87701092ee20d440e256d0afe37066933d396cb332d28e5108775a7

data/lib/zeitwerk/loader.rb

@@ -14,22 +14,16 @@ module Zeitwerk
     include Helpers
     include Config
 
-    # Keeps track of autoloads defined by the loader which have not been
-    # executed so far.
+    # Maps absolute paths for which an autoload has been set ---and not
+    # executed--- to their corresponding parent class or module and constant
+    # name.
     #
-    # This metadata helps us implement a few things:
-    #
-    # 1. When autoloads are triggered, ensure they define the expected constant
-    #    and invoke user callbacks. If reloading is enabled, remember cref and
-    #    abspath for later unloading logic.
-    #
-    # 2. When unloading, remove autoloads that have not been executed.
-    #
-    # 3. Eager load with a recursive const_get, rather than a recursive require,
-    #    for consistency with lazy loading.
+    #   "/Users/fxn/blog/app/models/user.rb"          => [Object, :User],
+    #   "/Users/fxn/blog/app/models/hotel/pricing.rb" => [Hotel, :Pricing]
+    #   ...
     #
     # @private
-    # @sig Zeitwerk::Autoloads
+    # @sig Hash[String, [Module, Symbol]]
     attr_reader :autoloads
 
     # We keep track of autoloaded directories to remove them from the registry
@@ -87,7 +81,7 @@ module Zeitwerk
     def initialize
       super
 
-      @autoloads       = Autoloads.new
+      @autoloads       = {}
       @autoloaded_dirs = []
       @to_unload       = {}
       @lazy_subdirs    = Hash.new { |h, cpath| h[cpath] = [] }
@@ -138,7 +132,7 @@ module Zeitwerk
         # is enough.
         unloaded_files = Set.new
 
-        autoloads.each do |(parent, cname), abspath|
+        autoloads.each do |abspath, (parent, cname)|
           if parent.autoload?(cname)
             unload_autoload(parent, cname)
           else
@@ -234,7 +228,7 @@ module Zeitwerk
             next if honour_exclusions && excluded_from_eager_load?(abspath)
 
             if ruby?(abspath)
-              if cref = autoloads.cref_for(abspath)
+              if cref = autoloads[abspath]
                 cget(*cref)
               end
             elsif dir?(abspath) && !root_dirs.key?(abspath)
@@ -376,7 +370,7 @@ module Zeitwerk
 
     # @sig (Module, Symbol, String) -> void
     def autoload_subdir(parent, cname, subdir)
-      if autoload_path = autoloads.abspath_for(parent, cname)
+      if autoload_path = autoload_path_set_by_me_for?(parent, cname)
         cpath = cpath(parent, cname)
         register_explicit_namespace(cpath) if ruby?(autoload_path)
         # We do not need to issue another autoload, the existing one is enough
@@ -432,7 +426,7 @@ module Zeitwerk
 
     # @sig (Module, Symbol, String) -> void
     def set_autoload(parent, cname, abspath)
-      autoloads.define(parent, cname, abspath)
+      parent.autoload(cname, abspath)
 
       if logger
         if ruby?(abspath)
@@ -442,6 +436,7 @@ module Zeitwerk
         end
       end
 
+      autoloads[abspath] = [parent, cname]
       Registry.register_autoload(self, abspath)
 
       # See why in the documentation of Zeitwerk::Registry.inceptions.
@@ -450,6 +445,15 @@ module Zeitwerk
       end
     end
 
+    # @sig (Module, Symbol) -> String?
+    def autoload_path_set_by_me_for?(parent, cname)
+      if autoload_path = strict_autoload_path(parent, cname)
+        autoload_path if autoloads.key?(autoload_path)
+      else
+        Registry.inception?(cpath(parent, cname))
+      end
+    end
+
     # @sig (String) -> void
     def register_explicit_namespace(cpath)
       ExplicitNamespace.register(cpath, self)

data/lib/zeitwerk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zeitwerk
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/lib/zeitwerk.rb

@@ -3,7 +3,6 @@
 module Zeitwerk
   require_relative "zeitwerk/real_mod_name"
   require_relative "zeitwerk/loader"
-  require_relative "zeitwerk/autoloads"
   require_relative "zeitwerk/registry"
   require_relative "zeitwerk/explicit_namespace"
   require_relative "zeitwerk/inflector"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Xavier Noria
@@ -23,7 +23,6 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/zeitwerk.rb
-- lib/zeitwerk/autoloads.rb
 - lib/zeitwerk/error.rb
 - lib/zeitwerk/explicit_namespace.rb
 - lib/zeitwerk/gem_inflector.rb

data/lib/zeitwerk/autoloads.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Zeitwerk
-  # @private
-  class Autoloads
-    # Maps crefs for which an autoload has been defined to the corresponding
-    # absolute path.
-    #
-    #   [Object, :User]  => "/Users/fxn/blog/app/models/user.rb"
-    #   [Object, :Hotel] => "/Users/fxn/blog/app/models/hotel"
-    #   ...
-    #
-    # This colection is transient, callbacks delete its entries as autoloads get
-    # executed.
-    #
-    # @sig Hash[[Module, Symbol], String]
-    attr_reader :c2a
-
-    # This is the inverse of c2a, for inverse lookups.
-    #
-    # @sig Hash[String, [Module, Symbol]]
-    attr_reader :a2c
-
-    # @sig () -> void
-    def initialize
-      @c2a = {}
-      @a2c = {}
-    end
-
-    # @sig (Module, Symbol, String) -> void
-    def define(parent, cname, abspath)
-      parent.autoload(cname, abspath)
-      cref = [parent, cname]
-      c2a[cref] = abspath
-      a2c[abspath] = cref
-    end
-
-    # @sig () { () -> [[Module, Symbol], String] } -> void
-    def each(&block)
-      c2a.each(&block)
-    end
-
-    # @sig (Module, Symbol) -> String?
-    def abspath_for(parent, cname)
-      c2a[[parent, cname]]
-    end
-
-    # @sig (String) -> [Module, Symbol]?
-    def cref_for(abspath)
-      a2c[abspath]
-    end
-
-    # @sig (String) -> [Module, Symbol]?
-    def delete(abspath)
-      cref = a2c.delete(abspath)
-      c2a.delete(cref)
-      cref
-    end
-
-    # @sig () -> void
-    def clear
-      c2a.clear
-      a2c.clear
-    end
-
-    # @sig () -> bool
-    def empty?
-      c2a.empty? && a2c.empty?
-    end
-  end
-end