ruby2js 3.0.15 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acab4a28c4ec163da40b2f1847692df089ff593af8d735bf163cfe566ed7f5b
-  data.tar.gz: f0f33e2c6beba7785d535ece64e4402cb5aac29fca9f9541087857905ba33d8f
+  metadata.gz: f0d87e8dda198550df6b79aa5a14e033ff6180f6057998d63252a41011d04735
+  data.tar.gz: 1869aa7759c6b40137258b3a87c0c250944940753cc5d0814a0e027bd88068dd
 SHA512:
-  metadata.gz: d53db4145f632be93c234cf706b25e6c7c27a0d0c1a864543045e6d9a9672e9e9792281677da6a4b107a3eac0d173ca2cd151a0d0f91acf3171ecc5a84dd06c4
-  data.tar.gz: 49364f4bb8cf3f05ea9d07664d800a86af81817b096a40c89ec8848a6f45fe62b755cc2e0c995ce49f300bb84a6caa1de4b5fd822b8ae403579e9244dde9e442
+  metadata.gz: 75b7232fbc65271e6b200f6283f04605de370d6e38b127e6c51a481931a41076e055a3141fe643094c67e9b73988b0e7ccf576d0d6c36e3f44cbdb56face4362
+  data.tar.gz: c60b7631d17f12cafe859cfc06e7551f3158f1d6f4643f2fd2faf12a4cbd85cb8496c453d8c43d6244e73516726251f438f964a2312fd87deb8c690dc098b208

data/README.md

@@ -236,6 +236,7 @@ the script.
     * `.last` becomes `[*.length-1]`
     * `.last(n)` becomes `.slice(*.length-1, *.length)`
     * `.max` becomes `Math.max.apply(Math)`
+    * `.merge` becomes `Object.assign({}, ...)`
     * `.merge!` becomes `Object.assign()`
     * `.min` becomes `Math.min.apply(Math)`
     * `.nil?` becomes `== null`
@@ -249,6 +250,9 @@ the script.
     * `.downto(lim)` becomes `for (var i=num; i>=lim; i-=1)`
     * `.step(lim, n).each` becomes `for (var i=num; i<=lim; i+=n)`
     * `.step(lim, -n).each` becomes `for (var i=num; i>=lim; i-=n)`
+    * `(0..a).to_a` becomes `Array.apply(null, {length: a}).map(Function.call, Number)`
+    * `(b..a).to_a` becomes `Array.apply(null, {length: (a-b+1)}).map(Function.call, Number).map(function (idx) { return idx+b })`
+    * `(b...a).to_a` becomes `Array.apply(null, {length: (a-b)}).map(Function.call, Number).map(function (idx) { return idx+b })`
     * `.strip` becomes `.trim`
     * `.sub` becomes `.replace`
     * `.to_f` becomes `parseFloat`
@@ -282,7 +286,7 @@ the script.
 
     * `.class` becomes `.constructor`
 
-* <a id="node" * href="https://github.com/rubys/ruby2js/blob/master/spec/node_spec.rb">node</a>
+* <a id="node" href="https://github.com/rubys/ruby2js/blob/master/spec/node_spec.rb">node</a>
 
     * `` `command` `` becomes `child_process.execSync("command", {encoding: "utf8"})`
     * `ARGV` becomes `process.argv.slice(2)`
@@ -539,6 +543,9 @@ conversions are made:
 * `proc {|x| x}` becomes `(x) => {x}`
 * `a {|x|}` becomes `a((x) => {})`
 * `class Person; end` becomes `class Person {}`
+* `(0...a).to_a` becomes `[...Array(a).keys()]`
+* `(0..a).to_a` becomes `[...Array(a+1).keys()]`
+* `(b..a).to_a` becomes `Array.from({length: (a-b+1)}, (_, idx) => idx+b)`
 
 ES2015 class support includes constructors, super, methods, class methods,
 instance methods, instance variables, class variables, getters, setters,
@@ -549,6 +556,9 @@ Additionally, the `functions` filter will provide the following conversion:
 * `Array(x)` becomes `Array.from(x)`
 * `.inject(n) {}` becomes `.reduce(() => {}, n)`
 
+Finally, keyword arguments and optional keyword arguments will be mapped to
+parameter detructuring.
+
 ES2016 support
 ---
 
@@ -566,6 +576,40 @@ conversion is made by the `functions` filter:
 
 * `.each_entry` becomes `Object.entries().forEach`
 
+ES2018 support
+---
+
+When option `eslevel: 2018` is provided, the following additional
+conversion is made by the `functions` filter:
+
+* `.merge` becomes `{...a, ...b}`
+
+Additionally, rest arguments can now be used with keyword arguments and
+optional keyword arguments.
+
+ES2019 support
+---
+
+When option `eslevel: 2018` is provided, the following additional
+conversion is made by the `functions` filter:
+
+* `.flatten` becomes `.flat(Infinity)`
+* `.lstrip` becomes `.trimEnd
+* `.rstrip` becomes `.trimStart
+* `a.to_h` becomes `Object.fromEntries(a)`
+
+Additionally, `rescue` without a variable will map to `catch` without a
+variable.
+
+ES2020 support
+---
+
+When option `eslevel: 2018` is provided, the following additional
+conversion is made:
+
+* `@x` becomes `this.#x`
+* `@@x` becomes `ClassName.#x`
+
 Picking a Ruby to JS mapping tool
 ---
 

data/lib/ruby2js.rb

@@ -81,6 +81,18 @@ module Ruby2JS
         @options[:eslevel] >= 2017
       end
 
+      def es2018
+        @options[:eslevel] >= 2018
+      end
+
+      def es2019
+        @options[:eslevel] >= 2019
+      end
+
+      def es2020
+        @options[:eslevel] >= 2020
+      end
+
       def process(node)
         ast, @ast = @ast, node
         replacement = super
@@ -201,7 +213,9 @@ module Ruby2JS
     buffer.source = source.encode('utf-8')
     parser = Parser::CurrentRuby.new
     parser.builder.emit_file_line_as_literals=false
-    parser.parse_with_comments(buffer)
+    ast, comments = parser.parse_with_comments(buffer)
+    Parser::CurrentRuby.parse(source.encode('utf-8')) unless ast
+    [ast, comments]
   rescue Parser::SyntaxError => e
     split = source[0..e.diagnostic.location.begin_pos].split("\n")
     line, col = split.length, split.last.length

data/lib/ruby2js/converter.rb

@@ -138,6 +138,18 @@ module Ruby2JS
       @eslevel >= 2017
     end
 
+    def es2018
+      @eslevel >= 2018
+    end
+
+    def es2019
+      @eslevel >= 2019
+    end
+
+    def es2020
+      @eslevel >= 2020
+    end
+
     @@handlers = []
     def self.handle(*types, &block)
       types.each do |type| 

data/lib/ruby2js/converter/args.rb

@@ -7,7 +7,37 @@ module Ruby2JS
    #   (blockarg :c))
 
     handle :args do |*args|
+      kwargs = []
+      while args.last and 
+        [:kwarg, :kwoptarg, :kwrestarg].include? args.last.type
+        kwargs.unshift args.pop
+      end
+
+      if kwargs.length == 1 and kwargs.last.type == :kwrestarg
+        args.push s(:arg, *kwargs.last.children)
+      end
+
+      unless kwargs.empty? or es2015
+        raise NotImplementedError.new('Keyword args require ES2015')
+      end
+
       parse_all(*args, join: ', ')
+      if not kwargs.empty?
+        put ', ' unless args.empty?
+        put '{ '
+        kwargs.each_with_index do |kw, index|
+          put ', ' unless index == 0
+          if kw.type == :kwarg
+            put kw.children.first
+          elsif kw.type == :kwoptarg
+            put kw.children.first; put ' = '; parse kw.children.last
+          elsif kw.type == :kwrestarg
+            raise 'Rest arg requires ES2018' unless es2018
+            put '...'; put kw.children.first
+          end
+        end
+        put ' }'
+      end
     end
 
     handle :mlhs do |*args|

data/lib/ruby2js/converter/casgn.rb

@@ -8,7 +8,9 @@ module Ruby2JS
       multi_assign_declarations if @state == :statement
 
       begin
-        if @state == :statement
+        cbase ||= @rbstack.map {|rb| rb[var]}.compact.last
+
+        if @state == :statement and not cbase
           if es2015
             put "const "
           else
@@ -16,7 +18,6 @@ module Ruby2JS
           end
         end
 
-        cbase ||= @rbstack.map {|rb| rb[var]}.compact.last
         (parse cbase; put '.') if cbase
 
         put "#{ var } = "; parse value

data/lib/ruby2js/converter/class2.rb

@@ -33,21 +33,79 @@ module Ruby2JS
         class_name, @class_name = @class_name, name
         class_parent, @class_parent = @class_parent, inheritance
         @rbstack.push({})
+        constructor = []
+        index = 0
 
-        # capture method names for automatic self referencing
-        body.each_with_index do |m, index|
+        # capture constructor, method names for automatic self referencing
+        body.each do |m|
           if m.type == :def
             prop = m.children.first
-            unless prop == :initialize or prop.to_s.end_with? '='
+            if prop == :initialize
+              constructor = m.children[2..-1]
+            elsif not prop.to_s.end_with? '='
               @rbstack.last[prop] = s(:self)
             end
           end
         end
 
+        # private variable declarations
+        if es2020
+          ivars = Set.new
+          cvars = Set.new
+
+          # find ivars and cvars
+          walk = proc do |ast|
+            ivars << ast.children.first if ast.type === :ivar
+            cvars << ast.children.first if ast.type === :cvar
+            ast.children.each do |child|
+              walk[child] if child.is_a? Parser::AST::Node
+            end
+          end
+          walk[@ast]
+
+          # process leading initializers in constructor
+          while constructor.length == 1 and constructor.first.type == :begin
+            constructor = constructor.first.children.dup
+          end
+
+          # emit additional class declarations
+          unless cvars.empty?
+            body.each do |m|
+              cvars.delete m.children.first if m.type == :cvasgn
+            end
+          end
+          cvars.to_a.sort.each do |cvar|
+            put(index == 0 ? @nl : @sep)
+            index += 1
+            put 'static #' + cvar.to_s[2..-1]
+          end
+
+          while constructor.length > 0 and constructor.first.type == :ivasgn
+            put(index == 0 ? @nl : @sep)
+            index += 1
+            statement = constructor.shift
+            put '#'
+            put statement.children.first.to_s[1..-1]
+            put ' = '
+            parse statement.children.last
+
+            ivars.delete statement.children.first
+          end
+
+          # emit additional instance declarations
+          ivars.to_a.sort.each do |ivar|
+            put(index == 0 ? @nl : @sep)
+            index += 1
+            put '#' + ivar.to_s[1..-1]
+          end
+        end
+
+        # process class definition
         post = []
         skipped = false
-        body.each_with_index do |m, index|
+        body.each do |m|
           put(index == 0 ? @nl : @sep) unless skipped
+          index += 1
           comments = comments(m)
           location = output_location
           skipped = false
@@ -67,7 +125,13 @@ module Ruby2JS
 
             if @prop == :initialize
               @prop = :constructor 
-              m = m.updated(m.type, [@prop, *m.children[1..2]])
+
+              if constructor == [] or constructor == [(:super)]
+                skipped = true 
+                next
+              end
+
+              m = m.updated(m.type, [@prop, m.children[1], *constructor])
             elsif not m.is_method?
               @prop = "get #{@prop}"
               m = m.updated(m.type, [*m.children[0..1], 
@@ -83,7 +147,7 @@ module Ruby2JS
 
             begin
               @instance_method = m
-              parse m
+              parse m # unless skipped
             ensure
               @instance_method = nil
             end
@@ -143,10 +207,21 @@ module Ruby2JS
             end
 
           else
-            skipped = true
+            if m.type == :cvasgn and es2020
+              put 'static #'; put m.children[0].to_s[2..-1]; put ' = '
+              parse m.children[1]
+            else
+              skipped = true
+            end
 
             if m.type == :casgn and m.children[0] == nil
               @rbstack.last[m.children[1]] = name
+
+              if es2020
+                put 'static '; put m.children[1].to_s; put ' = '
+                parse m.children[2]
+                skipped = false
+              end
             elsif m.type == :alias
               @rbstack.last[m.children[0]] = name
             end

data/lib/ruby2js/converter/cvar.rb

@@ -4,14 +4,16 @@ module Ruby2JS
     # (cvar :@@a)
 
     handle :cvar do |var|
+      prefix = es2020 ? '#' : '_'
+
       @class_name ||= nil
       if @class_name
         parse @class_name
-        put var.to_s.sub('@@', "._")
+        put var.to_s.sub('@@', ".#{prefix}")
       elsif @prototype
-        put var.to_s.sub('@@', 'this._')
+        put var.to_s.sub('@@', "this.#{prefix}")
       else
-        put var.to_s.sub('@@', 'this.constructor._')
+        put var.to_s.sub('@@', "this.constructor.#{prefix}")
       end
     end
   end

data/lib/ruby2js/converter/cvasgn.rb

@@ -7,13 +7,15 @@ module Ruby2JS
     handle :cvasgn do |var, expression=nil|
       multi_assign_declarations if @state == :statement
 
+      prefix = es2020 ? '#' : '_'
+
       if @class_name
         parse @class_name
-        put var.to_s.sub('@@', "._")
+        put var.to_s.sub('@@', ".#{prefix}")
       elsif @prototype
-        put var.to_s.sub('@@', 'this._')
+        put var.to_s.sub('@@', "this.#{prefix}")
       else
-        put var.to_s.sub('@@', 'this.constructor._')
+        put var.to_s.sub('@@', "this.constructor.#{prefix}")
       end
 
       if expression

data/lib/ruby2js/converter/hash.rb

@@ -12,10 +12,26 @@ module Ruby2JS
 
         (singleton ? put('{') : puts('{'))
 
-        pairs.each_with_index do |node, index|
-          raise Error.new("kwsplat", @ast) if node.type == :kwsplat
-
+        index = 0
+        while pairs.length > 0
+          node = pairs.shift
           (singleton ? put(', ') : put(",#@ws")) unless index == 0
+          index += 1
+
+          if node.type == :kwsplat
+            if es2018
+              if node.children.first.type == :hash
+                pairs.unshift(*node.children.first.children)
+                index = 0
+              else
+                puts '...'; parse node.children.first
+              end
+
+              next
+            else
+              raise Error.new("kwsplat", @ast)
+            end
+          end
 
           if not @comments[node].empty?
             (puts ''; singleton = false) if singleton

data/lib/ruby2js/converter/ivar.rb

@@ -6,6 +6,8 @@ module Ruby2JS
     handle :ivar do |var|
       if self.ivars and self.ivars.include? var
         parse s(:hostvalue, self.ivars[var])
+      elsif es2020
+        parse s(:attr, s(:self), var.to_s.sub('@', '#'))
       else
         parse s(:attr, s(:self), var.to_s.sub('@', '_'))
       end

data/lib/ruby2js/converter/ivasgn.rb

@@ -7,7 +7,7 @@ module Ruby2JS
     handle :ivasgn do |var, expression=nil|
       multi_assign_declarations if @state == :statement
 
-      put "#{ var.to_s.sub('@', 'this._') }"
+      put "#{ var.to_s.sub('@', 'this.' + (es2020 ? '#' : '_')) }"
       if expression
         put " = "; parse expression
       end

data/lib/ruby2js/converter/kwbegin.rb

@@ -51,13 +51,27 @@ module Ruby2JS
       puts "try {"; scope body; sput '}'
 
       if recovers
-        var ||= s(:gvar, :$EXCEPTION)
 
         if recovers.length == 1 and not recovers.first.children.first
+          # find reference to exception ($!)
+          walk = proc do |ast|
+            result = ast if ast.type === :gvar and ast.children.first == :$!
+            ast.children.each do |child|
+              result ||= walk[child] if child.is_a? Parser::AST::Node
+            end
+            result
+          end
+
           # single catch with no exception named
-          put " catch ("; parse var; puts ") {"
+          if es2019 and not var and not walk[@ast]
+            puts " catch {"
+          else
+            var ||= s(:gvar, :$EXCEPTION)
+            put " catch ("; parse var; puts ") {"
+          end
           scope recovers.first.children.last; sput '}'
         else
+          var ||= s(:gvar, :$EXCEPTION)
           put " catch ("; parse var; puts ') {'
 
           first = true

data/lib/ruby2js/converter/send.rb

@@ -16,12 +16,26 @@ module Ruby2JS
     handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
-    if 
-      args.length == 1 and method == :+
-    then
-      node = collapse_strings(ast)
-      return parse node if node != ast
-    end
+      if
+        args.length == 1 and method == :+
+      then
+        node = collapse_strings(ast)
+        return parse node if node != ast
+      end
+
+      # :irange support
+      # - currently only .to_a
+      if
+        receiver and
+        receiver.type == :begin and
+        [:irange, :erange].include? receiver.children.first.type
+      then
+        unless method == :to_a
+          raise Error.new("#{receiver.children.first.type} can only be converted to array currently", receiver.children.first)
+        else
+          return range_to_array(receiver.children.first)
+        end
+      end
 
       # strip '!' and '?' decorations
       method = method.to_s[0..-2] if method =~ /\w[!?]$/
@@ -39,7 +53,7 @@ module Ruby2JS
       end
 
       # call anonymous function
-      if [:call, :[]].include? method and receiver and receiver.type == :block 
+      if [:call, :[]].include? method and receiver and receiver.type == :block
         t2,m2,*args2 = receiver.children.first.children
         if not t2 and [:lambda, :proc].include? m2 and args2.length == 0
           (es2015 || @state == :statement ? group(receiver) : parse(receiver))
@@ -97,7 +111,7 @@ module Ruby2JS
 
       op_index = operator_index method
       if op_index != -1
-        target = args.first 
+        target = args.first
       end
 
       # resolve anonymous receivers against rbstack
@@ -109,7 +123,7 @@ module Ruby2JS
         group_receiver ||= GROUP_OPERATORS.include? receiver.type
         group_receiver = false if receiver.children[1] == :[]
         if receiver.type == :int and !OPERATORS.flatten.include?(method)
-          group_receiver = true 
+          group_receiver = true
         end
         if not receiver.is_method? and receiver.children.last == :new
           group_receiver = true 
@@ -117,7 +131,7 @@ module Ruby2JS
       end
 
       if target
-        group_target = target.type == :send && 
+        group_target = target.type == :send &&
           op_index < operator_index( target.children[1] )
         group_target ||= GROUP_OPERATORS.include? target.type
       end
@@ -156,7 +170,7 @@ module Ruby2JS
         put ')'
 
       elsif [:-@, :+@, :~, '~'].include? method
-        if 
+        if
           receiver.type == :send and
           receiver.children[1] == :+@ and
           Parser::AST::Node === receiver.children[0] and
@@ -235,7 +249,7 @@ module Ruby2JS
         elsif args.length == 1 and args.first.type == :const
           # accommodation for JavaScript like new syntax w/o argument list
           parse s(:attr, args.first, :new), @state
-        elsif 
+        elsif
           args.length == 2 and [:send, :const].include? args.first.type and
           args.last.type == :def and args.last.children.first == nil
         then
@@ -269,7 +283,7 @@ module Ruby2JS
             parse ast.updated(:lvasgn, [method]), @state
           end
         elsif args.any? {|arg| arg.type == :splat} and not es2015
-          parse s(:send, s(:attr, receiver, method), :apply, 
+          parse s(:send, s(:attr, receiver, method), :apply,
             (receiver || s(:nil)), s(:array, *args))
         else
           (group_receiver ? group(receiver) : parse(receiver))
@@ -313,47 +327,98 @@ module Ruby2JS
        parse expr
     end
 
-  # do string concatenation when possible
-  def collapse_strings(node)
-    left = node.children[0]
-    return node unless left
-    right = node.children[2]
-
-    # recursively evaluate left hand side
-    if 
-      left.type == :send and left.children.length == 3 and 
-      left.children[1] == :+
-    then
-      left = collapse_strings(left)
-    end
+    # do string concatenation when possible
+    def collapse_strings(node)
+      left = node.children[0]
+      return node unless left
+      right = node.children[2]
+
+      # recursively evaluate left hand side
+      if
+        left.type == :send and left.children.length == 3 and
+        left.children[1] == :+
+      then
+        left = collapse_strings(left)
+      end
 
-    # recursively evaluate right hand side
-    if 
-      right.type == :send and right.children.length == 3 and 
-      right.children[1] == :+
-    then
-      right = collapse_strings(right)
-    end
+      # recursively evaluate right hand side
+      if
+        right.type == :send and right.children.length == 3 and
+        right.children[1] == :+
+      then
+        right = collapse_strings(right)
+      end
 
-    # if left and right are both strings, perform concatenation
-    if [:dstr, :str].include? left.type and [:dstr, :str].include? right.type
-      if left.type == :str and right.type == :str
-        return left.updated nil, 
-          [left.children.first + right.children.first]
+      # if left and right are both strings, perform concatenation
+      if [:dstr, :str].include? left.type and [:dstr, :str].include? right.type
+        if left.type == :str and right.type == :str
+          return left.updated nil,
+            [left.children.first + right.children.first]
+        else
+          left = s(:dstr, left) if left.type == :str
+          right = s(:dstr, right) if right.type == :str
+          return left.updated(nil, left.children + right.children)
+        end
+      end
+
+      # if left and right are unchanged, return original node; otherwise
+      # return node modified to include new left and/or right hand sides.
+      if left == node.children[0] and right == node.children[2]
+        return node
       else
-        left = s(:dstr, left) if left.type == :str
-        right = s(:dstr, right) if right.type == :str
-        return left.updated(nil, left.children + right.children)
+        return node.updated(nil, [left, :+, right])
       end
     end
 
-    # if left and right are unchanged, return original node; otherwise
-    # return node modified to include new left and/or right hand sides.
-    if left == node.children[0] and right == node.children[2]
-      return node
-    else
-      return node.updated(nil, [left, :+, right]) 
+    def range_to_array(node)
+      start, finish = node.children
+      if start.type == :int and start.children.first == 0
+        # Ranges which start from 0 can be achieved with more simpler code
+        if finish.type == :int
+          # output cleaner code if we know the value already
+          length = finish.children.first + (node.type == :irange ? 1 : 0)
+        else
+          # If this is variable we need to fix indexing by 1 in js
+          length = "#{finish.children.last}" + (node.type == :irange ? "+1" : "")
+        end
+
+        if es2015
+          return put "[...Array(#{length}).keys()]"
+        else
+          return put "Array.apply(null, {length: #{length}}).map(Function.call, Number)"
+        end
+      else
+        # Use .compact because the first argument is nil with variables
+        # This way the first value is always set
+        start_value = start.children.compact.first
+        finish_value = finish.children.compact.first
+        if start.type == :int and finish.type == :int
+          length = finish_value - start_value + (node.type == :irange ? 1 : 0)
+        else
+          length = "(#{finish_value}-#{start_value}" + (node.type == :irange ? "+1" : "") + ")"
+        end
+
+        # Avoid of using same variables in the map as used in the irange or elsewhere in this code
+        # Ruby2js only allows dollar sign in beginning of variable so i$ is safe
+        if @vars.include? :idx or start_value == :idx or finish_value == :idx
+          index_var = 'i$'
+        else
+          index_var = 'idx'
+        end
+
+        if es2015
+          # Use _ because it's normal convention in JS for variable which is not used at all
+          if @vars.include? :_ or start_value == :_ or finish_value == :_
+            blank = '_$'
+          else
+            blank = '_'
+          end
+
+          return put "Array.from({length: #{length}}, (#{blank}, #{index_var}) => #{index_var}+#{start_value})"
+        else
+          return put "Array.apply(null, {length: #{length}}).map(Function.call, Number).map(function (#{index_var}) { return #{index_var}+#{start_value} })"
+        end
+      end
     end
   end
-  end
 end

data/lib/ruby2js/es2018.rb

@@ -0,0 +1,5 @@
+require 'ruby2js'
+
+if Ruby2JS.eslevel_default < 2018
+  Ruby2JS.eslevel_default = 2018
+end

data/lib/ruby2js/es2018/strict.rb

@@ -0,0 +1,3 @@
+require 'ruby2js/es2018'
+
+Ruby2JS.strict_default = true

data/lib/ruby2js/es2019.rb

@@ -0,0 +1,5 @@
+require 'ruby2js'
+
+if Ruby2JS.eslevel_default < 2019
+  Ruby2JS.eslevel_default = 2019
+end

data/lib/ruby2js/es2019/strict.rb

@@ -0,0 +1,3 @@
+require 'ruby2js/es2019'
+
+Ruby2JS.strict_default = true

data/lib/ruby2js/es2020.rb

@@ -0,0 +1,5 @@
+require 'ruby2js'
+
+if Ruby2JS.eslevel_default < 2020
+  Ruby2JS.eslevel_default = 2020
+end

data/lib/ruby2js/es2020/strict.rb

@@ -0,0 +1,3 @@
+require 'ruby2js/es2020'
+
+Ruby2JS.strict_default = true

data/lib/ruby2js/filter/functions.rb

@@ -35,6 +35,27 @@ module Ruby2JS
         elsif method == :keys and args.length == 0 and node.is_method?
           process S(:send, s(:const, nil, :Object), :keys, target)
 
+        elsif method == :merge
+          args.unshift target
+
+          if es2015
+            if es2018
+              process S(:hash, *args.map {|arg| s(:kwsplat, arg)})
+            else
+              process S(:send, s(:const, nil, :Object), :assign, s(:hash),
+                *args)
+            end
+          else
+            copy = [s(:gvasgn, :$$, s(:hash))]
+
+            s(:send, s(:block, s(:send, nil, :lambda), s(:args),
+              s(:begin, *copy, *args.map {|modname|
+              s(:for, s(:lvasgn, :$_), modname,
+              s(:send, s(:gvar, :$$), :[]=,
+              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              }, s(:return, s(:gvar, :$$)))), :[])
+          end
+
         elsif method == :merge!
           if es2015
             process S(:send, s(:const, nil, :Object), :assign, target, *args)
@@ -367,6 +388,19 @@ module Ruby2JS
         elsif es2017 and method==:ljust
           process node.updated(nil, [target, :padEnd, *args])
 
+        elsif es2019 and method==:flatten and args.length == 0
+          process node.updated(nil, [target, :flat, s(:lvar, :Infinity)])
+
+        elsif es2019 and method==:to_h and args.length==0
+          process node.updated(nil, [s(:const, nil, :Object), :fromEntries,
+            target])
+
+        elsif es2019 and method==:rstrip
+          process node.updated(nil, [target, :trimStart, *args])
+
+        elsif es2019 and method==:lstrip
+          process node.updated(nil, [target, :trimEnd, *args])
+
         elsif method == :class and args.length==0 and not node.is_method?
           process node.updated(:attr, [target, :constructor])
 

data/lib/ruby2js/version.rb

@@ -1,8 +1,8 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 15
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.1.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -93,6 +93,12 @@ files:
 - lib/ruby2js/es2016/strict.rb
 - lib/ruby2js/es2017.rb
 - lib/ruby2js/es2017/strict.rb
+- lib/ruby2js/es2018.rb
+- lib/ruby2js/es2018/strict.rb
+- lib/ruby2js/es2019.rb
+- lib/ruby2js/es2019/strict.rb
+- lib/ruby2js/es2020.rb
+- lib/ruby2js/es2020/strict.rb
 - lib/ruby2js/execjs.rb
 - lib/ruby2js/filter.rb
 - lib/ruby2js/filter/camelCase.rb