trailblazer-activity-dsl-linear 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36059b6c848e46341ed7c120c6f3e96bdbea72ac6a5ca3d7c536fc17f64b194a
-  data.tar.gz: bd31c9110032fd621e1f79880c6f7694480a8689b7371a9aec84b2ae5041f035
+  metadata.gz: e586cfffe36a34eb165699f525802629709dc0934d193a8bcbc460c33e63a4a0
+  data.tar.gz: 965ee6e76f86fa2e57fb11fff9c9e511ce655e72e01e431ed72a9bc338aeedd7
 SHA512:
-  metadata.gz: 29cbeca1196720b666f654436bbc58d330e3ad021f18fb247b1816d7a4ccb83d1378b3481ac425709a08807c0fb210f2a2d8a5c6971c75dda1fc7124e3d0b2bd
-  data.tar.gz: 22d73328ebbac971f41a2247d2f5821eddf622c413ede67354ec64f74543f3779f6fe8a6900c3386a2b75d7b5a9f4e144c2c81229df7ff131e2ac0a2bf869400
+  metadata.gz: 354cd6aa6b514f1b5e43b7b3b04a39f237e7d0dbb7b0ee4ffff876e7ed381fca59393e78b945b1a6d558678d770c84150770273164357d45a6b698d8f040952d
+  data.tar.gz: 1cebc503caa1c55d6753e233c519eeb0337583dc3216fa5fb5829bc7286dde95ad3b752bef876b762f94846d07ff21dd06d68306d5e72133d226f80819d64b9a

data/.github/workflows/ci.yml

@@ -5,10 +5,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.5, 2.6, 2.7, '3.0', '3.1', '3.2', 'head', 'jruby']
+        ruby: [2.5, 2.6, 2.7, '3.0', '3.1', '3.2', "3.3", 'head', 'jruby']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGES.md

@@ -1,3 +1,21 @@
+# 1.2.6
+
+* Speed up compile time of activities by ~ 1.3x by not using `Intermediate::Compiler`
+  but compiling the `Activity::Circuit` and `Schema` directly. This also saves runtime
+  memory.
+
+# 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

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/sequence/builder.rb

@@ -3,7 +3,8 @@ module Trailblazer
     module DSL
       module Linear
         class Sequence
-          # Implements a DSL Builder pattern.
+          # Run a normalizer for a user DSL input, and then apply the new step using the ADDS interface
+          # to the sequence.
           module Builder
             # @return Sequence
             def self.call(method, argument, options, **kws, &block)

data/lib/trailblazer/activity/dsl/linear/sequence/compiler.rb

@@ -8,51 +8,68 @@ module Trailblazer
             module_function
 
             # Default strategy to find out what's a stop event is to inspect the TaskRef's {data[:stop_event]}.
-            def find_termini(intermediate_wiring)
-              intermediate_wiring
-                .find_all { |task_ref, _| task_ref.data[:stop_event] }
-                .collect  { |task_ref, _| [task_ref.id, task_ref.data.fetch(:semantic)] }
+            def find_termini(sequence)
+              sequence
+                .find_all { |_, _, _, data| data[:stop_event] }
+                .collect  { |_, task, _, data| [task, data.fetch(:semantic)] }
                 .to_h
             end
 
-            # The first task in the wiring is the default start task.
-            def find_start_task_id(intermediate_wiring) # FIXME: shouldn't we use sequence here? and Row#id?
-              intermediate_wiring.first.first.id
+            def find_start_task(sequence)
+              sequence[0][1]
             end
 
-            def call(sequence, find_stops: method(:find_termini), find_start: method(:find_start_task_id))
-              _implementations, intermediate_wiring =
-                sequence.inject([[], []]) do |(implementations, intermediates), seq_row|
-                  _magnetic_to, task, connections, data = seq_row
-                  id = data[:id]
+            def call(sequence, find_stops: Compiler.method(:find_termini), find_start: method(:find_start_task))
+              config = Activity::Schema::Intermediate::Compiler::DEFAULT_CONFIG
 
-                  # execute all {Search}s for one sequence row.
-                  connections = find_connections(seq_row, connections, sequence)
+              nodes_attributes = []
 
-                  # FIXME: {:extensions} should be initialized
-                  implementations += [[id, Schema::Implementation::Task(task, connections.collect { |output, _| output }, data[:extensions] || [])]]
+              wiring = sequence.collect do |seq_row|
+                _magnetic_to, task, connections, data = seq_row
 
-                  intermediates += [
-                    [
-                      Schema::Intermediate::TaskRef(id, data),
-                      # Compute outputs.
-                      connections.collect { |output, target_id| Schema::Intermediate::Out(output.semantic, target_id) }
-                    ]
-                  ]
+                id = data[:id]
 
-                  [implementations, intermediates]
-                end
+                # execute all {Search}s for one sequence row.
+                connections = find_connections(seq_row, connections, sequence)
 
-              start_task_id         = find_start.(intermediate_wiring)
-              terminus_to_semantic  = find_stops.(intermediate_wiring)
+                circuit_connections = connections.collect { |output, target_task| [output.signal, target_task] }.to_h
 
-              intermediate   = Schema::Intermediate.new(intermediate_wiring.to_h, terminus_to_semantic, start_task_id)
-              implementation = _implementations.to_h
+                extensions = (seq_row[3][:extensions] || [])
+                # FIXME: move that to {Intermediate::Compiler}?
+                config = extensions.inject(config) { |cfg, ext| ext.(config: cfg, id: id, task: task) } # {ext} must return new config hash.
 
-              Schema::Intermediate::Compiler.(intermediate, implementation) # implemented in the generic {trailblazer-activity} gem.
-            end
+                # nodes_attributes:
+                outputs = connections.keys
+                nodes_attributes << [
+                  id,
+                  task,
+                  data,
+                  outputs
+                ]
+
+                [
+                  task,
+                  circuit_connections
+                ]
+              end.to_h
+
+              termini = find_stops.(sequence) # {task => semantic}
+              start_task = find_start.(sequence)
 
-            # private
+              circuit = Trailblazer::Activity::Circuit.new(
+                wiring,
+                termini.keys, # termini
+                start_task: start_task
+              )
+
+              # activity_outputs = [Activity::Output(steps[last_step_i], :success)]
+              activity_outputs = termini.collect { |terminus, semantic| Activity::Output(terminus, semantic) }
+
+
+              nodes = Schema::Nodes(nodes_attributes)
+
+              Schema.new(circuit, activity_outputs, nodes, config)
+            end
 
             # Execute all search strategies for a row, retrieve outputs and
             # their respective target IDs.
@@ -64,9 +81,9 @@ module Trailblazer
 
                 [
                   output,
-                  target_seq_row.id
+                  target_seq_row[1]
                 ]
-              end
+              end.to_h
             end
           end # Compiler
         end # Sequence

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

@@ -62,6 +62,7 @@ module Trailblazer
 
             private def recompile_activity(sequence)
               schema = Sequence::Compiler.(sequence)
+
               Activity.new(schema)
             end
 
@@ -112,7 +113,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.4"
+          VERSION = "1.2.6"
         end
       end
     end

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

@@ -0,0 +1,34 @@
+module Trailblazer::Activity::DSL::Linear
+  module Zeitwerk
+    module Strategy
+      # DISCUSS: rename to {Finalize}?
+      # Don't recompile, just collect sequence steps.
+      private def recompile_activity_for(type, *args, &block)
+        sequence = apply_step_on_sequence_builder(type, *args, &block)
+
+        @state.update!(:sequence) { |*| sequence }
+      end
+
+      # Compile the final {Activity} via the sequence.
+      def finalize!
+        sequence = @state.get(:sequence)
+# puts "~~~~~~~~~ finalizing #{self.inspect}"
+        recompile!(sequence)
+      end
+    end
+
+    module DSL
+      module Build
+        module_function
+        def Build(strategy, **options, &block)
+          activity_class = super
+puts "yoo"
+          activity_class.finalize!
+
+          activity_class
+        end
+      end
+
+    end
+  end # Zeitwerk
+end

data/trailblazer-activity-dsl-linear.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-activity", ">= 0.16.0", "< 0.17.0"
+  spec.add_dependency "trailblazer-activity", ">= 0.17.0", "< 0.18.0"
   spec.add_dependency "trailblazer-declarative", ">= 0.0.1", "< 0.1.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "minitest", ">= 5.15.0", "< 5.16.0"
+  spec.add_development_dependency "minitest"#, ">= 5.15.0", "< 5.16.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "trailblazer-core-utils", "0.0.2"
+  spec.add_development_dependency "trailblazer-core-utils", "0.0.4"
 
   spec.required_ruby_version = ">= 2.5.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-declarative
   requirement: !ruby/object:Gem::Requirement
@@ -70,20 +69,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.16.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.15.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,15 +97,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
-description: 
+        version: 0.0.4
 email:
 - apotonick@gmail.com
 executables: []
@@ -147,6 +139,7 @@ files:
 - lib/trailblazer/activity/dsl/linear/sequence/search.rb
 - lib/trailblazer/activity/dsl/linear/strategy.rb
 - lib/trailblazer/activity/dsl/linear/version.rb
+- lib/trailblazer/activity/dsl/linear/zeitwerk.rb
 - lib/trailblazer/activity/fast_track.rb
 - lib/trailblazer/activity/path.rb
 - lib/trailblazer/activity/railway.rb
@@ -155,7 +148,6 @@ homepage: https://trailblazer.to/2.1/docs/activity
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: 'The #step DSL for Trailblazer activities.'
 test_files: []