isomorfeus-preact 23.8.0.rc2 → 23.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ddc9384a1eb50682d92249ddc5bb104096145c2e735d4e29f279c54abe6670c
-  data.tar.gz: a07b26b674eaf136687d6b9643d4900320da5b260656e08a3a0a1b6b6db353ba
+  metadata.gz: 27a7d5a11be914eeb7d2492984130ce644c7e9544c28a51ca38de66062ed65e5
+  data.tar.gz: 0f8a66e40d5bc23cd54ecc624642d4dc02ce3b00e72746194dceb1f37e9f0c80
 SHA512:
-  metadata.gz: 878bd642bcf4afa03506624cac8ecd05a5e53e4b0a773154fdc05454441c0214af69f339512c78953a028e58fe50c5d8312ae6c1088aad47da5d4a08d545152e
-  data.tar.gz: b85b82f6c32e97419d1c01bbd3ac418beb996e436ca729471203958da554de4454d4103484dc4aa61678935eb481d586d5ac971f7fb312c854523e4bd1c926b9
+  metadata.gz: 91eda90d5fc66877f4c2c617d814b35bb11ac9040521802190b7462a4424ef0f88d793c09fbb95bc9a4fd43517dd1c4aead2bf9c4615347422d5a591417db051
+  data.tar.gz: c608d2b6c80195ff7d0d8831217600ec35ef9e8a3b7f253c8df214af66e5035f3e55430f0e0382bf71ac93b21dbc1fc87389081427f822d3bfc739ad73f85bcd

data/lib/browser/delegate_native.rb

@@ -49,6 +49,12 @@ 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))) {
               value = nil;
             }
@@ -80,5 +86,9 @@ module Browser
         return camel_cased_message
       }
     end
+
+    def to_n
+      @native
+    end
   end
 end

data/lib/browser/history.rb

@@ -3,14 +3,11 @@
 module Browser
   class History
     if RUBY_ENGINE == 'opal'
-      include Native::Wrapper
+      include DelegateNative
 
-      alias_native :back
-      alias_native :forward
-      alias_native :go
-
-      native_reader :length
-      alias :size :length
+      def size
+        length
+      end
 
       def push_state(state, title = '', url = `null`)
         `#@native.pushState(Object.fromEntries(#{state}), #{title}, #{url})`
@@ -29,7 +26,7 @@ module Browser
       end
 
       def state
-        `Opal.hash(#@native.state)`
+        `(#@native.state) ? Opal.hash(#@native.state) : nil`
       end
     else
       def back; end
@@ -47,7 +44,7 @@ module Browser
       def scroll_restoration=(s); end
 
       def state
-        {}
+        nil
       end
     end
   end

data/lib/browser/location.rb

@@ -1,17 +1,7 @@
 module Browser
   class Location
     if RUBY_ENGINE == 'opal'
-      include Native::Wrapper
-
-      alias_native :hash
-      alias_native :host
-      alias_native :hostname
-      alias_native :href
-      alias_native :origin
-      alias_native :pathname
-      alias_native :port
-      alias_native :protocol
-      alias_native :search
+      include DelegateNative
     else
       def initialize(location_string)
         @location = URI(location_string)

data/lib/browser_auto/browser/delegate_native.rb

@@ -0,0 +1,94 @@
+# 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
+
+    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`
+      else
+        property_name = property_for_message(message)
+        %x{
+          let value = #@native[#{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);
+            }
+            if (value instanceof HTMLCollection || value instanceof NodeList) {
+              let a = [];
+              for(let i=0; i<value.length; i++) {
+                a[i] = #{Browser::Element.new(`value.item(i)`)};
+              }
+              value = a;
+            } else if (value instanceof HTMLElement || value instanceof SVGElement) {
+              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))) {
+              value = nil;
+            }
+            return value;
+          } catch { return value; }
+        }
+      end
+    end
+
+    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`
+      false
+    end
+
+    def property_for_message(message)
+      %x{
+        let camel_cased_message;
+        if (typeof(#@native[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') {
+            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 → browser_auto/browser}/element.rb

@@ -1,8 +1,6 @@
 # backtick_javascript: true
 
 module Browser
-  autoload :FileList, 'browser/file_list'
-
   # Wrap a native DOM element
   class Element
     include EventTarget
@@ -24,11 +22,6 @@ module Browser
       element
     end
 
-    # @param native [JS] The native DOM element to wrap
-    def initialize native
-      @native = native
-    end
-
     # Replace all child elements with the given element
     #
     # @param element [Browser::Element] The Browser element with which to replace

data/lib/browser_auto/browser/file.rb

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,47 @@
+# 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

data/lib/browser_auto/browser/file_reader.rb

@@ -0,0 +1,18 @@
+module Browser
+  # The object that reads the file from disk.
+  class FileReader
+    include EventTarget
+
+    def initialize
+      @native = `new FileReader()`
+    end
+
+    def result
+      `#@native.result`
+    end
+
+    def read_as_binary_string file
+      `#@native.readAsBinaryString(#{file.to_n})`
+    end
+  end
+end

data/lib/isomorfeus/preact/version.rb

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

data/lib/isomorfeus-preact.rb

@@ -14,17 +14,16 @@ require 'isomorfeus-transport'
 require 'isomorfeus-redux'
 require 'isomorfeus-i18n'
 require 'isomorfeus/preact/config'
-require 'browser/history'
-require 'browser/location'
 
 if RUBY_ENGINE == 'opal'
-  require 'browser/event'
-  require 'browser/event_target'
   require 'browser/delegate_native'
-  require 'browser/element'
-  require 'browser/document'
-  require 'browser/window'
+  require_tree 'browser_auto', autoload: true
+end
+
+require 'browser/history'
+require 'browser/location'
 
+if RUBY_ENGINE == 'opal'
   if `window?.history`
     Isomorfeus.browser_history = Browser::History.new(`window.history`)
     Isomorfeus.browser_location = Browser::Location.new(`window.location`)
@@ -56,6 +55,7 @@ require 'preact/module_component_resolution'
 require 'preact/html_elements'
 # require 'preact/svg_elements' # optional
 # require 'preact/math_ml_elements' # optional
+
 # Component
 require 'preact/component'
 # Context
@@ -78,6 +78,7 @@ require 'lucid_app'
 
 if RUBY_ENGINE == 'opal'
   # init auto loader
+  Isomorfeus.zeitwerk.push_dir('browser_auto')
   Isomorfeus.zeitwerk.push_dir('components')
 else
   require 'isomorfeus/preact/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 23.8.0.rc2
+  version: 23.9.0.rc1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -19,7 +19,7 @@ dependencies:
         version: 3.13.23
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.13.23
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -64,42 +64,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.8.0.rc2
+        version: 23.9.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.8.0.rc2
+        version: 23.9.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.8.0.rc2
+        version: 23.9.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.8.0.rc2
+        version: 23.9.0.rc1
 - !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.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,16 +186,19 @@ files:
 - ext/isomorfeus_preact_ext/vnode.c
 - ext/isomorfeus_preact_ext/vnode.h
 - lib/browser/delegate_native.rb
-- lib/browser/document.rb
-- lib/browser/element.rb
-- lib/browser/element/canvas.rb
-- lib/browser/element/media.rb
-- lib/browser/event.rb
-- lib/browser/event_target.rb
-- lib/browser/file_list.rb
 - lib/browser/history.rb
 - lib/browser/location.rb
-- lib/browser/window.rb
+- lib/browser_auto/browser/delegate_native.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
 - lib/data_uri/open_uri.rb
 - lib/data_uri/uri.rb

data/lib/browser/file_list.rb

@@ -1,127 +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] = 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
-
-    # 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
-
-      # The object that reads the file from disk.
-      #
-      # @api private
-      class FileReader
-        include EventTarget
-
-        def initialize
-          @native = `new FileReader()`
-        end
-
-        def result
-          `#@native.result`
-        end
-
-        def read_as_binary_string file
-          `#@native.readAsBinaryString(#{file.to_n})`
-        end
-      end
-    end
-  end
-end