actionview_precompiler 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e7feef8ebfac2d8a2d18188dcfe98ce8e156e84567a8c632ebd713facb9a6e
-  data.tar.gz: 4b5efa2f1ce1a221bbf1f1729ec4548a0dc6250a4086a5e5dc1e1ef485cd59aa
+  metadata.gz: 58e32739b081a1318cdd69ea8bb88286f7921c1028e3081738ecda419d68b25f
+  data.tar.gz: 6309ed0e14d1261ea9f184c8f0522d6cf38b1c3a045a09537f01b8a13841bcae
 SHA512:
-  metadata.gz: 84eccaa58fb87a5a9dd06183e9f2fda66e258eaeaf57e0abbe27a4e8eed691e7cf1981a3d0ab4e55dbe6e9df841ea7f75ab924938ab8458ac8c7a2068ffa8c8f
-  data.tar.gz: bc95591c0489a70a3c1de6975c3ab0deb7890ee7d0ce4be018b4283098d3dabcb65eddaca299e50220673dbdb425d795ce20fabec178a5f20a6a6021038766fe
+  metadata.gz: f4476e8391491ca650bb1dbf3f946160c631a506a9abe7f20760e07ba6e1c94229e443579d7961b17301a6487a819d0c942f1c0261040b6110db45a6d3fda0ca
+  data.tar.gz: d7abd504555763b20cfbbd9afec57a67a1caf032fb1a4e3f571ca9d12f8fc58e72570c2437e42f26ec7e3f6d746cc383a35a90b38dc0758f4a0a3f919a37023f

data/lib/actionview_precompiler/ast_parser/{syntax_tree.rb → prism.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "syntax_tree"
+require "prism"
 
 module ActionviewPrecompiler
-  module SyntaxTreeASTParser
+  module PrismASTParser
     # This error is raised whenever an assumption we made wasn't met by the AST.
     class CompilationError < StandardError
     end
@@ -30,75 +30,79 @@ module ActionviewPrecompiler
       end
 
       def call?
-        node.is_a?(SyntaxTree::Call)
+        node.is_a?(Prism::CallNode)
       end
 
       def hash?
-        node.is_a?(SyntaxTree::HashLiteral) || node.is_a?(SyntaxTree::BareAssocHash)
+        node.is_a?(Prism::HashNode) || node.is_a?(Prism::KeywordHashNode)
       end
 
       def string?
-        node.is_a?(SyntaxTree::StringLiteral)
+        node.is_a?(Prism::StringNode)
       end
 
       def symbol?
-        node.is_a?(SyntaxTree::Label) || node.is_a?(SyntaxTree::SymbolLiteral)
+        node.is_a?(Prism::SymbolNode)
       end
 
       def variable_reference?
-        node.is_a?(SyntaxTree::VarRef)
+        case node.type
+        when :class_variable_read_node, :instance_variable_read_node,
+             :global_variable_read_node, :local_variable_read_node
+          true
+        else
+          false
+        end
       end
 
       def vcall?
-        node.is_a?(SyntaxTree::VCall)
+        node.is_a?(Prism::CallNode) && node.variable_call?
+      end
+
+      def call_method_name
+        node.message
+      end
+
+      def variable_name
+        case node.type
+        when :class_variable_read_node, :instance_variable_read_node,
+             :global_variable_read_node, :local_variable_read_node
+          node.name.name
+        when :call_node
+          node.message
+        end
       end
 
       # Converts the node into a hash where the keys and values are nodes. This
       # will raise an error if the hash doesn't match the format we expect or
       # if the hash contains any splats.
       def to_hash
-        case node
-        in SyntaxTree::HashLiteral[assocs:]
-        in SyntaxTree::BareAssocHash[assocs:]
-        else
-          raise CompilationError, "Unexpected node type: #{node.class.name}"
-        end
-
-        assocs.to_h do |assoc|
-          case assoc
-          in SyntaxTree::Assoc[key:, value:]
-            [RenderNode.new(key), RenderNode.new(value)]
-          else
-            raise CompilationError, "Unexpected node type: #{node.class.name}"
+        if hash?
+          if node.elements.all? { |assoc| assoc.is_a?(Prism::AssocNode) && assoc.key.is_a?(Prism::SymbolNode) }
+            node.elements.to_h { |assoc| [RenderNode.new(assoc.key), RenderNode.new(assoc.value)] }
           end
+        else
+          raise CompilationError, "Unexpected node type: #{node.inspect}"
         end
       end
 
       # Converts the node into a string value. Only handles plain string
       # content, and will raise an error if the node contains interpolation.
       def to_string
-        case node
-        in SyntaxTree::StringLiteral[parts: [SyntaxTree::TStringContent[value:]]]
-          value
-        in SyntaxTree::StringLiteral[parts:]
-          raise CompilationError, "Unexpected string parts type: #{parts.inspect}"
+        if string?
+          node.unescaped
         else
-          raise CompilationError, "Unexpected node type: #{node.class.name}"
+          raise CompilationError, "Unexpected node type: #{node.inspect}"
         end
       end
 
       # Converts the node into a symbol value. Only handles labels and plain
       # symbols, and will raise an error if the node contains interpolation.
       def to_symbol
-        case node
-        in SyntaxTree::Label[value:]
-          value.chomp(":").to_sym
-        in SyntaxTree::SymbolLiteral[value: SyntaxTree::Ident[value:]]
-          value.to_sym
-        in SyntaxTree::SymbolLiteral[value:]
-          raise CompilationError, "Unexpected symbol value type: #{value.inspect}"
+        if symbol?
+          node.unescaped.to_sym
         else
-          raise CompilationError, "Unexpected node type: #{node.class.name}"
+          raise CompilationError, "Unexpected node type: #{node.inspect}"
         end
       end
     end
@@ -106,7 +110,7 @@ module ActionviewPrecompiler
     # This visitor is responsible for visiting the parsed tree and extracting
     # out the render calls. After visiting the tree, the #render_calls method
     # will return the hash expected by the #parse_render_nodes method.
-    class RenderVisitor < SyntaxTree::Visitor
+    class RenderVisitor < Prism::Visitor
       MESSAGE = /\A(render|render_to_string|layout)\z/
 
       attr_reader :render_calls
@@ -115,29 +119,18 @@ module ActionviewPrecompiler
         @render_calls = Hash.new { |hash, key| hash[key] = [] }
       end
 
-      visit_method def visit_command(node)
-        case node
-        in SyntaxTree::Command[
-             message: SyntaxTree::Ident[value: MESSAGE],
-             arguments: SyntaxTree::Args[parts:]
-           ]
-          argument_nodes = parts.map { |part| RenderNode.new(part) }
-          render_calls[$1.to_sym] << RenderCall.new(argument_nodes)
-        else
-        end
-
-        super
-      end
-
-      visit_method def visit_fcall(node)
-        case node
-        in SyntaxTree::FCall[
-             value: SyntaxTree::Ident[value: MESSAGE],
-             arguments: SyntaxTree::ArgParen[arguments: SyntaxTree::Args[parts:]]
-           ]
-          argument_nodes = parts.map { |part| RenderNode.new(part) }
-          render_calls[$1.to_sym] << RenderCall.new(argument_nodes)
-        else
+      def visit_call_node(node)
+        if node.name.match?(MESSAGE) && !node.receiver && node.arguments
+          args =
+            node.arguments.arguments.map do |arg|
+              if arg.is_a?(Prism::ParenthesesNode) && arg.body && arg.body.body.length == 1
+                RenderNode.new(arg.body.body.first)
+              else
+                RenderNode.new(arg)
+              end
+            end
+
+          render_calls[node.name.to_sym] << RenderCall.new(args)
         end
 
         super
@@ -149,10 +142,14 @@ module ActionviewPrecompiler
     # values are arrays of call objects.
     def self.parse_render_nodes(code)
       visitor = RenderVisitor.new
-      SyntaxTree.parse(code).accept(visitor)
-      visitor.render_calls
-    rescue SyntaxTree::Parser::ParseError
-      raise CompilationError, "Unable to parse the template"
+      result = Prism.parse(code)
+
+      if result.success?
+        result.value.accept(visitor)
+        visitor.render_calls
+      else
+        raise CompilationError, "Unable to parse the template"
+      end
     end
   end
 end

data/lib/actionview_precompiler/ast_parser/ripper.rb

@@ -184,7 +184,11 @@ module ActionviewPrecompiler
       end
 
       def on_paren(content)
-        content
+        if (content.size == 1) && (content.is_a?(Array))
+          content.first
+        else
+          content
+        end
       end
     end
 

data/lib/actionview_precompiler/ast_parser/ruby26.rb

@@ -74,7 +74,7 @@ module ActionviewPrecompiler
       end
 
       def symbol?
-        type == :LIT && Symbol === children[0]
+        (type == :SYM) || (type == :LIT && Symbol === children[0])
       end
 
       def to_hash

data/lib/actionview_precompiler/ast_parser.rb

@@ -1,7 +1,13 @@
 module ActionviewPrecompiler
   parser = ENV["PRECOMPILER_PARSER"]
-  parser ||= "jruby" if RUBY_ENGINE == 'jruby'
-  parser ||= "rubyvm_ast" if RUBY_ENGINE == 'ruby'
+
+  begin
+    require "prism"
+    parser ||= "prism"
+  rescue LoadError
+    parser ||= "jruby" if RUBY_ENGINE == 'jruby'
+    parser ||= "rubyvm_ast" if RUBY_ENGINE == 'ruby'
+  end
 
   case parser
   when "rubyvm_ast"
@@ -10,9 +16,9 @@ module ActionviewPrecompiler
   when "jruby"
     require "actionview_precompiler/ast_parser/jruby"
     ASTParser = JRubyASTParser
-  when "syntax_tree"
-    require "actionview_precompiler/ast_parser/syntax_tree"
-    ASTParser = SyntaxTreeASTParser
+  when "prism"
+    require "actionview_precompiler/ast_parser/prism"
+    ASTParser = PrismASTParser
   else
     require "actionview_precompiler/ast_parser/ripper"
     ASTParser = RipperASTParser

data/lib/actionview_precompiler/render_parser.rb

@@ -128,6 +128,7 @@ module ActionviewPrecompiler
           dependency = node.variable_name
         elsif node.call?
           dependency = node.call_method_name
+          return unless dependency.is_a? String
         else
           return
         end

data/lib/actionview_precompiler/template_parser.rb

@@ -29,6 +29,7 @@ module ActionviewPrecompiler
       src = File.read(@filename)
       if src.include?("render")
         compiled_source = @handler.call(FakeTemplate.new, File.read(@filename))
+        compiled_source = "def _template; #{compiled_source}; end"
         RenderParser.new(compiled_source).render_calls
       else
         []

data/lib/actionview_precompiler/version.rb

@@ -1,3 +1,3 @@
 module ActionviewPrecompiler
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview_precompiler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -77,9 +77,9 @@ files:
 - lib/actionview_precompiler.rb
 - lib/actionview_precompiler/ast_parser.rb
 - lib/actionview_precompiler/ast_parser/jruby.rb
+- lib/actionview_precompiler/ast_parser/prism.rb
 - lib/actionview_precompiler/ast_parser/ripper.rb
 - lib/actionview_precompiler/ast_parser/ruby26.rb
-- lib/actionview_precompiler/ast_parser/syntax_tree.rb
 - lib/actionview_precompiler/controller_parser.rb
 - lib/actionview_precompiler/controller_scanner.rb
 - lib/actionview_precompiler/helper_parser.rb
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Precompiles ActionView templates