fix: avoid more TS type strip errors

dummdidumm · dummdidumm · commit 96c2cab762ab · 2025-09-13T00:47:31.000+02:00
- fix `let a!: number;`
- fix `function a(x?: number)`
diff --git a/packages/repl/src/lib/workers/typescript-strip-types.ts b/packages/repl/src/lib/workers/typescript-strip-types.ts
@@ -9,24 +9,32 @@ const ParserWithTS = acorn.Parser.extend(tsPlugin());
  * @param {FunctionExpression | FunctionDeclaration} node
  * @param {Context<any, any>} context
  */
-function remove_this_param(
+function remove_this_param_and_optional(
 	node: acorn.FunctionExpression | acorn.FunctionDeclaration,
 	context: Context<any, any>
 ) {
-	const param = node.params[0] as any;
-	if (param?.type === 'Identifier' && param.name === 'this') {
-		if (param.typeAnnotation) {
-			// the type annotation is blanked by another visitor, do it in two parts to prevent an overwrite error
-			ts_blank_space(context, { start: param.start, end: param.typeAnnotation.start });
-			ts_blank_space(context, {
-				start: param.typeAnnotation.end,
-				end: node.params[1]?.start || param.end
-			});
-		} else {
-			ts_blank_space(context, {
-				start: param.start,
-				end: node.params[1]?.start || param.end
-			});
+	for (const param of node.params as Array<acorn.Pattern & Record<string, any>>) {
+		if (param?.type === 'Identifier') {
+			if (param.name === 'this') {
+				if (param.typeAnnotation) {
+					// the type annotation is blanked by another visitor, do it in two parts to prevent an overwrite error
+					ts_blank_space(context, { start: param.start, end: param.typeAnnotation.start });
+					ts_blank_space(context, {
+						start: param.typeAnnotation.end,
+						end: node.params[1]?.start || param.end
+					});
+				} else {
+					ts_blank_space(context, {
+						start: param.start,
+						end: node.params[1]?.start || param.end
+					});
+				}
+			} else if (param.optional) {
+				const question_start = context.state.ms.original.indexOf('?', param.start);
+				if (question_start !== -1 && question_start < param.end) {
+					ts_blank_space(context, { start: question_start, end: question_start + 1 });
+				}
+			}
 		}
 	}
 	return context.next();
@@ -207,8 +215,8 @@ const visitors: Visitors<any, { ms: MagicString }> = {
 		ts_blank_space(context, { start: node.start, end: node.expression.start });
 		context.visit(node.expression);
 	},
-	FunctionExpression: remove_this_param,
-	FunctionDeclaration: remove_this_param,
+	FunctionExpression: remove_this_param_and_optional,
+	FunctionDeclaration: remove_this_param_and_optional,
 	TSDeclareFunction(node, context) {
 		ts_blank_space(context, node);
 		return empty;
@@ -245,6 +253,16 @@ const visitors: Visitors<any, { ms: MagicString }> = {
 		}
 		context.next();
 	},
+	VariableDeclarator(node, context) {
+		if (node.definite && node.id.type === 'Identifier') {
+			const definite_start = context.state.ms.original.indexOf(
+				'!',
+				node.id.start + node.id.name.length
+			);
+			ts_blank_space(context, { start: definite_start, end: definite_start + 1 });
+		}
+		context.next();
+	},
 	TSModuleDeclaration(node, context) {
 		if (!node.body) {
 			ts_blank_space(context, node);
