ruby2js 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e26859d5b9002827f57c600965dd6b55df2b25c3
-  data.tar.gz: 04ca04d344d2d48c70d135d9aecbe9078ff943ec
+SHA256:
+  metadata.gz: '009edffb834a3c8c298d4ad601160d30c4781891a4fe7b229e6dbc6f4284569e'
+  data.tar.gz: 186d6e6ec33a0fee107623c3ed7994e9dea0741cf454bb79005acbb6be7f6429
 SHA512:
-  metadata.gz: 5bf863d48a676e4d5980086604c446d9b9dff262b6c4fecd4511b2b3e79a3505883a9d5806f9815fa7b8c82d55a2ce989262ae019c41e2cd666501fce5b8cf51
-  data.tar.gz: c8b93f23990824470b7e3ceaf527e95968644ea3422c4074b8f6d946406fbd62efd19256bdc6c6873063788d820f4a53d88ca127fdeaff8faae2bc1d51d1147b
+  metadata.gz: de2efb3d8d13a282af0401ce3a6216423564933483d3be4ed160eb1ef2bbf3092fdae6c9325d09298d6c86012de936c764178a0767a08b66b49b6d6d53bd9daa
+  data.tar.gz: 3558c528e771c98fd50ece66410dd12d3a33c57af85e89e47a1c04f743f4a531cb971dbdf197291f8e6b1530d1895ea9c40aaf8814d64d094eb2f397092504a2

data/lib/ruby2js/converter.rb

@@ -21,6 +21,8 @@ module Ruby2JS
 
     GROUP_OPERATORS = [:begin, :dstr, :dsym, :and, :or]
 
+    VASGN = [:cvasgn, :ivasgn, :gvasgn, :lvasgn]
+
     attr_accessor :binding, :ivars
 
     def initialize( ast, comments, vars = {} )

data/lib/ruby2js/converter/casgn.rb

@@ -5,6 +5,8 @@ module Ruby2JS
     #   (int 1))
 
     handle :casgn do |cbase, var, value|
+      multi_assign_declarations if @state == :statement
+
       begin
         if es2015
           put "const "

data/lib/ruby2js/converter/cvasgn.rb

@@ -5,6 +5,8 @@ module Ruby2JS
     #   (int 1))
 
     handle :cvasgn do |var, expression=nil|
+      multi_assign_declarations if @state == :statement
+
       if @class_name
         parse @class_name
         put var.to_s.sub('@@', "._")

data/lib/ruby2js/converter/ivasgn.rb

@@ -5,6 +5,8 @@ module Ruby2JS
     #   (int 1))
 
     handle :ivasgn do |var, expression=nil|
+      multi_assign_declarations if @state == :statement
+
       put "#{ var.to_s.sub('@', 'this._') }"
       if expression
         put " = "; parse expression

data/lib/ruby2js/converter/send.rb

@@ -151,6 +151,8 @@ module Ruby2JS
         (group_target ? group(target) : parse(target))
 
       elsif method =~ /=$/
+        multi_assign_declarations if @state == :statement
+
         parse receiver
         put "#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } "
         parse args.first, (@state == :method ? :method : :expression)

data/lib/ruby2js/converter/vasgn.rb

@@ -21,8 +21,13 @@ module Ruby2JS
           end
 
           unless undecls.empty?
-            return parse s(:begin, 
-              *undecls.map {|uname| s(:lvasgn, uname)}, @ast), @state
+            if es2015
+              put 'let '
+            else
+              put 'var ' 
+            end
+            put undecls.map(&:to_s).join(', ') + @sep
+            undecls.each {|var| @vars[var] = true}
           end
         end
 
@@ -49,5 +54,39 @@ module Ruby2JS
         end
       end
     end
+
+    def multi_assign_declarations
+      undecls = []
+      child = @ast
+      loop do
+        if [:send, :casgn].include? child.type
+          subchild = child.children[2]
+        else
+          subchild = child.children[1]
+        end
+
+        if subchild.type == :send
+          break unless subchild.children[1] =~ /=$/
+        else
+          break unless [:send, :cvasgn, :ivasgn, :gvasgn, :lvasgn].
+            include? subchild.type
+        end
+
+        child = subchild
+
+        if child.type == :lvasgn and not @vars.include?(child.children[0]) 
+          undecls << child.children[0]
+        end
+      end
+
+      unless undecls.empty?
+        if es2015
+          put "let "
+        else
+          put "var "
+        end
+        put "#{undecls.map(&:to_s).join(', ')}#@sep"
+      end
+    end
   end
 end

data/lib/ruby2js/filter/functions.rb

@@ -17,8 +17,8 @@ module Ruby2JS
 
         if [:max, :min].include? method and args.length == 0
           return super unless node.is_method?
-          process S(:send, s(:attr, s(:const, nil, :Math), node.children[1]),
-            :apply, s(:const, nil, :Math), target)
+          process S(:send, s(:const, nil, :Math), node.children[1],
+            s(:splat, target))
 
         elsif method == :call and target and target.type == :ivar
           process S(:send, s(:self), "_#{target.children.first.to_s[1..-1]}",

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     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.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-21 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.