don't use old Inject() => {}.

replace :override with :replace.

Author: apotonick

lib/trailblazer/macro/each.rb

@@ -14,10 +14,10 @@ def self.Each(block_activity=nil, dataset_from: nil, item_key: :item, id: Macro.
       # filter to set ctx[:index]
       # The interesting part here is that we read dynamic values from the {circuit_options}, to not
       # pollute the business ctx.
-      my_lowlevel_inject_filter = ->((ctx, flow_options), index:, **circuit_options) { [index, ctx] }
+      my_lowlevel_inject_filter = ->((ctx, flow_options), index:, **circuit_options) { [{index: index}, ctx] }
       my_filter_builder = ->(*) { Trailblazer::Activity::DSL::Linear::VariableMapping::SetVariable.new(name: "bla.FIXME", filter: my_lowlevel_inject_filter, write_name: :index, user_filter: nil) }
       # filter to set ctx[item_key]
-      my_lowlevel_inject_filter_item = ->((ctx, flow_options), item:, **circuit_options) { [item, ctx] }
+      my_lowlevel_inject_filter_item = ->((ctx, flow_options), item:, **circuit_options) { [{item_key => item}, ctx] }
       my_filter_builder_item = ->(*) { Trailblazer::Activity::DSL::Linear::VariableMapping::SetVariable.new(name: "bla.FIXME.item_key", filter: my_lowlevel_inject_filter_item, write_name: item_key, user_filter: nil) }
 
       # DISCUSS: move to Wrap.
@@ -121,7 +121,7 @@ def self.options_for_dataset_from(dataset_from:)
       def self.compute_runtime_id(ctx, trace_node:, activity:, compile_id:, **)
         # activity is the iterated activity
         fields = activity.to_h[:fields]
-        return compile_id unless fields && fields[:each] == true
+        return unless fields && fields[:each] == true
 
         # Developer::Trace::Snapshot::Ctx.ctx_snapshot_for(trace_node.snapshot_before, .data
 # FIXME: BETTER API, we need access to stack now
@@ -130,7 +130,7 @@ def self.compute_runtime_id(ctx, trace_node:, activity:, compile_id:, **)
         # index = trace_node.snapshot_before.data[:ctx_snapshot].fetch(:index)
         index = trace_node.snapshot_before.data[:ctx_variable_changeset].find { |name, version, value| name == :index }[2]
 
-        ctx[:runtime_id] = "#{compile_id}.#{index}"
+        ctx.merge(runtime_id: "#{compile_id}.#{index}")
       end
     end
   end

lib/trailblazer/macro/model.rb

@@ -8,11 +8,9 @@ def self.Model(model_class = nil, action = :new, find_by_key = :id, id: 'model.b
         Activity::Railway.Inject() => [:params], # pass-through {:params} if it's in ctx.
 
         # defaulting as per Inject() API.
-        Activity::Railway.Inject() => {
-          :"model.class"          => ->(*) { model_class },
-          :"model.action"         => ->(*) { action },
-          :"model.find_by_key"    => ->(*) { find_by_key },
-        }
+        Activity::Railway.Inject(:"model.class") => ->(*) { model_class },
+        Activity::Railway.Inject(:"model.action") => ->(*) { action },
+        Activity::Railway.Inject(:"model.find_by_key") => ->(*) { find_by_key },
       }
 
       options = {task: task, id: id}.merge(injections)

lib/trailblazer/macro/nested.rb

@@ -20,10 +20,11 @@ def self.Nested(callable, id: Macro.id_for(callable, macro: :Nested, hint: calla
       # DISCUSS: we could use fields{task_wrap_extensions} from the Nested activity here?
       task_wrap_extension = Activity::TaskWrap.Extension(*merge)
 
-      Activity::Railway.Subprocess(task).merge( # FIXME: allow this directly in Subprocess
-        id:         id,
-        extensions: [task_wrap_extension],
-      )
+      Activity::Railway.Subprocess(task)
+        .merge( # FIXME: allow this directly in Subprocess
+          id:         id,
+          Activity::Railway.Extension() => task_wrap_extension,
+        )
     end
 
     # @private

lib/trailblazer/macro/policy.rb

@@ -32,11 +32,8 @@ def self.step(condition, name: nil, &block)
       path = :"policy.#{name}.eval"
       task = Eval.new(name: name, path: path)
 
-      injections = {
-        Trailblazer::Activity::Railway.Inject() => {
-          # :"policy.default.eval"
-          path => ->(*) { condition }
-        }
+      injections = {                          # :"policy.default.eval"
+        Trailblazer::Activity::Railway.Inject(path) => ->(*) { condition }
       }
 
       {task: task, id: path}.merge(injections)

test/docs/guard_test.rb

@@ -5,7 +5,7 @@
 class DocsGuardProcTest < Minitest::Spec
   #:proc
   class Create < Trailblazer::Operation
-    step Policy::Guard(->(options, pass:, **) { pass })
+    step Policy::Guard(->(options, pass:, **) { pass }), id: :policy
     #:pipeonly
     step :process
 
@@ -27,7 +27,7 @@ def process(options, **)
   #---
   #- Guard inheritance
   class New < Create
-    step Policy::Guard( ->(options, current_user:, **) { current_user } ), override: true
+    step Policy::Guard( ->(options, current_user:, **) { current_user } ), replace: :policy
   end
 
   it { assert_equal Trailblazer::Developer.railway(New), %{[>policy.default.eval,>process]} }

test/docs/pundit_test.rb

@@ -52,7 +52,7 @@ class Create < Trailblazer::Operation
   end
 
   #---
-  #- override
+  #- replace
   class New < Create
     step Policy::Pundit( MyPolicy, :new? ), replace: :"policy.default.eval"
   end
@@ -72,12 +72,12 @@ class New < Create
   #---
   #- override with :name
   class Edit < Trailblazer::Operation
-    step Policy::Pundit( MyPolicy, :create?, name: "first" )
+    step Policy::Pundit( MyPolicy, :create?, name: "first" ), id: "policy.first.eval"
     step Policy::Pundit( MyPolicy, :new?,    name: "second" )
   end
 
   class Update < Edit
-    step Policy::Pundit( MyPolicy, :new?, name: "first" ), override: true
+    step Policy::Pundit( MyPolicy, :new?, name: "first" ), replace: "policy.first.eval"
   end
 
   it { assert_equal Trailblazer::Developer.railway(Edit), %{[>policy.first.eval,>policy.second.eval]} }

trailblazer-macro.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "rake"
   # spec.add_development_dependency "trailblazer-developer", ">= 0.1.0", "< 0.2.0"
   # spec.add_dependency "trailblazer-operation", ">= 0.11.0" # TODO: this dependency will be removed. currently needed for tests and for Guard::Result