isomorfeus-preact 23.6.0.rc3 → 23.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa2d4629e93e2c991c3b17ec45a1799459bf0220097495ba0eaa22fb5f41784
-  data.tar.gz: fcbb9c76ba1e3079aa271409d0d47707102be34bdbecdaa8f23a71b447a2b696
+  metadata.gz: 779986a2bb11f9fa0c6e2843cc7dd178aa260d61545a11e9880029e814e9271a
+  data.tar.gz: e3f778adfa0d62c4e51528f9823a8c83cf7a0ed2e49e89a8a714203159a3f6e9
 SHA512:
-  metadata.gz: f63f57050045e918fa0f3463c09b20171ed48125f1f64206cd7ee31cead8255b8d1c62c06c448876b634f498f087f6fcc65d78df2d8fffc1b5ce7f6f22c1b4eb
-  data.tar.gz: 301be5e42841bfd302885d0fca5a0d449ff0c8245ef7329633d5261f8a52e58bf6f4605d2509f01d646f9beb14b1fa7f65da4409c1e4657888d576d77fdc7517
+  metadata.gz: 6897c32a84bf1802b752eb2909634e688dff95f0136cf93ba5fc87b78b6fb7bc719e392e230212a454e4aeb2983860af08044a980c2e1727e3e6c6b9d69f4b7a
+  data.tar.gz: 63aa3a8557f8ac5101732670b4abb38f9138e2eecf0c801dacde6f3bed47afe44d68f283a11d16de7f6504f7e29eaa8acfc24b22107d493a5b89dab1d0a8bcd5

data/ext/isomorfeus_preact_ext/preact.c

@@ -277,6 +277,7 @@ void internal_render_to_string(VALUE vnode, VALUE context, VALUE is_svg_mode,
 
       VALUE orig_name_id = name_id;
       VALUE name_s = rb_id2str(name_id);
+
       if (rb_reg_match(rUnsafe, name_s) == Qtrue)
         continue;
 
@@ -292,7 +293,7 @@ void internal_render_to_string(VALUE vnode, VALUE context, VALUE is_svg_mode,
         // <textarea value="a&b"> --> <textarea>a&amp;b</textarea>
         children = value;
       } else if (value != Qnil && value != Qfalse &&
-                 rb_obj_is_proc(value) != Qtrue) {
+                 rb_obj_is_proc(value) != Qtrue && rb_obj_is_method(value) != Qtrue) {
         if (value == Qtrue ||
             ((TYPE(value) == T_STRING) && (RSTRING_PTR(value)[0] == 0))) {
           // if (name_id == id_class || name_id == id_style) { continue; }

data/lib/isomorfeus/preact/ssr.rb

@@ -1,8 +1,7 @@
 module Isomorfeus
   class PreactSSR
-    def initialize(component_name, props, session_id, location, locale)
-      @session_id = session_id
-      @component_name = component_name
+    def initialize(component_name, props, location, locale)
+      @component = component_name.is_a?(String) ? self.class.const_get(component_name) : component_name
       @props = props
       @location = location
       @locale = locale
@@ -25,12 +24,7 @@ module Isomorfeus
           Thread.current[:isomorfeus_user] = c
         end
       end
-      render_component_to_string(@component_name, @props)
-    end
-
-    def render_component_to_string(component_name, props)
-      component = component_name.is_a?(String) ? self.class.const_get(component_name) : component_name
-      ::Preact.render_to_string(::Preact.create_element(component, props))
+      ::Preact.render_to_string(::Preact.create_element(@component, @props))
     end
   end
 end

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, styles, data, status)
-      Thread.current[:local_cache][key] = [rendered_tree, styles, data, status]
+    def store(key, rendered_tree, styles, status)
+      Thread.current[:local_cache][key] = [rendered_tree, styles, status]
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '23.6.0.rc3'
+    VERSION = '23.6.0.rc5'
   end
 end

data/lib/isomorfeus/preact/view_helper.rb

@@ -9,11 +9,11 @@ module Preact
       if !Isomorfeus.development? && !refresh
         render_result, @_ssr_styles, status = component_cache.fetch(key)
         Isomorfeus.ssr_response_status = status
-        return render_result if render_result
+        return render_result
       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, ssr_data, status) if status >= 200 && status < 300
+      render_result = mount_component(component_name, props, skip_ssr: skip_ssr)
+      status = Isomorfeus.ssr_response_status || 200
+      component_cache.store(key, render_result, ssr_styles, status) if status >= 200 && status < 300
       render_result
     end
 
@@ -23,7 +23,7 @@ module Preact
       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)
+      rendered_tree, application_state, @_ssr_styles = Isomorfeus::TopLevel.mount_component(component_name, props, location, locale, skip_ssr)
       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

data/lib/isomorfeus/props/validator.rb

@@ -9,6 +9,7 @@ module Isomorfeus
       end
 
       def validate!
+        return @v unless @o
         ensured = ensure!
         unless ensured
           set_default_value
@@ -24,6 +25,13 @@ module Isomorfeus
         @v
       end
 
+      def valid_value?
+        validate!
+        true
+      rescue
+        false
+      end
+
       private
 
       # basic tests
@@ -50,10 +58,10 @@ module Isomorfeus
                  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}!")
+                  Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: Dont know how to cast #{@p} to #{cl}!")
                  end
           rescue
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} cast to #{cl} failed!")
+            Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: #{@p} cast to #{cl} failed!")
           end
         end
       end
@@ -75,13 +83,13 @@ module Isomorfeus
       def type!
         return if @o[:allow_nil] && @v.nil?
         if @o.key?(:class)
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} class is not #{@o[:class]}") unless @v.class == @o[:class]
+          Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: #{@p} class is not #{@o[:class]}") unless @v.class == @o[:class]
         elsif @o.key?(:is_a)
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a #{@o[:is_a]}") unless @v.is_a?(@o[:is_a])
+          Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: #{@p} is not a #{@o[:is_a]}") unless @v.is_a?(@o[:is_a])
         elsif @o.key?(:type)
           case @o[:type]
           when :boolean
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a boolean") unless @v.class == TrueClass || @v.class == FalseClass
+            Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: #{@p} is not a boolean") unless @v.class == TrueClass || @v.class == FalseClass
           else
             c_string_sub_types
           end
@@ -101,66 +109,66 @@ module Isomorfeus
 
       # specific validations
       def c_gt(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} not greater than #{v}!") unless @v > v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} not greater than #{v}!") unless @v > v
       end
 
       def c_lt(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} not less than #{v}!") unless @v < v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} not less than #{v}!") unless @v < v
       end
 
       def c_keys(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} keys dont fit!") unless @v.keys.sort == v.sort
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} keys dont match!") unless @v.keys.sort == v.sort
       end
 
       def c_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} length/size is not #{v}") unless @v.length == v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} length/size is not #{v}") unless @v.length == v
       end
 
       def c_matches(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} does not match #{v}") unless v.match?(@v)
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} does not match #{v}") unless v.match?(@v)
       end
 
       def c_max(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @v <= v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is larger than #{v}") unless @v <= v
       end
 
       def c_min(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is smaller than #{v}") unless @v >= v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is smaller than #{v}") unless @v >= v
       end
 
       def c_max_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @v.length <= v
+        Isomorfeus.raise_error(error_class: ArgumentError, 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.length >= v
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is smaller than #{v}") unless @v.length >= v
       end
 
       def c_direction(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is positive") if v == :negative && @v >= 0
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is negative") if v == :positive && @v < 0
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is positive") if v == :negative && @v >= 0
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is negative") if v == :positive && @v < 0
       end
 
       def c_test
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} test condition check failed") unless @o[:test].call(@v)
+        Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} test condition check failed") unless @o[:test].call(@v)
       end
 
       def c_string_sub_types
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} must be a String") unless @v.class == String
+        Isomorfeus.raise_error(error_class: TypeError, message: "#{@c}: #{@p} must be a String") unless @v.class == String
         case @o[:type]
         when :email
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid email address") unless @v.match?(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
+          Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is not a valid email address") unless @v.match?(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
         when :uri
           if RUBY_ENGINE == 'opal'
             %x{
               try {
                 new URL(#@v);
               } catch {
-                #{Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri")}
+                #{Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is not a valid uri")}
               }
             }
           else
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri") unless @v.match?(/\A#{URI.regexp}\z/)
+            Isomorfeus.raise_error(error_class: ArgumentError, message: "#{@c}: #{@p} is not a valid uri") unless @v.match?(/\A#{URI.regexp}\z/)
           end
         end
       end

data/lib/isomorfeus/top_level.rb

@@ -114,8 +114,8 @@ module Isomorfeus
           Isomorfeus.top_component = top
         end
       else
-        def mount_component(component, props, session_id, location, locale, skip_ssr = false)
-          rendered_tree = Isomorfeus::PreactSSR.new(component, props, session_id, location, locale).render(skip_ssr)
+        def mount_component(component, props, location, locale, skip_ssr = false)
+          rendered_tree = Isomorfeus::PreactSSR.new(component, props, location, locale).render(skip_ssr)
           [rendered_tree, Isomorfeus.store.get_state, NanoCSS.instance.renderer[:raw]]
         end
       end

data/lib/lucid_app.rb

@@ -6,13 +6,13 @@ class LucidApp < LucidComponent
 
     def render(&block)
       define_method(:render) do
-        pr = Preact.render_buffer
+        pr = ::Preact.render_buffer
         block_result = _internal_render(pr, &block)
         children = pr.pop
-        if Preact.is_renderable?(block_result)
+        if ::Preact.is_renderable?(block_result)
           children << block_result
         end
-        Preact.create_element(LucidApplicationContext.Provider, state[:_app_ctx], children)
+        ::Preact.create_element(::LucidApplicationContext.Provider, state[:_app_ctx], children)
       end
     end
 

data/lib/lucid_component.rb

@@ -82,21 +82,21 @@ class LucidComponent < Preact::Component
 
   def _internal_render(pr, &block)
     pr << []
-    outer_loading = Isomorfeus.something_loading?
+    outer_loading = ::Isomorfeus.something_loading?
     ex = nil
     begin
       block_result = instance_exec(&block)
     rescue => e
       ex = e
     end
-    if Isomorfeus.something_loading?
-      STDERR.puts "#{@class_name} component still loading ...\n#{ex.message}\n#{ex.backtrace&.join("\n")}" if ex && Isomorfeus.development?
+    if ::Isomorfeus.something_loading?
+      STDERR.puts "#{@class_name} component still loading ...\n#{ex.message}\n#{ex.backtrace&.join("\n")}" if ex && ::Isomorfeus.development?
       pr[pr.length-1].clear
-      block_result = @while_loading_block ? instance_exec(&@while_loading_block) : Preact.create_element('div')
+      block_result = @while_loading_block ? instance_exec(&@while_loading_block) : ::Preact.create_element('div')
     elsif ex
       raise ex
     end
-    Isomorfeus.something_loading! if outer_loading
+    ::Isomorfeus.something_loading! if outer_loading
     block_result
   end
 

data/lib/preact/component_resolution.rb

@@ -59,7 +59,7 @@ module Preact::ComponentResolution
       # the full nesting into account
       constant = nil
       begin
-        if !Isomorfeus.development?
+        if !::Isomorfeus.development?
           @iso_preact_const_cache = {} unless @iso_preact_const_cache
           constant = @iso_preact_const_cache[component_name]
         end
@@ -74,7 +74,7 @@ module Preact::ComponentResolution
       end
 
       if constant
-        if !Isomorfeus.development? && @iso_preact_const_cache.key?(component_name)
+        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)

data/lib/preact/html_elements.rb

@@ -38,7 +38,7 @@ module Preact::HtmlElements
   else
     SUPPORTED_HTML_ELEMENTS.each do |element|
       define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
-        Preact._render_element(element, props, &block)
+        ::Preact._render_element(element, props, &block)
       end
     end
   end
@@ -48,11 +48,11 @@ module Preact::HtmlElements
       el = block.call
       return el if el
     end
-    Preact.render_buffer.last.pop
+    ::Preact.render_buffer.last.pop
   end
 
   def RPE(el)
-    Preact.render_buffer.last << el
+    ::Preact.render_buffer.last << el
     nil
   end
 end

data/lib/preact/math_ml_elements.rb

@@ -46,7 +46,7 @@ module Preact::MathMlElements
   else
     SUPPORTED_MATH_ML_ELEMENTS.each do |element|
       define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
-        Preact._render_element(element, props, &block)
+        ::Preact._render_element(element, props, &block)
       end
     end
   end

data/lib/preact/module_component_resolution.rb

@@ -53,15 +53,15 @@ class Module
       # otherwise pass on method missing
       c = component_name.to_s[0]
       if c == c.upcase
-        if !Isomorfeus.development?
+        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)
+        if constant && constant.respond_to?(:ancestors) && 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)

data/lib/preact/prop_declaration_mixin.rb

@@ -5,7 +5,7 @@ module Preact
     end
 
     def prop(prop_name, validate_hash = { required: true })
-      validate_hash = validate_hash.to_h if validate_hash.class == Isomorfeus::Props::ValidateHashProxy
+      validate_hash = validate_hash.to_h if validate_hash.class == ::Isomorfeus::Props::ValidateHashProxy
       declared_props[prop_name.to_sym] = validate_hash
     end
 
@@ -22,12 +22,12 @@ module Preact
     end
 
     def validate
-      Isomorfeus::Props::ValidateHashProxy.new
+      ::Isomorfeus::Props::ValidateHashProxy.new
     end
 
     def validate_prop(prop, value)
       return false unless declared_props.key?(prop)
-      validator = Isomorfeus::Props::Validator.new(self, prop, value, declared_props[prop])
+      validator = ::Isomorfeus::Props::Validator.new(self, prop, value, declared_props[prop])
       validator.validate!
       true
     end
@@ -36,7 +36,7 @@ module Preact
       props = {} unless props
       declared_props.each_key do |prop|
         if declared_props[prop].key?(:required) && declared_props[prop][:required] && !props.key?(prop)
-          Isomorfeus.raise_error(message: "Required prop '#{prop}' not given!")
+          ::Isomorfeus.raise_error(message: "Required prop '#{prop}' not given!")
         end
       end
       result = true
@@ -48,8 +48,8 @@ module Preact
     end
 
     def validated_prop(prop, value)
-      Isomorfeus.raise_error(message: "No such prop '#{prop}' declared!") unless declared_props.key?(prop)
-      validator = Isomorfeus::Props::Validator.new(self, prop, value, declared_props[prop])
+      ::Isomorfeus.raise_error(message: "No such prop '#{prop}' declared!") unless declared_props.key?(prop)
+      validator = ::Isomorfeus::Props::Validator.new(self, prop, value, declared_props[prop])
       validator.validated_value
     end
 
@@ -58,7 +58,7 @@ module Preact
 
       declared_props.each_key do |prop|
         if declared_props[prop].key?(:required) && declared_props[prop][:required] && !props.key?(prop)
-          Isomorfeus.raise_error(message: "Required prop '#{prop}' not given!")
+          ::Isomorfeus.raise_error(message: "Required prop '#{prop}' not given!")
         end
         props[prop] = nil unless props.key?(prop) # let validator handle value
       end

data/lib/preact/svg_elements.rb

@@ -58,7 +58,7 @@ module Preact::SvgElements
   else
     SUPPORTED_SVG_ELEMENTS.each do |element|
       define_method(element.to_s.underscore.upcase.to_sym) do |props = nil, &block|
-        Preact._render_element(element, props, &block)
+        ::Preact._render_element(element, props, &block)
       end
     end
   end

data/lib/preact.rb

@@ -1205,11 +1205,10 @@ module Preact
         end
 
         if block_given?
-          pr = `self.render_buffer`
-          pr.JS.push([])
+          `self.render_buffer.push([])`
           block_result = yield
-          c = pr.JS.pop()
           %x{
+            const c = self.render_buffer.pop();
             if (self["$is_renderable?"](block_result)) { c.push(block_result); }
             if (c.length > 0) { children = c; }
           }
@@ -1229,8 +1228,9 @@ module Preact
 
       def _render_element(component, props, &block)
         %x{
-          let opr = Opal.Preact.render_buffer;
-          opr[opr.length-1].push(#{create_element(component, props, nil, &block)});
+          const opr = self.render_buffer;
+          if (typeof block === 'function') self.$create_element.$$p = block.$to_proc();
+          opr[opr.length-1].push(self.$create_element(component, props, nil));
         }
         nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 23.6.0.rc3
+  version: 23.6.0.rc5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc3
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc3
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc3
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc3
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement