isomorfeus-preact 22.9.0.rc7 → 22.9.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1444a364c56453f0e45b901f88316ae4262494206149fb63108d206d84fff870
-  data.tar.gz: d22d8944d3001f1be119335ebaf72d2dac3bfb578b7eb83585ae58b1214171dc
+  metadata.gz: 28d9e79cef1f470a18cf3ceb7e24e4b1e87d544bdf3f9ea8e8c466f6e5f135c6
+  data.tar.gz: 0f07f213e0ed7aafb22f7abe64ea41a0b2b1d14dace721dcf01611d19b52f403
 SHA512:
-  metadata.gz: 01be4daedd99d8ba24d99125878af8032b0289a806e8eb98584f3bb7848d73fb7157770d30853199747a5ca14497cd9f5de90859006bfb4976e23c4247d68a60
-  data.tar.gz: 4962e6fb45985477eea0638976e9f600b1f448eedb68a2a9e245e914caefde52c6af0ad1df228b0747a6973bf018582bea1ac62d516c82812cc04d4a3e19abf4
+  metadata.gz: dcd883d7865f7b05373510a797cd254fa05fed28f54403c3a6d9c7d9d3ac1e0f51693bca52702b99b0248798339d74dad8a4f178c15611593072a1e5a8eaf6e0
+  data.tar.gz: a937605abfcbe71d93d6d97eb5f6b2783336773dcc7e2a9c3180285d8ccdc6dc011a1d33ba4175d186d6b03a4d47004aa67ad39c57c6f2203bd5e54d63a0bb56

data/lib/browser/delegate_native.rb

@@ -24,29 +24,17 @@ module Browser
         message = message.chop
         property_name = property_for_message(message)
         arg = args[0]
-        arg = if `arg && typeof arg.$to_n === 'function'`
-                arg.to_n
-              else
-                arg
-              end
-        return `#@native[#{property_name}] = args[0]`
+        arg = arg.to_n if `arg && typeof arg.$to_n === 'function'`
+        return `#@native[#{property_name}] = arg`
       else
         property_name = property_for_message(message)
-
         %x{
           let value = #@native[#{property_name}];
           let type = typeof(value);
+          if (type === 'undefined') { return #{super}; }
           try {
             if (type === 'function') {
-              #{
-                args.map! do |arg|
-                  if `arg && typeof arg.$to_n === 'function'`
-                    arg.to_n
-                  else
-                    arg
-                  end
-                end
-              }
+              #{args.map! { |arg| `arg && typeof arg.$to_n === 'function'` ? arg.to_n : arg }}
               value = value.apply(#@native, args);
             }
             if (value instanceof HTMLCollection || value instanceof NodeList) {
@@ -69,9 +57,9 @@ module Browser
     end
 
     def respond_to_missing? message, include_all
-      message = message.chop if message.end_with? '='
+      return true if message.end_with? '='
       property_name = property_for_message(message)
-      return true unless `#{property_name} in #@native`
+      return true if `#{property_name} in #@native`
       false
     end
 

data/lib/isomorfeus/preact/config.rb

@@ -4,7 +4,6 @@ module Isomorfeus
       attr_accessor :browser_history
       attr_accessor :browser_location
       attr_accessor :current_user_sid_s
-      attr_accessor :initial_state_fetched
       attr_accessor :ssr_response_status
       attr_accessor :top_component
       attr_reader :initialized
@@ -29,8 +28,7 @@ module Isomorfeus
       end
 
       def force_render
-        root_element = `document.querySelector('div[data-iso-root]')`
-        Preact.unmount_component_at_node(root_element)
+        Preact.unmount_component_at_node(`document.body`)
         Isomorfeus::TopLevel.do_the_mount!(init: false)
         nil
       rescue Exception => e

data/lib/isomorfeus/preact/ssr.rb

@@ -10,7 +10,7 @@ module Isomorfeus
 
     def render(skip_ssr)
       Isomorfeus.browser_location = Browser::Location.new(@location)
-      Isomorfeus.current_locale = @locale
+      Isomorfeus.current_locale = @locale if @locale
       NanoCSS.instance = NanoCSS.new(given_renderer: NanoCSS.global_instance.renderer.deep_dup)
       Isomorfeus.init_store
       Isomorfeus.store.clear!

data/lib/isomorfeus/preact/thread_local_component_cache.rb

@@ -8,8 +8,8 @@ module Isomorfeus
       Thread.current[:local_cache][key]
     end
 
-    def store(key, rendered_tree, response_status, styles)
-      Thread.current[:local_cache][key] = [rendered_tree, response_status, styles]
+    def store(key, rendered_tree, styles, data, status)
+      Thread.current[:local_cache][key] = [rendered_tree, styles, data, status]
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '22.9.0.rc7'
+    VERSION = '22.9.0.rc9'
   end
 end

data/lib/isomorfeus/preact/view_helper.rb

@@ -13,36 +13,42 @@ module Preact
       end
       render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr)
       status = ssr_response_status
-      component_cache.store(key, render_result, ssr_styles, status) if status >= 200 && status < 300
+      component_cache.store(key, render_result, ssr_styles, ssr_data, status) if status >= 200 && status < 300
       render_result
     end
 
     def mount_component(component_name, props = {}, skip_ssr: false)
       ssr_start_time = Time.now if Isomorfeus.development?
-      @ssr_styles = nil
       locale = props.delete(:locale)
-      render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
       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::TopLevel.mount_component(component_name, props, Thread.current[:isomorfeus_session_id], location, locale, skip_ssr)
-
-      render_result << " data-iso-hydrated='true'" unless skip_ssr
-      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 << '>'
-      render_result << (rendered_tree ? rendered_tree : "SSR didn't work")
-      render_result << '</div>'
-      render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
+      component_name = component_name.to_s unless component_name.is_a?(String)
+      usids = if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
+                Isomorfeus.current_user.sid.to_s
+              else
+                nil
+              end
+
+      @_ssr_data = <<~HTML
+      <script type='application/javascript'>
+        ServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}
+        ServerSideRenderingProps = #{Oj.dump({ env: Isomorfeus.env, component_name: component_name, props: props, hydrated: !skip_ssr, usids: usids }, mode: :strict)}
+      </script>
+      HTML
       puts "Preact::ViewHelper Server Side Rendering took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
-      render_result
+      rendered_tree ? rendered_tree : "SSR didn't work"
     end
 
     def ssr_response_status
       Isomorfeus.ssr_response_status
     end
 
+    def ssr_data
+      @_ssr_data
+    end
+
     def ssr_styles
       @_ssr_styles || ''
     end
@@ -52,13 +58,5 @@ module Preact
     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/top_level.rb

@@ -7,11 +7,10 @@ module Isomorfeus
       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')
+          p = `global.ServerSideRenderingProps`
+          component_name = p.JS[:component_name]
+          Isomorfeus.env = p.JS[:env]
+          Isomorfeus.current_user_sid_s = p.JS[:usids]
           component = nil
           begin
             component = component_name.constantize
@@ -29,14 +28,12 @@ module Isomorfeus
             end
           end
           if component
-            props_json = root_element.JS.getAttribute('data-iso-props')
-            props = JSON.parse(props_json)
+            props = Hash.new(p.JS[:props])
             if init
-              raw_hydrated = root_element.JS.getAttribute('data-iso-hydrated')
-              Isomorfeus::TopLevel.hydrated = (raw_hydrated && raw_hydrated == "true")
+              Isomorfeus::TopLevel.hydrated = p.JS[:hydrated]
               %x{
-                if (global.ServerSideRenderingStateJSON) {
                 var state = global.ServerSideRenderingStateJSON;
+                if (state) {
                   var keys = Object.keys(state);
                   for(var i=0; i < keys.length; i++) {
                     if (Object.keys(state[keys[i]]).length > 0) {
@@ -49,7 +46,7 @@ module Isomorfeus
             end
             begin
               Isomorfeus::TopLevel.first_pass = true
-              result = Isomorfeus::TopLevel.mount_component(component, props, root_element, Isomorfeus::TopLevel.hydrated)
+              result = Isomorfeus::TopLevel.mount_component(component, props, `document.body`, Isomorfeus::TopLevel.hydrated)
               Isomorfeus::TopLevel.first_pass = false
               @tried_another_time = false
               result

data/lib/preact/elements.rb

@@ -45,9 +45,22 @@ module Preact::Elements
     view vkern
   ]
 
-  SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
-    define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
-      Preact._render_element(element, props, &block)
+  if RUBY_ENGINE == 'opal'
+    SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
+      define_method(element.underscore.upcase) do |props = nil, &block|
+        %x{
+          const op = Opal.Preact;
+          const opr = op.render_buffer;
+          if (typeof block === 'function') op.$create_element.$$p = block.$to_proc();
+          opr[opr.length-1].push(op.$create_element(element, props, nil));
+        }
+      end
+    end
+  else
+    SUPPORTED_HTML_AND_SVG_ELEMENTS.each do |element|
+      define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
+        Preact._render_element(element, props, &block)
+      end
     end
   end
 

data/lib/preact.rb

@@ -1188,43 +1188,6 @@ module Preact
       end
     end
 
-    def create_element(type, props = nil, children = nil, &block)
-      if props
-        if props.is_a?(Hash)
-          normalized_props = props.dup
-          key = normalized_props.delete(:key)
-          ref = normalized_props.delete(:ref)
-        else
-          children = props
-          normalized_props = {}
-          key = nil
-          ref = nil
-        end
-      else
-        normalized_props = {}
-        key = nil
-        ref = nil
-      end
-
-      if block_given?
-        pr = render_buffer
-        pr.push([])
-        block_result = block.call
-        children = pr.pop
-        if Preact.is_renderable?(block_result)
-          children.push(block_result)
-        end
-      end
-
-      normalized_props[:children] = children unless children.nil?
-
-      if RUBY_ENGINE == 'opal'
-        `self.createVNode(type, normalized_props, key, ref, null)`
-      else
-        _create_vnode(type, normalized_props, key, ref, nil)
-      end
-    end
-
     def create_context(const_name, default_value = nil)
       context = Preact::Context.new(default_value)
       Object.const_set(const_name, context)
@@ -1247,6 +1210,40 @@ module Preact
       attr_accessor :render_buffer
       attr_accessor :rerender_queue
 
+      def create_element(type, props = nil, children = nil, &block)
+        if props
+          if props.is_a?(Hash)
+            normalized_props = props.dup
+            key = normalized_props.delete(:key)
+            ref = normalized_props.delete(:ref)
+          else
+            children = props
+            normalized_props = {}
+            key = nil
+            ref = nil
+          end
+        else
+          normalized_props = {}
+          key = nil
+          ref = nil
+        end
+
+        if block_given?
+          pr = render_buffer
+          pr.JS.push([])
+          block_result = block.call
+          children = pr.JS.pop()
+          if Preact.is_renderable?(block_result)
+            children.JS.push(block_result)
+          end
+        end
+
+        %x{
+          if (children !== nil && children !== null) { #{normalized_props[:children] = children} }
+          return self.createVNode(type, normalized_props, key, ref, null);
+        }
+      end
+
       def _enqueue_render(c)
         if ((`!c._dirty` && (`c._dirty = true`) && rerender_queue.push(c) && `!self.process._rerenderCount++`))
           `setTimeout(self.process)`
@@ -1321,6 +1318,38 @@ module Preact
         VNode.new(type, props, key, ref, original)
       end
 
+      def create_element(type, props = nil, children = nil, &block)
+        if props
+          if props.is_a?(Hash)
+            normalized_props = props.dup
+            key = normalized_props.delete(:key)
+            ref = normalized_props.delete(:ref)
+          else
+            children = props
+            normalized_props = {}
+            key = nil
+            ref = nil
+          end
+        else
+          normalized_props = {}
+          key = nil
+          ref = nil
+        end
+
+        if block_given?
+          pr = render_buffer
+          pr.push([])
+          block_result = block.call
+          children = pr.pop
+          if Preact.is_renderable?(block_result)
+            children.push(block_result)
+          end
+        end
+
+        normalized_props[:children] = children unless children.nil?
+        _create_vnode(type, normalized_props, key, ref, nil)
+      end
+
       def _encode_entities(input)
         s = input.to_s
         return s unless ENCODED_ENTITIES.match?(s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc7
+  version: 22.9.0.rc9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc7
+        version: 22.9.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc7
+        version: 22.9.0.rc9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc7
+        version: 22.9.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc7
+        version: 22.9.0.rc9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement