quince 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 896b010bef61ab4914a5cf09ad07c94d2840063788c6637422dfe6544c9bda3c
-  data.tar.gz: e3c39708bc888257d56ae5463619dca5bc65ace9070537af7a488e5457ffd9a4
+  metadata.gz: 8a30e10c958d56fc7a73d2515d200cae1080d407e2a19e132827b2b77837b6bb
+  data.tar.gz: 2f43465799409bb6a7336879189d35bfcfcd259b8637a1eec546826317034436
 SHA512:
-  metadata.gz: 7693d8919c8bc2f7af200afade98c9300131bf054a9a2614c9c3c80fa0eb90d2c153a092246bb7cf5b23661da2f57fde9038a712970ddecea45938eca4e4bcd5
-  data.tar.gz: da44b43b26aeeab5fe75579877e6e233e4425bf1befc12685ccdcc39aac445c617e16d2f28d571d1623afd1adc960db52a10918f39fc1922587e38c2aa736147
+  metadata.gz: 86e5e960621d4e6ecde1ce2cf07486596b00e64aeb8ddecf0c82d7c2ac9c3818ee2f367256e1a1539af86a1eee534af572cd45c94d2ed8676d5bd4d9867543f9
+  data.tar.gz: 0360b4ed00cba7ec1604c1bd42d79a8fce65b065b409a0dcb4539816980de92a33bf1c181d8f09f7542699edac24508684d01e2ad05cd08630b5c14c5e06f433

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quince (0.4.2)
+    quince (0.5.0)
       oj (~> 3.13)
       typed_struct (>= 0.1.4)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    oj (3.13.7)
+    oj (3.13.9)
     rake (13.0.6)
     rbs (1.6.2)
     rspec (3.10.0)

data/lib/quince/attributes_by_element.rb

@@ -4,14 +4,14 @@ require_relative "types"
 
 module Quince
   module HtmlTagComponents
-    referrer_policy = Rbs("'' | 'no-referrer' | 'no-referrer-when-downgrade' | 'origin' | 'origin-when-cross-origin' | 'same-origin' | 'strict-origin' | 'strict-origin-when-cross-origin' | 'unsafe-url' | Quince::Types::Undefined")
+    referrer_policy = Rbs("'' | 'no-referrer' | 'no-referrer-when-downgrade' | 'origin' | 'origin-when-cross-origin' | 'same-origin' | 'strict-origin' | 'strict-origin-when-cross-origin' | 'unsafe-url' | nil")
     form_method = Rbs(
-      '"get" | "post" | "GET" | "POST" | :GET | :POST | :get | :post | Quince::Types::Undefined'
+      '"get" | "post" | "GET" | "POST" | :GET | :POST | :get | :post | nil'
     )
     t = Quince::Types
     opt_string_sym = Rbs("#{t::OptionalString} | Symbol")
     opt_bool = t::OptionalBoolean
-    opt_callback = Rbs("Quince::Callback::Interface | Quince::Types::Undefined")
+    opt_callback = Rbs("Quince::Callback::Interface | nil")
     value = opt_string_sym # for now
 
     ATTRIBUTES_BY_ELEMENT = {
@@ -58,7 +58,7 @@ module Quince
         formnovalidate: opt_bool,
         formtarget: opt_string_sym,
         name: opt_string_sym,
-        type: Rbs("'submit' | 'reset' | 'button' | Quince::Types::Undefined"),
+        type: Rbs("'submit' | 'reset' | 'button' | nil"),
         value: value,
       }.freeze,
       "Canvas" => {
@@ -128,7 +128,7 @@ module Quince
         allowfullscreen: opt_bool,
         allowtransparency: opt_bool,
         height: opt_string_sym,
-        loading: Rbs('"eager" | "lazy" | Quince::Types::Undefined'),
+        loading: Rbs('"eager" | "lazy" | nil'),
         name: opt_string_sym,
         referrerpolicy: referrer_policy,
         sandbox: opt_string_sym,
@@ -192,7 +192,7 @@ module Quince
       "Ol" => {
         reversed: opt_bool,
         start: opt_string_sym,
-        type: Rbs("'1' | 'a' | 'A' | 'i' | 'I' | Quince::Types::Undefined"),
+        type: Rbs("'1' | 'a' | 'A' | 'i' | 'I' | nil"),
       }.freeze,
       "Optgroup" => {
         disabled: opt_bool,
@@ -270,7 +270,7 @@ module Quince
       }.freeze,
       "Tbody" => {}.freeze,
       "Td" => {
-        align: Rbs('"left" | "center" | "right" | "justify" | "char" | Quince::Types::Undefined'),
+        align: Rbs('"left" | "center" | "right" | "justify" | "char" | nil'),
         colspan: opt_string_sym,
         headers: opt_string_sym,
         rowspan: opt_string_sym,
@@ -278,7 +278,7 @@ module Quince
         abbr: opt_string_sym,
         height: opt_string_sym,
         width: opt_string_sym,
-        valign: Rbs('"top" | "middle" | "bottom" | "baseline" | Quince::Types::Undefined'),
+        valign: Rbs('"top" | "middle" | "bottom" | "baseline" | nil'),
       }.freeze,
       "Textarea" => {
         autocomplete: opt_string_sym,
@@ -300,7 +300,7 @@ module Quince
       }.freeze,
       "Tfoot" => {}.freeze,
       "Th" => {
-        align: Rbs('"left" | "center" | "right" | "justify" | "char" | Quince::Types::Undefined'),
+        align: Rbs('"left" | "center" | "right" | "justify" | "char" | nil'),
         colspan: opt_string_sym,
         headers: opt_string_sym,
         rowspan: opt_string_sym,
@@ -364,10 +364,10 @@ module Quince
       "Hr" => {}.freeze,
       "Img" => {
         alt: opt_string_sym,
-        crossorigin: Rbs('"anonymous" | "use-credentials" | "" | Quince::Types::Undefined'),
-        decoding: Rbs('"async" | "auto" | "sync" | Quince::Types::Undefined'),
+        crossorigin: Rbs('"anonymous" | "use-credentials" | "" | nil'),
+        decoding: Rbs('"async" | "auto" | "sync" | nil'),
         height: Rbs("#{opt_string_sym} | Integer"),
-        loading: Rbs('"eager" | "lazy" | Quince::Types::Undefined'),
+        loading: Rbs('"eager" | "lazy" | nil'),
         referrerpolicy: referrer_policy,
         sizes: opt_string_sym,
         src: opt_string_sym,
@@ -479,5 +479,3 @@ module Quince
     }.freeze
   end
 end
-
-Undefined = Quince::Types::Undefined

data/lib/quince/component.rb

@@ -9,7 +9,6 @@ module Quince
 
       def Props(**kw)
         self.const_set "Props", TypedStruct.new(
-          { default: Quince::Types::Undefined },
           Quince::Component::PARENT_SELECTOR_ATTR => String,
           Quince::Component::SELF_SELECTOR => String,
           **kw,
@@ -17,10 +16,7 @@ module Quince
       end
 
       def State(**kw)
-        st = kw.empty? ? nil : TypedStruct.new(
-          { default: Quince::Types::Undefined },
-          **kw,
-        )
+        st = kw.empty? ? nil : TypedStruct.new(**kw)
         self.const_set "State", st
       end
 
@@ -33,13 +29,13 @@ module Quince
           route: route,
         ) do |params|
           instance = Quince::Serialiser.deserialise(CGI.unescapeHTML(params[:component]))
-          Quince::Component.class_variable_set :@@params, params
+          Quince::Component.class_variable_set :@@params, params[:params]
           render_with = if params[:rerender]
-                          instance.instance_variable_set :@state_container, params[:stateContainer]
-                          params[:rerender][:method].to_sym
-                        else
-                          :render
-                        end
+              instance.instance_variable_set :@state_container, params[:stateContainer]
+              params[:rerender][:method].to_sym
+            else
+              :render
+            end
           instance.instance_variable_set :@render_with, render_with
           instance.instance_variable_set :@callback_event, params[:event]
           if @exposed_actions.member? action
@@ -68,7 +64,11 @@ module Quince
 
       def initialize_props(const, id, **props)
         if const.const_defined?("Props")
-          const::Props.new(PARENT_SELECTOR_ATTR => id, **props, SELF_SELECTOR => id)
+          const::Props.new(
+            PARENT_SELECTOR_ATTR => id,
+            **props,
+            SELF_SELECTOR => id
+          )
         end
       end
     end
@@ -102,11 +102,12 @@ module Quince
     SELF_SELECTOR = :"data-quid"
 
     def html_parent_selector
-      "[#{PARENT_SELECTOR_ATTR}='#{__id}']".freeze
+      id = props ? props[SELF_SELECTOR] : __id
+      "[#{PARENT_SELECTOR_ATTR}='#{id}']".freeze
     end
 
     def html_self_selector
-      "[#{SELF_SELECTOR}='#{props[SELF_SELECTOR]}']".freeze
+      "[#{SELF_SELECTOR}='#{__id}']".freeze
     end
   end
 end

data/lib/quince/html_tag_components.rb

@@ -49,13 +49,13 @@ module Quince
               internal = Quince::Serialiser.serialise receiver
               fn_name = "_Q_#{key}_#{receiver.send(:__id)}"
               rerender = value.rerender
-              state_container = html_self_selector
+              state_container = selector
               push_params_state = value.push_params_state.to_json
               code = CALLBACK_ERB_INSTANCE.result(binding)
               return %Q{#{key}="#{CGI.escape_html(code)}" data-qu-#{key}-state="#{CGI.escapeHTML(internal)}"}
             when true
               return key
-            when false, nil, Quince::Types::Undefined
+            when false, nil
               return nil
             else
               raise "prop type not yet implemented #{value}"
@@ -124,10 +124,3 @@ module Quince
 
   Quince::Component.include HtmlTagComponents
 end
-
-# tmp hack
-class TypedStruct < Struct
-  def to_json(*args)
-    to_h.to_json(*args)
-  end
-end

data/lib/quince/singleton_methods.rb

@@ -23,12 +23,30 @@ module Quince
       Object.send :private, :expose
     end
 
-    def define_constructor(const, constructor_name = const.to_s)
+    def define_constructor(const, constructor_name = nil)
+      if const.name
+        parts = const.name.split("::")
+        parent_namespace = Object.const_get(parts[0...-1].join("::")) if parts.length > 1
+        constructor_name ||= parts.last
+      end
+      constructor_name ||= const.to_s
+
       HtmlTagComponents.instance_eval do
-        define_method(constructor_name) do |*children, **props, &block_children|
-          new_props = { **props, Quince::Component::PARENT_SELECTOR_ATTR => __id }
+        mthd = lambda do |*children, **props, &block_children|
+          new_props = {
+            **props,
+            Quince::Component::PARENT_SELECTOR_ATTR => __id,
+          }
           const.create(*children, **new_props, &block_children)
         end
+
+        if parent_namespace
+          parent_namespace.instance_exec do
+            define_method(constructor_name, &mthd)
+          end
+        else
+          define_method(constructor_name, &mthd)
+        end
       end
     end
 
@@ -62,8 +80,10 @@ module Quince
 
             scr = to_html(HtmlTagComponents::Script.create(<<~JS, type: "text/javascript"))
               var stateContainer = document.querySelector(`#{selector}`);
+              console.log('yes');
               stateContainer.dataset.quOn#{event}State = #{updated_state};
             JS
+            output = output.render if output.is_a?(Component)
 
             output += (output.is_a?(String) ? scr : [scr])
           end
@@ -76,3 +96,10 @@ module Quince
     end
   end
 end
+
+############## TODO #############
+# I think you should be able to know when a component is the first to be called in a render method,
+# so you should be able to attach some props to it behind the scenes. Then any consumers of this
+# state just have to know the selector, so they can read from it before passing it to the back end.
+#
+# Also, the front end needs to be updated such that script tags from the back end are always read

data/lib/quince/types.rb

@@ -1,13 +1,8 @@
 module Quince
   module Types
-    class Base; end
-
     # precompiled helper types
-    OptionalString = Rbs("String | Quince::Types::Undefined").freeze
-    OptionalBoolean = Rbs("true | false | Quince::Types::Undefined").freeze
-
-    # no functional value for now, other than constants
-    Undefined = Class.new(Base).new.freeze
-    Any = Class.new(Base).new.freeze
+    OptionalString = Rbs("String?").freeze
+    OptionalBoolean = Rbs("true | false | nil").freeze
+    Any = Rbs("untyped").freeze
   end
 end

data/lib/quince/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quince
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quince
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Joseph Johansen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typed_struct