isomorfeus-preact 23.9.0.rc3 → 23.9.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e407fc877fc823bc4293e77aa42bdfec02301d3c94ab46ab03f64cb1b322ec48
-  data.tar.gz: ac9a74ed17b3bc6506d2108868b812c72f425b5b5a38331667402172e226e787
+  metadata.gz: b99c3271315df3f744c24558a5df45ad2f5386235ed91a6466c59ee8371ae948
+  data.tar.gz: 4e3c3ccf9dccfe9591bc3a3df4bd8c9a710f69c438939b9a241bf213fc008034
 SHA512:
-  metadata.gz: f1a783d3d655b8296ec24c9d402320c7484877b2392cbf5fc095b7b4a3a2e1b240f807febafd2df6c4a7ecf6797420cf44a0622a8759ed471db227967eb1441c
-  data.tar.gz: 6ec873ec434adb9d2c68c4ff3fd892397b758dde1066fa1fc4c3050c9124763d6c1efd64cba77aa9a2c2bc3032fb6ae7ca87de50edcfd7fa8586d706bae0a3b2
+  metadata.gz: 8bf76f033520d26864e46bccc148ffd634dd28f816aecf6165bddbf443eb68cbcae41a4e05baeda7e2fc5c49ff35545d72997a43ac5175543e849ebe749dbe7c
+  data.tar.gz: 328e0c9f13fecd1c54bf0fe50d97603269be718d83d2bad098dd33182e36ea3b00259ac2fe9d79726bcb5ec58a6428f1294e4f6049243f485458db0e374f8286

data/ext/isomorfeus_preact_ext/preact.c

@@ -223,11 +223,6 @@ void internal_render_to_string(VALUE vnode, VALUE context, VALUE is_svg_mode,
       return;
     rb_str_buf_append(rres, rb_funcall(self, id_encode_entities, 1, vnode));
     return;
-  case T_BIGNUM:
-  case T_FIXNUM:
-  case T_FLOAT:
-    rb_str_buf_append(rres, rb_funcall(vnode, id_to_s, 0));
-    return;
   case T_ARRAY:
     len = RARRAY_LEN(vnode);
     for (i = 0; i < len; i++) {

data/lib/isomorfeus/preact/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Preact
-    VERSION = '23.9.0.rc3'
+    VERSION = '23.9.0.rc4'
   end
 end

data/lib/preact.rb

@@ -34,6 +34,40 @@ module Preact
 
   if RUBY_ENGINE == 'opal'
     %x{
+      let vnodeId = 0;
+
+      function vnode_eql(me, other) {
+        for(let prop in me) {
+          if (prop === 'props' && !(vnode[prop]["$=="](other[prop]))) {
+            return false;
+          } else if (vnode[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;
 
@@ -63,7 +97,7 @@ module Preact
         throw error;
       }
 
-      const EMPTY_OBJ = Object.create(null);
+      const EMPTY_OBJ = new VNode();
       const EMPTY_ARR = [];
       const slice = EMPTY_ARR.slice;
 
@@ -279,17 +313,17 @@ module Preact
           // If this newVNode is being reused (e.g. <div>{reuse}{reuse}</div>) in the same diff,
           // or we are rendering a component (e.g. setState) copy the oldVNodes so it can have
           // it's own DOM & etc. pointers
-          else if (typeof childVNode === 'string' || typeof childVNode === 'number' || typeof childVNode === 'bigint') {
-            childVNode = newParentVNode._children[i] = self.createVNode(
+          else if (typeof childVNode === 'string') {
+            childVNode = newParentVNode._children[i] = new VNode(
               null,
               childVNode,
               null,
               null,
               childVNode
             );
-          } else if (childVNode.$$is_string || childVNode.$$is_number) {
+          } else if (childVNode.$$is_string) {
             let str = childVNode.valueOf();
-            childVNode = newParentVNode._children[i] = self.createVNode(
+            childVNode = newParentVNode._children[i] = new VNode(
               null,
               str,
               null,
@@ -297,7 +331,7 @@ module Preact
               str
             );
           } else if (childVNode.$$is_array) {
-            childVNode = newParentVNode._children[i] = self.createVNode(
+            childVNode = newParentVNode._children[i] = new VNode(
               Opal.Fragment,
               #{{ children: `childVNode` }},
               null,
@@ -309,7 +343,7 @@ module Preact
             // scenario:
             //   const reuse = <div />
             //   <div>{reuse}<span />{reuse}</div>
-            childVNode = newParentVNode._children[i] = self.createVNode(
+            childVNode = newParentVNode._children[i] = new VNode(
               childVNode.type,
               childVNode.props,
               childVNode.key,
@@ -387,7 +421,7 @@ module Preact
             }
 
             if (
-              typeof childVNode.type == 'function' &&
+              typeof childVNode.type === 'function' &&
               childVNode._children === oldVNode._children
             ) {
               childVNode._nextDom = oldDom = reorderChildren(
@@ -433,7 +467,7 @@ module Preact
         for (i = oldChildrenLength; i--; ) {
           if (oldChildren[i] != null) {
             if (
-              typeof newParentVNode.type == 'function' &&
+              typeof newParentVNode.type === 'function' &&
               oldChildren[i]._dom != null &&
               oldChildren[i]._dom == newParentVNode._nextDom
             ) {
@@ -834,7 +868,7 @@ module Preact
               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();
@@ -987,34 +1021,12 @@ module Preact
         });
       }
 
-      let vnodeId = 0;
 
-      function is_a_vnode(type) { return type === Opal.VNode; }
 
       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!
-        return {
-          type,
-          props,
-          key,
-          ref,
-          _children: null,
-          _parent: null,
-          _depth: 0,
-          _dom: null,
-          // _nextDom must be initialized to undefined b/c it will eventually
-          // be set to dom.nextSibling which can return `null` and it is important
-          // to be able to distinguish between an uninitialized _nextDom and
-          // a _nextDom that has been set to `null`
-          _nextDom: undefined,
-          _component: null,
-          _hydrating: null,
-          constructor: undefined,
-          _original: (original == null) ? ++vnodeId : original,
-          "$is_a?": is_a_vnode,
-          "$$is_vnode": true
-        };
+        return new VNode(type, props, key, ref, original);
       }
 
       self.render = function(vnode, parentDom, replaceNode) {
@@ -1083,7 +1095,7 @@ module Preact
 
         if (parentDom) {
           let commitQueue = [];
-          const oldVNode = assign({}, vnode);
+          const oldVNode = assign(new VNode(), vnode);
           oldVNode._original = vnode._original + 1;
 
           diff(
@@ -1177,7 +1189,6 @@ module Preact
     end
 
     if RUBY_ENGINE == 'opal'
-      attr_accessor :_vnode_id
       attr_accessor :render_buffer
       attr_accessor :rerender_queue
 
@@ -1312,6 +1323,3 @@ module Preact
   end
 end
 
-if RUBY_ENGINE == 'opal'
-  Preact._vnode_id = 0
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc3
+  version: 23.9.0.rc4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-16 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.rc3
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc3
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc3
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc3
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement