ruby2js 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bde5c5bd57b0599c6d259986d4b3ccfe3ca2a055d6d11c80730666ca4172860
-  data.tar.gz: e45ed225f7a1826de460f0a6370ff525465e138fe5c7feb5d8881dcb243a8ff0
+  metadata.gz: c2414f75bafbcf153ced6b3834b19513f4589d0745ca508eb2169fdc6c190c2f
+  data.tar.gz: b8847a24e1b7f96a5602c84034623c2f3847c17458b521d949fcbd5b9cb9c2b8
 SHA512:
-  metadata.gz: b44e98bc72e235b40a53745027ed24abba5eff043ccc0923014284301ef65210a34c043878aa35d86f8234c7246e119c92f8f21ac10ec175dbd932aaa8ee7cae
-  data.tar.gz: 743fd931691369c969df41a88cc19fa4a7bdf465afede108bce34fbfeddfa6ef74583aea260031f38ceb4aea37fecbfa4ca0cda95f48bcb6cd15d8c1dc95b3c4
+  metadata.gz: 736f8322e18bad8b0e6b70a6c41337f0db73499193ae0b7137e703bd9093ff8ff30a91610d0db93f6a8b3e9f9df017f42025cb28799fc80d72fe10ddd07a2eb1
+  data.tar.gz: 3faea6f125e9ec36c292be5afda1bf9de5a79c41e1ff8b1c46715a3508d06f977e0eae91cdb543e49899e416ce04d8aa01785244067709b75b50a6fb58da90f1

data/README.md

@@ -220,9 +220,10 @@ the script.
     * `.clear` becomes `.length = 0`
     * `.delete` becomes `delete target[arg]`
     * `.downcase` becomes `.toLowerCase`
-    * `.each` becomes `for (i in ...) {}`
-    * `.each_key` becomes `Object.keys().forEach`
-    * `.each_value` becomes `for (i in ...) {}`
+    * `.each` becomes `.forEach`
+    * `.each_key` becomes `for (i in ...) {}`
+    * `.each_pair` becomes `for (var key in item) {var value = item[key]; ...}`
+    * `.each_value` becomes `.forEach`
     * `.each_with_index` becomes `.forEach`
     * `.end_with?` becomes `.slice(-arg.length) == arg`
     * `.empty?` becomes `.length == 0`
@@ -536,7 +537,7 @@ conversions are made:
 * `def f(a, (foo, *bar))` becomes `function f(a, [foo, ...bar])`
 * `def a(b=1)` becomes `function a(b=1)`
 * `def a(*b)` becomes `function a(...b)`
-* `.each_key` becomes `for (i of ...) {}`
+* `.each_value` becomes `for (i of ...) {}`
 * `a(*b)` becomes `a(...b)`
 * `"#{a}"` becomes <code>\`${a}\`</code>
 * `lambda {|x| x}` becomes `(x) => {return x}`
@@ -574,7 +575,7 @@ ES2017 support
 When option `eslevel: 2017` is provided, the following additional
 conversion is made by the `functions` filter:
 
-* `.each_entry` becomes `Object.entries().forEach`
+* `.each_pair` becomes `for (let [key, value] of Object.entries()) {}'
 
 ES2018 support
 ---
@@ -590,7 +591,7 @@ optional keyword arguments.
 ES2019 support
 ---
 
-When option `eslevel: 2018` is provided, the following additional
+When option `eslevel: 2019` is provided, the following additional
 conversion is made by the `functions` filter:
 
 * `.flatten` becomes `.flat(Infinity)`
@@ -604,7 +605,7 @@ variable.
 ES2020 support
 ---
 
-When option `eslevel: 2018` is provided, the following additional
+When option `eslevel: 2020` is provided, the following additional
 conversion is made:
 
 * `@x` becomes `this.#x`

data/lib/ruby2js/filter/functions.rb

@@ -50,9 +50,15 @@ module Ruby2JS
 
             s(:send, s(:block, s(:send, nil, :lambda), s(:args),
               s(:begin, *copy, *args.map {|modname|
-              s(:for, s(:lvasgn, :$_), modname,
-              s(:send, s(:gvar, :$$), :[]=,
-              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              if modname.type == :hash
+                s(:begin, *modname.children.map {|pair|
+                    s(:send, s(:gvar, :$$), :[]=, *pair.children)
+                  })
+              else
+                s(:for, s(:lvasgn, :$_), modname,
+                s(:send, s(:gvar, :$$), :[]=,
+                s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              end
               }, s(:return, s(:gvar, :$$)))), :[])
           end
 
@@ -72,9 +78,15 @@ module Ruby2JS
 
             s(:send, s(:block, s(:send, nil, :lambda), s(:args),
               s(:begin, *copy, *args.map {|modname|
-              s(:for, s(:lvasgn, :$_), modname,
-              s(:send, target, :[]=,
-              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              if modname.type == :hash
+                s(:begin, *modname.children.map {|pair|
+                    s(:send, target, :[]=, *pair.children)
+                  })
+              else
+                s(:for, s(:lvasgn, :$_), modname,
+                s(:send, target, :[]=,
+                s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+              end
               }, s(:return, target))), :[])
           end
 
@@ -522,13 +534,24 @@ module Ruby2JS
             call.children[0].children[0], node.children[2])
 
         elsif
-          [:each, :each_value].include? method and
-          node.children[1].children.length == 1
+          [:each, :each_value].include? method
         then
           if es2015
-            process node.updated(:for_of,
-              [s(:lvasgn, node.children[1].children[0].children[0]),
-              node.children[0].children[0], node.children[2]])
+            if node.children[1].children.length > 1
+              process node.updated(:for_of,
+                [s(:mlhs, *node.children[1].children.map {|child|
+                  s(:lvasgn, child.children[0])}),
+                node.children[0].children[0], node.children[2]])
+            elsif node.children[1].children[0].type == :mlhs
+              process node.updated(:for_of,
+                [s(:mlhs, *node.children[1].children[0].children.map {|child|
+                  s(:lvasgn, child.children[0])}),
+                node.children[0].children[0], node.children[2]])
+            else
+              process node.updated(:for_of,
+                [s(:lvasgn, node.children[1].children[0].children[0]),
+                node.children[0].children[0], node.children[2]])
+            end
           else
             process node.updated(nil, [s(:send, call.children[0],
               :forEach), *node.children[1..2]])
@@ -548,10 +571,21 @@ module Ruby2JS
             s(:block, s(:send, nil, :lambda), *node.children[1..2]),
             *call.children[2..-1]])
 
-        elsif es2017 and method == :each_pair
-          process node.updated(nil, [s(:send, s(:send, s(:const, nil, :Object),
-            :entries, call.children[0]), :forEach), s(:args, s(:mlhs,
-            *node.children[1].children)), node.children[2]])
+        elsif method == :each_pair and node.children[1].children.length == 2
+          if es2017
+            # Object.entries(a).forEach(([key, value]) => {})
+            process node.updated(nil, [s(:send, s(:send,
+            s(:const, nil, :Object), :entries, call.children[0]), :each),
+            node.children[1], node.children[2]])
+          else
+            # for (key in a). {var value = a[key]; ...}
+            process node.updated(:for, [s(:lvasgn,
+              node.children[1].children[0].children[0]), call.children[0],
+              s(:begin, s(:lvasgn, node.children[1].children[1].children[0],
+              s(:send, call.children[0], :[], 
+              s(:lvar, node.children[1].children[0].children[0]))),
+              node.children[2])])
+          end
 
         else
           super

data/lib/ruby2js/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.