herb 0.8.4-x86_64-linux-musl → 0.8.5-x86_64-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894a1b1eb2fa62a37d7d04354611dad5075b6abadd173dfa363dd3f32661a35a
-  data.tar.gz: '082ffba5c4d3a007ae0fad9c17a6ea70df576b6fddee4277333d6eea345e0d70'
+  metadata.gz: 76c6577bfcc272287eea6b60ab9c37bf9e0f9835897c487c5bb08644acdce061
+  data.tar.gz: 30e9c1db33359fd759f268d9b4a6407b206361782ea453e2b89bb996f8d14989
 SHA512:
-  metadata.gz: 624d138af5d7da7393aeee55146fc76446193ebd0fcb48407042bce9bf700ba28a81ca7cf512df09d6501837df77e455f6cc5d39adf0759ff628a7baf3255225
-  data.tar.gz: c01d35421dce99d3fedfb49eecad2f1f51af3d3be7869fdfa34ada43ff95bec32e41d27cd0b130a3bedd8e83b57dafc74754dad4541c596389a3c49585eb67f7
+  metadata.gz: 50be6492332c0eaa719fa4bfae81574ee9068b8ce25c9ff80fe4ff5d54eae9a5827f05a8a2e897edb64f3151e377784610bb54b6f22a4242064dde95f3ee0df9
+  data.tar.gz: 46b68e7cb9371e6171dabce92d5d41d1616d12c1653115f9d9256c0d588f950f74b914e75d26f9f37c14b6d9999736d20b0e83a1f5d8dee2983954fd148e95dd

data/config.yml

@@ -171,6 +171,13 @@ errors:
         - name: keyword
           type: string
 
+    - name: ERBMultipleBlocksInTagError
+      message:
+        template: "Multiple unclosed control flow blocks in a single ERB tag. Split each block into its own ERB tag, or close all blocks within the same tag."
+        arguments: []
+
+      fields: []
+
 warnings:
   fields: []
   types: []

data/ext/herb/error_helpers.c

@@ -317,6 +317,30 @@ static VALUE rb_missingerb_end_tag_error_from_c_struct(MISSINGERB_END_TAG_ERROR_
   return rb_class_new_instance(4, args, MissingERBEndTagError);
 };
 
+static VALUE rb_erb_multiple_blocks_in_tag_error_from_c_struct(ERB_MULTIPLE_BLOCKS_IN_TAG_ERROR_T* erb_multiple_blocks_in_tag_error) {
+  if (erb_multiple_blocks_in_tag_error == NULL) { return Qnil; }
+
+  ERROR_T* error = &erb_multiple_blocks_in_tag_error->base;
+
+  VALUE Herb = rb_define_module("Herb");
+  VALUE Errors = rb_define_module_under(Herb, "Errors");
+  VALUE Error = rb_define_class_under(Errors, "Error", rb_cObject);
+  VALUE ERBMultipleBlocksInTagError = rb_define_class_under(Errors, "ERBMultipleBlocksInTagError", Error);
+
+  VALUE type = rb_utf8_str_new_cstr(error_type_to_string(error));
+  VALUE location = rb_location_from_c_struct(error->location);
+  VALUE message = rb_utf8_str_new_cstr(error->message);
+
+
+  VALUE args[3] = {
+    type,
+    location,
+    message
+  };
+
+  return rb_class_new_instance(3, args, ERBMultipleBlocksInTagError);
+};
+
 
 VALUE rb_error_from_c_struct(ERROR_T* error) {
   if (!error) { return Qnil; }
@@ -333,6 +357,7 @@ VALUE rb_error_from_c_struct(ERROR_T* error) {
     case RUBY_PARSE_ERROR: return rb_ruby_parse_error_from_c_struct((RUBY_PARSE_ERROR_T*) error); break;
     case ERB_CONTROL_FLOW_SCOPE_ERROR: return rb_erb_control_flow_scope_error_from_c_struct((ERB_CONTROL_FLOW_SCOPE_ERROR_T*) error); break;
     case MISSINGERB_END_TAG_ERROR: return rb_missingerb_end_tag_error_from_c_struct((MISSINGERB_END_TAG_ERROR_T*) error); break;
+    case ERB_MULTIPLE_BLOCKS_IN_TAG_ERROR: return rb_erb_multiple_blocks_in_tag_error_from_c_struct((ERB_MULTIPLE_BLOCKS_IN_TAG_ERROR_T*) error); break;
   }
 
   return Qnil;

data/ext/herb/nodes.c

@@ -464,7 +464,7 @@ static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_conte
   VALUE erb_content_node_tag_opening = rb_token_from_c_struct(erb_content_node->tag_opening);
   VALUE erb_content_node_content = rb_token_from_c_struct(erb_content_node->content);
   VALUE erb_content_node_tag_closing = rb_token_from_c_struct(erb_content_node->tag_closing);
-  /* #<Herb::Template::AnalyzedRubyField:0x00007f4bf6394088 @name="analyzed_ruby", @options={kind: nil}> */
+  /* #<Herb::Template::AnalyzedRubyField:0x00007fe374db9a70 @name="analyzed_ruby", @options={kind: nil}> */
   VALUE erb_content_node_analyzed_ruby = Qnil;
   VALUE erb_content_node_parsed = (erb_content_node->parsed) ? Qtrue : Qfalse;
   VALUE erb_content_node_valid = (erb_content_node->valid) ? Qtrue : Qfalse;

data/lib/herb/ast/helpers.rb

@@ -17,6 +17,11 @@ module Herb
         opening.start_with?("<%#")
       end
 
+      #: (String) -> bool
+      def erb_graphql?(opening)
+        opening.start_with?("<%graphql")
+      end
+
       #: (String) -> bool
       def erb_output?(opening)
         opening.include?("=")

data/lib/herb/engine/compiler.rb

@@ -319,6 +319,7 @@ module Herb
         opening = node.tag_opening.value
 
         return if !skip_comment_check && erb_comment?(opening)
+        return if erb_graphql?(opening)
 
         code = node.content.value.strip
 

data/lib/herb/errors.rb

@@ -58,7 +58,6 @@ module Herb
       #: (String, Location, String, String, String, String) -> void
       def initialize(type, location, message, description, expected, found)
         super(type, location, message)
-
         @description = description
         @expected = expected
         @found = found
@@ -71,11 +70,11 @@ module Herb
 
       #: () -> serialized_unexpected_error
       def to_hash
-        super.merge({
+        super.merge(
           description: description,
           expected: expected,
-          found: found,
-        }) #: Herb::serialized_unexpected_error
+          found: found
+        ) #: Herb::serialized_unexpected_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -102,7 +101,6 @@ module Herb
       #: (String, Location, String, String, Herb::Token) -> void
       def initialize(type, location, message, expected_type, found)
         super(type, location, message)
-
         @expected_type = expected_type
         @found = found
       end
@@ -114,10 +112,10 @@ module Herb
 
       #: () -> serialized_unexpected_token_error
       def to_hash
-        super.merge({
+        super.merge(
           expected_type: expected_type,
-          found: found,
-        }) #: Herb::serialized_unexpected_token_error
+          found: found
+        ) #: Herb::serialized_unexpected_token_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -144,7 +142,6 @@ module Herb
       #: (String, Location, String, Herb::Token) -> void
       def initialize(type, location, message, closing_tag)
         super(type, location, message)
-
         @closing_tag = closing_tag
       end
 
@@ -155,9 +152,9 @@ module Herb
 
       #: () -> serialized_missing_opening_tag_error
       def to_hash
-        super.merge({
-          closing_tag: closing_tag,
-        }) #: Herb::serialized_missing_opening_tag_error
+        super.merge(
+          closing_tag: closing_tag
+        ) #: Herb::serialized_missing_opening_tag_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -183,7 +180,6 @@ module Herb
       #: (String, Location, String, Herb::Token) -> void
       def initialize(type, location, message, opening_tag)
         super(type, location, message)
-
         @opening_tag = opening_tag
       end
 
@@ -194,9 +190,9 @@ module Herb
 
       #: () -> serialized_missing_closing_tag_error
       def to_hash
-        super.merge({
-          opening_tag: opening_tag,
-        }) #: Herb::serialized_missing_closing_tag_error
+        super.merge(
+          opening_tag: opening_tag
+        ) #: Herb::serialized_missing_closing_tag_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -223,7 +219,6 @@ module Herb
       #: (String, Location, String, Herb::Token, Herb::Token) -> void
       def initialize(type, location, message, opening_tag, closing_tag)
         super(type, location, message)
-
         @opening_tag = opening_tag
         @closing_tag = closing_tag
       end
@@ -235,10 +230,10 @@ module Herb
 
       #: () -> serialized_tag_names_mismatch_error
       def to_hash
-        super.merge({
+        super.merge(
           opening_tag: opening_tag,
-          closing_tag: closing_tag,
-        }) #: Herb::serialized_tag_names_mismatch_error
+          closing_tag: closing_tag
+        ) #: Herb::serialized_tag_names_mismatch_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -268,7 +263,6 @@ module Herb
       #: (String, Location, String, Herb::Token, Herb::Token) -> void
       def initialize(type, location, message, opening_quote, closing_quote)
         super(type, location, message)
-
         @opening_quote = opening_quote
         @closing_quote = closing_quote
       end
@@ -280,10 +274,10 @@ module Herb
 
       #: () -> serialized_quotes_mismatch_error
       def to_hash
-        super.merge({
+        super.merge(
           opening_quote: opening_quote,
-          closing_quote: closing_quote,
-        }) #: Herb::serialized_quotes_mismatch_error
+          closing_quote: closing_quote
+        ) #: Herb::serialized_quotes_mismatch_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -314,7 +308,6 @@ module Herb
       #: (String, Location, String, Herb::Token, String, String) -> void
       def initialize(type, location, message, tag_name, expected, found)
         super(type, location, message)
-
         @tag_name = tag_name
         @expected = expected
         @found = found
@@ -327,11 +320,11 @@ module Herb
 
       #: () -> serialized_void_element_closing_tag_error
       def to_hash
-        super.merge({
+        super.merge(
           tag_name: tag_name,
           expected: expected,
-          found: found,
-        }) #: Herb::serialized_void_element_closing_tag_error
+          found: found
+        ) #: Herb::serialized_void_element_closing_tag_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -359,7 +352,6 @@ module Herb
       #: (String, Location, String, Herb::Token) -> void
       def initialize(type, location, message, opening_tag)
         super(type, location, message)
-
         @opening_tag = opening_tag
       end
 
@@ -370,9 +362,9 @@ module Herb
 
       #: () -> serialized_unclosed_element_error
       def to_hash
-        super.merge({
-          opening_tag: opening_tag,
-        }) #: Herb::serialized_unclosed_element_error
+        super.merge(
+          opening_tag: opening_tag
+        ) #: Herb::serialized_unclosed_element_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -400,7 +392,6 @@ module Herb
       #: (String, Location, String, String, String, String) -> void
       def initialize(type, location, message, error_message, diagnostic_id, level)
         super(type, location, message)
-
         @error_message = error_message
         @diagnostic_id = diagnostic_id
         @level = level
@@ -413,11 +404,11 @@ module Herb
 
       #: () -> serialized_ruby_parse_error
       def to_hash
-        super.merge({
+        super.merge(
           error_message: error_message,
           diagnostic_id: diagnostic_id,
-          level: level,
-        }) #: Herb::serialized_ruby_parse_error
+          level: level
+        ) #: Herb::serialized_ruby_parse_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -443,7 +434,6 @@ module Herb
       #: (String, Location, String, String) -> void
       def initialize(type, location, message, keyword)
         super(type, location, message)
-
         @keyword = keyword
       end
 
@@ -454,9 +444,9 @@ module Herb
 
       #: () -> serialized_erb_control_flow_scope_error
       def to_hash
-        super.merge({
-          keyword: keyword,
-        }) #: Herb::serialized_erb_control_flow_scope_error
+        super.merge(
+          keyword: keyword
+        ) #: Herb::serialized_erb_control_flow_scope_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -480,7 +470,6 @@ module Herb
       #: (String, Location, String, String) -> void
       def initialize(type, location, message, keyword)
         super(type, location, message)
-
         @keyword = keyword
       end
 
@@ -491,9 +480,9 @@ module Herb
 
       #: () -> serialized_missingerb_end_tag_error
       def to_hash
-        super.merge({
-          keyword: keyword,
-        }) #: Herb::serialized_missingerb_end_tag_error
+        super.merge(
+          keyword: keyword
+        ) #: Herb::serialized_missingerb_end_tag_error
       end
 
       #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
@@ -509,5 +498,25 @@ module Herb
       end
     end
 
+    class ERBMultipleBlocksInTagError < Error
+      include Colors
+
+      #: () -> String
+      def inspect
+        tree_inspect.rstrip.gsub(/\s+$/, "")
+      end
+
+      #: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
+      def tree_inspect(indent: 0, depth: 0, depth_limit: 25)
+        output = +""
+
+        output += white("@ #{bold(red(error_name))} #{dimmed("(location: #{location.tree_inspect})\n")}")
+        output += white("└── message: #{green(message.inspect)}\n")
+        output += %(\n)
+
+        output.gsub(/^/, "    " * indent)
+      end
+    end
+
   end
 end

data/lib/herb/version.rb

@@ -2,5 +2,5 @@
 # typed: true
 
 module Herb
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/sig/herb/ast/helpers.rbs

@@ -9,6 +9,9 @@ module Herb
       # : (String) -> bool
       def erb_comment?: (String) -> bool
 
+      # : (String) -> bool
+      def erb_graphql?: (String) -> bool
+
       # : (String) -> bool
       def erb_output?: (String) -> bool
 

data/sig/herb/errors.rbs

@@ -243,5 +243,15 @@ module Herb
       # : (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
       def tree_inspect: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
     end
+
+    class ERBMultipleBlocksInTagError < Error
+      include Colors
+
+      # : () -> String
+      def inspect: () -> String
+
+      # : (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
+      def tree_inspect: (?indent: Integer, ?depth: Integer, ?depth_limit: Integer) -> String
+    end
   end
 end

data/sig/serialized_ast_errors.rbs

@@ -58,4 +58,7 @@ module Herb
     keyword: String,
   }
 
+  type serialized_erb_multiple_blocks_in_tag_error = serialized_error & {
+  }
+
 end

data/src/analyze.c

@@ -45,6 +45,8 @@ static analyzed_ruby_T* herb_analyze_ruby(hb_string_T source) {
   search_yield_nodes(analyzed->root, analyzed);
   search_block_closing_nodes(analyzed);
 
+  if (!analyzed->valid) { pm_visit_node(analyzed->root, search_unclosed_control_flows, analyzed); }
+
   return analyzed;
 }
 
@@ -54,12 +56,21 @@ static bool analyze_erb_content(const AST_NODE_T* node, void* data) {
 
     const char* opening = erb_content_node->tag_opening->value;
 
-    if (strcmp(opening, "<%%") != 0 && strcmp(opening, "<%%=") != 0 && strcmp(opening, "<%#") != 0) {
+    if (strcmp(opening, "<%%") != 0 && strcmp(opening, "<%%=") != 0 && strcmp(opening, "<%#") != 0
+        && strcmp(opening, "<%graphql") != 0) {
       analyzed_ruby_T* analyzed = herb_analyze_ruby(hb_string(erb_content_node->content->value));
 
       erb_content_node->parsed = true;
       erb_content_node->valid = analyzed->valid;
       erb_content_node->analyzed_ruby = analyzed;
+
+      if (!analyzed->valid && analyzed->unclosed_control_flow_count >= 2) {
+        append_erb_multiple_blocks_in_tag_error(
+          erb_content_node->base.location.start,
+          erb_content_node->base.location.end,
+          erb_content_node->base.errors
+        );
+      }
     } else {
       erb_content_node->parsed = false;
       erb_content_node->valid = true;