homura-runtime 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d8286719ce164088136af4d1caf0476c026d4ec2e42b98b08db8c84df6766d
-  data.tar.gz: 849f3bb4ae14131b950de3a89efff6032a4204e9878a19c84cfe9dcdfa618e8b
+  metadata.gz: aae4102ce898507966e1a993b16033cf74ede5f2543d17e56d552c6b3ecfabaf
+  data.tar.gz: 16b3be88c09f2189193da02cde5904a18749a74edf80e38927a2e47329ec06a8
 SHA512:
-  metadata.gz: c692cab5b2375646806e28b72b2e3c82da48563dcfc6a9074b8a8f3d9a756a92caee4ce100eee22bfaf81d00a459b3b85541176565fc1c3de5545f5c08b5216b
-  data.tar.gz: 0eda9cfebebb75b1efd6764d6be2b27710769e30a215e9c9cb5b9d635534afbf685cc8aeac632ad09378ecf106768d9b395093f4055c2293179b81817484f8a6
+  metadata.gz: 57f457bf20205a3bd68d81d5ad616b971892c513023d61dd9b56f575bc0cf70063b9753810abb1163084ebd48d7ae8439bcfd5c72a53e3dd25bdc3f98148b796
+  data.tar.gz: 6c69fb69b6c79a3309a9e5796534023ee47066027a97c809034615635b1df49e284ee0c010fce48059f062d43ec94e12f01ace5b39525b5f6e7d64940a4affa2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.6 (2026-04-23)
+
+- Teach `cloudflare-workers-build --standalone --with-db` to add the packaged
+  `sequel-d1` gem `vendor/` directory to the Opal load path before the gem's
+  `lib/`, so `require 'sequel'` resolves to the bundled Opal-compatible Sequel
+  subset instead of the CRuby gem.
+
 ## 0.1.5 (2026-04-23)
 
 - Make `auto-await` emit rewritten files for existing hand-written `.__await__`

data/bin/cloudflare-workers-build

@@ -121,24 +121,7 @@ def homura_vendor_from_gemfile(project_root)
 end
 
 def run_opal_standalone!(root, opal_input, opal_output, with_db:)
-  load_paths = []
-  hv = homura_vendor_from_gemfile(root)
-  load_paths << hv.to_s if hv
-  runtime_name = CloudflareWorkers::BuildSupport::RUNTIME_GEM_NAME
-  sinatra_name = CloudflareWorkers::BuildSupport::SINATRA_GEM_NAME
-
-  load_paths += ['build/auto_await/app', 'app']
-  [
-    CloudflareWorkersBuild.gem_lib(runtime_name),
-    CloudflareWorkersBuild.gem_vendor(runtime_name),
-    CloudflareWorkersBuild.gem_lib(sinatra_name),
-    CloudflareWorkersBuild.gem_vendor(sinatra_name)
-  ].compact.each do |path|
-    load_paths << path
-  end
-  load_paths << CloudflareWorkersBuild.gem_lib('sequel-d1') if with_db
-  load_paths << 'vendor' if root.join('vendor').directory?
-  load_paths << 'build'
+  load_paths = CloudflareWorkers::BuildSupport.standalone_load_paths(root, with_db: with_db)
 
   argv = ['bundle', 'exec', 'opal', '-c', '-E', '--esm', '--no-source-map']
   load_paths.each { |p| argv.push('-I', p) }

data/lib/cloudflare_workers/build_support.rb

@@ -7,6 +7,7 @@ module CloudflareWorkers
   module BuildSupport
     RUNTIME_GEM_NAME = 'homura-runtime'
     SINATRA_GEM_NAME = 'sinatra-homura'
+    SEQUEL_D1_GEM_NAME = 'sequel-d1'
 
     class << self
       def loaded_spec(name, loaded_specs: Gem.loaded_specs)
@@ -53,6 +54,37 @@ module CloudflareWorkers
         target_dir
       end
 
+      def standalone_load_paths(project_root, with_db:, loaded_specs: Gem.loaded_specs)
+        root = Pathname(project_root)
+        load_paths = []
+
+        hv = vendor_from_gemfile(root)
+        load_paths << hv.to_s if hv
+
+        load_paths += ['build/auto_await/app', 'app']
+        [
+          gem_lib(RUNTIME_GEM_NAME, loaded_specs: loaded_specs),
+          gem_vendor(RUNTIME_GEM_NAME, loaded_specs: loaded_specs),
+          gem_lib(SINATRA_GEM_NAME, loaded_specs: loaded_specs),
+          gem_vendor(SINATRA_GEM_NAME, loaded_specs: loaded_specs)
+        ].compact.each do |path|
+          load_paths << path
+        end
+
+        if with_db
+          [
+            gem_vendor(SEQUEL_D1_GEM_NAME, loaded_specs: loaded_specs),
+            gem_lib(SEQUEL_D1_GEM_NAME, loaded_specs: loaded_specs)
+          ].compact.each do |path|
+            load_paths << path
+          end
+        end
+
+        load_paths << 'vendor' if root.join('vendor').directory?
+        load_paths << 'build'
+        load_paths.uniq
+      end
+
       def standalone_namespace(project_root, suffix)
         base = Pathname(project_root).basename.to_s
         parts = base.split(/[^A-Za-z0-9]+/).reject(&:empty?)

data/lib/cloudflare_workers/version.rb

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

data/lib/cloudflare_workers.rb

@@ -20,9 +20,10 @@
 #      style entry point and never sees a Cloudflare-specific symbol.
 #
 #   3. Cloudflare::D1Database / KVNamespace / R2Bucket — tiny Ruby wrappers
-#      around the JS bindings. They expose the binding methods as regular
-#      Ruby method calls returning native JS Promises, which the user
-#      routes can `.__await__` inside a `# await: true` block.
+#      around the JS bindings. At the raw runtime layer they still return
+#      Promises, but homura's build-time auto-await pass rewrites the
+#      common Sinatra-facing call sites (`db.execute`, `kv.get`, etc.) so
+#      app code usually stays sync-shaped.
 #
 # Note: Opal Strings are immutable (they map to JS Strings), so this file
 # uses reassignment (`@buffer = @buffer + str`) instead of `<<` mutation.
@@ -209,8 +210,10 @@ module Rack
 
           # Expose D1 / KV / R2 bindings as plain Ruby wrapper objects.
           # The user Sinatra routes reach them via
-          # `env['cloudflare.DB']` / `.KV` / `.BUCKET`, call normal-looking
-          # Ruby methods on them, and `.__await__` the resulting JS Promise.
+          # `env['cloudflare.DB']` / `.KV` / `.BUCKET` and call ordinary
+          # Ruby methods on them. Under the hood those methods are async,
+          # but homura's auto-await build step inserts `.__await__` for the
+          # common binding/helper patterns so app source usually does not.
           js_db = `#{js_env} && #{js_env}.DB`
           js_kv = `#{js_env} && #{js_env}.KV`
           js_r2 = `#{js_env} && #{js_env}.BUCKET`
@@ -603,8 +606,10 @@ module Cloudflare
 
     # ---- sqlite3-ruby compatible high-level API ----------------------
 
-    # Execute a SQL statement with optional bind parameters and return
-    # all result rows as an Array of Hashes.
+    # Execute a SQL statement with optional bind parameters.
+    # Returns a JS Promise resolving to an Array of Hashes; the build-time
+    # auto-await pass rewrites the usual Sinatra call sites so app code can
+    # stay `db.execute(...)` instead of spelling `.__await__`.
     #
     #   db.execute("SELECT * FROM users")                           → Array<Hash>
     #   db.execute("SELECT * FROM users WHERE id = ?", [1])         → Array<Hash>
@@ -616,6 +621,7 @@ module Cloudflare
     end
 
     # Execute and return only the first row (or nil).
+    # Returns a JS Promise resolving to a Hash or nil.
     #
     #   db.get_first_row("SELECT * FROM users WHERE id = ?", [1])  → Hash or nil
     def get_first_row(sql, bind_params = [])
@@ -626,6 +632,7 @@ module Cloudflare
 
     # Execute a write statement (INSERT / UPDATE / DELETE) and return
     # a metadata Hash with `changes`, `last_row_id`, `duration`, etc.
+    # Returns a JS Promise resolving to that metadata Hash.
     #
     #   meta = db.execute_insert("INSERT INTO users (name) VALUES (?)", ["alice"])
     #   meta['last_row_id']  # → 7
@@ -636,7 +643,7 @@ module Cloudflare
     end
 
     # Execute one or more raw SQL statements separated by semicolons.
-    # Useful for schema migrations. Returns the D1 exec result.
+    # Useful for schema migrations. Returns the raw async D1 exec result.
     def execute_batch(sql)
       exec(sql)
     end
@@ -697,6 +704,7 @@ module Cloudflare
     end
 
     # KV#get returns a JS Promise resolving to a String or nil.
+    # In normal Sinatra app code, auto-await usually hides that Promise.
     def get(key)
       js_kv = @js
       err_cls = Cloudflare::KVError
@@ -705,7 +713,8 @@ module Cloudflare
 
     # Put a value. `expiration_ttl:` (seconds) maps to the Workers KV
     # `expirationTtl` option so callers can set TTLs without reaching
-    # for backticks. Returns a JS Promise.
+    # for backticks. Returns a JS Promise; common route/helper call sites
+    # are auto-awaited during the build.
     def put(key, value, expiration_ttl: nil)
       js_kv = @js
       err_cls = Cloudflare::KVError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Kazuhiro NISHIYAMA