herb 0.8.9-arm-linux-gnu → 0.9.0-arm-linux-gnu

data/lib/herb/engine/validator.rb

@@ -3,14 +3,19 @@
 module Herb
   class Engine
     class Validator < Herb::Visitor
-      attr_reader :diagnostics
+      attr_reader :diagnostics, :enabled
 
-      def initialize
-        super
+      def initialize(enabled: true)
+        super()
 
+        @enabled = enabled
         @diagnostics = []
       end
 
+      def enabled?
+        @enabled
+      end
+
       def validate(node)
         visit(node)
       end

data/lib/herb/engine/validators/nesting_validator.rb

@@ -31,7 +31,7 @@ module Herb
         end
 
         def validate_no_block_elements_in_paragraph(node)
-          block_elements = %w[div section article header footer nav aside p h1 h2 h3 h4 h5 h6 ul ol dl table form]
+          block_elements = ["div", "section", "article", "header", "footer", "nav", "aside", "p", "h1", "h2", "h3", "h4", "h5", "h6", "ul", "ol", "dl", "table", "form"]
 
           node.body.each do |child|
             next unless child.is_a?(Herb::AST::HTMLElementNode)
@@ -58,7 +58,7 @@ module Herb
         end
 
         def validate_no_interactive_in_button(node)
-          interactive_elements = %w[a button input select textarea]
+          interactive_elements = ["a", "button", "input", "select", "textarea"]
 
           node.body.each do |child|
             next unless child.is_a?(Herb::AST::HTMLElementNode)

data/lib/herb/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# typed: false
 
 require "json"
 require "time"
@@ -17,7 +18,7 @@ require_relative "engine/validators/accessibility_validator"
 module Herb
   class Engine
     attr_reader :src, :filename, :project_path, :relative_file_path, :bufvar, :debug, :content_for_head,
-                :validation_error_template, :visitors
+                :validation_error_template, :visitors, :enabled_validators
 
     ESCAPE_TABLE = {
       "&" => "&",
@@ -30,6 +31,16 @@ module Herb
     class CompilationError < StandardError
     end
 
+    class InvalidRubyError < CompilationError
+      attr_reader :compiled_source
+
+      def initialize(message, compiled_source: nil)
+        @compiled_source = compiled_source
+
+        super(message)
+      end
+    end
+
     def initialize(input, properties = {})
       @filename = properties[:filename] ? ::Pathname.new(properties[:filename]) : nil
       @project_path = ::Pathname.new(properties[:project_path] || Dir.pwd)
@@ -51,6 +62,8 @@ module Herb
       @content_for_head = properties[:content_for_head]
       @validation_error_template = nil
       @validation_mode = properties.fetch(:validation_mode, :raise)
+      @enabled_validators = Herb.configuration.enabled_validators(properties[:validators] || {})
+      @strict = properties.fetch(:strict, true)
       @visitors = properties.fetch(:visitors, default_visitors)
 
       if @debug && @visitors.empty?
@@ -75,6 +88,8 @@ module Herb
       preamble = properties[:preamble] || "#{@bufvar} = #{bufval};"
       postamble = properties[:postamble] || "#{@bufvar}.to_s\n"
 
+      preamble = "#{preamble}; " unless preamble.empty? || preamble.end_with?(";", " ", "\n")
+
       @src << "# frozen_string_literal: true\n" if @freeze
 
       if properties[:ensure]
@@ -89,7 +104,7 @@ module Herb
       @src << "__herb = ::Herb::Engine; " if @escape && @escapefunc == "__herb.h"
       @src << preamble
 
-      parse_result = ::Herb.parse(input, track_whitespace: true)
+      parse_result = ::Herb.parse(input, track_whitespace: true, strict: @strict)
       ast = parse_result.value
       parser_errors = parse_result.errors
 
@@ -104,12 +119,12 @@ module Herb
           # Skip both errors and compilation, but still need minimal Ruby code
         end
       else
-        validation_errors = run_validation(ast) unless @validation_mode == :none
-        all_errors = parser_errors + (validation_errors || [])
-
-        handle_validation_errors(all_errors, input) if @validation_mode == :raise && all_errors.any?
+        validators = run_validation(ast) unless @validation_mode == :none
 
-        add_validation_overlay(validation_errors, input) if @validation_mode == :overlay && validation_errors&.any?
+        if validators
+          handle_validation_errors(validators, input) if @validation_mode == :raise
+          add_validation_overlay(validators, input) if @validation_mode == :overlay
+        end
 
         @visitors.each do |visitor|
           ast.accept(visitor)
@@ -132,6 +147,18 @@ module Herb
 
       @src << "; ensure\n  #{@bufvar} = __original_outvar\nend\n" if properties[:ensure]
 
+      if properties.fetch(:validate_ruby, false)
+        require "prism"
+
+        prism_result = Prism.parse(@src)
+        syntax_errors = prism_result.errors.reject { |e| e.type == :invalid_yield }
+
+        if syntax_errors.any?
+          details = syntax_errors.map { |e| "  - #{e.message} (line #{e.location.start_line})" }.join("\n")
+          raise InvalidRubyError.new("Compiled template produced invalid Ruby:\n#{details}", compiled_source: @src)
+        end
+      end
+
       @src.freeze
       freeze
     end
@@ -172,6 +199,14 @@ module Herb
       end
     end
 
+    def self.comment?(code)
+      code.include?("#")
+    end
+
+    def self.heredoc?(code)
+      code.match?(/<<[~-]?\s*['"`]?\w/)
+    end
+
     protected
 
     def add_text(text)
@@ -193,8 +228,8 @@ module Herb
         @src << " " << code
 
         # TODO: rework and check for Prism::InlineComment as soon as we expose the Prism Nodes in the Herb AST
-        if code.include?("#")
-          @src << "\n"
+        if self.class.comment?(code) || self.class.heredoc?(code)
+          @src << "\n" unless code[-1] == "\n"
         else
           @src << ";" unless code[-1] == "\n"
         end
@@ -212,11 +247,15 @@ module Herb
     end
 
     def add_expression_result(code)
-      with_buffer { @src << " << (" << code << ").to_s" }
+      with_buffer {
+        @src << " << (" << code << trailing_newline(code) << ").to_s"
+      }
     end
 
     def add_expression_result_escaped(code)
-      with_buffer { @src << " << " << @escapefunc << "((" << code << "))" }
+      with_buffer {
+        @src << " << " << @escapefunc << "((" << code << trailing_newline(code) << "))"
+      }
     end
 
     def add_expression_block(indicator, code)
@@ -228,11 +267,38 @@ module Herb
     end
 
     def add_expression_block_result(code)
-      with_buffer { @src << " << " << code }
+      with_buffer {
+        @src << " << (" << code << trailing_newline(code)
+      }
     end
 
     def add_expression_block_result_escaped(code)
-      with_buffer { @src << " << " << @escapefunc << "(" << code << ")" }
+      with_buffer {
+        @src << " << " << @escapefunc << "((" << code << trailing_newline(code)
+      }
+    end
+
+    def add_expression_block_end(code, escaped: false)
+      terminate_expression
+
+      trailing_newline = code.end_with?("\n")
+      code_stripped = code.chomp
+
+      @src.chomp! if @src.end_with?("\n") && code_stripped.start_with?(" ")
+
+      @src << " " << code_stripped
+      @src << "\n" if self.class.comment?(code_stripped)
+      @src << (escaped ? "))" : ")")
+      @src << (trailing_newline ? "\n" : ";")
+
+      @buffer_on_stack = false
+    end
+
+    def trailing_newline(code)
+      return "\n" if self.class.comment?(code)
+      return "\n" if self.class.heredoc?(code)
+
+      ""
     end
 
     def add_postamble(postamble)
@@ -260,19 +326,16 @@ module Herb
 
     def run_validation(ast)
       validators = [
-        Validators::SecurityValidator.new,
-        Validators::NestingValidator.new,
-        Validators::AccessibilityValidator.new
+        Validators::SecurityValidator.new(enabled: @enabled_validators[:security]),
+        Validators::NestingValidator.new(enabled: @enabled_validators[:nesting]),
+        Validators::AccessibilityValidator.new(enabled: @enabled_validators[:accessibility])
       ]
 
-      errors = [] #: Array[untyped]
-
-      validators.each do |validator|
+      validators.select(&:enabled?).each do |validator|
         ast.accept(validator)
-        errors.concat(validator.errors)
       end
 
-      errors
+      validators
     end
 
     def handle_parser_errors(parser_errors, input, _ast)
@@ -292,24 +355,19 @@ module Herb
       end
     end
 
-    def handle_validation_errors(errors, input)
+    def handle_validation_errors(validators, input)
+      errors = validators.select(&:enabled?).flat_map(&:errors)
       return unless errors.any?
 
-      security_error = errors.find { |error|
-        error.is_a?(Hash) && error[:source] == "SecurityValidator"
-      }
+      security_error = errors.find { |error| error[:source] == "SecurityValidator" }
 
       if security_error
-        line = security_error[:location]&.start&.line
-        column = security_error[:location]&.start&.column
-        suggestion = security_error[:suggestion]
-
         raise SecurityError.new(
           security_error[:message],
-          line: line,
-          column: column,
+          line: security_error[:location]&.start&.line,
+          column: security_error[:location]&.start&.column,
           filename: @filename,
-          suggestion: suggestion
+          suggestion: security_error[:suggestion]
         )
       end
 
@@ -318,7 +376,8 @@ module Herb
       raise CompilationError, "\n#{message}"
     end
 
-    def add_validation_overlay(errors, input = nil)
+    def add_validation_overlay(validators, input = nil)
+      errors = validators.select(&:enabled?).flat_map(&:errors)
       return unless errors.any?
 
       templates = errors.map { |error|