isomorfeus-preact 10.9.0 → 22.9.0.rc2

data/lib/browser/window.rb

@@ -0,0 +1,58 @@
+module Browser
+  module Window
+    extend DelegateNative
+    extend EventTarget
+
+    @native = `window`
+
+    module_function
+
+    if `#@native.requestAnimationFrame !== undefined`
+      # Add the given block to the current iteration of the event loop. If this
+      # is called from another `animation_frame` call, the block is run in the
+      # following iteration of the event loop.
+      def animation_frame &block
+        `requestAnimationFrame(function(now) { #{block.call `now`} })`
+        self
+      end
+    else
+      def animation_frame &block
+        after(0, &block)
+        self
+      end
+    end
+
+    # Run the given block every `duration` seconds
+    #
+    # @param duration [Numeric] the number of seconds between runs
+    def set_interval duration, &block
+      `setInterval(function() { #{block.call} }, duration)`
+    end
+
+    def set_timeout duration, &block
+      `setTimeout(function() { #{block.call} }, duration)`
+    end
+
+    # return [History] the browser's History object
+    def history
+      Browser::History.new(`window.history`)
+    end
+
+    # @return [Location] the browser's Location object
+    def location
+      Browser::Location.new(`window.location`)
+    end
+
+    # Scroll to the specified (x,y) coordinates
+    def scroll x, y
+      `window.scrollTo(x, y)`
+    end
+  end
+
+  module_function
+
+  # return [Window] the browser's Window object
+  def window
+    Window
+  end
+end

data/lib/data_uri/open_uri.rb

@@ -0,0 +1,18 @@
+module URI
+  class Data
+    def open
+      io = StringIO.new(data)
+      OpenURI::Meta.init(io)
+      io.meta_add_field('content-type', content_type)
+      if block_given?
+        begin
+          yield io
+        ensure
+          io.close
+        end
+      else
+        io
+      end
+    end
+  end
+end

data/lib/data_uri/uri.rb

@@ -0,0 +1,61 @@
+module URI
+  class Data < Generic
+    COMPONENT = [:scheme, :opaque]
+    MIME_TYPE_RE = %r{^([-\w.+]+/[-\w.+]*)}
+    MIME_PARAM_RE = /^;([-\w.+]+)=([^;,]+)/
+
+    attr_reader :content_type, :data
+
+    def initialize(*args)
+      if args.length == 1
+        uri = args.first.to_s
+        unless uri.match(/^data:/)
+          raise URI::InvalidURIError.new('Invalid Data URI: ' + args.first.inspect)
+        end
+        @scheme = 'data'
+        @opaque = uri[5 .. -1]
+      else
+        super(*args)
+      end
+      @data = @opaque
+      if md = MIME_TYPE_RE.match(@data)
+        @content_type = md[1]
+        @data = @data[@content_type.length .. -1]
+      end
+      @content_type ||= 'text/plain'
+      @mime_params = {}
+      while md = MIME_PARAM_RE.match(@data)
+        @mime_params[md[1]] = md[2]
+        @data = @data[md[0].length .. -1]
+      end
+      if base64 = /^;base64/.match(@data)
+        @data = @data[7 .. -1]
+      end
+      unless /^,/.match(@data)
+        raise URI::InvalidURIError.new('Invalid data URI')
+      end
+      @data = @data[1 .. -1]
+      @data = base64 ? Base64.decode64(@data) : URI.decode(@data)
+      if @data.respond_to?(:force_encoding) && charset = @mime_params['charset']
+        @data.force_encoding(charset)
+      end
+    end
+
+    def self.build(arg)
+      data = nil
+      content_type = nil
+      case arg
+        when IO
+          data = arg
+        when Hash
+          data = arg[:data]
+          content_type = arg[:content_type]
+      end
+      raise 'Invalid build argument: ' + arg.inspect unless data
+      if !content_type && data.respond_to?(:content_type)
+        content_type = data.content_type
+      end
+      new('data', nil, nil, nil, nil, nil, "#{content_type};base64,#{Base64.encode64(data.read).chop}", nil, nil)
+    end
+  end
+end

data/lib/data_uri.rb

@@ -0,0 +1,4 @@
+require 'uri'
+require 'base64'
+require 'stringio'
+require 'data_uri/uri'

data/lib/isomorfeus/preact/config.rb

@@ -2,13 +2,13 @@ module Isomorfeus
   if RUBY_ENGINE == 'opal'
     class << self
       attr_accessor :browser_history
-      attr_accessor :current_user_sid
+      attr_accessor :browser_location
+      attr_accessor :current_user_sid_s
       attr_accessor :initial_state_fetched
-      attr_accessor :top_component
       attr_accessor :ssr_response_status
+      attr_accessor :top_component
       attr_reader :initialized
       attr_reader :env
-      attr_accessor :zeitwerk
 
       def init
         return if initialized
@@ -23,74 +23,63 @@ module Isomorfeus
         execute_init_classes
       end
 
-      def add_client_init_class_name(init_class_name)
-        client_init_class_names << init_class_name
-      end
-
-      def add_client_init_after_store_class_name(init_class_name)
-        client_init_after_store_class_names << init_class_name
+      def start_app!
+        Isomorfeus.zeitwerk.setup
+        Isomorfeus::TopLevel.mount!
       end
 
-      def add_client_option(key, value = nil)
-        self.class.attr_accessor(key)
-        self.send("#{key}=", value)
+      def force_render
+        root_element = `document.querySelector('div[data-iso-root]')`
+        Preact.unmount_component_at_node(root_element)
+        Isomorfeus::TopLevel.do_the_mount!(init: false)
+        nil
+      rescue Exception => e
+        `console.error("force_render failed'! Error: " + #{e.message} + "! Reloading page.")`
+        `location.reload()`
       end
+    end
+  else # RUBY_ENGINE
+    class << self
+      attr_reader :component_cache_init_block
+      attr_accessor :server_side_rendering
+      attr_accessor :ssr_hot_asset_url
 
-      def execute_init_classes
-        client_init_class_names.each do |constant|
-          constant.constantize.send(:init)
-        end
+      def ssr_response_status
+        Thread.current[:@_isomorfeus_preact_ssr_response_status]
       end
 
-      def execute_init_after_store_classes
-        client_init_after_store_class_names.each do |constant_name|
-          constant_name.constantize.send(:init)
-        end
+      def ssr_response_status=(s)
+        Thread.current[:@_isomorfeus_preact_ssr_response_status] = s
       end
 
-      # server side env is set in isomorfeus-asset-manager
-      def env=(env_string)
-        @env = env_string ? env_string : 'development'
-        @development = (@env == 'development') ? true : false
-        @production = (@env == 'production') ? true : false
-        @test = (@env == 'test') ? true : false
+      def init
+        return if Thread.current[:@_isomorfeus_initialized]
+        Thread.current[:@_isomorfeus_initialized] = true
+        Isomorfeus.init_store
+        execute_init_classes
       end
 
-      def development?
-        @development
+      def force_init!
+        Thread.current[:@_isomorfeus_initialized] = true
+        Isomorfeus.force_init_store!
+        execute_init_classes
       end
 
-      def production?
-        @production
+      def browser_history
+        @_isomorfeus_browser_history
       end
 
-      def test?
-        @test
+      def browser_history=(h)
+        @_isomorfeus_browser_history = h
       end
 
-      def start_app!
-        Isomorfeus.zeitwerk.setup
-        Isomorfeus::TopLevel.mount! unless on_ssr?
+      def browser_location
+        Thread.current[:@_isomorfeus_browser_location]
       end
 
-      def force_render
-        `Opal.Preact.deep_force_update(#{Isomorfeus.top_component})`
-        nil
-      rescue Exception => e
-        `console.error("force_render failed'! Error: " + #{e.message} + "! Reloading page.")`
-        `location.reload()` if on_browser?
+      def browser_location=(l)
+        Thread.current[:@_isomorfeus_browser_location] = l
       end
-    end
-
-    self.add_client_option(:client_init_class_names, [])
-    self.add_client_option(:client_init_after_store_class_names, [])
-  else
-    class << self
-      attr_reader :component_cache_init_block
-      attr_accessor :server_side_rendering
-      attr_accessor :ssr_hot_asset_url
-      attr_accessor :zeitwerk
-      attr_accessor :zeitwerk_lock
 
       def component_cache_init(&block)
         @component_cache_init_block = block
@@ -114,7 +103,7 @@ module Isomorfeus
         end
       end
     end
-  end
+  end # RUBY_ENGINE
 
   class << self
     def raise_error(error: nil, error_class: nil, message: nil, stack: nil)
@@ -122,7 +111,6 @@ module Isomorfeus
 
       error_class = RuntimeError unless error_class
       execution_environment = if on_browser? then 'on Browser'
-                              elsif on_ssr? then 'in Server Side Rendering'
                               elsif on_server? then 'on Server'
                               else
                                 'on Client'

data/lib/isomorfeus/preact/imports.rb

@@ -1,24 +1,9 @@
 module Isomorfeus
-  module Preact
-    module Imports
-      def self.add
-        Isomorfeus.add_web_js_import('preact/debug') if Isomorfeus.development?
-        Isomorfeus.add_common_js_import('preact', 'Preact', '*')
-        Isomorfeus.add_common_js_import('preact/hooks', 'PreactHooks', '*')
-        Isomorfeus.add_common_js_import('wouter-preact', nil, ['Router', 'Link', 'Redirect', 'Route', 'Switch'])
-
-        Isomorfeus.add_ssr_js_import('preact-render-to-string', 'Preact', ['render'], nil, 'renderToString')
-        Isomorfeus.add_ssr_js_import('wouter-preact/static-location', 'staticLocationHook')
-
-        Isomorfeus.add_web_js_import('wouter-preact/use-location', 'locationHook')
-
-        if Dir.exist?(Isomorfeus.app_root)
-          if File.exist?(File.join(Isomorfeus.app_root, 'isomorfeus_loader.rb'))
-            Isomorfeus.add_common_ruby_import('isomorfeus_loader')
-            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/top_level')
-            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/render_core')
-            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/history')
-          end
+  module PreactImports
+    def self.add
+      if Dir.exist?(Isomorfeus.app_root)
+        if File.exist?(File.join(Isomorfeus.app_root, 'isomorfeus_loader.rb'))
+          Isomorfeus.add_web_ruby_import('isomorfeus_loader')
         end
       end
     end

data/lib/isomorfeus/preact/ssr.rb

@@ -0,0 +1,34 @@
+module Isomorfeus
+  class PreactSSR
+    def self.mount_component(component_name, props, session_id, location, locale = nil)
+      rendered_tree = new(component_name, props, session_id, location, locale).render
+      [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
+    end
+
+    def initialize(component_name, props, session_id, location, locale = nil)
+      @session_id = session_id
+      @component_name = component_name
+      @props = props
+      @location = location
+      @locale = locale
+    end
+
+    def render
+      Isomorfeus.browser_location = Browser::Location.new(@location)
+      Isomorfeus.current_locale = @locale
+      NanoCSS.instance = NanoCSS.new(given_renderer: NanoCSS.global_instance.renderer.deep_dup)
+      Isomorfeus.init_store
+      Isomorfeus.store.clear!
+      c = Isomorfeus.current_user
+      if c.respond_to?(:reload)
+        Thread.current[:isomorfeus_user] = LocalSystem.new
+        begin
+          c.reload
+        ensure
+          Thread.current[:isomorfeus_user] = c
+        end
+      end
+      Isomorfeus::TopLevel.render_component_to_string(@component_name, @props)
+    end
+  end
+end

data/lib/isomorfeus/preact/thread_local_component_cache.rb

@@ -1,17 +1,15 @@
 module Isomorfeus
-  module Preact
-    class ThreadLocalComponentCache
-      def initialize
-        Thread.current[:local_cache] = {} unless Thread.current.key?(:local_cache)
-      end
+  class ThreadLocalComponentCache
+    def initialize
+      Thread.current[:local_cache] = {} unless Thread.current.key?(:local_cache)
+    end
 
-      def fetch(key)
-        Thread.current[:local_cache][key]
-      end
+    def fetch(key)
+      Thread.current[:local_cache][key]
+    end
 
-      def store(key, rendered_tree, response_status, styles)
-        Thread.current[:local_cache][key] = [rendered_tree, response_status, styles]
-      end
+    def store(key, rendered_tree, response_status, styles)
+      Thread.current[:local_cache][key] = [rendered_tree, response_status, styles]
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

@@ -0,0 +1,5 @@
+module Isomorfeus
+  module Preact
+    VERSION = '22.9.0.rc2'
+  end
+end

data/lib/isomorfeus/preact/view_helper.rb

@@ -0,0 +1,72 @@
+module Preact
+  module ViewHelper
+    def self.included(base)
+      base.include Isomorfeus::AssetManager::ViewHelper
+    end
+
+    def cached_mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false, refresh: false)
+      key = "#{Isomorfeus.current_user}#{component_name}#{props}"
+      if !Isomorfeus.development? && !refresh
+        render_result, @_ssr_styles, status = component_cache.fetch(key)
+        Isomorfeus.ssr_response_status = status
+        return render_result if render_result
+      end
+      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr, use_ssr: use_ssr)
+      status = ssr_response_status
+      component_cache.store(key, render_result, ssr_styles, status) if status >= 200 && status < 300
+      render_result
+    end
+
+    def mount_component(component_name, props = {}, skip_ssr: false, use_ssr: false)
+      ssr_start_time = Time.now if Isomorfeus.development?
+      @ssr_styles = nil
+      render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
+      if !skip_ssr && (Isomorfeus.server_side_rendering || use_ssr)
+        location_host = props[:location_host] ? props[:location_host] : 'localhost'
+        location = "#{props[:location_scheme] || 'http:'}//#{location_host}#{props[:location]}"
+
+        rendered_tree, application_state, @_ssr_styles = Isomorfeus::PreactSSR.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, props[:locale])
+
+        render_result << " data-iso-hydrated='true'" if rendered_tree
+        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
+        end
+        render_result << " data-iso-nloc='#{props[:locale]}'>"
+        render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
+      else
+        if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+          render_result << " data-iso-usids=#{Oj.dump(Isomorfeus.current_user.sid.to_s, mode: :strict)}"
+        end
+        render_result << " data-iso-nloc='#{props[:locale]}'>"
+      end
+      render_result << '</div>'
+      if Isomorfeus.server_side_rendering && !skip_ssr
+        render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
+        puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
+      end
+      render_result
+    end
+
+    def ssr_response_status
+      Isomorfeus.ssr_response_status
+    end
+
+    def ssr_styles
+      @_ssr_styles || ''
+    end
+
+    private
+
+    def component_cache
+      @_component_cache ||= Isomorfeus.component_cache_init_block.call
+    end
+
+    def ssr_mod
+      @_ssr_mod ||= Opal.compile(File.read(File.expand_path(File.join(File.dirname(__FILE__), 'ssr.rb'))), { use_strict: true })
+    end
+
+    def top_level_mod
+      @_top_level_mod ||= Opal.compile(File.read(File.expand_path(File.join(File.dirname(__FILE__), 'top_level_ssr.rb'))), { use_strict: true })
+    end
+  end
+end

data/lib/isomorfeus/props/validator.rb

@@ -36,16 +36,24 @@ module Isomorfeus
       def cast!
         if @o.key?(:cast)
           begin
-            @v = case @o[:class]
-                 when Integer then @v.to_i
-                 when String then @v.to_s
-                 when Float then @v.to_f
-                 when Array then @v.to_a
-                 when Hash then @v.to_h
+            return if @o[:is_a] && @v.is_a?(@o[:is_a])
+            return if @o[:class] && @v.class == @o[:class]
+            if @o[:type] == :boolean
+              @v = !!@v
+              return
+            end
+            cl = @o[:is_a] || @o[:class]
+            @v = case cl.name
+                 when 'Integer' then @v.to_i
+                 when 'String' then @v.to_s
+                 when 'Float' then @v.to_f
+                 when 'Array' then @v.to_a
+                 when 'Hash' then @v.to_h
+                 else
+                  Isomorfeus.raise_error(message: "#{@c}: Dont know how to cast #{@p} to #{cl}!")
                  end
-            @v = !!@v if @o[:type] == :boolean
           rescue
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} cast failed") unless @v.class == @o[:class]
+            Isomorfeus.raise_error(message: "#{@c}: #{@p} cast to #{cl} failed!")
           end
         end
       end
@@ -105,7 +113,7 @@ module Isomorfeus
       end
 
       def c_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} length/size is not #{v}") unless @v.size == v
+        Isomorfeus.raise_error(message: "#{@c}: #{@p} length/size is not #{v}") unless @v.length == v
       end
 
       def c_matches(v)
@@ -121,11 +129,11 @@ module Isomorfeus
       end
 
       def c_max_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @v.size <= v
+        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @v.length <= v
       end
 
       def c_min_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is smaller than #{v}") unless @v.size >= v
+        Isomorfeus.raise_error(message: "#{@c}: #{@p} is smaller than #{v}") unless @v.length >= v
       end
 
       def c_direction(v)

data/lib/isomorfeus/top_level.rb

@@ -4,20 +4,19 @@ module Isomorfeus
       attr_accessor :hydrated
       attr_accessor :first_pass
 
-      if on_browser?
-        def mount!
-          Isomorfeus.init
-          Isomorfeus::TopLevel.on_ready do
-            root_element = `document.querySelector('div[data-iso-root]')`
-            Isomorfeus.raise_error(message: "Isomorfeus root element not found!") unless root_element
-            component_name = root_element.JS.getAttribute('data-iso-root')
-            Isomorfeus.env = root_element.JS.getAttribute('data-iso-env')
-            user_sid = root_element.JS.getAttribute('data-iso-usid')
-            Isomorfeus.current_user_sid =`JSON.parse(user_sid)` if user_sid
-            component = nil
-            begin
-              component = component_name.constantize
-            rescue Exception => e
+      if RUBY_ENGINE == 'opal'
+        def do_the_mount!(init: true)
+          NanoCSS.instance = NanoCSS.new({ sh: `document.getElementById('css-server-side')` })
+          root_element = `document.querySelector('div[data-iso-root]')`
+          Isomorfeus.raise_error(message: "Isomorfeus root element not found!") unless root_element
+          component_name = root_element.JS.getAttribute('data-iso-root')
+          Isomorfeus.env = root_element.JS.getAttribute('data-iso-env')
+          Isomorfeus.current_user_sid_s = root_element.JS.getAttribute('data-iso-usids')
+          component = nil
+          begin
+            component = component_name.constantize
+          rescue Exception => e
+            if init
               `console.warn("Deferring mount: " + #{e.message})`
               @timeout_start = Time.now unless @timeout_start
               if (Time.now - @timeout_start) < 10
@@ -25,33 +24,39 @@ module Isomorfeus
               else
                 `console.error("Unable to mount '" + #{component_name} + "'!")`
               end
+            else
+              raise e
             end
-            if component
-              props_json = root_element.JS.getAttribute('data-iso-props')
-              props = `Opal.Hash.$new(JSON.parse(props_json))`
+          end
+          if component
+            props_json = root_element.JS.getAttribute('data-iso-props')
+            props = JSON.parse(props_json)
+            if init
               raw_hydrated = root_element.JS.getAttribute('data-iso-hydrated')
-              self.hydrated = (raw_hydrated && raw_hydrated == "true")
+              Isomorfeus::TopLevel.hydrated = (raw_hydrated && raw_hydrated == "true")
               %x{
                 if (global.ServerSideRenderingStateJSON) {
                 var state = global.ServerSideRenderingStateJSON;
                   var keys = Object.keys(state);
                   for(var i=0; i < keys.length; i++) {
                     if (Object.keys(state[keys[i]]).length > 0) {
-                      global.Opal.Isomorfeus.store.native.dispatch({ type: keys[i].toUpperCase(), set_state: state[keys[i]] });
+                      #{Isomorfeus.store.dispatch({ type: `keys[i].toUpperCase()`, set_state: Hash.new(`state[keys[i]]`) })}
                     }
                   }
                 }
               }
               Isomorfeus.execute_init_after_store_classes
-              begin
-                self.first_pass = true
-                result = Isomorfeus::TopLevel.mount_component(component, props, root_element, self.hydrated)
-                self.first_pass = false
-                @tried_another_time = false
-                result
-              rescue Exception => e
-                self.first_pass = false
-                if  !@tried_another_time
+            end
+            begin
+              Isomorfeus::TopLevel.first_pass = true
+              result = Isomorfeus::TopLevel.mount_component(component, props, root_element, Isomorfeus::TopLevel.hydrated)
+              Isomorfeus::TopLevel.first_pass = false
+              @tried_another_time = false
+              result
+            rescue Exception => e
+              if init
+                Isomorfeus::TopLevel.first_pass = false
+                if !@tried_another_time
                   @tried_another_time = true
                   `console.warn("Deferring mount: " + #{e.message})`
                   `console.error(#{e.backtrace.join("\n")})`
@@ -60,11 +65,20 @@ module Isomorfeus
                   `console.error("Unable to mount '" + #{component_name} + "'! Error: " + #{e.message} + "!")`
                   `console.error(#{e.backtrace.join("\n")})`
                 end
+              else
+                raise e
               end
             end
           end
         end
 
+        def mount!
+          Isomorfeus.init
+          Isomorfeus::TopLevel.on_ready do
+            Isomorfeus::TopLevel.do_the_mount!
+          end
+        end
+
         def on_ready(&block)
           %x{
             function run() { block.$call() };
@@ -88,18 +102,26 @@ module Isomorfeus
         end
 
         def mount_component(component, props, element_or_query, hydrated = false)
-          if `(typeof element_or_query === 'string')` || (`(typeof element_or_query.$class === 'function')` && element_or_query.class == String)
+          if `(element_or_query instanceof HTMLElement)`
+            element = element_or_query
+          elsif `(typeof element_or_query === 'string')` || element_or_query.is_a?(String)
             element = `document.body.querySelector(element_or_query)`
-          elsif `(typeof element_or_query.$is_a === 'function')` && element_or_query.is_a?(Browser::Element)
+          elsif element_or_query.is_a?(Browser::Element)
             element = element_or_query.to_n
           else
             element = element_or_query
           end
-
-          top = Preact.create_element(component, props)
-          hydrated ? Preact.hydrate(top, element) : Preact.render(top, element)
+          raise "Element is required!" unless element
+          top = ::Preact.create_element(component, props)
+          hydrated ? ::Preact.hydrate(top, element) : ::Preact.render(top, element)
           Isomorfeus.top_component = top
         end
+      else
+        def render_component_to_string(component_name, props)
+          component = component_name.is_a?(String) ? const_get(component_name) : component_name
+          ::Preact._vnode_id = 0
+          ::Preact.render_to_string(::Preact.create_element(component, props))
+        end
       end
     end
   end