opal-zeitwerk 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08d0237fce54d7885badfdda17e4c5b287627af98e41acb14f867ecc7b77631
-  data.tar.gz: 365a26b762cc3db8c2577bf093c87010a60315358f69572169a855f054bf7e71
+  metadata.gz: 926d4439591306fd785d55b4f69b3b60212c3db911255d9cfad96286f22c373b
+  data.tar.gz: f541fcfaac3eb639f070c11a8909835a5401669ce69e41c723b9a583c312e3ab
 SHA512:
-  metadata.gz: c1cddfe4dfbfed3c28f8081e44d71cf3c4e6682d7d09ed3ca2f456251eb89b60c490fdaf192d9346c3c263655a1f2821a90791e42987c6693faebe151d503130
-  data.tar.gz: e89409525a50a0693ee2f8578020b618c44e2b33fe9561c02b1925c54b1c6c8e61505f80e03209b1244f5bd20c36b6049f514817139eaaa94f9238c5851aef99
+  metadata.gz: ccac14d70164bbfd729f56c3ef9eaf1cb50716d83b218845da396e83db85b9866f5520290e5b8d6bda32c2463c27d05e67ba11748630b1f817f4cbc6c5cf7224
+  data.tar.gz: df5c01643cd645039b5b7b51206dda6461b9c7e6312310c1538b86d5c7ed841b9738cb29d710a75abcd7f7151173459683a30b21ca8b9da8cd32d56be277d6d4

data/lib/opal/zeitwerk/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Opal
   module Zeitwerk
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/opal/zeitwerk/explicit_namespace.rb

@@ -51,12 +51,12 @@ module Zeitwerk
         # If the class is a singleton class, we won't do anything with it so we
         # can bail out immediately. This is several orders of magnitude faster
         # than accessing its name.
-        return if event.self.singleton_class?
+        return if event.singleton_class?
 
         # Note that it makes sense to compute the hash code unconditionally,
         # because the trace point is disabled if cpaths is empty.
-        if loader = cpaths.delete(real_mod_name(event.self))
-          loader.on_namespace_loaded(event.self)
+        if loader = cpaths.delete(real_mod_name(event))
+          loader.on_namespace_loaded(event)
           disable_tracer_if_unneeded
         end
       end

data/opal/zeitwerk/loader.rb

@@ -153,7 +153,7 @@ module Zeitwerk
     #
     # @return [<String>]
     def dirs
-      root_dirs.keys.freeze
+      root_dirs.keys
     end
 
     # Pushes `path` to the list of root directories.
@@ -288,6 +288,7 @@ module Zeitwerk
       ExplicitNamespace.unregister(self)
 
       @setup = false
+      @eager_loaded = false
     end
 
     # Unloads all loaded code, and calls setup again so that the loader is able
@@ -367,7 +368,7 @@ module Zeitwerk
     #
     # @return [<String>]
     def unloadable_cpaths
-      to_unload.keys.freeze
+      to_unload.keys
     end
 
     # @private
@@ -401,7 +402,7 @@ module Zeitwerk
       #
       # @return [<String>]
       def all_dirs
-        Registry.loaders.flat_map(&:dirs).freeze
+        Registry.loaders.flat_map(&:dirs)
       end
     end
 
@@ -429,8 +430,7 @@ module Zeitwerk
           end
         rescue ::NameError => error
           path_type = ruby?(abspath) ? "file" : "directory"
-
-          raise NameError, <<~MESSAGE
+          message = <<~MESSAGE
             #{error.message} inferred by #{inflector.class} from #{path_type}
 
               #{abspath}
@@ -442,6 +442,7 @@ module Zeitwerk
               * Rename the #{path_type} to comply with the naming conventions.
               * Modify the inflector to handle this case.
           MESSAGE
+          raise NameError.new(message, error.name)
         end
       end
     end
@@ -499,6 +500,17 @@ module Zeitwerk
         # "file #{file} is ignored because #{cpath(parent, cname)} is already defined"
       else
         set_autoload(parent, cname, file)
+        if autoload_path = autoload_for?(parent, cname)
+          if dir?(autoload_path)
+            promote_namespace_from_implicit_to_explicit(
+              dir:    autoload_path,
+              file:   file,
+              parent: parent,
+              cname:  cname
+            )
+            (lazy_subdirs[cpath(parent, cname)] ||= []) << autoload_path
+          end
+        end
       end
     end
 
@@ -561,14 +573,8 @@ module Zeitwerk
     # @param parent [Module]
     # @param cname [Symbol]
     # @return [String, nil]
-    if method(:autoload?).arity == 1
-      def strict_autoload_path(parent, cname)
-        parent.autoload?(cname) if cdef?(parent, cname)
-      end
-    else
-      def strict_autoload_path(parent, cname)
-        parent.autoload?(cname, false)
-      end
+    def strict_autoload_path(parent, cname)
+      parent.autoload?(cname, false)
     end
 
     # This method is called this way because I prefer `preload` to be the method
@@ -629,7 +635,7 @@ module Zeitwerk
       dir_first_char = dir[0]
       path_start = dir.size + 1
       path_parts = `[]`
-      basename = `''`
+      basename = ''
       @module_paths.each do |abspath|
         %x{
           if (abspath[0] === dir_first_char) {

data/opal/zeitwerk/loader/callbacks.rb

@@ -13,7 +13,7 @@ module Zeitwerk::Loader::Callbacks
 
     # "constant #{cpath(*cref)} loaded from file #{file}" if cdef?(*cref)
     if !cdef?(*cref)
-      raise Zeitwerk::NameError, "expected file #{file} to define constant #{cpath(*cref)}, but didn't"
+      raise Zeitwerk::NameError.new("expected file #{file} to define constant #{cpath(*cref)}, but didn't", cref.last)
     end
   end
 
@@ -25,11 +25,8 @@ module Zeitwerk::Loader::Callbacks
   # @return [void]
   def on_dir_autoloaded(dir)
     if cref = autoloads.delete(dir)
-      autovivified_module = if vivify_mod_dir && dir.start_with?(vivify_mod_dir)
-                              cref[0].const_set(cref[1], vivify_mod_class.new)
-                            else
-                              cref[0].const_set(cref[1], Module.new)
-                            end
+      autovivified_module = cref[0].const_set(cref[1], Module.new)
+
       # "module #{autovivified_module.name} autovivified from directory #{dir}"
 
       to_unload[autovivified_module.name] = [dir, cref] if reloading_enabled?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-zeitwerk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -52,7 +52,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-post_install_message: "\nopal-zeitwerk 0.0.4:\n  \n  opal-zeitwerk currently requires
+post_install_message: "\nopal-zeitwerk 0.1.0:\n  \n  opal-zeitwerk currently requires
   the es6_modules_1_1 branch of opal, for the Gemfile:\n\n  gem 'opal', github: 'janbiedermann/opal',
   branch: 'es6_modules_1_1'\n\n"
 rdoc_options: []