make unit values optional

zefchain · Sep 13, 2024 · baf136a · baf136a
1 parent 1ac5bed
commit baf136a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/serde-generate/src/typescript.rs b/serde-generate/src/typescript.rs
@@ -271,7 +271,12 @@ impl<'a, T: Write> TypeScriptEmitter<'a, T> {
 				writeln!(self.out, "export type {name} = {{")?;
 				self.out.indent();
 				for field in fields {
-					writeln!(self.out, "{}: {},", field.name, self.quote_type(&field.value))?;
+					match field.value {
+						Format::Unit => {
+							writeln!(self.out, "{}?: {},", field.name, self.quote_type(&field.value))?;
+						}
+						_ => { writeln!(self.out, "{}: {},", field.name, self.quote_type(&field.value))?; }
+					}
 				}
 				self.out.unindent();
 				writeln!(self.out, "}}")?;
@@ -286,7 +291,7 @@ impl<'a, T: Write> TypeScriptEmitter<'a, T> {
 				for (_index, variant) in variants {
 					match &variant.value {
 						VariantFormat::Unit => {
-							writeln!(self.out, r#"| {{ $: "{0}", {0}: {1} }}"#, variant.name, self.quote_type(&Format::Unit))?;
+							writeln!(self.out, r#"| {{ $: "{0}", {0}?: {1} }}"#, variant.name, self.quote_type(&Format::Unit))?;
 						}
 						VariantFormat::Struct(fields) => {
 							let fields_str = fields.iter().map(|f| format!("{}: {}", f.name, self.quote_type(&f.value))).collect::<Vec<_>>().join(", ");

diff --git a/suite/typescript/ts/bincode/registry.ts b/suite/typescript/ts/bincode/registry.ts
@@ -15,7 +15,7 @@ export type MultiEnum =
 	| { $: "VariantA", VariantA: $t.i32 }
 	| { $: "VariantB", VariantB: $t.str }
 	| { $: "VariantC", VariantC: { x: $t.u8, y: $t.f64 } }
-	| { $: "UnitVariant", UnitVariant: $t.unit }
+	| { $: "UnitVariant", UnitVariant?: $t.unit }
 
 export type NewtypeStruct = $t.i32