ruby2js 3.1.0 → 3.3.1

data/lib/ruby2js/filter/matchAll.rb

@@ -0,0 +1,49 @@
+require 'ruby2js'
+
+module Ruby2JS
+  module Filter
+    module MatchAll
+      include SEXP
+
+      # ensure matchAll is before Functions in the filter list
+      def self.reorder(filters)
+        if \
+          defined? Ruby2JS::Filter::Functions and
+          filters.include? Ruby2JS::Filter::Functions
+        then
+          filters = filters.dup
+          matchAll = filters.delete(Ruby2JS::Filter::MatchAll)
+          filters.insert filters.index(Ruby2JS::Filter::Functions), matchAll
+        else
+          filters
+        end
+      end
+
+      def on_block(node)
+        return super if es2020
+
+        # only process each/forEach blocks
+        call = node.children.first
+        return super unless
+          [:each, :forEach].include? call.children[1] and
+          call.children.first.type == :send and
+          node.children[1].children.length == 1
+
+        # only process matchAll requests with simple expressions
+        call = call.children.first
+        return super unless
+          call.children[1] == :matchAll and
+          call.children[2].type == :send and
+          call.children[2].children.first == nil and
+          call.children[2].children.length == 2
+
+        process s(:while,
+          s(:lvasgn, node.children[1].children[0].children[0],
+            s(:send, call.children[2], :exec, call.children.first)),
+          node.children[2])
+      end
+    end
+
+    DEFAULTS.push MatchAll
+  end
+end

data/lib/ruby2js/filter/node.rb

@@ -56,7 +56,7 @@ module Ruby2JS
               s(:hash, s(:pair, s(:sym, :stdio), s(:str, 'inherit'))))
             end
 
-          elsif 
+          elsif \
             method == :require and args.length == 1 and 
             args.first.type == :str and 
             %w(fileutils tmpdir).include? args.first.children.first
@@ -67,7 +67,7 @@ module Ruby2JS
             super
           end
 
-        elsif 
+        elsif \
           [:File, :IO].include? target.children.last and
           target.type == :const and target.children.first == nil
         then
@@ -99,7 +99,7 @@ module Ruby2JS
             @node_setup << :fs
             S(:send, s(:attr, nil, :fs), :renameSync, *process_all(args))
 
-          elsif 
+          elsif \
             [:chmod, :lchmod].include? method and 
             args.length > 1 and args.first.type == :int
           then
@@ -110,7 +110,7 @@ module Ruby2JS
                 s(:octal, *args.first.children))
             })
 
-          elsif 
+          elsif \
             [:chown, :lchown].include? method and args.length > 2 and 
             args[0].type == :int and args[1].type == :int
           then
@@ -148,7 +148,7 @@ module Ruby2JS
             super
           end
 
-        elsif 
+        elsif \
           target.children.last == :FileUtils and
           target.type == :const and target.children.first == nil
         then
@@ -201,7 +201,7 @@ module Ruby2JS
               s(:send, s(:attr, nil, :fs), :unlinkSync, process(file))
             })
 
-          elsif 
+          elsif \
             method == :chmod and args.length == 2 and args.first.type == :int
           then
             @node_setup << :fs
@@ -211,7 +211,7 @@ module Ruby2JS
                 s(:octal, *args.first.children))
             })
 
-          elsif 
+          elsif \
             method == :chown and args.length == 3 and 
             args[0].type == :int and args[1].type == :int
           then
@@ -233,7 +233,7 @@ module Ruby2JS
             super
           end
 
-        elsif 
+        elsif \
           target.type == :const and target.children.first == nil and
           target.children.last == :Dir
         then
@@ -274,7 +274,7 @@ module Ruby2JS
         call = node.children.first
         target, method, *args = call.children
 
-        if 
+        if \
           method == :chdir and args.length == 1 and
           target.children.last == :Dir and
           target.type == :const and target.children.first == nil
@@ -324,7 +324,15 @@ module Ruby2JS
         children = node.children.dup
         command = children.shift
         while children.length > 0
-          command = s(:send, accumulator, :+, children.shift)
+          child = children.shift
+          if \
+            child.type == :begin and child.children.length == 1 and
+            child.children.first.type == :send and
+            child.children.first.children.first == nil
+          then
+            child = child.children.first
+          end
+          command = s(:send, command, :+, child)
         end
 
         s(:send, s(:attr, nil, :child_process), :execSync, command,

data/lib/ruby2js/filter/nokogiri.rb

@@ -36,7 +36,7 @@ module Ruby2JS
         return super if excluded?(method)
 
         if target == nil
-          if 
+          if \
             method == :require and args.length == 1 and 
             args.first.type == :str and 
             %w(nokogiri nokogumbo).include? args.first.children.first
@@ -47,7 +47,7 @@ module Ruby2JS
             super
           end
 
-        elsif 
+        elsif \
           [:HTML, :HTML5].include? method and
           target == s(:const, nil, :Nokogiri)
         then
@@ -55,7 +55,7 @@ module Ruby2JS
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 
-        elsif 
+        elsif \
           method == :parse and
           target.type == :const and
           target.children.first == s(:const, nil, :Nokogiri) and
@@ -65,13 +65,13 @@ module Ruby2JS
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 
-        elsif 
+        elsif \
           method == :at and 
           args.length == 1 and args.first.type == :str
         then
           S(:send, target, :querySelector, process(args.first))
 
-        elsif 
+        elsif \
           method == :search and 
           args.length == 1 and args.first.type == :str
         then
@@ -98,25 +98,25 @@ module Ruby2JS
         elsif method === :to_html and args.length == 0
           S(:attr, target, :outerHTML)
 
-        elsif 
+        elsif \
           [:attr, :get_attribute].include? method and 
           args.length == 1 and args.first.type == :str
         then
           S(:send, target, :getAttribute, process(args.first))
 
-        elsif 
+        elsif \
           [:key?, :has_attribute].include? method and 
           args.length == 1 and args.first.type == :str
         then
           S(:send, target, :hasAttribute, process(args.first))
 
-        elsif 
+        elsif \
           method == :set_attribute and 
           args.length == 2 and args.first.type == :str
         then
           S(:send, target, :setAttribute, *process_all(args))
 
-        elsif 
+        elsif \
           method == :attribute and 
           args.length == 1 and args.first.type == :str
         then
@@ -128,7 +128,7 @@ module Ruby2JS
         elsif method == :attribute_nodes and args.length == 0
           S(:attr, target, :attributes)
 
-        elsif 
+        elsif \
           method == :new and args.length == 2 and
           target == s(:const, s(:const, s(:const, nil, :Nokogiri), :XML), :Node)
         then
@@ -172,14 +172,14 @@ module Ruby2JS
         elsif method == :add_child and args.length == 1
           S(:send, target, :appendChild, process(args.first))
 
-        elsif 
+        elsif \
           [:add_next_sibling, :next=, :after].include? method and
           args.length == 1
         then
           S(:send, s(:attr, target, :parentNode), :insertBefore,
             process(args.first), s(:attr, target, :nextSibling))
 
-        elsif 
+        elsif \
           [:add_previous_sibling, :previous=, :before].include? method and
           args.length == 1
         then
@@ -199,7 +199,7 @@ module Ruby2JS
         elsif method == :previous_element and args.length == 0
           S(:attr, target, :previousElement)
 
-        elsif 
+        elsif \
           [:previous, :previous_sibling].include? method and args.length == 0
         then
           S(:attr, target, :previousSibling)

data/lib/ruby2js/filter/react.rb

@@ -68,12 +68,31 @@ module Ruby2JS
         @reactApply = nil
         @reactBlock = nil
         @reactClass = nil
+        @react_props = []
+        @react_methods = []
+        @react_filter_functions = false
+        @jsx = false
         super
       end
 
       def options=(options)
         super
         @react = true if options[:react]
+        filters = options[:filters] || Filter::DEFAULTS
+
+        if \
+          defined? Ruby2JS::Filter::Functions and
+          filters.include? Ruby2JS::Filter::Functions
+        then
+          @react_filter_functions = true
+        end
+
+        if \
+          defined? Ruby2JS::Filter::Wunderbar and
+          filters.include? Ruby2JS::Filter::Wunderbar
+        then
+          @jsx = true
+        end
       end
 
       # Example conversion
@@ -85,7 +104,9 @@ module Ruby2JS
       def on_class(node)
         cname, inheritance, *body = node.children
         return super unless cname.children.first == nil
-        return super unless inheritance == s(:const, nil, :React)
+        return super unless inheritance == s(:const, nil, :React) or
+          inheritance == s(:const, nil, :Vue) or
+          inheritance == s(:send, s(:const, nil, :React), :Component)
 
         # traverse down to actual list of class statements
         if body.length == 1
@@ -106,18 +127,25 @@ module Ruby2JS
           react, @react = @react, true
           reactClass, @reactClass = @reactClass, true
 
-          # automatically capture the displayName for the class
-          pairs = [s(:pair, s(:sym, :displayName),
-            s(:str, cname.children.last.to_s))]
+          pairs = []
+
+          unless es2015
+            # automatically capture the displayName for the class
+            pairs << s(:pair, s(:sym, :displayName),
+              s(:str, cname.children.last.to_s))
+          end
 
           # collect static properties/functions
           statics = []
           body.select {|child| child.type == :defs}.each do |child|
             _parent, mname, args, *block = child.children
-            if child.is_method?
+            if es2015
+              block = [s(:autoreturn, *block)] unless child.is_method?
+              pairs << s(:defs, s(:self), mname, args, *block)
+            elsif child.is_method?
               statics << s(:pair, s(:sym, mname), process(child.updated(:block,
                 [s(:send, nil, :proc), args, s(:autoreturn, *block)])))
-            elsif
+            elsif \
               block.length == 1 and
               Converter::EXPRESSIONS.include? block.first.type
             then
@@ -128,6 +156,25 @@ module Ruby2JS
             end
           end
 
+	  # collect instance methods (including getters and setters)
+          @react_props = []
+          @react_methods = []
+	  body.each do |statement|
+	    if statement.type == :def
+	      method = statement.children.first
+	      unless method == :initialize
+		if method.to_s.end_with? '='
+		  method = method.to_s[0..-2].to_sym
+		  @react_props << method unless @react_props.include? method
+		elsif statement.is_method?
+		  @react_methods << method unless @react_methods.include? method
+		else
+		  @react_props << method unless @react_props.include? method
+		end
+	      end
+	    end
+	  end
+
           # append statics (if any)
           unless statics.empty?
             pairs << s(:pair, s(:sym, :statics), s(:hash, *statics))
@@ -135,7 +182,8 @@ module Ruby2JS
 
           # create a default getInitialState method if there is no such method
           # and there are references to instance variables.
-          if
+          if \
+            not es2015 and
             not body.any? do |child|
               child.type == :def and
               [:getInitialState, :initialize].include? child.children.first
@@ -162,7 +210,7 @@ module Ruby2JS
               (@reactIvars[:pre] + @reactIvars[:post]).uniq
 
             if mname == :initialize
-              mname = :getInitialState
+              mname = es2015 ? :initialize : :getInitialState
 
               # extract real list of statements
               if block.length == 1
@@ -193,7 +241,9 @@ module Ruby2JS
                 anode.children.first.to_s[1..-1]), anode.children.last)})
 
               # modify block to build and/or return state
-              if block.empty?
+              if mname == :initialize
+                block.unshift(s(:send, s(:self), :state=, state))
+              elsif block.empty?
                 block = [s(:return, state)]
               else
                 block.unshift(s(:send, s(:self), :state=, state))
@@ -201,13 +251,30 @@ module Ruby2JS
               end
 
             elsif mname == :render
-              if
-                block.length != 1 or not block.last or
+              if \
+                 block.length != 1 or not block.last or
                 not [:send, :block].include? block.last.type
               then
-                # wrap multi-line blocks with a 'span' element
-                block = [s(:return,
-                  s(:block, s(:send, nil, :_span), s(:args), *block))]
+                if @jsx
+                  while block.length == 1 and block.first.type == :begin
+                    block = block.first.children.dup
+                  end
+
+                  # gather non-element emitting statements in the front
+                  prolog = []
+                  while not block.empty? and 
+                    react_wunderbar_free([block.first]) do
+                    prolog << process(block.shift)
+                  end
+
+                  # wrap multi-line blocks with an empty element
+                  block = [*prolog, s(:return,
+                    s(:xnode, '', *process_all(block)))]
+                else
+                  # wrap multi-line blocks with a 'span' element
+                  block = [s(:return,
+                    s(:block, s(:send, nil, :_span), s(:args), *block))]
+                end
               end
 
             elsif mname == :componentWillReceiveProps
@@ -227,12 +294,17 @@ module Ruby2JS
 
             # add method to class
             type = (child.is_method? ? :begin : :autoreturn)
+            type = :begin if mname == :initialize
             if block.length == 1 and Parser::AST::Node === block.first
               type = :begin if block.first.type == :return
             end
 
-            pairs << s(:pair, s(:sym, mname), child.updated(:block,
-              [s(:send, nil, :proc), args, process(s(type, *block))]))
+            if es2015
+              pairs << s(:def, mname, args,  process(s(type, *block)))
+            else
+              pairs << s(:pair, s(:sym, mname), child.updated(:block,
+                [s(:send, nil, :proc), args, process(s(type, *block))]))
+            end
 
             # retain comment
             unless @comments[child].empty?
@@ -245,18 +317,61 @@ module Ruby2JS
           @reactMethod = nil
         end
 
-        # emit a createClass statement
-        node.updated(:casgn, [nil, cname.children.last,
-          s(:send, inheritance, :createClass, s(:hash, *pairs))])
+        if es2015
+          # emit a class that extends React.Component
+          node.updated(:class, [s(:const, nil, cname.children.last),
+            s(:attr, s(:const, nil, :React), :Component), *pairs]) 
+        else
+          # emit a createClass statement
+          node.updated(:casgn, [nil, cname.children.last,
+            s(:send, s(:const, nil, :React), :createClass, s(:hash, *pairs))])
+        end
       end
 
       def on_send(node)
+        # convert Vue.utile.defineReactive to class fields or assignments
+        if node.children.first == s(:send, s(:const, nil, :Vue), :util)
+          if node.children[1] == :defineReactive
+            if node.children[2].type == :cvar
+              return process s(:cvasgn, node.children[2].children.first,
+                node.children[3])
+            elsif node.children[2].type == :send
+              assign = node.children[2]
+              return assign.updated(nil, [assign.children[0],
+                assign.children[1].to_s + '=', node.children[3]])
+            end
+          end
+        end
+
+        # calls to methods (including getters) defined in this class
+        if node.children[0]==nil and Symbol === node.children[1]
+          if node.is_method?
+            if @react_methods.include? node.children[1]
+              # calls to methods defined in this class
+              return node.updated nil, [s(:self), node.children[1],
+                *process_all(node.children[2..-1])]
+            end
+          else
+            if @react_props.include? node.children[1]
+              # access to properties defined in this class
+              return node.updated nil, [s(:self), node.children[1],
+                *process_all(node.children[2..-1])]
+            end
+          end
+        end
+
+        if node.children.first == s(:const, nil, :Vue)
+          node = node.updated(nil, [s(:const, nil, :React),
+            *node.children[1..-1]])
+        end
+
         if not @react
           # enable React filtering within React class method calls or
           # React component calls
-          if
+          if \
             node.children.first == s(:const, nil, :React)
           then
+
             begin
               react, @react = @react, true
               return on_send(node)
@@ -278,7 +393,7 @@ module Ruby2JS
             process(node.children[2])
           end
 
-        elsif
+        elsif \
           @reactApply and node.children[1] == :createElement and
           node.children[0] == s(:const, nil, :React)
         then
@@ -286,7 +401,7 @@ module Ruby2JS
           s(:send, s(:gvar, :$_), :push, s(:send, *node.children[0..1],
             *process_all(node.children[2..-1])))
 
-        elsif node.children[0] == nil and node.children[1] =~ /^_\w/
+        elsif !@jsx and node.children[0] == nil and node.children[1] =~ /^_\w/
           # map method calls starting with an underscore to React calls
           # to create an element.
           #
@@ -344,7 +459,7 @@ module Ruby2JS
                   expr = expr.children.first
                 end
 
-                if
+                if \
                   expr.type == :if and expr.children[1] and
                   expr.children[1].type == :str
                 then
@@ -468,6 +583,8 @@ module Ruby2JS
               # explicit call to React.createElement
               next true if arg.children[1] == :createElement and
                 arg.children[0] == s(:const, nil, :React)
+              next true if arg.children[1] == :createElement and
+                arg.children[0] == s(:const, nil, :Vue)
 
               # wunderbar style call
               arg = arg.children.first if arg.type == :block
@@ -669,7 +786,7 @@ module Ruby2JS
             super
           end
 
-        elsif
+        elsif \
           node.children[0] and node.children[0].type == :self and
           node.children.length == 2 and
           node.children[1] == :componentWillReceiveProps
@@ -686,7 +803,7 @@ module Ruby2JS
         if not @react
           # enable React filtering within React class method calls or
           # React component calls
-          if
+          if \
             node.children.first == s(:const, nil, :React)
           then
             begin
@@ -713,7 +830,7 @@ module Ruby2JS
         #
         # Base Ruby2JS processing will convert the 'splat' to 'apply'
         child = node.children.first
-        if 
+        if \
           child.children[1] == :createElement and
           child.children[0] == s(:const, nil, :React)
         then
@@ -743,7 +860,7 @@ module Ruby2JS
         end
 
         # wunderbar style calls
-        if child.children[0] == nil and child.children[1] =~ /^_\w/
+        if !@jsx and child.children[0] == nil and child.children[1] =~ /^_\w/
           if node.children[1].children.empty?
             # append block as a standalone proc
             block = s(:block, s(:send, nil, :proc), s(:args),
@@ -875,6 +992,49 @@ module Ruby2JS
         s(:attr, @reactProps, node.children.first.to_s[2..-1])
       end
 
+      # is this a "wunderbar" style call or createElement?
+      def react_element?(node)
+        return false unless node
+
+        forEach = [:forEach]
+        forEach << :each if @react_filter_functions
+
+        return true if node.type == :block and
+          forEach.include? node.children.first.children.last and 
+          react_element?(node.children.last)
+
+        # explicit call to React.createElement
+        return true if node.children[1] == :createElement and
+          node.children[0] == s(:const, nil, :React)
+
+        # explicit call to Vue.createElement
+        return true if node.children[1] == :createElement and
+          node.children[0] == s(:const, nil, :Vue)
+
+        # wunderbar style call
+        node = node.children.first if node.type == :block
+        while node.type == :send and node.children.first != nil
+          node = node.children.first
+        end
+        node.type == :send and node.children[1].to_s.start_with? '_'
+      end
+
+      # ensure that there are no "wunderbar" or "createElement" calls in
+      # a set of statements.
+      def react_wunderbar_free(nodes)
+        nodes.each do |node|
+          if Parser::AST::Node === node
+            return false if react_element?(node)
+
+            # recurse
+            return false unless react_wunderbar_free(node.children)
+          end
+        end
+
+        # no problems found
+        return true
+      end
+
       # analyze ivar usage
       def react_walk(node)
         # ignore hash values which are blocks (most typically, event handlers)
@@ -920,7 +1080,7 @@ module Ruby2JS
           end
 
         when :send
-          if
+          if \
             child and child.type == :self and node.children.length == 2 and
             node.children[1] == :componentWillReceiveProps
           then
@@ -933,7 +1093,7 @@ module Ruby2JS
       # Ruby 'desugars' -> to lambda, and Ruby2JS presumes that lambdas
       # return a value.
       def on_pair(node)
-        if
+        if \
           node.children[1].type == :block and
           node.children[1].children[0] == s(:send, nil, :lambda)
         then
@@ -949,7 +1109,7 @@ module Ruby2JS
       def on_begin(node)
         node = super
         (node.children.length-2).downto(0) do |i|
-          if
+          if \
             node.children[i].type == :send and
             node.children[i].children[0] and
             node.children[i].children[0].type == :self and