isomorfeus-preact 23.9.0.rc5 → 23.9.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d444d107a9f4342d932c6ee2874ce754c8fe7bffbbdb5dc484a9e068fae3cdd
-  data.tar.gz: 53b6ee295e9104a4fcdb57b993641e9f9856a20498f991e4172d0554d1fcdb02
+  metadata.gz: d5aa4a25a9b3f27b2951a433289c589471801da4b3b66d1819bb75d70199808d
+  data.tar.gz: b4f0f1192906a0bfee1d47d484c166a5e065756f6b52f80efc5a384e2812b1dc
 SHA512:
-  metadata.gz: 59a632dc3ea15976a62cb50d98b113d0681c6c786fce8806c07a76285454da61e639499556dc0a440ca3f5a7491db64826b9cd2cbed20efa3b5e62bd554f3add
-  data.tar.gz: a3dedb4b6551c642584aea4db408c816253a9200e586898d5fa1c356f930fbe6d16d39cd1e9bebab0ffc5a48a2027091f210864911314eac8d843f24aa73bf31
+  metadata.gz: 2602c1a0568bb8db7288dd6c5cc4d24660810012d6ac01bede2fbaf6a79e1bc17aceeb27261f0aa02392531aa19c2247148b9fe84424048f707ff49e30dc620c
+  data.tar.gz: '087bd77fb267ccb1d04b38264d98e295255c5e9fa30f4877e7e93843712b8cf03e77659d01f23160b753295bfc7626ebecfaa636261d618436701044b3549ea8'

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '23.9.0.rc5'
+    VERSION = '23.9.0.rc6'
   end
 end

data/lib/preact.rb

@@ -2,9 +2,49 @@
 # helpers: hash_get, hash_put
 
 if RUBY_ENGINE == 'opal'
-  class VNode
-    # just a empty place holder to make is_a?(VNode) work
-    # internally using the js implementation
+  %x{
+    let vnodeId = 0;
+
+    function vnode_eql(me, other) {
+      for(let prop in me) {
+        if (prop === 'props' && !(me[prop]["$=="](other[prop]))) {
+          return false;
+        } else if (me[prop] != other[prop]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    class VNode {
+      constructor(type, props, key, ref, original) {
+        this.type = type;
+        this.props = props;
+        this.key = key;
+        this.ref = ref;
+        this._children = null;
+        this._parent = null;
+        this._depth = 0;
+        this._dom = null;
+        this._nextDom = undefined;
+        this._component = null;
+        this._hydrating = null;
+        this._original = (original == null || original == nil) ? ++vnodeId : original;
+        this.constructor = undefined;
+      }
+      "$=="(other) { return vnode_eql(this, other); }
+      "$eql?"(other) { return vnode_eql(this, other); }
+      "$is_a?"(t) { return t === Opal.VNode; }
+      "$type"() { return this.type; }
+      "$props"() { return this.props; }
+      "$key"() { return this.key; }
+      "$ref"() { return this.ref; }
+    }
+  }
+  class VNode < `VNode`
+    def self.new(type, props, key, ref, original)
+      return `new VNode(type, props, key, ref, original)`
+    end
   end
 end
 
@@ -13,18 +53,9 @@ class Fragment
     @props = props
   end
 
-  if RUBY_ENGINE == 'opal'
-    def render
-      `Opal.Preact.render_buffer.pop()`
-      children = @props[:children]
-      `Opal.Preact.render_buffer.push(children.$$is_array ? children : [children])`
-      nil
-    end
-  else
-    def render
-      ::Preact.render_buffer.pop
-      ::Preact.render_buffer.push(@props[:children])
-    end
+  def render
+    ::Preact.render_buffer.pop
+    ::Preact.render_buffer.push(@props[:children])
   end
 end
 
@@ -34,40 +65,6 @@ module Preact
 
   if RUBY_ENGINE == 'opal'
     %x{
-      let vnodeId = 0;
-
-      function vnode_eql(me, other) {
-        for(let prop in me) {
-          if (prop === 'props' && !(me[prop]["$=="](other[prop]))) {
-            return false;
-          } else if (me[prop] != other[prop]) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      class VNode {
-        constructor(type, props, key, ref, original) {
-          this.type = type;
-          this.props = props;
-          this.key = key;
-          this.ref = ref;
-          this._children = null;
-          this._parent = null;
-          this._depth = 0;
-          this._dom = null;
-          this._nextDom = undefined;
-          this._component = null;
-          this._hydrating = null;
-          this._original = (original == null) ? ++vnodeId : original;
-          this.constructor = undefined;
-        }
-        "$=="(other) { return vnode_eql(this, other); }
-        "$eql?"(other) { return vnode_eql(this, other); }
-        "$is_a?"(t) { return t === Opal.VNode; }
-      }
-
       function _catchError(error, vnode, oldVNode) {
         let component, ctor, handled;
 
@@ -97,12 +94,12 @@ module Preact
         throw error;
       }
 
-      const EMPTY_OBJ = new VNode();
+      const EMPTY_VNODE = new VNode();
       const EMPTY_ARR = [];
       const slice = EMPTY_ARR.slice;
 
       function hash_fetch(hash, key) {
-        let val = $hash_get(hash, key);
+        let val = hash.get(key);
         return (val === undefined || val === null) ? nil : val;
       }
 
@@ -297,8 +294,8 @@ module Preact
       ) {
         let i, j, oldVNode, childVNode, newDom, firstChildDom, refs;
 
-        // This is a compression of oldParentVNode!=null && oldParentVNode != EMPTY_OBJ && oldParentVNode._children || EMPTY_ARR
-        // as EMPTY_OBJ._children should be `undefined`.
+        // This is a compression of oldParentVNode!=null && oldParentVNode != EMPTY_VNODE && oldParentVNode._children || EMPTY_ARR
+        // as EMPTY_VNODE._children should be `undefined`.
         let oldChildren = (oldParentVNode && oldParentVNode !== nil && oldParentVNode._children) ? oldParentVNode._children : EMPTY_ARR;
 
         let oldChildrenLength = oldChildren.length;
@@ -307,7 +304,7 @@ module Preact
         for (i = 0; i < renderResult.length; i++) {
           childVNode = renderResult[i];
 
-          if (childVNode === nil || childVNode == null || typeof childVNode === 'boolean' || childVNode.$$is_boolean) {
+          if (childVNode === nil || childVNode == null || typeof childVNode === 'boolean' || childVNode.$$is_boolean || typeof childVNode === 'number' || childVNode.$$is_number) {
             childVNode = newParentVNode._children[i] = null;
           }
           // If this newVNode is being reused (e.g. <div>{reuse}{reuse}</div>) in the same diff,
@@ -333,7 +330,7 @@ module Preact
           } else if (childVNode.$$is_array) {
             childVNode = newParentVNode._children[i] = new VNode(
               Opal.Fragment,
-              #{{ children: `childVNode` }},
+              new Map([['children', childVNode]]),
               null,
               null,
               null
@@ -357,6 +354,7 @@ module Preact
           if (childVNode === nil || childVNode == null) {
             continue;
           }
+
           childVNode._parent = newParentVNode;
           childVNode._depth = newParentVNode._depth + 1;
 
@@ -392,7 +390,7 @@ module Preact
             }
           }
 
-          oldVNode = (oldVNode && oldVNode !== nil) ? oldVNode : EMPTY_OBJ;
+          oldVNode = (oldVNode && oldVNode !== nil) ? oldVNode : EMPTY_VNODE;
 
           // Morph the old element into the new one, but don't append it to the dom yet
           diff(
@@ -792,7 +790,7 @@ module Preact
         if (newType.declared_props && newType.declared_props !== nil) {
           #{
             `newType.declared_props`.each do |prop, value|
-              `if (value.has("default") && !newProps.has(prop)) { newProps.set(prop, value.get("default")) }`
+              `if (value.has("default") && !newProps.has(prop)) { newProps.set(prop, hash_fetch(value, "default")) }`
               nil
             end
           }
@@ -973,7 +971,7 @@ module Preact
 
             c._force = false;
 
-            } else if (
+          } else if (
             excessDomChildren == null &&
             newVNode._original === oldVNode._original
           ) {
@@ -1021,8 +1019,6 @@ module Preact
         });
       }
 
-
-
       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
         // Do not inline into createElement and coerceToVNode!
@@ -1035,7 +1031,7 @@ module Preact
         // element..
         let isHydrating = typeof replaceNode === 'function';
 
-        let reno = (replaceNode !== nil && replaceNode);
+        let reno = (replaceNode && replaceNode !== nil);
         let nohy_reno = (!isHydrating && reno);
 
         // To be able to support calling `render()` multiple times on the same
@@ -1049,23 +1045,31 @@ module Preact
 
         let ov = (oldVNode && oldVNode !== nil);
 
-        vnode = (
-          nohy_reno || parentDom
-        )._children = self.$create_element(Opal.Fragment, nil, [vnode]);
+        vnode = (nohy_reno ? replaceNode : parentDom)._children = self.$create_element(Opal.Fragment, nil, [vnode]);
 
         // List of effects that need to be called after diffing.
         let commitQueue = [];
+
+        // Determine the new vnode tree and store it on the DOM element on
+        // our custom `_children` property.
         diff(
+          // parentDom
           parentDom,
-          // Determine the new vnode tree and store it on the DOM element on
-          // our custom `_children` property.
+          // newVNode
           vnode,
-          ov ? oldVNode : EMPTY_OBJ,
+          // oldVNode
+          ov ? oldVNode : EMPTY_VNODE,
+          // globalContext
           new Map(),
+          // isSvg
           parentDom.ownerSVGElement !== undefined,
+          // excessDomChildren
           nohy_reno ? [replaceNode] : ov ? null : parentDom.firstChild ? slice.call(parentDom.childNodes) : null,
+          // commitQueue
           commitQueue,
+          // oldDom
           nohy_reno ? replaceNode : ov ? oldVNode._dom : parentDom.firstChild,
+          // isHydrating
           isHydrating
         );
 
@@ -1119,7 +1123,7 @@ module Preact
 
       self.process = function() {
         let queue;
-        while ((self.process._rerenderCount = self.rerender_queue.length)) {
+        while ((self.rerender_count = self.rerender_queue.length)) {
           queue = self.rerender_queue.sort((a, b) => a._vnode._depth - b._vnode._depth);
           self.rerender_queue = [];
           // Don't update `renderCount` yet. Keep its value non-zero to prevent unnecessary
@@ -1129,7 +1133,8 @@ module Preact
           });
         }
       }
-      self.process._rerenderCount = 0;
+      self.rerender_count = 0;
+      self.rerender_queue = [];
     }
   else
     IS_NON_DIMENSIONAL = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|^--/i.freeze
@@ -1153,11 +1158,7 @@ module Preact
 
     def clone_element(vnode, props = nil, children = nil)
       normalized_props = {}
-      if RUBY_ENGINE == 'opal'
-        normalized_props.merge!(`vnode.props`)
-      else
-        normalized_props.merge!(vnode.props)
-      end
+      normalized_props.merge!(vnode.props)
 
       if props
         normalized_props.merge!(props)
@@ -1170,11 +1171,7 @@ module Preact
 
       normalized_props[:children] = children unless children.nil?
 
-      if RUBY_ENGINE == 'opal'
-        `self.createVNode(vnode.type, normalized_props, #{key || `vnode.key`}, #{ref || `vnode.ref`}, null)`
-      else
-        ::VNode.new(vnode.type, normalized_props, key || vnode.key, ref || vnode.ref)
-      end
+      ::VNode.new(vnode.type, normalized_props, key || vnode.key, ref || vnode.ref)
     end
 
     def create_context(const_name, default_value = nil)
@@ -1191,9 +1188,10 @@ module Preact
     if RUBY_ENGINE == 'opal'
       attr_accessor :render_buffer
       attr_accessor :rerender_queue
+      attr_accessor :rerender_count
 
       def is_renderable?(res)
-        `(res !== null && res !== undefined && res !== nil && res.$$is_string)`
+        `!!(res && res !== nil && res.$$is_string)`
       end
 
       def create_element(type, props = nil, children = nil)
@@ -1225,13 +1223,20 @@ module Preact
         end
 
         %x{
-          if (children !== nil && children !== null) { normalized_props.set("children", children); }
+          if (children !== nil && children !== null) {
+            normalized_props.set("children", children.$$is_array ? children : [children]);
+          } else {
+            children = normalized_props.get("children");
+            if (children && !children.$$is_array) {
+              normalized_props.set("children", [children]);
+            }
+          }
           return self.createVNode(type, normalized_props, key, ref, null);
         }
       end
 
       def _enqueue_render(c)
-        if ((`!c._dirty` && (`c._dirty = true`) && (rerender_queue << c) && `!self.process._rerenderCount++`))
+        if ((`!c._dirty` && (`c._dirty = true`) && (self.rerender_queue << c) && `!self.rerender_count++`))
           `setTimeout(self.process)`
         end
       end
@@ -1246,16 +1251,12 @@ module Preact
         nil
       end
 
-      def hydrate(vnode, container_node)
-        render(vnode, container_node, `self.render`)
-      end
-
       def element_or_query_to_n(element_or_query)
         if `!element_or_query || element_or_query === nil`
           return `null`
         elsif `(element_or_query instanceof HTMLElement)`
           return element_or_query
-        elsif `(typeof element_or_query === 'string')` || element_or_query.is_a?(String)
+        elsif `(typeof element_or_query === 'string') || element_or_query.$$is_string`
           return `document.body.querySelector(element_or_query)`
         elsif `(typeof element_or_query === 'function')`
           return element_or_query
@@ -1266,6 +1267,10 @@ module Preact
         end
       end
 
+      def hydrate(vnode, container_node)
+        render(vnode, container_node, `self.render`)
+      end
+
       def render(vnode, container_node, replace_node = nil)
         _init_render
         container_node = element_or_query_to_n(container_node)
@@ -1322,4 +1327,3 @@ module Preact
     end # RUBY_ENGINE
   end
 end
-

metadata

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