funicular 0.2.1 → 0.4.0

data/lib/funicular/compiler.rb

@@ -5,11 +5,11 @@ require "shellwords"
 module Funicular
   class Compiler
     class NodeNotFoundError < StandardError; end
-    class PicorbcMissingError < StandardError; end
+    class MrbcMissingError < StandardError; end
 
-    # picorbc.js + picorbc.wasm bundled into the gem at build time by `rake copy_wasm`.
-    PICORBC_DIR = File.expand_path("vendor/picorbc", __dir__)
-    PICORBC_JS  = File.join(PICORBC_DIR, "picorbc.js")
+    # mrbc.js + mrbc.wasm bundled into the gem at build time by `rake copy_wasm`.
+    MRBC_DIR = File.expand_path("vendor/mrbc", __dir__)
+    MRBC_JS  = File.join(MRBC_DIR, "mrbc.js")
 
     # Ordered list of application source files under app/funicular/.
     # Order matters: models -> stores -> components -> initializer, so that
@@ -36,19 +36,19 @@ module Funicular
     end
 
     def compile
-      check_picorbc_availability!
+      check_mrbc_availability!
       gather_source_files
       compile_to_mrb
     end
 
     private
 
-    def check_picorbc_availability!
-      unless File.exist?(PICORBC_JS)
-        raise PicorbcMissingError, <<~ERROR
-          Vendored picorbc not found at #{PICORBC_JS}.
+    def check_mrbc_availability!
+      unless File.exist?(MRBC_JS)
+        raise MrbcMissingError, <<~ERROR
+          Vendored mrbc not found at #{MRBC_JS}.
 
-          The funicular gem ships picorbc.js + picorbc.wasm inside the gem
+          The funicular gem ships mrbc.js + mrbc.wasm inside the gem
           package. This file is missing, which likely means the gem was not
           installed correctly. Try reinstalling:
 
@@ -61,7 +61,7 @@ module Funicular
         raise NodeNotFoundError, <<~ERROR
           Node.js executable not found.
 
-          Funicular compiles Ruby to .mrb using a WebAssembly build of picorbc
+          Funicular compiles Ruby to .mrb using a WebAssembly build of mrbc
           which is run via Node.js. Please install Node.js and ensure `node`
           is on your PATH (or set the NODE environment variable).
         ERROR
@@ -110,7 +110,7 @@ module Funicular
     def compile_to_mrb
       all_files = @source_files.dup
       all_files << @env_file if @env_file
-      argv = [node_command, PICORBC_JS]
+      argv = [node_command, MRBC_JS]
       argv << "-g" if debug_mode
       argv += ["-o", output_file.to_s]
       argv += all_files.map(&:to_s)
@@ -128,7 +128,7 @@ module Funicular
       result = system(*argv)
 
       unless result
-        raise "Failed to compile with picorbc. Command: #{Shellwords.join(argv)}"
+        raise "Failed to compile with mrbc. Command: #{Shellwords.join(argv)}"
       end
 
       log "Successfully compiled to #{output_file}"

data/lib/funicular/helpers/picoruby_helper.rb

@@ -11,6 +11,11 @@ module Funicular
         local_dist:  "/picoruby/dist/init.iife.js"
       }.freeze
 
+      LOCAL_VARIANTS = {
+        local_debug: "debug",
+        local_dist:  "dist"
+      }.freeze
+
       # Minimal CSS the gem ships for class names it emits itself (e.g.
       # FormBuilder error states). Read once; see assets/funicular.css.
       BASE_CSS_PATH = File.expand_path("../assets/funicular.css", __dir__)
@@ -101,12 +106,30 @@ module Funicular
           end
           format(CDN_URL_TEMPLATE, version: version)
         elsif (path = LOCAL_PATHS[source])
-          path
+          local_picoruby_src(path, source)
         else
           raise ArgumentError,
                 "Unknown picoruby source: #{source.inspect}. Expected one of #{Funicular::Configuration::SOURCES.inspect}"
         end
       end
+
+      def local_picoruby_src(path, source)
+        cache_key = local_picoruby_cache_key(source)
+        return path if cache_key.nil?
+
+        "#{path}?v=#{cache_key}"
+      end
+
+      def local_picoruby_cache_key(source)
+        variant = LOCAL_VARIANTS.fetch(source)
+        version = Funicular.vendored_wasm_version
+        wasm = File.join(Funicular::VENDOR_PICORUBY_DIR, variant, "picoruby.wasm")
+        mtime = File.mtime(wasm).to_i
+
+        [version || Funicular::VERSION, mtime].join("-")
+      rescue Errno::ENOENT
+        Funicular.vendored_wasm_version || Funicular::VERSION
+      end
     end
   end
 end

data/lib/funicular/ssr/runtime.rb

@@ -21,12 +21,15 @@ module Funicular
       # few real dependencies exist (vdom before html_serializer; styles and
       # vdom before component; component before error_boundary).
       LOAD_ORDER = %w[
+        0_tags
         environment_inquirer
         vdom
         html_serializer
         differ
         patcher
         styles
+        runtime
+        view_context
         debug
         component
         error_boundary

data/lib/funicular/ssr.rb

@@ -30,8 +30,9 @@ module Funicular
       return { html: "", state: {}, component: nil } unless component_class
 
       instance = component_class.new(symbolize_keys(params).merge(props))
+      instance.runtime = Funicular::Runtime.new(router)
       instance.seed_state(state)
-      html = Funicular::VDOM::HTMLSerializer.serialize(instance.build_vdom)
+      html = Funicular::VDOM::HTMLSerializer.serialize(instance.build_vdom, instance.runtime)
 
       { html: html, state: state, component: component_class }
     end

data/lib/funicular/testing/node_runner.rb

@@ -117,9 +117,9 @@ module Funicular
 
       def default_runtime_dir
         ENV["FUNICULAR_TEST_PICORUBY_DIR"] ||
-          existing_path(File.join(gem_root, "lib", "funicular", "vendor", "picoruby-test-node")) ||
           existing_path(File.expand_path("../picoruby/build/picoruby-wasm-test/bin", gem_root)) ||
           existing_path(File.expand_path("../../build/picoruby-wasm-test/bin", gem_root)) ||
+          existing_path(File.join(gem_root, "lib", "funicular", "vendor", "picoruby-test-node")) ||
           File.join(gem_root, "lib", "funicular", "vendor", "picoruby-test-node")
       end
 

data/lib/funicular/vendor/mrbc/VERSION

@@ -0,0 +1 @@
+4.0.2