ast_transform 2.1.1 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4f949d11b3c6ae864a5c773e6df3f286f88da246499eca57d13069e87c7376
-  data.tar.gz: ba829cf5e50d1c23c4fad2aed2dcd0bd5cbb2ffa15bbc4a9aab0d2abbf09df1e
+  metadata.gz: '02391c6a71f241da83617ab3dae2ff61a66c7a9ad3f9d154c6f6f3aee29e86ad'
+  data.tar.gz: 9b25a4ae5581efc378793af4b4d3d4fd697cc88104567610caf4dea77c2d4d64
 SHA512:
-  metadata.gz: 037e381eade462b8c9259ef14620ca55d1da3576a1028321b698dfa34cafb063fbfb8c41920aa60d56ec793bbe05842309568b5c2282006b2ce7e952bce5f4e7
-  data.tar.gz: d4284341fa943f57666c3ca5ace2038708ed1e2e284b26c82b17c241db6b2487b638990f2a55703561f116693438a30ee4f1a556a83f31037ff44e7f5b554a50
+  metadata.gz: 0e0c312499e1abdd8eea7f2c704cf3aaca4a06ed1b7c62c048bb6f4b350b85a89fc9170c8dc0d0cfd84d5b1e2c9822608a4767600350c097b1da1f4c98f5d759
+  data.tar.gz: d02faba1167586d4bb7aceb138b3452e3cb9ab7c2f294ae02803fb09a565d5ea884ec44568ec60efa1ab3b6600cc17fe911559c02afb6d8e5350bf37ce83ed04

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ast_transform (2.1.0)
+    ast_transform (2.1.4)
       parser (>= 3.0)
       prism (>= 1.5)
       unparser (>= 0.6)

data/lib/ast_transform/instruction_sequence/mixin.rb

@@ -10,9 +10,12 @@ module ASTTransform
       def load_iseq(source_path)
         return ASTTransform::MixinUtils.try_super(self, :load_iseq, source_path) if source_path == __FILE__
 
-        source = File.read(source_path)
+        # Binary read avoids encoding errors during the fast-path check below.
+        # Downstream (Prism, RubyVM::InstructionSequence) handle encoding natively
+        # via magic comments, so we never need to set it ourselves.
+        source = File.binread(source_path)
 
-        return ASTTransform::MixinUtils.try_super(self, :load_iseq, source_path) unless source =~ /transform!/
+        return ASTTransform::MixinUtils.try_super(self, :load_iseq, source_path) unless source.include?('transform!'.b)
 
         ASTTransform::InstructionSequence.source_to_transformed_iseq(source, source_path)
       end

data/lib/ast_transform/instruction_sequence.rb

@@ -16,7 +16,7 @@ module ASTTransform
         rewritten_source = transformer.transform_file_source(source, source_path, rewritten_file_pathname.to_s)
         write(rewritten_source, rewritten_file_pathname)
 
-        RubyVM::InstructionSequence.compile(rewritten_source, rewritten_file_pathname.to_s, rewritten_file_pathname.to_s)
+        RubyVM::InstructionSequence.compile(rewritten_source, source_path, source_path)
       end
 
       def write_pathname(file_path)

data/lib/ast_transform/kwargs_builder.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'prism/translation/parser'
+
+module ASTTransform
+  # Extends the default Prism parser builder to distinguish keyword arguments
+  # from hash literals in the AST.
+  #
+  # The upstream builder always emits :hash nodes for both `foo(bar: 1)` and
+  # `foo({ bar: 1 })`. Unparser uses the node type to decide whether to emit
+  # braces: :hash gets `{}`, :kwargs does not. Since Ruby 3.0+ treats these as
+  # semantically different (strict keyword/positional separation), we need the
+  # AST to preserve the distinction.
+  class KwargsBuilder < Prism::Translation::Parser::Builder
+    def associate(begin_t, pairs, end_t)
+      node = super
+      return node unless begin_t.nil? && end_t.nil?
+
+      node.updated(:kwargs)
+    end
+  end
+end

data/lib/ast_transform/source_map.rb

@@ -11,6 +11,7 @@ module ASTTransform
       # @return [void]
       def register_source_map(source_map)
         source_maps[source_map.transformed_file_path] = source_map
+        source_maps[source_map.source_file_path] = source_map
 
         nil
       end

data/lib/ast_transform/transformer.rb

@@ -2,6 +2,7 @@
 require 'prism'
 require 'prism/translation/parser'
 require 'unparser'
+require 'ast_transform/kwargs_builder'
 require 'ast_transform/source_map'
 
 module ASTTransform
@@ -9,10 +10,8 @@ module ASTTransform
     # Constructs a new Transformer instance.
     #
     # @param transformations [Array<ASTTransform::AbstractTransformation>] The transformations to be run.
-    # @param builder [Prism::Translation::Parser::Builder] The AST Node builder.
-    def initialize(*transformations, builder: Prism::Translation::Parser::Builder.new)
+    def initialize(*transformations)
       @transformations = transformations
-      @builder = builder
     end
 
     # Builds the AST for the given +source+.
@@ -100,7 +99,7 @@ module ASTTransform
 
     def parser
       @parser&.reset
-      @parser ||= Prism::Translation::Parser.new(@builder)
+      @parser ||= Prism::Translation::Parser.new(ASTTransform::KwargsBuilder.new)
     end
 
     def register_source_map(source_file_path, transformed_file_path, transformed_ast, transformed_source)

data/lib/ast_transform/version.rb

@@ -1,3 +1,3 @@
 module ASTTransform
-  VERSION = "2.1.1"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast_transform
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.4
 platform: ruby
 authors:
 - Jean-Philippe Duchesne
@@ -164,6 +164,7 @@ files:
 - lib/ast_transform/instruction_sequence/bootsnap_mixin.rb
 - lib/ast_transform/instruction_sequence/mixin.rb
 - lib/ast_transform/instruction_sequence/mixin_utils.rb
+- lib/ast_transform/kwargs_builder.rb
 - lib/ast_transform/source_map.rb
 - lib/ast_transform/transformation.rb
 - lib/ast_transform/transformation_helper.rb