ruby2js 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2990f20dc46745e6e632c5cf672ce516f3ca64819a9129024efd7cc333714638
-  data.tar.gz: 77df7775a4146e1e45278002737c24304b4d4f0ccdb49825c372286cfbb2a44b
+  metadata.gz: 075b7a63226221fc941c3ccd747285d1bf9a3e94cfefd39926e530c9e41ba0a0
+  data.tar.gz: 7a01d0dfef5bba7c05393a4059f4899631d6bac7894b98801dfc04634b4fcb84
 SHA512:
-  metadata.gz: 3e0fd19ebc555112ea283f6d112cac30c47c16c3701568acd725d70115c2fe3aa9ba5870145d1ec002f8d7c7f463f26a0fe5fce9f61eb4492539638b938a8219
-  data.tar.gz: 8423b871acb6c37b44b4d5e2878fc8b8eba3c3114768b37a8003cccafabf137253b02f4e55c13aea447521a944662b1554d848834fe5ec61e07381dfc967d3de
+  metadata.gz: 62e0c730806b6bb3dc2060028d37dee4a181c9aa43be77415ed9cfca016ebae821388ae1b696d6de9a1f634730163b2a2f9d3b95aac321ca6a11ddfabbc1383e
+  data.tar.gz: ae0a44b9d2a547def9fcc86b5af2dd1e5134881b0224c4e65a80e614215b1803a6be80649270622113829f531070aacfceed99a2edca364f661f2c75521fb214

data/lib/ruby2js/converter/case.rb

@@ -47,7 +47,15 @@ module Ruby2JS
           end
 
           parse code, :statement
-          put "#{@sep}break#@sep" if other or index < whens.length-1
+          last = code
+          while last.type == :begin
+            last = last.children.last
+          end
+
+          if other or index < whens.length-1
+            put "#{@sep}" 
+            put "break#@sep" unless last.type == :return
+          end
         end
 
         (put "#{@nl}default:#@ws"; parse other, :statement) if other

data/lib/ruby2js/converter/class2.rb

@@ -38,6 +38,8 @@ module Ruby2JS
         skipped = false
         body.each_with_index do |m, index|
           put(index == 0 ? @nl : @sep) unless skipped
+          comments = comments(m)
+          location = output_location
           skipped = false
 
           # intercept async definitions
@@ -136,7 +138,11 @@ module Ruby2JS
             end
           end
 
-          post << m if skipped
+          if skipped
+            post << m if skipped
+          else
+            comments.reverse.each {|comment| insert location, comment}
+          end
         end
 
         put @nl unless skipped

data/lib/ruby2js/converter/def.rb

@@ -8,9 +8,6 @@ module Ruby2JS
 
     handle :def, :defm, :async do |name, args, body=nil|
       body ||= s(:begin)
-      if name =~ /[!?]$/
-        raise Error.new("invalid method name #{ name }", @ast)
-      end
 
       vars = {}
       vars.merge! @vars unless name
@@ -99,6 +96,7 @@ module Ruby2JS
         while expr.type == :begin and expr.children.length == 1
           expr = expr.children.first
         end
+        expr = expr.children.first if expr.type == :return
 
         if EXPRESSIONS.include? expr.type
           if expr.type == :send and expr.children[0..1] == [nil, :raise]
@@ -131,7 +129,7 @@ module Ruby2JS
           put @prop
           @prop = nil
         elsif name
-          put "function #{name}"
+          put "function #{name.to_s.sub(/[?!]$/, '')}"
         else
           put 'function'
         end

data/lib/ruby2js/converter/dstr.rb

@@ -11,29 +11,30 @@ module Ruby2JS
 
     handle :dstr, :dsym do |*children|
       if es2015
-	put '`'
-
         # gather length of string parts; if long enough, newlines will
-        # not be escaped
-	length = children.select {|child| child.type==:str}.
-	  map {|child| child.children.last.length}.inject(:+)
-
-	children.each do |child|
-	  if child.type == :str
-	    str = child.children.first.inspect[1..-2].gsub('${', '$\{')
-	    if length > 40
-	      put str.gsub("\\n", "\n")
-	    else
-	      put str
-	    end
-	  else
-	    put '${'
-	    parse child
-	    put '}'
-	  end
-	end
-	put '`'
-	return
+        # not be escaped (poor man's HEREDOC)
+        strings = children.select {|child| child.type==:str}.
+          map {|child| child.children.last}.join
+        heredoc = (strings.length > 40 and strings.scan("\n").length > 3)
+
+        put '`'
+        children.each do |child|
+          if child.type == :str
+            str = child.children.first.inspect[1..-2].gsub('${', '$\{')
+            if heredoc
+              put! str.gsub("\\n", "\n")
+            else
+              put str
+            end
+          else
+            put '${'
+            parse child
+            put '}'
+          end
+        end
+        put '`'
+
+        return
       end
 
       children.each_with_index do |child, index|

data/lib/ruby2js/converter/masgn.rb

@@ -45,10 +45,24 @@ module Ruby2JS
         end
         put "] = "
         parse rhs
+
+      elsif rhs.type == :array
+
+        if lhs.children.length == rhs.children.length
+          block = []
+          lhs.children.zip rhs.children.zip do |var, val| 
+            block << s(var.type, *var.children, *val)
+          end
+          parse s(:begin, *block), @state
+        else
+          raise Error.new("unmatched assignment", @ast)
+        end
+
       else
+
         block = []
-        lhs.children.zip rhs.children.zip do |var, val| 
-          block << s(var.type, *var.children, *val)
+        lhs.children.each_with_index do |var, i|
+          block << s(var.type, *var.children, s(:send, rhs, :[], s(:int, i)))
         end
         parse s(:begin, *block), @state
       end

data/lib/ruby2js/converter/regexp.rb

@@ -6,36 +6,44 @@ module Ruby2JS
     #   (regopt :i))
 
     handle :regexp do |*parts, opt|
+      # remove "extended" from list of options
       extended = false
       opts = opt.children
       if opts.include? :x
-        opts = opts.dup - [:x]
+        opts = opts - [:x]
         extended = true
       end
 
-      if parts.all? {|part| part.type == :str}
-        str = parts.map {|part| part.children.first}.join
-        str = str.gsub(/ #.*/,'').gsub(/\s/,'') if extended
-        unless str.include? '/'
-          return put "/#{ str }/#{ opts.join }"
-        end
-        put "new RegExp(#{ str.inspect }"
-      else
-        put 'new RegExp('
-
-        parts.each_with_index do |part, index|
-          put ' + ' unless index == 0
-
+      # remove whitespace and comments from extended regular expressions
+      if extended
+        parts.map! do |part|
           if part.type == :str
             str = part.children.first 
-            str = str.gsub(/ #.*/,'').gsub(/\s/,'') if extended
-            put str.inspect
+            str = str.gsub(/ #.*/,'').gsub(/\s/,'')
+            s(:str, str)
           else
-            parse part
+            part
           end
         end
       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
+        unless str.scan('/').length - str.scan("\\").length > 3
+          return put "/#{ str.gsub('/', '\\/') }/#{ opts.join }"
+        end
+      end
+
+      # create a new RegExp object
+      put 'new RegExp('
+
+      if parts.length == 1
+        parse parts.first
+      else
+        parse s(:dstr, *parts)
+      end
+
       unless opts.empty?
         put ", #{ opts.join.inspect}"
       end

data/lib/ruby2js/converter/return.rb

@@ -26,6 +26,7 @@ module Ruby2JS
       return if block == []
       if EXPRESSIONS.include? block.last.type 
         block.push @ast.updated(:return, [block.pop])
+
       elsif block.last.type == :if
         node = block.pop
         if node.children[1] and node.children[2] and
@@ -49,6 +50,24 @@ module Ruby2JS
           end
         end
         block.push node
+
+      elsif block.last.type == :case
+        node = block.pop
+        children = node.children.dup
+        (1...children.length).each do |i|
+          if children[i].type == :when
+            gchildren = children[i].children.dup
+            if !gchildren.empty? and EXPRESSIONS.include? gchildren.last.type
+              gchildren.push s(:return, gchildren.pop)
+              children[i] = children[i].updated(nil, gchildren)
+            else
+            end
+          elsif EXPRESSIONS.include? children[i].type
+            children[i] = children[i].updated(:return, [children[i]])
+          end
+        end
+        block.push node.updated(nil, children)
+
       elsif block.last.type == :lvasgn
         block.push s(:return, s(:lvar, block.last.children.first))
       elsif block.last.type == :ivasgn

data/lib/ruby2js/converter/send.rb

@@ -16,6 +16,13 @@ module Ruby2JS
     handle :send, :sendw, :await, :attr, :call do |receiver, method, *args|
       ast = @ast
 
+    if 
+      args.length == 1 and method == :+
+    then
+      node = collapse_strings(ast)
+      return parse node if node != ast
+    end
+
       # strip '!' and '?' decorations
       method = method.to_s[0..-2] if method =~ /\w[!?]$/
 
@@ -285,5 +292,48 @@ module Ruby2JS
        put '...'
        parse expr
     end
+
+  # do string concatenation when possible
+  def collapse_strings(node)
+    left = node.children[0]
+    return node unless left
+    right = node.children[2]
+
+    # recursively evaluate left hand side
+    if 
+      left.type == :send and left.children.length == 3 and 
+      left.children[1] == :+
+    then
+      left = collapse_strings(left)
+    end
+
+    # recursively evaluate right hand side
+    if 
+      right.type == :send and right.children.length == 3 and 
+      right.children[1] == :+
+    then
+      right = collapse_strings(right)
+    end
+
+    # if left and right are both strings, perform concatenation
+    if [:dstr, :str].include? left.type and [:dstr, :str].include? right.type
+      if left.type == :str and right.type == :str
+        return left.updated nil, 
+          [left.children.first + right.children.first]
+      else
+        left = s(:dstr, left) if left.type == :str
+        right = s(:dstr, right) if right.type == :str
+        return left.updated(nil, left.children + right.children)
+      end
+    end
+
+    # if left and right are unchanged, return original node; otherwise
+    # return node modified to include new left and/or right hand sides.
+    if left == node.children[0] and right == node.children[2]
+      return node
+    else
+      return node.updated(nil, [left, :+, right]) 
+    end
+  end
   end
 end

data/lib/ruby2js/filter/functions.rb

@@ -289,6 +289,18 @@ module Ruby2JS
           # prevent chained delete methods from being converted to undef
           S(:send, target.updated(:sendw), *node.children[1..-1])
 
+        elsif es2017 and method==:entries and args.length==0 and node.is_method?
+          process node.updated(nil, [s(:const, nil, :Object), :entries, target])
+
+        elsif es2017 and method==:values and args.length==0 and node.is_method?
+          process node.updated(nil, [s(:const, nil, :Object), :values, target])
+
+        elsif es2017 and method==:rjust
+          process node.updated(nil, [target, :padStart, *args])
+
+        elsif es2017 and method==:ljust
+          process node.updated(nil, [target, :padEnd, *args])
+
         else
           super
         end

data/lib/ruby2js/serializer.rb

@@ -143,6 +143,11 @@ module Ruby2JS
       end
     end
 
+    # add a single token to the current line without checking for newline
+    def put!(string)
+      @line << Token.new(string.gsub("\r", "\n"), @ast)
+    end
+
     # add a single token to the current line and then advance to next line
     def puts(string)
       unless String === string and string.include? "\n"

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     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.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser