trailblazer-developer 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461fb0299b40474ecd967a538f7f8db2fe36a084bac62c8af1e309c3f0a52759
-  data.tar.gz: c589095535ff6be6868b691c67069e4054024b028cbd2f1f68ea5f178a7de704
+  metadata.gz: 2bc71f425eee589bda27a8b681b796650443e688c3dc46ddb7d12e6daf092f08
+  data.tar.gz: 2f128bcf1675ba3147db4737f348b52d9a1f96562e317feeddda79846c1ca0e8
 SHA512:
-  metadata.gz: 8bf357f48ef2132fd486f23f16d321eadbd4fcba82d117cb29082fe03be9aa832c02d837b9bcf48efb94fec29cd92b04f2d6cbf01cacf908e80a69483fc0aa4b
-  data.tar.gz: 252980dc7e276c381b426fc8d8a73affef843a78386b5b771cf276af0ad6085ca0bba7752c25fdd637085dd791a69a70ab07140b576d01d815676cd3ba03520a
+  metadata.gz: 3b10040b636e96bc396ec89b41db298030552b0460ad7fa88b94ebf5a767e881cdf2c219ab573522f4226cb84d6e6d5baac786d384b7ef93d2788576dea4183f
+  data.tar.gz: 2eb0f50c4af74ab44ea0353e61b45a4645adb0f70132be92d329dd8123d0fd20561b58047be1bd9b2a25cb9e6bd5ccd2a6ac67089c7546e0041c78c24c455c62

data/.github/workflows/ci.yml

@@ -5,13 +5,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby]
+        ruby: [2.6, 2.7, '3.0', '3.1', '3.2', 'jruby']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: true
     - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,38 @@
+# 0.0.28
+
+* Move `Introspect::Graph` over from `trailblazer-activity`. It's a data structure very specific
+  to rendering, which is not a part of pure runtime behavior.
+* Use `Introspect.Nodes` API instead of `TaskMap`.
+* Remove `:task_maps_per_activity` in `Debugger` as we don't need to cache anymore.
+* Require `trailblazer-activity-dsl-linear-1.2.0`.
+* Remove `Render::Circuit` as this is part of `trailblazer-activity` now.
+
+# 0.0.27
+
+## Trace
+
+* `Trace.capture_args` and `capture_return` no longer use any `Graph` logic. This
+  is moved to `Trace::Present` instead to reduce complexity at crunch time.
+* Removed the `:focus_on` option for `#wtf?`. This is now solved through the debugger.
+* `Trace.default_input_collector` and `default_output_collector` now receive the original taskWrap/pipeline-args
+  `[wrap_ctx, original_args]`.
+* In `Trace::Present.call` it's now possible to provide labels to the `default_renderer` using the `:label` option.
+* `Circuit.render` now accepts segments/path.
+* Fixed a bug in `Trace::Present` where the traced top activity would show up as a node, which was wrong.
+* Rename `Trace::Entity` to `Trace::Captured`.
+* Removed `:position` keyword in `Trace::Renderer` and friends.
+* Changed `Trace::Stack` from a nested datastructure to a linear `Captured` stack.
+
+## Debugger
+
+* Add `Debugger::Node` as an interface and datastructure between tracing (`Stack` and `Captured`) and `Present`,
+  the latter now having access to `Debugger::Node`, only.
+* Add `Debugger::Normalizer`, which computes default values for `Debugger::Node` at present-time.
+
+## Internals
+
+* Use `trailblazer-activity-dsl-linear-1.0.0`.
+
 # 0.0.26
 
 * Fixing release, and allow using beta versions.

data/Gemfile

@@ -3,8 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in trailblazer-developer.gemspec
 gemspec
 
-# gem "trailblazer-activity", ">= 0.7.1"
-# gem "trailblazer-activity", path: "../trailblazer-activity"
-# gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
+# gem "trailblazer-activity",             path: "../trailblazer-activity"
+# gem "trailblazer-activity-dsl-linear",  path: "../trailblazer-activity-dsl-linear"
+# gem "trailblazer-operation",            path: "../trailblazer-operation"
+# gem "trailblazer-pro",                  path: "../trailblazer-pro"
+
+# gem "trailblazer-activity",           github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear"
-# gem "trailblazer-activity", github: "trailblazer/trailblazer-activity"
+

data/lib/trailblazer/developer/introspect/graph.rb

@@ -0,0 +1,83 @@
+# NOTE: The Graph API might get deprecated and replaced.
+module Trailblazer
+  module Developer
+    module Introspect
+      # TODO: order of step/fail/pass in Node would be cool to have
+
+      # TODO: Remove Graph. This is only useful to render the full circuit
+      # Some thoughts here:
+      # * where do we need Schema.outputs? and where task.outputs?
+      #
+      #
+      # @private This API is still under construction.
+      class Graph
+        def initialize(activity)
+          @schema   = activity.to_h or raise
+          @circuit  = @schema[:circuit]
+          @map      = @circuit.to_h[:map]
+          @configs  = @schema[:nodes]
+        end
+
+        def find(id = nil, &block)
+          return find_by_id(id) unless block_given?
+
+          find_with_block(&block)
+        end
+
+        # TODO: convert to {#to_a}.
+        def collect(strategy: :circuit)
+          @map.keys.each_with_index.collect { |task, i| yield find_with_block { |node| node.task == task }, i }
+        end
+
+        def stop_events
+          @circuit.to_h[:end_events]
+        end
+
+        private
+
+        def find_by_id(id)
+          node = @configs.find { |_, _node| _node.id == id } or return
+          node_for(node[1])
+        end
+
+        def find_with_block
+          existing = @configs.find { |_, node| yield Node(node.task, node.id, node.outputs, node.data) } or return
+
+          node_for(existing[1])
+        end
+
+        # Build a {Graph::Node} with outputs etc.
+        def node_for(node_attributes)
+          Node(
+            node_attributes.task,
+            node_attributes.id,
+            node_attributes.outputs, # [#<struct Trailblazer::Activity::Output signal=Trailblazer::Activity::Right, semantic=:success>]
+            outgoings_for(node_attributes),
+            node_attributes.data,
+          )
+        end
+
+        def Node(*args)
+          Node.new(*args).freeze
+        end
+
+        Node     = Struct.new(:task, :id, :outputs, :outgoings, :data)
+        Outgoing = Struct.new(:output, :task)
+
+        def outgoings_for(node)
+          outputs     = node.outputs
+          connections = @map[node.task]
+
+          connections.collect do |signal, target|
+            output = outputs.find { |out| out.signal == signal }
+            Outgoing.new(output, target)
+          end
+        end
+      end
+
+      def self.Graph(*args)
+        Graph.new(*args)
+      end
+    end # Graph
+  end
+end

data/lib/trailblazer/developer/introspect.rb

@@ -0,0 +1,17 @@
+module Trailblazer
+  module Developer
+    module Introspect
+      # find the path for Strategy subclasses.
+      # FIXME: will be removed
+      def self.find_path(activity_class, segments)
+        activity = activity_class.is_a?(Class) ? activity_class.to_h[:activity] : activity_class # FIXME: not a real fan of this, maybe always do {to_h[:activity]}
+
+        node, activity, graph = Activity::Introspect.find_path(activity, segments)
+
+        activity = activity.is_a?(Class) ? activity.to_h[:activity] : activity # FIXME: not a real fan of this, maybe always do {to_h[:activity]}
+
+        return node, activity, graph
+      end
+    end
+  end
+end

data/lib/trailblazer/developer/render/circuit.rb

@@ -2,56 +2,13 @@ module Trailblazer
   module Developer
     module_function
 
-    def render(activity, **options)
-      Render::Circuit.(activity, **options)
-    end
-
-    module Render
-      module Circuit
-        module_function
-
-        # Render an {Activity}'s circuit as a simple hash.
-        def call(activity, **options)
-          graph = Activity::Introspect::Graph(activity)
-
-          circuit_hash(graph, **options)
-        end
-
-        def circuit_hash(graph, **options)
-          content = graph.collect do |node|
-            conns = node.outgoings.collect do |outgoing|
-              " {#{outgoing.output.signal}} => #{inspect_with_matcher(outgoing.task, **options)}"
-            end
-
-            [ inspect_with_matcher(node.task, **options), conns.join("\n") ]
-          end
-
-          content = content.join("\n")
-
-          "\n#{content}".gsub(/0x\w+/, "0x")
-        end
-
-        # If Ruby had pattern matching, this function wasn't necessary.
-        def inspect_with_matcher(task, inspect_task: method(:inspect_task), inspect_end: method(:inspect_end))
-          return inspect_task.(task) unless task.kind_of?(Trailblazer::Activity::End)
-          inspect_end.(task)
-        end
-
-        def inspect_task(task)
-          task.inspect
-        end
-
-        def inspect_end(task)
-          class_name = Render::Circuit.strip(task.class)
-          options    = task.to_h
-
-          "#<#{class_name}/#{options[:semantic].inspect}>"
-        end
-
-        def self.strip(string)
-          string.to_s.sub("Trailblazer::Activity::", "")
-        end
+    def render(activity, path: nil, **options)
+      if path # TODO: move to place where all renderers can use this logic!
+        node, _, graph   = Developer::Introspect.find_path(activity, path)
+        activity = node.task
       end
+
+      Activity::Introspect::Render.(activity, **options)
     end
   end
 end

data/lib/trailblazer/developer/render/linear.rb

@@ -15,7 +15,7 @@ module Trailblazer
         module_function
 
         def call(operation, style: :line)
-          graph = Activity::Introspect::Graph(operation)
+          graph = Introspect::Graph(operation)
 
           rows = graph.collect do |node, i|
             next if node[:data][:stop_event] # DISCUSS: show this?

data/lib/trailblazer/developer/render/task_wrap.rb

@@ -0,0 +1,79 @@
+module Trailblazer
+  module Developer
+    module Render
+      module TaskWrap
+        # @param activity Trailblazer::Activity
+        def self.render_for(activity, node)
+          task_wrap = task_wrap_for_activity(activity) # TODO: MERGE WITH BELOW
+          task      = node.task
+          step_wrap = task_wrap[task] # the taskWrap for the actual step, e.g. {input,call_task,output}.
+
+          level = 2
+          nodes = render_pipeline(step_wrap, level)
+
+          nodes = [[0, activity], [1, node.id], *nodes]
+
+          Hirb::Console.format_output(nodes, class: :tree, type: :directory, multi_line_nodes: true)
+        end
+
+        # @param activity Activity
+        def self.task_wrap_for_activity(activity, **)
+          activity.to_h[:config][:wrap_static]
+        end
+
+        def self.render_pipeline(pipeline, level)
+          renderers = Hash.new(method(:render_task_wrap_step))
+          renderers.merge!(
+            Trailblazer::Activity::DSL::Linear::VariableMapping::Pipe::Input => method(:render_input),
+            Trailblazer::Activity::DSL::Linear::VariableMapping::Pipe::Output => method(:render_input),
+          )
+# TODO: use collect
+          nodes=[]
+
+          pipeline.to_a.collect do |row|
+            renderer = renderers[row[1].class]
+
+            nodes = nodes + renderer.(row, level) # call the rendering component.
+          end
+
+          nodes
+        end
+
+        def self.render_task_wrap_step(row, level)
+          text = row.id.to_s.ljust(33, ".") + row[1].class.to_s
+
+          [[level, text]]
+        end
+
+        def self.render_input(row, level)
+          variable_mapping = Activity::DSL::Linear::VariableMapping
+
+          input_pipe = row[1].instance_variable_get(:@pipe) # this is again a {TaskWrap::Pipeline}.
+
+          filters = input_pipe.to_a.collect do |id, filter|
+            id, class_name, info =
+              if filter.is_a?(variable_mapping::AddVariables) || filter.is_a?(variable_mapping::SetVariable)
+                # TODO: grab user_filter here if needed for understanding
+                # _info       = filter.instance_variable_get(:@user_filter).inspect # we could even grab the source code for callables here!
+                _info       = ""
+
+                [id, filter.class.to_s.match(/VariableMapping::.+/), _info]
+              else # generic VariableMapping::DSL step such as {VariableMapping.scope}
+                _name = filter.inspect.match(/VariableMapping\.\w+/)
+
+                [id.to_s, _name, ""]
+              end
+
+            text =  "#{id.ljust(45, ".")} #{info.ljust(45, ".")} #{class_name}"
+
+            [level+1, text]
+          end
+
+          # pp filters
+          render_task_wrap_step(row, level) + filters
+          # render_task_wrap_step(row, level)
+        end
+      end
+    end
+  end
+end

data/lib/trailblazer/developer/trace/debugger/normalizer.rb

@@ -0,0 +1,68 @@
+module Trailblazer
+  module Developer
+    module Trace
+      module Debugger
+        # @private
+        # Public entry point to add Debugger::Node normalizer steps.
+        def self.add_normalizer_step!(step, id:, normalizer: Normalizer::PIPELINES.last, **options)
+          task = Normalizer.Task(step)
+
+          # We have a TaskWrap::Pipeline (a very simple style of "activity" used for normalizers) and
+          # add another step using the "friendly interface" from {Activity::Adds}.
+          options = {append: nil} unless options.any?
+
+          pipeline_extension = Activity::TaskWrap::Extension.build([task, id: id, **options])
+
+          Normalizer::PIPELINES << pipeline_extension.(normalizer)
+        end
+
+        module Normalizer
+          def self.Task(user_step) # TODO: we could keep this in the {activity} gem.
+            Activity::TaskWrap::Pipeline::TaskAdapter.for_step(user_step, option: false) # we don't need Option as we don't have ciruit_options here, and no {:exec_context}
+          end
+
+          # Default steps for the Debugger::Node options pipeline, following the step-interface.
+          module Default
+            def self.compile_id(ctx, activity:, task:, **)
+              ctx[:compile_id] = Activity::Introspect.Nodes(activity, task: task)[:id]
+            end
+
+            def self.compile_path(ctx, parent_map:, captured_node:, **)
+              ctx[:compile_path] = Trace::Tree::ParentMap.path_for(parent_map, captured_node)
+            end
+
+            def self.runtime_id(ctx, compile_id:, **)
+              ctx[:runtime_id] = compile_id
+            end
+
+            def self.runtime_path(ctx, runtime_id:, compile_path:, **)
+              return ctx[:runtime_path] = compile_path if compile_path.empty? # FIXME: this currently only applies to root.
+
+              ctx[:runtime_path] = compile_path[0..-2] + [runtime_id]
+            end
+
+            def self.label(ctx, label: nil, runtime_id:, **)
+              ctx[:label] = label || runtime_id
+            end
+
+            def self.data(ctx, data: {}, **)
+              ctx[:data] = data
+            end
+          end
+
+          default_steps = {
+            compile_id:       Normalizer.Task(Default.method(:compile_id)),
+            compile_path:     Normalizer.Task(Default.method(:compile_path)),
+            runtime_id:       Normalizer.Task(Default.method(:runtime_id)),
+            runtime_path:     Normalizer.Task(Default.method(:runtime_path)),
+            label:            Normalizer.Task(Default.method(:label)),
+            data:             Normalizer.Task(Default.method(:data)),
+          }.
+          collect { |id, task| Activity::TaskWrap::Pipeline.Row(id, task) }
+
+          PIPELINES = [Activity::TaskWrap::Pipeline.new(default_steps)] # we do mutate this constant at compile-time. Maybe # DISCUSS and find a better way.
+        end
+      end
+    end
+  end
+end

data/lib/trailblazer/developer/trace/debugger.rb

@@ -0,0 +1,72 @@
+module Trailblazer
+  module Developer
+    module Trace
+      module Debugger
+        class Node < Struct.new(:captured_node, :task, :activity, :compile_id, :compile_path, :runtime_id, :runtime_path, :label, :data, :captured_input, :captured_output, :level, keyword_init: true)
+          # The idea is to only work with {Activity} instances on this level, as that's the runtime concept.
+
+            # TODO: class, "type",
+            # which track, return signal, etc
+
+
+          # we always key options for specific nodes by Stack::Captured::Input, so we don't confuse activities if they were called multiple times.
+          def self.build(tree, enumerable_tree, node_options: {}, normalizer: Debugger::Normalizer::PIPELINES.last, **options_for_nodes)
+            parent_map = Trace::Tree::ParentMap.build(tree).to_h # DISCUSS: can we use {enumerable_tree} for {ParentMap}?
+
+
+            container_activity = enumerable_tree[0].captured_input.activity # TODO: any other way to grab the container_activity? Maybe via {activity.container_activity}?
+
+            top_activity = enumerable_tree[0].captured_input.task
+
+            # DISCUSS: this might change if we introduce a new Node type for Trace.
+            debugger_nodes = enumerable_tree[0..-1].collect do |node|
+              activity      = node.captured_input.activity
+              task          = node.captured_input.task
+              # it's possible to pass per-node options, like {label: "Yo!"} via {:node_options[<captured_input>]}
+              options       = node_options[node.captured_input] || {}
+
+
+              options_for_debugger_node, _ = normalizer.(
+                {
+                  captured_node:          node,
+                  task:                   task,
+                  activity:               activity,
+                  parent_map:             parent_map,
+                  **options
+                },
+                []
+              )
+
+              options_for_debugger_node = options_for_debugger_node.slice(*(options_for_debugger_node.keys - [:parent_map]))
+
+              # these attributes are not changing with the presentation
+              Debugger::Node.new(
+                captured_node:  node,
+                activity:       activity,
+                task:           task,
+
+                level: node.level,
+                captured_input: node.captured_input,
+                captured_output: node.captured_output,
+
+                **options_for_debugger_node,
+              ).freeze
+            end
+          end
+
+          def self.build_for_stack(stack, **options_for_debugger_nodes)
+            tree, processed = Trace.Tree(stack.to_a)
+
+            enumerable_tree = Trace::Tree.Enumerable(tree)
+
+            Debugger::Node.build(
+              tree,
+              enumerable_tree,
+              **options_for_debugger_nodes,
+            )
+          end
+        end
+      end # Debugger
+    end # Trace
+  end
+end

data/lib/trailblazer/developer/trace/present.rb

@@ -1,63 +1,45 @@
-require 'hirb'
+require "hirb"
 
 module Trailblazer::Developer
   module Trace
     module Present
       module_function
 
-      def default_renderer(task_node:, **)
-        [ task_node.level, %{#{task_node.value}} ]
+      # @private
+      def default_renderer(debugger_node:, **) # DISCUSS: for compatibility, should we pass {:task_node} here, too?
+        [debugger_node.level, debugger_node.label]
       end
 
-      def call(stack, level: 1, tree: [], renderer: method(:default_renderer), **options)
-        tree(stack.to_a, level, tree: tree, renderer: renderer, **options)
-      end
-
-      def tree(stack, level, tree:, renderer:, **options)
-        opts = options.merge(tree: tree)
-        tree_for(stack, level, **opts)
-
-        nodes = tree.each_with_index.map do |task_node, position|
-          renderer.(task_node: task_node, position: position, tree: tree)
+      # Returns the console output string.
+      # @private
+      def render(debugger_nodes, renderer: method(:default_renderer), **options_for_renderer)
+        nodes = debugger_nodes.collect do |debugger_node|
+          renderer.(debugger_node: debugger_node, tree: debugger_nodes, **options_for_renderer)
         end
 
         Hirb::Console.format_output(nodes, class: :tree, type: :directory, multi_line_nodes: true)
       end
 
-      def tree_for(stack, level, tree:, **options)
-        stack.each do |lvl| # always a Stack::Task[input, ..., output]
-          input, output, nested = Trace::Level.input_output_nested_for_level(lvl)
+      # Entry point for rendering a Stack as a "tree branch" the way we do it in {#wtf?}.
+      def call(stack, render_method: method(:render), node_options: {}, **options)
+        # The top activity doesn't have an ID, hence we need to compute a default label.
+        # TODO: maybe we should deep-merge here.
+        captured_input_for_top_activity = stack.to_a[0]
 
-          tree.push(*TreeNodes.for(level, **options.merge(input: input, output: output)))
+        top_activity_options = {
+          # we can pass particular label "hints".
+          captured_input_for_top_activity => {
+            # label: %{#{captured_input_for_top_activity.task.superclass} (anonymous)},
+            label: captured_input_for_top_activity.task.inspect,
+          },
+        }
 
-          if nested.any? # nesting
-            opts = options.merge(tree: tree)
-            tree_for(nested, level + 1, **opts)
-          end
+        node_options = top_activity_options.merge(node_options)
 
-          tree
-        end
-      end
+        debugger_nodes = Debugger::Node.build_for_stack(stack, node_options: node_options, **options) # currently, we agree on using a Debugger::Node list as the presentation data structure.
 
-      module TreeNodes
-        Node = Struct.new(:level, :value, :input, :output, :options) do
-          # Allow access to any custom key from options, eg. color_map
-          def method_missing(name, *)
-            options[name]
-          end
-        end
-
-        module_function
-
-        def for(level, input:, output:, **options)
-          nodes = Array[ Node.new(level, input.data[:task_name], input, output, options).freeze ]
-
-          focused_nodes = Trace::Focusable.tree_nodes_for(level, input: input, output: output, **options)
-          nodes += focused_nodes if focused_nodes.length > 0
-
-          nodes
-        end
+        return render_method.(debugger_nodes, **options)
       end
-    end
+    end # Present
   end
 end

data/lib/trailblazer/developer/trace/stack.rb

@@ -0,0 +1,21 @@
+module Trailblazer
+  module Developer
+    module Trace
+      # The stack is a linear one-dimensional array. Per traced task two {Trace::Captured}
+      # elements get pushed onto it (unless there's an Exception).
+      class Stack
+        def initialize(captureds=[])
+          @stack = captureds
+        end
+
+        def <<(captured)
+          @stack << captured
+        end
+
+        def to_a
+          @stack
+        end
+      end # Stack
+    end
+  end
+end

data/lib/trailblazer/developer/trace/tree.rb

@@ -0,0 +1,86 @@
+module Trailblazer
+  module Developer
+    module Trace
+      # Datastructure representing a trace.
+      class Tree
+        # This could also be seen as {tree.to_a}.
+        def self.Enumerable(node)
+          Enumerable.nodes_for(node)
+        end
+
+        module Enumerable
+          # @private
+          def self.nodes_for(node)
+            [node, *node.nodes.collect { |n| nodes_for(n) } ].flatten
+          end
+        end # Enumerable
+
+        # Map each {Node} instance to its parent {Node}.
+        module ParentMap
+          def self.build(node)
+            children_map = []
+            node.nodes.each { |n| children_map += ParentMap.build(n) }#.flatten(1)
+
+            node.nodes.collect { |n| [n, node] } + children_map
+          end
+
+          # @public
+          def self.path_for(parent_map, node)
+            path = []
+
+            while parent = parent_map[node] # DISCUSS: what if the graphs are cached and present, already?
+              node_id = Activity::Introspect.Nodes(node.captured_input.activity, task: node.captured_input.task).id
+              path << node_id
+
+              node = parent
+            end
+
+            path.reverse
+          end
+        end
+
+        class Node < Struct.new(:level, :captured_input, :captured_output, :nodes)
+        end
+      end # Tree
+
+
+      # Builds a tree graph from a linear stack.
+      # Consists of {Tree::Node} structures.
+      def self.Tree(stack_end, level: 0, parent: nil)
+        processed = []
+        nodes     = []
+
+        # for {captured_input} we're gonna build a {Node}!
+        captured_input, remaining = stack_end[0], stack_end[1..-1]
+
+            raise unless captured_input.is_a?(Captured::Input)
+
+        while next_captured = remaining[0]
+          if next_captured.is_a?(Captured::Input)
+
+            bla, _processed = Tree(remaining, level: level+1)
+            nodes += [bla]
+            processed += _processed
+
+
+            remaining = remaining - processed
+
+          else # Captured::Output
+
+            raise unless next_captured.is_a?(Captured::Output)
+            raise if next_captured.activity != captured_input.activity
+
+            node = Tree::Node.new(level, captured_input, next_captured, nodes)
+
+            return node,
+              [captured_input, *processed, next_captured] # what nodes did we process here?
+
+          end
+
+        end
+
+
+      end # Tree
+    end
+  end # Developer
+end