isomorfeus-preact 10.6.12 → 10.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb1ab44f4abdcc7cae7f4d2e1eddd2be46f9598e3e632447e80df5565751388
-  data.tar.gz: 1d090bea6a1c20472951832066106c01455b711c785bd6c8978917adacf411de
+  metadata.gz: 2796e916f3c62cec0b330e99b7ac6fb46b368f059c3ed1278353211fc4c8370c
+  data.tar.gz: ad47708be18d9e8f781a8e5bbddbc8501667bafbdee75b9589656789245d656c
 SHA512:
-  metadata.gz: 1a3fe6e155523191ea2f39e858406b94df39a1e2a6a6afac92394cfb4af34adf51b9e1b314ba17441f8009e3e19ff0143efdde441d35de3c41259425aa274498
-  data.tar.gz: ccc2b7b87060ae70fcc603539c51c2444d0638349e4e679faf88e884755864d02f5fa2004878e95ffe17e7dea50cc8f595be99dd30999fbeaf8014f2645869fd
+  metadata.gz: 2d40522093a724e462b77833292c29622521832d1faac7cedf584eadf20ea4005a42de057252927eac7d1c96b847f4a19c62416722f1e818a058b3b97b04a2a2
+  data.tar.gz: 612ebd137795482e93c356869f32af3c4f50b4164ce629ff4c3822a4dda8a4fc748b34899ee771771c3e0e0e57e4198547c62fb7e2466f3b02b2215ce8198d25

data/lib/isomorfeus/preact_view_helper.rb

@@ -68,7 +68,7 @@ module Isomorfeus
           let exception;
           if (typeof global.Opal.Isomorfeus.Transport !== 'undefined' && api_ws_path !== '') {
             global.Opal.Isomorfeus.TopLevel["$transport_ws_url="]("#{transport_ws_url}");
-            global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(), 'then', [], ($$1 = function(){
+            global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(global.IsomorfeusSessionId), 'then', [], ($$1 = function(){
               try {
                 global.Opal.Isomorfeus.TopLevel.$render_component_to_string('#{component_name}', #{Oj.dump(props, mode: :strict)});
                 global.FirstPassFinished = 'transport';
@@ -77,7 +77,8 @@ module Isomorfeus
                 global.FirstPassFinished = 'transport';
               }
             }, $$1.$$s = this, $$1.$$arity = 0, $$1))
-          } else { return global.FirstPassFinished = true; };
+            return false;
+          } else { global.FirstPassFinished = true; return true; };
         JAVASCRIPT
         # execute first render pass
         begin

data/lib/isomorfeus/props/validate_hash_proxy.rb

@@ -30,7 +30,7 @@ module Isomorfeus
 
       def ensure(v = nil, &block)
         if block_given?
-          @validation_hash[:ensure_block] = block
+          @validation_hash[:ensure] = block
         else
           @validation_hash[:ensure] = v
         end

data/lib/isomorfeus/props/validator.rb

@@ -52,10 +52,12 @@ module Isomorfeus
 
       def ensure!
         if @o.key?(:ensure)
-          @v = @o[:ensure] unless @v
-          true
-        elsif @o.key?(:ensure_block)
-          @v = @o[:ensure_block].call(@v)
+          proc_or_val = @o[:ensure]
+          if proc_or_val.class == Proc
+            @v = proc_or_val.call(@v)
+          else
+            @v = proc_or_val
+          end
           true
         else
           false

data/lib/isomorfeus-preact.rb

@@ -21,7 +21,7 @@ if RUBY_ENGINE == 'opal'
 
   # nanocss
   require 'nano_css'
-  
+
   # preact
   require 'preact/version'
   require 'preact'
@@ -31,7 +31,8 @@ if RUBY_ENGINE == 'opal'
   require 'isomorfeus/props/validate_hash_proxy'
   require 'isomorfeus/props/validator'
   require 'lucid_prop_declaration/mixin'
-  require 'preact/component/props'
+  require 'preact/params'
+  require 'preact/props'
 
   # HTML Elements and Fragment support
   require 'preact/component/elements'
@@ -45,8 +46,7 @@ if RUBY_ENGINE == 'opal'
   require 'preact/component/callbacks'
   require 'preact/component/initializer'
   require 'preact/component/native_component_constructor'
-  require 'preact/component/state'
-  require 'preact/component/params'
+  require 'preact/state'
   require 'preact/component/resolution'
   require 'preact/component/mixin'
   require 'preact/component/base'

data/lib/isomorfeus_preact/lucid_component/api.rb

@@ -2,7 +2,7 @@ module LucidComponent
   module Api
     def self.included(base)
       base.instance_exec do
-        # store
+        # stores
         attr_accessor :app_store
         attr_accessor :class_store
         attr_accessor :store

data/lib/isomorfeus_preact/lucid_component/initializer.rb

@@ -4,11 +4,9 @@ module LucidComponent
       @native = native_component
       @app_store = LucidComponent::AppStoreProxy.new(self)
       @class_store = LucidComponent::ClassStoreProxy.new(self.class.to_s, self, @native)
-      # @iso_store = Isomorfeus::IsomorphicStoreProxy.new(self)
-      # @local_store = Isomorfeus::LocalStoreProxy.new(self)
       @store = LucidComponent::InstanceStoreProxy.new(self)
-      @props = `Opal.Preact.Component.Props.$new(#@native)`
-      @state = `Opal.Preact.Component.State.$new(#@native)`
+      @props = `Opal.Preact.Props.$new(#@native)`
+      @state = `Opal.Preact.State.$new(#@native)`
     end
   end
 end

data/lib/isomorfeus_preact/lucid_func/initializer.rb

@@ -2,7 +2,7 @@ module LucidFunc
   module Initializer
     def initialize
       self.JS[:native_props] = `{ props: null }`
-      @native_props = `Opal.Preact.Component.Props.$new(#{self})`
+      @native_props = `Opal.Preact.Props.$new(#{self})`
       @app_store = LucidComponent::AppStoreProxy.new(self)
       @class_store = LucidComponent::ClassStoreProxy.new(self.class.to_s, self, self)
       @store = LucidComponent::InstanceStoreProxy.new(self)

data/lib/isomorfeus_preact/preact/function_component/initializer.rb

@@ -3,7 +3,7 @@ module Preact
     module Initializer
       def initialize
         self.JS[:native_props] = `{ props: null }`
-        @native_props = ::Preact::Component::Props.new(self)
+        @native_props = `Opal.Preact.Props.$new(self)`
       end
     end
   end

data/lib/preact/component/api.rb

@@ -41,7 +41,7 @@ module Preact
                 if (callback) { callback.call(); }
               }
             }
-            @default_state = Preact::Component::State.new(`native_state`)
+            @default_state = `Opal.Preact.State.$new(native_state)`
           end
 
           def render(&block)
@@ -113,7 +113,7 @@ module Preact
 
       def ruby_ref(name)
         return `#@native[name]` if `(typeof #@native[name] === 'function')`
-        Preact::Ref::new(`#@native[name]`)
+        `Opal.Preact.Ref.$new(#@native[name])`
       end
 
       def set_state(updater, &callback)

data/lib/preact/component/callbacks.rb

@@ -41,8 +41,8 @@ module Preact
             %x{
               var fun = function(prev_props, prev_state, snapshot) {
                 Opal.Preact.active_redux_components.push(this);
-                #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Component.Props.$new({props: prev_props})`,
-                                                       `Opal.Preact.Component.State.$new({state: prev_state})`,
+                #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
+                                                       `Opal.Preact.State.$new({state: prev_state})`,
                                                        `snapshot`, &block)};
                 Opal.Preact.active_redux_components.pop();
               }
@@ -69,8 +69,8 @@ module Preact
             %x{
               var fun = function(props, state) {
                 Opal.Preact.active_redux_components.push(this);
-                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Component.Props.$new({props: props})`,
-                                                                     `Opal.Preact.Component.State.$new({state: state})`, &block)};
+                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: props})`,
+                                                                     `Opal.Preact.State.$new({state: state})`, &block)};
                 Opal.Preact.active_redux_components.pop();
                 if (typeof result.$to_n === 'function') { result = result.$to_n() }
                 if (result === Opal.nil) { return null; }
@@ -85,8 +85,8 @@ module Preact
             %x{
               var fun = function(prev_props, prev_state) {
                 Opal.Preact.active_redux_components.push(this);
-                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Component.Props.$new({props: prev_props})`,
-                                                                    `Opal.Preact.Component.State.$new({state: prev_state})`, &block)};
+                var result = #{`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: prev_props})`,
+                                                                    `Opal.Preact.State.$new({state: prev_state})`, &block)};
                 Opal.Preact.active_redux_components.pop();
                 if (result === Opal.nil) { return null; }
                 return result;

data/lib/preact/component/initializer.rb

@@ -3,8 +3,8 @@ module Preact
     module Initializer
       def initialize(native_component)
         @native = native_component
-        @props = `Opal.Preact.Component.Props.$new(#@native)`
-        @state = `Opal.Preact.Component.State.$new(#@native)`
+        @props = `Opal.Preact.Props.$new(#@native)`
+        @state = `Opal.Preact.State.$new(#@native)`
       end
     end
   end

data/lib/preact/component/native_component_constructor.rb

@@ -46,7 +46,7 @@ module Preact
             }
             shouldComponentUpdate(next_props, next_state) {
               if (base.should_component_update_block) {
-                return #{!!`this.__ruby_instance`.instance_exec(Preact::Component::Props.new(`{props: next_props}`), Preact::Component::State.new(`{state: next_state }`), &`base.should_component_update_block`)};
+                return #{!!`this.__ruby_instance`.instance_exec(`Opal.Preact.Props.$new({props: next_props})`, `Opal.Preact.State.$new({state: next_state })`, &`base.should_component_update_block`)};
               }
               if (!Opal.Preact.props_are_equal(this.props, next_props)) { return true; }
               if (Opal.Preact.state_is_not_equal(this.state, next_state)) { return true; }

data/lib/preact/component/resolution.rb

@@ -10,9 +10,9 @@ module Preact
           def const_missing(const_name)
             %x{
               if (typeof Opal.global[const_name] !== "undefined" && (const_name[0] === const_name[0].toUpperCase())) {
-                var new_const = #{Preact::NativeConstantWrapper.new(`Opal.global[const_name]`, const_name)};
+                var new_const = Opal.Preact.NativeConstantWrapper.$new(Opal.global[const_name], const_name);
                 new_const.preact_component = Opal.global[const_name];
-                #{Object.const_set(const_name, `new_const`)};
+                Opal.Object.$const_set(const_name, new_const);
                 return new_const;
               } else {
                 return #{_preact_component_class_resolution_original_const_missing(const_name)};

data/lib/preact/params.rb

@@ -0,0 +1,16 @@
+module Preact
+  class Params
+    include Native::Wrapper
+
+    def method_missing(prop, *args, &block)
+      %x{
+        const p = #@native;
+        if (typeof p[prop] === 'undefined') {
+          prop = Opal.Preact.lower_camelize(prop);
+          if (typeof p[prop] === 'undefined') { return nil; }
+        }
+        return p[prop];
+      }
+    end
+  end
+end

data/lib/preact/props.rb

@@ -0,0 +1,51 @@
+module Preact
+  class Props
+    def initialize(native)
+      @native = native
+    end
+
+    def ==(other_props)
+      %x{
+        if (Opal.Preact.props_are_equal(#@native.props, #{other_props.to_n})) { return true; }
+        return false;
+      }
+    end
+
+    def method_missing(prop, *args, &block)
+      %x{
+        const p = #@native.props;
+        if (typeof p[prop] === 'undefined') {
+          prop = Opal.Preact.lower_camelize(prop);
+          if (typeof p[prop] === 'undefined') { return nil; }
+        }
+        return p[prop];
+      }
+    end
+
+    def theme
+      `#@native.props.iso_theme`
+    end
+
+    def params
+      return @params if @params
+      return nil if `typeof #@native.props.params === 'undefined'`
+      @params = `Opal.Preact.Params.$new(#@native.props.params)`
+    end
+
+    def to_h
+      `Opal.Hash.$new(#@native.props)`.transform_keys!(&:underscore)
+    end
+
+    def to_json
+      JSON.dump(to_transport)
+    end
+
+    def to_n
+      `#@native.props`
+    end
+
+    def to_transport
+      {}.merge(to_h)
+    end
+  end
+end

data/lib/preact/state.rb

@@ -0,0 +1,67 @@
+module Preact
+  class State
+    include ::Native::Wrapper
+
+    def initialize(native)
+      @native = native
+    end
+
+    def ==(other_state)
+      %x{
+        if (Opal.Preact.state_is_not_equal(#@native.state, #{other_state.to_raw_n})) { return false; }
+        return true;
+      }
+    end
+
+    def method_missing(key, *args, &block)
+      if `args.length > 0`
+        new_state = `{}`
+        new_state.JS[(`key.endsWith('=')` ? key.chop : key)] = args[0]
+        if block_given?
+          @native.JS.setState(new_state, `function() { block.$call(); }`)
+        else
+          @native.JS.setState(new_state, `null`)
+        end
+      else
+        %x{
+          if (typeof #@native.state[key] === 'undefined') { return nil; }
+          return #@native.state[key];
+        }
+      end
+    end
+
+    def set_state(updater, &block)
+      new_state = `{}`
+      updater.each do |key, value|
+        new_state.JS[key] = value
+      end
+      if block_given?
+        @native.JS.setState(new_state, `function() { block.$call(); }`)
+      else
+        @native.JS.setState(new_state, `null`)
+      end
+    end
+
+    def size
+      `Object.keys(#@native.state).length`;
+    end
+
+    def to_n
+      %x{
+        var new_native = {};
+        for (var key in #@native.state) {
+          if (typeof #@native.state[key].$to_n !== "undefined") {
+            new_native[key] = #@native.state[key].$to_n();
+          } else {
+            new_native[key] = #@native.state[key];
+          }
+        }
+        return new_native;
+      }
+    end
+
+    def to_raw_n
+      `#@native.state`
+    end
+  end
+end

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.12'
+  VERSION = '10.6.16'
 end

data/lib/preact.rb

@@ -256,14 +256,14 @@ module Preact
     `Opal.global.Preact.toChildArray(children)`
   end
 
-  def self.clone_element(ruby_preact_element, props = nil, children = nil, &block)
+  def self.clone_element(native_preact_element, props = nil, children = nil, &block)
     block_result = `null`
     if block_given?
       block_result = block.call
       block_result = `null` unless block_result
     end
     native_props = props ? `Opal.Preact.to_native_preact_props(props)` : `null`
-    `Opal.global.Preact.cloneElement(ruby_preact_element.$to_n(), native_props, block_result)`
+    `Opal.global.Preact.cloneElement(native_preact_element, native_props, block_result)`
   end
 
   def self.create_context(const_name, default_value)

data/node_modules/.package-lock.json

@@ -4,9 +4,9 @@
   "requires": true,
   "packages": {
     "node_modules/preact": {
-      "version": "10.6.4",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.4.tgz",
-      "integrity": "sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ==",
+      "version": "10.6.5",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.5.tgz",
+      "integrity": "sha512-i+LXM6JiVjQXSt2jG2vZZFapGpCuk1fl8o6ii3G84MA3xgj686FKjs4JFDkmUVhtxyq21+4ay74zqPykz9hU6w==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"

data/node_modules/preact/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-present Jason Miller
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015-present Jason Miller
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.