trailblazer-macro 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14fa43e34517eca4e07e257fc5a172f406b88294b72f222109203156af53b684
-  data.tar.gz: 4d357be0a556d5431d7e10971e8ca1f9853e8029ecd5c1835c356d2169c9b7cb
+  metadata.gz: 5cdf91d3afe4c31815401fd46ca1b6a8778dd2b1b89db4871c7dcff708cc73ff
+  data.tar.gz: 48c050c6086a5be67804385a427a95e0df1ab4cf0802de5004b61a96a8e54ced
 SHA512:
-  metadata.gz: 600a2b8ae99cb504a0574b929e59ca63edc219b43e219b5af3c414d0c362e323f3cb6ff276f86ce02b19466aab1723ae60bc8b34f91d94764f3b82eadeaa7c2c
-  data.tar.gz: f03b36faa58d2e0ea5c265b48194cd14bb5825cfecace98777637d44a91bb2404ebb710e1db3ce7a7b7b383158413db9f4ffac5f6bb7abf7226ea1e02749d97c
+  metadata.gz: 3a27a00484972d2c65a6ffad50bd34e1fff0cfee69382bb5fabd3a06f20e15f818f95d44ce03a13727095fe352901ca0fdfcc544e15ec066bc73e43d14b8b6df
+  data.tar.gz: c64786889c195182f399c9df157f67926622ae7c032d9ef8c8de47db89b37750544721b1261a7ea5fe5f731208eccb3192aac2fe2c92b77036cbcd3ce68e4070

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.13
+
+* Fix an introspect bug in `Each()` where we couldn't look into `"invoke_block_activity"`.
+
 # 2.1.12
 
 ## Internals

data/lib/trailblazer/macro/each.rb

@@ -52,6 +52,12 @@ module Trailblazer
         end
 
         return signal, [ctx, flow_options]
+      end #call
+
+      def self.to_h
+        container_activity = @state.get(:activity)
+        # FIXME: this is needed for a proper {find_path} introspect lookup.
+        container_activity.to_h.merge(activity: container_activity)
       end
 
       # This is basically Out() => {copy all mutable variables}
@@ -90,7 +96,11 @@ module Trailblazer
         block_activity,
         each:         true, # mark this activity for {compute_runtime_id}.
         nodes:        [Activity::NodeAttributes.new("invoke_block_activity", nil, block_activity)], # TODO: use TaskMap::TaskAttributes
+        outputs: outputs_from_block_activity,
       ).merge(
+        # FIXME: we can't pass {wrap_static: wrap_static_for_block_activity} into {#container_activity_for}
+        #        because when patching, the container_activity is not recompiled, so we need the Hash here
+        #        with defaulting.
         wrap_static: Hash.new(wrap_static_for_block_activity)
       )
 
@@ -111,9 +121,16 @@ module Trailblazer
         success_signal:   [termini_from_block_activity[-1][0], {}] # FIXME: when subclassing (e.g. patching) this must be recomputed.
       )
 
-      # {block_activity} looped. In the Stack, this will look as if {block_activity} is
-      # a child of {iterate_activity}, that's why we add {block_activity} as a Node in
-      # {iterate_activity}'s schema.
+      # |-- Each/composers_for_each
+      # |   |-- Start.default
+      # |   |-- Each.iterate.block            This is Class.new(Each), outputs_from_block_activity
+      # |   |   |-- invoke_block_activity.0      step :invoke_block_activity.0
+      # |   |   |   |-- Start.default
+      # |   |   |   |-- notify_composers
+      # |   |   |   `-- End.success
+      # |   |   `-- invoke_block_activity.1      step "invoke_block_activity.1"
+      # |   |       |-- Start.default
+      # |   |       |-- notify_composers
       iterate_strategy = Class.new(Each) do
         extend Macro::Strategy::State # now, the Wrap subclass can inherit its state and copy the {block_activity}.
         initialize!(state)

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.12"
+      VERSION = "2.1.13"
     end
   end
 end

data/test/docs/each_test.rb

@@ -616,20 +616,53 @@ class EachStrategyComplianceTest < Minitest::Spec
 
   it "find_path" do
     assert_equal Trailblazer::Developer::Introspect.find_path(Song::Activity::Cover,
-      ["Each/composers_for_each", "Each.iterate.block", :notify_composers])[0].task.inspect,
+      ["Each/composers_for_each", "Each.iterate.block", "invoke_block_activity", :notify_composers])[0].task.inspect,
       %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=notify_composers>}
 
 =begin
 #:find_path
 node, _ = Trailblazer::Developer::Introspect.find_path(
   Song::Activity::Cover,
-  ["Each/composers_for_each", "Each.iterate.block", :notify_composers])
+  ["Each/composers_for_each", "Each.iterate.block", "invoke_block_activity", :notify_composers])
 #=> #<Node ...>
 #:find_path end
 =end
 
   end
 
+  it "{#find_path} for Each(Activity) with anonymous class" do
+    id = nil
+
+    activity = Class.new(Trailblazer::Activity::Railway) do
+      sub_activity = Class.new(Trailblazer::Activity::Railway) do
+        step :notify_composers
+      end
+      id = sub_activity.to_s
+
+      step :model
+      step Each(sub_activity, dataset_from: :composers_for_each)
+      step :rearrange
+
+      def composers_for_each(ctx, model:, **)
+        model.composers
+      end
+      # include CoverMethods
+    end
+
+    node, _activity = Trailblazer::Developer::Introspect.find_path(activity,
+      [%{Each/#{id}}, "Each.iterate.#{id}", "invoke_block_activity"])
+
+    assert_equal _activity.class.inspect, "Hash" # container_activity
+
+    #@ inside {invoke_block_activity}
+    node, _activity = Trailblazer::Developer::Introspect.find_path(activity,
+      [%{Each/#{id}}, "Each.iterate.#{id}", "invoke_block_activity", :notify_composers])
+
+    assert_equal node.task.inspect,
+      %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=notify_composers>}
+    assert_equal _activity.class.inspect, "Trailblazer::Activity"
+  end
+
 
   it "tracing" do
     EachPureTest::Mailer.send_options = []
@@ -731,7 +764,7 @@ class DocsEachUnitTest < Minitest::Spec
   #@ compile time
   #@ make sure we can find tasks/compile-time artifacts in Each by using their {compile_id}.
     assert_equal Trailblazer::Developer::Introspect.find_path(activity,
-      ["Each/1", "Each.iterate.block", :compute_item])[0].task.inspect,
+      ["Each/1", "Each.iterate.block", "invoke_block_activity", :compute_item])[0].task.inspect,
       %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=compute_item>}
     # puts Trailblazer::Developer::Render::TaskWrap.(activity, ["Each/1", "Each.iterate.block", "invoke_block_activity", :compute_item])
 

data/trailblazer-macro.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "trailblazer-developer"
 
   spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.1.0", "< 1.2.0"
-  spec.add_dependency "trailblazer-operation", ">= 0.9.0" # TODO: this dependency will be removed. currently needed for tests?!
+  spec.add_dependency "trailblazer-operation", ">= 0.9.0" # TODO: this dependency will be removed. currently needed for tests?! and for Guard::Result
 
   spec.required_ruby_version = ">= 2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.1.13
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest