esrap 2.2.1 → 2.2.3

package/package.json

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

package/src/context.js

@@ -1,4 +1,3 @@
-/** @import { TSESTree } from '@typescript-eslint/types' */
 /** @import { BaseNode, Command, Visitors } from './types' */
 
 export const margin = 0;
@@ -51,7 +50,7 @@ export class Context {
 	append(context) {
 		this.#commands.push(context.#commands);
 
-		if (this.#has_newline) {
+		if (this.#has_newline || context.multiline) {
 			this.multiline = true;
 		}
 	}

package/src/languages/ts/index.js

@@ -232,6 +232,16 @@ export default (options = {}) => {
 		}
 	}
 
+	/**
+	 * @param {TSESTree.Node} node
+	 * @returns {boolean}
+	 */
+	function has_object_or_array_value(node) {
+		if (!node || node.type !== 'Property') return false;
+		const value = node.value?.type === 'AssignmentPattern' ? node.value.left : node.value;
+		return value?.type === 'ObjectExpression' || value?.type === 'ArrayExpression';
+	}
+
 	/**
 	 * @param {Context} context
 	 * @param {TSESTree.Node[]} nodes
@@ -280,8 +290,10 @@ export default (options = {}) => {
 			const child = children[i];
 
 			if (prev !== null) {
-				if (multiline_nodes[i - 1] || multiline_nodes[i]) {
-					context.margin();
+				if (multiline_nodes[i - 1] && multiline_nodes[i]) {
+					if (!has_object_or_array_value(nodes[i - 1]) || !has_object_or_array_value(nodes[i])) {
+						context.margin();
+					}
 				}
 
 				if (nodes[i]) {
@@ -554,6 +566,13 @@ export default (options = {}) => {
 			if (node.superClass) {
 				context.write('extends ');
 				context.visit(node.superClass);
+
+				// @ts-expect-error `acorn-typescript` and `@typescript-eslint/types` have slightly different type definitions
+				var type_arguments = node.superTypeParameters ?? node.superTypeArguments;
+				if (type_arguments) {
+					context.visit(type_arguments);
+				}
+
 				context.write(' ');
 			}
 
@@ -626,6 +645,14 @@ export default (options = {}) => {
 				context.write('abstract ');
 			}
 
+			if (node.accessibility) {
+				context.write(node.accessibility + ' ');
+			}
+
+			if (node.override) {
+				context.write('override ');
+			}
+
 			if (node.static) {
 				context.write('static ');
 			}

package/types/index.d.ts.map

@@ -35,6 +35,6 @@
 		null,
 		null
 	],
-	"mappings": ";MAGYA,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;aAEPC,QAAQA;;;;WAwBHC,QAAQA;;;;;;MAWbC,OAAOA;;kBAEFC,YAAYA;;;;;;;;;iBCHbC,KAAKA;;;;cC5CRC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cCDPC,sBAAsBA;;aAHZC,IAAIA;MCFfC,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA;;;;;;;;;;;aKdGO,IAAIA;MDFfC,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA",
+	"mappings": ";MAGYA,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;aAEPC,QAAQA;;;;WAwBHC,QAAQA;;;;;;MAWbC,OAAOA;;kBAEFC,YAAYA;;;;;;;;;iBCHbC,KAAKA;;;;cC7CRC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cCAPC,sBAAsBA;;aAHZC,IAAIA;MCFfC,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA;;;;;;;;;;;aKdGO,IAAIA;MDFfC,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA",
 	"ignoreList": []
 }