Allow passing Object when calling an Object.

Author: PetterS

module.c

@@ -31,6 +31,34 @@ static void object_dealloc(ObjectData *self) {
 	Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
+static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds);
+
+static PyObject *object_json(ObjectData *self) {
+	JSValue global = JS_GetGlobalObject(self->context);
+	JSValue JSON = JS_GetPropertyStr(self->context, global, "JSON");
+	JSValue stringify = JS_GetPropertyStr(self->context, JSON, "stringify");
+	JSValueConst args[1] = {self->object};
+	JSValue json_string = JS_Call(self->context, stringify, JSON, 1, args);
+	JS_FreeValue(self->context, global);
+	JS_FreeValue(self->context, JSON);
+	JS_FreeValue(self->context, stringify);
+	return quickjs_to_python(self->context, json_string);
+}
+
+static PyMethodDef object_methods[] = {
+    {"json", object_json, METH_NOARGS, "Converts to a JSON string."}, {NULL} /* Sentinel */
+};
+
+static PyTypeObject Object = {PyVarObject_HEAD_INIT(NULL, 0).tp_name = "_quickjs.Object",
+                              .tp_doc = "Quickjs object",
+                              .tp_basicsize = sizeof(ObjectData),
+                              .tp_itemsize = 0,
+                              .tp_flags = Py_TPFLAGS_DEFAULT,
+                              .tp_new = object_new,
+                              .tp_dealloc = (destructor)object_dealloc,
+                              .tp_call = object_call,
+                              .tp_methods = object_methods};
+
 static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 	if (self->context == NULL) {
 		Py_RETURN_NONE;
@@ -40,6 +68,7 @@ static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 		PyObject *item = PyTuple_GetItem(args, i);
 		if (PyLong_Check(item)) {
 		} else if (PyUnicode_Check(item)) {
+		} else if (PyObject_IsInstance(item, &Object)) {
 		} else {
 			PyErr_Format(PyExc_ValueError, "Unsupported type when calling quickjs object");
 			return NULL;
@@ -52,6 +81,8 @@ static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 			jsargs[i] = JS_MKVAL(JS_TAG_INT, PyLong_AsLong(item));
 		} else if (PyUnicode_Check(item)) {
 			jsargs[i] = JS_NewString(self->context, PyUnicode_AsUTF8(item));
+		} else if (PyObject_IsInstance(item, &Object)) {
+			jsargs[i] = JS_DupValue(self->context, ((ObjectData *)item)->object);
 		}
 	}
 	JSValue value = JS_Call(self->context, self->object, JS_NULL, nargs, jsargs);
@@ -62,32 +93,6 @@ static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 	return quickjs_to_python(self->context, value);
 }
 
-static PyObject *object_json(ObjectData *self) {
-	JSValue global = JS_GetGlobalObject(self->context);
-	JSValue JSON = JS_GetPropertyStr(self->context, global, "JSON");
-	JSValue stringify = JS_GetPropertyStr(self->context, JSON, "stringify");
-	JSValueConst args[1] = {self->object};
-	JSValue json_string = JS_Call(self->context, stringify, JSON, 1, args);
-	JS_FreeValue(self->context, global);
-	JS_FreeValue(self->context, JSON);
-	JS_FreeValue(self->context, stringify);
-	return quickjs_to_python(self->context, json_string);
-}
-
-static PyMethodDef object_methods[] = {
-    {"json", object_json, METH_NOARGS, "Converts to a JSON string."}, {NULL} /* Sentinel */
-};
-
-static PyTypeObject Object = {PyVarObject_HEAD_INIT(NULL, 0).tp_name = "_quickjs.Object",
-                              .tp_doc = "Quickjs object",
-                              .tp_basicsize = sizeof(ObjectData),
-                              .tp_itemsize = 0,
-                              .tp_flags = Py_TPFLAGS_DEFAULT,
-                              .tp_new = object_new,
-                              .tp_dealloc = (destructor)object_dealloc,
-                              .tp_call = object_call,
-                              .tp_methods = object_methods};
-
 static PyObject *quickjs_to_python(JSContext *context, JSValue value) {
 	int tag = JS_VALUE_GET_TAG(value);
 	PyObject *return_value = NULL;

test_quickjs.py

@@ -96,6 +96,18 @@ def test_function_call_str_three_args(self):
             """)
         self.assertEqual(f("1", "2", "3"), "1 hej 2 ho 3")
 
+    def test_function_call_object(self):
+        d = self.context.eval("d = {data: 42};")
+        f = self.context.eval("""
+            f = function(d) {
+                return d.data;
+            }
+            """)
+        self.assertEqual(f(d), 42)
+        # Try again to make sure refcounting works.
+        self.assertEqual(f(d), 42)
+        self.assertEqual(f(d), 42)
+
     def test_function_call_unsupported_arg(self):
         f = self.context.eval("""
             f = function(x) {