hyper-component 1.0.alpha1.1 → 1.0.alpha1.6

data/lib/hyperstack/component/isomorphic_helpers.rb

@@ -18,16 +18,22 @@ module Hyperstack
         def self.load_context(unique_id = nil, name = nil)
           # can be called on the client to force re-initialization for testing purposes
           if !unique_id || !@context || @context.unique_id != unique_id
-            if on_opal_server?
-              `console.history = []` rescue nil
-              message = "************************ React Prerendering Context Initialized #{name} ***********************"
-            else
-              message = "************************ React Browser Context Initialized ****************************"
-            end
+            message =
+              if on_opal_server?
+                `console.history = []` rescue nil
+                "************************ React Prerendering Context Initialized #{name} ***********************"
+              else
+                '************************ React Browser Context Initialized ****************************'
+              end
+
             log(message)
+
             @context = Context.new(unique_id)
           end
-          @context
+
+          # True is returned here because this method is evaluated by MiniRacer,
+          #   and can cause TypeError: Converting circular structure to JSON to raise
+          true
         end
       end
 
@@ -139,7 +145,6 @@ module Hyperstack
 
         def send_to_opal(method_name, *args)
           return unless @ctx
-          args = [1] if args.length == 0
           Hyperstack::Internal::Component::Rails::ComponentLoader.new(@ctx).load!
           method_args = args.collect do |arg|
             quarg = "#{arg}".tr('"', "'")

data/lib/hyperstack/component/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module Component
-    VERSION = '1.0.alpha1.1' # '1.0.alpha1.1'
+    VERSION = '1.0.alpha1.6' # '1.0.alpha1.5'
   end
 end

data/lib/hyperstack/component/while_loading.rb

@@ -0,0 +1,27 @@
+module Hyperstack
+  module Component
+    module WhileLoading
+      def __hyperstack_component_rescue_wrapper(child)
+        Hyperstack::Internal::Component::WhileLoadingWrapper(child: self, children_elements: child)
+      end
+
+      def resources_loading?
+        @__hyperstack_while_loading_waiting_on_resources
+      end
+
+      def resources_loaded?
+        !@__hyperstack_while_loading_waiting_on_resources
+      end
+
+      if Hyperstack::Component::IsomorphicHelpers.on_opal_client?
+        %x{
+          function onError(event) {
+            if (event.message.match(/^Uncaught NotQuiet: /)) event.preventDefault();
+          }
+
+          window.addEventListener('error', onError);
+         }
+      end
+    end
+  end
+end

data/lib/hyperstack/ext/component/array.rb

@@ -0,0 +1,20 @@
+# from Rails 6.0 activesupport.  Remove once defined by Opal activesupport
+class Array
+  # Removes and returns the elements for which the block returns a true value.
+  # If no block is given, an Enumerator is returned instead.
+  #
+  #   numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+  #   odd_numbers = numbers.extract! { |number| number.odd? } # => [1, 3, 5, 7, 9]
+  #   numbers # => [0, 2, 4, 6, 8]
+  def extract!
+    return to_enum(:extract!) { size } unless block_given?
+
+    extracted_elements = []
+
+    reject! do |element|
+      extracted_elements << element if yield(element)
+    end
+
+    extracted_elements
+  end
+end

data/lib/hyperstack/ext/component/element.rb

@@ -1,11 +1,9 @@
 Element.instance_eval do
   def self.find(selector)
-    selector = begin
-      selector.dom_node
-    rescue
-      selector
-    end if `#{selector}.$dom_node !== undefined`
-    `$(#{selector})`
+    if `typeof #{selector}['$respond_to?'] == 'function'` && selector.respond_to?(:dom_node)
+      selector = selector.dom_node
+    end
+    `jQuery(#{selector})`
   end
 
   def self.[](selector)
@@ -37,7 +35,7 @@ Element.instance_eval do
   # see react-rails documentation for more details
 
   %x{
-    $.fn.mount_components = function() {
+    jQuery.fn.mount_components = function() {
       this.each(function(e) { ReactRailsUJS.mountComponents(e[0]) })
       return this;
     }
@@ -45,4 +43,20 @@ Element.instance_eval do
   Element.expose :mount_components
 end
 
-DOM = Element
+module Hyperstack
+  module Internal
+    module Component
+      module InstanceMethods
+        def set_jq(var)
+          ->(val) { set(var).call(jQ[val]) }
+        end
+      end
+    end
+  end
+end
+
+class Object
+  def jQ
+    Element
+  end
+end

data/lib/hyperstack/ext/component/enumerable.rb

@@ -0,0 +1,18 @@
+# from Rails 6.0 activesupport.  Remove once defined by Opal activesupport
+module Enumerable
+  INDEX_WITH_DEFAULT = Object.new
+  private_constant :INDEX_WITH_DEFAULT
+  def index_with(default = INDEX_WITH_DEFAULT)
+    if block_given?
+      result = {}
+      each { |elem| result[elem] = yield(elem) }
+      result
+    elsif default != INDEX_WITH_DEFAULT
+      result = {}
+      each { |elem| result[elem] = default }
+      result
+    else
+      to_enum(:index_with) { size if respond_to?(:size) }
+    end
+  end
+end

data/lib/hyperstack/ext/component/kernel.rb

@@ -0,0 +1,7 @@
+module Kernel
+  def pause(s, &block)
+    Promise.new.tap { |p| after(s) { p.resolve(*(block && [block.call])) }}
+  end
+  alias busy_sleep sleep
+  alias sleep pause
+end

data/lib/hyperstack/ext/component/string.rb

@@ -5,4 +5,4 @@ class String
       return capitalize ? word.substr(0,1).toUpperCase()+word.substr(1) : word;
     })`
   end
-end
+end

data/lib/hyperstack/internal/component.rb

@@ -1,7 +1,13 @@
 require 'hyperstack-config'
 
 module Hyperstack
-
   define_setting :prerendering, :off if RUBY_ENGINE != 'opal'
 
+  module Internal
+    module Component
+      class << self
+        attr_accessor :after_error_args
+      end
+    end
+  end
 end

data/lib/hyperstack/internal/component/class_methods.rb

@@ -20,6 +20,10 @@ module Hyperstack
           true
         end
 
+        def allow_deprecated_render_definition?
+          false
+        end
+
         def mounted_components
           Hyperstack::Component.mounted_components.select { |c| c.class <= self }
         end
@@ -38,17 +42,74 @@ module Hyperstack
           backtrace[1..-1].each { |line| message_array << line }
         end
 
+        def before_receive_props(*args, &block)
+          deprecation_warning "'before_receive_props' is deprecated. Use the 'before_new_params' macro instead."
+          before_new_params(*args, &block)
+        end
+
         def render(container = nil, params = {}, &block)
+          Tags.included(self)
           if container
-            container = container.type if container.is_a? Hyperstack::Component::Element
-            define_method :render do
-              RenderingContext.render(container, params) { instance_eval(&block) if block }
+            container = container.element_type if container.is_a? Hyperstack::Component::Element
+            define_method(:__hyperstack_component_render) do
+              __hyperstack_component_select_wrappers do
+                RenderingContext.render(container, params) do
+                  instance_eval(&block) if block
+                end
+              end
             end
           else
-            define_method(:render) { instance_eval(&block) }
+            define_method(:__hyperstack_component_render) do
+              __hyperstack_component_select_wrappers do
+                instance_eval(&block)
+              end
+            end
           end
         end
 
+        # def while_loading(*args, &block)
+        #   __hyperstack_component_after_render_hook do |element|
+        #     element.while_loading(*args) { |*aargs| instance_exec(*aargs, &block) }
+        #   end
+        # end
+
+        def on(*args, &block)
+          __hyperstack_component_after_render_hook  do |element|
+            element.on(*args) { |*aargs| instance_exec(*aargs, &block) }
+          end
+        end
+
+        def rescues(*klasses, &block)
+          klasses = [StandardError] if klasses.empty?
+          __hyperstack_component_rescue_hook do |found, *args|
+            next [found, *args] if found || !klasses.detect { |klass| args[0].is_a? klass }
+            instance_exec(*args, &block)
+            [true, *args]
+          end
+        end
+
+        def before_render(*args, &block)
+          before_mount(*args, &block)
+          before_update(*args, &block)
+        end
+
+        def after_render(*args, &block)
+          after_mount(*args, &block)
+          after_update(*args, &block)
+        end
+
+        # [:while_loading, :on].each do |method|
+        #   define_method(method) do |*args, &block|
+        #     @@alias_id ||= 0
+        #     @@alias_id += 1
+        #     alias_name = "__hyperstack_attach_post_render_hook_#{@@alias_id}"
+        #     alias_method alias_name, :__hyperstack_attach_post_render_hook
+        #     define_method(:__hyperstack_attach_post_render_hook) do |element|
+        #       send(alias_name, element.while_loading(*args) { instance_eval(&block) })
+        #     end
+        #   end
+        # end
+
         # method missing will assume the method is a class name, and will treat this a render of
         # of the component, i.e. Foo::Bar.baz === Foo::Bar().baz
 
@@ -125,6 +186,10 @@ module Hyperstack
             options[:default] ||= nil
             options[:allow_nil] = true unless options.key?(:allow_nil)
           end
+          if name == :class
+            name = :className
+            options[:alias] ||= :Class
+          end
           if options[:default]
             validator.optional(name, options)
           else
@@ -138,14 +203,24 @@ module Hyperstack
 
         alias other_params collect_other_params_as
         alias others collect_other_params_as
+        alias other collect_other_params_as
+        alias opts collect_other_params_as
 
-        def triggers(name, opts = {})
+        def fires(name, opts = {})
           aka = opts[:alias] || "#{name}!"
-          name = name =~ /^<(.+)>$/ ? name.gsub(/^<(.+)>$/, '\1') : "on_#{name}"
+          name = if name =~ /^<(.+)>$/
+                   name.gsub(/^<(.+)>$/, '\1')
+                 elsif Hyperstack::Component::Event::BUILT_IN_EVENTS.include?("on#{name.event_camelize}")
+                   "on#{name.event_camelize}"
+                 else
+                   "on_#{name}"
+                 end
           validator.event(name)
           define_method(aka) { |*args| props[name]&.call(*args) }
         end
 
+        alias triggers fires
+
         def define_state(*states, &block)
           deprecation_warning "'define_state' is deprecated. Use the 'state' macro to declare states."
           default_initial_value = (block && block.arity == 0) ? yield : nil
@@ -196,7 +271,8 @@ module Hyperstack
           ReactWrapper.import_native_component(
             self, ReactWrapper.eval_native_react_component(component_name)
           )
-          define_method(:render) {} # define a dummy render method - will never be called...
+          render {}
+          #define_method(:render) {} # define a dummy render method - will never be called...
         rescue Exception => e # rubocop:disable Lint/RescueException : we need to catch everything!
           raise "#{self} cannot import '#{component_name}': #{e.message}."
           # rubocop:enable Lint/RescueException
@@ -216,7 +292,7 @@ module Hyperstack
         end
 
         def to_n
-          ReactWrapper.class_eval('@@component_classes')[self]
+          Hyperstack::Internal::Component::ReactWrapper.create_native_react_class(self)
         end
       end
     end

data/lib/hyperstack/internal/component/haml.rb

@@ -27,7 +27,9 @@ module Hyperstack
           Hyperstack::Internal::Component::RenderingContext.replace(
             self,
             Hyperstack::Internal::Component::RenderingContext.build do
-              Hyperstack::Internal::Component::RenderingContext.render(type, build_new_properties(class_name, args), &new_block)
+              Hyperstack::Internal::Component::RenderingContext.render(
+                element_type, @properties, args, class: haml_class_name(class_name), &new_block
+              )
             end
           )
         end
@@ -39,17 +41,6 @@ module Hyperstack
         def haml_class_name(class_name)
           class_name.gsub(/__|_/, '__' => '_', '_' => '-')
         end
-
-        private
-
-        def build_new_properties(class_name, args)
-          class_name = haml_class_name(class_name)
-          new_props = @properties.dup
-          new_props[:className] = "\
-            #{class_name} #{new_props[:className]} #{args.delete(:class)} #{args.delete(:className)}\
-          ".split(' ').uniq.join(' ')
-          new_props.merge! args
-        end
       end
     end
   end

data/lib/hyperstack/internal/component/instance_methods.rb

@@ -9,7 +9,7 @@ module Hyperstack
         end
 
         def params
-          if @__hyperstack_component_params_wrapper.param_accessor_style == :hyperstack
+          if [:hyperstack, :accessors].include? @__hyperstack_component_params_wrapper.param_accessor_style
             raise "params are now directly accessible via instance variables.\n"\
                   '  to access the legacy behavior add `param_accessor_style = :legacy` '\
                     "to your component class\n"\
@@ -23,18 +23,28 @@ module Hyperstack
           Hash.new(`#{@__hyperstack_component_native}.props`)
         end
 
-        def refs
-          Hash.new(`#{@__hyperstack_component_native}.refs`)
-        end
-
         def dom_node
           `ReactDOM.findDOMNode(#{self}.__hyperstack_component_native)` # react >= v0.15.0
         end
 
+        def jq_node
+          ::Element[dom_node]
+        end
+
         def mounted?
           `(#{self}.__hyperstack_component_is_mounted === undefined) ? false : #{self}.__hyperstack_component_is_mounted`
         end
 
+        def pluralize(count, singular, plural = nil)
+          word = if (count == 1 || count =~ /^1(\.0+)?$/)
+            singular
+          else
+            plural || singular.pluralize
+          end
+
+          "#{count || 0} #{word}"
+        end
+
         def force_update!
           `#{self}.__hyperstack_component_native.forceUpdate()`
           self
@@ -51,6 +61,29 @@ module Hyperstack
 
         private
 
+        # can be overriden by the Router include
+        def __hyperstack_router_wrapper(&block)
+          ->() { instance_eval(&block) }
+        end
+
+        # can be overriden by including WhileLoading include
+        def __hyperstack_component_rescue_wrapper(child)
+          if self.class.callbacks?(:__hyperstack_component_rescue_hook)
+            Hyperstack::Internal::Component::RescueWrapper(child: self, children_elements: child)
+          else
+            child.call
+          end
+        end
+
+        def __hyperstack_component_select_wrappers(&block)
+          RescueWrapper.after_error_args = nil
+          __hyperstack_component_run_post_render_hooks(
+            __hyperstack_component_rescue_wrapper(
+              __hyperstack_router_wrapper(&block)
+            )
+          )
+        end
+
         def set_or_replace_state_or_prop(state_or_prop, method, &block)
           raise "No native ReactComponent associated" unless @__hyperstack_component_native
           `var state_prop_n = #{state_or_prop.shallow_to_n}`

data/lib/hyperstack/internal/component/props_wrapper.rb

@@ -9,7 +9,7 @@ module Hyperstack
           def instance_var_name_for(name)
             case Hyperstack.naming_convention
             when :camelize_params
-              name.camelize
+              fix_suffix(name.camelize)
             when :prefix_params
               "_#{name}"
             else
@@ -17,6 +17,17 @@ module Hyperstack
             end
           end
 
+          def fix_suffix(name)
+            return unless name
+            if name =~ /\?$/
+              name[0..-2] + '_q'
+            elsif name =~ /\!$/
+              name[0..-2] + '_b'
+            else
+              name
+            end
+          end
+
           def param_accessor_style(style = nil)
             @param_accessor_style = style if style
             @param_accessor_style ||=
@@ -37,17 +48,23 @@ module Hyperstack
           end
 
           def define_param(name, param_type, aka = nil)
-            meth_name = aka || name
-            var_name = aka || instance_var_name_for(name)
-            param_definitions[name] = lambda do |props|
-              @component.instance_variable_set :"@#{var_name}", fetch_from_cache(name, param_type, props)
+            if param_accessor_style != :legacy || aka
+              meth_name = aka || name
+              var_name = fix_suffix(aka) || instance_var_name_for(name)
+              param_definitions[name] = lambda do |props|
+                @component.instance_variable_set :"@#{var_name}", val = fetch_from_cache(name, param_type, props)
+                next unless param_accessor_style == :accessors
+                `#{@component}[#{"$#{meth_name}"}] = function() { return #{val} }`
+                # @component.define_singleton_method(name) { val } if param_accessor_style == :accessors
+              end
+              return if %i[hyperstack accessors].include? param_accessor_style
             end
             if param_type == Proc
-              define_method(meth_name.to_sym) do |*args, &block|
+              define_method(name.to_sym) do |*args, &block|
                 props[name].call(*args, &block) if props[name]
               end
             else
-              define_method(meth_name.to_sym) do
+              define_method(name.to_sym) do
                 fetch_from_cache(name, param_type, props)
               end
             end
@@ -56,7 +73,10 @@ module Hyperstack
           def define_all_others(name)
             var_name = instance_var_name_for(name)
             param_definitions[name] = lambda do |props|
-              @component.instance_variable_set :"@#{var_name}", yield(props)
+              @component.instance_variable_set :"@#{var_name}", val = yield(props)
+              next unless param_accessor_style == :accessors
+              `#{@component}[#{"$#{name}"}] = function() { return #{val} }`
+              # @component.define_singleton_method(name) { val } if param_accessor_style == :accessors
             end
             define_method(name.to_sym) do
               @_all_others_cache ||= yield(props)
@@ -70,7 +90,7 @@ module Hyperstack
 
         def initialize(component, incoming = nil)
           @component = component
-          return if param_accessor_style == :legacy
+          #return if param_accessor_style == :legacy
           self.class.param_definitions.each_value do |initializer|
             instance_exec(incoming || props, &initializer)
           end