ruby2js 4.0.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064d9dc5d65f6e2456e91d951e2f4311b776221422a77d59a8cfd466ceb5056d
-  data.tar.gz: ffc274a55ceb9a1280f776c00da8c296dc10672150174135931547cd056a3520
+  metadata.gz: 6728e4201e77b477a9203551b57de3f23b36077f6012061233d4b072d92886b9
+  data.tar.gz: 7d5e6ef7aa5b9add1477b3cc642cc55714a657f7f962dbb6dd7af6688d45cfb0
 SHA512:
-  metadata.gz: 8fe9775803716fce25697adaf59a8afb57f4de499052a66847f18dfdd59c1f73b52d77be473adf762a57693a0896a6c90ed275a2b9152b5b6b548ca454e6d9ae
-  data.tar.gz: aa901eab47bba051a69a0ee132b69e7754aa5da49ff2e7e22560303a4c0fd02cdb727d4297c13098f3a6f82cf20788f4657c7ec21d145e66533875933d1a5154
+  metadata.gz: 321dc88308946ff626914ceb87fa93f93bec4f5cde0b660cab75d7df46b52f9ca63da830e7fab4f070b989586ef468b3cdf9d8f682f64b44ee06fef9df5230f7
+  data.tar.gz: 22f5161f0bc03c294fbfd3f32be407030fea293985e1eff4c7d0fc464bd57aaa6a3cfc70e1bf9ed13e9bbb0dbbac9f394b860e76df52ae236b494accd86c840b

data/README.md

@@ -3,7 +3,6 @@ Ruby2JS
 
 Minimal yet extensible Ruby to JavaScript conversion.  
 
-[![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js)
 [![Gem Version](https://badge.fury.io/rb/ruby2js.svg)](https://badge.fury.io/rb/ruby2js)
 [![Gitter](https://badges.gitter.im/ruby2js/community.svg)](https://gitter.im/ruby2js/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

data/lib/ruby2js.rb

@@ -92,6 +92,17 @@ module Ruby2JS
         include_only(options[:include_only]) if options[:include_only]
         include(options[:include]) if options[:include]
         exclude(options[:exclude]) if options[:exclude]
+
+        filters = options[:filters] || DEFAULTS
+        @modules_enabled =
+          (defined? Ruby2JS::Filter::ESM and
+          filters.include? Ruby2JS::Filter::ESM) or
+          (defined? Ruby2JS::Filter::CJS and
+          filters.include? Ruby2JS::Filter::CJS)
+      end
+
+      def modules_enabled?
+        @modules_enabled
       end
 
       def es2015
@@ -169,7 +180,7 @@ module Ruby2JS
       def on_xnode(node); end
       def on_export(node); end
       def on_import(node); end
-      def on_taglit(node); end
+      def on_taglit(node); on_pair(node); end
 
       # provide a method so filters can call 'super'
       def on_sym(node); node; end
@@ -182,10 +193,12 @@ module Ruby2JS
             return on_block s(:block, s(:send, *node.children[0..-2]),
               s(:args, s(:arg, :a), s(:arg, :b)), s(:return,
               process(s(:send, s(:lvar, :a), method, s(:lvar, :b)))))
-          else
+          elsif node.children.last.children.first.type == :sym
             return on_block s(:block, s(:send, *node.children[0..-2]),
               s(:args, s(:arg, :item)), s(:return,
               process(s(:attr, s(:lvar, :item), method))))
+          else
+            super
           end
         end
         super
@@ -277,7 +290,7 @@ module Ruby2JS
   
   def self.parse(source, file=nil, line=1)
     buffer = Parser::Source::Buffer.new(file, line)
-    buffer.source = source.encode('utf-8')
+    buffer.source = source.encode('UTF-8')
     parser = Parser::CurrentRuby.new
     parser.diagnostics.all_errors_are_fatal = true
     parser.diagnostics.consumer = lambda {|diagnostic| nil}

data/lib/ruby2js/converter.rb

@@ -60,12 +60,14 @@ module Ruby2JS
       @class_parent = nil
       @class_name = nil
       @jsx = false
+      @autobind = true
 
       @eslevel = :es5
       @strict = false
       @comparison = :equality
       @or = :logical
       @underscored_private = true
+      @redoable = false
     end
 
     def width=(width)
@@ -243,6 +245,34 @@ module Ruby2JS
       end
     end
 
+    def redoable(block)
+      save_redoable = @redoable
+
+      has_redo = proc do |node|
+        node.children.any? do |child|
+          next false unless child.is_a? Parser::AST::Node
+          next true if child.type == :redo
+          next false if %i[for while while_post until until_post].include? child.type
+          has_redo[child]
+        end
+      end
+
+      @redoable = has_redo[@ast]
+
+      if @redoable
+        put es2015 ? 'let ' : 'var '
+        put "redo$#@sep"
+        puts 'do {'
+        put "redo$ = false#@sep"
+        scope block
+        put "#@nl} while(redo$)"
+      else
+        scope block
+      end
+    ensure
+      @redoable = save_redoable
+    end
+
     def timestamp(file)
       super
 
@@ -335,6 +365,7 @@ require 'ruby2js/converter/nil'
 require 'ruby2js/converter/nthref'
 require 'ruby2js/converter/opasgn'
 require 'ruby2js/converter/prototype'
+require 'ruby2js/converter/redo'
 require 'ruby2js/converter/regexp'
 require 'ruby2js/converter/return'
 require 'ruby2js/converter/self'

data/lib/ruby2js/converter/args.rb

@@ -30,13 +30,18 @@ module Ruby2JS
           if kw.type == :kwarg
             put kw.children.first
           elsif kw.type == :kwoptarg
-            put kw.children.first; put ' = '; parse kw.children.last
+            put kw.children.first
+            unless kw.children.last == s(:send, nil, :undefined)
+              put '='; parse kw.children.last
+            end
           elsif kw.type == :kwrestarg
             raise 'Rest arg requires ES2018' unless es2018
             put '...'; put kw.children.first
           end
         end
         put ' }'
+
+        put ' = {}' unless kwargs.any? {|kw| kw.type == :kwarg}
       end
     end
 

data/lib/ruby2js/converter/class.rb

@@ -114,6 +114,7 @@ module Ruby2JS
           if m.children[1] == :attr_accessor
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {enumerable: s(:true), configurable: s(:true),
                   get: s(:block, s(:send, nil, :proc), s(:args), 
@@ -124,6 +125,7 @@ module Ruby2JS
           elsif m.children[1] == :attr_reader
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {get: s(:block, s(:send, nil, :proc), s(:args), 
                     s(:return, s(:ivar, :"@#{var}"))),
@@ -133,6 +135,7 @@ module Ruby2JS
           elsif m.children[1] == :attr_writer
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {set: s(:block, s(:send, nil, :proc), s(:args, s(:arg, var)), 
                     s(:ivasgn, :"@#{var}", s(:lvar, var))),

data/lib/ruby2js/converter/class2.rb

@@ -156,7 +156,7 @@ module Ruby2JS
             end
           end
 
-          if m.type == :def || m.type == :defm || m.type == :async
+          if %i[def defm deff async].include? m.type
             @prop = m.children.first
 
             if @prop == :initialize and !@rbstack.last[:initialize]
@@ -190,11 +190,11 @@ module Ruby2JS
             end
 
           elsif \
-            [:defs, :asyncs].include? m.type and m.children.first.type == :self
+            [:defs, :defp, :asyncs].include? m.type and m.children.first.type == :self
           then
 
             @prop = "static #{m.children[1]}"
-            if not m.is_method?
+            if m.type == :defp or not m.is_method?
               @prop = "static get #{m.children[1]}"
               m = m.updated(m.type, [*m.children[0..2], 
                 s(:autoreturn, m.children[3])])
@@ -206,7 +206,7 @@ module Ruby2JS
               @prop = "static #{m.children[1]}"
             end
 
-            @prop.sub! 'static', 'static async' if m.type == :asyncs
+            @prop = @prop.sub('static', 'static async') if m.type == :asyncs
 
             m = m.updated(:def, m.children[1..3])
             begin
@@ -224,6 +224,7 @@ module Ruby2JS
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}#@sep"
                 put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
@@ -231,12 +232,14 @@ module Ruby2JS
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}"
               end
             elsif m.children[1] == :attr_writer
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif [:private, :protected, :public].include? m.children[1]
@@ -276,7 +279,7 @@ module Ruby2JS
             if m.type == :casgn and m.children[0] == nil
               @rbstack.last[m.children[1]] = name
 
-              if es2020
+              if es2022
                 put 'static '; put m.children[1].to_s; put ' = '
                 parse m.children[2]
                 skipped = false

data/lib/ruby2js/converter/def.rb

@@ -135,14 +135,20 @@ module Ruby2JS
           style = :statement
         end
 
-        if args.children.length == 1 and args.children.first.type != :restarg 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 ') => '
         end
 
         if style == :expression
-          expr.type == :hash ? group(expr) : wrap('(', ')') { parse(expr) }
+          if expr.type == :taglit
+            parse expr
+          elsif expr.type == :hash
+            group(expr)
+          else
+            wrap('(', ')') { parse(expr) }
+          end
         elsif body.type == :begin and body.children.length == 0
           put "{}"
         else

data/lib/ruby2js/converter/dstr.rb

@@ -25,7 +25,9 @@ module Ruby2JS
         put '`'
         children.each do |child|
           if child.type == :str
-            str = child.children.first.inspect[1..-2].gsub('${', '$\{').gsub('`', '\\\`')
+            str = child.children.first.inspect[1..-2].
+              gsub('${', '$\{').gsub('`', '\\\`')
+            str = str.gsub(/\\"/, '"') unless str.include? '\\\\'
             if heredoc
               put! str.gsub("\\n", "\n")
             else

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

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/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/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, :taglit, :gvar ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/send.rb

@@ -60,7 +60,7 @@ module Ruby2JS
         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
@@ -75,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
@@ -89,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
 
@@ -137,6 +153,7 @@ module Ruby2JS
       if receiver
         if receiver.type == :autobind
           autobind = receiver = receiver.children.first
+          autobind = nil unless @autobind
         end
 
         group_receiver = receiver.type == :send &&
@@ -157,6 +174,8 @@ module Ruby2JS
         group_target ||= GROUP_OPERATORS.include? target.type
       end
 
+      put 'await ' if @ast.type == :await
+
       if method == :!
         parse s(:not, receiver)
 
@@ -172,7 +191,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*$/
@@ -303,9 +322,16 @@ module Ruby2JS
       elsif method == :typeof and receiver == nil
         put 'typeof '; parse args.first
 
-      else
-        put 'await ' if @ast.type == :await
+      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
         if method == :bind and receiver&.type == :send
           if receiver.children.length == 2 and receiver.children.first == nil
             receiver = receiver.updated(:attr) # prevent autobind