Elide slice name from lib/ when autoloading

Gemfile

@@ -18,7 +18,7 @@ gem "hanami-devtools", require: false, git: "https://github.com/hanami/devtools.
 
 gem "dry-files", git: "https://github.com/dry-rb/dry-files.git", branch: "master"
 gem "dry-configurable", git: "https://github.com/dry-rb/dry-configurable.git", branch: "master"
-gem "dry-system", git: "https://github.com/dry-rb/dry-system.git", branch: "master"
+gem "dry-system", git: "https://github.com/dry-rb/dry-system.git", branch: "explicit-two-way-component-dir-namespaces"
 
 group :test do
   gem "dotenv"

lib/hanami/application.rb

@@ -254,7 +254,9 @@ def configure_container(container)
 
           if root.join("lib").directory?
             config.component_dirs.add "lib" do |dir|
-              dir.default_namespace = application_name.to_s
+              # Make the files in `lib/[application_name]/` take the root identifier
+              # namespace in the container
+              dir.namespaces.add application_name.to_s
             end
 
             configuration.autoloader&.push_dir(root.join("lib"))

lib/hanami/slice.rb

@@ -115,12 +115,20 @@ def define_container
 
           if root.join("lib").directory?
             config.component_dirs.add "lib" do |dir|
-              dir.default_namespace = namespace_path.tr(File::SEPARATOR, config.namespace_separator)
+              if application.configuration.autoloader
+                # If we're using an autoloader, expect all files in the slice's `lib/` to
+                # use the slice's const namespace
+                dir.namespaces.root const: namespace_path.tr(File::SEPARATOR, config.namespace_separator)
+              else
+                # Otherwise expect them to be inside `lib/[namespace]`, and make that take
+                # the root identifier namespace in the container
+                dir.namespaces.add namespace_path.tr(File::SEPARATOR, config.namespace_separator)
+              end
             end
-
-            application.configuration.autoloader&.push_dir(root.join("lib"))
           end
         end
+
+        application.configuration.autoloader&.push_dir(root.join("lib"), namespace: namespace)
       end
 
       # Force after configure hook to run

spec/new_integration/container/auto_injection_spec.rb

@@ -20,14 +20,14 @@ class SharedService
         end
       RUBY
 
-      write "slices/admin/lib/admin/slice_service.rb", <<~RUBY
+      write "slices/admin/lib/slice_service.rb", <<~RUBY
         module Admin
           class SliceService
           end
         end
       RUBY
 
-      write "slices/admin/lib/admin/test_op.rb", <<~RUBY
+      write "slices/admin/lib/test_op.rb", <<~RUBY
         module Admin
           class TestOp
             include Deps[

spec/new_integration/container/auto_registration_spec.rb

@@ -22,7 +22,7 @@ class Operation
         end
       RUBY
 
-      write "slices/admin/lib/admin/nba_jam/get_that_outta_here.rb", <<~RUBY
+      write "slices/admin/lib/nba_jam/get_that_outta_here.rb", <<~RUBY
         module Admin
           module NBAJam
             class GetThatOuttaHere
@@ -60,7 +60,7 @@ class Operation
         end
       RUBY
 
-      write "slices/admin/lib/admin/nba_jam/get_that_outta_here.rb", <<~RUBY
+      write "slices/admin/lib/nba_jam/get_that_outta_here.rb", <<~RUBY
         module Admin
           module NBAJam
             class GetThatOuttaHere

spec/new_integration/container/autoloader_spec.rb

@@ -23,7 +23,7 @@ class GetThatOuttaHere
         end
       RUBY
 
-      write "slices/admin/lib/admin/operations/create_game.rb", <<~RUBY
+      write "slices/admin/lib/operations/create_game.rb", <<~RUBY
         module Admin
           module Operations
             class CreateGame
@@ -35,7 +35,7 @@ def call
         end
       RUBY
 
-      write "slices/admin/lib/admin/entities/game.rb", <<~RUBY
+      write "slices/admin/lib/entities/game.rb", <<~RUBY
         # auto_register: false
 
         module Admin
@@ -46,7 +46,7 @@ class Game
         end
       RUBY
 
-      write "slices/admin/lib/admin/entities/quarter.rb", <<~RUBY
+      write "slices/admin/lib/entities/quarter.rb", <<~RUBY
         # auto_register: false
 
         module Admin

spec/new_integration/container/imports_spec.rb

@@ -56,7 +56,7 @@ class TestOp
         end
       RUBY
 
-      write "slices/search/lib/search/index_entity.rb", <<~RUBY
+      write "slices/search/lib/index_entity.rb", <<~RUBY
         module Search
           class IndexEntity
           end
@@ -91,7 +91,7 @@ class TestOp
         end
       RUBY
 
-      write "slices/search/lib/search/index_entity.rb", <<~RUBY
+      write "slices/search/lib/index_entity.rb", <<~RUBY
         module Search
           class IndexEntity
           end

spec/new_integration/view/views_spec.rb

@@ -12,7 +12,7 @@ class Application < Hanami::Application
         end
       RUBY
 
-      write "slices/main/lib/main/view.rb", <<~RUBY
+      write "slices/main/lib/view.rb", <<~RUBY
         require "hanami/view"
 
         module Main
@@ -21,7 +21,7 @@ class View < Hanami::View
         end
       RUBY
 
-      write "slices/main/lib/main/views/test_view.rb", <<~RUBY
+      write "slices/main/lib/views/test_view.rb", <<~RUBY
         module Main
           module Views
             class TestView < Main::View

spec/new_integration/web_app_spec.rb

@@ -37,7 +37,7 @@ class Routes < Hanami::Application::Routes
 
       write "lib/test_app/.keep", ""
 
-      write "slices/main/lib/main/actions/home/index.rb", <<~RUBY
+      write "slices/main/lib/actions/home/index.rb", <<~RUBY
         require "hanami/action"
 
         module Main
@@ -53,7 +53,7 @@ def handle(*, res)
         end
       RUBY
 
-      write "slices/admin/lib/admin/actions/dashboard/show.rb", <<~RUBY
+      write "slices/admin/lib/actions/dashboard/show.rb", <<~RUBY
         require "hanami/action"
 
         module Admin