Further reduce classes in minimal codegen (low-hanging fruits)

Author: Bromeon

.github/composite/godot-itest/action.yml

@@ -142,9 +142,10 @@ runs:
           targetArgs="--target $TARGET"
         fi
         
+        # Keep `--no-default-features` even if it's currently redundant. Features may change.
         cargo build -p itest --no-default-features ${{ inputs.rust-extra-args }} $targetArgs
         
-        # Instead of modifying .gdextension, rename the output directory
+        # Instead of modifying .gdextension, rename the output directory.
         if [[ -n "$TARGET" ]]; then
           rm -rf target/debug
           mv target/$TARGET/debug target

godot-codegen/src/special_cases/codegen_special_cases.rs

@@ -132,55 +132,62 @@ pub(crate) fn is_utility_function_excluded(
 // Classes for minimal config
 #[cfg(not(feature = "codegen-full"))]
 const SELECTED_CLASSES: &[&str] = &[
-    "Area2D",
-    "ArrayMesh",
-    "BoxMesh",
-    "Camera3D",
-    "CanvasItem",
-    "CanvasLayer",
-    "ClassDB",
-    "CollisionObject2D",
-    "CollisionShape2D",
-    "Control",
-    "EditorPlugin",
-    "EditorExportPlugin",
-    "Engine",
-    "FileAccess",
-    "GDScript",
-    "HTTPRequest",
-    "Image",
-    "ImageTextureLayered",
-    "Input",
-    "InputEvent",
-    "InputEventAction",
-    "MainLoop",
-    "Mesh",
+    // Core class hierarchy
+    "Object",
     "Node",
+    "CanvasItem", // base of Node2D
     "Node2D",
     "Node3D",
-    "Object",
-    "OS",
-    "PackedScene",
-    "PhysicsBody2D",
-    "PrimitiveMesh",
     "RefCounted",
-    "RenderingServer",
     "Resource",
-    "ResourceFormatLoader",
+    //
+    // Runtime + reflection support
+    "ClassDB",
+    "Engine",
+    "OS",
+    //
+    // Editor plugins
+    "EditorPlugin",
+    "EditorExportPlugin",
+    //
+    // I/O and save/load
     "ResourceLoader",
     "ResourceSaver",
-    "RigidBody2D",
+    "FileAccess",
+    //
+    // Scene (node_test, rpc_test)
+    "MainLoop", // base of SceneTree
     "SceneTree",
+    //
+    // Script instances
     "Script",
     "ScriptExtension",
     "ScriptNameCasing",
     "ScriptLanguage",
     "ScriptLanguageExtension",
+    "GDScript",
+    //
+    // Example resources
+    "PackedScene", // manual_extensions
     "Texture",
-    "Texture2DArray",
-    "TextureLayered",
-    "Time", // usage: enum_test.enum_hash()
-    "Timer",
+    //
+    // Meshes (virtual_methods_test)
+    "Mesh",
+    "ArrayMesh", // enum_test, 1 case, but small API
+    "PrimitiveMesh",
+    //
+    // Windowing + Input (virtual_methods_test)
     "Viewport",
     "Window",
+    "Input",
+    "InputEvent",
+    "InputEventAction",
+    //
+    // Godot servers (for RID support)
+    "RenderingServer",
+    //
+    // Misc
+    "Time", // usage: enum_test.enum_hash()
+    "HTTPRequest",
+    "ResourceFormatLoader", // TODO: replace?
 ];

godot/src/prelude.rs

@@ -16,8 +16,8 @@ pub use super::meta::error::{ConvertError, IoError};
 pub use super::meta::{FromGodot, GodotConvert, ToGodot};
 
 pub use super::classes::{
-    INode, INode2D, INode3D, IObject, IPackedScene, IRefCounted, IResource, ISceneTree, Input,
-    Node, Node2D, Node3D, Object, PackedScene, RefCounted, Resource, SceneTree,
+    INode, INode2D, INode3D, IObject, IPackedScene, IRefCounted, IResource, ISceneTree, Node,
+    Node2D, Node3D, Object, PackedScene, RefCounted, Resource, SceneTree,
 };
 pub use super::global::{
     godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn,

itest/rust/src/builtin_tests/containers/array_test.rs

@@ -399,9 +399,11 @@ fn untyped_array_return_from_godot_func() {
     assert_eq!(result, varray![child, Variant::nil(), NodePath::default()]);
 }
 
-// TODO All API functions that take a `Array` are even more obscure and not included in
-// `SELECTED_CLASSES`. Decide if this test is worth having `Texture2DArray` and `Image` and their
-// ancestors in the list.
+// Conditional, so we don't need Texture2DArray > ImageTextureLayered > TextureLayered > Texture in minimal codegen.
+// Potential alternatives (search for "typedarray::" in extension_api.json):
+// - ClassDB::class_get_signal_list() -> Array<Dictionary>
+// - Compositor::set_compositor_effects( Array<Gd<Compositor>> )
+#[cfg(feature = "codegen-full-experimental")]
 #[itest]
 fn typed_array_pass_to_godot_func() {
     use godot::classes::image::Format;

itest/rust/src/engine_tests/codegen_test.rs

@@ -10,7 +10,7 @@
 
 use crate::framework::itest;
 use godot::builtin::inner::InnerColor;
-use godot::classes::{FileAccess, HttpRequest, IHttpRequest, Image};
+use godot::classes::{FileAccess, HttpRequest, IHttpRequest, RenderingServer};
 use godot::prelude::*;
 
 #[itest]
@@ -53,7 +53,8 @@ fn codegen_static_class_method() {
 
 #[itest]
 fn codegen_constants() {
-    assert_eq!(Image::MAX_WIDTH, 16777216);
+    assert_eq!(RenderingServer::CANVAS_ITEM_Z_MIN, -4096);
+    //assert_eq!(Image::MAX_WIDTH, 16777216);
     // assert_eq!(Material::RENDER_PRIORITY_MIN, -128);
 }
 

itest/rust/src/object_tests/object_test.rs

@@ -13,8 +13,7 @@ use std::rc::Rc;
 
 use godot::builtin::{GString, StringName, Variant, Vector3};
 use godot::classes::{
-    file_access, Area2D, Camera3D, Engine, FileAccess, IRefCounted, Node, Node3D, Object,
-    RefCounted,
+    file_access, Engine, FileAccess, IRefCounted, Node, Node2D, Node3D, Object, RefCounted,
 };
 #[allow(deprecated)]
 use godot::global::instance_from_id;
@@ -514,10 +513,10 @@ fn check_convert_variant_refcount(obj: Gd<RefCounted>) {
 fn object_engine_convert_variant_nil() {
     let nil = Variant::nil();
 
-    Gd::<Area2D>::try_from_variant(&nil).expect_err("`nil` should not convert to `Gd<Area2D>`");
+    Gd::<Node2D>::try_from_variant(&nil).expect_err("`nil` should not convert to `Gd<Node2D>`");
 
     expect_panic("from_variant(&nil)", || {
-        Gd::<Area2D>::from_variant(&nil);
+        Gd::<Node2D>::from_variant(&nil);
     });
 }
 
@@ -526,12 +525,12 @@ fn object_engine_convert_variant_error() {
     let refc = RefCounted::new_gd();
     let variant = refc.to_variant();
 
-    let err = Gd::<Area2D>::try_from_variant(&variant)
-        .expect_err("`Gd<RefCounted>` should not convert to `Gd<Area2D>`");
+    let err = Gd::<Node2D>::try_from_variant(&variant)
+        .expect_err("`Gd<RefCounted>` should not convert to `Gd<Node2D>`");
 
     assert_eq!(
         err.to_string(),
-        format!("cannot convert to class Area2D: {refc:?}")
+        format!("cannot convert to class Node2D: {refc:?}")
     );
 }
 
@@ -705,9 +704,9 @@ fn object_engine_bad_downcast() {
 
 #[itest]
 fn object_engine_accept_polymorphic() {
-    let mut node = Camera3D::new_alloc();
+    let mut node = Node3D::new_alloc();
     let expected_name = StringName::from("Node name");
-    let expected_class = GString::from("Camera3D");
+    let expected_class = GString::from("Node3D");
 
     node.set_name(expected_name.arg());