voxgig_struct 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac352065c6d43bd84bf62fd687157226920a7dcece0c2671af82e79bed18e44
-  data.tar.gz: 46376fbb7414d3fc9d98ca4717f2c698cf7657da635e58d5178e00199769a215
+  metadata.gz: ff9e0e4d399722d0f1b625bc1c7ddc310a18db4affcdb6bc119fb300b30eae27
+  data.tar.gz: a51b33ce2ccd9f77a06092095017dc4f7aefb0be8e5a5981ab9a245d971913c9
 SHA512:
-  metadata.gz: 3fadf7a2e1450899adee35501d6d75b51b1d4d33439d762e019d4f05a2e6e3595ed0980d80a69305d434f7ead1ed754dff2055aaa59cc24e17efe08df1506ec4
-  data.tar.gz: 27c70e26883dbe8efc183bf018dc533875b4a1cc48d0c7ba4a662e9d907e782b795d27e968586fa791f3505d9c7b225551dfcaa2e523fc6c976d31077c03be92
+  metadata.gz: 81946c4f83d01daf2a0705961cce4afcd74cea7ac7d02568bb2cd5ffe2ece3ed5f21e1182b65fe5e8eb08e2ad1ab429aa1fd11e1c42a6897060d7af683db3a2e
+  data.tar.gz: 3fea471cd507d9e78623301686f5dd29fdc9300675ea4a02b7adf60fe66a0d869e7e2053ac39813832a87a6313b4c29186ba2c521cdae387f9ab441893402fe5

data/README.md

@@ -468,7 +468,7 @@ VoxgigStruct.transform(
 )
 # { 'x' => { 'y' => [{ 'q' => 13, 'r' => 13, 'p' => 1 }, { 'q' => 23, 'r' => 23, 'p' => 1 }] } }
 ```
-<!-- => {"x": {"y": [{"q": 13, "r": 13, "p": 1}, {"q": 23, "r": 23, "p": 1}]}} -->
+<!-- => {"x": {"y": [{"p": 1, "q": 13, "r": 13}, {"p": 1, "q": 23, "r": 23}]}} -->
 
 Putting a command in **key** position (or, for `$APPLY`, directly under a
 map) is an error — commands must be list values:
@@ -490,7 +490,7 @@ VoxgigStruct.validate(
 # { 'name' => 'Ada', 'age' => 36 }
 ```
 
-<!-- => {"name": "Ada", "age": 36} -->
+<!-- => {"age": 36, "name": "Ada"} -->
 
 <!-- example: select#query -->
 ```ruby
@@ -502,7 +502,7 @@ VoxgigStruct.select(
 # [{ 'name' => 'Alice', 'age' => 30, '$KEY' => 'a' }]
 ```
 
-<!-- => [{"name": "Alice", "age": 30, "$KEY": "a"}] -->
+<!-- => [{"$KEY": "a", "age": 30, "name": "Alice"}] -->
 
 ### Builders
 
@@ -519,7 +519,7 @@ VoxgigStruct.jt(1, 2, 3)          # [1, 2, 3]
 ### `Injection` class
 
 Full implementation with `descend`, `child`, `setval` instance
-methods.  Used internally by `inject`/`transform`/`validate`; you
+methods. Used internally by `inject`/`transform`/`validate`; you
 need it when writing custom injectors.
 
 ### Injection helpers
@@ -603,7 +603,7 @@ Ruby has `nil`.  The port distinguishes:
 ### Method naming
 
 Ruby method names match canonical lowercase (`getpath`, `setpath`,
-`getprop`), not Ruby's idiomatic snake_case.  Parity beats style.
+`getprop`), not Ruby's idiomatic snake_case. Parity beats style.
 
 ### Walk-based merge
 
@@ -640,7 +640,7 @@ portable to the Go / Rust / C / Lua / Zig ports.
 ### Sharp edges
 
 - **Catastrophic backtracking.** Onigmo has internal mitigations for
-  some classic ReDoS shapes — `^(a+)+$` against 22 a's plus `!` runs
+  some classic ReDoS shapes — `^(a+)+$` against 22 repetitions of `a` plus `!` runs
   in microseconds here. Larger inputs or different shapes can still
   blow up; the safe rule is to stay inside the RE2 subset and avoid
   nested quantifiers.

data/voxgig_struct.rb

@@ -5,8 +5,11 @@ module VoxgigStruct
   # --- Debug Logging Configuration ---
   DEBUG = false
 
-  def self.log(msg)
-    puts "[DEBUG] #{msg}" if DEBUG
+  # Lazy: the message block is only evaluated when DEBUG is on, so hot paths
+  # never pay to build (and `.inspect`-serialise whole nodes into) a debug
+  # string that would just be discarded.
+  def self.log
+    puts "[DEBUG] #{yield}" if DEBUG
   end
 
   # --- Helper to convert internal undefined marker to Ruby nil ---
@@ -202,34 +205,34 @@ module VoxgigStruct
   # --- Internal getprop ---
   # Returns the value if found; otherwise returns alt (default is UNDEF)
   def self._getprop(val, key, alt = UNDEF)
-    log("(_getprop) called with val=#{val.inspect} and key=#{key.inspect}")
+    log { "(_getprop) called with val=#{val.inspect} and key=#{key.inspect}" }
     return alt if val.nil? || key.nil?
 
     if islist(val)
       key = key.to_i if key.to_s =~ /\A\d+\z/
       unless key.is_a?(Numeric) && key >= 0 && key < val.size
-        log("(_getprop) index #{key.inspect} out of bounds; returning alt")
+        log { "(_getprop) index #{key.inspect} out of bounds; returning alt" }
         return alt
       end
       result = val[key]
-      log("(_getprop) returning #{result.inspect} from array for key #{key}")
+      log { "(_getprop) returning #{result.inspect} from array for key #{key}" }
       result
     elsif ismap(val)
       key_str = key.to_s
       if val.key?(key_str)
         result = val[key_str]
-        log("(_getprop) found key #{key_str.inspect} in hash, returning #{result.inspect}")
+        log { "(_getprop) found key #{key_str.inspect} in hash, returning #{result.inspect}" }
         result
       elsif key.is_a?(String) && val.key?(key.to_sym)
         result = val[key.to_sym]
-        log("(_getprop) found symbol key #{key.to_sym.inspect} in hash, returning #{result.inspect}")
+        log { "(_getprop) found symbol key #{key.to_sym.inspect} in hash, returning #{result.inspect}" }
         result
       else
-        log("(_getprop) key #{key.inspect} not found; returning alt")
+        log { "(_getprop) key #{key.inspect} not found; returning alt" }
         alt
       end
     else
-      log('(_getprop) value is not a node; returning alt')
+      log { '(_getprop) value is not a node; returning alt' }
       alt
     end
   end
@@ -280,7 +283,7 @@ module VoxgigStruct
   end
 
   def self.setprop(parent, key, val = :no_val_provided)
-    log(">>> setprop called with parent=#{parent.inspect}, key=#{key.inspect}, val=#{val.inspect}")
+    log { ">>> setprop called with parent=#{parent.inspect}, key=#{key.inspect}, val=#{val.inspect}" }
     return parent unless iskey(key)
 
     if ismap(parent)
@@ -305,7 +308,7 @@ module VoxgigStruct
         parent.unshift(val)
       end
     end
-    log("<<< setprop result: #{parent.inspect}")
+    log { "<<< setprop result: #{parent.inspect}" }
     parent
   end
 
@@ -942,8 +945,8 @@ module VoxgigStruct
             part = stringify(getpath(inj_meta, part[6..-2]))
           end
 
-          # $$ escapes $
-          part = part.gsub('$$', '$') if part.is_a?(String)
+          # $$ escapes $ (skip the gsub allocation for the common no-`$$` part)
+          part = part.gsub('$$', '$') if part.is_a?(String) && part.include?('$$')
 
           if part == S_MT
             ascends = 0
@@ -1789,8 +1792,21 @@ module VoxgigStruct
         setprop(parent, n[0], clone(childtm))
       end
       parent.slice!(inj.dparent.length..-1) if parent.length > inj.dparent.length
-      inj.keyI = 0
-      return getprop(inj.dparent, 0)
+
+      # NOTE: modifying inj! This extends the child value loop in inject
+      # to cover every cloned child.
+      (size(keys)...size(parent)).each do |ckeyI|
+        keys << strkey(ckeyI)
+      end
+
+      # Restart the child value loop at the first element (the loop
+      # increments keyI on resume) so that the first element is also
+      # validated against the child template.
+      inj.keyI = -1
+
+      # SKIP leaves the cloned child template in place at the first
+      # element so the resumed loop can validate it.
+      return SKIP
     end
 
     nil
@@ -1920,7 +1936,10 @@ module VoxgigStruct
       pkeys = keysof(pval)
 
       if pkeys.length.positive? && getprop(pval, '`$OPEN`') != true
-        badkeys = ckeys.reject { |ck| haskey(pval, ck) }
+        # Literal presence: the shape DECLARES ck even when its value is nil.
+        # Canonical uses `NONE === _lookup`; `haskey` is Group A (value-based)
+        # and would drop records with a nil field from an open ($AND) select.
+        badkeys = ckeys.reject { |ck| pval.is_a?(Hash) && pval.key?(strkey(ck)) }
         if badkeys.length.positive?
           inj.errs << "Unexpected keys at field #{pathify(inj.path, 1)}#{S_VIZ}#{join(badkeys, ', ')}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voxgig_struct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Voxgig