ruby2js 3.5.3 → 4.0.2

data/lib/ruby2js/converter/def.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     #     (arg :x)
     #   (...)
 
-    handle :def, :defm, :async do |name, args, body=nil|
+    handle :def, :defm, :async, :deff do |name, args, body=nil|
       body ||= s(:begin)
 
       add_implicit_block = false
@@ -106,7 +106,7 @@ module Ruby2JS
       # es2015 fat arrow support
       if \
         not name and es2015 and @state != :method and @ast.type != :defm and 
-        not @prop
+        @ast.type != :deff and not @prop
       then
         expr = body
         expr = expr.children.first while expr.type == :autoreturn
@@ -118,6 +118,10 @@ module Ruby2JS
         if EXPRESSIONS.include? expr.type
           if expr.type == :send and expr.children[0..1] == [nil, :raise]
             style = :statement
+          elsif expr.type == :send and expr.children.length == 2 and
+            expr.children.first == nil and @rbstack.last and
+            @rbstack.last[expr.children[1]]&.type == :autobind
+            style = :statement
           else
             style = :expression
           end
@@ -131,7 +135,7 @@ module Ruby2JS
           style = :statement
         end
 
-        if args.children.length == 1 and style == :expression
+        if args.children.length == 1 and args.children.first.type == :arg and style == :expression
           parse args; put ' => '
         else
           put '('; parse args; put ') => '

data/lib/ruby2js/converter/dstr.rb

@@ -10,6 +10,11 @@ module Ruby2JS
     #   (...))
 
     handle :dstr, :dsym do |*children|
+      if @state == :expression and children.empty?
+        puts '""'
+        return
+      end
+
       if es2015
         # gather length of string parts; if long enough, newlines will
         # not be escaped (poor man's HEREDOC)
@@ -26,7 +31,7 @@ module Ruby2JS
             else
               put str
             end
-          else
+          elsif child != s(:begin)
             put '${'
             parse child
             put '}'
@@ -40,8 +45,8 @@ module Ruby2JS
       children.each_with_index do |child, index|
         put ' + ' unless index == 0
 
-        if child.type == :begin and child.children.length == 1
-          child = child.children.first
+        if child.type == :begin and child.children.length <= 1
+          child = child.children.first || s(:str, '')
         end
 
         if child.type == :send

data/lib/ruby2js/converter/for.rb

@@ -28,7 +28,7 @@ module Ruby2JS
         else
           put (@ast.type==:for_of ? ' of ' : ' in '); parse expression; 
         end
-        puts ') {'; scope block; sput '}'
+        puts ') {'; redoable block; sput '}'
       ensure
         @next_token = next_token
         @vars = vars if es2015

data/lib/ruby2js/converter/hash.rb

@@ -7,6 +7,24 @@ module Ruby2JS
     #     (str "value")))
 
     handle :hash do |*pairs|
+      if not es2018 and pairs.any? {|pair| pair.type == :kwsplat}
+        groups = []
+        pending = []
+        while not pairs.empty?
+          pair = pairs.shift
+          if pair.type != :kwsplat
+            pending << pair
+          else
+            groups << s(:hash, *pending) unless pending.empty?
+            groups << pair.children.first
+            pending = []
+          end
+        end
+        groups << s(:hash, *pending) unless pending.empty?
+        parse s(:assign, s(:hash), *groups)
+        return
+      end
+
       compact do
         singleton = pairs.length <= 1
 
@@ -24,7 +42,7 @@ module Ruby2JS
                 pairs.unshift(*node.children.first.children)
                 index = 0
               else
-                puts '...'; parse node.children.first
+                put '...'; parse node.children.first
               end
 
               next
@@ -73,7 +91,7 @@ module Ruby2JS
               if right.type == :hash
                 right.children.each do |pair|
                   next unless Parser::AST::Node === pair.children.last
-                  if [:block, :def, :async].include? pair.children.last.type
+                  if %i[block def defm async].include? pair.children.last.type
                     if @comments[pair.children.last]
                       (puts ''; singleton = false) if singleton
                       comments(pair.children.last).each do |comment|
@@ -120,22 +138,26 @@ module Ruby2JS
 
               if \
                 anonfn and 
-                left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
+                left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\z/
               then
                 @prop = left.children.first
                 parse right, :method
               elsif \
-                es2015 and left.type == :sym and right.type == :lvar and
-                left.children == right.children
+                es2015 and left.type == :sym and (right.type == :lvar or 
+                (right.type == :send and right.children.first == nil)) and
+                left.children.last == right.children.last
               then
                 parse right 
+              elsif right.type == :defm and %i[sym str].include? left.type and es2015
+                @prop = left.children.first.to_s
+                parse right
               else
 		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/
+		  left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\z/
 		then
 		  put left.children.first
 		else

data/lib/ruby2js/converter/hide.rb

@@ -0,0 +1,13 @@
+module Ruby2JS
+  class Converter
+
+    # (hide, ...)
+
+    handle :hide do |*nodes|
+      capture {parse_all(*nodes)}
+
+      @lines.pop if @state == :statement and @lines.last == []
+      @lines.last.pop if @lines.last.last == @sep
+    end
+  end
+end

data/lib/ruby2js/converter/if.rb

@@ -64,10 +64,18 @@ module Ruby2JS
           if else_block.type == :begin
             else_block = s(:xnode, '', *else_block.children)
           end
+        else
+          if then_block.type == :begin
+            then_block = s(:kwbegin, then_block)
+          end
+
+          if else_block.type == :begin
+            else_block = s(:kwbegin, else_block)
+          end
         end
 
-        parse condition; put ' ? '; parse then_block
-        put ' : '; parse else_block
+        parse condition; put ' ? '; parse then_block, @state
+        put ' : '; parse else_block, @state
       end
     end
   end

data/lib/ruby2js/converter/import.rb

@@ -28,14 +28,29 @@ module Ruby2JS
         put path.inspect
       else
         # import (x) from "file.js"
-        default_import = !args.first.is_a?(Array) && [:const, :send, :attr].include?(args.first.type)
+        default_import = !args.first.is_a?(Array) && %i[const send attr str].include?(args.first.type)
+
+        if default_import and args.length > 1
+          parse args.shift
+          put ', '
+          default_import = false
+        end
+
         args = args.first if args.first.is_a?(Array)
 
+        if args.first.type == :array
+          args = args.first.children
+        end
+
         # handle the default name or { ConstA, Const B } portion
         put "{ " unless default_import
         args.each_with_index do |arg, index|
           put ', ' unless index == 0
-          parse arg
+          if arg.type == :str
+            put arg.children.first # useful for '*'
+          else
+            parse arg
+          end
         end
         put " }" unless default_import
 
@@ -43,7 +58,7 @@ module Ruby2JS
 
         # should there be an as clause? e.g., import React as *
         if path.is_a?(Array) && !path[0].is_a?(String) && path[0].type == :pair && path[0].children[0].children[0] == :as
-          put " as #{path[0].children[1].children[0]}"
+          put " as #{path[0].children[1].children.last}"
 
           # advance to the next kwarg, aka from
           from_kwarg_position = 1
@@ -82,7 +97,7 @@ module Ruby2JS
       elsif node.respond_to?(:type) && node.children[1] == :default
         put 'default '
         args[0] = node.children[2]
-      elsif node.respond_to?(:type) && node.type == :lvasgn
+      elsif node.respond_to?(:type) && [:lvasgn, :casgn].include?(node.type)
         if node.children[0] == :default
           put 'default '
           args[0] = node.children[1]

data/lib/ruby2js/converter/kwbegin.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     #     (resbody nil nil
     #       (send nil :b)) nil)
     handle :rescue do |*statements|
-      parse_all s(:kwbegin, s(:rescue, *statements))
+      parse s(:kwbegin, s(:rescue, *statements)), @state
     end
 
     # (kwbegin
@@ -19,7 +19,14 @@ module Ruby2JS
 
     handle :kwbegin do |*children|
       block = children.first
-      if block.type == :ensure
+
+      if @state == :expression
+        parse s(:send, s(:block, s(:send, nil, :proc), s(:args),
+          s(:begin, s(:autoreturn, *children))), :[])
+        return
+      end
+
+      if block&.type == :ensure
         block, finally = block.children
       else
         finally = nil

data/lib/ruby2js/converter/literal.rb

@@ -5,12 +5,24 @@ module Ruby2JS
     # (float 1.1)
     # (str "1"))
 
-    handle :int, :float, :str do |value|
+    handle :str do |value|
       put value.inspect
     end
 
+    handle :int, :float do |value|
+      put number_format(value)
+    end
+
     handle :octal do |value|
-      put '0' + value.to_s(8)
+      put '0' + number_format(value.to_s(8))
+    end
+
+    def number_format(number)
+      return number.to_s unless es2021
+      parts = number.to_s.split('.')
+      parts[0] = parts[0].gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1_")
+      parts[1] = parts[1].gsub(/(\d\d\d)(?=\d)/, "\\1_") if parts[1]
+      parts.join('.')
     end
   end
 end

data/lib/ruby2js/converter/logical.rb

@@ -57,7 +57,7 @@ module Ruby2JS
       else
         group   = LOGICAL.include?( expr.type ) && 
           operator_index( :not ) < operator_index( expr.type )
-        group = true if expr and expr.type == :begin
+        group = true if expr and %i[begin in?].include? expr.type
 
         put '!'; put '(' if group; parse expr; put ')' if group
       end

data/lib/ruby2js/converter/module.rb

@@ -4,14 +4,43 @@ module Ruby2JS
     # (module
     #   (const nil :A)
     #   (...)
+    #
+    #   Note: modules_hash is an anonymous modules as a value in a hash; the
+    #         name has already been output so should be ignored other than
+    #         in determining the namespace.
+
+    handle :module, :module_hash do |name, *body|
+      extend = @namespace.enter(name)
+
+      if body == [nil]
+        if @ast.type == :module and not extend
+          parse @ast.updated(:casgn, [*name.children, s(:hash)])
+        else
+          parse @ast.updated(:hash, [])
+        end
+
+        @namespace.leave
+        return
+      end
 
-    handle :module do |name, *body|
       while body.length == 1 and body.first.type == :begin
         body = body.first.children
       end
 
-      if body.length > 0 and body.all? {|child| child.type == :def}
-        parse @ast.updated(:class_module, [name, nil, *body])
+      if body.length > 0 and body.all? {|child| 
+        %i[def module].include? child.type or
+        (es2015 and child.type == :class and child.children[1] == nil)}
+
+        if extend
+          parse s(:assign, name, @ast.updated(:class_module, 
+            [nil, nil, *body])), :statement
+        elsif @ast.type == :module_hash
+          parse @ast.updated(:class_module, [nil, nil, *body])
+        else
+          parse @ast.updated(:class_module, [name, nil, *body])
+        end
+
+        @namespace.leave
         return
       end
 
@@ -42,6 +71,8 @@ module Ruby2JS
           symbols << node.children.first
         elsif node.type == :class and node.children.first.children.first == nil
           symbols << node.children.first.children.last
+        elsif node.type == :module
+          symbols << node.children.first.children.last
         end
       end
 
@@ -50,11 +81,17 @@ module Ruby2JS
 
       body = s(:send, s(:block, s(:send, nil, :proc), s(:args),
         s(:begin, *body)), :[])
-      if name.children.first == nil
+      if not name
+        parse body
+      elsif extend
+        parse s(:assign, name, body)
+      elsif name.children.first == nil
         parse s(:lvasgn, name.children.last, body)
       else
         parse s(:send, name.children.first, "#{name.children.last}=", body)
       end
+
+      @namespace.leave
     end
   end
 end

data/lib/ruby2js/converter/next.rb

@@ -5,8 +5,16 @@ module Ruby2JS
     #   (int 1))
 
     handle :next do |n=nil|
-      raise Error.new("next argument #{ n.inspect }", @ast) if n
-      put @next_token.to_s
+      if @next_token == :return
+        put 'return'
+        if n
+          put ' '
+          parse n
+        end
+      else
+        raise Error.new("next argument #{ n.inspect }", @ast) if n
+        put @next_token.to_s
+      end
     end
   end
 end

data/lib/ruby2js/converter/opasgn.rb

@@ -12,6 +12,14 @@ module Ruby2JS
       var = s(:lvar, var.children.first) if var.type == :lvasgn
       var = s(:cvar, var.children.first) if var.type == :cvasgn
 
+      if var.type == :lvar
+        name = var.children.first
+        receiver = @rbstack.map {|rb| rb[name]}.compact.last
+        if receiver
+          var = s(:attr, nil, name)
+        end
+      end
+
       if \
         [:+, :-].include?(op) and value.type==:int and 
         (value.children==[1] or value.children==[-1])

data/lib/ruby2js/converter/redo.rb

@@ -0,0 +1,14 @@
+module Ruby2JS
+  class Converter
+
+    # (redo)
+
+    handle :redo do
+      unless @redoable and @next_token == :continue
+        raise Error.new("redo outside of loop", @ast)
+      end
+
+      put "redo$ = true#{@sep}continue"
+    end
+  end
+end

data/lib/ruby2js/converter/return.rb

@@ -14,7 +14,8 @@ module Ruby2JS
 
     EXPRESSIONS = [ :array, :float, :hash, :int, :lvar, :nil, :send, :attr,
       :str, :sym, :dstr, :dsym, :cvar, :ivar, :zsuper, :super, :or, :and,
-      :block, :const, :true, :false, :xnode, :taglit, :self ]
+      :block, :const, :true, :false, :xnode, :taglit, :self,
+      :op_asgn, :and_asgn, :or_asgn ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/send.rb

@@ -9,11 +9,12 @@ module Ruby2JS
     # (sendw nil :puts
     #   (int 1))
 
-    # Note: attr, sendw, and await are only generated by filters.  Attr forces
+    # Note: attr, sendw, send!, and await are only generated by filters.  Attr forces
     # interpretation as an attribute vs a function call with zero parameters.
+    # send! forces interpretation as a method call even with zero parameters.
     # Sendw forces parameters to be placed on separate lines.
 
-    handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
+    handle :send, :sendw, :send!, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
       if \
@@ -40,12 +41,26 @@ module Ruby2JS
       # strip '!' and '?' decorations
       method = method.to_s[0..-2] if method =~ /\w[!?]$/
 
+      # anonymous class
+      if method == :new and receiver and receiver.children == [nil, :Class] and
+        args.last.type == :def and args.last.children.first == nil
+
+        parent = (args.length > 1) ? args.first : nil
+
+        if es2015
+          return parse s(:class2, nil, parent, *args.last.children[2..-1])
+        else
+          return parse s(:kwbegin, s(:class, s(:const, nil, :$$), parent,
+            *args.last.children[2..-1]), s(:const, nil, :$$))
+        end
+      end
+
       # three ways to define anonymous functions
       if method == :new and receiver and receiver.children == [nil, :Proc]
         return parse args.first, @state
 
       elsif not receiver and [:lambda, :proc].include? method
-        if method == :lambda
+        if method == :lambda and @state != :statement
           return parse s(args.first.type, *args.first.children[0..-2],
             s(:autoreturn, args.first.children[-1])), @state
         else
@@ -60,10 +75,17 @@ module Ruby2JS
           (es2015 || @state == :statement ? group(receiver) : parse(receiver))
           put '('; parse_all(*args, join: ', '); put ')'
           return
+        elsif not t2 and m2 == :async and args2.length == 0
+          put '('; parse receiver; put ')()'
+          return
         end
       end
 
       # async/await support
+      # map "await x do...end" to "await x {...}" due to precedence rules
+      if method == :await and es2017 and receiver == nil and args.length == 2 and args[1].type == :def
+        args = [s(:block, args.first, *args.last.children[1..-1])]
+      end
       if es2017 and receiver == nil and args.length == 1
         if method == :async
           if args.first.type == :def
@@ -74,6 +96,15 @@ module Ruby2JS
             # async def o.m(x) {...}
             return parse args.first.updated :asyncs
 
+          elsif args.first.type == :send  and 
+            args.first.children.first.type == :block and 
+            args.first.children.last == :[]
+
+            put '(async '
+            parse args.first.children.first, :statement
+            put ')()'
+            return
+
           elsif args.first.type == :block
             block = args.first
 
@@ -117,8 +148,13 @@ module Ruby2JS
 
       # resolve anonymous receivers against rbstack
       receiver ||= @rbstack.map {|rb| rb[method]}.compact.last
+      autobind = nil
 
       if receiver
+        if receiver.type == :autobind
+          autobind = receiver = receiver.children.first
+        end
+
         group_receiver = receiver.type == :send &&
           op_index < operator_index( receiver.children[1] ) if receiver
         group_receiver ||= GROUP_OPERATORS.include? receiver.type
@@ -137,6 +173,8 @@ module Ruby2JS
         group_target ||= GROUP_OPERATORS.include? target.type
       end
 
+      put 'await ' if @ast.type == :await
+
       if method == :!
         parse s(:not, receiver)
 
@@ -152,7 +190,7 @@ module Ruby2JS
         end
 
       elsif method == :[]=
-        parse receiver
+        (group_receiver ? group(receiver) : parse(receiver))
         if \
           args.length == 2 and [:str, :sym].include? args.first.type and
           args.first.children.first.to_s =~ /^[a-zA-Z]\w*$/
@@ -175,9 +213,15 @@ module Ruby2JS
           receiver.type == :send and
           receiver.children[1] == :+@ and
           Parser::AST::Node === receiver.children[0] and
-          receiver.children[0].type == :class
+          %i(class module).include? receiver.children[0].type
         then
-          parse receiver.children[0].updated(:class_extend)
+          if receiver.children[0].type == :class
+            parse receiver.children[0].updated(:class_extend)
+          else
+            mod = receiver.children[0]
+            parse s(:assign, mod.children[0],
+              mod.updated(nil, [nil, *mod.children[1..-1]]))
+          end
         else
           put method.to_s[0]; parse receiver
         end
@@ -277,10 +321,23 @@ module Ruby2JS
       elsif method == :typeof and receiver == nil
         put 'typeof '; parse args.first
 
+      elsif ast.children[1] == :is_a? and receiver and args.length == 1
+        parse receiver; put ' instanceof '; parse args.first
+
+      elsif ast.children[1] == :kind_of? and receiver and args.length == 1
+        parse receiver; put ' instanceof '; parse args.first
+
+      elsif ast.children[1] == :instance_of? and receiver and args.length == 1
+        parse s(:send, s(:attr, receiver, :constructor), :==, args.first)
+
       else
-        put 'await ' if @ast.type == :await
+        if method == :bind and receiver&.type == :send
+          if receiver.children.length == 2 and receiver.children.first == nil
+            receiver = receiver.updated(:attr) # prevent autobind
+          end
+        end
 
-        if not ast.is_method?
+        if not ast.is_method? and ast.type != :send!
           if receiver
             (group_receiver ? group(receiver) : parse(receiver))
             put ".#{ method }"
@@ -302,6 +359,14 @@ module Ruby2JS
             compact { puts "("; parse_all(*args, join: ",#@ws"); sput ')' }
           end
         end
+
+        if autobind and not ast.is_method? and ast.type != :attr
+          if @state == :statement
+            put '()'
+          else
+            put '.bind('; parse(autobind); put ')'
+          end
+        end
       end
     end