Finish clean up and enable sorbet on CI

Author: mickeytgl

.github/workflows/build.yml

@@ -50,8 +50,8 @@ jobs:
       - name: RBS Inline
         run: bundle exec rake rbs_inline
 
-      # - name: Sorbet
-      #   run: bundle exec srb tc
+      - name: Sorbet
+        run: bundle exec srb tc
 
       - name: Run C tests
         run: ./run_herb_tests

templates/lib/herb/ast/nodes.rb.erb

@@ -2,8 +2,15 @@ module Herb
   module AST
     <%- nodes.each do |node| -%>
     class <%= node.name -%> < Node
+      #: type serialized_<%= node.human %> = {
       <%- node.fields.each do |field| -%>
-      attr_reader :<%= field.name %> #: <%= field.ruby_type %>
+      #| <%= field.name %>: <%= field.ruby_type %>,
+      <%- end -%>
+      #| }
+
+      <%- node.fields.each do |field| -%>
+      #: <%= field.ruby_type %>
+      attr_reader :<%= field.name %>
       <%- end -%>
 
       #: (<%= ["String", "Location", "Array[Herb::Errors::Error]", *node.fields.map(&:ruby_type)].join(", ") %>) -> void
@@ -24,7 +31,7 @@ module Herb
           <%- node.fields.each do |field| -%>
           <%= field.name %>: <%= field.name %>,
           <%- end -%>
-        }) #: Herb::serialized_<%= node.human %>
+        })
       end
 
       #: (Visitor) -> void
@@ -73,7 +80,7 @@ module Herb
         output += %(<%= name %>#{<%= field.name %>.inspect}\n)
         <%- when Herb::Template::TokenField -%>
         output += "<%= name %>"
-        output += <%= field.name %> ? <%= field.name %>.tree_inspect : "∅"
+        output += <%= field.name %>.tree_inspect
         output += "\n"
         <%- when Herb::Template::BooleanField -%>
         output += "<%= name %>"
@@ -87,18 +94,14 @@ module Herb
         # no-op for <%= field.name %>
         <%- when Herb::Template::NodeField -%>
         output += "<%= name %>"
-        if <%= field.name %>
-          <%- prefix = (node.fields.last == field) ? "    " : "│   " -%>
-          output += "\n"
-          <%- if (node.fields.last == field) -%>
-          output += "    └── "
-          <%- else -%>
-          output += "│   └── "
-          <%- end -%>
-          output += <%= field.name %>.tree_inspect(indent).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, "<%= prefix %>").delete_prefix("<%= prefix %>")
-        else
-          output += "∅\n"
-        end
+        <%- prefix = (node.fields.last == field) ? "    " : "│   " -%>
+        output += "\n"
+        <%- if (node.fields.last == field) -%>
+        output += "    └── "
+        <%- else -%>
+        output += "│   └── "
+        <%- end -%>
+        output += <%= field.name %>.tree_inspect(indent).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, "<%= prefix %>").delete_prefix("<%= prefix %>")
         <%- when Herb::Template::ArrayField -%>
         output += "<%= name %>"
         output += inspect_array(<%= field.name %>, prefix: "<%= (node.fields.last == field) ? "    " : "│   " %>")

templates/lib/herb/errors.rb.erb

@@ -47,8 +47,15 @@ module Herb
 
     <%- errors.each do |error| -%>
     class <%= error.name -%> < Error
+      #: type serialized_<%= error.human %> = {
       <%- error.fields.each do |field| -%>
-      attr_reader :<%= field.name %> #: <%= field.ruby_type %>
+      #| <%= field.name %>: <%= field.ruby_type %>,
+      <%- end -%>
+      #| }
+
+      <%- error.fields.each do |field| -%>
+      #: <%= field.ruby_type %>
+      attr_reader :<%= field.name %>
       <%- end -%>
 
       #: (<%= [*base_arguments.map(&:last), *error.fields.map(&:ruby_type)].join(", ") %>) -> void
@@ -86,9 +93,9 @@ module Herb
         <%- name = "#{symbol} #{field.name}: " -%>
         <%- case field -%>
         <%- when Herb::Template::PositionField -%>
-        output += %(<%= name %>#{<%= field.name %> ? <%= field.name %>.tree_inspect : "∅"}\n)
+        output += %(<%= name %>#{<%= field.name %>.tree_inspect}\n)
         <%- when Herb::Template::TokenField -%>
-        output += %(<%= name %>#{<%= field.name %> ? <%= field.name %>.tree_inspect : "∅"}\n)
+        output += %(<%= name %>#{<%= field.name %>.tree_inspect}\n)
         <%- when Herb::Template::TokenTypeField -%>
         output += %(<%= name %>#{<%= field.name %>.inspect}\n)
         <%- when Herb::Template::StringField -%>