ruby2js 4.1.1 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b96695d82101133b8d791e19d0f04fa5c6c56c16bb6504b447cf26e0e1291db
-  data.tar.gz: 9a7711f281076e14e354bcab9fd8f96de5b884153360a9b5fdb57b6fa9c5a792
+  metadata.gz: 412d541e9884847f722555edd11a71ead4c2358632976bf32f530ca270eb539b
+  data.tar.gz: f32b8d14177ee0f08466abfbb4a96017e6dc8a4e5a2226476c77f26affa7f81d
 SHA512:
-  metadata.gz: f64daa6dad4b3ed8d475654e588a8f921782fc11aceecb01886b8c039139bdc716f863eb25f57c119410da1a180273cbf9f66992da0555ce66b1131c31deab44
-  data.tar.gz: f5ffccf5acc15710797fc566ba89730f34d5884492892d4972fa9d4ad6ef785e1875bd4e3ffb25a9cb0148d77c4501aed8ea21e3f1171c55c5ca13104c274f56
+  metadata.gz: c4be8efc1eb9ec2f1de81f5c0236b6ea3c868522043e305cb0dfcac80e61b1e57e5639f77ad2a0a6aa44b7b5eb87842db5a7072f42ab25ad625474904d88e4b8
+  data.tar.gz: 6f8c9c91f1ca05f4363023ee588e356226dbafcf09235d5ab25c5ffaef564109a4c653673bbf8a6da1c0b3a231f84231f25089fdd0c0207e7ddd6c8d25dfd7d7

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/def.rb

@@ -169,7 +169,9 @@ module Ruby2JS
           put 'function'
         end
 
-        put '('; parse args; put ") {#{nl}"
+        put '('
+        parse s(:args, *args.children.select {|arg| arg.type != :shadowarg})
+        put ") {#{nl}"
 
         next_token, @next_token = @next_token, :return
         @block_depth += 1 if @block_depth

data/lib/ruby2js/converter/logical.rb

@@ -69,7 +69,7 @@ module Ruby2JS
         left = rewrite(*left.children)
       end
 
-      if right.type != :send
+      if right.type != :send or OPERATORS.flatten.include? right.children[1]
         s(:and, left, right)
       elsif conditionally_equals(left, right.children.first)
         # a && a.b => a&.b

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/converter/send.rb

@@ -323,13 +323,13 @@ module Ruby2JS
         put 'typeof '; parse args.first
 
       elsif ast.children[1] == :is_a? and receiver and args.length == 1
-        parse receiver; put ' instanceof '; parse args.first
+        put '('; parse receiver; put ' instanceof '; parse args.first; put ')'
 
       elsif ast.children[1] == :kind_of? and receiver and args.length == 1
-        parse receiver; put ' instanceof '; parse args.first
+        put '('; parse receiver; put ' instanceof '; parse args.first; put ')'
 
       elsif ast.children[1] == :instance_of? and receiver and args.length == 1
-        parse s(:send, s(:attr, receiver, :constructor), :==, args.first)
+        put '('; parse s(:send, s(:attr, receiver, :constructor), :==, args.first); put ')'
 
       else
         if method == :bind and receiver&.type == :send

data/lib/ruby2js/filter/active_functions.rb

@@ -7,7 +7,6 @@ module Ruby2JS
 
       def on_send(node)
         target, method, *args = node.children
-        return super unless args.empty?
 
         if es2015 and method == :blank?
           create_or_update_import("blank$")
@@ -18,6 +17,15 @@ module Ruby2JS
         elsif es2015 and method == :presence
           create_or_update_import("presence$")
           process node.updated :send, [nil, "presence$", target]
+        elsif es2015 and method == :chomp
+          create_or_update_import("chomp$")
+          process node.updated :send, [nil, "chomp$", target, *args]
+        elsif es2015 and method == :delete_prefix
+          create_or_update_import("deletePrefix$")
+          process node.updated :send, [nil, "deletePrefix$", target, *args]
+        elsif es2015 and method == :delete_suffix
+          create_or_update_import("deleteSuffix$")
+          process node.updated :send, [nil, "deleteSuffix$", target, *args]
         else
           super
         end

data/lib/ruby2js/filter/camelCase.rb

@@ -14,6 +14,9 @@ module Ruby2JS
         attr_reader
         attr_writer
         method_missing
+        is_a?
+        kind_of?
+        instance_of?
       }
 
       CAPS_EXCEPTIONS = {
@@ -28,6 +31,8 @@ module Ruby2JS
       }
 
       def camelCase(symbol)
+        return symbol if ALLOWLIST.include?(symbol.to_s)
+
         should_symbolize = symbol.is_a?(Symbol)
         symbol = symbol
                   .to_s
@@ -64,7 +69,7 @@ module Ruby2JS
       def handle_generic_node(node, node_type)
         return node if node.type != node_type
 
-        if node.children[0] =~ /_.*\w$/ and !ALLOWLIST.include?(node.children[0].to_s)
+        if node.children[0] =~ /_.*[?!\w]$/ and !ALLOWLIST.include?(node.children[0].to_s)
           S(node_type , camelCase(node.children[0]), *node.children[1..-1])
         else
           node
@@ -99,6 +104,10 @@ module Ruby2JS
         handle_generic_node(super, :arg)
       end
 
+      def on_kwarg(node)
+        handle_generic_node(super, :kwarg)
+      end
+
       def on_lvasgn(node)
         handle_generic_node(super, :lvasgn)
       end
@@ -111,6 +120,14 @@ module Ruby2JS
         handle_generic_node(super, :cvasgn)
       end
 
+      def on_match_pattern(node)
+        handle_generic_node(super, :match_pattern)
+      end
+
+      def on_match_var(node)
+        handle_generic_node(super, :match_var)
+      end
+
       def on_sym(node)
         handle_generic_node(super, :sym)
       end
@@ -119,7 +136,7 @@ module Ruby2JS
         node = super
         return node if node.type != :defs
 
-        if node.children[1] =~ /_.*\w$/
+        if node.children[1] =~ /_.*[?!\w]$/
           S(:defs , node.children[0],
             camelCase(node.children[1]), *node.children[2..-1])
         else

data/lib/ruby2js/filter/functions.rb

@@ -341,7 +341,11 @@ module Ruby2JS
 
         elsif method == :last
           if node.children.length == 2
-            process on_send S(:send, target, :[], s(:int, -1))
+            if es2022
+              process S(:send, target, :at, s(:int, -1))
+            else
+              process on_send S(:send, target, :[], s(:int, -1))
+            end
           elsif node.children.length == 3
             process S(:send, target, :slice,
               s(:send, s(:attr, target, :length), :-, node.children[2]),
@@ -358,8 +362,12 @@ module Ruby2JS
           # resolve negative literal indexes
           i = proc do |index|
             if index.type == :int and index.children.first < 0
-              process S(:send, S(:attr, target, :length), :-,
-                s(:int, -index.children.first))
+              if es2022
+                return process S(:send, target, :at, index)
+              else
+                process S(:send, S(:attr, target, :length), :-,
+                  s(:int, -index.children.first))
+              end
             else
               index
             end

data/lib/ruby2js/filter/lit-element.rb

@@ -36,7 +36,7 @@ module Ruby2JS
       end
 
       def on_class(node)
-        cname, inheritance, *body = node.children
+        _, inheritance, *body = node.children
         return super unless inheritance == s(:const, nil, :LitElement)
 
         @le_props = {}

data/lib/ruby2js/filter/react.rb

@@ -1492,7 +1492,13 @@ module Ruby2JS
        source = Ruby2JS.jsx2_rb(source)
        ast =  Ruby2JS.parse(source).first
        ast = s(:block, s(:send, nil, :_), s(:args), ast) if ast.type == :begin
-       process ast
+
+       begin
+         react, @react = @react, @react || :react
+         process ast
+       ensure
+         @react = react
+       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  = 5
 
     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.5
 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-08-14 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