homura-runtime 0.2.15 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694836eb27a5ada6280795e386907320274633bcc5d1c6c06c923946d6f25d4a
-  data.tar.gz: bfdf7f444a17af66deff9ebe693c1251c1a8215b0dc48bde5fd050afc0c21c7b
+  metadata.gz: 484afdeb8e2980e08e029bf515a07530b08296357eaa6bfbf255a721104358bf
+  data.tar.gz: 77bf0079ae55ecdbbe137d6b804d8501a90f66daa3859e22d9e9114fad582830
 SHA512:
-  metadata.gz: a9137328c2e78d8fd8911cf704f3fd2431d193a5ef798aa5f54eb8d8d10a9d40647df0eafcd53d26903ad6fbca18ddb27fc2ad14df44514aa5d29e8541da1e1b
-  data.tar.gz: 1ae649dca3329e6ba13d2690a989842388702d0ee2b8788ca4bcd38fdbc69e141a0dd62f0f3cc73d4141973a7945170d572a674d30b6d2b75efa00e351642c08
+  metadata.gz: 89a21e0c74732fa2b2467ccff72a3ca365c706d0928c9ffb3fc4e4f2b96ecf8688fc4bdbf3beda1e806122d8abca9053d787a528c48d13a3f709aeb8c57ab027
+  data.tar.gz: 79975dd3ce599d61824919d790ec05727603043887577ece2af6231136e320514837ca54e710095e4c8a3aadfe06fc9ebf97ae791da0255cf19feea6eef83803

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.2.17 (2026-04-27)
+
+- Rewrite class-variable references (`@@foo`) inside precompiled ERB
+  templates into explicit `class_variable_get` / `class_variable_set`
+  calls on the instance's class. Opal evaluates compiled template
+  bodies via `instance_exec` on a Sinatra instance whose `$$cvars`
+  slot is undefined at that runtime path, so the previous build emit
+  blew up with `TypeError: Cannot read properties of undefined (reading
+  '$$cvars')` whenever a template touched `<%= @@todos %>` or
+  `<% @@todos.each ... %>` directly. Templates can now use the
+  natural Sinatra style (`@@cvar` reads, `@@cvar = expr` and compound
+  `@@cvar op= expr` assignments) without route-level `@todos = @@todos`
+  shims. Fixes #28.
+
 ## 0.2.11 (2026-04-25)
 
 - Normalize bare JS `undefined` / `null` values to Ruby `nil` while converting

data/exe/compile-erb

@@ -54,7 +54,94 @@ module HomuraERB
 
   def normalize_fragment(fragment)
     return '__homura_template_yield__' if supported_yield_fragment?(fragment)
-    fragment
+    rewrite_class_variables(fragment)
+  end
+
+  # Opal compiles class-variable reads/writes (`@@foo`) into accessors
+  # bound to the lexically enclosing class, but precompiled ERB bodies
+  # are evaluated through `instance_exec` on a Sinatra instance whose
+  # `$$cvars` slot is undefined at that runtime path. The result is a
+  # `TypeError: Cannot read properties of undefined (reading '$$cvars')`
+  # the moment a template touches `<%= @@todos %>` directly — exactly
+  # the natural Sinatra style we want users to be able to keep writing.
+  #
+  # Rewrite both reads (`@@foo`) and writes (`@@foo = expr`) into
+  # explicit `class_variable_get` / `class_variable_set` calls on the
+  # instance's class so the same source compiles cleanly under Opal
+  # without requiring `@foo = @@foo` shims at the route layer.
+  #
+  # The rewrite is a deliberately small regex pass: ERB fragments are
+  # short, and class-variable tokens inside Ruby string literals or
+  # comments are vanishingly rare in real templates. Anything more
+  # ambitious would need a Ruby parser, which is overkill for the
+  # `@@ivar` shape we actually have to handle here.
+  CVAR_OP_ASSIGN_RE = /(?<![@\w])@@([A-Za-z_]\w*)\s*(\|\||&&|\+|-|\*|\/|%|\*\*|<<|>>|\||&|\^)=\s*([^;\n]+)/.freeze
+  CVAR_ASSIGN_RE = /(?<![@\w])@@([A-Za-z_]\w*)\s*=(?!=)\s*([^;\n]+)/.freeze
+  # Read pattern excludes `@@name` that appears on the left-hand side
+  # of an assignment (`@@name =`, `@@name +=`, `@@name ||=`, etc.) so
+  # the assignment passes still see the raw token to rewrite. The
+  # `=(?!=)` guard keeps `==` (comparison) treated as a read.
+  CVAR_READ_RE = %r{
+    (?<![@\w])@@([A-Za-z_]\w*)\b
+    (?!
+      \s*
+      (?:\|\||&&|\+|-|\*|/|%|\*\*|<<|>>|\||&|\^)?
+      =(?!=)
+    )
+  }x.freeze
+
+  CVAR_PLACEHOLDER_PREFIX = "\x01HOMURA_CVAR\x01".freeze
+  CVAR_PLACEHOLDER_SUFFIX = "\x01".freeze
+
+  def rewrite_class_variables(fragment)
+    return fragment unless fragment.include?('@@')
+
+    placeholders = []
+    record = lambda do |replacement|
+      placeholders << replacement
+      "#{CVAR_PLACEHOLDER_PREFIX}#{placeholders.length - 1}#{CVAR_PLACEHOLDER_SUFFIX}"
+    end
+
+    # Reads first: rewrite every `@@name` that is *not* the target of
+    # an assignment, including occurrences on the right-hand side of
+    # an assignment. Each match collapses into a sentinel so the
+    # later assignment passes see the original `@@name = ...` shape
+    # (without their RHS reads being clobbered) and so the final
+    # output never re-enters this same rewrite loop.
+    work = fragment.gsub(CVAR_READ_RE) do
+      name = Regexp.last_match(1)
+      record.call("self.class.class_variable_get(:@@#{name})")
+    end
+
+    work = work.gsub(CVAR_OP_ASSIGN_RE) do
+      name = Regexp.last_match(1)
+      op = Regexp.last_match(2)
+      value = Regexp.last_match(3)
+      replacement =
+        case op
+        when '||'
+          "self.class.class_variable_set(:@@#{name}, (self.class.class_variable_defined?(:@@#{name}) ? self.class.class_variable_get(:@@#{name}) : nil) || (#{value}))"
+        when '&&'
+          "self.class.class_variable_set(:@@#{name}, (self.class.class_variable_defined?(:@@#{name}) ? self.class.class_variable_get(:@@#{name}) : nil) && (#{value}))"
+        else
+          "self.class.class_variable_set(:@@#{name}, self.class.class_variable_get(:@@#{name}) #{op} (#{value}))"
+        end
+      record.call(replacement)
+    end
+
+    work = work.gsub(CVAR_ASSIGN_RE) do
+      name = Regexp.last_match(1)
+      value = Regexp.last_match(2)
+      record.call("self.class.class_variable_set(:@@#{name}, (#{value}))")
+    end
+
+    placeholder_re = /#{Regexp.escape(CVAR_PLACEHOLDER_PREFIX)}(\d+)#{Regexp.escape(CVAR_PLACEHOLDER_SUFFIX)}/
+    loop do
+      replaced = work.gsub(placeholder_re) { placeholders[Regexp.last_match(1).to_i] }
+      break if replaced == work
+      work = replaced
+    end
+    work
   end
 
   def validate_code_fragment!(fragment)

data/lib/cloudflare_workers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudflareWorkers
-  VERSION = '0.2.15'
+  VERSION = '0.2.17'
 end

data/lib/cloudflare_workers.rb

@@ -685,7 +685,19 @@ module Cloudflare
     # Flatten common keys from `result['meta']` to the top of the hash so
     # callers can write `meta['last_row_id']` without descending into the
     # nested D1 metadata object. Preserves the original shape unchanged.
+    #
+    # The gem's own Ruby sources are NOT processed by the build's
+    # auto-await pass — only user app code is. So when `execute_insert`
+    # passes the result of `stmt.run` here, `result` may still be a JS
+    # Promise. Await it explicitly so the flatten branch actually runs;
+    # otherwise the early `unless result.is_a?(Hash)` would short-circuit
+    # and `meta['last_row_id']` would come back as nil at the call site
+    # (the caller's auto-await resolves the Promise *after* this method
+    # returns).
     def self.flatten_meta(result)
+      if defined?(::Cloudflare) && ::Cloudflare.js_promise?(result)
+        result = result.__await__
+      end
       return result unless result.is_a?(Hash)
       nested = result['meta']
       return result unless nested.is_a?(Hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.17
 platform: ruby
 authors:
 - Kazuhiro Homma