ruby2js 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b96695d82101133b8d791e19d0f04fa5c6c56c16bb6504b447cf26e0e1291db
-  data.tar.gz: 9a7711f281076e14e354bcab9fd8f96de5b884153360a9b5fdb57b6fa9c5a792
+  metadata.gz: 696f01a3f2781f8821257f1d2d0ed832e45a9fbde25c2f6f9f200ced90b24dab
+  data.tar.gz: d4bc6d38fb7146b3615e621e7c86fc8e864895d377d10ecf69599fa60b7808d3
 SHA512:
-  metadata.gz: f64daa6dad4b3ed8d475654e588a8f921782fc11aceecb01886b8c039139bdc716f863eb25f57c119410da1a180273cbf9f66992da0555ce66b1131c31deab44
-  data.tar.gz: f5ffccf5acc15710797fc566ba89730f34d5884492892d4972fa9d4ad6ef785e1875bd4e3ffb25a9cb0148d77c4501aed8ea21e3f1171c55c5ca13104c274f56
+  metadata.gz: f82772a1dc3aefde7a5acb6b7ca3b05a083dbb3e4c9bbdcf585387ae950c6d410280dfe069d0be3d5fd5e28a5eb0524f2c35ccac83c3b9789109a45e2ceb29a9
+  data.tar.gz: dffb0cd058bc9cdf28b76e99d73cb4916792bd9160ff9516994b3de2bc1b46e22c5d5be9bb772ec0f62c5947f5d73218e9d5fbd69e5e8a28b450875b92940ed7

data/lib/ruby2js/converter.rb

@@ -359,6 +359,7 @@ require 'ruby2js/converter/kwbegin'
 require 'ruby2js/converter/literal'
 require 'ruby2js/converter/logical'
 require 'ruby2js/converter/masgn'
+require 'ruby2js/converter/match'
 require 'ruby2js/converter/module'
 require 'ruby2js/converter/next'
 require 'ruby2js/converter/nil'

data/lib/ruby2js/converter/match.rb

@@ -0,0 +1,7 @@
+module Ruby2JS
+  class Converter
+    handle :match_pattern do |value, name|
+      parse @ast.updated(:lvasgn, [name.children.first, value]), @state
+    end
+  end
+end

data/lib/ruby2js/serializer.rb

@@ -300,22 +300,29 @@ module Ruby2JS
     BASE64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
 
     # https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit
+    # http://sokra.github.io/source-map-visualization/
     def vlq(*mark)
-      if @mark[0] == mark[0]
-        return if @mark[-3..-1] == mark[-3..-1]
-        @mappings += ',' unless @mappings == ''
+      if !@mark
+        diffs = mark
+        @mark = [0, 0, 0, 0, 0, 0]
+      else
+        if @mark[0] == mark[0]
+          return if @mark[4] == mark[4] and @mark[3] == mark[3]
+          @mappings += ',' unless @mappings == ''
+        end
+
+        diffs = mark.zip(@mark).map {|a,b| a-b}
       end
 
       while @mark[0] < mark[0]
         @mappings += ';'
         @mark[0] += 1
-        @mark[1] = 0
+        diffs[1] = mark[1] 
       end
 
-      diffs = mark.zip(@mark).map {|a,b| a-b}
-      @mark = mark
+      @mark[0...mark.length] = mark
 
-      diffs[1..4].each do |diff|
+      diffs[1..-1].each do |diff|
         if diff < 0
           data = (-diff << 1) + 1
         else
@@ -345,7 +352,8 @@ module Ruby2JS
 
       @mappings = ''
       sources = []
-      @mark = [0, 0, 0, 0, 0]
+      names = []
+      @mark = nil
 
       @lines.each_with_index do |line, row|
         col = line.indent
@@ -361,8 +369,30 @@ module Ruby2JS
               sources << buffer
             end
 
-            split = buffer.source[0...pos].split("\n")
-            vlq row, col, source_index, [split.length - 1, 0].max, split.last.to_s.length
+            line = buffer.line_for_position(pos) - 1
+            column = buffer.column_for_position(pos)
+
+            name = nil
+            if %i{lvasgn lvar}.include? token.ast.type
+              name = token.ast.children.first
+            elsif %i{casgn const}.include? token.ast.type 
+              if token.ast.children.first == nil
+                name = token.ast.children[1]
+              end
+            end
+
+            if name
+              index = names.find_index(name)
+
+              unless index
+                index = names.length
+                names << name
+              end
+
+              vlq row, col, source_index, line, column, index
+            else
+              vlq row, col, source_index, line, column
+            end
           end
           col += token.length
         end
@@ -372,6 +402,7 @@ module Ruby2JS
         version: 3,
         file: @file_name,
         sources: sources.map(&:name),
+        names: names.map(&:to_s),
         mappings: @mappings
       }
     end

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 4
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -85,6 +85,7 @@ files:
 - lib/ruby2js/converter/literal.rb
 - lib/ruby2js/converter/logical.rb
 - lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/match.rb
 - lib/ruby2js/converter/module.rb
 - lib/ruby2js/converter/next.rb
 - lib/ruby2js/converter/nil.rb