String const

examples/typesystem/src/lib.rs

@@ -3,7 +3,7 @@ mod tests {
     use pulumi_wasm_provider_common::OneOf2;
     use pulumi_wasm_rust::Output;
     use pulumi_wasm_typesystem::typesystem_server::TypesystemServerArgs;
-    use pulumi_wasm_typesystem::{MyEnum, UnionCase1, UnionCase2};
+    use pulumi_wasm_typesystem::{MyEnum, UnionCase1, UnionCase2, UnionCaseWithConst1, UnionCaseWithConst2};
     use std::panic::catch_unwind;
 
     #[test]
@@ -47,6 +47,21 @@ mod tests {
         assert_eq!(deserialized_enum2, enum2);
     }
 
+    #[test]
+    fn test_case_deserialization_with_oneof2() {
+        let oneof: OneOf2<UnionCaseWithConst1, UnionCaseWithConst2> = OneOf2::Left(
+            UnionCaseWithConst1::builder()
+               .field_1("value1".to_string())
+               .build_struct(),
+        );
+
+        let json = serde_json::to_string(&oneof).unwrap();
+        assert_eq!(json, r#"{"field1":"value1"}"#);
+
+        let deserialized: OneOf2<UnionCaseWithConst1, UnionCaseWithConst2> = serde_json::from_str(&json).unwrap();
+        assert_eq!(deserialized, oneof);
+    }
+
     fn compilation_test() {
         // String
         let output = Output::new(&"Hello, World!".to_string());

pulumi_wasm_generator_lib/Cargo.toml

@@ -17,6 +17,7 @@ prettyplease.workspace = true
 syn.workspace = true
 quote.workspace = true
 proc-macro2.workspace = true
+itertools.workspace = true
 
 [dev-dependencies]
 assert_cmd.workspace = true

pulumi_wasm_generator_lib/src/code_generation/yaml/model.rs

@@ -195,6 +195,7 @@
         Type::Integer => TypeWithoutOption::Integer,
         Type::Number => TypeWithoutOption::Number,
         Type::String => TypeWithoutOption::String,
+        Type::ConstString(s) => TypeWithoutOption::String,
         Type::Array(a) => TypeWithoutOption::Array(Box::new(remove_option(a))),
         Type::Object(o) => TypeWithoutOption::Object(Box::new(remove_option(o))),
         Type::Ref(r) => TypeWithoutOption::Ref(r.clone()),

pulumi_wasm_generator_lib/src/model.rs

@@ -15,6 +15,7 @@ pub(crate) enum Type {
     Ref(Ref),
     Option(Box<Type>),
     DiscriminatedUnion(Vec<Type>),
+    ConstString(String)
 }
 
 impl Type {
@@ -48,6 +49,7 @@ impl Type {
                     .collect::<Vec<_>>()
                     .join(", ")
             ),
+            Type::ConstString(s) => format!("crate::__ConstString_{}", s).to_string(),
         }
     }
 
@@ -57,9 +59,10 @@ impl Type {
             Type::Integer => None,
             Type::Number => None,
             Type::String => None,
+            Type::ConstString(_) => None,
+            Type::Ref(_) => None,
             Type::Array(t) => t.get_internal_discriminated_union(),
             Type::Object(o) => o.get_internal_discriminated_union(),
-            Type::Ref(_) => None,
             Type::Option(o) => o.get_internal_discriminated_union(),
             Type::DiscriminatedUnion(types) => Some(
                 types
@@ -69,6 +72,21 @@ impl Type {
             ),
         }
     }
+
+    pub(crate) fn get_consts(&self) -> Vec<String> {
+        match self {
+            Type::Boolean => vec![],
+            Type::Integer => vec![],
+            Type::Number => vec![],
+            Type::String => vec![],
+            Type::ConstString(s) => vec![s.clone()],
+            Type::Ref(_) => vec![],
+            Type::Array(t) => t.get_consts(),
+            Type::Object(o) => o.get_consts(),
+            Type::Option(o) => o.get_consts(),
+            Type::DiscriminatedUnion(_) => vec![],
+        }
+    }
 }
 
 #[derive(Debug, PartialEq, Hash, Ord, PartialOrd, Eq)]

pulumi_wasm_generator_lib/src/output/rust/lib.rs.handlebars

@@ -34,4 +34,7 @@ mod bindings {
 fn into_domain<F: serde::Serialize>(output: WitOutput) -> Output<F> {
     unsafe { Output::<F>::new_from_handle(output) }
 }
-{{/if}}
+{{/if}}
+{{#each package.const_strings}}
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_{{&this}}, "{{&this}}");
+{{/each}}

pulumi_wasm_generator_lib/src/output/rust/source_code_librs.rs

@@ -1,7 +1,10 @@
+use std::collections::BTreeSet;
 use crate::output::get_main_version;
 use handlebars::Handlebars;
 use serde::Serialize;
 use serde_json::json;
+use crate::model::GlobalType;
+use itertools::Itertools;
 
 static TEMPLATE: &str = include_str!("lib.rs.handlebars");
 
@@ -16,6 +19,7 @@
     pulumi_wasm_version: String,
     contains_resources: bool,
     contains_functions: bool,
+    const_strings: Vec<String>,
 }
 
 fn convert_model(package: &crate::model::Package) -> Package {
@@ -26,9 +30,38 @@
         contains_elements: !package.resources.is_empty() || !package.functions.is_empty(),
         contains_resources: !package.resources.is_empty(),
         contains_functions: !package.functions.is_empty(),
+        const_strings: find_consts(package),
     }
 }
 
+fn find_consts(package: &crate::model::Package) -> Vec<String> {
+    let mut consts = BTreeSet::new();
+    for (_, resource) in &package.resources {
+        for (input) in &resource.input_properties {
+            consts.extend(input.r#type.get_consts().clone());
+        }
+        for (output) in &resource.output_properties {
+            consts.extend(output.r#type.get_consts().clone());
+        }
+    }
+    for (_, function) in &package.functions {
+        for (input) in &function.input_properties {
+            consts.extend(input.r#type.get_consts().clone());
+        }
+        for (output) in &function.output_properties {
+            consts.extend(output.r#type.get_consts().clone());
+        }
+    }
+    for (_, type_) in &package.types {
+        if let GlobalType::Object(_, obj) = type_ {
+            for gtp in obj {
+                consts.extend(gtp.r#type.get_consts().clone());
+            }
+        }
+    }
+    consts.into_iter().sorted().collect()
+}
+
 pub(crate) fn generate_source_code(package: &crate::model::Package) -> String {
     let handlebars = Handlebars::new();
     handlebars

pulumi_wasm_generator_lib/src/output/rust/source_code_types_code.rs

@@ -3,7 +3,7 @@ use convert_case::{Case, Casing};
 use handlebars::Handlebars;
 use serde::Serialize;
 use serde_json::json;
-use std::collections::HashMap;
+use std::collections::{BTreeSet, HashMap};
 use std::path::PathBuf;
 
 static TEMPLATE: &str = include_str!("types_code.rs.handlebars");
@@ -25,6 +25,7 @@ struct RefType {
     description_lines: Vec<String>,
     struct_name: String,
     file_name: String,
+    const_strings: BTreeSet<String>,
 }
 
 #[derive(Serialize)]
@@ -86,11 +87,15 @@ fn convert_model(package: &crate::model::Package) -> Package {
                             ),
                         })
                         .collect(),
+                    const_strings: properties
+                        .iter()
+                        .flat_map(|global_type_property| global_type_property.r#type.get_consts())
+                        .collect()
                 };
                 real_types.push(ref_type);
             }
             GlobalType::StringEnum(description, enum_values) => {
-                let enum_type = Enum {
+                    let enum_type = Enum {
                     struct_name: element_id.get_rust_struct_name(),
                     file_name: element_id.get_rust_struct_name().to_case(Case::Snake),
                     description_lines: crate::utils::to_lines(description.clone(), package, None),

pulumi_wasm_generator_lib/src/schema.rs

@@ -36,6 +36,8 @@ struct Type {
     additional_properties: Option<Box<Type>>,
     #[serde(rename = "oneOf")]
     one_of: Option<Vec<OneOfType>>,
+    #[serde(rename = "const")]
+    const_: Option<String>
 }
 
 #[derive(Deserialize, Debug)]
@@ -136,6 +138,7 @@ pub(crate) struct Package {
 
 //TODO: Fix formatting
 fn new_type_mapper(type_: &Type) -> Result<crate::model::Type> {
+    println!("{:?}", type_);
     (match type_ {
         Type {
             ref_: Some(ref r), ..
@@ -154,6 +157,11 @@ fn new_type_mapper(type_: &Type) -> Result<crate::model::Type> {
             type_: Some(TypeEnum::Number),
             ..
         } => Ok(crate::model::Type::Number),
+        Type {
+            type_: Some(TypeEnum::String),
+            const_: Some(const_),
+            ..
+        } => Ok(crate::model::Type::ConstString(const_.clone())),
         Type {
             type_: Some(TypeEnum::String),
             ..

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/function/func_with_const_input.rs

@@ -4,7 +4,7 @@
 #[builder(finish_fn = build_struct)]
 pub struct FuncWithConstInputArgs {
     #[builder(into, default = ::pulumi_wasm_rust::Output::empty())]
-    pub plain_input: pulumi_wasm_rust::Output<Option<String>>,
+    pub plain_input: pulumi_wasm_rust::Output<Option<crate::__ConstString_fixed>>,
 }
 
 pub struct FuncWithConstInputResult {

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/lib.rs

@@ -20,3 +20,8 @@ mod bindings {
 fn into_domain<F: serde::Serialize>(output: WitOutput) -> Output<F> {
     unsafe { Output::<F>::new_from_handle(output) }
 }
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Environment, "Environment");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Folder, "Folder");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Package, "Package");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Project, "Project");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_fixed, "fixed");

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/types/ssis_environment_response.rs

@@ -23,7 +23,7 @@ pub struct SsisEnvironmentResponse {
     /// Expected value is 'Environment'.
     #[builder(into)]
     #[serde(rename = "type")]
-    pub r#type: Box<String>,
+    pub r#type: Box<crate::__ConstString_Environment>,
     /// Variable in environment
     #[builder(into, default = Box::new(None))]
     #[serde(rename = "variables")]

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/types/ssis_folder_response.rs

@@ -19,5 +19,5 @@ pub struct SsisFolderResponse {
     /// Expected value is 'Folder'.
     #[builder(into)]
     #[serde(rename = "type")]
-    pub r#type: Box<String>,
+    pub r#type: Box<crate::__ConstString_Folder>,
 }

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/types/ssis_package_response.rs

@@ -35,5 +35,5 @@ pub struct SsisPackageResponse {
     /// Expected value is 'Package'.
     #[builder(into)]
     #[serde(rename = "type")]
-    pub r#type: Box<String>,
+    pub r#type: Box<crate::__ConstString_Package>,
 }

pulumi_wasm_generator_lib/tests/output/output-funcs/lib/src/types/ssis_project_response.rs

@@ -31,7 +31,7 @@ pub struct SsisProjectResponse {
     /// Expected value is 'Project'.
     #[builder(into)]
     #[serde(rename = "type")]
-    pub r#type: Box<String>,
+    pub r#type: Box<crate::__ConstString_Project>,
     /// Project version.
     #[builder(into, default = Box::new(None))]
     #[serde(rename = "version")]

pulumi_wasm_generator_lib/tests/output/unions-inline/lib/src/lib.rs

@@ -20,3 +20,5 @@ mod bindings {
 fn into_domain<F: serde::Serialize>(output: WitOutput) -> Output<F> {
     unsafe { Output::<F>::new_from_handle(output) }
 }
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_PointInTimeRestore, "PointInTimeRestore");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Replica, "Replica");

pulumi_wasm_generator_lib/tests/output/unions-inline/lib/src/types/server_properties_for_replica.rs

@@ -3,7 +3,7 @@
 pub struct ServerPropertiesForReplica {
     #[builder(into)]
     #[serde(rename = "createMode")]
-    pub r#create_mode: Box<String>,
+    pub r#create_mode: Box<crate::__ConstString_Replica>,
     #[builder(into, default = Box::new(None))]
     #[serde(rename = "version")]
     pub r#version: Box<Option<String>>,

pulumi_wasm_generator_lib/tests/output/unions-inline/lib/src/types/server_properties_for_restore.rs

@@ -3,7 +3,7 @@
 pub struct ServerPropertiesForRestore {
     #[builder(into)]
     #[serde(rename = "createMode")]
-    pub r#create_mode: Box<String>,
+    pub r#create_mode: Box<crate::__ConstString_PointInTimeRestore>,
     #[builder(into)]
     #[serde(rename = "restorePointInTime")]
     pub r#restore_point_in_time: Box<String>,

pulumi_wasm_generator_lib/tests/output/unions-inside-arrays/lib/src/lib.rs

@@ -20,3 +20,5 @@ mod bindings {
 fn into_domain<F: serde::Serialize>(output: WitOutput) -> Output<F> {
     unsafe { Output::<F>::new_from_handle(output) }
 }
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_PointInTimeRestore, "PointInTimeRestore");
+pulumi_wasm_provider_common::generate_string_const!(__ConstString_Replica, "Replica");

pulumi_wasm_generator_lib/tests/output/unions-inside-arrays/lib/src/types/server_properties_for_replica.rs

@@ -3,7 +3,7 @@
 pub struct ServerPropertiesForReplica {
     #[builder(into)]
     #[serde(rename = "createMode")]
-    pub r#create_mode: Box<String>,
+    pub r#create_mode: Box<crate::__ConstString_Replica>,
     #[builder(into, default = Box::new(None))]
     #[serde(rename = "version")]
     pub r#version: Box<Option<String>>,