isomorfeus-preact 10.6.28 → 10.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6331ce028802f1b54b7fb887e252eb034ea9a445282d4e560b72c0254afb492b
-  data.tar.gz: f9bd49e677237be97b152221133c4a0d02e454df2e4bf483fcbe324591fc252a
+  metadata.gz: 75663e1db3afaf4d60c6a1cb2e85544bc96b09fb9a9cee116aa0b055463cf611
+  data.tar.gz: 8b08d796a5bee25b087932f6a06f1a54dc4a7afefd883b5c7d561b04a07c1115
 SHA512:
-  metadata.gz: 98b8ec5095a5723e43742b1ec6ed5dceef4d5735574bb05a475e71fd4a8afec150a2c106ed5b047a06504b1a935c21d458c67ec32301cce308ac825b2839957a
-  data.tar.gz: b04a6cbfa3e7b3b5d297e7fe5927189e29da30f86b303dcb822d917bdbd9bbf0145fc60ffe470fe2eb560382d68468855ae8037ff7659d511644496bc1afb84c
+  metadata.gz: d0e0a80f63b218960ba579a780bd8a1d2993f168611cd4a949899109b1ab7c32ec187d2b56682b109d6830119d23c9944698d781e1d6ae8c20b1e44b4ff57916
+  data.tar.gz: 895e40dc74ad772a9b3a32b43d7a707b7a2698f47aa66ae012c71eb245be970e94671c7ea9ff892791b29533587bc329f58df68738d987e68e9a1a9ab054611d

data/README.md

@@ -7,7 +7,7 @@ Isomorfeus Preact<br/>
 Develop Preact components for Opal Ruby along with very easy to use and advanced Preact-Redux Components.
 
 ## Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com)
+At the [Isomorfeus Framework Project](https://isomorfeus.com)
 
 ## Versioning and Compatibility
 isomorfeus-preact version follows the Preact version which features and API it implements.

data/lib/isomorfeus/preact_view_helper.rb

@@ -60,7 +60,9 @@ module Isomorfeus
           global.Exception = false;
           global.IsomorfeusSessionId = '#{Thread.current[:isomorfeus_session_id]}';
           global.Opal.Isomorfeus['$env=']('#{Isomorfeus.env}');
-          if (typeof global.Opal.Isomorfeus.$negotiated_locale === 'function') {
+          if (typeof global.Opal.Isomorfeus["$current_locale="] === 'function') {
+            global.Opal.Isomorfeus["$current_locale="]('#{props[:locale]}');
+          } else if (typeof global.Opal.Isomorfeus["$negotiated_locale="] === 'function') { // remove later on
             global.Opal.Isomorfeus["$negotiated_locale="]('#{props[:locale]}');
           }
           global.Opal.Isomorfeus['$force_init!']();
@@ -124,11 +126,11 @@ module Isomorfeus
           let rendered_tree;
           let ssr_styles;
           let component;
-            try {
-              rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)});
-            } catch (e) {
-              global.Exception = e;
-            }
+          try {
+            rendered_tree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)});
+          } catch (e) {
+            global.Exception = e;
+          }
           let application_state = global.Opal.Isomorfeus.store.native.getState();
           let transport_busy = false;
           if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && global.Opal.Isomorfeus.Transport["$busy?"]()) { transport_busy = true; }
@@ -171,7 +173,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? && !skip_ssr
+      STDERR.puts "PreactViewHelper Server Side Rendering rendered #{pass} passes and took ~#{((Time.now - start_time)*1000).to_i}ms" if Isomorfeus.development? && !skip_ssr
       render_result
     end
 

data/lib/isomorfeus_preact/lucid_app/native_component_constructor.rb

@@ -37,7 +37,9 @@ module LucidApp
                 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]`)}
+                  try {
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                  } catch (e) { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
                   oper.unregister_active_component(this);
                 }
                 this[ref] = this[ref].bind(this);
@@ -47,7 +49,7 @@ module LucidApp
             }
             if (base.preload_block) {
               oper.register_active_component(this);
-              this.state.preloaded = this.__ruby_instance.$execute_preload_block();
+              this.state.preloaded = this.__ruby_instance.$execute_preload_block(); // caught in execute_preload_block itself
               oper.unregister_active_component(this);
             }
             this.listener = this.listener.bind(this);
@@ -61,9 +63,14 @@ module LucidApp
             oper.render_buffer.push([]);
             oper.register_active_component(this);
             let block_result;
-            if (base.while_loading_block && !state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
-            else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
-            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            try {
+              if (base.while_loading_block && !state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+              else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
+              if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            } catch (e) {
+              if (oper.using_did_catch) { throw e; }
+              else { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
+            }
             oper.unregister_active_component(this);
             let children = oper.render_buffer.pop();
             return Opal.global.Preact.createElement(Opal.global.LucidApplicationContext.Provider, { value: { iso_store: this.state.isomorfeus_store_state, iso_theme: base.css_theme }}, children);
@@ -78,6 +85,11 @@ module LucidApp
           componentWillUnmount() {
             if (typeof this.unsubscriber === "function") { this.unsubscriber(); }
           }
+          shouldComponentUpdate(next_props, next_state) {
+            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; }
+            return false;
+          }
           validateProp(props, propName, componentName) {
             try { base.$validate_prop(propName, props[propName]) }
             catch (e) { return new Error(componentName + ": Error: prop validation failed: " + e.message); }

data/lib/isomorfeus_preact/lucid_component/api.rb

@@ -16,17 +16,14 @@ module LucidComponent
           `base.preload_block = block`
           component_did_mount do
             unless self.state.preloaded
-              @_preload_promise.then { self.state.preloaded = true }.fail do |result|
-                err_text = "#{self.class.name}: preloading failed, last result: #{result.nil? ? 'nil' : result}!"
-                `console.error(err_text)`
-              end
+              @_preload_promise.then { self.state.preloaded = true } if @_preload_promise
             end
           end
         end
 
         def while_loading(option = nil, &block)
           wl_block = proc do
-            if @_preload_promise.resolved?
+            if @_preload_promise && @_preload_promise.resolved?
               instance_exec(&`base.render_block`)
             else
               instance_exec(&block)
@@ -85,8 +82,23 @@ module LucidComponent
 
       # preloading
       def execute_preload_block
-        @_preload_promise = instance_exec(&self.class.JS[:preload_block])
-        @_preload_promise.resolved?
+        begin
+          @_preload_promise = instance_exec(&self.class.JS[:preload_block])
+        rescue => e
+          %x{
+            console.error(e.message);
+            console.error(e.stack);
+          }
+        end
+        if @_preload_promise
+          @_preload_promise.fail do |result|
+            err_text = "#{self.class.name}: preloading failed, last result: #{result.nil? ? 'nil' : result}!"
+            `console.error(err_text)`
+          end
+          @_preload_promise.resolved?
+        else
+          false
+        end
       end
 
       def preloaded?

data/lib/isomorfeus_preact/lucid_component/native_component_constructor.rb

@@ -33,7 +33,9 @@ module LucidComponent
                 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]`)}
+                  try {
+                    #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                  } catch (e) { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
                   oper.unregister_active_component(this);
                 }
                 this[ref] = this[ref].bind(this);
@@ -43,7 +45,7 @@ module LucidComponent
             }
             if (base.preload_block) {
               oper.register_active_component(this);
-              this.state.preloaded = this.__ruby_instance.$execute_preload_block();
+              this.state.preloaded = this.__ruby_instance.$execute_preload_block(); // caught in execute_preload_block itself
               oper.unregister_active_component(this);
             }
           }
@@ -55,9 +57,14 @@ module LucidComponent
             oper.render_buffer.push([]);
             oper.register_active_component(this);
             let block_result;
-            if (base.while_loading_block && !state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
-            else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
-            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            try {
+              if (base.while_loading_block && !state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+              else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
+              if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            } catch (e) {
+              if (oper.using_did_catch) { throw e; }
+              else { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
+            }
             oper.unregister_active_component(this);
             let result = oper.render_buffer.pop();
             return (result.length === 1) ? result[0] : result;

data/lib/isomorfeus_preact/lucid_func/native_component_constructor.rb

@@ -24,8 +24,13 @@ module LucidFunc
           const __ruby_instance = __ruby_state.instance;
           __ruby_instance.props = Object.assign({}, props, context);
           oper.register_active_component(__ruby_instance);
-          let block_result = #{`__ruby_instance`.instance_exec(&`base.render_block`)};
-          if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+          try {
+            let block_result = #{`__ruby_instance`.instance_exec(&`base.render_block`)};
+            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+          } catch (e) {
+            if (oper.using_did_catch) { throw e; }
+            else { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
+          }
           oper.unregister_active_component(__ruby_instance);
           // console.log("function popping", oper.render_buffer, oper.render_buffer.toString());
           let result = oper.render_buffer.pop();

data/lib/isomorfeus_preact/preact/function_component/native_component_constructor.rb

@@ -17,8 +17,13 @@ module Preact
             const __ruby_instance = __ruby_state.instance;
             __ruby_instance.props = props;
             oper.register_active_component(__ruby_instance);
-            let block_result = #{`__ruby_instance`.instance_exec(&`base.render_block`)};
-            if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            try {
+              let block_result = #{`__ruby_instance`.instance_exec(&`base.render_block`)};
+              if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+            } catch (e) {
+              if (oper.using_did_catch) { throw e; }
+              else { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
+            }
             oper.unregister_active_component(__ruby_instance);
             let result = oper.render_buffer.pop();
             return (result.length === 1) ? result[0] : result;

data/lib/preact/component/callbacks.rb

@@ -8,11 +8,14 @@ module Preact
             %x{
               var fun = function(error) {
                 Opal.Preact.register_active_component(this);
-                #{`this.__ruby_instance`.instance_exec(`error`, &block)};
+                try {
+                  #{`this.__ruby_instance`.instance_exec(`error`, &block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
               }
               if (self.lucid_preact_component) { self.lucid_preact_component.prototype.componentDidCatch = fun; }
               else { self.preact_component.prototype.componentDidCatch = fun; }
+              Opal.Preact.using_did_catch = true;
             }
           end
 
@@ -20,7 +23,9 @@ module Preact
             %x{
               let fun = function() {
                 Opal.Preact.register_active_component(this);
-                #{`this.__ruby_instance`.instance_exec(&block)};
+                try {
+                  #{`this.__ruby_instance`.instance_exec(&block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
               }
               if (self.lucid_preact_component) {
@@ -41,9 +46,11 @@ module Preact
             %x{
               var fun = function(prev_props, prev_state, snapshot) {
                 Opal.Preact.register_active_component(this);
-                #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
-                                                       `Opal.Preact.State.$new({state: prev_state})`,
-                                                       `snapshot`, &block)};
+                try {
+                  #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
+                                                        `Opal.Preact.State.$new({state: prev_state})`,
+                                                        `snapshot`, &block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
               }
               if (self.lucid_preact_component) { self.lucid_preact_component.prototype.componentDidUpdate = fun; }
@@ -56,7 +63,9 @@ module Preact
               var fun = function() {
                 if (typeof this.unsubscriber === "function") { this.unsubscriber(); };
                 Opal.Preact.register_active_component(this);
-                #{`this.__ruby_instance`.instance_exec(&block)};
+                try {
+                  #{`this.__ruby_instance`.instance_exec(&block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
               }
               if (self.lucid_preact_component) { self.lucid_preact_component.prototype.componentWillUnmount = fun; }
@@ -69,8 +78,10 @@ module Preact
             %x{
               var fun = function(props, state) {
                 Opal.Preact.register_active_component(this);
-                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: props})`,
-                                                                     `Opal.Preact.State.$new({state: state})`, &block)};
+                try {
+                  var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: props})`,
+                                                                      `Opal.Preact.State.$new({state: state})`, &block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
                 if (typeof result.$to_n === 'function') { result = result.$to_n() }
                 if (result === nil) { return null; }
@@ -85,8 +96,10 @@ module Preact
             %x{
               var fun = function(prev_props, prev_state) {
                 Opal.Preact.register_active_component(this);
-                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
-                                                                    `Opal.Preact.State.$new({state: prev_state})`, &block)};
+                try {
+                  var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
+                                                                      `Opal.Preact.State.$new({state: prev_state})`, &block)};
+                } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
                 Opal.Preact.unregister_active_component(this);
                 if (result === nil) { return null; }
                 return result;

data/lib/preact/component/native_component_constructor.rb

@@ -24,7 +24,9 @@ module Preact
                     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]`)}
+                    try {
+                      #{`this.__ruby_instance`.instance_exec(`element`, &`defined_refs[r]`)}
+                    } catch (e) { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
                     oper.unregister_active_component(this);
                   }
                   this[ref] = this[ref].bind(this);
@@ -40,8 +42,13 @@ module Preact
               const oper = Opal.Preact;
               oper.render_buffer.push([]);
               oper.register_active_component(this);
-              let block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)};
-              if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+              try {
+                let block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)};
+                if (block_result && block_result !== nil) { oper.render_block_result(block_result); }
+              } catch (e) {
+                if (oper.using_did_catch) { throw e; }
+                else { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
+              }
               oper.unregister_active_component(this);
               let result = oper.render_buffer.pop();
               return (result.length === 1) ? result[0] : result;
@@ -50,8 +57,12 @@ module Preact
               const oper = Opal.Preact;
               if (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`)};
+                let result;
+                try {
+                  result = #{!!`this.__ruby_instance`.instance_exec(`oper.Props.$new({props: next_props})`, `oper.State.$new({state: next_state })`, &`base.should_component_update_block`)};
+                } catch (e) { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
                 oper.unregister_active_component(this);
+                return result;
               }
               if (!oper.props_are_equal(this.props, next_props)) { return true; }
               if (oper.state_is_not_equal(this.state, next_state)) { return true; }

data/lib/preact/context_wrapper.rb

@@ -5,7 +5,7 @@ module Preact
     def initialize(native)
       @native = native
     end
-    
+
     def is_wrapped_context
       true
     end
@@ -22,8 +22,10 @@ module Preact
           if (block !== nil) {
             operabu.push([]);
             // console.log("consumer pushed", operabu, operabu.toString());
-            let block_result = block.$call(value);
-            if (block_result && block_result !== nil) { Opal.Preact.render_block_result(block_result); }
+            try {
+              let block_result = block.$call(value);
+              if (block_result && block_result !== nil) { Opal.Preact.render_block_result(block_result); }
+            } catch (e) { console.error(e.message === nil ? 'error at' : e.message, e.stack); }
             // console.log("consumer popping", operabu, operabu.toString());
             children = operabu.pop();
             if (children.length === 1) { children = children[0]; }

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.28'
+  VERSION = '10.6.32'
 end

data/lib/preact.rb

@@ -80,6 +80,8 @@ module Preact
       } else { operain(component, null, null, block); }
     };
 
+    self.using_did_catch = false;
+
     self.active_components = [];
 
     self.active_component = function() {
@@ -216,7 +218,7 @@ module Preact
       if(vnode) {
         if (vnode.__c && vnode.__c.forceUpdate) { vnode.__c.forceUpdate(); }
         if (vnode.__k) {
-          for (let i=vnode.__k.length-1; i>=0; i--) {
+          for (let i=0; i<vnode.__k.length; i++) {
             self.deep_force_update(vnode.__k[i]);
           }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.28
+  version: 10.6.32
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.15
 - !ruby/object:Gem::Dependency
   name: isomorfeus-speednode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-description: Write Preact Components in Ruby.
+description: Write Preact Components in Ruby, including styles and reactive data access.
 email:
 - jan@kursator.com
 executables: []
@@ -449,11 +449,12 @@ files:
 - node_modules/wouter-preact/use-location.d.ts
 - node_modules/wouter-preact/use-location.js
 - package.json
-homepage: http://isomorfeus.com
+homepage: https://isomorfeus.com
 licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
+  source_code_uri: https://github.com/isomorfeus/isomorfeus-preact
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -472,5 +473,5 @@ requirements: []
 rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: Preact for the Isomorfeus Framework Project.
+summary: Preact Components for Isomorfeus.
 test_files: []