trailblazer-activity-dsl-linear 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99e0c72f1c402fc56bf48c302d04d5749e47f159ce9d7b10a2537665a0af62e
-  data.tar.gz: f3c35842ae2631b358a1decaad27bb32785e578f0f99cf2597757c2e4485a120
+  metadata.gz: e586cfffe36a34eb165699f525802629709dc0934d193a8bcbc460c33e63a4a0
+  data.tar.gz: 965ee6e76f86fa2e57fb11fff9c9e511ce655e72e01e431ed72a9bc338aeedd7
 SHA512:
-  metadata.gz: 2035d707ca689d84923de40eaccd48b08c355be9351172804dc45d80ded9a141088b26b2d7a464727c5b9c49082018d02085aa3754d0bdca19ad13c6bf70a161
-  data.tar.gz: cfdf092b175fdefd34a0321248aa95f4a5a8c768b18e3f23f9285be10c0f1c720dd633e061b9d079a60d610ef743ad6544597af0bf5adb3cf7cb53b6b9b91502
+  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,9 @@
+# 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

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem "minitest-line"
 
-gem "trailblazer-developer",      path: "../trailblazer-developer"
+# gem "trailblazer-developer",      path: "../trailblazer-developer"
 # gem "trailblazer-developer", github: "trailblazer/trailblazer-developer"
 # gem "trailblazer-declarative", path: "../trailblazer-declarative"
 # gem "trailblazer-activity",       path: "../trailblazer-activity"
@@ -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/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
 

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

@@ -3,7 +3,7 @@ module Trailblazer
     module Activity
       module DSL
         module Linear
-          VERSION = "1.2.5"
+          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.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-05 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: []