ruby2js 3.5.1 → 4.0.0

data/lib/ruby2js/converter/class.rb

@@ -11,13 +11,27 @@ module Ruby2JS
     # NOTE: class_extend is not generated by the parser, but instead produced
     #       when ++class is encountered; it signals that this construct is
     #       meant to extend an already existing JavaScrpt class.
+    #
+    #       class_hash is an anonymous class as a value in a hash; the
+    #       name has already been output so should be ignored other than
+    #       in determining the namespace.
+    #
+    #       class_module is a module that to be re-processed by this handler
+    #       given the similarity between the two structures.
 
-    handle :class, :class_extend, :class_module do |name, inheritance, *body|
-      if @ast.type != :class
+    handle :class, :class_hash, :class_extend, :class_module do |name, inheritance, *body|
+      extend = @namespace.enter(name) unless @ast.type == :class_module
+
+      if !%i(class class_hash).include?(@ast.type) or extend
         init = nil
       else
-        if es2015
-          parse @ast.updated(:class2)
+        if es2015 and not extend
+          if @ast.type == :class_hash
+            parse @ast.updated(:class2, [nil, *@ast.children[1..-1]])
+          else
+            parse @ast.updated(:class2)
+          end
+          @namespace.leave unless @ast.type == :class_module
           return
         end
 
@@ -35,7 +49,7 @@ module Ruby2JS
       end
 
       body.compact!
-      visible = {}
+      visible = @namespace.getOwnProps
       body.map! do |m| 
         if \
           @ast.type == :class_module and m.type == :defs and
@@ -45,7 +59,7 @@ module Ruby2JS
         end
 
         node = if m.type == :def
-          if m.children.first == :initialize
+          if m.children.first == :initialize and !visible[:initialize]
             # constructor: remove from body and overwrite init function
             init = m
             nil
@@ -54,17 +68,20 @@ module Ruby2JS
             sym = :"#{m.children.first.to_s[0..-2]}"
             s(:prop, s(:attr, name, :prototype), sym =>
                 {enumerable: s(:true), configurable: s(:true),
-                set: s(:block, s(:send, nil, :proc), *m.children[1..-1])})
+                set: s(:defm, nil, *m.children[1..-1])})
           else
-            visible[m.children[0]] = s(:self)
 
             if not m.is_method?
+              visible[m.children[0]] = s(:self)
+
               # property getter
               s(:prop, s(:attr, name, :prototype), m.children.first =>
                   {enumerable: s(:true), configurable: s(:true),
-                  get: s(:block, s(:send, nil, :proc), m.children[1],
+                  get: s(:defm, nil, m.children[1],
                     m.updated(:autoreturn, m.children[2..-1]))})
             else
+              visible[m.children[0]] = s(:autobind, s(:self))
+
               # method: add to prototype
               s(:method, s(:attr, name, :prototype),
                 :"#{m.children[0].to_s.chomp('!')}=",
@@ -90,7 +107,7 @@ module Ruby2JS
           else
             # class method definition: add to prototype
             s(:prototype, s(:send, name, "#{m.children[1]}=",
-              s(:block, s(:send, nil, :proc), *m.children[2..-1])))
+              s(:defm, nil, *m.children[2..-1])))
           end
 
         elsif m.type == :send and m.children.first == nil
@@ -125,9 +142,10 @@ module Ruby2JS
           elsif m.children[1] == :include
             s(:send, s(:block, s(:send, nil, :lambda), s(:args),
               s(:begin, *m.children[2..-1].map {|modname|
-              s(:for, s(:lvasgn, :$_), modname,
-              s(:send, s(:attr, name, :prototype), :[]=,
-              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+                @namespace.defineProps @namespace.find(modname)
+                s(:for, s(:lvasgn, :$_), modname,
+                s(:send, s(:attr, name, :prototype), :[]=,
+                s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
               })), :[])
           elsif [:private, :protected, :public].include? m.children[1]
             raise Error.new("class #{m.children[1]} is not supported", @ast)
@@ -160,17 +178,23 @@ module Ruby2JS
           s(:send, s(:attr, name, :prototype),
             "#{m.children[0].children.first}=", 
             s(:attr, s(:attr, name, :prototype), m.children[1].children.first))
-        elsif m.type == :class
+        elsif m.type == :class or m.type == :module
           innerclass_name = m.children.first
           if innerclass_name.children.first
             innerclass_name = innerclass_name.updated(nil,
-              [s(:attr, innerclass_name.children[0], name),
+              [s(:attr, name, innerclass_name.children[0].children.last),
               innerclass_name.children[1]])
           else
             innerclass_name = innerclass_name.updated(nil,
               [name, innerclass_name.children[1]])
           end
           m.updated(nil, [innerclass_name, *m.children[1..-1]])
+        elsif @ast.type == :class_module
+          m
+        elsif m.type == :defineProps
+          @namespace.defineProps m.children.first
+          visible.merge! m.children.first
+          nil
         else
           raise Error.new("class #{ m.type } not supported", @ast)
         end
@@ -194,7 +218,7 @@ module Ruby2JS
       # merge property definitions
       combine_properties(body)
 
-      if inheritance
+      if inheritance and (@ast.type != :class_extend and !extend)
         body.unshift s(:send, name, :prototype=, 
           s(:send, s(:const, nil, :Object), :create,
             s(:attr, inheritance, :prototype))),
@@ -206,10 +230,14 @@ module Ruby2JS
         methods = 0
         start = 0
         body.each do |node|
-          if [:method, :prop].include? node.type and 
+          if (node.type == :method or (node.type == :prop and es2015)) and
             node.children[0].type == :attr and
             node.children[0].children[1] == :prototype
             methods += 1
+          elsif node.type == :class and @ast.type == :class_module and es2015
+            methods += 1 if node.children.first.children.first == name
+          elsif node.type == :module and @ast.type == :class_module
+            methods += 1 if node.children.first.children.first == name
           elsif methods == 0
             start += 1
           else
@@ -219,14 +247,22 @@ module Ruby2JS
 
         # collapse sequence to a single assignment
         if \
-          @ast.type != :class_extend and
-          (methods > 1 or (methods == 1 and body[start].type == :prop))
+          @ast.type == :class_module or methods > 1 or 
+          body[start]&.type == :prop
         then
           pairs = body[start...start+methods].map do |node|
             if node.type == :method
               replacement = node.updated(:pair, [
                 s(:str, node.children[1].to_s.chomp('=')),
                 node.children[2]])
+            elsif node.type == :class and node.children.first.children.first == name
+              sym = node.children.first.children.last
+              replacement = s(:pair, s(:sym, sym),
+                s(:class_hash, s(:const, nil, sym), nil, node.children.last))
+            elsif node.type == :module and node.children.first.children.first == name
+              sym = node.children.first.children.last
+              replacement = s(:pair, s(:sym, sym),
+                s(:module_hash, s(:const, nil, sym), node.children.last))
             else
               replacement = node.children[1].map do |prop, descriptor|
                 node.updated(:pair, [s(:prop, prop), descriptor])
@@ -244,12 +280,30 @@ module Ruby2JS
           end
 
           if @ast.type == :class_module
+            start = 0 if methods == 0
+            if name
+              body[start...start+methods] =
+                s(:casgn, *name.children, s(:hash, *pairs.flatten))
+            else
+              body[start...start+methods] = s(:hash, *pairs.flatten)
+            end
+          elsif @ast.type == :class_extend or extend
             body[start...start+methods] =
-              s(:casgn, *name.children, s(:hash, *pairs.flatten))
+              s(:assign, body[start].children.first, s(:hash, *pairs.flatten))
           else
             body[start...start+methods] =
               s(:send, name, :prototype=, s(:hash, *pairs.flatten))
           end
+
+        elsif (@ast.type == :class_extend or extend) and methods > 1
+
+          pairs = body[start...start+methods].map do |node|
+            node.updated(:pair, [
+               s(:sym, node.children[1].to_s[0..-2]), node.children[2]])
+          end
+
+          body[start...start+methods] =
+            s(:assign, body[start].children.first, s(:hash, *pairs))
         end
       end
 
@@ -258,7 +312,7 @@ module Ruby2JS
         constructor = init.updated(:constructor, [name, *init.children[1..-1]])
         @comments[constructor] = @comments[init] unless @comments[init].empty?
 
-        if @ast.type == :class_extend
+        if @ast.type == :class_extend or extend
           if es2015
             constructor = s(:masgn, s(:mlhs, 
               s(:attr, s(:casgn, *name.children, constructor), :prototype)), 
@@ -285,6 +339,7 @@ module Ruby2JS
 
         # add locally visible interfaces to rbstack.  See send.rb, const.rb
         @rbstack.push visible
+        @rbstack.last.merge!(@namespace.find(inheritance)) if inheritance
 
         parse s(:begin, *body.compact), :statement
       ensure
@@ -292,6 +347,7 @@ module Ruby2JS
         @class_name = class_name
         @class_parent = class_parent
         @rbstack.pop
+        @namespace.leave unless @ast.type == :class_module
       end
     end
 

data/lib/ruby2js/converter/class2.rb

@@ -9,11 +9,24 @@ module Ruby2JS
     # NOTE: this is the es2015 version of class
 
     handle :class2 do |name, inheritance, *body|
-      if name.type == :const and name.children.first == nil
+      body.compact!
+      while body.length == 1 and body.first.type == :begin
+        body = body.first.children 
+      end
+
+      proxied = body.find do |node| 
+        node.type == :def and node.children.first == :method_missing
+      end
+
+      if not name
+        put 'class'
+      elsif name.type == :const and name.children.first == nil
         put 'class '
         parse name
+        put '$' if proxied
       else
         parse name
+        put '$' if proxied
         put ' = class'
       end
 
@@ -24,15 +37,11 @@ module Ruby2JS
 
       put " {"
 
-      body.compact!
-      while body.length == 1 and body.first.type == :begin
-        body = body.first.children 
-      end
-
       begin
         class_name, @class_name = @class_name, name
         class_parent, @class_parent = @class_parent, inheritance
-        @rbstack.push({})
+        @rbstack.push(@namespace.getOwnProps)
+        @rbstack.last.merge!(@namespace.find(inheritance)) if inheritance
         constructor = []
         index = 0
 
@@ -40,10 +49,17 @@ module Ruby2JS
         body.each do |m|
           if m.type == :def
             prop = m.children.first
-            if prop == :initialize
+            if prop == :initialize and !@rbstack.last[:initialize]
               constructor = m.children[2..-1]
-            elsif not prop.to_s.end_with? '='
-              @rbstack.last[prop] = s(:self)
+            elsif prop.to_s.end_with? '='
+              @rbstack.last[prop.to_s[0..-2].to_sym] = s(:autobind, s(:self))
+            else
+              @rbstack.last[prop] = m.is_method? ? s(:autobind, s(:self)) : s(:self)
+            end
+          elsif m.type == :send and m.children[0..1] == [nil, :async]
+            if m.children[2].type == :def
+              prop = m.children[2].children.first
+              @rbstack.last[prop] = s(:autobind, s(:self))
             end
           end
         end
@@ -64,21 +80,21 @@ module Ruby2JS
               walk[child] if child.is_a? Parser::AST::Node
             end
 
-	    if ast.type == :send and ast.children.first == nil
-	      if ast.children[1] == :attr_accessor
-		ast.children[2..-1].each_with_index do |child_sym, index2|
-		  ivars << :"@#{child_sym.children.first}"
-		end
-	      elsif ast.children[1] == :attr_reader
-		ast.children[2..-1].each_with_index do |child_sym, index2|
-		  ivars << :"@#{child_sym.children.first}"
-		end
-	      elsif ast.children[1] == :attr_writer
-		ast.children[2..-1].each_with_index do |child_sym, index2|
-		  ivars << :"@#{child_sym.children.first}"
-		end
-	      end
-	    end
+            if ast.type == :send and ast.children.first == nil
+              if ast.children[1] == :attr_accessor
+                ast.children[2..-1].each_with_index do |child_sym, index2|
+                  ivars << :"@#{child_sym.children.first}"
+                end
+              elsif ast.children[1] == :attr_reader
+                ast.children[2..-1].each_with_index do |child_sym, index2|
+                  ivars << :"@#{child_sym.children.first}"
+                end
+              elsif ast.children[1] == :attr_writer
+                ast.children[2..-1].each_with_index do |child_sym, index2|
+                  ivars << :"@#{child_sym.children.first}"
+                end
+              end
+            end
 
           end
           walk[@ast]
@@ -140,10 +156,10 @@ module Ruby2JS
             end
           end
 
-          if m.type == :def || m.type == :async
+          if m.type == :def || m.type == :defm || m.type == :async
             @prop = m.children.first
 
-            if @prop == :initialize
+            if @prop == :initialize and !@rbstack.last[:initialize]
               @prop = :constructor 
 
               if constructor == [] or constructor == [(:super)]
@@ -228,13 +244,27 @@ module Ruby2JS
             else
               if m.children[1] == :include
                 m = m.updated(:begin, m.children[2..-1].map {|mname|
-                  s(:send, s(:const, nil, :Object), :assign,
-                  s(:attr, name, :prototype), mname)})
+                  @namespace.defineProps @namespace.find(mname)
+                  s(:assign, s(:attr, name, :prototype), mname)
+                })
               end
 
               skipped = true
             end
 
+          elsif es2022 and \
+            m.type == :send and m.children.first.type == :self and \
+            m.children[1].to_s.end_with? '='
+
+            put 'static '
+            parse m.updated(:lvasgn, [m.children[1].to_s.sub('=', ''),
+              m.children[2]])
+
+          elsif m.type == :defineProps
+            skipped = true
+            @namespace.defineProps m.children.first
+            @rbstack.last.merge! m.children.first
+
           else
             if m.type == :cvasgn and !underscored_private
               put 'static #$'; put m.children[0].to_s[2..-1]; put ' = '
@@ -257,7 +287,7 @@ module Ruby2JS
           end
 
           if skipped
-            post << [m, comments] if skipped
+            post << [m, comments] unless m.type == :defineProps
           else
             comments.reverse.each {|comment| insert location, comment}
           end
@@ -294,15 +324,56 @@ module Ruby2JS
             else
               parse m.updated(:send, [@class_name, *m.children[1..-1]])
             end
+          elsif m.type == :block and m.children.first.children.first == nil
+            # class method calls passing a block
+            parse s(:block, s(:send, name, *m.children.first.children[1..-1]), 
+              *m.children[1..-1])
           else
             parse m, :statement
           end
         end
 
+        if proxied
+          put @sep
+
+          rename = name.updated(nil, [name.children.first, name.children.last.to_s + '$'])
+
+          if proxied.children[1].children.length == 1
+            # special case: if method_missing only has on argument, call it
+            # directly (i.e., don't pass arguments).  This enables
+            # method_missing to return instance attributes (getters) as well
+            # as bound functions (methods).
+            forward = s(:send, s(:lvar, :obj), :method_missing, s(:lvar, :prop))
+          else
+            # normal case: return a function which, when called, will call
+            # method_missing with method name and arguments.
+            forward = s(:block, s(:send, nil, :proc), s(:args, s(:restarg, :args)),
+            s(:send, s(:lvar, :obj), :method_missing, s(:lvar, :prop),
+            s(:splat, s(:lvar, :args))))
+          end
+
+          proxy = s(:return, s(:send, s(:const, nil, :Proxy), :new,
+            s(:send, rename, :new, s(:splat, s(:lvar, :args))),
+            s(:hash, s(:pair, s(:sym, :get), s(:block, s(:send, nil, :proc),
+            s(:args, s(:arg, :obj), s(:arg, :prop)),
+            s(:if, s(:in?, s(:lvar, :prop), s(:lvar, :obj)),
+            s(:return, s(:send, s(:lvar, :obj), :[], s(:lvar, :prop))),
+            s(:return, forward))))))
+          )
+
+          if name.children.first == nil
+            proxy = s(:def, name.children.last, s(:args, s(:restarg, :args)), proxy)
+          else
+            proxy = s(:defs, *name.children, s(:args, s(:restarg, :args)), proxy)
+          end
+
+          parse proxy
+        end
+
       ensure
         @class_name = class_name
         @class_parent = class_parent
-        @rbstack.pop
+        @namespace.defineProps @rbstack.pop
       end
     end
   end

data/lib/ruby2js/converter/def.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     #     (arg :x)
     #   (...)
 
-    handle :def, :defm, :async do |name, args, body=nil|
+    handle :def, :defm, :async, :deff do |name, args, body=nil|
       body ||= s(:begin)
 
       add_implicit_block = false
@@ -106,7 +106,7 @@ module Ruby2JS
       # es2015 fat arrow support
       if \
         not name and es2015 and @state != :method and @ast.type != :defm and 
-        not @prop
+        @ast.type != :deff and not @prop
       then
         expr = body
         expr = expr.children.first while expr.type == :autoreturn
@@ -118,6 +118,10 @@ module Ruby2JS
         if EXPRESSIONS.include? expr.type
           if expr.type == :send and expr.children[0..1] == [nil, :raise]
             style = :statement
+          elsif expr.type == :send and expr.children.length == 2 and
+            expr.children.first == nil and @rbstack.last and
+            @rbstack.last[expr.children[1]]&.type == :autobind
+            style = :statement
           else
             style = :expression
           end
@@ -131,7 +135,7 @@ module Ruby2JS
           style = :statement
         end
 
-        if args.children.length == 1 and style == :expression
+        if args.children.length == 1 and args.children.first.type != :restarg and style == :expression
           parse args; put ' => '
         else
           put '('; parse args; put ') => '