isomorfeus-preact 23.9.0.rc2 → 23.9.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b75453247bc0c884571e884c674717562fe5e27fadf2f1f27f5f62965e37580
-  data.tar.gz: 6eaddb4ca8921da6d124b1eb983663fd8de05b3d25ad31c9975b35d77468cc6d
+  metadata.gz: b99c3271315df3f744c24558a5df45ad2f5386235ed91a6466c59ee8371ae948
+  data.tar.gz: 4e3c3ccf9dccfe9591bc3a3df4bd8c9a710f69c438939b9a241bf213fc008034
 SHA512:
-  metadata.gz: 37662cbea0b4b59cd9ec04c632cb2ea2bf9e96fa2ffab3f6a40f9d7632be83b72d60189b8da2c60ba70af41c4f7de435a7410a40c66887699ab1ad9d6419c57d
-  data.tar.gz: 4300537585ebb569255dddc9a34ea47ddc19d682ae0e1f995cf30f9b7cebe7a063512f9689a634bd9a9a113d80083bb684a0262db5c4d05d1aa18e008e1f90dd
+  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/browser/array_buffer.rb

@@ -0,0 +1,7 @@
+# backtick_javascript: true
+
+module Browser
+  class ArrayBuffer < `ArrayBuffer`
+    include Delegate
+  end
+end

data/lib/browser/blob.rb

@@ -0,0 +1,7 @@
+# backtick_javascript: true
+
+module Browser
+  class Blob < `Blob`
+    include Delegate
+  end
+end

data/lib/{browser_auto/browser/delegate_native.rb → browser/delegate.rb}

@@ -1,43 +1,28 @@
 # backtick_javascript: true
 
 module Browser
-  module DelegateNative
-    # Provides a default initializer. This should be overridden in all but the
-    # simplest cases.
-    def initialize native
-      @native = native
-    end
-
+  module Delegate
     def [](property)
       method_missing(property)
     end
 
-    # Fall back to native properties. If the message sent to this element is not
-    # recognized, it checks to see if it is a property of the native element. It
-    # also checks for variations of the message name, such as:
-    #
-    #   :supported? => [:supported, :isSupported]
-    #
-    # If a property with the specified message name is found and it is a
-    # function, that function is invoked with `args`. Otherwise, the property
-    # is returned as is.
     def method_missing message, *args, &block
       if message.end_with? '='
         message = message.chop
         property_name = property_for_message(message)
         arg = args[0]
         arg = arg.to_n if `arg && typeof arg.$to_n === 'function'`
-        return `#@native[#{property_name}] = arg`
+        return `self[#{property_name}] = arg`
       else
         property_name = property_for_message(message)
         %x{
-          let value = #@native[#{property_name}];
+          let value = self[#{property_name}];
           let type = typeof(value);
           if (type === 'undefined') { return #{super}; }
           try {
             if (type === 'function') {
               #{args.map! { |arg| `arg && typeof arg.$to_n === 'function'` ? arg.to_n : arg }}
-              value = value.apply(#@native, args);
+              value = value.apply(self, args);
             }
             if (value instanceof HTMLCollection || value instanceof NodeList) {
               let a = [];
@@ -49,10 +34,6 @@ module Browser
               value = #{Browser::Element.new(`value`)};
             } else if (value instanceof Event) {
               value = #{Browser::Event.new(`value`)};
-            } else if (value instanceof FileList) {
-              value = #{Browser::FileList.new(`value`)};
-            } else if (value instanceof File) {
-              value = #{Browser::File.new(`value`)};
             } else if (value instanceof FileReader) {
               value = #{Browser::FileReader.new(`value`)}
             } else if (value === null || type === 'undefined' || (type === 'number' && isNaN(value))) {
@@ -67,28 +48,24 @@ module Browser
     def respond_to_missing? message, include_all
       message = message.chop if message.end_with? '='
       property_name = property_for_message(message)
-      return true if `#{property_name} in #@native`
+      return true if `#{property_name} in self`
       false
     end
 
     def property_for_message(message)
       %x{
         let camel_cased_message;
-        if (typeof(#@native[message]) !== 'undefined') { camel_cased_message = message; }
+        if (typeof(self[message]) !== 'undefined') { camel_cased_message = message; }
         else { camel_cased_message = #{message.camelize(:lower)} }
 
         if (camel_cased_message.endsWith('?')) {
           camel_cased_message = camel_cased_message.substring(0, camel_cased_message.length - 2);
-          if (typeof(#@native[camel_cased_message]) === 'undefined') {
+          if (typeof(self[camel_cased_message]) === 'undefined') {
             camel_cased_message = 'is' + camel_cased_message[0].toUpperCase() + camel_cased_message.substring(0, camel_cased_message.length - 1);
           }
         }
         return camel_cased_message
       }
     end
-
-    def to_n
-      @native
-    end
   end
 end

data/lib/browser/delegate_native.rb

@@ -49,10 +49,6 @@ module Browser
               value = #{Browser::Element.new(`value`)};
             } else if (value instanceof Event) {
               value = #{Browser::Event.new(`value`)};
-            } else if (value instanceof FileList) {
-              value = #{Browser::FileList.new(`value`)};
-            } else if (value instanceof File) {
-              value = #{Browser::File.new(`value`)};
             } else if (value instanceof FileReader) {
               value = #{Browser::FileReader.new(`value`)}
             } else if (value === null || type === 'undefined' || (type === 'number' && isNaN(value))) {

data/lib/browser/file.rb

@@ -0,0 +1,8 @@
+# backtick_javascript: true
+
+module Browser
+  # An individual item in a FileList
+  class File < `File`
+    include Delegate
+  end
+end

data/lib/browser/file_list.rb

@@ -0,0 +1,29 @@
+# backtick_javascript: true
+
+module Browser
+  class FileList < `FileList`
+    include Delegate
+    include Enumerable
+
+    def [](idx)
+      `self.item(idx)`
+    end
+
+    # @return [Integer] the number of files in this list
+    def size
+      `self.length`
+    end
+
+    # Call the given block for each file in the list
+    #
+    # @yieldparam file [Browser::FileList::File]
+    def each &block
+      %x{
+        let l = #@native.length, i;
+        for(i = 0; i < l; i++) {
+          #{block.call(File.new(`#@native.item(i)`))}
+        }
+      }
+    end
+  end
+end

data/lib/browser/readable_stream.rb

@@ -0,0 +1,7 @@
+# backtick_javascript: true
+
+module Browser
+  class ReadableStream < `ReadableStream`
+    include Delegate
+  end
+end

data/lib/browser_auto/browser/element.rb

@@ -109,15 +109,7 @@ module Browser
     #
     # @return [Browser::File] the file selected by the user
     def file
-      files.first
-    end
-
-    # Get the currently selected files for this input. This is only useful for
-    # file inputs with the `multiple` property set.
-    #
-    # @return [Browser::FileList] the currently selected files for this input
-    def files
-      FileList.new(`#@native.files`)
+      `#@native.files.item(0)`
     end
 
     # Determine whether this is the same element

data/lib/browser_auto/browser/file_reader.rb

@@ -1,18 +1,20 @@
+# backtick_javascript: true
+
 module Browser
-  # The object that reads the file from disk.
   class FileReader
+    include DelegateNative
     include EventTarget
 
-    def initialize
-      @native = `new FileReader()`
-    end
+    EMPTY = 0
+    LOADING = 1
+    DONE = 2
 
-    def result
-      `#@native.result`
+    def initialize(native=nil)
+      @native = native || `new FileReader()`
     end
 
-    def read_as_binary_string file
-      `#@native.readAsBinaryString(#{file.to_n})`
+    def read_as_data_url file
+      `#@native.readAsDataURL(file)`
     end
   end
 end

data/lib/isomorfeus/preact/version.rb

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

data/lib/isomorfeus-preact.rb

@@ -16,7 +16,9 @@ require 'isomorfeus-i18n'
 require 'isomorfeus/preact/config'
 
 if RUBY_ENGINE == 'opal'
+  require 'browser/delegate'
   require 'browser/delegate_native'
+  require 'browser/file'
   require_tree 'browser_auto', autoload: true
 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.rc2
+  version: 23.9.0.rc4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 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.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        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.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,18 +185,21 @@ files:
 - ext/isomorfeus_preact_ext/preact.c
 - ext/isomorfeus_preact_ext/vnode.c
 - ext/isomorfeus_preact_ext/vnode.h
+- lib/browser/array_buffer.rb
+- lib/browser/blob.rb
+- lib/browser/delegate.rb
 - lib/browser/delegate_native.rb
+- lib/browser/file.rb
+- lib/browser/file_list.rb
 - lib/browser/history.rb
 - lib/browser/location.rb
-- lib/browser_auto/browser/delegate_native.rb
+- lib/browser/readable_stream.rb
 - lib/browser_auto/browser/document.rb
 - lib/browser_auto/browser/element.rb
 - lib/browser_auto/browser/element/canvas.rb
 - lib/browser_auto/browser/element/media.rb
 - lib/browser_auto/browser/event.rb
 - lib/browser_auto/browser/event_target.rb
-- lib/browser_auto/browser/file.rb
-- lib/browser_auto/browser/file_list.rb
 - lib/browser_auto/browser/file_reader.rb
 - lib/browser_auto/browser/window.rb
 - lib/data_uri.rb

data/lib/browser_auto/browser/file.rb

@@ -1,62 +0,0 @@
-module Browser
-  # An individual item in a FileList
-  class File
-    attr_reader :data
-
-    # @param native [JS] the native File object to wrap
-    def initialize native
-      @native = native
-      @data = nil
-    end
-
-    # @return [String] the filename
-    def name
-      `#@native.name`
-    end
-
-    # @return [Integer] the size of this file on disk
-    def size
-      `#@native.size`
-    end
-
-    # @return [String] the MIME type of the file, detected by the browser
-    def type
-      `#@native.type`
-    end
-
-    # @return [Time] the timestamp of the file
-    def last_modified
-      `#@native.lastModifiedDate`
-    end
-
-    # Read the file from disk into memory
-    #
-    # @return [Promise] a promise that resolves when finished loading and
-    #   rejects if an error occurs while loading.
-    def read
-      promise = Promise.new
-      reader = FileReader.new
-      reader.on :load do
-        result = reader.result
-
-        @data = result
-        promise.resolve result
-      end
-
-      reader.on :error do
-        promise.reject reader.result
-      end
-
-      reader.read_as_binary_string self
-
-      promise
-    end
-
-    # Convert to the native object
-    #
-    # @return [JS.HTMLElement] the underlying native element
-    def to_n
-      @native
-    end
-  end
-end

data/lib/browser_auto/browser/file_list.rb

@@ -1,47 +0,0 @@
-# backtick_javascript: true
-
-module Browser
-  class FileList
-    include Enumerable
-
-    # @param native [JS] the native FileList object to wrap
-    def initialize native
-      @native = `#{native} || []`
-      @files = length.times.each_with_object([]) { |index, array|
-        array[index] = ::Browser::File.new(`#@native[index]`)
-      }
-    end
-
-    # @param index [Integer] the index of the file in the list
-    # @return [Browser::FileList::File] the file at the specified index
-    def [] index
-      @files[index]
-    end
-
-    # @return [Integer] the number of files in this list
-    def length
-      `#@native.length`
-    end
-    alias size length
-
-    # Call the given block for each file in the list
-    #
-    # @yieldparam file [Browser::FileList::File]
-    def each &block
-      @files.each do |file|
-        block.call file
-      end
-    end
-
-    # Convert this FileList into an array
-    def to_a
-      @files.dup # Don't return a value that can mutate our internal state
-    end
-    alias to_ary to_a
-
-    # @return [String] a string representation of this FileList
-    def to_s
-      @files.to_s
-    end
-  end
-end