Added @export_storage Export Type

Author: Swivelgames

godot-core/src/registry/property.rs

@@ -462,6 +462,7 @@ pub mod export_info_functions {
     // right side are the corresponding property hint. Godot is not always consistent between the two, such
     // as `export_multiline` being `PROPERTY_HINT_MULTILINE_TEXT`.
     default_export_funcs!(
+        export_storage => NONE,
         export_flags_2d_physics => LAYERS_2D_PHYSICS,
         export_flags_2d_render => LAYERS_2D_RENDER,
         export_flags_2d_navigation => LAYERS_2D_NAVIGATION,

godot-macros/src/class/data_models/field_export.rs

@@ -27,6 +27,10 @@ impl FieldExport {
     pub fn to_export_hint(&self) -> Option<TokenStream> {
         self.export_type.to_export_hint()
     }
+
+    pub fn to_export_usage(&self) -> Option<Ident> {
+        self.export_type.to_export_usage()
+    }
 }
 
 /// Store info from `#[export]` attribute.
@@ -40,6 +44,16 @@ pub enum ExportType {
     /// Can become other property hints, depends on context.
     Default,
 
+    /// ### GDScript annotations
+    /// - `@export_storage`
+    ///
+    /// ### Property hints
+    /// - `NONE`
+    ///
+    /// This is used to indicate that the property should be exported
+    /// but should not be visible in the editor.
+    Storage,
+
     /// ### GDScript annotations
     /// - `@export_range`
     ///
@@ -150,6 +164,10 @@ impl ExportType {
     ///   becomes
     ///   `#[export(flags/enum = (elem1, elem2 = key2, ...))]`
     pub(crate) fn new_from_kv(parser: &mut KvParser) -> ParseResult<Self> {
+        if parser.handle_alone("storage")? {
+            return Self::new_storage();
+        }
+
         if let Some(list_parser) = parser.handle_list("range")? {
             return Self::new_range_list(list_parser);
         }
@@ -273,6 +291,10 @@ impl ExportType {
         Ok(Self::Default)
     }
 
+    fn new_storage() -> ParseResult<Self> {
+        Ok(Self::Storage)
+    }
+
     fn new_range_list(mut parser: ListParser) -> ParseResult<Self> {
         const FLAG_OPTIONS: [&str; 7] = [
             "or_greater",
@@ -396,6 +418,8 @@ impl ExportType {
         match self {
             Self::Default => None,
 
+            Self::Storage => quote_export_func! { export_storage() },
+
             Self::Range {
                 min,
                 max,
@@ -513,6 +537,16 @@ impl ExportType {
             Self::ColorNoAlpha => quote_export_func! { export_color_no_alpha() },
         }
     }
+
+    pub fn to_export_usage(&self) -> Option<Ident> {
+        match self {
+            #[cfg(since_api = "4.3")]
+            Self::Storage => Some(Ident::new("STORAGE", Span::call_site())),
+            #[cfg(not(since_api = "4.3"))]
+            Self::Storage => Some(Ident::new("DEFAULT", Span::call_site())),
+            _ => None,
+        }
+    }
 }
 
 /// The dimension of a `@export_flags_{dimension}_{layer}` annotation.

godot-macros/src/class/data_models/property.rs

@@ -53,10 +53,17 @@ pub fn make_property_impl(class_name: &Ident, fields: &Fields) -> TokenStream {
 
         // Ensure we add a var if the user only provided a `#[export]`.
         let var = match (export, var) {
-            (Some(_), None) => Some(FieldVar {
-                usage_flags: UsageFlags::InferredExport,
-                ..Default::default()
-            }),
+            (Some(export), None) => {
+                let usage_flags = if let Some(usage) = export.to_export_usage() {
+                    UsageFlags::Custom(vec![usage])
+                } else {
+                    UsageFlags::InferredExport
+                };
+                Some(FieldVar {
+                    usage_flags,
+                    ..Default::default()
+                })
+            }
 
             (_, var) => var.clone(),
         };

godot-macros/src/lib.rs

@@ -243,7 +243,11 @@ use crate::util::{bail, ident, KvParser};
 ///     // @export
 ///     #[export]
 ///     float: f64,
-///     
+///
+///     // @export_storage
+///     #[export(storage)]
+///     hidden_string: GString,
+///
 ///     // @export_range(0.0, 10.0, or_greater)
 ///     #[export(range = (0.0, 10.0, or_greater))]
 ///     range_f64: f64,

itest/rust/build.rs

@@ -471,6 +471,11 @@ fn generate_property_template(inputs: &[Input]) -> PropertyTests {
         pub struct PropertyTestsRust {
             #(#rust,)*
 
+            #[export]
+            export_string: GString,
+            #[cfg(since_api = "4.3")]
+            #[export(storage)]
+            export_storage: GString,
             #[export(file)]
             export_file: GString,
             #[export(file = "*.txt")]
@@ -525,6 +530,8 @@ fn generate_property_template(inputs: &[Input]) -> PropertyTests {
     let gdscript = format!(
         r#"
 {}
+@export var export_string: String
+{}
 @export_file var export_file: String
 @export_file("*.txt") var export_file_wildcard_txt: String
 @export_global_file var export_global_file: String
@@ -550,7 +557,12 @@ fn generate_property_template(inputs: &[Input]) -> PropertyTests {
 @export_enum("Slow:30", "Average:60", "VeryFast:200") var export_enum_int_slow_30_average_60_very_fast_200: int
 @export_enum("Rebecca", "Mary", "Leah") var export_enum_string_rebecca_mary_leah: String
 "#,
-        gdscript.join("\n")
+        gdscript.join("\n"),
+        if godot_bindings::since_api("4.3") {
+            "@export_storage var export_storage: String"
+        } else {
+            ""
+        }
     );
 
     PropertyTests { rust, gdscript }

itest/rust/src/object_tests/property_template_test.rs

@@ -60,11 +60,15 @@ fn property_template_test(ctx: &TestContext) {
 
         let mut rust_usage = rust_prop.at("usage").to::<i64>();
 
-        // the GDSscript variables are script variables, and so have `PROPERTY_USAGE_SCRIPT_VARIABLE` set.
-        if rust_usage == PropertyUsageFlags::STORAGE.ord() as i64 {
-            // `PROPERTY_USAGE_SCRIPT_VARIABLE` does the same thing as `PROPERTY_USAGE_STORAGE` and so
-            // GDScript doesn't set both if it doesn't need to.
-            rust_usage = PropertyUsageFlags::SCRIPT_VARIABLE.ord() as i64
+        // The GDSscript variables are script variables, and so have `PROPERTY_USAGE_SCRIPT_VARIABLE` set.
+        // Before 4.3, `PROPERTY_USAGE_SCRIPT_VARIABLE` did the same thing as `PROPERTY_USAGE_STORAGE` and
+        // so GDScript didn't set both if it didn't need to.
+        if GdextBuild::before_api("4.3") {
+            if rust_usage == PropertyUsageFlags::STORAGE.ord() as i64 {
+                rust_usage = PropertyUsageFlags::SCRIPT_VARIABLE.ord() as i64
+            } else {
+                rust_usage |= PropertyUsageFlags::SCRIPT_VARIABLE.ord() as i64;
+            }
         } else {
             rust_usage |= PropertyUsageFlags::SCRIPT_VARIABLE.ord() as i64;
         }
@@ -95,12 +99,12 @@ fn property_template_test(ctx: &TestContext) {
         }
     }
 
+    rust_properties.free();
+
     assert!(
         properties.is_empty(),
         "not all properties were matched, missing: {properties:?}"
     );
 
     assert!(errors.is_empty(), "{}", errors.join("\n"));
-
-    rust_properties.free();
 }

rustfmt.toml

@@ -0,0 +1 @@
+hard_tabs = false