Update generate_builtin_api.py, javascript.cpp, javascript.h, and 13 more files

Author: fire

SCsub

@@ -30,23 +30,20 @@ def dump_text_file_to_cpp(file):
 
 
 if JS_ENGINE == "quickjs":
-    # generate builtin binding code
     import generate_builtin_api
 
     generate_builtin_api.generate_api_json(os.path.join(GetLaunchDir(), "modules", os.path.basename(os.getcwd())))
     import thirdparty.quickjs.builtin_binding_generator
 
     thirdparty.quickjs.builtin_binding_generator.generate_builtin_bindings()
-    # build quickjs source
     version = open("thirdparty/quickjs/quickjs/VERSION.txt", "r").read().split("\n")[0]
     env_module.Append(CPPDEFINES={"QUICKJS_CONFIG_VERSION": '"' + version + '"'})
     env_module.Append(CPPDEFINES=["CONFIG_BIGNUM"])
     if "release" not in (env_module["target"] or ""):
         env_module.Append(CPPDEFINES={"DUMP_LEAKS": 1})
         env_module.Append(CPPDEFINES={"QUICKJS_WITH_DEBUGGER": 1})
     env_module.Append(CPPPATH=["thirdparty/quickjs/quickjs"])
-    # env_module.Append(CXXFLAGS=["-std=c++20"])
-    # env_module.Append(CCFLAGS=["-std=c++20"])
+    env_module.Append(CPPPATH=["thirdparty/quickjs"])
     if TOOLS:
         env_module.add_source_files(env.modules_sources, "tools/editor_tools.cpp")
     env_module.add_source_files(env.modules_sources, "thirdparty/quickjs/quickjs_builtin_binder.gen.cpp")

generate_builtin_api.py

@@ -314,6 +314,8 @@ def parse_class(cls):
             continue  # ignored methods
         if class_name == "PackedByteArray" and method_name.startswith("encode_") or method_name.startswith("decode_"):
             continue  # ignore decode/encode methods
+        if class_name == "PackedByteArray" and method_name == "get_string_from_wchar":
+            continue
         return_type = m.find("return").attrib["type"] if m.find("return") != None else "void"
         if return_type in TYPE_MAP:
             return_type = TYPE_MAP[return_type]

javascript.cpp

@@ -349,7 +349,7 @@ void JavaScriptModule::_bind_methods() {
 }
 
 JavaScriptModule::JavaScriptModule() {
-	set_source_code("module.exports = {};" ENDL);
+	set_source_code("module.exports = {};\n");
 }
 
 Ref<Resource> ResourceFormatLoaderJavaScriptModule::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, ResourceFormatLoader::CacheMode p_cache_mode) {

javascript.h

@@ -34,9 +34,10 @@
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/object/script_language.h"
-#include "javascript_binder.h"
 #include "scene/resources/text_file.h"
 
+#include "javascript_binder.h"
+
 #define EXT_JSCLASS "mjs"
 #define EXT_JSMODULE "js"
 #define EXT_JSON "json"

javascript_instance.h

@@ -32,6 +32,7 @@
 #define JAVASCRIPT_INSTANCE_H
 
 #include "core/object/script_language.h"
+
 #include "core/variant/callable.h"
 #include "javascript.h"
 #include "javascript_binder.h"

javascript_language.cpp

@@ -31,7 +31,11 @@
 #include "javascript_language.h"
 #include "core/io/file_access.h"
 #include "core/object/class_db.h"
-JavaScriptLanguage *JavaScriptLanguage::singleton = NULL;
+
+#include "javascript_binder.h"
+#include "quickjs_binder.h"
+
+JavaScriptLanguage *JavaScriptLanguage::singleton = nullptr;
 
 namespace JavaScriptInstanceBindingCallbacks {
 

javascript_language.h

@@ -32,8 +32,9 @@
 #define JAVASCRIPT_LANGUAGE_H
 
 #include "core/object/script_language.h"
+
 #include "javascript.h"
-#include "thirdparty/quickjs/quickjs_binder.h"
+#include "javascript_binder.h"
 
 class CallableMiddleman : public Object {
 	GDCLASS(CallableMiddleman, Object);

register_types.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "register_types.h"
+
 #include "javascript.h"
 #include "javascript_language.h"
 
@@ -45,31 +46,11 @@ class EditorExportJavaScript : public EditorExportPlugin {
 public:
 	virtual void _export_file(const String &p_path, const String &p_type, const HashSet<String> &p_features) override {
 		String script_key;
-		// int script_mode = EditorExportPreset::MODE_SCRIPT_COMPILED;
 		const Ref<EditorExportPreset> &preset = get_export_preset();
-
-		// if (preset.is_valid()) {
-		// 	script_mode = preset->get_file_export_mode(p_path);
-		// }
-
-		// if (script_mode == EditorExportPreset::MODE_SCRIPT_TEXT)
-		// 	return;
-
 		String extension = p_path.get_extension();
-		if (extension != EXT_JSCLASS && extension != EXT_JSMODULE)
+		if (extension != EXT_JSCLASS && extension != EXT_JSMODULE) {
 			return;
-
-// 		if (script_mode == EditorExportPreset::FileExportMode::MODE_SCRIPT_COMPILED) {
-// #if 0 // Disable compile to bytecode as it is not battle tested on all platform
-// 			Error err;
-// 			String code = FileAccess::get_file_as_string(p_path, &err);
-// 			ERR_FAIL_COND(err != OK);
-
-// 			Vector<uint8_t> file;
-// 			ERR_FAIL_COND(JavaScriptLanguage::get_singleton()->get_main_binder()->compile_to_bytecode(code, p_path, file) != OK);
-// 			add_file(p_path.get_basename() + "." + extension + "b", file, true);
-// #endif
-// 		}
+		}
 	}
 	virtual String _get_name() const override { return "JavaScript"; }
 };

thirdparty/quickjs/builtin_binding_generator.py

@@ -755,8 +755,9 @@ def generate_class_bind_action(cls, constructor):
 def generate_builtin_bindings():
     Template = """\
 #include "core/variant/variant.h"
-#include "quickjs_binder.h"
+
 #include "quickjs_builtin_binder.h"
+#include "quickjs_worker.h"
 
 #ifndef inf
 #define inf INFINITY