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

Author: Rich-Harris

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"

pnpm-lock.yaml

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

src/context.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 };

src/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 = {

src/languages/ts.js renamed to src/languages/ts/index.js

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

src/languages/ts/public.d.ts

@@ -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]

src/languages/tsx.js renamed to src/languages/tsx/index.js

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

src/languages/tsx/public.d.ts

@@ -1,5 +1,3 @@
-import type { TSESTree } from '@typescript-eslint/types';
-
 export type TSOptions = {
 	quotes?: 'double' | 'single';
 	comments?: Comment[];

src/languages/types.d.ts

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