okay i think this shit actually works now, types and all. except windows. fuckin windows

Rich-Harris · Rich-Harris · commit 5a81fa781b75 · 2025-06-25T13:08:54.000-04:00
diff --git a/package.json b/package.json
@@ -18,11 +18,11 @@
     },
     "./languages/ts": {
       "types": "./types/index.d.ts",
-      "default": "./src/languages/ts.js"
+      "default": "./src/languages/ts/index.js"
     },
     "./languages/tsx": {
       "types": "./types/index.d.ts",
-      "default": "./src/languages/tsx.js"
+      "default": "./src/languages/tsx/index.js"
     }
   },
   "types": "./types/index.d.ts",
@@ -32,7 +32,7 @@
     "@typescript-eslint/types": "^8.2.0",
     "@vitest/ui": "^2.1.1",
     "acorn": "^8.15.0",
-    "dts-buddy": "^0.5.4",
+    "dts-buddy": "^0.6.2",
     "prettier": "^3.0.3",
     "typescript": "^5.7.2",
     "vitest": "^2.1.1",
@@ -42,7 +42,7 @@
     "changeset:version": "changeset version",
     "changeset:publish": "changeset publish",
     "check": "tsc",
-    "prepublishOnly": "pnpm test && dts-buddy -m esrap:./src/public.d.ts -m esrap/languages/ts:./src/languages/ts.js -m esrap/languages/tsx:./src/languages/tsx.js",
+    "prepublishOnly": "pnpm test && 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",
     "sandbox": "node test/sandbox/index.js",
     "test": "vitest --run",
     "test:ui": "vitest --ui"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/context.js b/src/context.js
@@ -1,5 +1,5 @@
 /** @import { TSESTree } from '@typescript-eslint/types' */
-/** @import { Command, Visitors } from './types' */
+/** @import { BaseNode, Command, Visitors } from './types' */
 
 export const margin = 0;
 export const newline = 1;
@@ -49,7 +49,7 @@ export class Context {
 	/**
 	 *
 	 * @param {string} content
-	 * @param {TSESTree.Node} [node]
+	 * @param {BaseNode} [node]
 	 */
 	write(content, node) {
 		if (node?.loc) {
@@ -91,8 +91,10 @@ export class Context {
 		}
 
 		if (this.#visitors._) {
+			// @ts-expect-error
 			this.#visitors._(node, this, (node) => visitor(node, this));
 		} else {
+			// @ts-expect-error
 			visitor(node, this);
 		}
 	}
diff --git a/src/index.js b/src/index.js
@@ -153,3 +153,8 @@ export function print(node, visitors, opts = {}) {
 		}
 	};
 }
+
+// it sucks that we have to export the class rather than just
+// re-exporting it via public.d.ts, but otherwise TypeScript
+// gets confused about private fields because it is really dumb!
+export { Context };
diff --git a/src/languages/ts/index.js b/src/languages/ts/index.js
@@ -1,7 +1,9 @@
 /** @import { TSESTree } from '@typescript-eslint/types' */
-/** @import { Visitors } from '../types.js' */
-/** @import { TSOptions, Comment } from './types.js' */
-import { Context } from '../context.js';
+/** @import { Visitors } from '../../types.js' */
+/** @import { TSOptions, Comment } from '../types.js' */
+import { Context } from 'esrap';
+
+/** @typedef {TSESTree.Node} Node */
 
 /** @type {Record<TSESTree.Expression['type'] | 'Super' | 'RestElement', number>} */
 export const EXPRESSIONS_PRECEDENCE = {
diff --git a/src/languages/ts/public.d.ts b/src/languages/ts/public.d.ts
@@ -0,0 +1,2 @@
+export * from './index';
+export { Comment } from '../types';
diff --git a/src/languages/tsx/index.js b/src/languages/tsx/index.js
@@ -1,7 +1,9 @@
-/** @import { Visitors } from '../types' */
-/** @import { TSOptions } from './types.js' */
-import { TSESTree } from '@typescript-eslint/types';
-import ts from './ts.js';
+/** @import { TSESTree } from '@typescript-eslint/types' */
+/** @import { Visitors } from '../../types.js' */
+/** @import { TSOptions } from '../types.js' */
+import ts from '../ts/index.js';
+
+/** @typedef {TSESTree.Node} Node */
 
 /**
  * @param {TSOptions} [options]
diff --git a/src/languages/tsx/public.d.ts b/src/languages/tsx/public.d.ts
@@ -0,0 +1,2 @@
+export * from './index';
+export { Comment } from '../types';
diff --git a/src/languages/types.d.ts b/src/languages/types.d.ts
@@ -1,5 +1,3 @@
-import type { TSESTree } from '@typescript-eslint/types';
-
 export type TSOptions = {
 	quotes?: 'double' | 'single';
 	comments?: Comment[];
diff --git a/src/public.d.ts b/src/public.d.ts
@@ -1,2 +1,2 @@
-export { PrintOptions, Context, Visitors } from './types';
+export { PrintOptions, Visitors } from './types';
 export * from './index';
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -1,7 +1,13 @@
 import { TSESTree } from '@typescript-eslint/types';
-import type { Context } from './context.js';
-
-export type BaseNode = { type: string };
+import { Context } from 'esrap';
+
+export 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;
 
diff --git a/test/esrap.test.js b/test/esrap.test.js
@@ -6,7 +6,7 @@ import { expect, test } from 'vitest';
 import { walk } from 'zimmerframe';
 import { print } from '../src/index.js';
 import { acornTs, acornTsx, load } from './common.js';
-import tsx from '../src/languages/tsx.js';
+import tsx from '../src/languages/tsx/index.js';
 
 /** @param {TSESTree.Node} ast */
 function clean(ast) {
diff --git a/test/indent.test.js b/test/indent.test.js
@@ -4,7 +4,7 @@ import { test } from 'vitest';
 import { load } from './common';
 import { print } from '../src';
 import { expect } from 'vitest';
-import ts from '../src/languages/ts.js';
+import ts from '../src/languages/ts/index.js';
 
 const test_code = "const foo = () => { const bar = 'baz' }";
 
diff --git a/test/quotes.test.js b/test/quotes.test.js
@@ -5,7 +5,7 @@ import { print } from '../src/index.js';
 import { expect } from 'vitest';
 import { load } from './common.js';
 import { walk } from 'zimmerframe';
-import ts from '../src/languages/ts.js';
+import ts from '../src/languages/ts/index.js';
 
 /** @import { TSESTree } from '@typescript-eslint/types' */
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/** @import { TSESTree } from '@typescript-eslint/types' */`
`2`		`-/** @import { Command, Visitors } from './types' */`
	`2`	`+/** @import { BaseNode, Command, Visitors } from './types' */`
`3`	`3`
`4`	`4`	`export const margin = 0;`
`5`	`5`	`export const newline = 1;`
`@@ -49,7 +49,7 @@ export class Context {`
`49`	`49`	`/**`
`50`	`50`	`*`
`51`	`51`	`* @param {string} content`
`52`		`- * @param {TSESTree.Node} [node]`
	`52`	`+ * @param {BaseNode} [node]`
`53`	`53`	`*/`
`54`	`54`	`write(content, node) {`
`55`	`55`	`if (node?.loc) {`
`@@ -91,8 +91,10 @@ export class Context {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if (this.#visitors._) {`
	`94`	`+ // @ts-expect-error`
`94`	`95`	`this.#visitors._(node, this, (node) => visitor(node, this));`
`95`	`96`	`} else {`
	`97`	`+ // @ts-expect-error`
`96`	`98`	`visitor(node, this);`
`97`	`99`	`}`
`98`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,3 +153,8 @@ export function print(node, visitors, opts = {}) {`
`153`	`153`	`}`
`154`	`154`	`};`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+// it sucks that we have to export the class rather than just`
	`158`	`+// re-exporting it via public.d.ts, but otherwise TypeScript`
	`159`	`+// gets confused about private fields because it is really dumb!`
	`160`	`+export { Context };`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './index';`
	`2`	`+export { Comment } from '../types';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import type { TSESTree } from '@typescript-eslint/types';`
`2`		`-`
`3`	`1`	`export type TSOptions = {`
`4`	`2`	`quotes?: 'double' \| 'single';`
`5`	`3`	`comments?: Comment[];`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-export { PrintOptions, Context, Visitors } from './types';`
	`1`	`+export { PrintOptions, Visitors } from './types';`
`2`	`2`	`export * from './index';`