funicular 0.3.0 → 0.4.0

data/sig/styles.rbs

@@ -7,18 +7,31 @@ module Funicular
     def to_s: () -> String
   end
 
-  # StyleAccessor provides explicit access to defined styles.
-  class StyleAccessor
+  # Read-side accessor. A subclass is generated per component class with a
+  # real method per declared style name; those methods are app-defined and
+  # therefore untyped (use the [] form where static checking matters).
+  class StyleAccessor < BasicObject
+    @definitions: Hash[Symbol, Hash[Symbol, untyped]]
+
+    def self.accessor_for: (Hash[Symbol, Hash[Symbol, untyped]] definitions) -> singleton(StyleAccessor)
     def initialize: (Hash[Symbol, Hash[Symbol, untyped]] definitions) -> void
     def []: (Symbol name, ?(Symbol | bool) variant) -> StyleValue
+    def method_missing: (Symbol name, *untyped args) -> bot
+    def respond_to_missing?: (Symbol name, ?bool include_private) -> bool
   end
 
-  # StyleBuilder is used to define styles within the styles {} block
-  class StyleBuilder
+  # Definition-side cleanroom builder for the class-level styles block.
+  # Barewords resolve through method_missing and define styles.
+  class StyleBuilder < BasicObject
+    RESERVED_NAMES: Array[Symbol]
+
     @definitions: Hash[Symbol, Hash[Symbol, untyped]]
 
     def initialize: () -> void
-    def define: (Symbol name, ?(String | Hash[Symbol, untyped]) value, **untyped options) -> void
+    def define: (Symbol name, ?(String | Hash[Symbol, untyped])? value, **untyped options) -> self
+    def validate_options: (Symbol name, Hash[Symbol, untyped] options) -> Hash[Symbol, untyped]
     def to_definitions: () -> Hash[Symbol, Hash[Symbol, untyped]]
+    def method_missing: (Symbol name, ?untyped value, **untyped options) -> self
+    def respond_to_missing?: (Symbol name, ?bool include_private) -> bool
   end
 end

data/sig/tags.rbs

@@ -0,0 +1,54 @@
+module Funicular
+  class DSLCollisionError < StandardError
+  end
+
+  class RenderContextError < StandardError
+  end
+
+  module Tags
+    HTML_TAGS: Array[String]
+    HELPER_NAMES: Array[String]
+    RESERVED_DSL: Hash[Symbol, Symbol]
+
+    def tag: (Symbol | String name, ?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def div: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def span: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def p: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def a: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def data: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h1: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h2: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h3: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h4: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h5: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h6: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def ul: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def ol: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def li: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def table: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def thead: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def tbody: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def tr: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def th: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def td: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def form: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def input: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def textarea: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def button: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def select: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def option: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def label: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def header: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def footer: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def nav: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def section: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def article: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def aside: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def img: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def video: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def audio: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def canvas: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def br: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def hr: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+  end
+end

data/sig/view_context.rbs

@@ -1,47 +1,60 @@
 module Funicular
+  # Internal element factory. Application code uses the bareword tag DSL
+  # on Component (see sig/tags.rbs); ViewContext is what FormBuilder, the
+  # framework helpers, and ErrorBoundary fallback procs build through.
   class ViewContext
     HTML_TAGS: Array[String]
 
     def initialize: (Component component) -> void
-    def state: () -> Component::StateAccessor
-    def props: () -> Hash[Symbol, untyped]
-    def resources: () -> Component::ResourceAccessor
-    def styles: () -> StyleAccessor
-    def routes: () -> untyped
-    def tag: (Symbol | String name, ?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def component: (singleton(Component) component_class, ?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Component
+    def tag: (Symbol | String name, ?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def component: (singleton(Component) component_class, ?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Component
     def form_for: (Symbol model_key, ?Hash[Symbol, untyped] options) { (FormBuilder) -> void } -> VDOM::Element
-    def suspense: (Symbol name, fallback: untyped, ?error: untyped) { (ViewContext, Component::ResourceAccessor) -> untyped } -> untyped
+    def suspense: (Symbol name, fallback: untyped, ?error: untyped) { (Component::ResourceAccessor) -> untyped } -> untyped
     def link_to: (String path, **untyped options) ?{ -> untyped } -> VDOM::Element
     def button_to: (String path, ?method: Symbol, **untyped options) ?{ -> untyped } -> VDOM::Element
-    def capture: () { (ViewContext) -> untyped } -> Array[VDOM::child_t]
+    def capture: () { () -> untyped } -> Array[VDOM::child_t]
     def add_child: (untyped child) -> void
-    private def build_element: (Symbol | String tag_name, ?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
+    private def build_element: (Symbol | String tag_name, ?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
     private def normalize_props: (Hash[Symbol, untyped] props) -> Hash[Symbol, untyped]
 
-    def div: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def span: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def p: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def a: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def data: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h1: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h2: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h3: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h4: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h5: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def h6: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def ul: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def ol: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def li: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def table: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def form: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def input: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def textarea: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def button: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def select: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def option: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def label: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def nav: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
-    def canvas: (?Hash[Symbol, untyped] props) ?{ (ViewContext) -> untyped } -> VDOM::Element
+    def div: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def span: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def p: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def a: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def data: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h1: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h2: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h3: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h4: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h5: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def h6: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def ul: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def ol: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def li: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def table: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def thead: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def tbody: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def tr: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def th: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def td: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def form: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def input: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def textarea: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def button: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def select: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def option: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def label: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def header: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def footer: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def nav: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def section: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def article: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def aside: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def img: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def video: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def audio: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def canvas: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def br: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
+    def hr: (?Hash[Symbol, untyped] props) ?{ () -> untyped } -> VDOM::Element
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funicular
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - HASUMI Hitoshi
@@ -99,6 +99,7 @@ files:
 - minitest/commands_routes_test.rb
 - minitest/compiler_test.rb
 - minitest/configuration_test.rb
+- minitest/dsl_test.rb
 - minitest/fixtures/funicular_app/components/greeting_component.rb
 - minitest/fixtures/funicular_app/initializer.rb
 - minitest/form_for_test.rb
@@ -109,6 +110,7 @@ files:
 - minitest/plugin_test.rb
 - minitest/route_parser_test.rb
 - minitest/schema_test.rb
+- minitest/sig_tags_test.rb
 - minitest/ssr_test.rb
 - minitest/support/rails_stub.rb
 - minitest/test_helper.rb
@@ -116,6 +118,7 @@ files:
 - minitest/validations_test.rb
 - minitest/view_context_test.rb
 - mrbgem.rake
+- mrblib/0_tags.rb
 - mrblib/0_validations.rb
 - mrblib/1_validators.rb
 - mrblib/cable.rb
@@ -158,6 +161,7 @@ files:
 - sig/store_collection.rbs
 - sig/store_singleton.rbs
 - sig/styles.rbs
+- sig/tags.rbs
 - sig/validations.rbs
 - sig/vdom.rbs
 - sig/view_context.rbs