ast_transform 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74867dd7f6d788c78d286901e1e4c6a362e0a341300fb9bb22ccb92503a0223
-  data.tar.gz: c2968b8000a875e169f89d85deaa38868ad49dcc8d193db6a78c88ea4eafb986
+  metadata.gz: fb38ad75ff6d31e4f8da1d1b272968b3d65393a3acaf92b914be2c0d35ebdb32
+  data.tar.gz: f2621b3116184b0f7b7eb87a9a4b4af184f685e4399e5b52761b1deb1f54c998
 SHA512:
-  metadata.gz: 9f4e007503a09479a7df3f595097bf384eb0196fb192cd012855c63417582e34a32cfd318ae765f1a8122de408bbfd337c8e3adfe889d2fd1bc36b3a20c96599
-  data.tar.gz: 900412939feb57ee329d2c3adca9b9712c1da8243038268104db916f9270ea09427d0d96cbf5aded11f86d919d4b45e6629be20372eb4dfc1d0531f05757b1e5
+  metadata.gz: 3ff9177f5bdd86e95af2406aeb675a53cd93917a63faa2fdf26bcfb12bc6365e415dbadb576247f7d134a2a36a7866d46cca17626351fb648f156379e3ba5473
+  data.tar.gz: 054fe46ee27bc9cda5f18b163460f62a94c496cc3993407e79a3592079d3011c56c78d300db0639d685749e47a704a0a3e6d3a1915fbcbd044de7a7b6a6c173b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ast_transform (3.1.0)
+    ast_transform (3.1.1)
       parser (>= 3.3)
       prism (>= 1.5)
       unparser (>= 0.8)

data/lib/ast_transform/layout.rb

@@ -9,6 +9,7 @@ module ASTTransform
   class Layout
     def initialize
       @lines = []
+      @sealed = false
     end
 
     # The line number currently being written; the next fresh line would be +cursor + 1+.
@@ -21,7 +22,10 @@ module ASTTransform
     # +column+ — cosmetic only (leading whitespace is never significant in emitted code), but it keeps the artifact
     # visually close to the source. Packed text ignores the column, as do continuation lines (they keep their own
     # relative indentation).
-    def place(target_line, text, column: nil)
+    #
+    # +seal+ declares the text's last line unextendable (the caller's property — e.g. it terminates a heredoc,
+    # whose terminator must stand alone): a subsequent pack opens a fresh line instead of joining it.
+    def place(target_line, text, column: nil, seal: false)
       first, *rest = text.split("\n")
 
       if target_line && target_line > @lines.size
@@ -32,22 +36,27 @@ module ASTTransform
       end
 
       @lines.concat(rest)
+      @sealed = seal
     end
 
     # Appends +text+ on a new line unconditionally — for text that must never be `;`-packed after a statement
     # (e.g. keywords).
     def place_on_fresh_line(text)
       @lines << text
+      @sealed = false
     end
 
-    # Appends +text+ to the current line with a `; ` separator. The last line is never blank here: padding blanks
-    # are only created inside +place+, which immediately overwrites the padded line.
+    # Appends +text+ to the current line with a `; ` separator — unless the current line is sealed, in which case
+    # the text opens a fresh line (alignment degrades by one more line; validity is preserved). The last line is
+    # never blank here: padding blanks are only created inside +place+, which immediately overwrites the padded
+    # line.
     def pack(text)
-      if @lines.empty?
+      if @lines.empty? || @sealed
         @lines << text
       else
         @lines[-1] = "#{@lines.last}; #{text}"
       end
+      @sealed = false
     end
 
     # @return [String] the laid-out text, with a trailing newline.

data/lib/ast_transform/line_aligned_emitter.rb

@@ -71,7 +71,9 @@ module ASTTransform
       if recursive_container?(node)
         emit_container(node, layout, renderer)
       else
-        layout.place(node.loc&.line, renderer.aligned_render(node), column: node.loc&.column)
+        render = renderer.aligned_render(node)
+        # A render in heredoc form seals its line: nothing may pack after the terminator (issue #16).
+        layout.place(node.loc&.line, render, column: node.loc&.column, seal: renderer.line_terminal?(render))
       end
     end
 
@@ -145,7 +147,8 @@ module ASTTransform
     # nested statements align.
     def emit_container(node, layout, renderer)
       opener, closer = container_delimiters(node, renderer)
-      layout.place(node.loc&.line, opener, column: node.loc&.column)
+      # An opener can carry a heredoc too (e.g. a block call with a heredoc argument) — seal it like a statement.
+      layout.place(node.loc&.line, opener, column: node.loc&.column, seal: renderer.line_terminal?(opener))
       emit_body(container_body(node), layout, renderer)
       layout.place(closer_line(node), closer, column: closer_column(node))
     end

data/lib/ast_transform/statement_renderer.rb

@@ -62,8 +62,30 @@ module ASTTransform
       compress_to_single_line(render) || render
     end
 
+    # Whether +render+ must be the last text on its final line: a render ending on a heredoc terminator (Unparser
+    # falls back to `<<-HEREDOC` form when its quoted-string round-trip fails) cannot have anything `;`-packed
+    # after it — the terminator must stand alone, so a join unterminates the heredoc. Probed by re-parse, the same
+    # verification style as +compress_to_single_line+, behind a cheap textual gate: only a heredoc makes a last
+    # line unextendable, and every heredoc opener contains +<<+. A false positive (the probe failing for another
+    # reason, e.g. an isolated container opener carrying a heredoc argument) costs one line of alignment, never
+    # correctness.
+    def line_terminal?(render)
+      return false unless render.include?('<<')
+
+      # chomp: heredoc renders end with a trailing newline; the probe must extend the last *line* (where the
+      # layout would pack), not append below it.
+      !parses?("#{render.chomp}; nil")
+    end
+
     private
 
+    def parses?(source)
+      Unparser.parse(source)
+      true
+    rescue Parser::SyntaxError
+      false
+    end
+
     def compress_to_single_line(render)
       candidate = render.split("\n").map(&:strip).join('; ')
       # Both sides parsed without scope context, so lvar/send ambiguity cancels out; equality means the newline

data/lib/ast_transform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ASTTransform
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ast_transform
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Jean-Philippe Duchesne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-29 00:00:00.000000000 Z
+date: 2026-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser