support Ruby 3.1 shorthand hash syntax

rubys · rubys · commit de18d2bf6edf · 2022-01-05T20:38:49.000-05:00
Fixes #152
diff --git a/lib/ruby2js/converter/match.rb b/lib/ruby2js/converter/match.rb
@@ -1,7 +1,20 @@
 module Ruby2JS
   class Converter
     handle :match_pattern do |value, name|
-      parse @ast.updated(:lvasgn, [name.children.first, value]), @state
+      if name.type == :match_var
+        parse @ast.updated(:lvasgn, [name.children.first, value]), @state
+      elsif name.type == :hash_pattern and name.children.all? {|child| child.type == :match_var}
+        if es2015
+          put 'let { '
+          put name.children.map {|child| child.children[0].to_s}.join(', ')
+          put ' } = '
+          parse value
+        else
+          raise Error.new("destructuring requires es2015")
+        end
+      else
+        raise Error.new("complex match patterns are not supported")
+      end
     end
   end
 end
diff --git a/spec/es2015_spec.rb b/spec/es2015_spec.rb
@@ -114,6 +114,12 @@ def to_js_fn(string)
     it "should implement max with spread operators" do
       to_js_fn( 'a.max()' ).must_equal('Math.max(...a)')
     end
+
+    unless (RUBY_VERSION.split('.').map(&:to_i) <=> [3, 0, 0]) == -1
+      it "should support => operator with simple destructuring" do
+        to_js('hash => {a:, b:}').must_equal 'let {a, b} = hash'
+      end
+    end
   end
 
   describe :arguments do
diff --git a/spec/transliteration_spec.rb b/spec/transliteration_spec.rb
@@ -975,7 +975,7 @@ def to_js( string, opts={} )
     end
 
     unless (RUBY_VERSION.split('.').map(&:to_i) <=> [3, 0, 0]) == -1
-      it "should support => operator" do
+      it "should support => operator with simple left hand sides" do
         to_js('0 => x').must_equal 'var x = 0'
       end
     end
