esrap 2.2.7 → 2.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",

package/src/languages/ts/index.js

@@ -1010,12 +1010,7 @@ export default (options = {}) => {
 
 			context.write(' => ');
 
-			if (
-				node.body.type === 'ObjectExpression' ||
-				(node.body.type === 'AssignmentExpression' && node.body.left.type === 'ObjectPattern') ||
-				(node.body.type === 'LogicalExpression' && node.body.left.type === 'ObjectExpression') ||
-				(node.body.type === 'ConditionalExpression' && node.body.test.type === 'ObjectExpression')
-			) {
+			if (arrow_concise_body_needs_wrap(node.body)) {
 				context.write('(');
 				context.visit(node.body);
 				context.write(')');
@@ -1406,6 +1401,8 @@ export default (options = {}) => {
 		},
 
 		ImportSpecifier(node, context) {
+			if (node.importKind == 'type') context.write('type ');
+
 			if (
 				node.local.type === 'Identifier' &&
 				node.imported.type === 'Identifier' &&
@@ -1415,7 +1412,6 @@ export default (options = {}) => {
 				context.write(' as ');
 			}
 
-			if (node.importKind == 'type') context.write('type ');
 			context.visit(node.local);
 		},
 
@@ -2321,6 +2317,34 @@ export default (options = {}) => {
 
 /** @satisfies {Visitors} */
 
+/**
+ * Arrow functions with a concise body must wrap certain expressions in parentheses,
+ * otherwise `{` can start a block statement instead of an object literal (`as` /
+ * `satisfies` / `!` do not change that (e.g. `() => { x } as const`).
+ * @param {TSESTree.BlockStatement | TSESTree.Expression} body
+ * @returns {boolean}
+ */
+function arrow_concise_body_needs_wrap(body) {
+	if (body.type === 'BlockStatement') return false;
+
+	switch (body.type) {
+		case 'ObjectExpression':
+			return true;
+		case 'AssignmentExpression':
+			return body.left.type === 'ObjectPattern';
+		case 'LogicalExpression':
+			return body.left.type === 'ObjectExpression';
+		case 'ConditionalExpression':
+			return body.test.type === 'ObjectExpression';
+		case 'TSAsExpression':
+		case 'TSSatisfiesExpression':
+		case 'TSNonNullExpression':
+			return body.expression ? arrow_concise_body_needs_wrap(body.expression) : false;
+		default:
+			return false;
+	}
+}
+
 /**
  *
  * @param {TSESTree.Expression | TSESTree.PrivateIdentifier} node