TypeScript: Move certain TS expressions out of ECMAScript module

Author: andylovescode

src/modules/ecmascript.js

@@ -917,101 +917,6 @@ export default {
 		}
 	},
 
-	TSAsExpression(node, state) {
-		if (node.expression) {
-			const needs_parens =
-				EXPRESSIONS_PRECEDENCE[node.expression.type] < EXPRESSIONS_PRECEDENCE.TSAsExpression;
-
-			if (needs_parens) {
-				state.commands.push('(');
-				handle(node.expression, state);
-				state.commands.push(')');
-			} else {
-				handle(node.expression, state);
-			}
-		}
-		state.commands.push(' as ');
-		handle(node.typeAnnotation, state);
-	},
-
-	TSEnumDeclaration(node, state) {
-		state.commands.push('enum ');
-		handle(node.id, state);
-		state.commands.push(' {', indent, newline);
-		sequence(node.members, state, false, handle);
-		state.commands.push(dedent, newline, '}', newline);
-	},
-
-	TSModuleBlock(node, state) {
-		state.commands.push(' {', indent, newline);
-		handle_body(node.body, state);
-		state.commands.push(dedent, newline, '}');
-	},
-
-	TSModuleDeclaration(node, state) {
-		if (node.declare) state.commands.push('declare ');
-		else state.commands.push('namespace ');
-
-		handle(node.id, state);
-
-		if (!node.body) return;
-		handle(node.body, state);
-	},
-
-	TSNonNullExpression(node, state) {
-		handle(node.expression, state);
-		state.commands.push('!');
-	},
-
-	TSInterfaceBody(node, state) {
-		sequence(node.body, state, true, handle, ';');
-	},
-
-	TSInterfaceDeclaration(node, state) {
-		state.commands.push('interface ');
-		handle(node.id, state);
-		if (node.typeParameters) handle(node.typeParameters, state);
-		if (node.extends) {
-			state.commands.push(' extends ');
-			sequence(node.extends, state, false, handle);
-		}
-		state.commands.push(' {');
-		handle(node.body, state);
-		state.commands.push('}');
-	},
-
-	TSSatisfiesExpression(node, state) {
-		if (node.expression) {
-			const needs_parens =
-				EXPRESSIONS_PRECEDENCE[node.expression.type] < EXPRESSIONS_PRECEDENCE.TSSatisfiesExpression;
-
-			if (needs_parens) {
-				state.commands.push('(');
-				handle(node.expression, state);
-				state.commands.push(')');
-			} else {
-				handle(node.expression, state);
-			}
-		}
-		state.commands.push(' satisfies ');
-		handle(node.typeAnnotation, state);
-	},
-
-	TSTypeAliasDeclaration(node, state) {
-		state.commands.push('type ');
-		handle(node.id, state);
-		if (node.typeParameters) handle(node.typeParameters, state);
-		state.commands.push(' = ');
-		handle(node.typeAnnotation, state);
-		state.commands.push(';');
-	},
-
-	TSQualifiedName(node, state) {
-		handle(node.left, state);
-		state.commands.push('.');
-		handle(node.right, state);
-	},
-
 	UnaryExpression(node, state) {
 		state.commands.push(node.operator);
 

src/modules/typescript.js

@@ -1,4 +1,12 @@
-import { sequence, handle } from '../handlers';
+import {
+	sequence,
+	handle,
+	EXPRESSIONS_PRECEDENCE,
+	dedent,
+	newline,
+	indent,
+	handle_body
+} from '../handlers';
 /** @import { Handlers } from '../types' */
 
 /**
@@ -177,5 +185,100 @@ export default {
 			state.commands.push('.');
 			handle(node.qualifier, state);
 		}
+	},
+
+	TSAsExpression(node, state) {
+		if (node.expression) {
+			const needs_parens =
+				EXPRESSIONS_PRECEDENCE[node.expression.type] < EXPRESSIONS_PRECEDENCE.TSAsExpression;
+
+			if (needs_parens) {
+				state.commands.push('(');
+				handle(node.expression, state);
+				state.commands.push(')');
+			} else {
+				handle(node.expression, state);
+			}
+		}
+		state.commands.push(' as ');
+		handle(node.typeAnnotation, state);
+	},
+
+	TSEnumDeclaration(node, state) {
+		state.commands.push('enum ');
+		handle(node.id, state);
+		state.commands.push(' {', indent, newline);
+		sequence(node.members, state, false, handle);
+		state.commands.push(dedent, newline, '}', newline);
+	},
+
+	TSModuleBlock(node, state) {
+		state.commands.push(' {', indent, newline);
+		handle_body(node.body, state);
+		state.commands.push(dedent, newline, '}');
+	},
+
+	TSModuleDeclaration(node, state) {
+		if (node.declare) state.commands.push('declare ');
+		else state.commands.push('namespace ');
+
+		handle(node.id, state);
+
+		if (!node.body) return;
+		handle(node.body, state);
+	},
+
+	TSNonNullExpression(node, state) {
+		handle(node.expression, state);
+		state.commands.push('!');
+	},
+
+	TSInterfaceBody(node, state) {
+		sequence(node.body, state, true, handle, ';');
+	},
+
+	TSInterfaceDeclaration(node, state) {
+		state.commands.push('interface ');
+		handle(node.id, state);
+		if (node.typeParameters) handle(node.typeParameters, state);
+		if (node.extends) {
+			state.commands.push(' extends ');
+			sequence(node.extends, state, false, handle);
+		}
+		state.commands.push(' {');
+		handle(node.body, state);
+		state.commands.push('}');
+	},
+
+	TSSatisfiesExpression(node, state) {
+		if (node.expression) {
+			const needs_parens =
+				EXPRESSIONS_PRECEDENCE[node.expression.type] < EXPRESSIONS_PRECEDENCE.TSSatisfiesExpression;
+
+			if (needs_parens) {
+				state.commands.push('(');
+				handle(node.expression, state);
+				state.commands.push(')');
+			} else {
+				handle(node.expression, state);
+			}
+		}
+		state.commands.push(' satisfies ');
+		handle(node.typeAnnotation, state);
+	},
+
+	TSTypeAliasDeclaration(node, state) {
+		state.commands.push('type ');
+		handle(node.id, state);
+		if (node.typeParameters) handle(node.typeParameters, state);
+		state.commands.push(' = ');
+		handle(node.typeAnnotation, state);
+		state.commands.push(';');
+	},
+
+	TSQualifiedName(node, state) {
+		handle(node.left, state);
+		state.commands.push('.');
+		handle(node.right, state);
 	}
 };