Add default parameters for constructors, fix doubles (#88)

cdklabs · Feb 23, 2023 · cd415fc · cd415fc
1 parent 0da80f1
commit cd415fc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/ir/constructor.rs b/src/ir/constructor.rs
@@ -13,9 +13,11 @@ impl Constructor {
     pub fn translate(parse_tree: &CloudformationParseTree) -> Constructor {
         let mut inputs = Vec::new();
         for (name, param) in parse_tree.parameters.params.iter() {
+            let default: Option<&String> = param.default.as_ref();
             inputs.push(ConstructorParameter {
                 name: camel_case(name),
                 constructor_type: param.parameter_type.to_string(),
+                default_value: default.map(|v| v.to_string()),
             })
         }
         Constructor { inputs }
@@ -30,4 +32,5 @@ impl Default for Constructor {
 pub struct ConstructorParameter {
     pub name: String,
     pub constructor_type: String,
+    pub default_value: Option<String>,
 }
diff --git a/src/ir/resources.rs b/src/ir/resources.rs
@@ -433,6 +433,7 @@ pub fn translate_resource(
                 return match simple_type {
                     CfnType::Boolean => Ok(ResourceIr::Bool(s.parse().unwrap())),
                     CfnType::Integer => Ok(ResourceIr::Number(s.parse().unwrap())),
+                    CfnType::Double => Ok(ResourceIr::Number(s.parse().unwrap())),
                     &_ => Ok(ResourceIr::String(s.to_string())),
                 };
             }

diff --git a/src/synthesizer/typescript_synthesizer.rs b/src/synthesizer/typescript_synthesizer.rs
@@ -33,18 +33,39 @@ impl TypescriptSynthesizer {
             "export interface NoctStackProps extends cdk.StackProps {",
         );
 
-        for param in ir.constructor.inputs {
+        for param in &ir.constructor.inputs {
             append_with_newline(
                 output,
                 &format!(
                     "\treadonly {}: {};",
                     pretty_name(&param.name),
-                    pretty_name(&param.constructor_type)
+                    pretty_name(&param.constructor_type),
                 ),
             );
         }
 
         append_with_newline(output, "}");
+
+        append_with_newline(output, "\n// Default parameters");
+        append_with_newline(output, "// {");
+        for param in &ir.constructor.inputs {
+            let default_value: Option<&String> = param.default_value.as_ref();
+            if let Some(x) = default_value {
+                append_with_newline(
+                    output,
+                    &format!(
+                        "//\t {}: {},",
+                        pretty_name(&param.name),
+                        match pretty_name(&param.constructor_type).as_str() {
+                            "string" => x.to_string(),
+                            _ => pretty_name(x),
+                        }
+                    ),
+                );
+            }
+        }
+        append_with_newline(output, "// }");
+
         append_with_newline(output, "\n// Stack");
         append_with_newline(output, "export class NoctStack extends cdk.Stack {");
         append_with_newline(