fix: handle questionToken for MappedType

so1ve · Oct 31, 2023 · d70ed8f · d70ed8f
1 parent fdc2230
commit d70ed8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/core/printer.ts b/src/core/printer.ts
@@ -35,10 +35,12 @@ export class Printer {
 				parts.push(
 					[
 						member.name.getText(),
-						member.questionToken ? "?" : "",
+						member.questionToken?.getText(),
 						": ",
 						stringBaseType,
-					].join(""),
+					]
+						.filter(Boolean)
+						.join(""),
 				);
 			}
 		}
@@ -52,14 +54,19 @@ export class Printer {
 		const type = this.checker.getTypeAtLocation(node);
 		const properties = type.getProperties();
 		const parts = ["{"];
-
+		let questionToken = "";
+		if (ts.isMappedTypeNode(node)) {
+			questionToken = node.questionToken?.getText() ?? "";
+		}
 		for (const property of properties) {
 			const valueType = this.checker.getTypeOfSymbol(property);
 			const stringValueType = this.checker.typeToString(
 				this.getBaseType(valueType),
 			);
 			parts.push(
-				`${this.checker.symbolToString(property)}: ${stringValueType}`,
+				`${this.checker.symbolToString(
+					property,
+				)}${questionToken}: ${stringValueType}`,
 			);
 		}
 

diff --git a/test/__fixtures__/basic.vue b/test/__fixtures__/basic.vue
@@ -16,6 +16,8 @@ defineProps<
 		genericCondition: I extends "a" ? "a" : 1;
 	} & SomeInterface & {
 			[MappedString in "1-1" | "2-1"]: `${MappedString}MappedType`;
+		} & {
+			[MappedString in "1-1" | "2-1"]?: `${MappedString}OptionalMappedType`;
 		}
 >();
 </script>
diff --git a/test/__snapshots__/fixtures.test.ts.snap b/test/__snapshots__/fixtures.test.ts.snap
@@ -25,6 +25,9 @@ typeLiteral: TypeLiteral
 } & {
 \\"1-1\\": string
 \\"2-1\\": string
+} & {
+\\"1-1\\"?: \\"1-1OptionalMappedType\\" | undefined
+\\"2-1\\"?: \\"2-1OptionalMappedType\\" | undefined
 }
 >();
 </script>