Provider and booter overhaul, including class-backed provider sources

Gemfile

@@ -9,6 +9,7 @@ gemspec
 # Remove verson constraint once latter versions release their -java packages
 gem "bootsnap", "= 1.4.9"
 gem "dry-monitor"
+gem "dry-types"
 gem "zeitwerk"
 
 group :tools do

lib/dry/system.rb

@@ -1,49 +1,62 @@
 # frozen_string_literal: true
 
 require "dry/core/deprecations"
-require_relative "system/source_provider_registry"
+require_relative "system/provider_source_registry"
 
 module Dry
   module System
-    # Registers all the source providers in the files under the given path
+    # Registers the provider sources in the files under the given path
     #
     # @api public
-    def self.register_source_providers(path)
-      source_providers.load_sources(path)
+    def self.register_provider_sources(path)
+      provider_sources.load_sources(path)
     end
 
     def self.register_provider(_name, options)
       Dry::Core::Deprecations.announce(
         "Dry::System.register_provider",
-        "Use `Dry::System.register_source_providers` instead",
+        "Use `Dry::System.register_provider_sources` instead",
         tag: "dry-system",
         uplevel: 1
       )
 
-      register_source_providers(options.fetch(:path))
+      register_provider_sources(options.fetch(:path))
     end
 
-    # Registers a source provider, which can be used as the basis for other providers
+    # Registers a provider source, which can be used as the basis for other providers
     #
     # @api public
-    def self.register_source_provider(name, group:, &block)
-      source_providers.register(name: name, group: group, &block)
+    def self.register_provider_source(name, group:, source: nil, &block)
+      if source && block
+        raise ArgumentError, "You must supply only a `source:` option or a block, not both"
+      end
+
+      if source
+        provider_sources.register(name: name, group: group, source: source)
+      else
+        provider_sources.register_from_block(
+          name: name,
+          group: group,
+          target_container: self,
+          &block
+        )
+      end
     end
 
     def self.register_component(name, provider:, &block)
       Dry::Core::Deprecations.announce(
         "Dry::System.register_component",
-        "Use `Dry::System.register_source_provider` instead",
+        "Use `Dry::System.register_provider_source` instead",
         tag: "dry-system",
         uplevel: 1
       )
 
-      register_source_provider(name, group: provider, &block)
+      register_provider_source(name, group: provider, &block)
     end
 
     # @api private
-    def self.source_providers
-      @source_providers ||= SourceProviderRegistry.new
+    def self.provider_sources
+      @provider_sources ||= ProviderSourceRegistry.new
     end
   end
 end

lib/dry/system/components.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
-require "dry/system"
+require "dry/core/deprecations"
 
-Dry::System.register_source_providers Pathname(__dir__).join("system_components").realpath
+Dry::Core::Deprecations.announce(
+  "require \"dry/system/components\"",
+  "Use `require \"dry/system/provider_sources\"` instead",
+  tag: "dry-system",
+  uplevel: 1
+)
+
+require_relative "provider_sources"