ruby2js 2.1.24 → 3.0.0

data/lib/ruby2js/converter/hash.rb

@@ -56,8 +56,8 @@ module Ruby2JS
               # hoist get/set comments to definition of property
               if right.type == :hash
                 right.children.each do |pair|
-                next unless Parser::AST::Node === pair.children.last
-                  if pair.children.last.type == :block
+                  next unless Parser::AST::Node === pair.children.last
+                  if [:block, :def, :async].include? pair.children.last.type
                     if @comments[pair.children.last]
                       (puts ''; singleton = false) if singleton
                       comments(pair.children.last).each do |comment|
@@ -68,15 +68,40 @@ module Ruby2JS
                 end
               end
 
+              # check to see if es2015 anonymous function syntax can be used
+              anonfn = (es2015 and right and right.type == :block)
+              if anonfn
+                receiver, method = right.children[0].children
+                if receiver
+                  unless method == :new and receiver.children == [nil, :Proc]
+                    anonfn = false
+                  end
+                elsif not [:lambda, :proc].include? method
+                  anonfn = false
+                end
+              end
+
               if 
+                anonfn and 
                 left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
               then
-                put left.children.first
+                @prop = left.children.first
+                parse right, :method
               else
-                parse left
+		if not [:str, :sym].include? left.type and es2015
+		  put '['
+		  parse left
+		  put ']'
+		elsif 
+		  left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
+		then
+		  put left.children.first
+		else
+		  parse left
+		end
+
+		put ': '; parse right
               end
-
-              put ': '; parse right
             end
 
           ensure

data/lib/ruby2js/converter/if.rb

@@ -50,7 +50,7 @@ module Ruby2JS
           if scope
             vars = @vars.select {|key, value| value == :pending}.keys
             unless vars.empty?
-              insert mark, "var #{vars.join(', ')}#{@sep}"
+              insert mark, "#{es2015 ? 'let' : 'var'} #{vars.join(', ')}#{@sep}"
               vars.each {|var| @vars[var] = true}
             end
           end

data/lib/ruby2js/converter/ivasgn.rb

@@ -4,8 +4,11 @@ module Ruby2JS
     # (ivasgn :@a
     #   (int 1))
 
-    handle :ivasgn do |var, expression|
-      put "#{ var.to_s.sub('@', 'this._') } = "; parse expression
+    handle :ivasgn do |var, expression=nil|
+      put "#{ var.to_s.sub('@', 'this._') }"
+      if expression
+        put " = "; parse expression
+      end
     end
   end
 end

data/lib/ruby2js/converter/masgn.rb

@@ -10,11 +10,48 @@ module Ruby2JS
     #     (int 2)))
 
     handle :masgn do |lhs, rhs|
-      block = []
-      lhs.children.zip rhs.children.zip do |var, val| 
-        block << s(var.type, *var.children, *val)
+      if es2015
+        walk = lambda do |node|
+          results = []
+          node.children.each do |var|
+            if var.type == :lvasgn
+              results << var 
+            elsif var.type == :mlhs or var.type == :splat
+              results += walk[var]
+            end
+          end
+          results
+        end
+
+        vars = walk[lhs]
+        newvars = vars.select {|var| not @vars.include? var.children[0]}
+
+        if newvars.length > 0
+          if vars == newvars
+            put 'let ' 
+          else
+            put "let #{newvars.map {|var| var.children.last}.join(', ')}#{@sep}"
+          end
+        end
+
+        newvars.each do |var| 
+          @vars[var.children.last] ||= (@scope ? true : :pending)
+        end
+
+        put '['
+        lhs.children.each_with_index do |child, index|
+          put ", " unless index == 0
+          parse child
+        end
+        put "] = "
+        parse rhs
+      else
+        block = []
+        lhs.children.zip rhs.children.zip do |var, val| 
+          block << s(var.type, *var.children, *val)
+        end
+        parse s(:begin, *block), @state
       end
-      parse s(:begin, *block), @state
     end
   end
 end

data/lib/ruby2js/converter/send.rb

@@ -9,11 +9,11 @@ module Ruby2JS
     # (sendw nil :puts
     #   (int 1))
 
-    # Note: attr and sendw are only generated by filters.  Attr forces
+    # Note: attr, sendw, and await are only generated by filters.  Attr forces
     # interpretation as an attribute vs a function call with zero parameters.
     # Sendw forces parameters to be placed on separate lines.
 
-    handle :send, :sendw, :attr, :call do |receiver, method, *args|
+    handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
       # strip '!' and '?' decorations
@@ -21,13 +21,13 @@ module Ruby2JS
 
       # three ways to define anonymous functions
       if method == :new and receiver and receiver.children == [nil, :Proc]
-        return parse args.first
+        return parse args.first, @state
       elsif not receiver and [:lambda, :proc].include? method
         if method == :lambda
           return parse s(args.first.type, *args.first.children[0..-2],
-            s(:autoreturn, args.first.children[-1]))
+            s(:autoreturn, args.first.children[-1])), @state
         else
-          return parse args.first
+          return parse args.first, @state
         end
       end
 
@@ -35,12 +35,59 @@ module Ruby2JS
       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
-          (@state == :statement ? group(receiver) : parse(receiver))
+          (es2015 || @state == :statement ? group(receiver) : parse(receiver))
           put '('; parse_all(*args, join: ', '); put ')'
           return
         end
       end
 
+      # async/await support
+      if es2017 and receiver == nil and args.length == 1
+        if method == :async
+          if args.first.type == :def
+            # async def f(x) {...}
+            return parse args.first.updated :async
+
+          elsif args.first.type == :defs
+            # async def o.m(x) {...}
+            return parse args.first.updated :asyncs
+
+          elsif args.first.type == :block
+            block = args.first
+
+            if block.children[0].children.last == :lambda
+              # async lambda {|x| ... }
+              # async -> (x) { ... }
+              return parse block.updated(:async, [nil, block.children[1],
+                s(:autoreturn, block.children[2])])
+
+            elsif block.children[0].children.last == :proc
+              # async proc {|x| ... }
+              return parse block.updated(:async, [nil, *block.children[1..-1]])
+
+            elsif
+              block.children[0].children[1] == :new and
+              block.children[0].children[0] == s(:const, nil, :Proc)
+            then
+              # async Proc.new {|x| ... }
+              return parse block.updated(:async, [nil, *block.children[1..-1]])
+            end
+          end
+
+        elsif method == :await
+          if args.first.type == :send
+            # await f(x)
+            return parse args.first.updated(:await)
+
+          elsif args.first.type == :block
+            # await f(x) { ... }
+            block = args.first
+            return parse block.updated nil, [block.children[0].updated(:await),
+              *block.children[1..-1]]
+          end
+        end
+      end
+
       op_index = operator_index method
       if op_index != -1
         target = args.first 
@@ -76,6 +123,13 @@ module Ruby2JS
         parse receiver; put '['; parse_all(*args[0..-2], join: ', '); put '] = '
         parse args[-1]
 
+      elsif method == :** and not es2016
+        put 'Math.pow('
+        parse receiver
+        put ', '
+        parse args.first
+        put ')'
+
       elsif [:-@, :+@, :~, '~'].include? method
         put method.to_s[0]; parse receiver
 
@@ -99,7 +153,7 @@ module Ruby2JS
       elsif method =~ /=$/
         parse receiver
         put "#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } "
-        parse args.first
+        parse args.first, (@state == :method ? :method : :expression)
 
       elsif method == :new
         if receiver
@@ -166,6 +220,8 @@ module Ruby2JS
         put 'typeof '; parse args.first
 
       else
+        put 'await ' if @ast.type == :await
+
         if not ast.is_method?
           if receiver
             (group_receiver ? group(receiver) : parse(receiver))
@@ -173,7 +229,7 @@ module Ruby2JS
           else
             parse ast.updated(:lvasgn, [method]), @state
           end
-        elsif args.length > 0 and args.any? {|arg| arg.type == :splat}
+        elsif args.any? {|arg| arg.type == :splat} and not es2015
           parse s(:send, s(:attr, receiver, method), :apply, 
             (receiver || s(:nil)), s(:array, *args))
         else
@@ -206,11 +262,16 @@ module Ruby2JS
       # build up chain of conditional evaluations
       until stack.empty?
         node = stack.pop
-	expr = node.updated(:send, [expr, *node.children[1..-1]])
-	result = s(:and, result, expr)
+        expr = node.updated(:send, [expr, *node.children[1..-1]])
+        result = s(:and, result, expr)
       end
 
       parse result
     end
+
+    handle :splat do |expr|
+       put '...'
+       parse expr
+    end
   end
 end

data/lib/ruby2js/converter/super.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     # (super ...)
 
     handle :super, :zsuper do |*args|
-      unless @class_parent and @instance_method
+      unless @instance_method and @class_parent
         raise NotImplementedError, "super outside of a method"
       end
 
@@ -21,15 +21,28 @@ module Ruby2JS
         end
       end
 
-      parse @class_parent
+      if es2015
+        if @instance_method.children[0] == :constructor
+          put 'super'
+        else
+          put 'super.'
+          put @instance_method.children[0]
+        end
 
-      # what to call
-      if @instance_method.type != :constructor
-        puts  ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
-      end
+        put '('
+        parse s(:args, *args)
+        put ')'
+      else
+        parse @class_parent
 
-      if args
-        put '.call('; parse_all s(:self), *args, join: ', '; put ')'
+        # what to call
+        if @instance_method.type != :constructor
+          puts  ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
+        end
+
+        if args
+          put '.call('; parse_all s(:self), *args, join: ', '; put ')'
+        end
       end
     end
   end

data/lib/ruby2js/converter/vasgn.rb

@@ -27,7 +27,11 @@ module Ruby2JS
         end
 
         if state == :statement and @scope and not @vars.include?(name) 
-          var = 'var ' 
+          if es2015
+            var = 'let '
+          else
+            var = 'var ' 
+          end
         end
 
         if value

data/lib/ruby2js/converter/while.rb

@@ -9,6 +9,19 @@ module Ruby2JS
       begin
         next_token, @next_token = @next_token, :continue
 
+        # handle while loops that assign a variable
+        while condition.type == :begin and condition.children.length == 1
+          condition = condition.children.first
+        end
+
+        if condition.type == :lvasgn
+          var = condition.children[0]
+          unless @vars[var]
+            put "#{es2015 ? 'let' : 'var'} #{var}#@sep" 
+            @vars[var] = true
+          end
+        end
+
         put 'while ('; parse condition; puts ') {'; scope block; sput '}'
       ensure
         @next_token = next_token

data/lib/ruby2js/converter.rb

@@ -5,8 +5,9 @@ module Ruby2JS
     attr_accessor :ast
 
     LOGICAL   = :and, :not, :or
-    OPERATORS = [:[], :[]=], [:not, :!], [:*, :/, :%], [:+, :-], [:>>, :<<], 
-      [:&], [:^, :|], [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="], [:and, :or]
+    OPERATORS = [:[], :[]=], [:not, :!], [:**], [:*, :/, :%], [:+, :-], 
+      [:>>, :<<], [:&], [:^, :|], [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="],
+      [:and, :or]
     
     INVERT_OP = {
       :<  => :>=,
@@ -44,6 +45,9 @@ module Ruby2JS
       @prototype = nil
       @class_parent = nil
       @class_name = nil
+
+      @eslevel = :es5
+      @strict = false
     end
 
     def width=(width)
@@ -52,6 +56,14 @@ module Ruby2JS
 
     def convert
       parse( @ast, :statement )
+
+      if @strict
+        if @sep == '; '
+          @lines.first.unshift "\"use strict\"#@sep"
+        else
+          @lines.unshift Line.new('"use strict";')
+        end
+      end
     end
 
     def operator_index op
@@ -73,6 +85,20 @@ module Ruby2JS
       Parser::AST::Node.new(type, args)
     end
 
+    attr_accessor :strict, :eslevel
+
+    def es2015
+      @eslevel >= 2015
+    end
+
+    def es2016
+      @eslevel >= 2016
+    end
+
+    def es2017
+      @eslevel >= 2017
+    end
+
     @@handlers = []
     def self.handle(*types, &block)
       types.each do |type| 
@@ -132,9 +158,9 @@ module Ruby2JS
     end
 
     def parse_all(*args)
-      options = (Hash === args.last) ? args.pop : {}
-      sep = options[:join].to_s
-      state = options[:state] || :expression
+      @options = (Hash === args.last) ? args.pop : {}
+      sep = @options[:join].to_s
+      state = @options[:state] || :expression
 
       args.each_with_index do |arg, index|
         put sep unless index == 0
@@ -211,6 +237,7 @@ require 'ruby2js/converter/break'
 require 'ruby2js/converter/case'
 require 'ruby2js/converter/casgn'
 require 'ruby2js/converter/class'
+require 'ruby2js/converter/class2'
 require 'ruby2js/converter/const'
 require 'ruby2js/converter/cvar'
 require 'ruby2js/converter/cvasgn'

data/lib/ruby2js/es2015/strict.rb

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

data/lib/ruby2js/es2015.rb

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

data/lib/ruby2js/es2016/strict.rb

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

data/lib/ruby2js/es2016.rb

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

data/lib/ruby2js/es2017/strict.rb

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

data/lib/ruby2js/es2017.rb

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

data/lib/ruby2js/execjs.rb

@@ -7,7 +7,7 @@ module Ruby2JS
   end
 
   def self.eval(source, options={})
-    ExecJS.eval(convert(source, options).to_s)
+    ExecJS.eval(convert(source, options.merge(strict: false)).to_s)
   end
 
   def self.exec(source, options={})

data/lib/ruby2js/filter/camelCase.rb

@@ -17,7 +17,7 @@ module Ruby2JS
         if node.children[0] == nil and WHITELIST.include? node.children[1].to_s
           super
         elsif node.children[1] =~ /_.*\w$/
-          super S((node.is_method? ? :call : :attr) , node.children[0],
+          super S(:send , node.children[0],
             camelCase(node.children[1]), *node.children[2..-1])
         else
           super

data/lib/ruby2js/filter/functions.rb

@@ -47,8 +47,12 @@ module Ruby2JS
           process S(:call, target, :toString, *args)
 
         elsif method == :Array and target == nil
-          process S(:send, s(:attr, s(:attr, s(:const, nil, :Array), 
-            :prototype), :slice), :call, *args)
+          if es2015
+            process S(:send, s(:const, nil, :Array), :from, *args)
+          else
+            process S(:send, s(:attr, s(:attr, s(:const, nil, :Array), 
+              :prototype), :slice), :call, *args)
+          end
 
         elsif method == :to_i
           process node.updated :send, [nil, :parseInt, target, *args]
@@ -368,6 +372,49 @@ module Ruby2JS
             :step, step])
           process node.updated(nil, [call, *node.children[1..-1]])
 
+        elsif 
+          # (a..b).each {|v| ...}
+          call.children[1] == :each and
+          call.children[0].type == :begin and
+          call.children[0].children.length == 1 and
+          [:irange, :erange].include? call.children[0].children[0].type and
+          node.children[1].children.length == 1
+        then
+          s(:for, s(:lvasgn, node.children[1].children[0].children[0]), 
+            call.children[0].children[0], node.children[2])
+
+        elsif 
+          [:each, :each_value].include? call.children[1] and 
+          node.children[1].children.length == 1
+        then
+          if es2015
+            process node.updated(:for_of, 
+              [s(:lvasgn, node.children[1].children[0].children[0]),
+              node.children[0].children[0], node.children[2]])
+          else
+            process node.updated(nil, [s(:send, call.children[0], 
+              :forEach), *node.children[1..2]])
+          end
+
+        elsif 
+          call.children[1] == :each_key and 
+          [:each, :each_key].include? call.children[1] and 
+          node.children[1].children.length == 1
+        then
+          process node.updated(:for, 
+            [s(:lvasgn, node.children[1].children[0].children[0]),
+            node.children[0].children[0], node.children[2]])
+
+        elsif es2015 and call.children[1] == :inject
+          process node.updated(:send, [call.children[0], :reduce,
+            s(:block, s(:send, nil, :lambda), *node.children[1..2]),
+            *call.children[2..-1]])
+
+        elsif es2017 and call.children[1] == :each_pair
+          process node.updated(nil, [s(:send, s(:send, s(:const, nil, :Object),
+            :entries, call.children[0]), :forEach), s(:args, s(:mlhs,
+            *node.children[1].children)), node.children[2]])
+
         else
           super
         end