hokusai-zero 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750449495b6ff533259afe965f85b4ec8da53768613b1636a011a9c0d63bfa54
-  data.tar.gz: abedbc5fa46e999dfcd8af09b38d0bced547b527718cb4a5f5e88b639f358391
+  metadata.gz: e03fd33f856cbaade06505c5e962980504107726d39d6ec630b16e2d4c75b480
+  data.tar.gz: eb7bf1b39ea4acae4e7d7cfe4d7d70d14cd7335e65c4b74dc7c7e37b697eb52b
 SHA512:
-  metadata.gz: 1d4d7da22c16a69bb0e169027c25378395f3d3f58d7267bff3e26bdbcd323dafae067148e8d3c18dfcd59d87cd0b272072cd9735235f8f0f1681426f76474e73
-  data.tar.gz: 8e8d26b0d9db21585c4575346233ba65467a6eb484a8ea17b121ab1b0972898c458393f284d0cfcd9a7e98e51061aaee71e3af878e304ef4345666d18b9e745e
+  metadata.gz: 9c85bc9f63b75685b60fc83d3e247c84cd3ee02e981608aadf810e080ec7c22043bf0d0ff5908678ed244ad40a2a0e9653d67eaefd77071b1cde15df81e2f641
+  data.tar.gz: 10e5e39e7185c0c3863a0958fe20085d62f2603bfe1621a5d92dbb16caff6d7183d1a8779f45a5d2e1624b99c54ea116f1dbe8318f6b78d2bc2a47ade2965d7d

data/hokusai.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hokusai-zero'
-  s.version     = '0.1.9'
+  s.version     = '0.2.0'
   s.licenses    = ['MIT']
   s.summary     = "A Ruby library for writing GUI applications"
   s.authors     = ["skinnyjames"]

data/ui/spec/hokusai/diff_spec.rb

@@ -0,0 +1,117 @@
+describe Hokusai::Diff, focus: true do
+  def patches(before, after)
+    patches = []
+
+    Hokusai::Diff.new(before, after).patch do |item|
+      patches << item
+    end
+
+    patches
+  end
+
+  it "inserts new items" do
+    list = patches([], [[:key1, 1],[:key2, 2],[:key3, 3]])
+
+    expect(list.count).to eq(3)
+    
+    list.each_with_index do |patch, i|
+      expect(patch).to be_a(Hokusai::InsertPatch)
+      expect(patch.target).to eq(i)
+      expect(patch.value).to eq(i+1)
+      expect(patch.delete).to be(true)
+    end
+  end
+
+  it "inserts new items and deletes old items" do
+    list = patches(
+      [[:key1, 1], [:key2, 2], [:key3, 3]],
+      [[:key1, 1], [:key4, 4], [:key3, 3]]
+    )
+
+    expect(list.count).to eq(1)
+
+    # removes key2 and inserts key4 with 1 insertpatch
+    expect(list.first).to be_a(Hokusai::InsertPatch)
+    expect(list.first.target).to eq(1)
+    expect(list.first.value).to eq(4)
+    expect(list.first.delete).to be(true)
+  end
+
+  it "updates items with new values on existing keys" do
+    list = patches(
+      [[:key1, 1], [:key2, 2], [:key3, 3]],
+      [[:key1, 1], [:key2, 4], [:key3, 3]]
+    )
+
+    expect(list.count).to eq(1)
+
+    # removes key2 and inserts key4 with 1 insertpatch
+    expect(list.first).to be_a(Hokusai::UpdatePatch)
+    expect(list.first.target).to eq(1)
+    expect(list.first.value).to eq(4)
+  end
+
+  it "moves items that have the same key and no longer are in the list" do
+    list = patches(
+      [[:key1, 1], [:key2, 2], [:key3, 3]],
+      [[:key1, 1], [:key3, 3]]
+    )
+
+    expect(list.count).to eq(1)
+    expect(list.first).to be_a(Hokusai::MovePatch)
+    expect(list.first.from).to eq(2)
+    expect(list.first.to).to eq(1)
+    expect(list.first.value).to eq(3)
+    expect(list.first.delete).to be(true)
+  end
+
+  it "deletes items that have different keys and no longer are in the list" do
+    list = patches(
+      [[:key1, 1], [:key2, 2], [:key3, 3]],
+      [[:key2, 2], [:key3, 3]]
+    )
+
+    expect(list.count).to eq(3)
+    # moves position 1 to 0
+    expect(list[0]).to be_a(Hokusai::MovePatch)
+    expect(list[0].from).to eq(1)
+    expect(list[0].to).to eq(0)
+    expect(list[0].delete).to be(true)
+
+    # moves position 2 to 1
+    expect(list[1]).to be_a(Hokusai::MovePatch)
+    expect(list[1].from).to eq(2)
+    expect(list[1].to).to eq(1)
+
+    # delete position 2
+    expect(list[2]).to be_a(Hokusai::DeletePatch)
+    expect(list[2].target).to eq(2)
+  end
+
+  it "moves items around" do 
+    # [d, a, c]     [(c), e, a, b]
+    list = patches(
+      [[:key1, :d], [:key2, :a], [:key3, :c]],
+      [[:key3, :c], [:key4, :e], [:key2, :a], [:key5, :b]]
+    )
+
+    expect(list.count).to eq(3)
+
+    # Moves [key3, c] to position 0 and deletes [key1, d]
+    expect(list[0]).to be_a(Hokusai::MovePatch)
+    expect(list[0].from).to eq(2)
+    expect(list[0].to).to eq(0)
+    expect(list[0].delete).to eq(true)
+
+    # Inserts [key4, e] into position 1
+    expect(list[1]).to be_a(Hokusai::InsertPatch)
+    expect(list[1].target).to eq(1)
+    expect(list[1].value).to eq(:e)
+    expect(list[1].delete).to be(false)
+
+    expect(list[2]).to be_a(Hokusai::InsertPatch)
+    expect(list[2].target).to eq(3)
+    expect(list[2].value).to eq(:b)
+    expect(list[2].delete).to eq(true) # delete doesn't need to be true here...
+  end
+end

data/ui/spec/hokusai/providers_spec.rb

@@ -27,7 +27,7 @@ describe "Providers" do
         slot
       EOF
 
-      provide :provision,  counter_klass.new
+      provide :provision, counter_klass.new
 
       def state
         self.class.provides[:provision]
@@ -212,4 +212,91 @@ describe "Providers" do
       expect(provided.state.count).to eq(2)
     end
   end
+
+  describe "Loops with conditionals" do
+    let(:loop_if_container) do
+      provider_klass = provider
+      inject_klass = inject
+
+      c = Class.new(Hokusai::Block) do
+        template <<~EOF
+        [template]
+          container
+            provision
+              [for="value in values"]
+                vblock { :key="value" }
+                  [if="show"]
+                    vblock
+                      inject
+                  [else]
+                    vblock
+                      injectelse
+            control
+        EOF
+
+        uses(
+          container: Hokusai::Blocks::Vblock,
+          vblock: Hokusai::Blocks::Vblock,
+          control: inject_klass,
+          inject: inject_klass,
+          injectelse: inject_klass,
+          provision: provider_klass
+        )
+
+        attr_accessor :show
+
+        def initialize(**args)
+          @show = false
+
+          super
+        end
+
+        def values
+          [1,2,3,4,5]
+        end
+
+        def toggle
+          self.show = !show
+        end
+      end
+
+      c.mount
+    end
+
+    it "provisions extend to conditional children in loops" do
+      loop_if_container.toggle
+      loop_if_container.update
+
+      injecteds = get_blocks_by_type(loop_if_container, "inject")
+      provided = get_block_by_type(loop_if_container, "provision")
+      control = get_block_by_type(loop_if_container, "control")
+      
+      injecteds.each do |injected|
+        expect(injected.provision.count).to eq(0)
+      end
+
+      injecteds.first.provision.increment
+
+      injecteds.each do |injected|
+        expect(injected.provision.count).to eq(1)
+      end
+
+      expect(provided.state.count).to eq(1)
+      expect(control.provision).to be(nil)
+
+      loop_if_container.toggle
+      loop_if_container.update
+
+      inject_elses = get_blocks_by_type(loop_if_container, "injectelse")
+      
+      inject_elses.each do |inject_else|
+        expect(inject_else.provision).not_to be(nil)
+        expect(inject_else.provision.count).to eq(1)
+      end
+
+      inject_elses.first.provision.increment
+
+      expect(provided.state.count).to eq(2)
+    end
+  end
 end

data/ui/src/hokusai/backends/raylib.rb

@@ -192,6 +192,12 @@ module Hokusai::Backends
       last_input_hash = nil
 
       until Raylib.WindowShouldClose
+        if Raylib.IsWindowFocused
+          Raylib.DisableEventWaiting
+        else
+          Raylib.EnableEventWaiting
+        end
+
         last_width = Raylib.GetScreenWidth
         last_height = Raylib.GetScreenHeight
 

data/ui/src/hokusai/blocks/text.rb

@@ -206,9 +206,7 @@ class Hokusai::Blocks::Text < Hokusai::Block
         self.last_content = content
       end
 
-      height = internal_render(last_clamping, canvas)
-      self.last_content = last_content
-      
+      height = internal_render(last_clamping, canvas)      
       new_height = height + padding.bottom + padding.top
       new_height -= size if markdown
 

data/ui/src/hokusai/diff.rb

@@ -2,11 +2,12 @@ module Hokusai
   # Represents a patch to move a loop item
   # from one location to another
   class MovePatch
-    attr_accessor :from, :to, :delete
+    attr_accessor :from, :to, :value, :delete
 
-    def initialize(from:, to:, delete: false)
+    def initialize(from:, to:, value:, delete: false)
       @from = from
       @to = to
+      @value = value
       @delete = delete
     end
   end
@@ -96,12 +97,12 @@ module Hokusai
               # move a to 2
               before[bi[:index]] = [ckey, current] # before[2] = a
               # update index
-              mapbefore[ckey] = { index: bi, value: current }
+              mapbefore[ckey] = { index: bi[:index], value: current }
 
               # move c to 0
-              yield MovePatch.new(from: bi, to: i)
+              yield MovePatch.new(from: bi[:index], to: i, value: bi[:value])
             else
-              yield MovePatch.new(from: bi, to: i, delete: true)
+              yield MovePatch.new(from: bi[:index], to: i, value: bi[:value], delete: true)
               mapbefore[ckey] = nil
               deletions += 1
               # next

data/ui/src/hokusai/meta.rb

@@ -120,7 +120,7 @@ module Hokusai
     end
 
     def has_ast?(ast, index)
-      if portal = children![index]&.node&.portal
+      if portal = children![index]&.node&.portal&.portal
         return portal.ast.object_id == ast.object_id
       end
 

data/ui/src/hokusai/mounting/loop_entry.rb

@@ -71,9 +71,7 @@ module Hokusai
           child_block.node.meta.set_prop(ast.loop.var.to_sym, value)
           child_block.node.meta.publisher.add(target)
 
-          UpdateEntry.new(child_block, block, target).register(context: ctx)
-
-          child_block.class.provides.merge!(parent.class.provides)
+          UpdateEntry.new(child_block, block, target).register(context: ctx, providers: mount_providers.merge(child_block.providers))
 
           block.node.meta << child_block
 
@@ -150,9 +148,8 @@ module Hokusai
               ctx.add_entry(ast.loop.var, patch.value)
               children[patch.target].node.add_styles(target.class)
               children[patch.target].node.add_props_from_block(target, context: ctx)
-              children[patch.target].node.meta.set_prop(ast.loop.var.to_sym, patch.value)
 
-              UpdateEntry.new(children[patch.target], uparent, utarget).register(context: ctx)
+              # UpdateEntry.new(children[patch.target], uparent, utarget).register(context: ctx)
             when MovePatch
               if patch.delete
                 from = children[patch.from]
@@ -203,12 +200,10 @@ module Hokusai
               portal = Node.new(ast)
               node = child_block_class.compile(target_ast.type, portal)
               node.add_props_from_block(target, context: ctx)
-              child_block = NodeMounter.new(node, child_block_class).mount(context: ctx)
+              child_block = NodeMounter.new(node, child_block_class).mount(context: nil, providers: mount_providers.merge(ublock.providers))
               child_block.node.add_styles(target.class)
               child_block.node.meta.publisher.add(target)
 
-              child_block.class.provides.merge!(parent.class.provides)
-
               if patch.delete
                 children[patch.target] = child_block
               else

data/ui/src/hokusai/mounting/update_entry.rb

@@ -40,18 +40,19 @@ module Hokusai
                 unless child_present.call(child)
                   portal = Node.new(child, Node.new(child))
                   node = child_block_klass.compile("root", portal)
+                  node.add_styles(target.class)
+                  node.add_props_from_block(target, context: context)
+                  node.meta.publisher.add(target)
+
                   stack = []
                   child.children.each_with_index do |ast, ast_index|
-                    stack << MountEntry.new(ast_index, ast, ublock, uparent, utarget)
+                    stack << MountEntry.new(ast_index, ast, ublock, uparent, utarget, providers: providers)
                   end
 
-                  child_block = NodeMounter.new(node, child_block_klass, [stack]).mount(context: context, providers: providers)
-                  UpdateEntry.new(child_block, block, target).register(context: context, providers: providers)
-
-                  child_block.node.add_styles(target.class)
-                  child_block.node.add_props_from_block(target, context: context)
-                  child_block.node.meta.publisher.add(target)
+                  child_block = NodeMounter.new(node, child_block_klass, [stack], previous_providers: providers).mount(context: context, providers: providers)
 
+                  UpdateEntry.new(child_block, block, target).register(context: context, providers: providers)
+                  
                   meta.children!.insert(index, child_block)
 
                   child_block.public_send(:before_updated) if child_block.respond_to?(:before_updated)
@@ -66,21 +67,21 @@ module Hokusai
                 end
 
                 if child.has_else_condition? && !child.else_condition_active?
-                  portal = Node.new(child, Node.new(child))
+                  portal = Node.new(child.else_ast, Node.new(child))
                   else_child_block_klass = target.class.use(child.else_ast.type)
-                  node = else_child_block_klass.compile(child.else_ast.type, portal)
 
+                  node = else_child_block_klass.compile(child.else_ast.type, portal)
+                  node.add_styles(utarget.class)
+                  node.add_props_from_block(utarget, context: context)
+                  node.meta.publisher.add(utarget)
+                  
                   stack = []
                   child.else_ast.children.each_with_index do |ast, ast_index|
-                    stack << MountEntry.new(ast_index, ast, ublock, uparent, utarget)
+                    stack << MountEntry.new(ast_index, ast, ublock, uparent, utarget, providers: providers)
                   end
 
-                  child_block = NodeMounter.new(node, else_child_block_klass, [stack]).mount(context: context, providers: providers)
+                  child_block = NodeMounter.new(node, else_child_block_klass, [stack], previous_providers: providers).mount(context: context, providers: providers)
                   UpdateEntry.new(child_block, block, utarget).register(context: context, providers: providers)
-                  
-                  child_block.node.add_styles(utarget.class)
-                  child_block.node.add_props_from_block(utarget, context: context)
-                  child_block.node.meta.publisher.add(utarget)
                   meta.children!.insert(index, child_block)
 
                   child_block.public_send(:before_updated) if child_block.respond_to?(:before_updated)

data/ui/src/hokusai/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "random/formatter"
+require "securerandom"
 require "forwardable"
 require_relative "./node_mounter"
 require_relative "./meta"
@@ -21,7 +21,7 @@ module Hokusai
     def initialize(ast, portal = nil)
       @ast = ast
       @portal = portal
-      @uuid = Random.hex(6).freeze
+      @uuid = SecureRandom.hex(6).freeze
       @meta = Meta.new
     end
 

data/ui/src/hokusai/node_mounter.rb

@@ -7,8 +7,8 @@ module Hokusai
     attr_accessor :primary_stack, :secondary_stack
     attr_reader :root
 
-    def initialize(node, klass, secondary_stack = [], previous_target = nil)
-      @root = klass.new(node: node)
+    def initialize(node, klass, secondary_stack = [], previous_target = nil, previous_providers: {})
+      @root = klass.new(node: node, providers: previous_providers)
 
       raise Hokusai::Error.new("Root #{klass} doesn't have a node.  Did you remember to call `super`?") if @root.node.nil?
 
@@ -106,7 +106,6 @@ module Hokusai
         end
       end
 
-      root.public_send(:on_mounted) if root.respond_to?(:on_mounted)
       root
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - skinnyjames
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-25 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -197,6 +197,7 @@ files:
 - ui/spec/hokusai/automation/keys_transcoder_spec.rb
 - ui/spec/hokusai/automation/selector_spec.rb
 - ui/spec/hokusai/block_spec.rb
+- ui/spec/hokusai/diff_spec.rb
 - ui/spec/hokusai/directives_spec.rb
 - ui/spec/hokusai/e2e/client_spec.rb
 - ui/spec/hokusai/e2e/meta_spec.rb