isomorfeus-preact 10.6.21 → 10.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c5ba07f42c9e53b189fed74f0ac51e7041cd9d243b080295e86492cfc12bd8
-  data.tar.gz: 5ae156acd8f5c22acfdca4642df719459183727df885d141a1b72b37268c4304
+  metadata.gz: 5297a6babb3f48a4cebfe2a957fdfcb8b3e3e7de5a928956e0b93f7d3d2741c8
+  data.tar.gz: a2af099fbf9f129b1fb6054249c99b6387b79ad4ea10493f9b481672afdc8ed2
 SHA512:
-  metadata.gz: 7aecd0b46f5d6901d435444fe02080d2aa114778bf3de8ce1ee42052226bd06a3d91644bfe73456a8bce24f336769e1347a079b38894f63ef16f3186732a98dd
-  data.tar.gz: a3c3ae921ad2bd80cc5fae87857b299ff206c9026300c99a177b96249b5517eb09b1401a56e287b629cfabf4a613dd37cc39b0fffc95afd64beda63f97bda6ce
+  metadata.gz: d4098d558db9b42dc5c35ae1602c83829a80ae64e986fb9f843af1321cec415b314acee4ac292b3c891628b4fc7b1b8628605561a7858af5d5e18d8a6c0d2ad3
+  data.tar.gz: c726635dc08b8e506551e3e28ada187bd1327bbe30bad51f4095b56e242b412db83d0028c4d33a9608f958986b04d4b8ad090ebff40862d1776db01beb261cc7

data/lib/browser/delegate_native.rb

@@ -26,12 +26,22 @@ module Browser
         %x{
           let value = #@native[#{property_name}];
           let type = typeof(value);
-          if (type === 'function') {
-            return value.apply(#@native, args);
-          } else if (value === null || type === 'undefined' || (type === 'number' && isNaN(value))) {
-            return nil;
-          }
-          return value;
+          try {
+            if (type === 'function') {
+              return value.apply(#@native, args);
+            } else if (type === 'object' && (value instanceof HTMLCollection)) {
+              let a = [];
+              for(let i=0; i<value.length; i++) {
+                a[i] = #{Browser::Element.new(`value.item(i)`)};
+              }
+              value = a;
+            } else if (type === 'object' && (value instanceof HTMLElement)) {
+              value = #{Browser::Element.new(value)};
+            } else if (value === null || type === 'undefined' || (type === 'number' && isNaN(value))) {
+              return nil;
+            }
+            return value;
+          } catch { return value; }
         }
       end
     end

data/lib/isomorfeus/preact_view_helper.rb

@@ -4,19 +4,19 @@ module Isomorfeus
       base.include Isomorfeus::AssetManager::ViewHelper
     end
 
-    def cached_mount_component(component_name, props = {}, asset_key = 'ssr.js')
+    def cached_mount_component(component_name, props = {}, asset_key = 'ssr.js', skip_ssr: false, use_ssr: false, max_passes: 4)
       key = "#{component_name}#{props}#{asset}"
       if Isomorfeus.production?
         render_result, @ssr_response_status, @ssr_styles = component_cache.fetch(key)
         return render_result if render_result
       end
-      render_result = mount_component(component_name, props, asset_key)
+      render_result = mount_component(component_name, props, asset_key, skip_ssr: skip_ssr, use_ssr: use_ssr, max_passes: max_passes)
       status = ssr_response_status
       component_cache.store(key, render_result, status, ssr_styles) if status >= 200 && status < 300
       render_result
     end
 
-    def mount_component(component_name, props = {}, asset_key = 'ssr.js', skip_ssr: false, use_ssr: false)
+    def mount_component(component_name, props = {}, asset_key = 'ssr.js', skip_ssr: false, use_ssr: false, max_passes: 4)
       @ssr_response_status = nil
       @ssr_styles = nil
       thread_id_asset = "#{Thread.current.object_id}#{asset_key}"
@@ -41,6 +41,8 @@ module Isomorfeus
           end
         end
 
+        start_time = Time.now if Isomorfeus.development?
+        pass = 1
         # if location_host and scheme are given and if Transport is loaded, connect and then render,
         # otherwise do not render because only one pass is required
         ws_scheme = props[:location_scheme] == 'https:' ? 'wss:' : 'ws:'
@@ -88,6 +90,7 @@ module Isomorfeus
         end
         # wait for first pass to finish
         unless first_pass_skipped
+          pass += 1
           first_pass_finished, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec('return [global.FirstPassFinished, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false ]')
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
           unless first_pass_finished
@@ -104,7 +107,7 @@ module Isomorfeus
             if transport_busy
               start_time = Time.now
               while transport_busy
-                break if (Time.now - start_time) > 10
+                break if (Time.now - start_time) > 5
                 sleep 0.01
                 transport_busy = Isomorfeus.ssr_contexts[thread_id_asset].exec('return global.Opal.Isomorfeus.Transport["$busy?"]()')
               end
@@ -127,12 +130,30 @@ module Isomorfeus
               global.Exception = e;
             }
           let application_state = global.Opal.Isomorfeus.store.native.getState();
-          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined') { global.Opal.Isomorfeus.Transport.$disconnect(); }
+          let transport_busy = false;
+          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && global.Opal.Isomorfeus.Transport["$busy?"]()) { transport_busy = true; }
           if (typeof global.NanoCSSInstance !== 'undefined') { ssr_styles = global.NanoCSSInstance.raw }
-          return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
+          return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), transport_busy, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
+        JAVASCRIPT
+        # execute further render passes
+        rendered_tree, application_state, @ssr_styles, @ssr_response_status, transport_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
+        start_time = Time.now
+        while transport_busy
+          break if (Time.now - start_time) > 5
+          while transport_busy
+            break if (Time.now - start_time) > 4
+            sleep 0.01
+            transport_busy = Isomorfeus.ssr_contexts[thread_id_asset].exec('return global.Opal.Isomorfeus.Transport["$busy?"]()')
+          end
+          # execute third render pass
+          pass += 1
+          rendered_tree, application_state, @ssr_styles, @ssr_response_status, transport_busy, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
+          break if pass > max_passes
+        end
+        javascript = <<~JAVASCRIPT
+          if (typeof global.Opal.Isomorfeus.Transport !== 'undefined') { global.Opal.Isomorfeus.Transport.$disconnect(); }
         JAVASCRIPT
-        # execute second render pass
-        rendered_tree, application_state, @ssr_styles, @ssr_response_status, exception = Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
+        Isomorfeus.ssr_contexts[thread_id_asset].exec(javascript)
         Isomorfeus.raise_error(message: exception['message'], stack: exception['stack']) if exception
         render_result << " data-iso-hydrated='true'" if rendered_tree
         if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
@@ -150,6 +171,7 @@ module Isomorfeus
       if Isomorfeus.server_side_rendering
         render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
       end
+      STDERR.puts "PreactViewHelper Server Side Rendering rendered #{pass} passes and took ~#{Time.now - start_time}s" if Isomorfeus.development?
       render_result
     end
 

data/lib/isomorfeus_preact/lucid_app/native_component_constructor.rb

@@ -36,7 +36,9 @@ module LucidApp
                 let r = ref; // to ensure closure for function below gets correct ref name
                 this[ref] = function(element) {
                   element = oper.native_element_or_component_to_ruby(element);
+                  oper.register_active_component(this);
                   #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                  oper.unregister_active_component(this);
                 }
                 this[ref] = this[ref].bind(this);
               } else {
@@ -44,9 +46,9 @@ module LucidApp
               }
             }
             if (base.preload_block) {
-              oper.active_redux_components.push(this);
+              oper.register_active_component(this);
               this.state.preloaded = this.__ruby_instance.$execute_preload_block();
-              oper.active_redux_components.pop();
+              oper.unregister_active_component(this);
             }
             this.listener = this.listener.bind(this);
             this.unsubscriber = Opal.Isomorfeus.store.native.subscribe(this.listener);

data/lib/isomorfeus_preact/lucid_component/native_component_constructor.rb

@@ -32,7 +32,9 @@ module LucidComponent
                 let r = ref; // to ensure closure for function below gets correct ref name
                 this[ref] = function(element) {
                   element = oper.native_element_or_component_to_ruby(element);
+                  oper.register_active_component(this);
                   #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                  oper.unregister_active_component(this);
                 }
                 this[ref] = this[ref].bind(this);
               } else {
@@ -40,9 +42,9 @@ module LucidComponent
               }
             }
             if (base.preload_block) {
-              oper.active_redux_components.push(this);
+              oper.register_active_component(this);
               this.state.preloaded = this.__ruby_instance.$execute_preload_block();
-              oper.active_redux_components.pop();
+              oper.unregister_active_component(this);
             }
           }
           static get displayName() {

data/lib/preact/component/native_component_constructor.rb

@@ -21,8 +21,11 @@ module Preact
                 if (defined_refs[ref] != null) {
                   let r = ref; // to ensure closure for function below gets correct ref name
                   this[ref] = function(element) {
-                    element = Opal.Preact.native_element_or_component_to_ruby(element);
+                    const oper = Opal.Preact;
+                    element = oper.native_element_or_component_to_ruby(element);
+                    oper.register_active_component(this);
                     #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                    oper.unregister_active_component(this);
                   }
                   this[ref] = this[ref].bind(this);
                 } else {
@@ -44,11 +47,14 @@ module Preact
               return (result.length === 1) ? result[0] : result;
             }
             shouldComponentUpdate(next_props, next_state) {
+              const oper = Opal.Preact;
               if (base.should_component_update_block) {
-                return #{!!`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: next_props})`, `Opal.Preact.State.$new({state: next_state })`, &`base.should_component_update_block`)};
+                oper.register_active_component(this);
+                return #{!!`this.__ruby_instance`.instance_exec(`oper.Props.$new({props: next_props})`, `oper.State.$new({state: next_state })`, &`base.should_component_update_block`)};
+                oper.unregister_active_component(this);
               }
-              if (!Opal.Preact.props_are_equal(this.props, next_props)) { return true; }
-              if (Opal.Preact.state_is_not_equal(this.state, next_state)) { return true; }
+              if (!oper.props_are_equal(this.props, next_props)) { return true; }
+              if (oper.state_is_not_equal(this.state, next_state)) { return true; }
               return false;
             }
             validateProp(props, propName, componentName) {

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.21'
+  VERSION = '10.6.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.21
+  version: 10.6.25
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.7
+        version: 0.14.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.7
+        version: 0.14.8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement