esrap 2.2.5 → 2.2.6

package/package.json

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

package/src/languages/ts/index.js

@@ -1848,19 +1848,28 @@ export default (options = {}) => {
 		TSMappedType(node, context) {
 			context.write('{[');
 
-			if (node.typeParameter) {
-				context.visit(node.typeParameter);
+			const legacy_type_parameter = node.typeParameter;
+			const key = node.key ?? legacy_type_parameter?.name;
+			const constraint = node.constraint ?? legacy_type_parameter?.constraint;
+
+			if (key && typeof key === 'object') {
+				context.visit(key);
 			} else {
-				context.visit(node.key);
+				context.write(key, node);
+			}
+
+			if (constraint) {
 				context.write(' in ');
-				context.visit(node.constraint);
+				context.visit(constraint);
 			}
 
 			context.write(']');
+
 			if (node.typeAnnotation) {
 				context.write(': ');
 				context.visit(node.typeAnnotation);
 			}
+
 			context.write('}');
 		},
 
@@ -2019,9 +2028,15 @@ export default (options = {}) => {
 
 		TSModuleDeclaration(node, context) {
 			if (node.declare) context.write('declare ');
-			else context.write('namespace ');
 
-			context.visit(node.id);
+			if (node.global) {
+				context.write('global', node.id);
+			} else {
+				// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
+				const kind = node.kind ?? (node.id.type === 'Literal' ? 'module' : 'namespace');
+				context.write(kind + ' ');
+				context.visit(node.id);
+			}
 
 			if (!node.body) return;
 			context.visit(node.body);