ruby2js 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064d9dc5d65f6e2456e91d951e2f4311b776221422a77d59a8cfd466ceb5056d
-  data.tar.gz: ffc274a55ceb9a1280f776c00da8c296dc10672150174135931547cd056a3520
+  metadata.gz: b77ba98b59e2dd3f500c4fa6c4974d6a082757becd31eb47efa841b51513ec28
+  data.tar.gz: 3a868aa5a10b6562ad156c47bec44aed4060338f6aa747e90298dd890ae3095f
 SHA512:
-  metadata.gz: 8fe9775803716fce25697adaf59a8afb57f4de499052a66847f18dfdd59c1f73b52d77be473adf762a57693a0896a6c90ed275a2b9152b5b6b548ca454e6d9ae
-  data.tar.gz: aa901eab47bba051a69a0ee132b69e7754aa5da49ff2e7e22560303a4c0fd02cdb727d4297c13098f3a6f82cf20788f4657c7ec21d145e66533875933d1a5154
+  metadata.gz: 2837170756fe4b6ca1f369d1dfe10c2ee6613f0572d54104354fb10df0b2f57dbe38c1dc4a44fa53f093af26bc6b826897144fbd5c5f0f6029885898878ff581
+  data.tar.gz: 97b02c3f49d12c7eb6f84e5a504e6b5210f04bf4450f8923ee38927714aa749968839b67ac2ad04f508f7a4cc34010eab06ad4b3cc408415390107bc1a04d623

data/lib/ruby2js.rb

@@ -182,10 +182,12 @@ module Ruby2JS
             return on_block s(:block, s(:send, *node.children[0..-2]),
               s(:args, s(:arg, :a), s(:arg, :b)), s(:return,
               process(s(:send, s(:lvar, :a), method, s(:lvar, :b)))))
-          else
+          elsif node.children.last.children.first.type == :sym
             return on_block s(:block, s(:send, *node.children[0..-2]),
               s(:args, s(:arg, :item)), s(:return,
               process(s(:attr, s(:lvar, :item), method))))
+          else
+            super
           end
         end
         super

data/lib/ruby2js/converter/args.rb

@@ -30,13 +30,18 @@ module Ruby2JS
           if kw.type == :kwarg
             put kw.children.first
           elsif kw.type == :kwoptarg
-            put kw.children.first; put ' = '; parse kw.children.last
+            put kw.children.first
+            unless kw.children.last == s(:send, nil, :undefined)
+              put ' = '; parse kw.children.last
+            end
           elsif kw.type == :kwrestarg
             raise 'Rest arg requires ES2018' unless es2018
             put '...'; put kw.children.first
           end
         end
         put ' }'
+
+        put ' = {}' unless kwargs.any? {|kw| kw.type == :kwarg}
       end
     end
 

data/lib/ruby2js/converter/class.rb

@@ -114,6 +114,7 @@ module Ruby2JS
           if m.children[1] == :attr_accessor
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {enumerable: s(:true), configurable: s(:true),
                   get: s(:block, s(:send, nil, :proc), s(:args), 
@@ -124,6 +125,7 @@ module Ruby2JS
           elsif m.children[1] == :attr_reader
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {get: s(:block, s(:send, nil, :proc), s(:args), 
                     s(:return, s(:ivar, :"@#{var}"))),
@@ -133,6 +135,7 @@ module Ruby2JS
           elsif m.children[1] == :attr_writer
             m.children[2..-1].map do |child_sym|
               var = child_sym.children.first
+              visible[var] = s(:self)
               s(:prop, s(:attr, name, :prototype), var =>
                   {set: s(:block, s(:send, nil, :proc), s(:args, s(:arg, var)), 
                     s(:ivasgn, :"@#{var}", s(:lvar, var))),

data/lib/ruby2js/converter/class2.rb

@@ -206,7 +206,7 @@ module Ruby2JS
               @prop = "static #{m.children[1]}"
             end
 
-            @prop.sub! 'static', 'static async' if m.type == :asyncs
+            @prop = @prop.sub('static', 'static async') if m.type == :asyncs
 
             m = m.updated(:def, m.children[1..3])
             begin
@@ -224,6 +224,7 @@ module Ruby2JS
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}#@sep"
                 put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
@@ -231,12 +232,14 @@ module Ruby2JS
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "get #{var}() {#{@nl}return this.#{p}#{var}#@nl}"
               end
             elsif m.children[1] == :attr_writer
               m.children[2..-1].each_with_index do |child_sym, index2|
                 put @sep unless index2 == 0
                 var = child_sym.children.first
+                @rbstack.last[var] = s(:self)
                 put "set #{var}(#{var}) {#{@nl}this.#{p}#{var} = #{var}#@nl}"
               end
             elsif [:private, :protected, :public].include? m.children[1]
@@ -276,7 +279,7 @@ module Ruby2JS
             if m.type == :casgn and m.children[0] == nil
               @rbstack.last[m.children[1]] = name
 
-              if es2020
+              if es2022
                 put 'static '; put m.children[1].to_s; put ' = '
                 parse m.children[2]
                 skipped = false

data/lib/ruby2js/converter/def.rb

@@ -135,7 +135,7 @@ module Ruby2JS
           style = :statement
         end
 
-        if args.children.length == 1 and args.children.first.type != :restarg and style == :expression
+        if args.children.length == 1 and args.children.first.type == :arg and style == :expression
           parse args; put ' => '
         else
           put '('; parse args; put ') => '

data/lib/ruby2js/converter/hash.rb

@@ -7,6 +7,24 @@ module Ruby2JS
     #     (str "value")))
 
     handle :hash do |*pairs|
+      if not es2018 and pairs.any? {|pair| pair.type == :kwsplat}
+        groups = []
+        pending = []
+        while not pairs.empty?
+          pair = pairs.shift
+          if pair.type != :kwsplat
+            pending << pair
+          else
+            groups << s(:hash, *pending) unless pending.empty?
+            groups << pair.children.first
+            pending = []
+          end
+        end
+        groups << s(:hash, *pending) unless pending.empty?
+        parse s(:assign, s(:hash), *groups)
+        return
+      end
+
       compact do
         singleton = pairs.length <= 1
 
@@ -24,7 +42,7 @@ module Ruby2JS
                 pairs.unshift(*node.children.first.children)
                 index = 0
               else
-                puts '...'; parse node.children.first
+                put '...'; parse node.children.first
               end
 
               next

data/lib/ruby2js/converter/logical.rb

@@ -57,7 +57,7 @@ module Ruby2JS
       else
         group   = LOGICAL.include?( expr.type ) && 
           operator_index( :not ) < operator_index( expr.type )
-        group = true if expr and expr.type == :begin
+        group = true if expr and %i[begin in?].include? expr.type
 
         put '!'; put '(' if group; parse expr; put ')' if group
       end

data/lib/ruby2js/converter/return.rb

@@ -14,7 +14,8 @@ module Ruby2JS
 
     EXPRESSIONS = [ :array, :float, :hash, :int, :lvar, :nil, :send, :attr,
       :str, :sym, :dstr, :dsym, :cvar, :ivar, :zsuper, :super, :or, :and,
-      :block, :const, :true, :false, :xnode, :taglit, :self ]
+      :block, :const, :true, :false, :xnode, :taglit, :self,
+      :op_asgn, :and_asgn, :or_asgn ]
 
     handle :autoreturn do |*statements|
       return if statements == [nil]

data/lib/ruby2js/converter/send.rb

@@ -60,7 +60,7 @@ module Ruby2JS
         return parse args.first, @state
 
       elsif not receiver and [:lambda, :proc].include? method
-        if method == :lambda
+        if method == :lambda and @state != :statement
           return parse s(args.first.type, *args.first.children[0..-2],
             s(:autoreturn, args.first.children[-1])), @state
         else
@@ -75,10 +75,17 @@ module Ruby2JS
           (es2015 || @state == :statement ? group(receiver) : parse(receiver))
           put '('; parse_all(*args, join: ', '); put ')'
           return
+        elsif not t2 and m2 == :async and args2.length == 0
+          put '('; parse receiver; put ')()'
+          return
         end
       end
 
       # async/await support
+      # map "await x do...end" to "await x {...}" due to precedence rules
+      if method == :await and es2017 and receiver == nil and args.length == 2 and args[1].type == :def
+        args = [s(:block, args.first, *args.last.children[1..-1])]
+      end
       if es2017 and receiver == nil and args.length == 1
         if method == :async
           if args.first.type == :def
@@ -89,6 +96,15 @@ module Ruby2JS
             # async def o.m(x) {...}
             return parse args.first.updated :asyncs
 
+          elsif args.first.type == :send  and 
+            args.first.children.first.type == :block and 
+            args.first.children.last == :[]
+
+            put '(async '
+            parse args.first.children.first, :statement
+            put ')()'
+            return
+
           elsif args.first.type == :block
             block = args.first
 
@@ -157,6 +173,8 @@ module Ruby2JS
         group_target ||= GROUP_OPERATORS.include? target.type
       end
 
+      put 'await ' if @ast.type == :await
+
       if method == :!
         parse s(:not, receiver)
 
@@ -172,7 +190,7 @@ module Ruby2JS
         end
 
       elsif method == :[]=
-        parse receiver
+        (group_receiver ? group(receiver) : parse(receiver))
         if \
           args.length == 2 and [:str, :sym].include? args.first.type and
           args.first.children.first.to_s =~ /^[a-zA-Z]\w*$/
@@ -303,9 +321,16 @@ module Ruby2JS
       elsif method == :typeof and receiver == nil
         put 'typeof '; parse args.first
 
-      else
-        put 'await ' if @ast.type == :await
+      elsif ast.children[1] == :is_a? and receiver and args.length == 1
+        parse receiver; put ' instanceof '; parse args.first
+
+      elsif ast.children[1] == :kind_of? and receiver and args.length == 1
+        parse receiver; put ' instanceof '; parse args.first
 
+      elsif ast.children[1] == :instance_of? and receiver and args.length == 1
+        parse s(:send, s(:attr, receiver, :constructor), :==, args.first)
+
+      else
         if method == :bind and receiver&.type == :send
           if receiver.children.length == 2 and receiver.children.first == nil
             receiver = receiver.updated(:attr) # prevent autobind

data/lib/ruby2js/converter/xstr.rb

@@ -5,9 +5,8 @@ module Ruby2JS
     #   (str 'a'))
 
     handle :xstr do |*children|
-      str = eval capture { parse_all(*children) }
-
       if @binding
+        str = eval capture { parse_all(*children) }
         puts @binding.eval(str).to_s
       else
         raise SecurityError.new('Insecure operation, eval without binding option')

data/lib/ruby2js/filter/camelCase.rb

@@ -11,6 +11,8 @@ module Ruby2JS
 
       ALLOWLIST = %w{
         attr_accessor
+        attr_reader
+        attr_writer
         method_missing
       }
 

data/lib/ruby2js/filter/functions.rb

@@ -1,4 +1,5 @@
 require 'ruby2js'
+
 require 'regexp_parser/scanner'
 
 module Ruby2JS
@@ -7,7 +8,7 @@ module Ruby2JS
       include SEXP
 
       # require explicit opt-in to to class => constructor mapping
-      Filter.exclude :class
+      Filter.exclude :class, :call
 
       VAR_TO_ASSIGN = {
         lvar: :lvasgn,
@@ -23,7 +24,7 @@ module Ruby2JS
 
       def on_send(node)
         target, method, *args = node.children
-        return super if excluded?(method)
+        return super if excluded?(method) and method != :call
 
         if [:max, :min].include? method and args.length == 0
           if target.type == :array
@@ -36,13 +37,10 @@ module Ruby2JS
             return super
           end
 
-        elsif method == :call and target and target.type == :ivar
-          process S(:send, s(:self), "_#{target.children.first.to_s[1..-1]}",
-            *args)
+        elsif method == :call and target and 
+          (%i[ivar cvar].include?(target.type) or not excluded?(:call))
 
-        elsif method == :call and target and target.type == :cvar
-          process S(:send, s(:attr, s(:self), :constructor),
-            "_#{target.children.first.to_s[2..-1]}", *args)
+          S(:call, process(target), nil, *process_all(args))
 
         elsif method == :keys and args.length == 0 and node.is_method?
           process S(:send, s(:const, nil, :Object), :keys, target)

data/lib/ruby2js/filter/react.rb

@@ -222,7 +222,7 @@ module Ruby2JS
               scan_events[node.children]
             end
           end
-          scan_events[body]
+          scan_events[body] unless es2015
 
           # append statics (if any)
           unless statics.empty?
@@ -323,7 +323,7 @@ module Ruby2JS
             elsif mname == :render and not react_wunderbar_free(block, true)
               if \
                  block.length != 1 or not block.last or
-                not [:send, :block].include? block.last.type
+                not %i[send block xstr].include? block.last.type
               then
                 if @jsx
                   while block.length == 1 and block.first.type == :begin

data/lib/ruby2js/filter/require.rb

@@ -111,6 +111,7 @@ module Ruby2JS
 
               importname = Pathname.new(filename).relative_path_from(Pathname.new(dirname)).to_s
               importname = Pathname.new(@require_relative).join(importname).to_s
+              importname = "./#{importname}" unless importname.start_with? '.'
 
               prepend_list << s(:import, importname, *imports)
 
@@ -152,12 +153,7 @@ module Ruby2JS
             end
           end
         else
-          begin
-            require_expr, @require_expr = @require_expr, true
-            super
-          ensure
-            @require_expr = require_expr
-          end
+          super
         end
       end
 

data/lib/ruby2js/jsx.rb

@@ -11,7 +11,7 @@ module Ruby2JS
 
   class JsxParser
     def initialize(stream)
-      @stream = stream
+      @stream = stream.respond_to?(:next) ? stream : OpalEnumerator.new(stream)
       @state = :text
       @text = ''
       @result = []
@@ -288,4 +288,22 @@ module Ruby2JS
       self.class.new(@stream).parse(:element)
     end
   end
+
+  # Opal's enumerator doesn't currently support next and peek methods.
+  # Build a wrapper that adds those methods.
+  class OpalEnumerator
+    def initialize(stream)
+      @stream = stream.to_a
+    end
+
+    def next
+      raise StopIteration.new if @stream.empty?
+      @stream.shift
+    end
+
+    def peek
+      raise StopIteration.new if @stream.empty?
+      @stream.first
+    end
+  end
 end

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.summary = "Minimal yet extensible Ruby to JavaScript conversion.".freeze
 
   s.add_dependency('parser')
-  s.add_dependency('regexp_parser')
+  s.add_dependency('regexp_parser', '~> 2.0.3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -29,16 +29,16 @@ dependencies:
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.3
 description: |2
       The base package maps Ruby syntax to JavaScript semantics.
       Filters may be provided to add Ruby-specific or framework specific