ruby2js 3.2.0 → 3.3.0

data/lib/ruby2js/converter/hash.rb

@@ -97,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
@@ -113,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/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

data/lib/ruby2js/converter/opasgn.rb

@@ -12,7 +12,7 @@ module Ruby2JS
       var = s(:lvar, var.children.first) if var.type == :lvasgn
       var = s(:cvar, var.children.first) if var.type == :cvasgn
 
-      if 
+      if \
         [:+, :-].include?(op) and value.type==:int and 
         (value.children==[1] or value.children==[-1])
       then
@@ -46,7 +46,10 @@ module Ruby2JS
       vtype = :ivar if asgn.type == :ivasgn
       vtype = :cvar if asgn.type == :cvasgn
       
-      if vtype
+      if es2021
+        op = type == :and ? '&&' : (@or == :nullish ? '??' : '||')
+        parse s(:op_asgn, asgn, op, value);
+      elsif vtype
         parse s(asgn.type, asgn.children.first, s(type, 
           s(vtype, asgn.children.first), value))
       elsif asgn.type == :send and asgn.children[1] == :[]

data/lib/ruby2js/converter/regexp.rb

@@ -27,10 +27,35 @@ module Ruby2JS
         end
       end
 
+      # in Ruby regular expressions, ^ and $ apply to each line
       if parts.first.type == :str and parts.first.children[0].start_with?('^')
-        opts = opts + [:m] unless opts.include? :m or opts.include? 'm'
+        if opts.include? :m or opts.include? 'm'
+          if parts.first.children[0].gsub(/\\./, '').gsub(/\[.*?\]/, '').include? '.'
+            opts = opts + [:s] unless opts.include? :s or opts.include? 's'
+          end
+        else
+          opts = opts + [:m]
+        end
       elsif parts.last.type == :str and parts.last.children[0].end_with?('$')
-        opts = opts + [:m] unless opts.include? :m or opts.include? 'm'
+        if opts.include? :m or opts.include? 'm'
+          if parts.last.children[0].gsub(/\\./, '').gsub(/\[.*?\]/, '').include? '.'
+            opts = opts + [:s] unless opts.include? :s or opts.include? 's'
+          end
+        else
+          opts = opts + [:m]
+        end
+      end
+
+      # in Ruby regular expressions, /A is the start of the string
+      if parts.first.type == :str and parts.first.children[0].start_with?('\A')
+        parts = [s(:str, parts.first.children[0].sub('\A', '^'))] +
+          parts[1..-1]
+      end
+
+      # in Ruby regular expressions, /z is the end of the string
+      if parts.last.type == :str and parts.last.children[0].end_with?('\z')
+        parts = parts[0..-2] +
+          [s(:str, parts.first.children[0].sub('\z', '$'))]
       end
 
       # use slash syntax if there are few embedded slashes in the regexp

data/lib/ruby2js/converter/return.rb

@@ -14,7 +14,7 @@ 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 ]
+      :block, :const, :true, :false, :xnode ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/send.rb

@@ -16,7 +16,7 @@ module Ruby2JS
     handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
-      if
+      if \
         args.length == 1 and method == :+
       then
         node = collapse_strings(ast)
@@ -25,7 +25,7 @@ module Ruby2JS
 
       # :irange support
       # - currently only .to_a
-      if
+      if \
         receiver and
         receiver.type == :begin and
         [:irange, :erange].include? receiver.children.first.type
@@ -43,6 +43,7 @@ module Ruby2JS
       # 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
           return parse s(args.first.type, *args.first.children[0..-2],
@@ -86,7 +87,7 @@ module Ruby2JS
               # async proc {|x| ... }
               return parse block.updated(:async, [nil, *block.children[1..-1]])
 
-            elsif
+            elsif \
               block.children[0].children[1] == :new and
               block.children[0].children[0] == s(:const, nil, :Proc)
             then
@@ -141,7 +142,7 @@ module Ruby2JS
 
       elsif method == :[]
         (group_receiver ? group(receiver) : parse(receiver))
-        if
+        if \
           args.length == 1 and [:str, :sym].include? args.first.type and
           args.first.children.first.to_s =~ /^[a-zA-Z]\w*$/
         then
@@ -152,7 +153,7 @@ module Ruby2JS
 
       elsif method == :[]=
         parse receiver
-        if
+        if \
           args.length == 2 and [:str, :sym].include? args.first.type and
           args.first.children.first.to_s =~ /^[a-zA-Z]\w*$/
         then
@@ -170,7 +171,7 @@ module Ruby2JS
         put ')'
 
       elsif [:-@, :+@, :~, '~'].include? method
-        if
+        if \
           receiver.type == :send and
           receiver.children[1] == :+@ and
           Parser::AST::Node === receiver.children[0] and
@@ -196,7 +197,13 @@ module Ruby2JS
 
       elsif OPERATORS.flatten.include?(method) and not LOGICAL.include?(method)
         (group_receiver ? group(receiver) : parse(receiver))
-        put " #{ method } "
+
+        if @comparison == :identity and [:==, :!=].include? method
+          put " #{ method }= "
+        else
+          put " #{ method } "
+        end
+
         (group_target ? group(target) : parse(target))
 
       elsif method =~ /=$/
@@ -249,7 +256,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
@@ -299,27 +306,46 @@ module Ruby2JS
     end
 
     handle :csend do |receiver, method, *args|
-      node = @ast
+      if es2020
 
-      # collect up chain of conditional sends
-      stack = []
-      while node.children.first.type == :csend
-        stack << node
-        node = node.children.first
-      end
+        # optional chaining
+        parse receiver
+        put "?."
+        if method == :[]
+          put '['
+          args.each {|arg| parse arg}
+          put ']'
+        else
+          put method.to_s
+          put '(' if @ast.is_method?
+          args.each {|arg| parse arg}
+          put ')' if @ast.is_method?
+        end
 
-      # conditionally evaluate most nested expression
-      expr = node.updated(:send)
-      result = s(:and, node.children.first, expr)
+      else
 
-      # 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)
-      end
+        node = @ast
+
+        # collect up chain of conditional sends
+        stack = []
+        while node.children.first.type == :csend
+          stack << node
+          node = node.children.first
+        end
 
-      parse result
+        # conditionally evaluate most nested expression
+        expr = node.updated(:send)
+        result = s(:and, node.children.first, expr)
+
+        # 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)
+        end
+
+        parse result
+      end
     end
 
     handle :splat do |expr|
@@ -334,7 +360,7 @@ module Ruby2JS
       right = node.children[2]
 
       # recursively evaluate left hand side
-      if
+      if \
         left.type == :send and left.children.length == 3 and
         left.children[1] == :+
       then
@@ -342,7 +368,7 @@ module Ruby2JS
       end
 
       # recursively evaluate right hand side
-      if
+      if \
         right.type == :send and right.children.length == 3 and
         right.children[1] == :+
       then

data/lib/ruby2js/converter/super.rb

@@ -6,27 +6,33 @@ module Ruby2JS
     # (super ...)
 
     handle :super, :zsuper do |*args|
-      unless @instance_method and @class_parent
+      method = @instance_method || @class_method
+
+      unless method and @class_parent
         raise Error.new("super outside of a method", @ast)
       end
 
       # what to pass
       if @ast.type == :zsuper
-        if @instance_method.type == :method
-          args = @instance_method.children[2].children[1].children
-        elsif @instance_method.type == :prop
+        if method.type == :method
+          args = method.children[2].children[1].children
+        elsif method.type == :prop
           args = nil
         else
-          args = @instance_method.children[1].children
+          args = method.children[1].children
         end
       end
 
       if es2015
-        if @instance_method.children[0] == :constructor
+        if @class_method
+          parse @class_parent
+          put '.'
+          put method.children[0]
+        elsif method.children[0] == :constructor
           put 'super'
         else
           put 'super.'
-          put @instance_method.children[0]
+          put method.children[0]
         end
 
         put '('
@@ -36,8 +42,8 @@ module Ruby2JS
         parse @class_parent
 
         # what to call
-        if @instance_method.type != :constructor
-          puts  ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
+        if method.type != :constructor
+          puts  ".prototype.#{ method.children[1].to_s.chomp('=') }"
         end
 
         if args

data/lib/ruby2js/converter/xnode.rb

@@ -0,0 +1,89 @@
+module Ruby2JS
+  class Converter
+
+    # (xnode str hash) 
+
+    # NOTE: xnode is a synthetic 
+
+    handle :xnode do |nodename, *args|
+      attrs = {}
+      children = []
+
+      args.each do |arg|
+        if arg.type == :hash
+          arg.children.each do |pair|
+            name = pair.children[0].children[0]
+
+            if defined? Ruby2JS::Filter::React
+              name = :className if name == :class
+              name = :htmlFor if name == :for
+            end
+
+            if [:class, :className].include? name and attrs[name]
+              if attrs[name].type == :str and pair.children[1].type == :str
+                attrs[name] = s(:str, pair.children[1].children[0] + ' ' +
+                  attrs[name].children[0])
+              else
+                attrs[name] = s(:send, s(:send, attrs[name], :+, 
+                  s(:str, ' ')), :+, pair.children[1])
+              end
+            else
+              attrs[name] = pair.children[1]
+            end
+          end
+        elsif arg.type == :begin
+          children += arg.children
+        else
+          children << arg
+        end
+      end
+
+      put '<'
+      put nodename
+
+      attrs.each do |name, value|
+        put ' '
+        put name
+        put '='
+        if value.type == :str
+          parse value
+        else
+          put '{'
+          parse value
+          put '}'
+        end
+      end
+
+      if children.empty?
+        put '/>'
+      else
+        put '>'
+        put @nl unless children.length == 1 and children.first.type != :xnode
+
+        children.each_with_index do |child, index|
+          put @nl unless index == 0
+          if child.type == :str
+            put child.children.first
+          elsif child.type == :xnode
+            parse child
+          else
+            begin
+              jsx, @jsx = @jsx, true
+              put '{'
+              parse child
+              put '}'
+            ensure
+              @jsx = jsx
+            end
+          end
+        end
+
+        put @nl unless children.length == 1 and children.first.type != :xnode
+
+        put '</'
+        put nodename
+        put ">"
+      end
+    end
+  end
+end