isomorfeus-preact 22.9.0.rc9 → 22.10.0.rc1

data/lib/preact.rb

@@ -3,32 +3,6 @@ if RUBY_ENGINE == 'opal'
     # just a empty place holder to make is_a?(VNode) work
     # internally using the js implementation
   end
-else
-  class VNode
-    # full ruby implementation
-    attr_accessor :__c
-    attr_reader :_children
-    attr_reader :_component
-    attr_reader :_depth
-    attr_reader :_dom
-    attr_reader :_hydrating
-    attr_reader :_nextDom
-    attr_reader :_original
-    attr_reader :constructor
-    attr_reader :key
-    attr_reader :props
-    attr_reader :ref
-    attr_reader :type
-
-    def initialize(type, props, key, ref, original)
-      @type = type
-      @props = props
-      @key = key
-      @ref = ref
-      @_depth = 0
-      @_original = original.nil? ? Preact._vnode_id += 1 : original
-    end
-  end
 end
 
 class Fragment
@@ -496,11 +470,11 @@ module Preact
               dom.style.cssText = oldValue = '';
             }
 
-            if (value && value !== nil && value["$is_a?"](Opal.Hash)) {
+            if (value && value !== nil && value.$$is_hash) {
               value = value.$to_n();
             }
 
-            if (oldValue && oldValue !== nil && oldValue["$is_a?"](Opal.Hash)) {
+            if (oldValue && oldValue !== nil && oldValue.$$is_hash) {
               oldValue = oldValue.$to_n();
             }
 
@@ -1033,7 +1007,8 @@ module Preact
             return true;
           },
           "$eql?": eql,
-          "$nil?": is_nil
+          "$nil?": is_nil,
+          "$$is_vnode": true
         };
 
         return vnode;
@@ -1142,11 +1117,9 @@ module Preact
       self.process._rerenderCount = 0;
     }
   else
-    IGNORED_PROPS = %i[key ref __self __source].freeze
     IS_NON_DIMENSIONAL = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|^--/i
     JS_TO_CSS = {}
     ENCODED_ENTITIES = /[&<>"]/
-    VOID_ELEMENTS = /^(area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)$/
   end
 
   class << self
@@ -1184,7 +1157,7 @@ module Preact
       if RUBY_ENGINE == 'opal'
         `self.createVNode(vnode.type, normalized_props, #{key || `vnode.key`}, #{ref || `vnode.ref`}, null)`
       else
-        _create_vnode(vnode.type, normalized_props, key || vnode.key, ref || vnode.ref, nil)
+        VNode.new(vnode.type, normalized_props, key || vnode.key, ref || vnode.ref)
       end
     end
 
@@ -1199,20 +1172,20 @@ module Preact
       Isomorfeus.reset_something_loading
     end
 
-    def is_renderable?(block_result)
-      block_result &&
-        (block_result.is_a?(VNode) || block_result.is_a?(String) || block_result.is_a?(Numeric) ||
-          (block_result.is_a?(Array) && block_result.length > 0 && is_renderable?(block_result[0])))
-    end
-
     if RUBY_ENGINE == 'opal'
       attr_accessor :_vnode_id
       attr_accessor :render_buffer
       attr_accessor :rerender_queue
 
-      def create_element(type, props = nil, children = nil, &block)
+      def is_renderable?(block_result)
+        block_result &&
+          (block_result.JS['$$is_vnode'] || block_result.JS['$$is_string'] || block_result.is_a?(Numeric) ||
+            (block_result.JS['$$is_array'] && `block_result.length > 0` && is_renderable?(block_result[0])))
+      end
+
+      def create_element(type, props = nil, children = nil)
         if props
-          if props.is_a?(Hash)
+          if props.JS['$$is_hash']
             normalized_props = props.dup
             key = normalized_props.delete(:key)
             ref = normalized_props.delete(:ref)
@@ -1229,17 +1202,18 @@ module Preact
         end
 
         if block_given?
-          pr = render_buffer
+          pr = `self.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
+          block_result = yield
+          c = pr.JS.pop()
+          %x{
+            if (self["$is_renderable?"](block_result)) { c.push(block_result); }
+            if (c.length > 0) { children = c; }
+          }
         end
 
         %x{
-          if (children !== nil && children !== null) { #{normalized_props[:children] = children} }
+          if (children !== nil && children !== null) { normalized_props["$[]="]("children", children); }
           return self.createVNode(type, normalized_props, key, ref, null);
         }
       end
@@ -1253,7 +1227,7 @@ module Preact
       def _render_element(component, props, &block)
         %x{
           let opr = Opal.Preact.render_buffer;
-          opr[opr.length-1].push(#{self.create_element(component, props, nil, &block)});
+          opr[opr.length-1].push(#{create_element(component, props, nil, &block)});
         }
         nil
       end
@@ -1290,14 +1264,6 @@ module Preact
         `self.render(null, element_or_query)`
       end
     else # RUBY_ENGINE
-      def _vnode_id
-        Thread.current[:@_isomorfeus_preact_vnode_id] ||= 0
-      end
-
-      def _vnode_id=(i)
-        Thread.current[:@_isomorfeus_preact_vnode_id] = i
-      end
-
       def render_buffer
         Thread.current[:@_isomorfeus_preact_render_buffer]
       end
@@ -1314,46 +1280,15 @@ module Preact
         Thread.current[:@_isomorfeus_preact_rerender_queue] = i
       end
 
-      def _create_vnode(type, props, key, ref, original)
-        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)
+      def is_renderable?(block_result)
+        block_result &&
+          (block_result.is_a?(VNode) || block_result.is_a?(String) || block_result.is_a?(Numeric) ||
+            (block_result.is_a?(Array) && block_result.length > 0 && is_renderable?(block_result[0])))
       end
 
       def _encode_entities(input)
         s = input.to_s
         return s unless ENCODED_ENTITIES.match?(s)
-        s.gsub(/&/, '&amp;').gsub(/</, '&lt;').gsub(/>/, '&gt;').gsub(/"/, '&quot;')
         # TODO performance maybe, maybe similar to new js way, need to measure
         # for (; i<str.length; i++) {
         #   switch (str.charCodeAt(i)) {
@@ -1367,15 +1302,7 @@ module Preact
         #   out += ch;
         #   start = i + 1;
         # }
-      end
-
-      def _get_children(accumulator, children)
-        if children.is_a?(Array)
-          children.reduce(accumulator) { |accumulator, child| _get_children(accumulator, child) }
-        elsif children != nil && children != false
-          accumulator.push(children)
-        end
-        accumulator
+        s.gsub(/&/, '&amp;').gsub(/</, '&lt;').gsub(/>/, '&gt;').gsub(/"/, '&quot;')
       end
 
       def _style_obj_to_css(v)
@@ -1400,218 +1327,15 @@ module Preact
         nil
       end
 
-      def _render_to_string(vnode, context, opts, inner = nil, is_svg_mode = false, select_value = nil)
-        return '' if !vnode || vnode == true
-
-        if vnode.is_a?(String) # text nodes
-          return _encode_entities(vnode)
-        elsif vnode.is_a?(Numeric) # numeric nodes
-          return vnode.to_s
-        end
-
-        if vnode.is_a?(Array) # array of nodes
-          rendered = ''
-          vnode.each_index do |i|
-            rendered << _render_to_string(vnode[i], context, opts, inner, is_svg_mode, select_value)
-          end
-          return rendered
-        end
-
-        node_name = vnode.type
-        props = vnode.props
-        is_component = false
-        is_fragment = false
-
-        # components
-        if !node_name.is_a?(String) && (node_name.ancestors.include?(Preact::Component) || is_fragment = node_name.ancestors.include?(Fragment))
-          is_component = true
-          if opts && opts[:shallow] && (inner || opts[:render_root_component] == false)
-            node_name = node_name.class.to_s
-          elsif is_fragment
-            children = []
-            _get_children(children, vnode.props[:children])
-            return _render_to_string(children, context, opts, opts&.fetch(:shallow_high_order) != false, is_svg_mode, select_value)
-          else
-            rendered = nil
-
-            vnode.__c = {
-              __v: vnode,
-              context: context,
-              props: vnode.props,
-              __d: true
-            }
-
-            c = vnode.__c
-            # silently drop state updates
-            mark_as_dirty = proc { c[:__d] = true }
-            c[:set_state] = mark_as_dirty,
-            c[:force_update] = mark_as_dirty,
-
-            # class-based components
-            cx_type = node_name.context_type
-            provider = cx_type && context[cx_type.context_id]
-            cctx = cx_type ? (provider ? provider.props[:value] : cx_type.value) : context
-
-            # validate props
-            declared_props = node_name.instance_variable_get(:@declared_props)
-            if declared_props
-              declared_props.each do |prop, value|
-                props[prop] = value[:default] if value.key?(:default) && !props.key?(prop)
-              end
-              node_name.validate_props(props) if Isomorfeus.development?
-            end
-
-            c = vnode.__c = node_name.new(props, cctx)
-            c.__v = vnode
-            # turn off stateful re-rendering:
-            c._dirty = c.__d = true
-            c.instance_variable_set(:@props, props) if c.props.nil?
-            c.instance_variable_set(:@state, {}) if c.state.nil?
-
-            c._next_state = c.__s = c.state if c._next_state == nil && c.__s == nil
-
-            c.instance_variable_set(:@context, cctx)
-
-            if c.respond_to?(:get_derived_state_from_props)
-              c.instance_variable_set(:@state, {}.merge!(c.state, c.get_derived_state_from_props(c.props, c.state)))
-            end
-
-            rendered = c.render
-
-            context = {}.merge!(context, c.get_child_context) if c.respond_to?(:get_child_context)
-
-            return _render_to_string(rendered, context, opts, opts&.fetch(:shallow_high_order) != false, is_svg_mode, select_value)
-          end
-        end
-
-        # render JSX to HTML
-        node_name_s = node_name.to_s
-        s = "<#{node_name_s}"
-        prop_children = nil
-        html = nil
-
-        if props
-          attrs = props.keys
-
-          # allow sorting lexicographically for more determinism (useful for tests, such as via preact-jsx-chai)
-          attrs.sort! if opts && opts[:sort_attributes] == true
-
-          attrs.each do |name|
-            v = props[name]
-            if name == :children
-              prop_children = v
-              next
-            end
-
-            next if UNSAFE_NAME.match?(name.to_s)
-            next if !(opts && opts[:all_attributes]) && IGNORED_PROPS.include?(name)
-
-            if name == :default_value
-              name = :value
-            elsif name == :class_name
-              next if props[:class] != nil
-              name = :class
-            elsif is_svg_mode && name.to_s.match?(/^xlink:?./)
-              name = name.to_s.downcase.gsub(/^xlink:?/, 'xlink:')
-            end
-
-            if name == :html_for
-              next if props.key?(:for)
-              name = :for
-            end
-
-            v = _style_obj_to_css(v) if name == :style && v && v.is_a?(Hash)
-
-            # always use string values instead of booleans for aria attributes
-            # also see https://github.com/preactjs/preact/pull/2347/files
-            v = v.to_s if name.to_s.start_with?('aria') && (v == true || v == false)
-
-            if name == :dangerouslySetInnerHTML
-              html = v && v[:__html]
-            elsif node_name == :textarea && name == :value
-              # <textarea value="a&b"> --> <textarea>a&amp;b</textarea>
-              prop_children = v
-            elsif name.to_s.start_with?('on_')
-              next
-            elsif v || v == 0 || v == '' && !v.is_a?(Proc)
-              if v == true || v == ''
-                v = name
-                # in non-xml mode, allow boolean attributes
-                if !opts || !opts[:xml]
-                  s << " #{name}"
-                  next
-                end
-              end
-
-              if name == :value
-                if node_name == :select
-                  select_value = v
-                  next
-                elsif (
-                  # If we're looking at an <option> and it's the currently selected one
-                  node_name == :option &&
-                  select_value == v &&
-                  # and the <option> doesn't already have a selected attribute on it
-                  props[:selected] == nil
-                  )
-                  s << ' selected'
-                end
-              end
-              s << " #{name}=\"#{_encode_entities(v)}\""
-            end
-          end
-        end
-
-        s << '>'
-
-        raise "#{node_name_s} is not a valid HTML tag name in #{s}" if (UNSAFE_NAME.match?(node_name_s))
-
-        is_void = VOID_ELEMENTS.match?(node_name_s)
-        pieces = []
-
-        if html
-          s << html
-        elsif prop_children
-          children = []
-          if _get_children(children, prop_children).size > 0
-            last_was_text = false
-
-            children.each do |child|
-              if child != nil && child != false
-                child_svg_mode = node_name == :svg ? true : ((node_name == :foreignObject) ? false : is_svg_mode)
-                ret = _render_to_string(child, context, opts, true, child_svg_mode, select_value)
-
-                # Skip if we received an empty string
-                if ret
-                  pieces.push(ret)
-                end
-              end
-            end
-          end
-        end
-
-        if (pieces.length > 0) || html
-          s << pieces.join('')
-        elsif opts && opts[:xml]
-          return s.chop! << ' />'
-        end
-
-        if is_void && !children && !html
-          s = s.sub(/>$/, ' />')
-        else
-          s << "</#{node_name}>"
-        end
-
-        return s
-      end
-
-      def render_to_string(vnode, context = nil, opts = nil)
+      def render_to_string(vnode, context = nil)
         _init_render
         context = {} unless context
-        _render_to_string(vnode, context, opts)
+        _render_to_string(vnode, context, false, nil)
       end
     end # RUBY_ENGINE
   end
 end
 
-Preact._vnode_id = 0
+if RUBY_ENGINE == 'opal'
+  Preact._vnode_id = 0
+end

data/lib/redirect.rb

@@ -2,6 +2,8 @@ class Redirect < Preact::Component
   EVENT_PUSH_STATE = "pushState"
   EVENT_REPLACE_STATE = "replaceState"
 
+  self.context_type = RouterContext
+
   def initialize(props, context)
     super(props, context)
     if RUBY_ENGINE == 'opal'
@@ -31,4 +33,3 @@ class Redirect < Preact::Component
     nil
   end
 end
-Redirect.context_type = RouterContext

data/lib/route.rb

@@ -1,4 +1,7 @@
 class Route < Preact::Component
+
+  self.context_type = RouterContext
+
   render do
     route_match = @context[:router][:matcher].call(props[:path], @context[:location])
     matches, params = props[:match] || route_match
@@ -14,4 +17,3 @@ class Route < Preact::Component
     end
   end
 end
-Route.context_type = RouterContext

data/lib/switch.rb

@@ -1,4 +1,7 @@
 class Switch < Preact::Component
+
+  self.context_type = RouterContext
+
   def initialize(props, context)
     super(props, context)
     if RUBY_ENGINE == 'opal'
@@ -76,4 +79,3 @@ class Switch < Preact::Component
     child
   end
 end
-Switch.context_type = RouterContext

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 22.9.0.rc9
+  version: 22.10.0.rc1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-06 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.rc9
+        version: 22.10.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc9
+        version: 22.10.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc9
+        version: 22.10.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 22.9.0.rc9
+        version: 22.10.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-puppetmaster
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,11 +140,18 @@ description: Write Preact Components in Ruby, including styles and reactive data
 email:
 - jan@kursator.com
 executables: []
-extensions: []
+extensions:
+- ext/isomorfeus_preact_ext/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- ext/isomorfeus_preact_ext/extconf.rb
+- ext/isomorfeus_preact_ext/fio-stl.h
+- ext/isomorfeus_preact_ext/isomorfeus_preact_ext.c
+- ext/isomorfeus_preact_ext/isomorfeus_preact_ext.h
+- ext/isomorfeus_preact_ext/preact.c
+- ext/isomorfeus_preact_ext/vnode.c
 - lib/browser/delegate_native.rb
 - lib/browser/document.rb
 - lib/browser/element.rb
@@ -163,9 +184,11 @@ files:
 - lib/preact/component.rb
 - lib/preact/component_resolution.rb
 - lib/preact/context.rb
-- lib/preact/elements.rb
+- lib/preact/html_elements.rb
+- lib/preact/math_ml_elements.rb
 - lib/preact/module_component_resolution.rb
 - lib/preact/prop_declaration_mixin.rb
+- lib/preact/svg_elements.rb
 - lib/redirect.rb
 - lib/route.rb
 - lib/router.rb
@@ -187,14 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Preact Components for Isomorfeus.