isomorfeus-preact 22.10.0.rc1 → 22.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52289511155a5b8805b447f322b7bb1c12f32d11a7b622b65ddce9904da6ed32
-  data.tar.gz: 3d4b57c6a439b9aebca2202ebb839eef61071b84375f41df5d77b23b0044d096
+  metadata.gz: 62b4e6bc05265ca02d586b44bcd579ee5a75cb5bd31f54125a897d8e398fa88c
+  data.tar.gz: 3929ae5d2004b3ee4988aeb95a8e419fbd812141f32b03fa73204071af044cd0
 SHA512:
-  metadata.gz: 978253c3a2ddf848ea644d8e5625ef5f31f6af4358e16245bf83943132e3ae1528624df232bd8b1ad0f49db218da77c3d8145bd2aa6c77ff57efef6cedbbf1c0
-  data.tar.gz: 7d0a9a76d291c523f87100a47277d1752d4e9ccc9d6c3fcfea4b5a6c2c09fbbb9a2408d2762ea239d937dfb0e3a1167b6750c334c35c11fea33f028bf737acc3
+  metadata.gz: fa6aeda0ef1e2392c6259ba8e176205013a832909051ad20f6440c8d4645d3479c547f99baf326ce0608005cbf6c9b86720cc934bca3e2a8a015c23b1b28dee3
+  data.tar.gz: 569e16a8edd6e60826f47b7aeaff7afec87548aee6a61382307f3fc81b36223cc5c2953b430e4ce8391c25b154e1a94691f2e49e3dccf15ca6928d56912d44fb

data/lib/browser/history.rb

@@ -27,7 +27,7 @@ module Browser
       end
 
       def state
-        ::Hash.new(`#@native.state`)
+        `Opal.hash(#@native.state)`
       end
     else
       def back; end

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '22.10.0.rc1'
+    VERSION = '22.11.0.rc1'
   end
 end

data/lib/isomorfeus/top_level.rb

@@ -28,7 +28,7 @@ module Isomorfeus
             end
           end
           if component
-            props = Hash.new(p.JS[:props])
+            props = `Opal.hash(p.props)`
             if init
               Isomorfeus::TopLevel.hydrated = p.JS[:hydrated]
               %x{
@@ -37,7 +37,7 @@ module Isomorfeus
                   var keys = Object.keys(state);
                   for(var i=0; i < keys.length; i++) {
                     if (Object.keys(state[keys[i]]).length > 0) {
-                      #{Isomorfeus.store.dispatch({ type: `keys[i].toUpperCase()`, set_state: Hash.new(`state[keys[i]]`) })}
+                      #{Isomorfeus.store.dispatch({ type: `keys[i].toUpperCase()`, set_state: Hash.recursive_new(`state[keys[i]]`) })}
                     }
                   }
                 }

data/lib/lucid_app.rb

@@ -10,7 +10,7 @@ class LucidApp < LucidComponent
         block_result = _internal_render(pr, &block)
         children = pr.pop
         if Preact.is_renderable?(block_result)
-          children.push(block_result)
+          children << block_result
         end
         Preact.create_element(LucidApplicationContext.Provider, state[:_app_ctx], children)
       end
@@ -78,31 +78,34 @@ class LucidApp < LucidComponent
     super(props, context)
 
     # theme
-    @class_name_sym = @class_name.to_sym
     @theme = @self_class.css_theme
 
-    store_state = Isomorfeus.store.get_state
-    unless store_state[:class_state].key?(@class_name_sym)
-      store_state[:class_state][@class_name_sym] = {}
-    end
-    @state.merge!({ _app_ctx: { value: { iso_location: props[:location],
-       iso_store: store_state,
-       iso_theme: @theme }}})
+    @state.merge!({ _app_ctx: { value: {
+      iso_location: props[:location],
+      iso_store: Isomorfeus.store.get_state,
+      iso_theme: @theme }}})
 
-    lai = self
     if RUBY_ENGINE == 'opal'
+      lai = self
       @unsubscriber = Isomorfeus.store.subscribe do
-        store_state = Isomorfeus.store.get_state
-        unless store_state[:class_state].key?(@class_name_sym)
-          store_state[:class_state][@class_name_sym] = {}
-        end
-        lai.set_state({ _app_ctx: { value: { iso_location: lai.props[:location],
-          iso_store: store_state,
+        lai.set_state({ _app_ctx: { value: {
+          iso_location: lai.props[:location],
+          iso_store: Isomorfeus.store.get_state,
           iso_theme: lai.theme }}})
       end
     end
   end
 
+  def app_state
+    @state.dig(:_app_ctx, :value, :iso_store, :application_state)
+  end
+
+  def class_state
+    res = @state.dig(:_app_ctx, :value, :iso_store, :class_state, @class_name)
+    return res if res
+    {}
+  end
+
   def should_component_update?(next_props, next_state, _next_context)
     return true if @props != next_props || @state != next_state
     false

data/lib/lucid_component.rb

@@ -11,7 +11,7 @@ class LucidComponent < Preact::Component
         pr = Preact.render_buffer
         block_result = _internal_render(pr, &block)
         if Preact.is_renderable?(block_result)
-          pr.pop.push(block_result)
+          pr.pop << block_result
         else
           pr.pop
         end
@@ -81,7 +81,7 @@ class LucidComponent < Preact::Component
   end
 
   def _internal_render(pr, &block)
-    pr.push([])
+    pr << []
     outer_loading = Isomorfeus.something_loading?
     ex = nil
     begin

data/lib/nano_css.rb

@@ -120,7 +120,7 @@ class NanoCSS
 
     decls.each do |prop, value|
       if value.is_a?(Hash) && !value.is_a?(Array)
-        postponed.push(prop)
+        postponed << prop
       else
         str += decl(prop, value)
       end
@@ -237,19 +237,19 @@ class NanoCSS
       if pos
         if parents.empty?
           replaced_selector = sel.gsub(/&/, parent)
-          result.push(replaced_selector)
+          result << replaced_selector
         else
           parents.each do |parent|
             replaced_selector = sel.gsub(/&/, parent)
-            result.push(replaced_selector)
+            result << replaced_selector
           end
         end
       else
         if parents.empty?
-          result.push(sel)
+          result << sel
         else
           parents.each do |parent|
-            result.push("#{parent} #{sel}")
+            result << "#{parent} #{sel}"
           end
         end
       end

data/lib/preact/component.rb

@@ -75,10 +75,10 @@ module Preact
       def render(&block)
         define_method(:render) do
           pr = Preact.render_buffer
-          pr.push([])
+          pr << []
           block_result = instance_exec(&block)
           if Preact.is_renderable?(block_result)
-            pr.pop.push(block_result)
+            pr.pop << block_result
           else
             pr.pop
           end
@@ -168,7 +168,7 @@ module Preact
         # is coming from. We need this because forceUpdate should never call
         # should_component_update
         @_force = true
-        @_renderCallbacks.push(block.to_n) if block_given?
+        @_renderCallbacks << block.to_n if block_given?
         Preact._enqueue_render(self)
       end
     end
@@ -190,7 +190,7 @@ module Preact
       end
 
       if @_vnode
-        @_renderCallbacks.push(block.to_n) if block_given?
+        @_renderCallbacks << block.to_n if block_given?
         Preact._enqueue_render(self)
       end
     end

data/lib/preact/component_resolution.rb

@@ -11,10 +11,22 @@ module Preact::ComponentResolution
       %x{
         let constant;
         let sc = self.$class();
+        // disable stack traces here for improved performance
+        // if const cannot be found, the orignal method_mising will throw with stacktrace
+        let orig_est = Opal.config.enable_stack_trace;
+        Opal.config.enable_stack_trace = false;
         try {
-          constant = sc.$const_get(component_name);
+          // disable the const cache for development, so that always the latest constant
+          // version is used to make hot reloading reliable
+          if (!Opal.Isomorfeus.development) {
+            if (!self.$$iso_preact_const_cache) { self.$$iso_preact_const_cache = {}; }
+            constant = self.$$iso_preact_const_cache[component_name];
+          }
+          if (!constant) { constant = sc.$const_get(component_name); }
         } catch(err) {
-          let module_names = sc.$to_s().split("::");
+          let module_names;
+          if (sc.$$full_name) { module_names = sc.$$full_name.split("::"); }
+          else { module_names = sc.$to_s().split("::"); }
           let module_name;
           for (let i = module_names.length - 1; i > 0; i--) {
             module_name = module_names.slice(0, i).join('::');
@@ -23,8 +35,13 @@ module Preact::ComponentResolution
               break;
             } catch(err) { }
           }
+        } finally {
+          Opal.config.enable_stack_trace = orig_est;
         }
         if (constant) {
+          if (!Opal.Isomorfeus.development && !self.$$iso_preact_const_cache[component_name]) {
+            self.$$iso_preact_const_cache[component_name] = constant;
+          }
           let last = args[args.length-1];
           #{`Opal.Preact`._render_element(`constant`, `(last === undefined || last === null) ? nil : last`, &block)};
           return nil;
@@ -41,21 +58,25 @@ module Preact::ComponentResolution
       # Further on it must check for modules, because const_get does not take
       # the full nesting into account
       constant = nil
-      if self.is_a?(Module)
-        constant = const_get(component_name) rescue nil
-      else
-        begin
-          constant = self.class.const_get(component_name)
-        rescue
-          module_names = self.class.to_s.split('::')
-          module_names.each_index do |i|
-            module_name = module_names[0..i].join('::')
-            constant = self.class.const_get(module_name).const_get(component_name, false) rescue nil
-            break if constant
-          end
+      begin
+        if !Isomorfeus.development?
+          @iso_preact_const_cache = {} unless @iso_preact_const_cache
+          constant = @iso_preact_const_cache[component_name]
+        end
+        constant = self.class.const_get(component_name) unless constant
+      rescue
+        module_names = self.class.to_s.split('::')
+        module_names.each_index do |i|
+          module_name = module_names[0..i].join('::')
+          constant = self.class.const_get(module_name).const_get(component_name, false) rescue nil
+          break if constant
         end
       end
+
       if constant
+        if !Isomorfeus.development? && @iso_preact_const_cache.key?(component_name)
+          @iso_preact_const_cache[component_name] = constant
+        end
         Preact._render_element(constant, args.last, &block)
         nil
       else

data/lib/preact/context.rb

@@ -43,7 +43,7 @@ module Preact
       end
 
       def sub(component)
-        @subs.push(component)
+        @subs << component
         component.provider_subs = @subs
       end
     end

data/lib/preact/html_elements.rb

@@ -52,7 +52,7 @@ module Preact::HtmlElements
   end
 
   def RPE(el)
-    Preact.render_buffer.last.push(el)
+    Preact.render_buffer.last << el
     nil
   end
 end

data/lib/preact/module_component_resolution.rb

@@ -13,10 +13,26 @@ class Module
         let constant = null;
         let c = component_name[0];
         if (c == c.toUpperCase()) {
+          // disable stack traces here for improved performance
+          // if const cannot be found, the orignal method_mising will throw with stacktrace
+          Opal.config.enable_stack_trace = false;
           try {
+            // disable the const cache for development, so that always the latest constant
+            // version is used to make hot reloading reliable
+            if (!Opal.Isomorfeus.development) {
+              if (!self.$$iso_preact_const_cache) { self.$$iso_preact_const_cache = {}; }
+              constant = self.$$iso_preact_const_cache[component_name];
+            }
             constant = self.$const_get(component_name);
-          } catch(err) { }
+          } catch(err) {
+            // nothing
+          } finally {
+            Opal.config.enable_stack_trace = true;
+          }
           if (constant) {
+            if (!Opal.Isomorfeus.development && !self.$$iso_preact_const_cache[component_name]) {
+              self.$$iso_preact_const_cache[component_name] = constant;
+            }
             let last = args[args.length-1];
             #{`Opal.Preact`._render_element(`constant`, `(last === undefined || last === null) ? nil : last`, &block)};
             return nil;
@@ -35,11 +51,19 @@ class Module
     def method_missing(component_name, *args, &block)
       # check for ruby component and render it
       # otherwise pass on method missing
-      component_name_s = component_name.to_s
-      c = component_name_s[0]
+      c = component_name.to_s[0]
       if c == c.upcase
-        constant = const_get(component_name) rescue nil
+        if !Isomorfeus.development?
+          @iso_preact_const_cache = {} unless @iso_preact_const_cache
+          constant = @iso_preact_const_cache[component_name]
+        end
+        unless constant
+          constant = const_get(component_name) rescue nil
+        end
         if constant && constant.ancestors.include?(Preact::Component)
+          if !Isomorfeus.development? && @iso_preact_const_cache.key?(component_name)
+            @iso_preact_const_cache[component_name] = constant
+          end
           Preact._render_element(constant, args.last, &block)
           return nil
         end

data/lib/preact.rb

@@ -650,7 +650,7 @@ module Preact
           // If excessDomChildren was not null, repopulate it with the current element's children:
           excessDomChildren = excessDomChildren && slice.call(dom.childNodes);
 
-          oldProps = oldVNode.props || Opal.Hash.$new();
+          oldProps = oldVNode.props || Opal.hash();
 
           let oldHtml = oldProps["$[]"]("dangerouslySetInnerHTML");
           let newHtml = newProps["$[]"]("dangerouslySetInnerHTML");
@@ -661,7 +661,7 @@ module Preact
             // But, if we are in a situation where we are using existing DOM (e.g. replaceNode)
             // we should read the existing DOM attributes to diff them
             if (excessDomChildren != null) {
-              oldProps = Opal.Hash.$new();
+              oldProps = Opal.hash();
               for (i = 0; i < dom.attributes.length; i++) {
                 oldProps["$[]="](dom.attributes[i].name, dom.attributes[i].value);
               }
@@ -797,13 +797,14 @@ module Preact
               // Instantiate the new component
               // validate props
               validate_props(newType, newProps);
-              // The check above verifies that newType is suppose to be constructed
+              newProps.$freeze();
+              // The check above verifies that newType is supposed to be constructed
               newVNode._component = c = newType.$new(newProps, componentContext);
 
               if (provider && provider !== nil) provider.$sub(c);
 
               c.props = newProps;
-              if (c.state === nil || !c.state) c.state = Opal.Hash.$new();
+              if (c.state === nil || !c.state) c.state = Opal.hash();
               c.context = componentContext;
               c._globalContext = globalContext;
               isNew = c._dirty = true;
@@ -811,11 +812,12 @@ module Preact
             }
 
             // Invoke get_derived_state_from_props
-            if (c._nextState === nil) {
+            if (!c._nextState || c._nextState === nil) {
               c._nextState = c.state;
             }
 
             if (!isNew) { validate_props(newType, newProps); }
+            newProps.$freeze();
             if (c["$respond_to?"]("get_derived_state_from_props")) {
               if (c._nextState == c.state) {
                 c._nextState = c._nextState.$dup();
@@ -825,6 +827,7 @@ module Preact
 
             oldProps = c.props;
             oldState = c.state;
+            c._nextState.$freeze();
 
             // Invoke pre-render lifecycle methods
             if (isNew) {
@@ -971,6 +974,13 @@ module Preact
 
       function is_a_vnode(type) { return type === vnode_class; }
       function is_nil() { return false; }
+      function vnode_eql(me, other) {
+        for(let prop in me) {
+          if (prop === 'props') { continue; }
+          else if (me[prop] != other[prop]) { return false; }
+        }
+        return me.props["$=="](other.props);
+      }
 
       self.createVNode = function(type, props, key, ref, original) {
         // V8 seems to be better at detecting type shapes if the object is allocated from the same call site
@@ -993,24 +1003,13 @@ module Preact
           _component: null,
           _hydrating: null,
           constructor: undefined,
-          _original: original == null ? ++vnodeId : original,
+          _original: (original == null) ? ++vnodeId : original,
           "$is_a?": is_a_vnode,
-          "$==": eql = function(other) {
-            for(let prop in vnode) {
-              if (prop === 'props') {
-                let res = vnode[prop]["$=="](other[prop]);
-                if (!res) return false;
-              } else if (vnode[prop] != other[prop]) {
-                return false;
-              }
-            }
-            return true;
-          },
+          "$==": eql = function(other) { return vnode_eql(vnode, other); },
           "$eql?": eql,
           "$nil?": is_nil,
           "$$is_vnode": true
         };
-
         return vnode;
       }
 
@@ -1046,7 +1045,7 @@ module Preact
           // our custom `_children` property.
           vnode,
           ov ? oldVNode : EMPTY_OBJ,
-          Opal.Hash.$new(),
+          Opal.hash(),
           parentDom.ownerSVGElement !== undefined,
           nohy_reno ? [replaceNode] : ov ? null : parentDom.firstChild ? slice.call(parentDom.childNodes) : null,
           commitQueue,
@@ -1219,7 +1218,7 @@ module Preact
       end
 
       def _enqueue_render(c)
-        if ((`!c._dirty` && (`c._dirty = true`) && rerender_queue.push(c) && `!self.process._rerenderCount++`))
+        if ((`!c._dirty` && (`c._dirty = true`) && (rerender_queue << c) && `!self.process._rerenderCount++`))
           `setTimeout(self.process)`
         end
       end
@@ -1323,7 +1322,7 @@ module Preact
 
       def _render_element(element, props, &block)
         pr = Preact.render_buffer
-        pr[pr.length-1].push(create_element(element, props, nil, &block))
+        pr[pr.length-1] << create_element(element, props, nil, &block)
         nil
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.10.0.rc1
+  version: 22.11.0.rc1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.21
+        version: 3.13.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.21
+        version: 3.13.23
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: opal-activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-asset-manager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.10.0.rc1
+        version: 22.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.10.0.rc1
+        version: 22.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.10.0.rc1
+        version: 22.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.10.0.rc1
+        version: 22.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement