trailblazer-activity-dsl-linear 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9556b0bba65b7d0d785428b33548fc9585a2f9e101c032f47992a1570f2ae53d
-  data.tar.gz: 0e9243345de16d945fbaf5b85bf74047d1f9f844ace7af62e63fa93393acc717
+  metadata.gz: b99e0c72f1c402fc56bf48c302d04d5749e47f159ce9d7b10a2537665a0af62e
+  data.tar.gz: f3c35842ae2631b358a1decaad27bb32785e578f0f99cf2597757c2e4485a120
 SHA512:
-  metadata.gz: '081bacc336e3e98845d065cbd72d26e56ab4673e620ce5c4d0999ed8879b601fe5e83186e99367af781170b40b3687482d15b7911e7b5f2672db2e61de959112'
-  data.tar.gz: 7e5f318e4ad5eaef5dc8831ee06737d4f508a934888c2d781325585d82408841f8ebdbbaefa7fa7bd91b98f3b65525a33dd8ff4996bd1371beec062f152fc309
+  metadata.gz: 2035d707ca689d84923de40eaccd48b08c355be9351172804dc45d80ded9a141088b26b2d7a464727c5b9c49082018d02085aa3754d0bdca19ad13c6bf70a161
+  data.tar.gz: cfdf092b175fdefd34a0321248aa95f4a5a8c768b18e3f23f9285be10c0f1c720dd633e061b9d079a60d610ef743ad6544597af0bf5adb3cf7cb53b6b9b91502

data/CHANGES.md

@@ -1,3 +1,20 @@
+# 1.2.5
+
+* Fix a bug where, within a helper `Path()`, the last step couldn't
+explicitly define additional `Output()`, e.g. for `:failure`.
+
+```ruby
+... => Path(connect_to: Track(:success)) do
+  step :upload,
+    Output(Trailblazer::Activity::Left, :failure) => Track(:failure) # FIXME: this configuration gets lost.
+end
+```
+
+# 1.2.4
+
+* Fix a bug where using `fail_fast: true` (same with `:pass_fast`) would result in a
+  compile time exception `No fail_fast output found`. See  https://github.com/trailblazer/trailblazer/issues/256
+
 # 1.2.3
 
 * Add `FastTrack.left` alias.

data/Gemfile

@@ -15,4 +15,4 @@ gem "trailblazer-developer",      path: "../trailblazer-developer"
 # gem "benchmark-ips"
 # gem "stackprof"
 # gem "standard"
-# gem "trailblazer-core-utils", path: "../trailblazer-core-utils"
+gem "trailblazer-core-utils", path: "../trailblazer-core-utils"

data/lib/trailblazer/activity/dsl/linear/helper/path.rb

@@ -97,14 +97,29 @@ module Trailblazer
             # Connect last row of the {sequence} to the given step via its {Id}
             # Useful when steps needs to be inserted in between {Start} and {connect Id()}.
             private def connect_for_sequence(sequence, connect_to:)
-              output, _ = sequence[-1][2][0].(sequence, sequence[-1]) # FIXME: the Forward() proc contains the row's Output, and the only current way to retrieve it is calling the search strategy. It should be Forward#to_h
+              last_step_on_path = sequence[-1]
+              output_searches   = last_step_on_path[2]
+
+              last_step_outputs =
+                output_searches.collect do |search_strategy|
+                  # TODO: introduce {search_strategy.to_h} so we don't need to execute it here.
+                  output, _ = search_strategy.(sequence, last_step_on_path) # FIXME: the Forward() proc contains the row's Output, and the only current way to retrieve it is calling the search strategy. It should be Forward#to_h
+                  output
+                end
+
+              # we want to reconnect the last step's {:success} output, everything else we keep.
+              success_output = last_step_outputs.find { |output| output.to_h[:semantic] == :success } or raise
+
+                # FIXME: what about End()?
+              success_search = Sequence::Search.ById(success_output, connect_to.value) if connect_to.instance_of?(Linear::Normalizer::OutputTuples::Id)
+              success_search = Sequence::Search.Forward(success_output, connect_to.color) if connect_to.instance_of?(Linear::Normalizer::OutputTuples::Track) # FIXME: use existing mapping logic!
+
+              success_output_index = last_step_outputs.index(success_output)
 
-              # searches = [Search.ById(output, connect_to.value)]
-              searches = [Sequence::Search.ById(output, connect_to.value)] if connect_to.instance_of?(Linear::Normalizer::OutputTuples::Id)
-              searches = [Sequence::Search.Forward(output, connect_to.color)] if connect_to.instance_of?(Linear::Normalizer::OutputTuples::Track) # FIXME: use existing mapping logic!
+              output_searches[success_output_index] = success_search # replace the success search strategy. # DISCUSS: a bit cryptical with this index.
 
-              row = sequence[-1]
-              row = row[0..1] + [searches] + [row[3]] # FIXME: not mutating an array is so hard: we only want to replace the "searches" element, index 2
+              row = last_step_on_path
+              row = row[0..1] + [output_searches] + [row[3]] # FIXME: not mutating an array is so hard: we only want to replace the "searches" element, index 2
               row = Sequence::Row[*row]
 
               sequence[0..-2] + [row]

data/lib/trailblazer/activity/dsl/linear/normalizer.rb

@@ -145,6 +145,7 @@ module Trailblazer
             )
           end
 
+          # TODO: remove this! it doesn't receive correct ciruit_options.
           # DISCUSS: should we remove this special case?
           # This handles
           #   step task: :instance_method_exposing_circuit_interface

data/lib/trailblazer/activity/dsl/linear/strategy.rb

@@ -112,7 +112,6 @@ module Trailblazer
               TaskWrap.invoke(self, *args, **kws)
             end
           end # class << self
-          # FIXME: do we want class << self?!
 
           module DSL
             module_function

data/lib/trailblazer/activity/dsl/linear/version.rb

@@ -3,7 +3,7 @@ module Trailblazer
     module Activity
       module DSL
         module Linear
-          VERSION = "1.2.3"
+          VERSION = "1.2.5"
         end
       end
     end

data/lib/trailblazer/activity/fast_track.rb

@@ -112,10 +112,11 @@ module Trailblazer
           ctx = merge_connections_for!(ctx, :fast_track, :fail_fast, :fail_fast, **ctx)
         end
 
-        def pass_fast_option(ctx, **)
+        def pass_fast_option(ctx, outputs:, **)
           ctx = merge_connections_for!(ctx, :pass_fast, :success, **ctx)
 
-          ctx = merge_connections_for!(ctx, :pass_fast, :pass_fast, :pass_fast, **ctx)
+          ctx = merge_connections_for!(ctx, :pass_fast, :pass_fast, :pass_fast, **ctx) if outputs[:pass_fast]
+          ctx
         end
 
         def pass_fast_option_for_pass(ctx, **)
@@ -123,10 +124,12 @@ module Trailblazer
           ctx = merge_connections_for!(ctx, :pass_fast, :success, **ctx)
         end
 
-        def fail_fast_option(ctx, **)
+        def fail_fast_option(ctx, outputs:, **)
           ctx = merge_connections_for!(ctx, :fail_fast, :failure, **ctx)
 
-          ctx = merge_connections_for!(ctx, :fail_fast, :fail_fast, :fail_fast, **ctx)
+          # DISCUSS: instead of checking outputs here, we could introduce something like Output(non_strict: true)
+          ctx = merge_connections_for!(ctx, :fail_fast, :fail_fast, :fail_fast, **ctx) if outputs[:fail_fast]
+          ctx
         end
 
         def fail_fast_option_for_fail(ctx, **)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity