herb 0.10.2-x86-linux-musl → 0.10.3-x86-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8580eb8bced26efa1b7d2e9d706be035b0c19d3f47cb2c8a97faede0c6fbbed
-  data.tar.gz: 2cbf6c0923d2a3a0ef088b8fc978e6f2895718571afd045a18b7eb10dd4ab397
+  metadata.gz: 9dc371ce28a6cfe6d92a4b900cb9624951744b17ce04d7e6a5db4570437b2a85
+  data.tar.gz: ef478f6167c9d141c28c2c6ba4a92442942e86699b0dede7b93a540964543e04
 SHA512:
-  metadata.gz: d3208283da316cc34d9e1c93ebbf685cea626b0e7b63138dd808b6fefc50495d8e50c0f256ce2fffdf6daf1d26ecdb937d1e48ffbac4d59acdb2451c6afb5d45
-  data.tar.gz: 59158a54fa34f44ee7599381b05d00ea3a38af915a7e53d82e60b67fe7572a9d8641e2bdba18a2e68295eb99507a380b26e871b925b635ced059c2202a9b7bc6
+  metadata.gz: 62131dbf43093b43cb8ade6b77e47aaec5b024a22983033bd56ff4d5d39f563f3289c0aff761a3e9057f286015cfddb725f95fffc5584746af7e59bb37974dfe
+  data.tar.gz: fd19b4898455016e19af67f6b362ded9759ad8208bc58a48e10d753831fb4884e881a3732bc078e1722df8ce279a189040a1ef2b502c7e7db1bcb97d03cfc077

data/lib/herb/cli.rb

@@ -8,7 +8,7 @@ require "optparse"
 class Herb::CLI
   include Herb::Colors
 
-  attr_accessor :json, :silent, :log_file, :no_timing, :local, :escape, :no_escape, :freeze, :debug, :tool, :strict, :analyze, :track_whitespace, :verbose, :isolate, :arena_stats, :leak_check, :action_view_helpers, :trim, :optimize
+  attr_accessor :json, :silent, :log_file, :no_timing, :local, :escape, :no_escape, :freeze, :debug, :tool, :strict, :analyze, :track_whitespace, :verbose, :isolate, :arena_stats, :leak_check, :action_view_helpers, :trim, :optimize, :file_timeout
 
   def initialize(args)
     @args = args
@@ -154,6 +154,7 @@ class Herb::CLI
                   project.silent = silent
                   project.verbose = verbose || ci?
                   project.isolate = isolate
+                  project.file_timeout = file_timeout if file_timeout
                   project.validate_ruby = true
                   project.arena_stats = arena_stats
                   project.leak_check = leak_check
@@ -269,6 +270,10 @@ class Herb::CLI
         self.isolate = true
       end
 
+      parser.on("--timeout SECONDS", Float, "Per-file timeout for parse + compile (for analyze command) (default: #{Herb::Project::DEFAULT_FILE_TIMEOUT})") do |seconds|
+        self.file_timeout = seconds
+      end
+
       parser.on("--log-file", "Enable log file generation") do
         self.log_file = true
       end

data/lib/herb/engine/debug_visitor.rb

@@ -336,7 +336,7 @@ module Herb
       end
 
       def in_excluded_context?
-        excluded_tags = ["script", "style", "head", "textarea", "pre", "svg", "math"]
+        excluded_tags = ["script", "style", "head", "title", "textarea", "pre", "svg", "math"]
         return true if excluded_tags.any? { |tag| @element_stack.include?(tag) }
 
         if @erb_block_stack.any? { |node| javascript_tag?(node.content.value.strip) || include_debug_disable_comment?(node.content.value.strip) }

data/lib/herb/engine/parser_error_overlay.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "digest"
+
 module Herb
   class Engine
     class ParserErrorOverlay

data/lib/herb/project.rb

@@ -12,7 +12,9 @@ module Herb
   class Project
     include Colors
 
-    attr_accessor :project_path, :output_file, :no_log_file, :no_timing, :silent, :verbose, :isolate, :validate_ruby, :file_paths, :arena_stats, :leak_check
+    attr_accessor :project_path, :output_file, :no_log_file, :no_timing, :silent, :verbose, :isolate, :validate_ruby, :file_paths, :arena_stats, :leak_check, :file_timeout
+
+    DEFAULT_FILE_TIMEOUT = 1 # seconds per file for parse + compile
 
     # Known error types that indicate issues in the user's template, not bugs in the parser.
     TEMPLATE_ERRORS = [
@@ -126,6 +128,7 @@ module Herb
 
       date = Time.now.strftime("%Y-%m-%d_%H-%M-%S")
       @output_file = output_file || "#{date}_erb_parsing_result_#{@project_path.basename}.log"
+      @file_timeout = DEFAULT_FILE_TIMEOUT
     end
 
     def configuration
@@ -354,7 +357,7 @@ module Herb
         result[:leak_check] = capture_leak_check(file_content)
       end
 
-      Timeout.timeout(1) do
+      Timeout.timeout(file_timeout) do
         parse_result = Herb.parse(file_content)
 
         if parse_result.failed?
@@ -369,7 +372,7 @@ module Herb
       result
     rescue Timeout::Error
       result.merge(status: :timeout, file_content: file_content,
-                   log: "⏱️ Parsing #{file_path} timed out after 1 second")
+                   log: "⏱️ Parsing #{file_path} timed out after #{file_timeout} #{pluralize(file_timeout, "second")}")
     rescue StandardError => e
       file_content ||= begin
         File.read(file_path)
@@ -388,7 +391,7 @@ module Herb
       stdout_file = Tempfile.new("stdout")
       stderr_file = Tempfile.new("stderr")
 
-      Timeout.timeout(1) do
+      Timeout.timeout(file_timeout) do
         pid = Process.fork do
           $stdout.reopen(stdout_file.path, "w")
           $stderr.reopen(stderr_file.path, "w")
@@ -431,7 +434,7 @@ module Herb
         nil
       end
 
-      { file_path: file_path, status: :timeout, file_content: file_content, log: "⏱️ Parsing #{file_path} timed out after 1 second" }
+      { file_path: file_path, status: :timeout, file_content: file_content, log: "⏱️ Parsing #{file_path} timed out after #{file_timeout} #{pluralize(file_timeout, "second")}" }
     rescue StandardError => e
       file_content ||= begin
         File.read(file_path)

data/lib/herb/version.rb

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

data/src/analyze/action_view/tag_helpers.c

@@ -5,6 +5,7 @@
 #include "../../include/analyze/analyze.h"
 #include "../../include/ast/ast_nodes.h"
 #include "../../include/herb.h"
+#include "../../include/lexer/token.h"
 #include "../../include/lib/hb_allocator.h"
 #include "../../include/lib/hb_array.h"
 #include "../../include/lib/hb_buffer.h"
@@ -1426,6 +1427,8 @@ void transform_tag_helper_array(hb_array_T* array, analyze_ruby_context_T* conte
     if (child->type == AST_ERB_BLOCK_NODE) {
       AST_ERB_BLOCK_NODE_T* block_node = (AST_ERB_BLOCK_NODE_T*) child;
 
+      if (token_is_escaped_erb_tag_opening(block_node->tag_opening)) { continue; }
+
       if (block_node->tag_opening && !hb_string_is_empty(block_node->tag_opening->value)) {
         const char* opening_string = block_node->tag_opening->value.data;
         if (opening_string && strstr(opening_string, "=") == NULL) { continue; }
@@ -1455,6 +1458,8 @@ void transform_tag_helper_array(hb_array_T* array, analyze_ruby_context_T* conte
       AST_ERB_CONTENT_NODE_T* erb_node = (AST_ERB_CONTENT_NODE_T*) child;
       token_T* tag_opening = erb_node->tag_opening;
 
+      if (token_is_escaped_erb_tag_opening(tag_opening)) { continue; }
+
       if (tag_opening && !hb_string_is_empty(tag_opening->value)) {
         const char* opening_string = tag_opening->value.data;
 

data/src/analyze/control_type.c

@@ -110,11 +110,10 @@ static bool find_earliest_control_keyword_walker(const pm_node_t* node, void* da
       if (call->block != NULL && call->block->type == PM_BLOCK_NODE) {
         pm_block_node_t* block_node = (pm_block_node_t*) call->block;
 
-        bool has_do_opening = is_do_block(block_node->opening_loc);
-        bool has_brace_opening = is_brace_block(block_node->opening_loc);
-        bool has_valid_brace_closing = is_closing_brace(block_node->closing_loc);
+        bool has_opening = is_do_block(block_node->opening_loc) || is_brace_block(block_node->opening_loc);
+        bool is_unclosed = !has_valid_block_closing(block_node->opening_loc, block_node->closing_loc);
 
-        if (has_do_opening || (has_brace_opening && !has_valid_brace_closing)) {
+        if (has_opening && is_unclosed) {
           current_type = CONTROL_TYPE_BLOCK;
           keyword_offset = (uint32_t) (node->location.start - context->source_start);
         }
@@ -125,11 +124,10 @@ static bool find_earliest_control_keyword_walker(const pm_node_t* node, void* da
     case PM_LAMBDA_NODE: {
       pm_lambda_node_t* lambda = (pm_lambda_node_t*) node;
 
-      bool has_do_opening = is_do_block(lambda->opening_loc);
-      bool has_brace_opening = is_brace_block(lambda->opening_loc);
-      bool has_valid_brace_closing = is_closing_brace(lambda->closing_loc);
+      bool has_opening = is_do_block(lambda->opening_loc) || is_brace_block(lambda->opening_loc);
+      bool is_unclosed = !has_valid_block_closing(lambda->opening_loc, lambda->closing_loc);
 
-      if (has_do_opening || (has_brace_opening && !has_valid_brace_closing)) {
+      if (has_opening && is_unclosed) {
         current_type = CONTROL_TYPE_BLOCK;
         keyword_offset = (uint32_t) (node->location.start - context->source_start);
       }

data/src/analyze/render_nodes.c

@@ -5,6 +5,7 @@
 #include "../include/analyze/helpers.h"
 #include "../include/ast/ast_nodes.h"
 #include "../include/errors.h"
+#include "../include/lexer/token.h"
 #include "../include/lib/hb_allocator.h"
 #include "../include/lib/hb_array.h"
 #include "../include/lib/hb_string.h"
@@ -811,6 +812,7 @@ static AST_ERB_RENDER_NODE_T* try_transform_content_node(
 ) {
   if (!erb_node->analyzed_ruby || !erb_node->analyzed_ruby->valid || !erb_node->analyzed_ruby->parsed) { return NULL; }
   if (is_erb_comment_tag(erb_node->tag_opening)) { return NULL; }
+  if (token_is_escaped_erb_tag_opening(erb_node->tag_opening)) { return NULL; }
 
   pm_call_node_t* render_call = find_render_call(erb_node->analyzed_ruby->root, &erb_node->analyzed_ruby->parser);
   if (!render_call) { return NULL; }
@@ -840,6 +842,7 @@ static AST_ERB_RENDER_NODE_T* try_transform_block_node(
   analyze_ruby_context_T* context
 ) {
   if (!block_node->content || hb_string_is_empty(block_node->content->value)) { return NULL; }
+  if (token_is_escaped_erb_tag_opening(block_node->tag_opening)) { return NULL; }
 
   const char* ruby_source = block_node->content->value.data;
   size_t ruby_length = block_node->content->value.length;

data/src/include/lexer/token.h

@@ -28,4 +28,6 @@ void token_free(token_T* token, hb_allocator_T* allocator);
 
 bool token_value_empty(const token_T* token);
 
+bool token_is_escaped_erb_tag_opening(const token_T* token);
+
 #endif

data/src/include/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.10.2"
+#define HERB_VERSION "0.10.3"
 
 #endif

data/src/lexer/token.c

@@ -228,6 +228,12 @@ bool token_value_empty(const token_T* token) {
   return token == NULL || hb_string_is_empty(token->value);
 }
 
+bool token_is_escaped_erb_tag_opening(const token_T* token) {
+  if (token_value_empty(token)) { return false; }
+
+  return hb_string_starts_with(token->value, hb_string("<%%"));
+}
+
 void token_free(token_T* token, hb_allocator_T* allocator) {
   if (!token) { return; }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herb
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: x86-linux-musl
 authors:
 - Marco Roth