Fix reference object constructor

Author: Geequlim

ecmascript_instance.h

@@ -22,6 +22,8 @@ class ECMAScriptInstance : public ScriptInstance {
 	virtual bool get(const StringName &p_name, Variant &r_ret) const override;
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const override;
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const override;
+	virtual bool property_can_revert(const StringName &p_name) const override { return false; };
+	virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const override { return false; };
 
 	virtual void get_method_list(List<MethodInfo> *p_list) const override;
 	virtual bool has_method(const StringName &p_method) const override;

ecmascript_language.cpp

@@ -48,7 +48,7 @@ ECMAScriptLanguage::~ECMAScriptLanguage() {
 void ECMAScriptLanguage::init() {
 	ERR_FAIL_NULL(main_binder);
 	main_binder->initialize();
-	execute_file("bin/test.js");
+	execute_file("modules/ECMAScript/tests/UnitTest.js");
 }
 
 void ECMAScriptLanguage::finish() {

ecmascript_language.h

@@ -34,7 +34,7 @@ class ECMAScriptLanguage : public ScriptLanguage {
 	}
 
 	_FORCE_INLINE_ virtual String get_name() const override { return "JavaScript"; }
-	const GDNativeInstanceBindingCallbacks *getInstanceBindingCallbacks() const { return &instance_binding_callbacks; }
+	const GDNativeInstanceBindingCallbacks *get_instance_binding_callbacks() const { return &instance_binding_callbacks; }
 #ifdef TOOLS_ENABLED
 	_FORCE_INLINE_ HashSet<Ref<ECMAScript> > &get_scripts() { return scripts; }
 #endif

quickjs/quickjs_binder.cpp

@@ -50,7 +50,7 @@ struct GodotMethodArguments {
 _FORCE_INLINE_ static ECMAScriptGCHandler *BINDING_DATA_FROM_GD(Object *p_object) {
 	ERR_FAIL_COND_V(p_object == NULL, NULL);
 	ECMAScriptLanguage *lang = ECMAScriptLanguage::get_singleton();
-	ECMAScriptGCHandler *bind = (ECMAScriptGCHandler *)(p_object)->get_instance_binding(lang, lang->getInstanceBindingCallbacks());
+	ECMAScriptGCHandler *bind = (ECMAScriptGCHandler *)(p_object)->get_instance_binding(lang, lang->get_instance_binding_callbacks());
 	return bind;
 }
 
@@ -1587,6 +1587,7 @@ Error QuickJSBinder::bind_gc_object(JSContext *ctx, ECMAScriptGCHandler *data, O
 		if (p_object->is_ref_counted()) {
 			RefCounted *ref = Object::cast_to<RefCounted>(p_object);
 			data->flags |= ECMAScriptGCHandler::FLAG_REFERENCE;
+#if 0
 			union {
 				Ref<RefCounted> *ref;
 				struct {
@@ -1596,6 +1597,9 @@ Error QuickJSBinder::bind_gc_object(JSContext *ctx, ECMAScriptGCHandler *data, O
 			u.ref = memnew(Ref<RefCounted>);
 			u.r->ref = ref;
 			data->godot_reference = u.ref;
+#else
+			data->godot_reference = memnew(Ref<RefCounted>(ref));
+#endif
 		}
 		JS_SetOpaque(obj, data);
 #ifdef DUMP_LEAKS
@@ -1633,7 +1637,10 @@ JSValue QuickJSBinder::object_constructor(JSContext *ctx, JSValueConst new_targe
 		js_obj = new_target;
 	} else {
 		Object *gd_obj = cls.gdclass->creation_func();
-		bind = BINDING_DATA_FROM_GD(ctx, gd_obj);
+		ECMAScriptLanguage *lang = ECMAScriptLanguage::get_singleton();
+		bind = new_gc_handler(ctx);
+		bind_gc_object(ctx, bind, gd_obj);
+		gd_obj->set_instance_binding(lang, bind, lang->get_instance_binding_callbacks());
 		js_obj = JS_MKPTR(JS_TAG_OBJECT, bind->ecma_object);
 
 		if (JS_IsFunction(ctx, new_target)) {

tests/UnitTest.js

@@ -0,0 +1,79 @@
+// @ts-nocheck
+const TEST_ENTRIES = new Map();
+
+
+test('godot', typeof godot === 'object', 'core');
+test('new Object', () => {
+	let obj = new godot.Object();
+	let ok = obj && obj instanceof godot.Object;
+	obj.free();
+	return ok;
+}, 'core');
+
+test('new Resource', () => {
+	let obj = new godot.Resource();
+	let ok = obj && obj.get_class() === 'Resource';
+	return ok;
+}, 'core');
+
+
+// --------------------------- Unit Test Implementation ------------------------
+function test(description, blcok, group = 'default') {
+	const entries = TEST_ENTRIES.get(group) || [];
+	entries.push({ description, blcok });
+	TEST_ENTRIES.set(group, entries);
+}
+function runEntry(entry) {
+	return new Promise((resolve, reject) => {
+		switch (typeof (entry.blcok)) {
+			case 'boolean':
+				return resolve(entry.blcok);
+			case 'function': {
+				try {
+					resolve(entry.blcok());
+				} catch (error) {
+					console.error(error);
+					resolve(false);
+				}
+			}
+			break;
+			case 'object':
+				if (entry.blcok instanceof Promise) {
+					entry.blcok.then(() => {
+						resolve(true);
+					}).catch(err => {
+						resolve(false);
+					});
+				}
+				break;
+			default:
+				return resolve(false);
+		}
+	});
+}
+async function run() {
+	let count = 0;
+	let passed = 0;
+	for (const [group, entries] of TEST_ENTRIES) {
+		console.log(`Start test ${group}`);
+		count += entries.length;
+		let groupCount = 0;
+		for (let i = 0; i < entries.length; i++) {
+			const entry = entries[i];
+			const ret = await runEntry(entry);
+			if (ret) {
+				passed++;
+				groupCount++;
+				console.log(`\t[${i + 1}/${entries.length}][ √ ] ${entry.description}`);
+			}
+			else {
+				console.error(`\t[${i + 1}/${entries.length}][ X ] ${entry.description}`);
+			}
+		}
+		const logFunc2 = groupCount == entries.length ? console.log : console.warn;
+		logFunc2(`\tTest ${group} finished: ${groupCount}/${entries.length} passed`);
+	}
+	const logFunc = passed == count ? console.log : console.warn;
+	logFunc(`Test complete: ${passed}/${count} passed`);
+}
+const _ = run(); // QuickJS BUG ? 返回的是一个 Promise 对象，不赋给临时变量，会导致 Promise 对象无法被 GC