herb 0.10.4 → 0.11.0

data/sig/serialized_ast_nodes.rbs

@@ -2,7 +2,7 @@
 # typed: true
 
 # NOTE: This file is generated by the templates/template.rb script and should not be
-# modified manually. See /home/runner/work/herb/herb/templates/sig/serialized_ast_nodes.rbs.erb
+# modified manually. See templates/sig/serialized_ast_nodes.rbs.erb
 
 module Herb
   type serialized_document_node = serialized_node & {
@@ -72,7 +72,7 @@ module Herb
   }
 
   type serialized_html_attribute_name_node = serialized_node & {
-    children: Array[(Herb::AST::LiteralNode | Herb::AST::ERBContentNode)],
+    children: Array[(Herb::AST::LiteralNode | Herb::AST::ERBContentNode | Herb::AST::ERBCommentNode)],
   }
 
   type serialized_html_attribute_node = serialized_node & {
@@ -120,6 +120,13 @@ module Herb
     tag_closing: Herb::Token,
   }
 
+  type serialized_xml_processing_instruction_node = serialized_node & {
+    tag_opening: Herb::Token,
+    target: Herb::Token,
+    children: Array[Herb::AST::Node],
+    tag_closing: Herb::Token,
+  }
+
   type serialized_cdata_node = serialized_node & {
     tag_opening: Herb::Token,
     children: Array[Herb::AST::Node],
@@ -177,6 +184,24 @@ module Herb
     end_node: Herb::AST::ERBEndNode,
   }
 
+  type serialized_erb_iteration_block_node = serialized_node & {
+    tag_opening: Herb::Token,
+    content: Herb::Token,
+    tag_closing: Herb::Token,
+    prism_node: String,
+    receiver: Herb::Token,
+    call_operator: Herb::Token,
+    message: Herb::Token,
+    arguments: Array[Herb::AST::RubyLiteralNode],
+    block_opening: Herb::Token,
+    body: Array[Herb::AST::Node],
+    block_arguments: Array[Herb::AST::RubyParameterNode],
+    rescue_clause: Herb::AST::ERBRescueNode,
+    else_clause: Herb::AST::ERBElseNode,
+    ensure_clause: Herb::AST::ERBEnsureNode,
+    end_node: Herb::AST::ERBEndNode,
+  }
+
   type serialized_erb_when_node = serialized_node & {
     tag_opening: Herb::Token,
     content: Herb::Token,
@@ -296,6 +321,8 @@ module Herb
     handlers: Herb::Token,
     content_type: Herb::Token,
     locals: Array[Herb::AST::RubyRenderLocalNode],
+    state: Array[Herb::AST::HerbStateDeclarationNode],
+    state_location: Herb::Location,
   }
 
   type serialized_erb_render_node = serialized_node & {
@@ -343,4 +370,33 @@ module Herb
     statements: Array[Herb::AST::Node],
   }
 
+  type serialized_herb_directive_node = serialized_node & {
+    tag_opening: Herb::Token,
+    content: Herb::Token,
+    tag_closing: Herb::Token,
+    key: Herb::Token,
+    arguments: Herb::Token,
+  }
+
+  type serialized_herb_state_declaration_node = serialized_node & {
+    name: Herb::Token,
+    default_value: Herb::AST::RubyLiteralNode,
+    kind: String,
+  }
+
+  type serialized_herb_state_directive_node = serialized_node & {
+    tag_opening: Herb::Token,
+    content: Herb::Token,
+    tag_closing: Herb::Token,
+    key: Herb::Token,
+    signature: Herb::Token,
+    states: Array[Herb::AST::HerbStateDeclarationNode],
+  }
+
+  type serialized_erb_comment_node = serialized_node & {
+    tag_opening: Herb::Token,
+    content: Herb::Token,
+    tag_closing: Herb::Token,
+  }
+
 end

data/src/analyze/action_view/attribute_extraction_helpers.c

@@ -238,10 +238,12 @@ static char* join_static_string_array(pm_array_node_t* array, hb_allocator_T* al
 
   char* result = hb_allocator_strdup(allocator, hb_buffer_value(&buffer));
 
+  hb_buffer_free(&buffer);
+
   return result;
 }
 
-static AST_HTML_ATTRIBUTE_NODE_T* create_attribute_from_value(
+static AST_NODE_T* create_attribute_from_value(
   const char* name_string,
   pm_node_t* value_node,
   attribute_positions_T* positions,
@@ -256,7 +258,7 @@ static AST_HTML_ATTRIBUTE_NODE_T* create_attribute_from_value(
       create_html_attribute_node_precise(name_string, joined, positions, allocator);
     hb_allocator_dealloc(allocator, joined);
 
-    return attribute;
+    return (AST_NODE_T*) attribute;
   }
 
   if (value_node->type == PM_SYMBOL_NODE || value_node->type == PM_STRING_NODE) {
@@ -267,17 +269,17 @@ static AST_HTML_ATTRIBUTE_NODE_T* create_attribute_from_value(
       create_html_attribute_node_precise(name_string, value_string, positions, allocator);
     hb_allocator_dealloc(allocator, value_string);
 
-    return attribute;
+    return (AST_NODE_T*) attribute;
   } else if (value_node->type == PM_TRUE_NODE) {
     if (is_boolean_attribute(hb_string((char*) name_string))) {
-      return create_html_attribute_node_precise(name_string, NULL, positions, allocator);
+      return (AST_NODE_T*) create_html_attribute_node_precise(name_string, NULL, positions, allocator);
     }
 
-    return create_html_attribute_node_precise(name_string, "true", positions, allocator);
+    return (AST_NODE_T*) create_html_attribute_node_precise(name_string, "true", positions, allocator);
   } else if (value_node->type == PM_FALSE_NODE) {
     if (is_boolean_attribute(hb_string((char*) name_string))) { return NULL; }
 
-    return create_html_attribute_node_precise(name_string, "false", positions, allocator);
+    return (AST_NODE_T*) create_html_attribute_node_precise(name_string, "false", positions, allocator);
   } else if (value_node->type == PM_INTEGER_NODE) {
     size_t value_length = value_node->location.end - value_node->location.start;
     char* value_string = hb_allocator_strndup(allocator, (const char*) value_node->location.start, value_length);
@@ -287,9 +289,9 @@ static AST_HTML_ATTRIBUTE_NODE_T* create_attribute_from_value(
       create_html_attribute_node_precise(name_string, value_string, positions, allocator);
     hb_allocator_dealloc(allocator, value_string);
 
-    return attribute;
+    return (AST_NODE_T*) attribute;
   } else if (value_node->type == PM_INTERPOLATED_STRING_NODE) {
-    return create_html_attribute_with_interpolated_value(
+    return (AST_NODE_T*) create_html_attribute_with_interpolated_value(
       name_string,
       (pm_interpolated_string_node_t*) value_node,
       positions->name_start,
@@ -302,34 +304,48 @@ static AST_HTML_ATTRIBUTE_NODE_T* create_attribute_from_value(
 
     if (raw_content && value_node->location.start) {
       char* ruby_content = raw_content;
+      hb_buffer_T wrapper;
+      bool wrapped = false;
+
+      if (!is_nested && is_boolean_attribute(hb_string((char*) name_string))) {
+        AST_NODE_T* conditional_attribute =
+          create_conditional_boolean_attribute(name_string, raw_content, positions, allocator);
+
+        hb_allocator_dealloc(allocator, raw_content);
+
+        return conditional_attribute;
+      }
 
       if (!is_nested && strcmp(name_string, "class") == 0
           && (value_node->type == PM_HASH_NODE || value_node->type == PM_ARRAY_NODE)) {
-        hb_buffer_T class_buffer;
-        hb_buffer_init(&class_buffer, value_length + 16, allocator);
-        hb_buffer_append(&class_buffer, "token_list(");
-        hb_buffer_append(&class_buffer, raw_content);
-        hb_buffer_append(&class_buffer, ")");
+        hb_buffer_init(&wrapper, value_length + 16, allocator);
+        hb_buffer_append(&wrapper, "token_list(");
+        hb_buffer_append(&wrapper, raw_content);
+        hb_buffer_append(&wrapper, ")");
 
-        ruby_content = hb_buffer_value(&class_buffer);
+        ruby_content = hb_buffer_value(&wrapper);
+        wrapped = true;
       }
 
       // Rails calls .to_json on non-string/symbol values inside data:/aria: hashes
       if (is_nested) {
-        hb_buffer_T json_buffer;
-        hb_buffer_init(&json_buffer, value_length + 64, allocator);
-        hb_buffer_append(&json_buffer, "::Herb::Engine.nested_attribute_value(");
-        hb_buffer_append(&json_buffer, raw_content);
-        hb_buffer_append(&json_buffer, ")");
+        hb_buffer_init(&wrapper, value_length + 64, allocator);
+        hb_buffer_append(&wrapper, "::Herb::Engine.nested_attribute_value(");
+        hb_buffer_append(&wrapper, raw_content);
+        hb_buffer_append(&wrapper, ")");
 
-        ruby_content = hb_buffer_value(&json_buffer);
+        ruby_content = hb_buffer_value(&wrapper);
+        wrapped = true;
       }
 
       AST_HTML_ATTRIBUTE_NODE_T* attribute =
         create_html_attribute_with_ruby_literal_precise(name_string, ruby_content, positions, allocator);
+
+      if (wrapped) { hb_buffer_free(&wrapper); }
+
       hb_allocator_dealloc(allocator, raw_content);
 
-      return attribute;
+      return (AST_NODE_T*) attribute;
     }
 
     return NULL;
@@ -375,20 +391,25 @@ void resolve_nonce_attribute(hb_array_T* attributes, hb_allocator_T* allocator)
         allocator
       );
 
-      hb_array_T* new_children = hb_array_init(1, allocator);
-      hb_array_append(new_children, (AST_NODE_T*) ruby_node);
-      attribute->value->children = new_children;
+      for (size_t child = 0; child < hb_array_size(attribute->value->children); child++) {
+        ast_node_free(hb_array_get(attribute->value->children, child), allocator);
+      }
+
+      attribute->value->children->size = 0;
+      hb_array_append(attribute->value->children, (AST_NODE_T*) ruby_node);
+
       return;
     }
 
     if (hb_string_equals(literal->content, hb_string("false"))) {
       hb_array_remove(attributes, index);
+
       return;
     }
   }
 }
 
-AST_HTML_ATTRIBUTE_NODE_T* extract_html_attribute_from_assoc(
+AST_NODE_T* extract_html_attribute_from_assoc(
   pm_assoc_node_t* assoc,
   const uint8_t* source,
   const char* original_source,
@@ -417,14 +438,30 @@ AST_HTML_ATTRIBUTE_NODE_T* extract_html_attribute_from_assoc(
     compute_position_pair(&name_loc, source, original_source, erb_content_offset, &name_start, &name_end);
 
     char* dashed_name = convert_underscores_to_dashes(name_string);
-
-    AST_HTML_ATTRIBUTE_NODE_T* attribute = create_html_attribute_with_ruby_literal(
-      dashed_name ? dashed_name : name_string,
-      name_string,
-      name_start,
-      name_start,
-      allocator
-    );
+    const char* attribute_name = dashed_name ? dashed_name : name_string;
+
+    AST_NODE_T* attribute;
+
+    if (is_boolean_attribute(hb_string((char*) attribute_name))) {
+      attribute_positions_T positions = {
+        .name_start = name_start,
+        .name_end = name_end,
+        .separator_string = ":",
+        .separator_type = TOKEN_COLON,
+        .separator_start = name_end,
+        .separator_end = name_end,
+        .value_start = name_end,
+        .value_end = name_end,
+        .content_start = name_end,
+        .content_end = name_end,
+        .quoted = false,
+      };
+
+      attribute = create_conditional_boolean_attribute(attribute_name, name_string, &positions, allocator);
+    } else {
+      attribute = (AST_NODE_T*)
+        create_html_attribute_with_ruby_literal(attribute_name, name_string, name_start, name_start, allocator);
+    }
 
     if (dashed_name) { free(dashed_name); }
     hb_allocator_dealloc(allocator, name_string);
@@ -451,7 +488,7 @@ AST_HTML_ATTRIBUTE_NODE_T* extract_html_attribute_from_assoc(
   fill_attribute_positions(assoc, source, original_source, erb_content_offset, &positions);
 
   char* dashed_name = convert_underscores_to_dashes(name_string);
-  AST_HTML_ATTRIBUTE_NODE_T* attribute_node =
+  AST_NODE_T* attribute_node =
     create_attribute_from_value(dashed_name ? dashed_name : name_string, assoc->value, &positions, allocator, false);
 
   if (dashed_name) { free(dashed_name); }
@@ -575,7 +612,7 @@ hb_array_T* extract_html_attributes_from_keyword_hash(
             attribute_positions_T hash_positions;
             fill_attribute_positions(hash_assoc, source, original_source, erb_content_offset, &hash_positions);
 
-            AST_HTML_ATTRIBUTE_NODE_T* attribute =
+            AST_NODE_T* attribute =
               create_attribute_from_value(attribute_key_string, hash_assoc->value, &hash_positions, allocator, true);
 
             if (attribute) { hb_array_append(attributes, attribute); }
@@ -583,7 +620,7 @@ hb_array_T* extract_html_attributes_from_keyword_hash(
           }
         }
       } else {
-        AST_HTML_ATTRIBUTE_NODE_T* attribute =
+        AST_NODE_T* attribute =
           extract_html_attribute_from_assoc(assoc, source, original_source, erb_content_offset, allocator);
 
         if (attribute) { hb_array_append(attributes, attribute); }

data/src/analyze/action_view/generated_handlers.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/analyze/action_view/generated_handlers.c.erb
+// be modified manually. See templates/src/analyze/action_view/generated_handlers.c.erb
 
 #include "../../include/analyze/action_view/tag_helper_handler.h"
 #include "../../include/lib/hb_allocator.h"
@@ -29,6 +29,14 @@ bool detect_javascript_include_tag(pm_call_node_t* call_node, pm_parser_t* parse
   return constant && constant->length == 22 && strncmp((const char*) constant->start, "javascript_include_tag", 22) == 0;
 }
 
+bool detect_stylesheet_link_tag(pm_call_node_t* call_node, pm_parser_t* parser) {
+  if (!call_node || !call_node->name) { return false; }
+
+  pm_constant_t* constant = pm_constant_pool_id_to_constant(&parser->constant_pool, call_node->name);
+
+  return constant && constant->length == 19 && strncmp((const char*) constant->start, "stylesheet_link_tag", 19) == 0;
+}
+
 bool detect_javascript_tag(pm_call_node_t* call_node, pm_parser_t* parser) {
   if (!call_node || !call_node->name) { return false; }
 
@@ -83,6 +91,13 @@ static char* extract_javascript_include_tag_tag_name(pm_call_node_t* _call_node,
   return hb_allocator_strdup(allocator, "script");
 }
 
+static char* extract_stylesheet_link_tag_tag_name(pm_call_node_t* _call_node, pm_parser_t* _parser, hb_allocator_T* allocator) {
+  (void) _call_node;
+  (void) _parser;
+
+  return hb_allocator_strdup(allocator, "link");
+}
+
 static char* extract_javascript_tag_tag_name(pm_call_node_t* _call_node, pm_parser_t* _parser, hb_allocator_T* allocator) {
   (void) _call_node;
   (void) _parser;
@@ -159,6 +174,14 @@ static char* extract_javascript_include_tag_content(pm_call_node_t* _call_node,
   return NULL;
 }
 
+static char* extract_stylesheet_link_tag_content(pm_call_node_t* _call_node, pm_parser_t* _parser, hb_allocator_T* _allocator) {
+  (void) _call_node;
+  (void) _parser;
+  (void) _allocator;
+
+  return NULL;
+}
+
 static char* extract_javascript_tag_content(pm_call_node_t* call_node, pm_parser_t* _parser, hb_allocator_T* allocator) {
   (void) _parser;
 
@@ -280,6 +303,10 @@ static bool javascript_include_tag_supports_block(void) {
   return false;
 }
 
+static bool stylesheet_link_tag_supports_block(void) {
+  return false;
+}
+
 static bool javascript_tag_supports_block(void) {
   return true;
 }
@@ -318,6 +345,15 @@ const tag_helper_handler_T javascript_include_tag_handler = {
   .supports_block = javascript_include_tag_supports_block,
 };
 
+const tag_helper_handler_T stylesheet_link_tag_handler = {
+  .name = "stylesheet_link_tag",
+  .source = HB_STRING_LITERAL("ActionView::Helpers::AssetTagHelper#stylesheet_link_tag"),
+  .detect = detect_stylesheet_link_tag,
+  .extract_tag_name = extract_stylesheet_link_tag_tag_name,
+  .extract_content = extract_stylesheet_link_tag_content,
+  .supports_block = stylesheet_link_tag_supports_block,
+};
+
 const tag_helper_handler_T javascript_tag_handler = {
   .name = "javascript_tag",
   .source = HB_STRING_LITERAL("ActionView::Helpers::JavaScriptHelper#javascript_tag"),

data/src/analyze/action_view/generated_handlers.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /home/runner/work/herb/herb/templates/src/analyze/action_view/generated_handlers.h.erb
+// be modified manually. See templates/src/analyze/action_view/generated_handlers.h.erb
 
 #ifndef GENERATED_HANDLERS_H
 #define GENERATED_HANDLERS_H
@@ -8,6 +8,7 @@
 
 extern const tag_helper_handler_T image_tag_handler;
 extern const tag_helper_handler_T javascript_include_tag_handler;
+extern const tag_helper_handler_T stylesheet_link_tag_handler;
 extern const tag_helper_handler_T javascript_tag_handler;
 extern const tag_helper_handler_T content_tag_handler;
 extern const tag_helper_handler_T tag_handler;