@atcute/lex-cli 2.5.2 → 2.6.0

package/dist/pull-sources/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/pull-sources/git.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAI7C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EACjC,MAAuB,EACvB,gBAA8D,EACxC,EAAE,CAAC;IACzB,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAE/C,IAAI,CAAC;QACJ,MAAM,MAAM,CACX;YACC,OAAO;YACP,oBAAoB;YACpB,SAAS;YACT,GAAG;YACH,UAAU;YACV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,MAAM,CAAC,MAAM;YACb,QAAQ;SACR,EACD,EAAE,SAAS,EAAE,MAAM,EAAE,CACrB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,wBAAwB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,GAAG,CAAC;IACX,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE;YACxF,SAAS,EAAE,MAAM;SACjB,CAAC,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,kCAAkC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YACnF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,GAAG,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEhD,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACpB,SAAS;QACV,CAAC;QAED,MAAM,QAAQ,GAAmB;YAChC,YAAY,EAAE,QAAQ;YACtB,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,MAAM,CAAC,MAAM;SAChC,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE7C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,sBAAsB;IACtB,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1F,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,4BAA4B,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,GAAG,CAAC;IACX,CAAC;IAED,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;AAAA,CACvB,CAAC"}
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/pull-sources/git.ts"],"names":[],"mappings":"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"}

package/dist/shared-options.d.ts

@@ -1,4 +1,4 @@
-export declare const sharedOptions: import("@optique/core/parser").Parser<{
+export declare const sharedOptions: import("@optique/core/parser").Parser<"sync", {
     readonly config: string | undefined;
 }, {
     readonly config: [import("@optique/core/valueparser").ValueParserResult<string> | undefined] | undefined;

package/package.json

@@ -1,39 +1,42 @@
 {
-  "type": "module",
   "name": "@atcute/lex-cli",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "cli tool to generate type definitions for atcute",
   "license": "0BSD",
   "repository": {
     "url": "https://github.com/mary-ext/atcute",
     "directory": "packages/lexicons/lex-cli"
   },
+  "bin": "./cli.mjs",
   "files": [
+    "cli.mjs",
     "dist/",
+    "schema/",
     "src/",
     "!src/**/*.bench.ts",
-    "!src/**/*.test.ts",
-    "cli.mjs",
-    "schema/"
+    "!src/**/*.test.ts"
   ],
-  "bin": "./cli.mjs",
+  "type": "module",
   "exports": {
     ".": "./dist/index.js"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@badrap/valita": "^0.4.6",
-    "@optique/core": "^0.6.3",
-    "@optique/run": "^0.6.3",
+    "@optique/core": "^0.10.7",
+    "@optique/run": "^0.10.7",
     "picocolors": "^1.1.1",
-    "prettier": "^3.7.1",
-    "@atcute/identity": "^1.1.3",
-    "@atcute/identity-resolver": "^1.2.0",
-    "@atcute/lexicon-resolver": "^0.1.5",
-    "@atcute/lexicon-doc": "^2.0.5",
-    "@atcute/lexicons": "^1.2.5"
+    "prettier": "^3.8.1",
+    "@atcute/identity": "^1.1.4",
+    "@atcute/identity-resolver": "^1.2.2",
+    "@atcute/lexicon-doc": "^2.1.2",
+    "@atcute/lexicon-resolver": "^0.1.6",
+    "@atcute/lexicons": "^1.2.9"
   },
   "devDependencies": {
-    "@types/node": "^22.19.1",
+    "@types/node": "^25.5.2",
     "tschema": "^3.2.0"
   },
   "scripts": {

package/src/cli.ts

@@ -1,9 +1,9 @@
 import { or } from '@optique/core/constructs';
 import { run } from '@optique/run';
 
-import { exportCommandSchema, runExport } from './commands/export.js';
-import { generateCommandSchema, runGenerate } from './commands/generate.js';
-import { pullCommandSchema, runPull } from './commands/pull.js';
+import { exportCommandSchema, runExport } from './commands/export.ts';
+import { generateCommandSchema, runGenerate } from './commands/generate.ts';
+import { pullCommandSchema, runPull } from './commands/pull.ts';
 
 const parser = or(generateCommandSchema, pullCommandSchema, exportCommandSchema);
 

package/src/codegen.ts

@@ -1,7 +1,5 @@
 import { dirname as getDirname, relative as getRelativePath } from 'node:path/posix';
 
-import * as prettier from 'prettier';
-
 import type {
 	LexDefinableField,
 	LexiconDoc,
@@ -16,6 +14,7 @@ import type {
 	LexXrpcQuery,
 	LexXrpcSubscription,
 } from '@atcute/lexicon-doc';
+import { formatLexiconRef, parseLexiconRef, type ParsedLexiconRef } from '@atcute/lexicon-doc';
 
 export interface SourceFile {
 	filename: string;
@@ -33,13 +32,6 @@ export interface LexiconApiOptions {
 	modules: {
 		importSuffix: string;
 	};
-	prettier: {
-		cwd: string;
-	};
-}
-
-export interface LexiconApiResult {
-	files: SourceFile[];
 }
 
 type DocumentMap = Map<string, LexiconDoc>;
@@ -49,31 +41,8 @@ type Literal = string | number | boolean;
 
 const lit: (val: Literal | Literal[]) => string = JSON.stringify;
 
-interface LexPath {
-	nsid: string;
-	defId: string;
-}
-
-const toLexUri = (path: LexPath): string => {
-	const { nsid, defId } = path;
-	return defId === 'main' ? nsid : `${nsid}#${defId}`;
-};
-
-const resolvePath = (from: LexPath, ref: string): LexPath => {
-	const index = ref.indexOf('#');
-
-	// nsid (no hash)
-	if (index === -1) {
-		return { nsid: ref, defId: 'main' };
-	}
-
-	// #defId (local ref)
-	if (index === 0) {
-		return { nsid: from.nsid, defId: ref.slice(1) };
-	}
-
-	// nsid#defId (full ref)
-	return { nsid: ref.slice(0, index), defId: ref.slice(index + 1) };
+const resolvePath = (from: ParsedLexiconRef, ref: string): ParsedLexiconRef => {
+	return parseLexiconRef(ref, from.nsid);
 };
 
 const resolveExternalImport = (nsid: string, mappings: ImportMapping[]): ImportMapping | undefined => {
@@ -90,7 +59,7 @@ const resolveExternalImport = (nsid: string, mappings: ImportMapping[]): ImportM
 
 const PURE = `/*#__PURE__*/`;
 
-export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<LexiconApiResult> => {
+export function* generateLexiconApi(opts: LexiconApiOptions): Generator<SourceFile> {
 	const importExt = opts.modules?.importSuffix;
 
 	const documents = opts.documents.toSorted((a, b) => {
@@ -105,7 +74,6 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 	});
 
 	const map: DocumentMap = new Map(documents.map((doc) => [doc.id, doc]));
-	const files: SourceFile[] = [];
 	const generatedIds = new Set<string>();
 
 	for (const doc of documents) {
@@ -139,7 +107,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 
 		for (const defId of sortedDefIds) {
 			const def = doc.defs[defId];
-			const path: LexPath = { nsid: doc.id, defId };
+			const path: ParsedLexiconRef = { nsid: doc.id, defId };
 
 			const camelcased = toCamelCase(defId);
 			const varname = `${camelcased}Schema`;
@@ -153,7 +121,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 
 					file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
 					file.ambients += `  interface XRPCQueries {\n`;
-					file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
+					file.ambients += `    ${lit(formatLexiconRef(path))}: ${camelcased}Schema;\n`;
 					file.ambients += `  }\n`;
 					file.ambients += `}`;
 					break;
@@ -165,7 +133,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 
 					file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
 					file.ambients += `  interface XRPCProcedures {\n`;
-					file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
+					file.ambients += `    ${lit(formatLexiconRef(path))}: ${camelcased}Schema;\n`;
 					file.ambients += `  }\n`;
 					file.ambients += `}`;
 					break;
@@ -177,7 +145,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 
 					file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
 					file.ambients += `  interface XRPCSubscriptions {\n`;
-					file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
+					file.ambients += `    ${lit(formatLexiconRef(path))}: ${camelcased}Schema;\n`;
 					file.ambients += `  }\n`;
 					file.ambients += `}`;
 					break;
@@ -193,13 +161,13 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 
 					file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
 					file.ambients += `  interface Records {\n`;
-					file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
+					file.ambients += `    ${lit(formatLexiconRef(path))}: ${camelcased}Schema;\n`;
 					file.ambients += `  }\n`;
 					file.ambients += `}`;
 					break;
 				}
 				case 'token': {
-					result = `${PURE} v.literal(${lit(toLexUri(path))})`;
+					result = `${PURE} v.literal(${lit(formatLexiconRef(path))})`;
 					break;
 				}
 				case 'permission-set': {
@@ -358,7 +326,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 		if (file.exports) {
 			generatedIds.add(doc.id);
 
-			files.push({
+			yield {
 				filename: filename,
 				code:
 					file.imports +
@@ -376,7 +344,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 					file.sinterfaces +
 					`\n\n` +
 					file.ambients,
-			});
+			};
 		}
 	}
 
@@ -391,40 +359,37 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 			code += `export * as ${toTitleCase(doc.id)} from ${lit(`./types/${doc.id.replaceAll('.', '/')}${importExt}`)};\n`;
 		}
 
-		files.push({
+		yield {
 			filename: 'index.ts',
 			code: code,
-		});
-	}
-
-	if (opts.prettier) {
-		const config = await prettier.resolveConfig(opts.prettier.cwd, { editorconfig: true });
-
-		for (const file of files) {
-			const formatted = await prettier.format(file.code, { ...config, parser: 'typescript' });
-			file.code = formatted;
-		}
+		};
 	}
+}
 
-	return { files };
-};
-
-const generateXrpcQuery = (imports: ImportSet, path: LexPath, spec: LexXrpcQuery): string => {
+const generateXrpcQuery = (imports: ImportSet, path: ParsedLexiconRef, spec: LexXrpcQuery): string => {
 	const params = generateXrpcParameters(imports, path, spec.parameters);
 	const output = generateXrpcBody(imports, path, spec.output);
 
-	return `${PURE} v.query(${lit(toLexUri(path))}, {\n"params": ${params}, "output": ${output} })`;
+	return `${PURE} v.query(${lit(formatLexiconRef(path))}, {\n"params": ${params}, "output": ${output} })`;
 };
 
-const generateXrpcProcedure = (imports: ImportSet, path: LexPath, spec: LexXrpcProcedure): string => {
+const generateXrpcProcedure = (
+	imports: ImportSet,
+	path: ParsedLexiconRef,
+	spec: LexXrpcProcedure,
+): string => {
 	const params = generateXrpcParameters(imports, path, spec.parameters);
 	const input = generateXrpcBody(imports, path, spec.input);
 	const output = generateXrpcBody(imports, path, spec.output);
 
-	return `${PURE} v.procedure(${lit(toLexUri(path))}, {\n"params": ${params}, "input": ${input}, "output": ${output} })`;
+	return `${PURE} v.procedure(${lit(formatLexiconRef(path))}, {\n"params": ${params}, "input": ${input}, "output": ${output} })`;
 };
 
-const generateXrpcSubscription = (imports: ImportSet, path: LexPath, spec: LexXrpcSubscription): string => {
+const generateXrpcSubscription = (
+	imports: ImportSet,
+	path: ParsedLexiconRef,
+	spec: LexXrpcSubscription,
+): string => {
 	const schema = spec.message?.schema;
 
 	const params = generateXrpcParameters(imports, path, spec.parameters);
@@ -441,10 +406,14 @@ const generateXrpcSubscription = (imports: ImportSet, path: LexPath, spec: LexXr
 		inner += `"message": null,`;
 	}
 
-	return `${PURE} v.subscription(${lit(toLexUri(path))}, {\n${inner}})`;
+	return `${PURE} v.subscription(${lit(formatLexiconRef(path))}, {\n${inner}})`;
 };
 
-const generateXrpcBody = (imports: ImportSet, path: LexPath, spec: LexXrpcBody | undefined): string => {
+const generateXrpcBody = (
+	imports: ImportSet,
+	path: ParsedLexiconRef,
+	spec: LexXrpcBody | undefined,
+): string => {
 	if (spec === undefined) {
 		return `null`;
 	}
@@ -489,7 +458,7 @@ const generateXrpcBody = (imports: ImportSet, path: LexPath, spec: LexXrpcBody |
 
 const generateXrpcParameters = (
 	imports: ImportSet,
-	path: LexPath,
+	path: ParsedLexiconRef,
 	spec: LexXrpcParameters | undefined,
 ): string => {
 	if (spec === undefined) {
@@ -529,7 +498,7 @@ const generateXrpcParameters = (
 	return generateObject(imports, path, mask, 'none');
 };
 
-const generateRecord = (imports: ImportSet, path: LexPath, spec: LexRecord): string => {
+const generateRecord = (imports: ImportSet, path: ParsedLexiconRef, spec: LexRecord): string => {
 	const schema = generateObject(imports, path, spec.record, 'required');
 
 	let key = `${PURE} v.string()`;
@@ -548,7 +517,7 @@ const generateRecord = (imports: ImportSet, path: LexPath, spec: LexRecord): str
 
 const generateObject = (
 	imports: ImportSet,
-	path: LexPath,
+	path: ParsedLexiconRef,
 	spec: LexObject,
 	writeType: 'required' | 'optional' | 'none' = 'optional',
 ): string => {
@@ -559,11 +528,11 @@ const generateObject = (
 
 	switch (writeType) {
 		case 'optional': {
-			inner += `"$type": ${PURE} v.optional(${PURE} v.literal(${lit(toLexUri(path))})),`;
+			inner += `"$type": ${PURE} v.optional(${PURE} v.literal(${lit(formatLexiconRef(path))})),`;
 			break;
 		}
 		case 'required': {
-			inner += `"$type": ${PURE} v.literal(${lit(toLexUri(path))}),`;
+			inner += `"$type": ${PURE} v.literal(${lit(formatLexiconRef(path))}),`;
 			break;
 		}
 	}
@@ -715,7 +684,12 @@ const generateJsdocField = (spec: LexUserType | LexRefVariant | LexUnknown) => {
 	return res;
 };
 
-const generateType = (imports: ImportSet, path: LexPath, spec: LexDefinableField, lazy = false): string => {
+const generateType = (
+	imports: ImportSet,
+	path: ParsedLexiconRef,
+	spec: LexDefinableField,
+	lazy = false,
+): string => {
 	switch (spec.type) {
 		// LexRefVariant
 		case 'ref': {
@@ -732,8 +706,9 @@ const generateType = (imports: ImportSet, path: LexPath, spec: LexDefinableField
 			const refs = spec.refs
 				.map((ref) => {
 					const refPath = resolvePath(path, ref);
-					return { path: refPath, uri: toLexUri(refPath) };
+					return { path: refPath, uri: formatLexiconRef(refPath) };
 				})
+				// oxlint-disable-next-line unicorn/no-array-sort -- map already clones
 				.sort((a, b) => {
 					if (a.uri < b.uri) {
 						return -1;

package/src/commands/export.ts

@@ -2,16 +2,17 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 
 import type { LexiconDoc } from '@atcute/lexicon-doc';
+
 import { merge, object } from '@optique/core/constructs';
 import { message } from '@optique/core/message';
 import { type InferValue } from '@optique/core/parser';
 import { command, constant } from '@optique/core/primitives';
 import pc from 'picocolors';
-import prettier from 'prettier';
 
-import { loadConfig, type ExportConfig, type NormalizedConfig } from '../config.js';
-import { loadLexicons } from '../lexicon-loader.js';
-import { sharedOptions } from '../shared-options.js';
+import { loadConfig, type ExportConfig, type NormalizedConfig } from '../config.ts';
+import { createFormatter, type Formatter } from '../formatter.ts';
+import { loadLexicons } from '../lexicon-loader.ts';
+import { sharedOptions } from '../shared-options.ts';
 
 export const exportCommandSchema = command(
 	'export',
@@ -43,27 +44,17 @@ const ensureExportConfig = (config: NormalizedConfig): ExportConfig => {
 	return config.export;
 };
 
-/**
- * writes a lexicon document to disk as formatted JSON
- * @param outdir output directory
- * @param nsid the NSID of the lexicon
- * @param doc the lexicon document
- * @param prettierConfig prettier configuration
- */
 const writeLexicon = async (
 	outdir: string,
 	nsid: string,
 	doc: LexiconDoc,
-	prettierConfig: prettier.Options | null,
+	formatter: Formatter,
 ): Promise<void> => {
 	const nsidPath = nsid.replaceAll('.', '/');
 	const target = path.join(outdir, `${nsidPath}.json`);
 	const dirname = path.dirname(target);
 
-	const code = await prettier.format(JSON.stringify(doc, null, 2), {
-		...(prettierConfig ?? {}),
-		parser: 'json',
-	});
+	const code = await formatter.format(JSON.stringify(doc, null, 2), target);
 
 	await fs.mkdir(dirname, { recursive: true });
 	await fs.writeFile(target, code);
@@ -80,7 +71,7 @@ export const runExport = async (args: ExportCommand): Promise<void> => {
 	// use export.files if specified, otherwise fall back to root files config
 	const files = exportConfig.files ?? config.files;
 	const outdir = path.resolve(config.root, exportConfig.outdir);
-	const prettierConfig = await prettier.resolveConfig(config.root, { editorconfig: true });
+	const formatter = await createFormatter(config.formatter, config.root);
 
 	// load lexicons from files
 	const loaded = await loadLexicons(files, config.root);
@@ -98,9 +89,7 @@ export const runExport = async (args: ExportCommand): Promise<void> => {
 	await fs.mkdir(outdir, { recursive: true });
 
 	// write each lexicon as JSON
-	for (const { nsid, doc } of loaded) {
-		await writeLexicon(outdir, nsid, doc, prettierConfig);
-	}
+	await Promise.all(loaded.map(({ nsid, doc }) => writeLexicon(outdir, nsid, doc, formatter)));
 
 	console.log(pc.green(`exported ${loaded.length} lexicon(s) to ${outdir}`));
 };

package/src/commands/generate.ts

@@ -7,11 +7,12 @@ import { type InferValue } from '@optique/core/parser';
 import { command, constant } from '@optique/core/primitives';
 import pc from 'picocolors';
 
-import { generateLexiconApi, type ImportMapping } from '../codegen.js';
-import { loadConfig } from '../config.js';
-import { loadLexicons } from '../lexicon-loader.js';
-import { packageJsonSchema } from '../lexicon-metadata.js';
-import { sharedOptions } from '../shared-options.js';
+import { generateLexiconApi, type ImportMapping } from '../codegen.ts';
+import { loadConfig } from '../config.ts';
+import { createFormatter } from '../formatter.ts';
+import { loadLexicons } from '../lexicon-loader.ts';
+import { packageJsonSchema } from '../lexicon-metadata.ts';
+import { sharedOptions } from '../shared-options.ts';
 
 /**
  * resolves package imports to ImportMapping[]
@@ -147,24 +148,27 @@ export const runGenerate = async (args: GenerateCommand): Promise<void> => {
 	const loaded = await loadLexicons(config.files, config.root);
 	const documents = loaded.map((l) => l.doc);
 
-	const generationResult = await generateLexiconApi({
+	const outdir = path.join(config.root, config.outdir);
+	const formatter = await createFormatter(config.formatter, config.root);
+	const pending: Promise<void>[] = [];
+
+	for (const file of generateLexiconApi({
 		documents: documents,
 		mappings: allMappings,
 		modules: {
 			importSuffix: config.modules?.importSuffix ?? '.js',
 		},
-		prettier: {
-			cwd: process.cwd(),
-		},
-	});
-
-	const outdir = path.join(config.root, config.outdir);
-
-	for (const file of generationResult.files) {
+	})) {
 		const filename = path.join(outdir, file.filename);
-		const dirname = path.dirname(filename);
 
-		await fs.mkdir(dirname, { recursive: true });
-		await fs.writeFile(filename, file.code);
+		pending.push(
+			(async () => {
+				const formatted = await formatter.format(file.code, filename);
+				await fs.mkdir(path.dirname(filename), { recursive: true });
+				await fs.writeFile(filename, formatted);
+			})(),
+		);
 	}
+
+	await Promise.all(pending);
 };

package/src/commands/pull.ts

@@ -2,18 +2,19 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 
 import { lexiconDoc, refineLexiconDoc, type LexiconDoc } from '@atcute/lexicon-doc';
+
 import { merge, object } from '@optique/core/constructs';
 import { message } from '@optique/core/message';
 import { type InferValue } from '@optique/core/parser';
 import { command, constant } from '@optique/core/primitives';
 import pc from 'picocolors';
-import prettier from 'prettier';
 
-import { loadConfig, type NormalizedConfig, type PullConfig, type SourceConfig } from '../config.js';
-import { pullAtprotoSource } from '../pull-sources/atproto.js';
-import { pullGitSource } from '../pull-sources/git.js';
-import type { PullResult, PulledLexicon, SourceLocation } from '../pull-sources/types.js';
-import { sharedOptions } from '../shared-options.js';
+import { loadConfig, type NormalizedConfig, type PullConfig, type SourceConfig } from '../config.ts';
+import { createFormatter, type Formatter } from '../formatter.ts';
+import { pullAtprotoSource } from '../pull-sources/atproto.ts';
+import { pullGitSource } from '../pull-sources/git.ts';
+import type { PullResult, PulledLexicon, SourceLocation } from '../pull-sources/types.ts';
+import { sharedOptions } from '../shared-options.ts';
 
 export const pullCommandSchema = command(
 	'pull',
@@ -109,16 +110,13 @@ const writeLexicon = async (
 	outdir: string,
 	nsid: string,
 	doc: LexiconDoc,
-	prettierConfig: prettier.Options | null,
+	formatter: Formatter,
 ): Promise<void> => {
 	const nsidPath = nsid.replaceAll('.', '/');
 	const target = path.join(outdir, `${nsidPath}.json`);
 	const dirname = path.dirname(target);
 
-	const code = await prettier.format(JSON.stringify(doc, null, 2), {
-		...(prettierConfig ?? {}),
-		parser: 'json',
-	});
+	const code = await formatter.format(JSON.stringify(doc, null, 2), target);
 
 	await fs.mkdir(dirname, { recursive: true });
 	await fs.writeFile(target, code);
@@ -138,7 +136,7 @@ const pullSource = async (source: SourceConfig): Promise<PullResult> => {
 const writeSourceReadme = async (
 	outdir: string,
 	revisions: SourceRevision[],
-	prettierConfig: prettier.Options | null,
+	formatter: Formatter,
 ): Promise<void> => {
 	const lines = [
 		'# lexicon sources',
@@ -172,12 +170,10 @@ const writeSourceReadme = async (
 	lines.push('');
 
 	const content = lines.join('\n');
-	const formatted = await prettier.format(content, {
-		...(prettierConfig ?? {}),
-		parser: 'markdown',
-	});
+	const target = path.join(outdir, 'README.md');
+	const formatted = await formatter.format(content, target);
 
-	await fs.writeFile(path.join(outdir, 'README.md'), formatted);
+	await fs.writeFile(target, formatted);
 };
 
 /**
@@ -189,7 +185,7 @@ export const runPull = async (args: PullCommand): Promise<void> => {
 	const pullConfig = ensurePullConfig(config);
 
 	const outdir = path.resolve(config.root, pullConfig.outdir);
-	const prettierConfig = await prettier.resolveConfig(config.root, { editorconfig: true });
+	const formatter = await createFormatter(config.formatter, config.root);
 
 	const seen = new Map<string, SourceLocation>();
 	const collected: PulledLexicon[] = [];
@@ -223,9 +219,8 @@ export const runPull = async (args: PullCommand): Promise<void> => {
 
 	await fs.mkdir(outdir, { recursive: true });
 
-	for (const entry of collected) {
-		await writeLexicon(outdir, entry.nsid, entry.doc, prettierConfig);
-	}
-
-	await writeSourceReadme(outdir, sourceRevisions, prettierConfig);
+	await Promise.all([
+		...collected.map((entry) => writeLexicon(outdir, entry.nsid, entry.doc, formatter)),
+		writeSourceReadme(outdir, sourceRevisions, formatter),
+	]);
 };

package/src/config.ts

@@ -1,14 +1,15 @@
 import * as fs from 'node:fs/promises';
+import { availableParallelism } from 'node:os';
 import * as path from 'node:path';
 import * as url from 'node:url';
 
-import * as v from '@badrap/valita';
-import pc from 'picocolors';
-
 import { isAtprotoDid } from '@atcute/identity';
 import { isHandle, isNsid } from '@atcute/lexicons/syntax';
 
-import type { ImportMapping } from './codegen.js';
+import * as v from '@badrap/valita';
+import pc from 'picocolors';
+
+import type { ImportMapping } from './codegen.ts';
 
 const gitSourceConfigSchema = v.object({
 	type: v.literal('git'),
@@ -63,6 +64,18 @@ const exportConfigSchema = v.object({
 	clean: v.boolean().optional(),
 });
 
+const formatterConfigSchema = v.union(
+	v.object({ type: v.literal('prettier') }),
+	v.object({
+		type: v.literal('command'),
+		command: v.string().assert((value) => value.length > 0, `must not be empty`),
+		concurrency: v
+			.number()
+			.assert((value) => Number.isInteger(value) && value > 0, `must be a positive integer`)
+			.optional(() => availableParallelism()),
+	}),
+);
+
 export type GitSourceConfig = v.Infer<typeof gitSourceConfigSchema>;
 export type AtprotoNsidsSourceConfig = v.Infer<typeof atprotoNsidsSourceConfigSchema>;
 export type AtprotoAuthoritySourceConfig = v.Infer<typeof atprotoAuthoritySourceConfigSchema>;
@@ -70,6 +83,7 @@ export type AtprotoSourceConfig = v.Infer<typeof atprotoSourceConfigSchema>;
 export type SourceConfig = v.Infer<typeof sourceConfigSchema>;
 export type PullConfig = v.Infer<typeof pullConfigSchema>;
 export type ExportConfig = v.Infer<typeof exportConfigSchema>;
+export type FormatterConfig = v.Infer<typeof formatterConfigSchema>;
 
 const isValidLexiconPattern = (pattern: string): boolean => {
 	if (pattern.endsWith('.*')) {
@@ -126,6 +140,7 @@ export const lexiconConfigSchema = v.object({
 		})
 		.partial()
 		.optional(),
+	formatter: formatterConfigSchema.optional((): FormatterConfig => ({ type: 'prettier' })),
 	pull: pullConfigSchema.optional(),
 	export: exportConfigSchema.optional(),
 });