ruby2js 3.0.13 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc199c50043c6bf4873bb097b7e92856023ff48baf112aa4c7e9487b749f89b
-  data.tar.gz: 3c374a3ca6f1591c61dbc36bf602507c5526aadbf8fbd17c3c6efe7a6e3ca0db
+  metadata.gz: 977a5000855a15e2bb92f1c4c8c1ccea4fdf5ab3e7191119822baef7eae542c6
+  data.tar.gz: d37e1f93e78f0fb2ea11bb507764df75fc24e16146b173a5c9bf93819277911e
 SHA512:
-  metadata.gz: '02917c6c3e994817a8bbf67aede8dbfa16dbe4d6ee48b7503f763795ddb22ed57b07427179ead407b8036e7c4e36d4fa6848edef7a4951bf39e183f4547e4666'
-  data.tar.gz: 496ad88241844101e583205e33f0d7604296801100e1a8870ec2b2f971110f873048d33ed4e7fac4f347bf05d8c545e64867b1b0ff5100dda96c97a98d7f51d6
+  metadata.gz: daf2acb19662ed955b502f226fdf9f36226968926a3a6e17a2b4d180a8d89edbfc451464ee4ce24139c1f960de348521958147701cfa99248d1a80e6c5f51be6
+  data.tar.gz: 61d107547afd6f57ed4a98277c78e9edb86253bc61d6036520f22cd208d213f5c3a7ac010a738c94848bbdb649f608322379953a9892c92f4275f3d29181c068

data/README.md

@@ -556,6 +556,7 @@ When option `eslevel: 2016` is provided, the following additional
 conversion is made:
 
 * `a ** b` becomes `a ** b`
+* `.include?` becomes `.includes`
 
 ES2017 support
 ---

data/lib/ruby2js/converter/class2.rb

@@ -34,6 +34,16 @@ module Ruby2JS
         class_parent, @class_parent = @class_parent, inheritance
         @rbstack.push({})
 
+        # capture method names for automatic self referencing
+        body.each_with_index do |m, index|
+          if m.type == :def
+            prop = m.children.first
+            unless prop == :initialize or prop.to_s.end_with? '='
+              @rbstack.last[prop] = s(:self)
+            end
+          end
+        end
+
         post = []
         skipped = false
         body.each_with_index do |m, index|
@@ -59,20 +69,16 @@ module Ruby2JS
               @prop = :constructor 
               m = m.updated(m.type, [@prop, *m.children[1..2]])
             elsif not m.is_method?
-              @rbstack.last[@prop] = s(:self)
               @prop = "get #{@prop}"
               m = m.updated(m.type, [*m.children[0..1], 
                 s(:autoreturn, m.children[2])])
             elsif @prop.to_s.end_with? '='
               @prop = @prop.to_s.sub('=', '').to_sym
-              @rbstack.last[@prop] = s(:self)
               m = m.updated(m.type, [@prop, *m.children[1..2]])
               @prop = "set #{@prop}"
             elsif @prop.to_s.end_with? '!'
               @prop = @prop.to_s.sub('!', '')
               m = m.updated(m.type, [@prop, *m.children[1..2]])
-            else
-              @rbstack.last[@prop] = s(:self)
             end
 
             begin

data/lib/ruby2js/converter/regexp.rb

@@ -27,6 +27,12 @@ module Ruby2JS
         end
       end
 
+      if parts.first.type == :str and parts.first.children[0].start_with?('^')
+        opts = opts + [:m] unless opts.include? :m
+      elsif parts.last.type == :str and parts.last.children[0].end_with?('$')
+        opts = opts + [:m] unless opts.include? :m
+      end
+
       # use slash syntax if there are few embedded slashes in the regexp
       if parts.all? {|part| part.type == :str}
         str = parts.map {|part| part.children.first}.join

data/lib/ruby2js/converter/send.rb

@@ -111,6 +111,9 @@ module Ruby2JS
         if receiver.type == :int and !OPERATORS.flatten.include?(method)
           group_receiver = true 
         end
+        if not receiver.is_method? and receiver.children.last == :new
+          group_receiver = true 
+        end
       end
 
       if target
@@ -221,7 +224,7 @@ module Ruby2JS
             end
           end
 
-          put "new "; parse receiver
+          put "new "; (group_receiver ? group(receiver) : parse(receiver))
           if ast.is_method?
             put '('; parse_all(*args, join: ', '); put ')'
           end

data/lib/ruby2js/filter/functions.rb

@@ -29,7 +29,7 @@ module Ruby2JS
             *args)
 
         elsif method == :call and target and target.type == :cvar
-          process S(:send, s(:attr, s(:self), :constructor), 
+          process S(:send, s(:attr, s(:self), :constructor),
             "_#{target.children.first.to_s[2..-1]}", *args)
 
         elsif method == :keys and args.length == 0 and node.is_method?
@@ -73,7 +73,7 @@ module Ruby2JS
           if es2015
             process S(:send, s(:const, nil, :Array), :from, *args)
           else
-            process S(:send, s(:attr, s(:attr, s(:const, nil, :Array), 
+            process S(:send, s(:attr, s(:attr, s(:const, nil, :Array),
               :prototype), :slice), :call, *args)
           end
 
@@ -84,19 +84,22 @@ module Ruby2JS
           process node.updated :send, [nil, :parseFloat, target, *args]
 
         elsif method == :sub and args.length == 2
+          if args[1].type == :str
+            args[1] = s(:str, args[1].children.first.gsub(/\\(\d)/, "$\\1"))
+          end
           process node.updated nil, [target, :replace, *args]
 
         elsif [:sub!, :gsub!].include? method
           method = :"#{method.to_s[0..-2]}"
           if VAR_TO_ASSIGN.keys.include? target.type
-            process S(VAR_TO_ASSIGN[target.type], target.children[0], 
+            process S(VAR_TO_ASSIGN[target.type], target.children[0],
               S(:send, target, method, *node.children[2..-1]))
           elsif target.type == :send
             if target.children[0] == nil
               process S(:lvasgn, target.children[1], S(:send,
                 S(:lvar, target.children[1]), method, *node.children[2..-1]))
             else
-              process S(:send, target.children[0], :"#{target.children[1]}=", 
+              process S(:send, target.children[0], :"#{target.children[1]}=",
                 S(:send, target, method, *node.children[2..-1]))
             end
           else
@@ -119,7 +122,7 @@ module Ruby2JS
           else
             super
           end
-          
+
           if pattern.include? '('
             s(:block, s(:send,
               s(:send, process(target), :match, gpattern), :map),
@@ -139,6 +142,9 @@ module Ruby2JS
             before = before.updated(:regexp,
               [s(:str, Regexp.escape(before.children.first)), s(:regopt, :g)])
           end
+          if after.type == :str
+            after = s(:str, after.children.first.gsub(/\\(\d)/, "$\\1"))
+          end
           process node.updated nil, [target, :replace, before, after]
 
         elsif method == :ord and args.length == 0
@@ -176,10 +182,10 @@ module Ruby2JS
 	    end
 
 	    if method == :start_with?
-	      process S(:send, S(:send, target, :substring, s(:int, 0), 
+	      process S(:send, S(:send, target, :substring, s(:int, 0),
 		length), :==, *args)
 	    else
-	      process S(:send, S(:send, target, :slice, 
+	      process S(:send, S(:send, target, :slice,
 		S(:send, length, :-@)), :==, *args)
 	    end
           end
@@ -203,8 +209,12 @@ module Ruby2JS
             S(:and, s(:send, args.first, :>=, target.children.first),
               s(:send, args.first, :<, target.children.last))
           else
-            process S(:send, S(:send, target, :indexOf, args.first), :!=,
-              s(:int, -1))
+            if es2016
+              process S(:send, target, :includes, args.first)
+            else
+              process S(:send, S(:send, target, :indexOf, args.first), :!=,
+                s(:int, -1))
+            end
           end
 
         elsif method == :respond_to? and args.length == 1
@@ -220,7 +230,7 @@ module Ruby2JS
           process S(:send, target, :toUpperCase)
 
         elsif method == :strip and args.length == 0
-          process S(:send, target, :trim)
+          process s(:send, target, :trim)
 
         elsif node.children[0..1] == [nil, :puts]
           process S(:send, s(:attr, nil, :console), :log, *args)
@@ -251,7 +261,7 @@ module Ruby2JS
           # resolve negative literal indexes
           i = proc do |index|
             if index.type == :int and index.children.first < 0
-              process S(:send, S(:attr, target, :length), :-, 
+              process S(:send, S(:attr, target, :length), :-,
                 s(:int, -index.children.first))
             else
               index
@@ -264,7 +274,7 @@ module Ruby2JS
             super
 
           elsif index.type == :regexp
-            process S(:send, 
+            process S(:send,
               s(:or, S(:send, process(target), :match, index), s(:array)),
               :[], args[1] || s(:int, 0))
 
@@ -302,11 +312,11 @@ module Ruby2JS
             super
           end
 
-        elsif method == :reverse! and node.is_method? 
+        elsif method == :reverse! and node.is_method?
           # input: a.reverse!
           # output: a.splice(0, a.length, *a.reverse)
-          process S(:send, target, :splice, s(:int, 0), 
-            s(:attr, target, :length), s(:splat, S(:send, target, 
+          process S(:send, target, :splice, s(:int, 0),
+            s(:attr, target, :length), s(:splat, S(:send, target,
             :reverse, *node.children[2..-1])))
 
         elsif method == :each_with_index
@@ -331,7 +341,7 @@ module Ruby2JS
               S(:send, s(:const, nil, :Array), :isArray, target)
             elsif [:Arguments, :Boolean, :Date, :Error, :Function, :Number,
                 :Object, :RegExp, :String].include? parent
-              S(:send, s(:send, s(:attr, s(:attr, s(:const, nil, Object), 
+              S(:send, s(:send, s(:attr, s(:attr, s(:const, nil, Object),
                 :prototype), :toString), :call, target), :===,
                 s(:str, "[object #{parent.to_s}]"))
             else
@@ -415,7 +425,7 @@ module Ruby2JS
           # output: a.splice(0, a.length, *a.map {expression})
           method = (method == :map! ? :map : :select)
           target = call.children.first
-          process call.updated(:send, [target, :splice, s(:splat, s(:send, 
+          process call.updated(:send, [target, :splice, s(:splat, s(:send,
             s(:array, s(:int, 0), s(:attr, target, :length)), :concat,
             s(:block, s(:send, target, method, *call.children[2..-1]),
             *node.children[1..-1])))])
@@ -432,11 +442,11 @@ module Ruby2JS
           if result.children[0].type == :undef
             call = result.children[0].children[0]
             if call.type == :attr
-              call = call.updated(:send, 
+              call = call.updated(:send,
                 [call.children[0], :delete, s(:str, call.children[1])])
               result = result.updated(nil, [call, *result.children[1..-1]])
             else
-              call = call.updated(nil, 
+              call = call.updated(nil,
                 [call.children[0], :delete, *call.children[2..-1]])
               result = result.updated(nil, [call, *result.children[1..-1]])
             end
@@ -454,19 +464,19 @@ module Ruby2JS
           call = call.updated(nil, [s(:begin, range), :step, s(:int, 1)])
           process node.updated(nil, [call, *node.children[1..-1]])
 
-        elsif 
+        elsif
           method == :each and call.children[0].type == :send and
           call.children[0].children[1] == :step
         then
           # i.step(j, n).each {|v| ...}
           range = call.children[0]
           step = range.children[3] || s(:int, 1)
-          call = call.updated(nil, [s(:begin, 
+          call = call.updated(nil, [s(:begin,
             s(:irange, range.children[0], range.children[2])),
             :step, step])
           process node.updated(nil, [call, *node.children[1..-1]])
 
-        elsif 
+        elsif
           # (a..b).each {|v| ...}
           method == :each and
           call.children[0].type == :begin and
@@ -474,28 +484,28 @@ module Ruby2JS
           [:irange, :erange].include? call.children[0].children[0].type and
           node.children[1].children.length == 1
         then
-          s(:for, s(:lvasgn, node.children[1].children[0].children[0]), 
+          s(:for, s(:lvasgn, node.children[1].children[0].children[0]),
             call.children[0].children[0], node.children[2])
 
-        elsif 
-          [:each, :each_value].include? method and 
+        elsif
+          [:each, :each_value].include? method and
           node.children[1].children.length == 1
         then
           if es2015
-            process node.updated(:for_of, 
+            process node.updated(:for_of,
               [s(:lvasgn, node.children[1].children[0].children[0]),
               node.children[0].children[0], node.children[2]])
           else
-            process node.updated(nil, [s(:send, call.children[0], 
+            process node.updated(nil, [s(:send, call.children[0],
               :forEach), *node.children[1..2]])
           end
 
-        elsif 
-          method == :each_key and 
-          [:each, :each_key].include? method and 
+        elsif
+          method == :each_key and
+          [:each, :each_key].include? method and
           node.children[1].children.length == 1
         then
-          process node.updated(:for, 
+          process node.updated(:for,
             [s(:lvasgn, node.children[1].children[0].children[0]),
             node.children[0].children[0], node.children[2]])
 
@@ -519,7 +529,7 @@ module Ruby2JS
         body.compact!
 
         if inheritance == s(:const, nil, :Exception)
-          unless 
+          unless
             body.any? {|statement| statement.type == :def and
             statement.children.first == :initialize}
           then

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 13
+    TINY  = 14
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser