ruby2js 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe86f145da2a356f2f0356636b82b7e3dd03c3c20b18e4f4df73c02e94eb8517
-  data.tar.gz: cd4ddff033e394e8752acdf8c28ac36a9c8a9b659514b4e6eed5f1ed6af0d01c
+  metadata.gz: 6da7644d192eea8de1e3a6fe6b8550ef9b373912aed034a88d50cb0b0e27b988
+  data.tar.gz: 558b980ae2a39e47cb4b17f354a5378b183606acd5700ed30f44070b5e180131
 SHA512:
-  metadata.gz: 3dfe608effc755e3e9f17e68710b9ad5833184fa022a8632ca7227ddeabf2894c207a021a4083da617c865e0499807127a7cb0dc8b32f332cc0de21419c887e2
-  data.tar.gz: 94fe88ca8908058f69d590602108d586a0b191012603648e072686bd35bf8b3413241f4d04200aff3820f823dd22cf6e1dec9548293c343636632f7405390c7f
+  metadata.gz: a0819a2eeecd764f301f0bc8ec1d50cb4014dc715e850849e572fd0962247f46e2799a9265e474d79837f2cb17de201bb205762da018100eaa0b62eb7cb8a069
+  data.tar.gz: bc64c4729076b98dc9589e4e27a7d873c5a1185604eaca6ee38923b560f57dfcb51509e1f4e55caa4a9ec2fb5b20c539146a2cd5d4e365d9507356e22b9e5989

data/lib/ruby2js/converter/def.rb

@@ -92,8 +92,6 @@ module Ruby2JS
         not name and es2015 and @state != :method and @ast.type != :defm and 
         not @prop
       then
-        put '('; parse args; put ') => '
-
         expr = body
         expr = expr.children.first while expr.type == :autoreturn
         while expr.type == :begin and expr.children.length == 1
@@ -117,8 +115,16 @@ module Ruby2JS
           style = :statement
         end
 
+        if args.children.length == 1 and style == :expression
+          parse args; put ' => '
+        else
+          put '('; parse args; put ') => '
+        end
+
         if style == :expression
-          expr.type == :hash ? group(expr) : parse(expr)
+          expr.type == :hash ? group(expr) : wrap('(', ')') { parse(expr) }
+        elsif body.type == :begin and body.children.length == 0
+          put "{}"
         else
           put "{#{@nl}"; scope body, vars; put "#{@nl}}"
         end

data/lib/ruby2js/converter/kwbegin.rb

@@ -45,10 +45,10 @@ module Ruby2JS
       end
 
       if not recovers and not finally
-        return parse s(:begin, *children)
+        return scope s(:begin, *children)
       end
 
-      puts "try {"; parse body, :statement; sput '}'
+      puts "try {"; scope body; sput '}'
 
       if recovers
         var ||= s(:gvar, :$EXCEPTION)
@@ -56,7 +56,7 @@ module Ruby2JS
         if recovers.length == 1 and not recovers.first.children.first
           # single catch with no exception named
           put " catch ("; parse var; puts ") {"
-          parse recovers.first.children.last, :statement; sput '}'
+          scope recovers.first.children.last; sput '}'
         else
           put " catch ("; parse var; puts ') {'
 
@@ -84,7 +84,7 @@ module Ruby2JS
               puts '} else {'
             end
 
-            parse recovery, :statement; puts ''
+            scope recovery; puts ''
           end
 
           if recovers.last.children.first
@@ -95,7 +95,7 @@ module Ruby2JS
         end
       end
 
-      (puts ' finally {'; parse finally, :statement; sput '}') if finally
+      (puts ' finally {'; scope finally; sput '}') if finally
     end
   end
 end

data/lib/ruby2js/converter/vasgn.rb

@@ -33,7 +33,7 @@ module Ruby2JS
 
         hoist = false
         if state == :statement and not @vars.include?(name) 
-          hoist = hoist?(@scope, @inner, name) if @inner
+          hoist = hoist?(@scope, @inner, name) if @inner and @scope != @inner
           if not hoist
             if es2015
               var = 'let '

data/lib/ruby2js/serializer.rb

@@ -203,8 +203,8 @@ module Ruby2JS
     end
 
     # wrap long statements in curly braces
-    def wrap
-      puts '{'
+    def wrap(open = '{', close = '}')
+      puts open
       mark = output_location
       yield
 
@@ -212,7 +212,7 @@ module Ruby2JS
         @lines.length > mark.first+1 or
         @lines[mark.first-1].join.length + @line.join.length >= @width
       then
-        sput '}'
+        sput close
       else
         @line = @lines[mark.first-1]
         @line[-1..-1] = @lines.pop

data/lib/ruby2js/version.rb

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