Fold definition hierarchy into Factory

lib/factory_bot.rb

@@ -6,7 +6,6 @@
 require "active_support/notifications"
 
 require "factory_bot/internal"
-require "factory_bot/definition_hierarchy"
 require "factory_bot/configuration"
 require "factory_bot/errors"
 require "factory_bot/factory_runner"

lib/factory_bot/factory.rb

@@ -93,7 +93,6 @@ def compile
         parent.compile
         inherit_parent_traits
         @definition.compile(build_class)
-        build_hierarchy
         @compiled = true
       end
     end
@@ -121,28 +120,16 @@ def attributes
       end
     end
 
-    def hierarchy_class
-      @hierarchy_class ||= Class.new(parent.hierarchy_class)
-    end
-
-    def hierarchy_instance
-      @hierarchy_instance ||= hierarchy_class.new
-    end
-
-    def build_hierarchy
-      hierarchy_class.build_from_definition definition
-    end
-
     def callbacks
-      hierarchy_instance.callbacks
+      parent.callbacks + definition.callbacks
     end
 
     def compiled_to_create
-      hierarchy_instance.to_create
+      definition.to_create || parent.compiled_to_create
     end
 
     def compiled_constructor
-      hierarchy_instance.constructor
+      definition.constructor || parent.compiled_constructor
     end
 
     private
@@ -170,8 +157,6 @@ def initialize_copy(source)
       super
       @definition = @definition.clone
       @evaluator_class = nil
-      @hierarchy_class = nil
-      @hierarchy_instance = nil
       @compiled = false
     end
   end

lib/factory_bot/null_factory.rb

@@ -7,8 +7,7 @@ def initialize
       @definition = Definition.new(:null_factory)
     end
 
-    delegate :defined_traits, :callbacks, :attributes, :constructor,
-      :to_create, to: :definition
+    delegate :defined_traits, :attributes, to: :definition
 
     def compile
     end
@@ -20,8 +19,16 @@ def evaluator_class
       FactoryBot::Evaluator
     end
 
-    def hierarchy_class
-      FactoryBot::DefinitionHierarchy
+    def callbacks
+      Internal.callbacks
+    end
+
+    def compiled_constructor
+      Internal.constructor
+    end
+
+    def compiled_to_create
+      Internal.to_create
     end
   end
 end

spec/factory_bot/null_factory_spec.rb

@@ -5,22 +5,28 @@
     expect(null_factory).to delegate(:defined_traits).to(:definition)
   end
 
-  it "delegates callbacks to its definition" do
+  it "delegates attributes to its definition" do
     null_factory = FactoryBot::NullFactory.new
 
-    expect(null_factory).to delegate(:callbacks).to(:definition)
+    expect(null_factory).to delegate(:attributes).to(:definition)
   end
 
-  it "delegates attributes to its definition" do
+  it "has the global callbacks as its callbacks" do
     null_factory = FactoryBot::NullFactory.new
 
-    expect(null_factory).to delegate(:attributes).to(:definition)
+    expect(null_factory.callbacks).to eq FactoryBot::Internal.callbacks
+  end
+
+  it "has the global constructor as its compiled constructor" do
+    null_factory = FactoryBot::NullFactory.new
+
+    expect(null_factory.compiled_constructor).to eq FactoryBot::Internal.constructor
   end
 
-  it "delegates constructor to its definition" do
+  it "has the global to_create as its compiled to_create" do
     null_factory = FactoryBot::NullFactory.new
 
-    expect(null_factory).to delegate(:constructor).to(:definition)
+    expect(null_factory.compiled_to_create).to eq FactoryBot::Internal.to_create
   end
 
   it "has a nil value for its compile attribute" do