esrap 2.2.4 → 2.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esrap",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "Parse in reverse",
   "repository": {
     "type": "git",
@@ -29,6 +29,8 @@
   "devDependencies": {
     "@changesets/cli": "^2.27.11",
     "@sveltejs/acorn-typescript": "^1.0.5",
+    "@types/estree": "^1.0.8",
+    "@typescript-eslint/types": "^8.2.0",
     "@vitest/ui": "^2.1.1",
     "acorn": "^8.15.0",
     "dts-buddy": "^0.6.2",
@@ -40,16 +42,24 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jridgewell/sourcemap-codec": "^1.4.15",
+    "@jridgewell/sourcemap-codec": "^1.4.15"
+  },
+  "peerDependencies": {
     "@typescript-eslint/types": "^8.2.0"
   },
+  "peerDependenciesMeta": {
+    "@typescript-eslint/types": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "changeset:version": "changeset version",
     "changeset:publish": "changeset publish",
-    "check": "tsc",
+    "gen": "dts-buddy -m esrap:./src/public.d.ts -m esrap/languages/ts:./src/languages/ts/public.d.ts -m esrap/languages/tsx:./src/languages/tsx/public.d.ts",
+    "check": "pnpm gen && tsc",
     "sandbox": "node test/sandbox/index.js",
     "test": "vitest --run",
     "test:ui": "vitest --ui",

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);

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

@@ -1,2 +1,7 @@
-export * from './index';
-export type { BaseComment, Comment } from '../types';
+import type { Visitors, BaseNode } from '../../types';
+import type { TSOptions, BaseComment, Comment } from '../types';
+export type { BaseComment, Comment };
+export type Node = BaseNode;
+export default function ts(options?: TSOptions): Visitors<BaseNode>;
+// was Record<TSESTree.Expression['type'] | 'Super' | 'RestElement', number>
+export declare const EXPRESSIONS_PRECEDENCE: Record<string, number>;

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

@@ -1,2 +1,5 @@
-export * from './index';
-export type { BaseComment, Comment } from '../types';
+import type { Visitors, BaseNode } from '../../types';
+import type { TSOptions, BaseComment, Comment } from '../types';
+export type { BaseComment, Comment };
+export type Node = BaseNode;
+export default function tsx(options?: TSOptions): Visitors<BaseNode>;

package/types/index.d.ts

@@ -69,11 +69,30 @@ declare module 'esrap' {
 }
 
 declare module 'esrap/languages/ts' {
-	import type { TSESTree } from '@typescript-eslint/types';
 	import type { Context } from 'esrap';
-	export const EXPRESSIONS_PRECEDENCE: Record<TSESTree.Expression["type"] | "Super" | "RestElement", number>;
-	export default function _default(options?: TSOptions): Visitors<TSESTree.Node>;
-	export type Node = TSESTree.Node;
+	export type Node = BaseNode;
+	export default function ts(options?: TSOptions): Visitors<BaseNode>;
+	// was Record<TSESTree.Expression['type'] | 'Super' | 'RestElement', number>
+	export const EXPRESSIONS_PRECEDENCE: Record<string, number>;
+	type BaseNode = {
+		type: string;
+		loc?: null | {
+			start: { line: number; column: number };
+			end: { line: number; column: number };
+		};
+	};
+
+	type NodeOf<T extends string, X> = X extends { type: T } ? X : never;
+
+	type SpecialisedVisitors<T extends BaseNode> = {
+		[K in T['type']]?: Visitor<NodeOf<K, T>>;
+	};
+
+	type Visitor<T> = (node: T, context: Context) => void;
+
+	type Visitors<T extends BaseNode = BaseNode> = T['type'] extends '_'
+		? never
+		: SpecialisedVisitors<T> & { _?: (node: T, context: Context, visit: (node: T) => void) => void };
 	type TSOptions = {
 		quotes?: 'double' | 'single';
 		comments?: Comment[];
@@ -101,6 +120,14 @@ declare module 'esrap/languages/ts' {
 			end: Position;
 		};
 	}
+
+	export {};
+}
+
+declare module 'esrap/languages/tsx' {
+	import type { Context } from 'esrap';
+	export type Node = BaseNode;
+	export default function tsx(options?: TSOptions): Visitors<BaseNode>;
 	type BaseNode = {
 		type: string;
 		loc?: null | {
@@ -120,14 +147,6 @@ declare module 'esrap/languages/ts' {
 	type Visitors<T extends BaseNode = BaseNode> = T['type'] extends '_'
 		? never
 		: SpecialisedVisitors<T> & { _?: (node: T, context: Context, visit: (node: T) => void) => void };
-
-	export {};
-}
-
-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>;
 	type TSOptions = {
 		quotes?: 'double' | 'single';
 		comments?: Comment[];
@@ -155,25 +174,6 @@ declare module 'esrap/languages/tsx' {
 			end: Position;
 		};
 	}
-	type BaseNode = {
-		type: string;
-		loc?: null | {
-			start: { line: number; column: number };
-			end: { line: number; column: number };
-		};
-	};
-
-	type NodeOf<T extends string, X> = X extends { type: T } ? X : never;
-
-	type SpecialisedVisitors<T extends BaseNode> = {
-		[K in T['type']]?: Visitor<NodeOf<K, T>>;
-	};
-
-	type Visitor<T> = (node: T, context: Context) => void;
-
-	type Visitors<T extends BaseNode = BaseNode> = T['type'] extends '_'
-		? never
-		: SpecialisedVisitors<T> & { _?: (node: T, context: Context, visit: (node: T) => void) => void };
 
 	export {};
 }

package/types/index.d.ts.map

@@ -12,27 +12,31 @@
 		"PrintOptions",
 		"print",
 		"Context",
-		"EXPRESSIONS_PRECEDENCE",
 		"Node",
+		"ts",
+		"EXPRESSIONS_PRECEDENCE",
 		"TSOptions",
 		"Position",
 		"BaseComment",
-		"Comment"
+		"Comment",
+		"tsx"
 	],
 	"sources": [
 		"../src/types.d.ts",
 		"../src/index.js",
 		"../src/context.js",
-		"../src/languages/ts/index.js",
-		"../src/languages/types.d.ts"
+		"../src/languages/ts/public.d.ts",
+		"../src/languages/types.d.ts",
+		"../src/languages/tsx/public.d.ts"
 	],
 	"sourcesContent": [
 		null,
 		null,
 		null,
 		null,
+		null,
 		null
 	],
-	"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",
+	"mappings": ";MAEYA,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;aAEPC,QAAQA;;;;WAWHC,QAAQA;;;;;;MAWbC,OAAOA;;kBAEFC,YAAYA;;;;;;;;;iBCWbC,KAAKA;;;;cC7CRC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aCLRC,IAAIA;yBACQC,EAAEA;;cAELC,sBAAsBA;MHJ/BZ,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA;;;MIhBRS,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA;;;;;;;;;;;;aCpBZN,IAAIA;yBACQO,GAAGA;MLFfjB,QAAQA;;;;;;;;MAQfC,MAAMA;;MAENC,mBAAmBA;;;;MAIZC,OAAOA;;MAEPC,QAAQA;;;MIhBRS,SAASA;;;;;;;WAOXC,QAAQA;;;;;;;kBAODC,WAAWA;;;;;;;kBAOXC,OAAOA",
 	"ignoreList": []
 }