@atcute/lex-cli 2.6.0 → 2.7.0

package/dist/formatter.js

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process';
-import { availableParallelism } from 'node:os';
+import { createLspClient } from './lsp-client.js';
 const inferPrettierParser = (filepath) => {
     if (filepath.endsWith('.ts') || filepath.endsWith('.tsx')) {
         return 'typescript';
@@ -47,65 +47,76 @@ class Semaphore {
  * @returns a formatter instance
  */
 export const createFormatter = async (config, root) => {
-    let inner;
-    let concurrency;
-    if (config.type === 'prettier') {
-        const prettier = await import('prettier');
-        const prettierConfig = await prettier.resolveConfig(root, { editorconfig: true });
-        // prettier is in-process and CPU-bound, so concurrency only helps
-        // avoid buffering all files in memory at once
-        concurrency = availableParallelism();
-        inner = {
-            async format(code, filepath) {
-                return prettier.format(code, { ...prettierConfig, parser: inferPrettierParser(filepath) });
-            },
-        };
-    }
-    else {
-        // the template uses {filepath} as a placeholder, which is passed as a
-        // positional argument to sh to avoid shell injection via filenames
-        const shellCmd = config.command.replaceAll('{filepath}', '"$1"');
-        concurrency = config.concurrency;
-        inner = {
-            format(code, filepath) {
-                return new Promise((resolve, reject) => {
-                    const child = spawn('sh', ['-c', shellCmd, 'sh', filepath], {
-                        stdio: ['pipe', 'pipe', 'pipe'],
-                    });
-                    const stdoutChunks = [];
-                    const stderrChunks = [];
-                    child.stdout.on('data', (chunk) => {
-                        stdoutChunks.push(chunk);
-                    });
-                    child.stderr.on('data', (chunk) => {
-                        stderrChunks.push(chunk);
-                    });
-                    child.on('error', reject);
-                    child.on('close', (exitCode) => {
-                        if (exitCode !== 0) {
-                            const stderr = Buffer.concat(stderrChunks).toString();
-                            reject(new Error(`formatter exited with code ${exitCode}:\n${stderr}`));
-                        }
-                        else {
-                            resolve(Buffer.concat(stdoutChunks).toString());
-                        }
-                    });
-                    child.stdin.end(code);
-                });
-            },
-        };
+    switch (config.type) {
+        case 'prettier': {
+            const prettier = await import('prettier');
+            const prettierConfig = await prettier.resolveConfig(root, { editorconfig: true });
+            return {
+                async format(code, filepath) {
+                    return prettier.format(code, { ...prettierConfig, parser: inferPrettierParser(filepath) });
+                },
+                async dispose() { },
+            };
+        }
+        case 'command': {
+            // the template uses {filepath} as a placeholder, which is passed as a
+            // positional argument to sh to avoid shell injection via filenames
+            const shellCmd = config.command.replaceAll('{filepath}', '"$1"');
+            const semaphore = new Semaphore(config.concurrency);
+            return {
+                async format(code, filepath) {
+                    const lock = await semaphore.acquire();
+                    try {
+                        return await new Promise((resolve, reject) => {
+                            const child = spawn('sh', ['-c', shellCmd, 'sh', filepath], {
+                                stdio: ['pipe', 'pipe', 'pipe'],
+                            });
+                            const stdoutChunks = [];
+                            const stderrChunks = [];
+                            child.stdout.on('data', (chunk) => {
+                                stdoutChunks.push(chunk);
+                            });
+                            child.stderr.on('data', (chunk) => {
+                                stderrChunks.push(chunk);
+                            });
+                            child.on('error', reject);
+                            child.on('close', (exitCode) => {
+                                if (exitCode !== 0) {
+                                    const stderr = Buffer.concat(stderrChunks).toString();
+                                    reject(new Error(`formatter exited with code ${exitCode}:\n${stderr}`));
+                                }
+                                else {
+                                    resolve(Buffer.concat(stdoutChunks).toString());
+                                }
+                            });
+                            child.stdin.end(code);
+                        });
+                    }
+                    finally {
+                        lock.release();
+                    }
+                },
+                async dispose() { },
+            };
+        }
+        case 'lsp': {
+            const client = await createLspClient(config.command, root);
+            const semaphore = new Semaphore(1);
+            return {
+                async format(code, filepath) {
+                    const lock = await semaphore.acquire();
+                    try {
+                        return await client.formatDocument(code, filepath);
+                    }
+                    finally {
+                        lock.release();
+                    }
+                },
+                async dispose() {
+                    await client.dispose();
+                },
+            };
+        }
     }
-    const semaphore = new Semaphore(concurrency);
-    return {
-        async format(code, filepath) {
-            const lock = await semaphore.acquire();
-            try {
-                return await inner.format(code, filepath);
-            }
-            finally {
-                lock.release();
-            }
-        },
-    };
 };
 //# sourceMappingURL=formatter.js.map

package/dist/formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAe/C,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACxD,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3D,OAAO,YAAY,CAAC;IACrB,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC;IACf,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAChE,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AAQF,MAAM,SAAS;IACN,OAAO,GAAmB,EAAE,CAAC;IAC7B,MAAM,GAAG,CAAC,CAAC;IACX,GAAG,CAAS;IAEpB,YAAY,GAAW;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,CAAC;IAED,OAAO;QACN,MAAM,IAAI,GAAS;YAClB,OAAO,EAAE,GAAG,EAAE;gBACb,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClC,IAAI,IAAI,EAAE,CAAC;oBACV,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,IAAI,EAAE,CAAC;gBACR,CAAC;YACF,CAAC;SACD,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,EAAQ,CAAC;QAC3D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IAChB,CAAC;CACD;AAED,aAAa;AAEb;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,MAAuB,EAAE,IAAY,EAAsB,EAAE;IAClG,IAAI,KAAgB,CAAC;IACrB,IAAI,WAAmB,CAAC;IAExB,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAElF,kEAAkE;QAClE,8CAA8C;QAC9C,WAAW,GAAG,oBAAoB,EAAE,CAAC;QACrC,KAAK,GAAG;YACP,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ;gBAC1B,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,cAAc,EAAE,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5F,CAAC;SACD,CAAC;IACH,CAAC;SAAM,CAAC;QACP,sEAAsE;QACtE,mEAAmE;QACnE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAEjE,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACjC,KAAK,GAAG;YACP,MAAM,CAAC,IAAI,EAAE,QAAQ;gBACpB,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE;wBAC3D,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;qBAC/B,CAAC,CAAC;oBAEH,MAAM,YAAY,GAAa,EAAE,CAAC;oBAClC,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;wBACzC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC;oBAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;wBACzC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC1B,CAAC,CAAC,CAAC;oBAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAE1B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAuB,EAAE,EAAE;wBAC7C,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;4BACpB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;4BACtD,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,QAAQ,MAAM,MAAM,EAAE,CAAC,CAAC,CAAC;wBACzE,CAAC;6BAAM,CAAC;4BACP,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACjD,CAAC;oBACF,CAAC,CAAC,CAAC;oBAEH,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACJ,CAAC;SACD,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAE7C,OAAO;QACN,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ;YAC1B,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI,CAAC;gBACJ,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC3C,CAAC;oBAAS,CAAC;gBACV,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../src/formatter.ts"],"names":[],"mappings":"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"}

package/dist/lsp-client.d.ts

@@ -0,0 +1,20 @@
+/** LSP client for formatting documents */
+export interface LspClient {
+    /**
+     * formats a document via LSP textDocument/formatting
+     * @param code source code to format
+     * @param filepath filepath for language detection and URI
+     * @returns formatted code
+     */
+    formatDocument(code: string, filepath: string): Promise<string>;
+    /** shuts down the LSP server */
+    dispose(): Promise<void>;
+}
+/**
+ * creates an LSP client that communicates with a formatter over stdio
+ * @param command shell command to spawn the LSP server
+ * @param root project root for LSP rootUri
+ * @returns an initialized LSP client ready for formatting
+ */
+export declare const createLspClient: (command: string, root: string) => Promise<LspClient>;
+//# sourceMappingURL=lsp-client.d.ts.map

package/dist/lsp-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lsp-client.d.ts","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"AAsFA,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACzB;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,gCAAgC;IAChC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,YAAmB,MAAM,QAAQ,MAAM,KAAG,OAAO,CAAC,SAAS,CA0LtF,CAAC"}

package/dist/lsp-client.js

@@ -0,0 +1,203 @@
+import { spawn } from 'node:child_process';
+import * as url from 'node:url';
+import { getUtf8Length } from '@atcute/uint8array';
+// #endregion
+// #region text edits
+const applyTextEdits = (code, edits) => {
+    if (edits.length === 0) {
+        return code;
+    }
+    // build line start offsets
+    const lineStarts = [0];
+    for (let i = 0; i < code.length; i++) {
+        if (code[i] === '\n') {
+            lineStarts.push(i + 1);
+        }
+    }
+    const positionToOffset = (pos) => {
+        return (lineStarts[pos.line] ?? code.length) + pos.character;
+    };
+    // sort edits in reverse document order so earlier positions stay valid
+    const sorted = edits.toSorted((a, b) => {
+        const lineDiff = b.range.start.line - a.range.start.line;
+        if (lineDiff !== 0) {
+            return lineDiff;
+        }
+        return b.range.start.character - a.range.start.character;
+    });
+    let result = code;
+    for (const edit of sorted) {
+        const start = positionToOffset(edit.range.start);
+        const end = positionToOffset(edit.range.end);
+        result = result.slice(0, start) + edit.newText + result.slice(end);
+    }
+    return result;
+};
+// #endregion
+const inferLanguageId = (filepath) => {
+    if (filepath.endsWith('.ts') || filepath.endsWith('.tsx')) {
+        return 'typescript';
+    }
+    if (filepath.endsWith('.json')) {
+        return 'json';
+    }
+    if (filepath.endsWith('.md') || filepath.endsWith('.markdown')) {
+        return 'markdown';
+    }
+    return 'typescript';
+};
+/**
+ * creates an LSP client that communicates with a formatter over stdio
+ * @param command shell command to spawn the LSP server
+ * @param root project root for LSP rootUri
+ * @returns an initialized LSP client ready for formatting
+ */
+export const createLspClient = async (command, root) => {
+    const child = spawn('sh', ['-c', command], {
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    // prevent EPIPE crash when child exits mid-write; actual errors
+    // are handled by the close/error handlers below
+    child.stdin.on('error', () => { });
+    // drain stderr so a chatty server doesn't block on a full pipe buffer
+    child.stderr.resume();
+    // #region JSON-RPC framing
+    const pending = new Map();
+    let nextId = 1;
+    let exited = false;
+    const sendMessage = (message) => {
+        if (exited) {
+            return;
+        }
+        const json = JSON.stringify(message);
+        const byteLength = getUtf8Length(json);
+        child.stdin.write(`Content-Length: ${byteLength}\r\n\r\n${json}`);
+    };
+    const sendRequest = (method, params) => {
+        if (exited) {
+            return Promise.reject(new Error(`LSP server has already exited`));
+        }
+        const id = nextId++;
+        const deferred = Promise.withResolvers();
+        pending.set(id, deferred);
+        sendMessage({ jsonrpc: '2.0', id, method, params });
+        return deferred.promise;
+    };
+    const sendNotification = (method, params) => {
+        sendMessage({ jsonrpc: '2.0', method, params });
+    };
+    // incremental message parser
+    const HEADER_SEPARATOR = Buffer.from('\r\n\r\n');
+    let buffer = Buffer.alloc(0);
+    let contentLength = -1;
+    const processBuffer = () => {
+        while (true) {
+            if (contentLength === -1) {
+                const separatorIndex = buffer.indexOf(HEADER_SEPARATOR);
+                if (separatorIndex === -1) {
+                    break;
+                }
+                const header = buffer.toString('utf8', 0, separatorIndex);
+                const match = header.match(/Content-Length:\s*(\d+)/i);
+                buffer = buffer.subarray(separatorIndex + 4);
+                if (!match) {
+                    continue;
+                }
+                contentLength = parseInt(match[1], 10);
+            }
+            if (buffer.length < contentLength) {
+                break;
+            }
+            const body = buffer.toString('utf8', 0, contentLength);
+            buffer = buffer.subarray(contentLength);
+            contentLength = -1;
+            let message;
+            try {
+                message = JSON.parse(body);
+            }
+            catch {
+                continue;
+            }
+            if (message.id != null) {
+                const entry = pending.get(message.id);
+                if (entry) {
+                    pending.delete(message.id);
+                    if (message.error) {
+                        entry.reject(new Error(`LSP error ${message.error.code}: ${message.error.message}`));
+                    }
+                    else {
+                        entry.resolve(message.result);
+                    }
+                }
+                else if (message.method != null) {
+                    // server-initiated request — reply with MethodNotFound so it doesn't hang
+                    sendMessage({
+                        jsonrpc: '2.0',
+                        id: message.id,
+                        error: { code: -32601, message: `method not found` },
+                    });
+                }
+            }
+        }
+    };
+    child.stdout.on('data', (chunk) => {
+        buffer = buffer.length > 0 ? Buffer.concat([buffer, chunk]) : chunk;
+        processBuffer();
+    });
+    const rejectPending = (error) => {
+        for (const [, entry] of pending) {
+            entry.reject(error);
+        }
+        pending.clear();
+    };
+    child.on('error', (err) => {
+        exited = true;
+        rejectPending(err);
+    });
+    child.on('close', (exitCode) => {
+        exited = true;
+        rejectPending(new Error(`LSP server exited unexpectedly with code ${exitCode}`));
+    });
+    // #endregion
+    // #region initialize handshake
+    const rootUri = url.pathToFileURL(root).href;
+    await sendRequest('initialize', {
+        processId: process.pid,
+        clientInfo: { name: 'lex-cli' },
+        rootUri,
+        capabilities: {},
+    });
+    sendNotification('initialized');
+    // #endregion
+    return {
+        async formatDocument(code, filepath) {
+            const uri = url.pathToFileURL(filepath).href;
+            const languageId = inferLanguageId(filepath);
+            sendNotification('textDocument/didOpen', {
+                textDocument: { uri, languageId, version: 1, text: code },
+            });
+            const edits = (await sendRequest('textDocument/formatting', {
+                textDocument: { uri },
+                options: { tabSize: 2, insertSpaces: false },
+            }));
+            sendNotification('textDocument/didClose', {
+                textDocument: { uri },
+            });
+            if (!edits || edits.length === 0) {
+                return code;
+            }
+            return applyTextEdits(code, edits);
+        },
+        async dispose() {
+            if (!exited) {
+                await sendRequest('shutdown', null);
+                sendNotification('exit');
+            }
+            if (!exited) {
+                child.kill();
+                await new Promise((resolve) => child.on('close', resolve));
+            }
+        },
+    };
+};
+//# sourceMappingURL=lsp-client.js.map

package/dist/lsp-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lsp-client.js","sourceRoot":"","sources":["../src/lsp-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atcute/lex-cli",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "cli tool to generate type definitions for atcute",
   "license": "0BSD",
   "repository": {
@@ -31,13 +31,14 @@
     "prettier": "^3.8.1",
     "@atcute/identity": "^1.1.4",
     "@atcute/identity-resolver": "^1.2.2",
-    "@atcute/lexicon-doc": "^2.1.2",
+    "@atcute/lexicon-doc": "^2.2.0",
     "@atcute/lexicon-resolver": "^0.1.6",
-    "@atcute/lexicons": "^1.2.9"
+    "@atcute/lexicons": "^1.3.0"
   },
   "devDependencies": {
     "@types/node": "^25.5.2",
-    "tschema": "^3.2.0"
+    "tschema": "^3.2.0",
+    "@atcute/uint8array": "^1.1.1"
   },
   "scripts": {
     "build": "pnpm run generate:schema && tsgo",

package/src/codegen.ts

@@ -59,6 +59,32 @@ const resolveExternalImport = (nsid: string, mappings: ImportMapping[]): ImportM
 
 const PURE = `/*#__PURE__*/`;
 
+const simplifyAccept = (accept: string[] | undefined): string[] | undefined => {
+	if (accept === undefined || accept.length === 0 || accept.includes('*/*')) {
+		return undefined;
+	}
+
+	const wildcards = new Set<string>();
+	for (const mime of accept) {
+		if (mime.endsWith('/*')) {
+			wildcards.add(mime.slice(0, mime.indexOf('/')));
+		}
+	}
+
+	if (wildcards.size === 0) {
+		return accept;
+	}
+
+	const simplified = accept.filter((mime) => {
+		if (mime.endsWith('/*')) {
+			return true;
+		}
+		return !wildcards.has(mime.slice(0, mime.indexOf('/')));
+	});
+
+	return simplified.length > 0 ? simplified : undefined;
+};
+
 export function* generateLexiconApi(opts: LexiconApiOptions): Generator<SourceFile> {
 	const importExt = opts.modules?.importSuffix;
 
@@ -658,9 +684,10 @@ const generateJsdocField = (spec: LexUserType | LexRefVariant | LexUnknown) => {
 			break;
 		}
 		case 'blob': {
-			if (spec.accept) {
-				const accept = spec.accept.map((mime) => mime.replace(/\*\//g, '*\\/')).join(', ');
-				lines.push(`@accept ${accept}`);
+			const accept = simplifyAccept(spec.accept);
+			if (accept) {
+				const formatted = accept.map((mime) => mime.replace(/\*\//g, '*\\/')).join(', ');
+				lines.push(`@accept ${formatted}`);
 			}
 			if (spec.maxSize !== undefined) {
 				lines.push(`@maxSize ${spec.maxSize}`);
@@ -890,7 +917,24 @@ const generateType = (
 
 		// LexBlob
 		case 'blob': {
-			return `${PURE} v.blob()`;
+			let pipe: string[] = [];
+
+			if (spec.maxSize !== undefined) {
+				pipe.push(`${PURE} v.blobSize(${lit(spec.maxSize)})`);
+			}
+
+			const accept = simplifyAccept(spec.accept);
+			if (accept !== undefined) {
+				pipe.push(`${PURE} v.blobAccept(${lit(accept)})`);
+			}
+
+			let call = `${PURE} v.blob()`;
+
+			if (pipe.length !== 0) {
+				call = `${PURE} v.constrain(${call}, [ ${pipe.join(', ')} ])`;
+			}
+
+			return call;
 		}
 
 		// LexIpldType

package/src/commands/export.ts

@@ -73,23 +73,27 @@ export const runExport = async (args: ExportCommand): Promise<void> => {
 	const outdir = path.resolve(config.root, exportConfig.outdir);
 	const formatter = await createFormatter(config.formatter, config.root);
 
-	// load lexicons from files
-	const loaded = await loadLexicons(files, config.root);
+	try {
+		// load lexicons from files
+		const loaded = await loadLexicons(files, config.root);
 
-	if (loaded.length === 0) {
-		console.warn(pc.yellow(`warning: no lexicons found to export`));
-		return;
-	}
+		if (loaded.length === 0) {
+			console.warn(pc.yellow(`warning: no lexicons found to export`));
+			return;
+		}
 
-	// clean output directory if requested
-	if (exportConfig.clean) {
-		await fs.rm(outdir, { recursive: true, force: true });
-	}
+		// clean output directory if requested
+		if (exportConfig.clean) {
+			await fs.rm(outdir, { recursive: true, force: true });
+		}
 
-	await fs.mkdir(outdir, { recursive: true });
+		await fs.mkdir(outdir, { recursive: true });
 
-	// write each lexicon as JSON
-	await Promise.all(loaded.map(({ nsid, doc }) => writeLexicon(outdir, nsid, doc, formatter)));
+		// write each lexicon as JSON
+		await Promise.all(loaded.map(({ nsid, doc }) => writeLexicon(outdir, nsid, doc, formatter)));
 
-	console.log(pc.green(`exported ${loaded.length} lexicon(s) to ${outdir}`));
+		console.log(pc.green(`exported ${loaded.length} lexicon(s) to ${outdir}`));
+	} finally {
+		await formatter.dispose();
+	}
 };

package/src/commands/generate.ts

@@ -150,25 +150,30 @@ export const runGenerate = async (args: GenerateCommand): Promise<void> => {
 
 	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',
-		},
-	})) {
-		const filename = path.join(outdir, file.filename);
-
-		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);
+	try {
+		const pending: Promise<void>[] = [];
+
+		for (const file of generateLexiconApi({
+			documents: documents,
+			mappings: allMappings,
+			modules: {
+				importSuffix: config.modules?.importSuffix ?? '.js',
+			},
+		})) {
+			const filename = path.join(outdir, file.filename);
+
+			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);
+	} finally {
+		await formatter.dispose();
+	}
 };