Support standard as interface for command graph too

lib/rom/commands/abstract.rb

@@ -112,6 +112,11 @@ def lazy?
         false
       end
 
+      # @api private
+      def graph?
+        false
+      end
+
       # Target relation on which the command will operate
       #
       # By default this is set to the relation that's passed to the constructor.
@@ -125,6 +130,13 @@ def target
         relation
       end
 
+      # Return name of this command's relation
+      #
+      # @api private
+      def name
+        relation.name
+      end
+
       # Assert that tuple count in the target relation corresponds to :result
       # setting
       #

lib/rom/commands/graph.rb

@@ -1,4 +1,5 @@
 require 'rom/pipeline'
+require 'rom/support/options'
 require 'rom/commands/graph/class_interface'
 
 module ROM
@@ -9,6 +10,7 @@ module Commands
     class Graph
       extend ClassInterface
 
+      include Options
       include Pipeline
       include Pipeline::Proxy
 
@@ -21,8 +23,11 @@ class Graph
       alias_method :left, :root
       alias_method :right, :nodes
 
+      option :mappers, reader: true, default: proc { MapperRegistry.new }
+
       # @api private
-      def initialize(root, nodes)
+      def initialize(root, nodes, options = {})
+        super
         @root = root
         @nodes = nodes
       end
@@ -48,10 +53,17 @@ def call(*args)
         left = root.call(*args)
 
         right = nodes.map do |node|
-          if node.lazy?
-            node.call(args.first, left)
+          response =
+            if node.lazy?
+              node.call(args.first, left)
+            else
+              node.call(left)
+            end
+
+          if node.result.equal?(:one) && !node.graph?
+            [response]
           else
-            node.call(left)
+            response
           end
         end
 
@@ -61,6 +73,25 @@ def call(*args)
           [left, right]
         end
       end
+
+      # Return a new graph with updated options
+      #
+      # @api private
+      def with(new_options)
+        self.class.new(root, nodes, options.merge(new_options))
+      end
+
+      # Return name of the root relation
+      #
+      # @api private
+      def name
+        root.relation.name
+      end
+
+      # @api private
+      def graph?
+        true
+      end
     end
   end
 end

lib/rom/env.rb

@@ -105,7 +105,14 @@ def command(options)
           commands[name]
         end
       when Array
-        Commands::Graph.build(commands, options)
+        graph = Commands::Graph.build(commands, options)
+        name = graph.name
+
+        if mappers.key?(name)
+          graph.with(mappers: mappers[graph.name])
+        else
+          graph
+        end
       else
         raise ArgumentError, "#{self.class}#command accepts a symbol or an array"
       end

spec/integration/commands/graph_builder_spec.rb → spec/integration/commands/graph_spec.rb

@@ -153,4 +153,44 @@ def execute(tuples, user)
       { name: 'blue', task: 'Task Two' }
     ])
   end
+
+  it 'works with auto-mapping' do
+    setup.mappers do
+      define(:users) do
+        register_as :entity
+        reject_keys true
+
+        model name: 'Test::User'
+
+        attribute :name
+
+        combine :task, type: :hash, on: { name: :user } do
+          model name: 'Test::Task'
+          attribute :title
+        end
+      end
+    end
+
+    setup.commands(:tasks) do
+      define(:create) do
+        input Transproc(:accept_keys, [:title, :user])
+        result :one
+
+        def execute(tuple, user)
+          super(tuple.merge(user: user.fetch(:name)))
+        end
+      end
+    end
+
+    input = { user: { name: 'Jane', task: { title: 'Task One' } } }
+
+    command = rom.command([
+      { user: :users }, [:create, [{ task: :tasks }, [:create]]]
+    ]).as(:entity)
+
+    result = command.call(input).first
+
+    expect(result).to be_instance_of(Test::User)
+    expect(result.task).to be_instance_of(Test::Task)
+  end
 end