lib/hyperstack/internal/component/class_methods.rb in hyper-component-1.0.alpha1.2 vs lib/hyperstack/internal/component/class_methods.rb in hyper-component-1.0.alpha1.3

@@ -40,22 +40,78 @@
         def append_backtrace(message_array, backtrace)
           message_array << "    #{backtrace[0]}"
           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 :__hyperstack_component_render do
-              RenderingContext.render(container, params) { instance_eval(&block) if block }
+            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(:__hyperstack_component_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
 
         def method_missing(name, *args, &children)
           if args.any? || !Hyperstack::Component::Element.respond_to?(:haml_class_name)
@@ -145,12 +201,14 @@
           validator.all_other_params(name) { props }
         end
 
         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 = if name =~ /^<(.+)>$/
                    name.gsub(/^<(.+)>$/, '\1')
                  elsif Hyperstack::Component::Event::BUILT_IN_EVENTS.include?("on#{name.event_camelize}")
                    "on#{name.event_camelize}"
@@ -158,9 +216,11 @@
                    "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
           states_hash = (states.last.is_a?(Hash)) ? states.pop : {}