ruby2js 3.0.15 → 3.3.0

data/lib/ruby2js/converter/class2.rb

@@ -33,21 +33,99 @@ 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
+            ivars << ast.children.first if ast.type === :ivasgn
+            cvars << ast.children.first if ast.type === :cvar
+            cvars << ast.children.first if ast.type === :cvasgn
+
+            ast.children.each do |child|
+              walk[child] if child.is_a? Parser::AST::Node
+            end
+
+	    if ast.type == :send and ast.children.first == nil
+	      if ast.children[1] == :attr_accessor
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      elsif ast.children[1] == :attr_reader
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      elsif ast.children[1] == :attr_writer
+		ast.children[2..-1].each_with_index do |child_sym, index2|
+		  ivars << :"@#{child_sym.children.first}"
+		end
+	      end
+	    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 +145,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], s(:begin, *constructor)])
             elsif not m.is_method?
               @prop = "get #{@prop}"
               m = m.updated(m.type, [*m.children[0..1], 
@@ -83,12 +167,13 @@ module Ruby2JS
 
             begin
               @instance_method = m
-              parse m
+              @class_method = nil
+              parse m # unless skipped
             ensure
               @instance_method = nil
             end
 
-          elsif 
+          elsif \
             [:defs, :asyncs].include? m.type and m.children.first.type == :self
           then
 
@@ -108,27 +193,35 @@ module Ruby2JS
             @prop.sub! 'static', 'static async' if m.type == :asyncs
 
             m = m.updated(:def, m.children[1..3])
-            parse m
+            begin
+              @instance_method = nil
+              @class_method = m
+              parse m # unless skipped
+            ensure
+              @instance_method = nil
+            end
 
           elsif m.type == :send and m.children.first == nil
+            p = es2020 ? '#' : '_'
+
             if m.children[1] == :attr_accessor
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
-                put "get #{var}() {#{@nl}return this._#{var}#@nl}#@sep"
-                put "set #{var}(#{var}) {#{@nl}this._#{var} = #{var}#@nl}"
+                put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}#@sep"
+                put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif m.children[1] == :attr_reader
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
-                put "get #{var}() {#{@nl}return this._#{var}#@nl}"
+                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
-                put "set #{var}(#{var}) {#{@nl}this._#{var} = #{var}#@nl}"
+                put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif [:private, :protected, :public].include? m.children[1]
               raise Error.new("class #{m.children[1]} is not supported", @ast)
@@ -143,10 +236,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/def.rb

@@ -88,7 +88,7 @@ module Ruby2JS
       put 'async ' if @ast.type == :async
 
       # es2015 fat arrow support
-      if 
+      if \
         not name and es2015 and @state != :method and @ast.type != :defm and 
         not @prop
       then
@@ -105,7 +105,7 @@ module Ruby2JS
           else
             style = :expression
           end
-        elsif 
+        elsif \
           expr.type == :if and expr.children[1] and expr.children[2] and
           EXPRESSIONS.include? expr.children[1].type and
           EXPRESSIONS.include? expr.children[2].type

data/lib/ruby2js/converter/for.rb

@@ -10,11 +10,18 @@ module Ruby2JS
     #   (...)
 
     handle :for, :for_of do |var, expression, block|
+      if @jsx and @ast.type == :for_of
+        parse s(:block, s(:send, expression, :map),
+         s(:args, s(:arg, var.children[0])),
+         s(:autoreturn, block))
+        return
+      end
+
       begin
         vars = @vars.dup
         next_token, @next_token = @next_token, :continue
         put "for (#{es2015 ? 'let' : 'var'} "; parse var
-        if [:irange, :erange].include? expression.type
+        if expression and [:irange, :erange].include? expression.type
           put ' = '; parse expression.children.first; put '; '; parse var
           (expression.type == :erange ? put(' < ') : put(' <= '))
           parse expression.children.last; put '; '; parse var; put '++'

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
@@ -81,13 +97,13 @@ module Ruby2JS
                 end
               end
 
-              if 
+              if \
                 anonfn and 
                 left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
               then
                 @prop = left.children.first
                 parse right, :method
-              elsif
+              elsif \
                 es2015 and left.type == :sym and right.type == :lvar and
                 left.children == right.children
               then
@@ -97,7 +113,7 @@ module Ruby2JS
 		  put '['
 		  parse left
 		  put ']'
-		elsif 
+		elsif \
 		  left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
 		then
 		  put left.children.first

data/lib/ruby2js/converter/if.rb

@@ -55,8 +55,19 @@ module Ruby2JS
         end
       else
         else_block ||= s(:nil)
-        put '('; parse condition; put ' ? '; parse then_block
-        put ' : '; parse else_block; put ')'
+
+        if @jsx
+          if then_block.type == :begin
+            then_block = s(:xnode, '', *then_block.children)
+          end
+
+          if else_block.type == :begin
+            else_block = s(:xnode, '', *else_block.children)
+          end
+        end
+
+        parse condition; put ' ? '; parse then_block
+        put ' : '; parse else_block
       end
     end
   end

data/lib/ruby2js/converter/import.rb

@@ -0,0 +1,38 @@
+module Ruby2JS
+  class Converter
+
+    # (import str const) 
+
+    # NOTE: import is a synthetic 
+
+    handle :import do |path, *args|
+      put 'import '
+
+      args.each_with_index do |arg, index|
+        put ', ' unless index == 0
+        parse arg
+      end
+
+      put ' from '
+      put path.inspect
+    end
+
+    # (export const) 
+
+    # NOTE: export is a synthetic 
+
+    handle :export do |*args|
+      put 'export '
+
+      if args.first == :default
+        put 'default '
+        args.shift
+      end
+
+      args.each_with_index do |arg, index|
+        put ', ' unless index == 0
+        parse arg
+      end
+    end
+  end
+end

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

@@ -14,6 +14,17 @@ module Ruby2JS
 
     handle :and, :or do |left, right|
       type = @ast.type
+
+
+      if es2020 and type == :and
+        node = rewrite(left, right)
+        if node.type == :csend
+          return parse right.updated(node.type, node.children)
+        else
+          left, right = node.children
+        end
+      end
+
       op_index = operator_index type
 
       lgroup   = LOGICAL.include?( left.type ) && 
@@ -25,7 +36,7 @@ module Ruby2JS
       rgroup = true if right.type == :begin
 
       put '(' if lgroup; parse left; put ')' if lgroup
-      put (type==:and ? ' && ' : ' || ')
+      put (type==:and ? ' && ' : ((@or == :nullish and es2020) ? ' ?? ' : ' || '))
       put '(' if rgroup; parse right; put ')' if rgroup
     end
 
@@ -51,5 +62,39 @@ module Ruby2JS
         put '!'; put '(' if group; parse expr; put ')' if group
       end
     end
+
+    # rewrite a && a.b to a&.b
+    def rewrite(left, right)
+      if left && left.type == :and
+        left = rewrite(*left.children)
+      end
+
+      if right.type != :send
+        s(:and, left, right)
+      elsif conditionally_equals(left, right.children.first)
+        # a && a.b => a&.b
+        right.updated(:csend, [left, right.children.last])
+      elsif conditionally_equals(left.children.last, right.children.first)
+        # a && b && b.c => a && b&.c
+        left.updated(:and, [left.children.first,
+          left.children.last.updated(:csend, 
+          [left.children.last, right.children.last])])
+      else
+        s(:and, left, right)
+      end
+    end
+
+    # determine if two trees are identical, modulo conditionalilties
+    # in other words a.b == a&.b
+    def conditionally_equals(left, right)
+      if left == right
+        true
+      elsif !left or !right or left.type != :csend or right.type != :send
+        false
+      else
+        conditionally_equals(left.children.first, right.children.first) &&
+          conditionally_equals(left.children.last, right.children.last)
+      end
+    end
   end
 end