herb 0.6.1-x86-linux-musl → 0.7.0-x86-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aa64c91c7cbc7283994ea4483bcd4919b6c34a1dd6168abe5e7067c73c035ff
-  data.tar.gz: b11c8bce197668327e5b01de03748d5c2877582a18e382beb542548a0356785c
+  metadata.gz: 4c817e048425267d57d7e86f1e8ee6c08a283458435a1d1bd13cf8ec42d1722b
+  data.tar.gz: 1461dcca1670e4315755aa5364c31c7cbefc8ee5f8b7f8746e7a88f5e96040b8
 SHA512:
-  metadata.gz: f001e033f06ccf76e84c4a359abdd1caad166ee3ea3d9ffeba59ee3933c9bb0f799e4a41b965ff625ce2bfff189584439c87ca3d0b0068b21921143692ab8441
-  data.tar.gz: 3545109c8b87bc84ab9cffb541d3e6033420b564b8ffe70a51a6fcd1cd94a57094eff4a2dbcd09d0d41d89b677b8ac5b73b8e3c7cf3f8860c7949fef22cdfe3f
+  metadata.gz: 1d8e07da38c1c0400a3bf8e7cd06cd70e0b737268d30c778efef7bb603027c281e8cf0d761c202a895888a0003353ca89aa5d4eb163d08cad0bec9a83e13d11b
+  data.tar.gz: bf2f61abf772b93cb77e7405dfdc5e0e2bf1870c642941ff6c9484b9c8a52a440dc8993e89ed614f84397f3880b1f0fbed73c11404d926d72f3ef1af91fcf9d0

data/README.md

@@ -127,6 +127,7 @@ While Herb brings a fresh approach to HTML+ERB tooling, it builds upon and learn
 - [**htmlbeautifier**](https://github.com/threedaymonk/htmlbeautifier)
 - [**vscode-erb-beautify**](https://github.com/aliariff/vscode-erb-beautify)
 - [**vscode-erb-linter**](https://github.com/manuelpuyol/vscode-erb-linter)
+- [**syntax_tree-erb**](https://github.com/davidwessman/syntax_tree-erb)
 
 Herb differentiates itself by being HTML-aware from the ground up, providing a unified parsing approach that understands both HTML and ERB as first-class citizens, rather than treating one as embedded within the other.
 

data/ext/herb/nodes.c

@@ -151,8 +151,9 @@ static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_el
   VALUE html_element_node_body = rb_nodes_array_from_c_array(html_element_node->body);
   VALUE html_element_node_close_tag = rb_node_from_c_struct((AST_NODE_T*) html_element_node->close_tag);
   VALUE html_element_node_is_void = (html_element_node->is_void) ? Qtrue : Qfalse;
+  VALUE html_element_node_source = rb_str_new_cstr(element_source_to_string(html_element_node->source));
 
-  VALUE args[8] = {
+  VALUE args[9] = {
     type,
     location,
     errors,
@@ -160,10 +161,11 @@ static VALUE rb_html_element_node_from_c_struct(AST_HTML_ELEMENT_NODE_T* html_el
     html_element_node_tag_name,
     html_element_node_body,
     html_element_node_close_tag,
-    html_element_node_is_void
+    html_element_node_is_void,
+    html_element_node_source
   };
 
-  return rb_class_new_instance(8, args, HTMLElementNode);
+  return rb_class_new_instance(9, args, HTMLElementNode);
 };
 
 static VALUE rb_html_attribute_value_node_from_c_struct(AST_HTML_ATTRIBUTE_VALUE_NODE_T* html_attribute_value_node) {
@@ -443,7 +445,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:0x00007f62e38bbaa8 @name="analyzed_ruby", @options={kind: nil}> */
+  /* #<Herb::Template::AnalyzedRubyField:0x00007f1e10166f68 @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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# typed: true
+
+module Herb
+  module AST
+    module Helpers
+      #: (Herb::AST::Node) -> bool
+      def erb_outputs?(node)
+        return false unless node.is_a?(Herb::AST::ERBContentNode)
+
+        opening = node.tag_opening&.value
+        opening&.include?("=") && !opening&.start_with?("<%#")
+      end
+
+      #: (String) -> bool
+      def erb_comment?(opening)
+        opening.start_with?("<%#")
+      end
+
+      #: (String) -> bool
+      def erb_output?(opening)
+        opening.include?("=")
+      end
+    end
+  end
+end

data/lib/herb/ast/nodes.rb

@@ -269,15 +269,17 @@ module Herb
       attr_reader :body #: Array[Herb::AST::Node]
       attr_reader :close_tag #: Herb::AST::HTMLCloseTagNode
       attr_reader :is_void #: bool
+      attr_reader :source #: String
 
-      #: (String, Location, Array[Herb::Errors::Error], Herb::AST::HTMLOpenTagNode, Herb::Token, Array[Herb::AST::Node], Herb::AST::HTMLCloseTagNode, bool) -> void
-      def initialize(type, location, errors, open_tag, tag_name, body, close_tag, is_void)
+      #: (String, Location, Array[Herb::Errors::Error], Herb::AST::HTMLOpenTagNode, Herb::Token, Array[Herb::AST::Node], Herb::AST::HTMLCloseTagNode, bool, String) -> void
+      def initialize(type, location, errors, open_tag, tag_name, body, close_tag, is_void, source)
         super(type, location, errors)
         @open_tag = open_tag
         @tag_name = tag_name
         @body = body
         @close_tag = close_tag
         @is_void = is_void
+        @source = source
       end
 
       #: () -> serialized_html_element_node
@@ -288,6 +290,7 @@ module Herb
           body: body,
           close_tag: close_tag,
           is_void: is_void,
+          source: source,
         }) #: Herb::serialized_html_element_node
       end
 
@@ -342,9 +345,10 @@ module Herb
         else
           output += "∅\n"
         end
-        output += "└── is_void: "
+        output += "├── is_void: "
         output += [true, false].include?(is_void) ? is_void.to_s : "∅"
         output += "\n"
+        output += %(└── source: #{source.inspect}\n)
         output += "\n"
 
         output.gsub(/^/, "    " * indent)

data/lib/herb/cli.rb

@@ -6,7 +6,7 @@
 require "optparse"
 
 class Herb::CLI
-  attr_accessor :json, :silent, :no_interactive, :no_log_file, :no_timing, :local
+  attr_accessor :json, :silent, :no_interactive, :no_log_file, :no_timing, :local, :escape, :no_escape, :freeze, :debug
 
   def initialize(args)
     @args = args
@@ -86,6 +86,8 @@ class Herb::CLI
       Commands:
         bundle exec herb lex [file]         Lex a file.
         bundle exec herb parse [file]       Parse a file.
+        bundle exec herb compile [file]     Compile ERB template to Ruby code.
+        bundle exec herb render [file]      Compile and render ERB template to final output.
         bundle exec herb analyze [path]     Analyze a project by passing a directory to the root of the project
         bundle exec herb ruby [file]        Extract Ruby from a file.
         bundle exec herb html [file]        Extract HTML from a file.
@@ -110,10 +112,15 @@ class Herb::CLI
                   project.no_interactive = no_interactive
                   project.no_log_file = no_log_file
                   project.no_timing = no_timing
+                  project.silent = silent
                   has_issues = project.parse!
                   exit(has_issues ? 1 : 0)
                 when "parse"
                   Herb.parse(file_content)
+                when "compile"
+                  compile_template
+                when "render"
+                  render_template
                 when "lex"
                   Herb.lex(file_content)
                 when "ruby"
@@ -191,6 +198,22 @@ class Herb::CLI
       parser.on("--local", "Use localhost for playground command instead of herb-tools.dev") do
         self.local = true
       end
+
+      parser.on("--escape", "Enable HTML escaping by default (for compile command)") do
+        self.escape = true
+      end
+
+      parser.on("--no-escape", "Disable HTML escaping by default (for compile command)") do
+        self.no_escape = true
+      end
+
+      parser.on("--freeze", "Add frozen string literal pragma (for compile command)") do
+        self.freeze = true
+      end
+
+      parser.on("--debug", "Enable debug mode with ERB expression wrapping (for compile command)") do
+        self.debug = true
+      end
     end
   end
 
@@ -200,6 +223,140 @@ class Herb::CLI
 
   private
 
+  def compile_template
+    require_relative "engine"
+
+    begin
+      options = {}
+      options[:filename] = @file if @file
+      options[:escape] = no_escape ? false : true
+      options[:freeze] = true if freeze
+
+      if debug
+        options[:debug] = true
+        options[:debug_filename] = @file if @file
+      end
+
+      engine = Herb::Engine.new(file_content, options)
+
+      if json
+        result = {
+          success: true,
+          source: engine.src,
+          filename: engine.filename,
+          bufvar: engine.bufvar,
+        }
+
+        puts result.to_json
+      elsif silent
+        puts "Success"
+      else
+        puts engine.src
+      end
+
+      exit(0)
+    rescue Herb::Engine::CompilationError => e
+      if json
+        result = {
+          success: false,
+          error: e.message,
+          filename: @file,
+        }
+        puts result.to_json
+      elsif silent
+        puts "Failed"
+      else
+        puts e.message
+      end
+
+      exit(1)
+    rescue StandardError => e
+      if json
+        result = {
+          success: false,
+          error: "Unexpected error: #{e.class}: #{e.message}",
+          filename: @file,
+        }
+        puts result.to_json
+      elsif silent
+        puts "Failed"
+      else
+        puts "Unexpected error: #{e.class}: #{e.message}"
+        puts e.backtrace.first(5).join("\n") unless silent
+      end
+
+      exit(1)
+    end
+  end
+
+  def render_template
+    require_relative "engine"
+
+    begin
+      options = {}
+      options[:filename] = @file if @file
+      options[:escape] = no_escape ? false : true
+      options[:freeze] = true if freeze
+
+      if debug
+        options[:debug] = true
+        options[:debug_filename] = @file if @file
+      end
+
+      engine = Herb::Engine.new(file_content, options)
+      compiled_code = engine.src
+
+      rendered_output = eval(compiled_code)
+
+      if json
+        result = {
+          success: true,
+          output: rendered_output,
+          filename: engine.filename,
+        }
+
+        puts result.to_json
+      elsif silent
+        puts "Success"
+      else
+        puts rendered_output
+      end
+
+      exit(0)
+    rescue Herb::Engine::CompilationError => e
+      if json
+        result = {
+          success: false,
+          error: e.message,
+          filename: @file,
+        }
+        puts result.to_json
+      elsif silent
+        puts "Failed"
+      else
+        puts e.message
+      end
+
+      exit(1)
+    rescue StandardError => e
+      if json
+        result = {
+          success: false,
+          error: "Unexpected error: #{e.class}: #{e.message}",
+          filename: @file,
+        }
+        puts result.to_json
+      elsif silent
+        puts "Failed"
+      else
+        puts "Unexpected error: #{e.class}: #{e.message}"
+        puts e.backtrace.first(5).join("\n") unless silent
+      end
+
+      exit(1)
+    end
+  end
+
   def print_version
     puts Herb.version
     exit(0)