Merge pull request #41 from Distributive-Network/slightly-improved-determining-js-classes

Detect es6 classes via toString starting with word 'class'

Author: YarnSaw

dcp/js/utils.py

@@ -26,7 +26,9 @@ def isclass(ref):
     # if a js object prototype has more than one own property, it is a class
     proto_own_prop_names = pm.eval(
         'x=>(x?.prototype ? Object.getOwnPropertyNames(x?.prototype) : [])')
-    return len(proto_own_prop_names(ref)) > 1
+    # @TODO: what if instead of coming up with a better way, I just made it more cursed?
+    is_es6_class = pm.eval('x => /^class /.test(Function.prototype.toString.call(x))')
+    return len(proto_own_prop_names(ref)) > 1 or is_es6_class(ref)
 
 
 def class_name(JSClass):

tests/test_api/test_wallet.py

@@ -8,7 +8,7 @@ class TestWallet(unittest.TestCase):
 
     def test_smoke_keystore_address(self):
         ks = dcp.wallet.get()
-        self.assertTrue(isinstance(ks, dcp.wallet.Keystore))
+        self.assertTrue(pm.eval("(x)=> x instanceof dcp.wallet.Keystore")(ks.js_ref))
 
         address = ks.address
         self.assertTrue(isinstance(address, dcp.wallet.Address))