feat: Ensure codegen files are type checked.

We want users to be able to have skipLibCheck: true in their
tsconfig. However, we do need to ensure that our codegen files are
not skipped in such cases. So we no longer use the .d.ts extension.

"Generate Godot d.ts" is now "Generate types" and in addition to
generating all Godot and project types (which it already did), the
autogen directory will now wiped of all files/directories before
commencing generation. This ensures old generated files no longer
pollute the project.

.changeset/epimachinae-anemonal-unbearableness.md

@@ -0,0 +1,11 @@
+---
+"@godot-js/editor": patch
+---
+
+**Types:** "Generate Godot d.ts" in the UI is now "Generate types" and in addition to
+generating all Godot and project types (which it already did), the
+autogen directory will now be wiped of all files/directories before
+commencing generation. This ensures old generated files no longer
+pollute the project.
+
+

bridge/jsb_editor_utility_funcs.cpp

@@ -786,7 +786,7 @@ namespace jsb
         v8::HandleScope handle_scope(isolate);
         v8::Local<v8::Context> context = isolate->GetCurrentContext();
 
-        List<StringName> exposed_class_list = internal::NamingUtil::get_exposed_class_list();
+        List<StringName> exposed_class_list = internal::NamingUtil::get_exposed_original_class_list();
         v8::Local<v8::Array> array = v8::Array::New(isolate, exposed_class_list.size());
         int index = 0;
 

bridge/jsb_environment.cpp

@@ -319,7 +319,7 @@ namespace jsb
             // Populate StringNames replacement list so that classes can be lazily loaded by their exposed class name.
             if (internal::Settings::get_camel_case_bindings_enabled())
             {
-                List<StringName> exposed_class_list = internal::NamingUtil::get_exposed_class_list();
+                List<StringName> exposed_class_list = internal::NamingUtil::get_exposed_original_class_list();
 
                 for (auto it = exposed_class_list.begin(); it != exposed_class_list.end(); ++it)
                 {

internal/jsb_naming_util.cpp

@@ -67,6 +67,27 @@ namespace jsb::internal
 			{ "XRAPI", "XRApi" },
 	});
 
+	const HashSet<String> omitted_original_classes_set = {
+		"IPUnix",
+		"ScriptEditorDebugger",
+		"Thread",
+		"Semaphore",
+
+		// GodotJS related clases
+		"GodotJSEditorPlugin",
+		"GodotJSExportPlugin",
+		"GodotJSREPL",
+		"GodotJSScript",
+		"GodotJSEditorHelper",
+		"GodotJSEditorProgress",
+
+		// GDScript related classes
+		"GDScript",
+		"GDScriptEditorTranslationParserPlugin",
+		"GDScriptNativeClass",
+		"GDScriptSyntaxHighlighter"
+	};
+
 	String _get_pascal_case_part_override(String p_part, bool p_input_is_upper = true)
 	{
 		if (!p_input_is_upper)
@@ -337,10 +358,10 @@ namespace jsb::internal
 		return ret;
 	}
 
-	List<StringName> NamingUtil::get_exposed_class_list()
+	List<StringName> NamingUtil::get_exposed_original_class_list()
 	{
 #ifdef TOOLS_ENABLED
-		HashSet<StringName> ignored_classes_set;
+		HashSet<String> ignored_classes_set;
 
 		if (internal::Settings::editor_settings_available())
 		{
@@ -364,6 +385,12 @@ namespace jsb::internal
 		{
 			StringName class_name = *it;
 
+			if (omitted_original_classes_set.has(class_name))
+			{
+				JSB_LOG(Verbose, "Omitted class '%s' as it's currently not usable from JavaScript", class_name);
+				continue;
+			}
+
 #ifdef TOOLS_ENABLED
 			if (ignored_classes_set.has(get_class_name(class_name)))
 			{
@@ -376,6 +403,7 @@ namespace jsb::internal
 
 			if (api_type == ClassDB::API_NONE)
 			{
+				JSB_LOG(Verbose, "Ignoring class '%s' because it's marked as API_NONE", class_name);
 				continue;
 			}
 
@@ -396,4 +424,38 @@ namespace jsb::internal
 
 		return exposed_class_names;
 	}
+
+	bool NamingUtil::is_original_class_exposed(const String& p_original_name)
+	{
+		if (omitted_original_classes_set.has(p_original_name))
+		{
+			return false;
+		}
+
+		ClassDB::APIType api_type = ClassDB::get_api_type(p_original_name);
+
+		if (api_type == ClassDB::API_NONE)
+		{
+			return false;
+		}
+
+		if (!ClassDB::is_class_exposed(p_original_name))
+		{
+			return false;
+		}
+
+		if (!ClassDB::is_class_enabled(p_original_name))
+		{
+			return false;
+		}
+
+#ifdef TOOLS_ENABLED
+		if (internal::Settings::get_ignored_classes().find(p_original_name) >= 0)
+		{
+			return false;
+		}
+#endif
+
+		return true;
+	}
 }

internal/jsb_naming_util.h

@@ -15,7 +15,9 @@ namespace jsb::internal
 
 		static String snake_to_camel_case(const String &p_identifier, bool p_input_is_upper = false);
 
-		static List<StringName> get_exposed_class_list();
+		static List<StringName> get_exposed_original_class_list();
+
+		static bool is_original_class_exposed(const String& p_original_name);
 
 		static String get_class_name(const String& p_original_name)
 		{

scripts/jsb.editor/src/jsb.editor.codegen.ts

@@ -728,33 +728,6 @@ const PrimitiveTypeNames: { [type: number]: string } = {
 const RemapTypes: { [name: string]: string } = {
     ["bool"]: "boolean",
 }
-const IgnoredTypes = new Set([
-    "IPUnix",
-    "ScriptEditorDebugger",
-    "Thread",
-    "Semaphore",
-
-    //
-    // "GodotNavigationServer2D",
-    // "GodotPhysicsServer2D",
-    // "GodotPhysicsServer3D",
-    // "PhysicsServer2DExtension",
-    // "PhysicsServer3DExtension",
-
-    // GodotJS related clases
-    "GodotJSEditorPlugin",
-    "GodotJSExportPlugin",
-    "GodotJSREPL",
-    "GodotJSScript",
-    "GodotJSEditorHelper",
-    "GodotJSEditorProgress",
-
-    // GDScript related classes
-    "GDScript",
-    "GDScriptEditorTranslationParserPlugin",
-    "GDScriptNativeClass",
-    "GDScriptSyntaxHighlighter",
-])
 const GlobalUtilityFuncs = [
     {
         description: "shorthand for getting project settings",
@@ -2530,9 +2503,6 @@ export class TSDCodeGen {
         // godot classes
         for (let class_name in this._types.classes) {
             const cls = this._types.classes[class_name];
-            if (IgnoredTypes.has(class_name)) {
-                continue;
-            }
             if (typeof this._types.singletons[class_name] !== "undefined") {
                 // ignore the class if it's already defined as Singleton
                 continue;
@@ -2772,7 +2742,7 @@ export class SceneTSDCodeGen {
     private make_scene_path(scene_path: string, include_filename = true) {
         const relative_path = (
             include_filename
-                ? scene_path.replace(/\.t?scn$/i, ".nodes.gen.d.ts")
+                ? scene_path.replace(/\.t?scn$/i, ".nodes.gen.ts")
                 : scene_path.replace(/\/[^\/]+$/, "")
         ).replace(/^res:\/\/?/, "");
 
@@ -2877,7 +2847,7 @@ export class ResourceTSDCodeGen {
     private make_resource_path(resource_path: string, include_filename = true) {
         const relative_path = (
           include_filename
-            ? resource_path + ".gen.d.ts"
+            ? resource_path + ".gen.ts"
             : resource_path.replace(/\/[^\/]+$/, "")
         ).replace(/^res:\/\/?/, "");
 

weaver-editor/jsb_editor_helper.cpp

@@ -87,6 +87,18 @@ bool GodotJSEditorHelper::_request_codegen(jsb::JSEnvironment& p_env, GodotJSScr
     return true;
 }
 
+StringName GodotJSEditorHelper::_get_exposed_node_class_name(const StringName& class_name)
+{
+    StringName exposed_class_name = class_name;
+
+    while (!jsb::internal::NamingUtil::is_original_class_exposed(exposed_class_name))
+    {
+        exposed_class_name = ClassDB::get_parent_class(exposed_class_name);
+    }
+
+    return jsb::internal::NamingUtil::get_class_name(exposed_class_name);
+}
+
 Dictionary GodotJSEditorHelper::_build_node_type_descriptor(jsb::JSEnvironment& p_env, Node* p_node, const String& scene_resource_path)
 {
     Dictionary descriptor;
@@ -177,7 +189,7 @@ Dictionary GodotJSEditorHelper::_build_node_type_descriptor(jsb::JSEnvironment&
             }
 
             descriptor[jsb_string_name(type)] = (int32_t) DescriptorType::Godot;
-            descriptor[jsb_string_name(name)] = jsb::internal::NamingUtil::get_class_name(p_node->get_class_name());
+            descriptor[jsb_string_name(name)] = GodotJSEditorHelper::_get_exposed_node_class_name(p_node->get_class_name());
             descriptor[jsb_string_name(arguments)] = generic_arguments;
         }
         else
@@ -332,9 +344,8 @@ Dictionary GodotJSEditorHelper::get_resource_type_descriptor(const String& p_pat
 
     if (script == nullptr || GodotJSScriptLanguage::get_singleton()->is_global_class_generic(script->get_path()))
     {
-        const StringName& resource_class = resource->get_class_name();
         descriptor[jsb_string_name(type)] = (int32_t) DescriptorType::Godot;
-        descriptor[jsb_string_name(name)] = resource_class == jsb_string_name(GodotJSScript) ? "Script" : jsb::internal::NamingUtil::get_class_name(resource_class);
+        descriptor[jsb_string_name(name)] = GodotJSEditorHelper::_get_exposed_node_class_name(resource->get_class_name());
     }
     else
     {

weaver-editor/jsb_editor_helper.h

@@ -9,6 +9,7 @@ class GodotJSEditorHelper : public Object
 private:
 
     static bool _request_codegen(jsb::JSEnvironment& p_env, GodotJSScript* p_script, const Dictionary& p_request, Dictionary& p_result);
+    static StringName _get_exposed_node_class_name(const StringName& class_name);
     static Dictionary _build_node_type_descriptor(jsb::JSEnvironment& p_env, Node* p_node, const String& scene_resource_path = String());
     static void _log_load_error(const String &p_file, const String &p_type, Error p_error);