further progress towards open classes

rubys · rubys · commit 358b2f5f3a12 · 2021-01-29T19:10:51.000-05:00
diff --git a/lib/ruby2js/converter/assign.rb b/lib/ruby2js/converter/assign.rb
@@ -93,10 +93,10 @@ class Converter
                   pair.updated(:defm, [nil, *pair.children[1..-1]]))
                 })
 
-    				elsif modname.type == :lvar and not es2015
-					    s(:for, s(:lvasgn, :$_), modname,
-					    s(:send, target, :[]=,
-					    s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
+            elsif modname.type == :lvar and not es2015
+              s(:for, s(:lvasgn, :$_), modname,
+              s(:send, target, :[]=,
+              s(:lvar, :$_), s(:send, modname, :[], s(:lvar, :$_))))
 
             else
               if es2017
diff --git a/lib/ruby2js/converter/class.rb b/lib/ruby2js/converter/class.rb
@@ -49,7 +49,7 @@ class Converter
       end
 
       body.compact!
-      visible = {}
+      visible = @namespace.getOwnProps
       body.map! do |m| 
         if \
           @ast.type == :class_module and m.type == :defs and
@@ -68,15 +68,15 @@ class Converter
             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?
               # 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
               # method: add to prototype
diff --git a/lib/ruby2js/converter/class2.rb b/lib/ruby2js/converter/class2.rb
@@ -40,7 +40,7 @@ class Converter
       begin
         class_name, @class_name = @class_name, name
         class_parent, @class_parent = @class_parent, inheritance
-        @rbstack.push({})
+        @rbstack.push(@namespace.getOwnProps)
         constructor = []
         index = 0
 
@@ -350,7 +350,7 @@ class Converter
       ensure
         @class_name = class_name
         @class_parent = class_parent
-        @rbstack.pop
+        @namespace.defineProps @rbstack.pop
       end
     end
   end
diff --git a/lib/ruby2js/converter/hash.rb b/lib/ruby2js/converter/hash.rb
@@ -73,7 +73,7 @@ class Converter
               if right.type == :hash
                 right.children.each do |pair|
                   next unless Parser::AST::Node === pair.children.last
-                  if [:block, :def, :async].include? pair.children.last.type
+                  if %i[block def defm async].include? pair.children.last.type
                     if @comments[pair.children.last]
                       (puts ''; singleton = false) if singleton
                       comments(pair.children.last).each do |comment|
@@ -130,6 +130,9 @@ class Converter
                 left.children.last == right.children.last
               then
                 parse right 
+              elsif right.type == :defm and %i[sym str].include? left.type and es2015
+                @prop = left.children.first.to_s
+                parse right
               else
 		if not [:str, :sym].include? left.type and es2015
 		  put '['
diff --git a/lib/ruby2js/namespace.rb b/lib/ruby2js/namespace.rb
@@ -22,8 +22,12 @@ def enter(name)
       previous
     end
 
-    def find(name)
-      @seen[active + resolve(name)]
+    def getOwnProps(name = nil)
+      @seen[active + resolve(name)] || {}
+    end
+
+    def defineProps(props)
+      @seen[active].merge! props || {}
     end
 
     def leave()
diff --git a/spec/es2015_spec.rb b/spec/es2015_spec.rb
@@ -496,7 +496,7 @@ def to_js_fn(string)
   describe 'module extensions' do
     it 'should handle methods' do
       to_js('++module M; def m(); end; end').
-        must_equal 'Object.assign(M, {m: function() {}})'
+        must_equal 'Object.assign(M, {m() {}})'
     end
   end
 
diff --git a/spec/namespace_spec.rb b/spec/namespace_spec.rb
@@ -11,21 +11,21 @@ def to_js(string)
     it "should extend modules" do
       to_js( 'module M; def f(); end; end;' +
              'module M; def g(); end; end').
-      must_equal('const M = {f: function() {}}; ' +
+      must_equal('const M = {f() {}}; ' +
         'M.g = function() {}');
     end
 
     it "should extend nested modules" do
       to_js( 'module M; module N; def f(); end; end; end;' +
              'module M::N; def g(); end; end').
-      must_equal('const M = {N: {f: function() {}}}; ' +
+      must_equal('const M = {N: {f() {}}}; ' +
         'M.N.g = function() {}');
     end
 
     it "should extend nested modules with getter" do
       to_js( 'module M; module N; def f(); end; end; end;' +
              'module M::N; def g; end; end').
-      must_equal('const M = {N: {f: function() {}}}; ' +
+      must_equal('const M = {N: {f() {}}}; ' +
         'Object.defineProperties(M.N, ' +
         'Object.getOwnPropertyDescriptors({get g() {}}))');
     end
@@ -46,5 +46,11 @@ def to_js(string)
         'Object.defineProperty(M.N.prototype, "g", ' +
         '{enumerable: true, configurable: true, get() {}})');
     end
+
+    it "should bind references to methods defined in original class" do
+      to_js( 'class C; def f(); end; end' +
+             'class C; def g; f; end; end').
+      must_include 'return this.f.bind(this)'
+    end
   end
 end
