sirop 0.6 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ef982b49313b55ac8b76d8886f406ee315421080e728bc1d9cdf05bcce93e7
-  data.tar.gz: 40c33682b5c44f10e242049041f40f20f58a2939340debb858307b5bc12b9319
+  metadata.gz: a44ab3d216adc8e5bda83ca86fef998d8c059ac7f62b3ab4c4b1688be65a24a6
+  data.tar.gz: 8c4b7b1aa49f6e293ca2f161ade3f8c1b14ad386644e7abc713eefc7798bcbd7
 SHA512:
-  metadata.gz: 9d92a9e43cfa127c5d2a8e1ccb963ea38e66b54670c0a33558a874a95e5b3ae11fc9092d5b69c0486828a8a759bb6a20c4596280e90e3f1285928badc1da9d55
-  data.tar.gz: e5f76b7f45f7fd5a6ddb94613aa381b7f36ecc737f1c5c62a19c3257f48398509e61df2439b6b3d2716cbc80d8605cafe349174e6c61c4b21173e6ab7f21dbd6
+  metadata.gz: 5cfbd57a4e23be3fb959462f6c76aaf1af3e2810c80b81560772965d39654d7975a6aeb7f2441f0c33b9811c898f005ac89eb163ed4215099df7b47abc60e2ca
+  data.tar.gz: 8c778dee6a5a416438e37972684ee6cd12d8b8332c4422b099c913b14425d3acb6c63f092f7e8433277f409807724f70fe267e6b7e08d5f21b9367d682d69b3e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.8 2025-08-06
+
+- Add source map generation
+- Require Ruby 3.4 or higher
+
+# 0.7 2025-07-24
+
+- Add minimize_whitespace option to `Sourcifier#initialize`
+- Fix `Sirop.to_ast` for wrapped procs
+
 # 0.6 2025-07-23
 
 - Update to current version of Prism
@@ -29,4 +39,3 @@
 # 2024-02-20 0.1
 
 - Find node for a given `Proc` object
--

data/lib/sirop/finder.rb

@@ -5,8 +5,7 @@ require 'prism'
 module Sirop
   class Finder < Prism::BasicVisitor
     def self.find(*, &)
-      finder = self.new
-      finder.find(*, &)
+      new.find(*, &)
     end
 
     def find(root, key, &)

data/lib/sirop/sourcifier.rb

@@ -3,7 +3,7 @@
 require 'prism'
 
 module Sirop
-  # 
+  #
   class Sourcifier < Prism::BasicVisitor
     VISIT_PLANS = {
       alias_global_variable:      [:keyword_loc, :new_name, :old_name],
@@ -91,28 +91,47 @@ module Sirop
 
     attr_reader :buffer
 
-    def initialize
+    def initialize(minimize_whitespace: false)
       @buffer = +''
+      @minimize_whitespace = minimize_whitespace
     end
-  
+
     def to_source(node)
       @buffer.clear
+      @source_map = nil
       visit(node)
       @buffer
     end
-  
+
+    def to_source_with_source_map(obj, node, line_ofs)
+      @buffer.clear
+      @source_map_line_ofs = line_ofs
+      @source_map = { source_fn: obj.source_location.first }
+      visit(node)
+      [@buffer, @source_map]
+    end
+
     def loc_start(loc)
       [loc.start_line, loc.start_column]
     end
-  
+
     def loc_end(loc)
       [loc.end_line, loc.end_column]
     end
 
     def emit(str)
+      update_source_map
       @buffer << str
     end
 
+    def update_source_map
+      return if !@source_map
+
+      buffer_cur_line = @buffer.count("\n") + 1
+      orig_source_cur_line = @last_loc_start ? @last_loc_start.first : 1
+      @source_map[buffer_cur_line] ||= orig_source_cur_line
+    end
+
     def adjust_whitespace(loc)
       return if loc.is_a?(Sirop::Injection)
 
@@ -120,16 +139,16 @@ module Sirop
         line_diff = loc.start_line - @last_loc_end.first
         if line_diff > 0
           @buffer << "\n" * line_diff
-          @buffer << ' ' * loc.start_column
+          @buffer << ' ' * loc.start_column if !@minimize_whitespace
         elsif line_diff == 0
           ofs = loc.start_column - @last_loc_end.last
           if ofs > 0
-            @buffer << ' ' * ofs
+            @buffer << (@minimize_whitespace ? ' ' : (' ' * ofs))
           end
         end
       else
         # empty buffer
-        @buffer << ' ' * loc.start_column
+        @buffer << ' ' * loc.start_column if !@minimize_whitespace
       end
       @last_loc = loc
       @last_loc_start = loc_start(loc)
@@ -141,7 +160,7 @@ module Sirop
 
       if @last_loc
         loc_loc = loc.is_a?(Prism::Node) ? loc.location : loc
-        return if loc_loc.slice == @last_loc.slice && loc_loc.start_line == @last_loc.start_line && 
+        return if loc_loc.slice == @last_loc.slice && loc_loc.start_line == @last_loc.start_line &&
           loc_loc.start_column == @last_loc.start_column
       end
 
@@ -155,20 +174,20 @@ module Sirop
       str = str.chomp if chomp
       emit(str)
     end
-  
+
     def emit_verbatim(node)
       emit_code(node.location)
     end
 
     def emit_nothing(node)
       # emit nothing
-    end  
+    end
 
     def emit_str(str)
       emit(str)
       @last_loc_end[1] += str.size
     end
-  
+
     def emit_comma
       emit_str(',')
     end
@@ -193,7 +212,7 @@ module Sirop
       sym = :"visit_#{key}_node"
       define_method(sym) { |n| visit_plan(plan, n) }
     end
-  
+
     def visit_plan(plan, node)
       return send(plan, node) if plan.is_a?(Symbol)
 
@@ -270,7 +289,7 @@ module Sirop
     def visit_arguments_node(node, subscript = 0..-1)
       visit_comma_separated_nodes(node.arguments[subscript])
     end
-  
+
     def visit_keyword_hash_node(node)
       visit_comma_separated_nodes(node.elements)
     end
@@ -298,7 +317,7 @@ module Sirop
     end
 
     def visit_if_node_guard(node)
-      emit_code(node.statements)        
+      emit_code(node.statements)
       emit_code(node.if_keyword_loc)
       emit_code(node.predicate)
     end
@@ -318,7 +337,7 @@ module Sirop
     end
 
     def visit_unless_node_guard(node)
-      emit_code(node.statements)        
+      emit_code(node.statements)
       emit_code(node.keyword_loc)
       emit_code(node.predicate)
     end
@@ -385,7 +404,7 @@ module Sirop
       end
       emit_code(node.opening_loc)
       emit_code(node.arguments)
-      
+
       if block.is_a?(Prism::BlockArgumentNode)
         emit_comma if node.arguments && node.arguments.arguments.size > 0
         emit_code(block)
@@ -461,7 +480,7 @@ module Sirop
       visit_comma_separated_nodes(node.elements)
       emit_code(node.closing_loc)
     end
-  
+
     def visit_array_node(node)
       emit_code(node.opening_loc)
       if node.opening_loc && node.opening_loc.slice =~ /^%/

data/lib/sirop/version.rb

@@ -1,4 +1,4 @@
 module Sirop
   # Sirop version
-  VERSION = '0.6'
+  VERSION = '0.8'
 end

data/lib/sirop.rb

@@ -22,15 +22,20 @@ module Sirop
       end
     end
 
-    def to_source(obj)
+    def to_source(obj, **)
       obj = to_ast(obj) if !obj.is_a?(Prism::Node)
-      Sourcifier.new.to_source(obj)
+      Sourcifier.new(**).to_source(obj)
+    end
+
+    def to_source_with_source_map(obj, line_ofs = 0, **)
+      ast = to_ast(obj)
+      Sourcifier.new(**).to_source_with_source_map(obj, ast, line_ofs)
     end
 
     private
 
     def proc_ast(proc)
-      fn, lineno = proc.source_location  
+      fn, lineno = proc.source_location
       pr = Prism.parse(IO.read(fn), filepath: fn)
       program = pr.value
 
@@ -39,6 +44,10 @@ module Sirop
           found!(node) if node.location.start_line == lineno
           super(node)
         end
+        on(:block) do |node|
+          found!(node) if node.location.start_line == lineno
+          super(node)
+        end
         on(:call) do |node|
           case node.name
           when :proc, :lambda

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sirop
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.8'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: 5.25.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: 5.25.5
 email: sharon@noteflakes.com
 executables: []
 extensions: []
@@ -69,14 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: 'Sirop: Ruby code rewriter'
 test_files: []