esrap 2.2.2 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",
@@ -29,7 +29,6 @@
   "devDependencies": {
     "@changesets/cli": "^2.27.11",
     "@sveltejs/acorn-typescript": "^1.0.5",
-    "@typescript-eslint/types": "^8.2.0",
     "@vitest/ui": "^2.1.1",
     "acorn": "^8.15.0",
     "dts-buddy": "^0.6.2",
@@ -41,7 +40,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jridgewell/sourcemap-codec": "^1.4.15"
+    "@jridgewell/sourcemap-codec": "^1.4.15",
+    "@typescript-eslint/types": "^8.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/languages/ts/index.js

@@ -566,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(' ');
 			}
 
@@ -638,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/src/languages/ts/public.d.ts

@@ -1,2 +1,2 @@
 export * from './index';
-export { BaseComment, Comment } from '../types';
+export type { BaseComment, Comment } from '../types';

package/src/languages/tsx/index.js

@@ -3,8 +3,6 @@
 /** @import { TSOptions } from '../types.js' */
 import ts from '../ts/index.js';
 
-/** @typedef {TSESTree.Node} Node */
-
 /**
  * @param {TSOptions} [options]
  * @returns {Visitors<TSESTree.Node>}

package/src/languages/tsx/public.d.ts

@@ -1,2 +1,2 @@
 export * from './index';
-export { BaseComment, Comment } from '../types';
+export type { BaseComment, Comment } from '../types';

package/src/languages/types.d.ts

@@ -1,5 +1,4 @@
-import { TSESTree } from '@typescript-eslint/types';
-import { BaseNode } from '../types';
+import type { BaseNode } from '../types';
 
 export type TSOptions = {
 	quotes?: 'double' | 'single';

package/src/public.d.ts

@@ -1,2 +1,2 @@
-export { PrintOptions, Visitors } from './types';
+export type { PrintOptions, Visitors } from './types';
 export * from './index';

package/src/types.d.ts

@@ -1,5 +1,4 @@
-import { TSESTree } from '@typescript-eslint/types';
-import { Context } from 'esrap';
+import type { Context } from 'esrap';
 
 export type BaseNode = {
 	type: string;
@@ -23,19 +22,6 @@ export type Visitors<T extends BaseNode = BaseNode> = T['type'] extends '_'
 
 export { Context };
 
-export type TypeAnnotationNodes =
-	| TSESTree.TypeNode
-	| TSESTree.TypeElement
-	| TSESTree.TSTypeAnnotation
-	| TSESTree.TSPropertySignature
-	| TSESTree.TSTypeParameter
-	| TSESTree.TSTypeParameterDeclaration
-	| TSESTree.TSTypeParameterInstantiation
-	| TSESTree.TSEnumMember
-	| TSESTree.TSInterfaceHeritage
-	| TSESTree.TSClassImplements
-	| TSExpressionWithTypeArguments;
-
 type TSExpressionWithTypeArguments = {
 	type: 'TSExpressionWithTypeArguments';
 	expression: any;

package/types/index.d.ts

@@ -128,7 +128,6 @@ declare module 'esrap/languages/tsx' {
 	import type { TSESTree } from '@typescript-eslint/types';
 	import type { Context } from 'esrap';
 	export default function _default(options?: TSOptions): Visitors<TSESTree.Node>;
-	export type Node = TSESTree.Node;
 	type TSOptions = {
 		quotes?: 'double' | 'single';
 		comments?: Comment[];

package/types/index.d.ts.map

@@ -24,17 +24,15 @@
 		"../src/index.js",
 		"../src/context.js",
 		"../src/languages/ts/index.js",
-		"../src/languages/types.d.ts",
-		"../src/languages/tsx/index.js"
+		"../src/languages/types.d.ts"
 	],
 	"sourcesContent": [
 		null,
 		null,
 		null,
 		null,
-		null,
 		null
 	],
-	"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",
+	"mappings": ";MAEYA,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;aAEPC,QAAQA;;;;WAWHC,QAAQA;;;;;;MAWbC,OAAOA;;kBAEFC,YAAYA;;;;;;;;;iBCWbC,KAAKA;;;;cC7CRC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cCAPC,sBAAsBA;;aAHZC,IAAIA;MCHfC,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA;;;;;;;;;;;MIhBRQ,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;MJrBZf,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA",
 	"ignoreList": []
 }