@atcute/lex-cli 2.3.2 → 2.4.0

package/dist/index.d.ts

@@ -1,12 +1,4 @@
-import type { ImportMapping } from './codegen.js';
-export interface LexiconConfig {
-    outdir: string;
-    files: string[];
-    imports?: string[];
-    mappings?: ImportMapping[];
-    modules?: {
-        importSuffix?: string;
-    };
-}
+import { type LexiconConfig } from './config.js';
+export type { LexiconConfig };
 export declare const defineLexiconConfig: (config: LexiconConfig) => LexiconConfig;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE;QACT,YAAY,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACF;AAED,eAAO,MAAM,mBAAmB,GAAI,QAAQ,aAAa,KAAG,aAE3D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAEtE,YAAY,EAAE,aAAa,EAAE,CAAC;AAE9B,eAAO,MAAM,mBAAmB,GAAI,QAAQ,aAAa,KAAG,aAE3D,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
+import { lexiconConfigSchema } from './config.js';
 export const defineLexiconConfig = (config) => {
-    return config;
+    return lexiconConfigSchema.parse(config);
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAqB,EAAiB,EAAE;IAC3E,OAAO,MAAM,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAsB,MAAM,aAAa,CAAC;AAItE,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAqB,EAAiB,EAAE;IAC3E,OAAO,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC,CAAC"}

package/dist/pull.d.ts

@@ -0,0 +1,7 @@
+import type { NormalizedConfig } from './config.js';
+/**
+ * pulls lexicon documents from configured sources and writes them to disk using nsid-based paths.
+ * @param config normalized lex-cli configuration
+ */
+export declare const runPull: (config: NormalizedConfig) => Promise<void>;
+//# sourceMappingURL=pull.d.ts.map

package/dist/pull.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAA4B,MAAM,aAAa,CAAC;AAkP9E;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAU,QAAQ,gBAAgB,KAAG,OAAO,CAAC,IAAI,CA0CpE,CAAC"}

package/dist/pull.js

@@ -0,0 +1,209 @@
+import * as fs from 'node:fs/promises';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { lexiconDoc, refineLexiconDoc } from '@atcute/lexicon-doc';
+import prettier from 'prettier';
+import pc from 'picocolors';
+import { runGit, GitError } from './git.js';
+const ensurePullConfig = (config) => {
+    if (!config.pull) {
+        console.error(pc.bold(pc.red(`pull configuration missing`)));
+        process.exit(1);
+    }
+    return config.pull;
+};
+const parseLexiconFile = async (loc) => {
+    let source;
+    try {
+        source = await fs.readFile(loc.absolutePath, 'utf8');
+    }
+    catch (err) {
+        console.error(pc.bold(pc.red(`file read error for ${loc.relativePath} when pulling ${loc.sourceDescription}`)));
+        console.error(`found in ${loc.absolutePath}`);
+        console.error(err);
+        process.exit(1);
+    }
+    let json;
+    try {
+        json = JSON.parse(source);
+    }
+    catch (err) {
+        console.error(pc.bold(pc.red(`json parse error in ${loc.relativePath} when pulling ${loc.sourceDescription}`)));
+        console.error(`found in ${loc.absolutePath}`);
+        console.error(err);
+        process.exit(1);
+    }
+    const result = lexiconDoc.try(json, { mode: 'passthrough' });
+    if (!result.ok) {
+        console.error(pc.bold(pc.red(`schema validation failed for ${loc.relativePath} when pulling ${loc.sourceDescription}`)));
+        console.error(`found in ${loc.absolutePath}`);
+        console.error(result.message);
+        for (const issue of result.issues) {
+            console.log(`- ${issue.code} at .${issue.path.join('.')}`);
+        }
+        process.exit(1);
+    }
+    const issues = refineLexiconDoc(result.value, true);
+    if (issues.length > 0) {
+        console.error(pc.bold(pc.red(`lint validation failed for ${loc.relativePath} when pulling ${loc.sourceDescription}`)));
+        console.error(`found in ${loc.absolutePath}`);
+        for (const issue of issues) {
+            console.log(`- ${issue.message} at .${issue.path.join('.')}`);
+        }
+        process.exit(1);
+    }
+    return result.value;
+};
+const writeLexicon = async (outdir, nsid, doc, prettierConfig) => {
+    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',
+    });
+    await fs.mkdir(dirname, { recursive: true });
+    await fs.writeFile(target, code);
+};
+/**
+ * pulls lexicon documents from a git repository source
+ * @param source git source configuration
+ * @returns pulled lexicons and commit hash
+ */
+const pullGitSource = async (source) => {
+    const tempParent = await fs.mkdtemp(path.join(os.tmpdir(), 'lex-cli-pull-'));
+    const cloneDir = path.join(tempParent, 'repo');
+    try {
+        await runGit([
+            'clone',
+            '--filter=blob:none',
+            '--depth',
+            '1',
+            '--sparse',
+            ...(source.ref ? ['--branch', source.ref, '--single-branch'] : []),
+            source.remote,
+            cloneDir,
+        ], { timeoutMs: 60_000 });
+    }
+    catch (err) {
+        if (err instanceof GitError) {
+            console.error(pc.bold(pc.red(`git clone failed for ${source.remote}:`)));
+            console.error(err.stderr || err.message);
+            process.exit(1);
+        }
+        throw err;
+    }
+    try {
+        await runGit(['-C', cloneDir, 'sparse-checkout', 'set', '--no-cone', ...source.pattern], {
+            timeoutMs: 30_000,
+        });
+    }
+    catch (err) {
+        if (err instanceof GitError) {
+            console.error(pc.bold(pc.red(`git sparse-checkout failed for ${source.remote}:`)));
+            console.error(err.stderr || err.message);
+            process.exit(1);
+        }
+        throw err;
+    }
+    const pulled = new Map();
+    for await (const filename of fs.glob(source.pattern, { cwd: cloneDir })) {
+        const absolute = path.join(cloneDir, filename);
+        const stat = await fs.stat(absolute);
+        if (!stat.isFile()) {
+            continue;
+        }
+        const location = {
+            absolutePath: absolute,
+            relativePath: filename,
+            sourceDescription: source.remote,
+        };
+        const doc = await parseLexiconFile(location);
+        pulled.set(doc.id, { nsid: doc.id, doc, location });
+    }
+    // get the commit hash
+    let rev;
+    try {
+        const result = await runGit(['-C', cloneDir, 'rev-parse', 'HEAD'], { timeoutMs: 10_000 });
+        rev = result.stdout.trim();
+    }
+    catch (err) {
+        if (err instanceof GitError) {
+            console.error(pc.bold(pc.red(`git rev-parse failed for ${source.remote}:`)));
+            console.error(err.stderr || err.message);
+            process.exit(1);
+        }
+        throw err;
+    }
+    await fs.rm(tempParent, { recursive: true, force: true });
+    return { pulled, rev };
+};
+const pullSource = async (source) => {
+    switch (source.type) {
+        case 'git': {
+            return pullGitSource(source);
+        }
+    }
+};
+const writeSourceReadme = async (outdir, revisions, prettierConfig) => {
+    const lines = [
+        '# lexicon sources',
+        '',
+        'this directory contains lexicon documents pulled from the following sources:',
+        '',
+    ];
+    for (const { source, rev } of revisions) {
+        switch (source.type) {
+            case 'git': {
+                lines.push(`- ${source.remote}${source.ref ? ` (ref: ${source.ref})` : ``}`);
+                lines.push(`  - commit: ${rev}`);
+                break;
+            }
+        }
+    }
+    lines.push('');
+    const content = lines.join('\n');
+    const formatted = await prettier.format(content, {
+        ...(prettierConfig ?? {}),
+        parser: 'markdown',
+    });
+    await fs.writeFile(path.join(outdir, 'README.md'), formatted);
+};
+/**
+ * pulls lexicon documents from configured sources and writes them to disk using nsid-based paths.
+ * @param config normalized lex-cli configuration
+ */
+export const runPull = async (config) => {
+    const pullConfig = ensurePullConfig(config);
+    const outdir = path.resolve(config.root, pullConfig.outdir);
+    const prettierConfig = await prettier.resolveConfig(config.root, { editorconfig: true });
+    const seen = new Map();
+    const collected = [];
+    const sourceRevisions = [];
+    for (const source of pullConfig.sources) {
+        const result = await pullSource(source);
+        sourceRevisions.push({ source, rev: result.rev });
+        for (const [nsid, entry] of result.pulled) {
+            const existing = seen.get(nsid);
+            if (existing) {
+                console.error(pc.bold(pc.red(`duplicate lexicon "${nsid}"`)));
+                console.error(`- found ${entry.location.relativePath} from ${entry.location.sourceDescription}`);
+                console.error(`  at ${entry.location.absolutePath}`);
+                console.error(`- already found ${existing.relativePath} from ${existing.sourceDescription}`);
+                console.error(`  at ${existing.absolutePath}`);
+                process.exit(1);
+            }
+            seen.set(nsid, entry.location);
+            collected.push(entry);
+        }
+    }
+    if (pullConfig.clean) {
+        await fs.rm(outdir, { recursive: true, force: true });
+    }
+    await fs.mkdir(outdir, { recursive: true });
+    for (const entry of collected) {
+        await writeLexicon(outdir, entry.nsid, entry.doc, prettierConfig);
+    }
+    await writeSourceReadme(outdir, sourceRevisions, prettierConfig);
+};
+//# sourceMappingURL=pull.js.map

package/dist/pull.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@atcute/lex-cli",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "description": "cli tool to generate type definitions for atcute",
   "license": "0BSD",
   "repository": {
@@ -26,12 +26,12 @@
     "@optique/run": "^0.6.2",
     "picocolors": "^1.1.1",
     "prettier": "^3.6.2",
-    "@atcute/lexicon-doc": "^1.2.0"
+    "@atcute/lexicon-doc": "^2.0.2"
   },
   "devDependencies": {
     "@types/node": "^22.19.0",
     "tschema": "^3.2.0",
-    "@atcute/lexicons": "^1.2.2"
+    "@atcute/lexicons": "^1.2.5"
   },
   "scripts": {
     "build": "pnpm run generate:schema && tsc",

package/src/cli.ts

@@ -1,18 +1,19 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import * as url from 'node:url';
+
+import { lexiconDoc, refineLexiconDoc, type LexiconDoc } from '@atcute/lexicon-doc';
 
 import { object } from '@optique/core/constructs';
 import { command, constant, option } from '@optique/core/primitives';
+import { or } from '@optique/core/constructs';
 import { run } from '@optique/run';
 import { path as pathParser } from '@optique/run/valueparser';
 import pc from 'picocolors';
 
-import { lexiconDoc, type LexiconDoc } from '@atcute/lexicon-doc';
-
 import { generateLexiconApi, type ImportMapping } from './codegen.js';
-import type { LexiconConfig } from './index.js';
+import { loadConfig } from './config.js';
 import { packageJsonSchema } from './lexicon-metadata.js';
+import { runPull } from './pull.js';
 
 /**
  * Resolves package imports to ImportMapping[]
@@ -117,42 +118,38 @@ const resolveImportsToMappings = async (
 	return mappings;
 };
 
-const parser = command(
-	'generate',
-	object({
-		type: constant('generate'),
-		config: option('-c', '--config', pathParser({ metavar: 'CONFIG' })),
-	}),
+const parser = or(
+	command(
+		'generate',
+		object({
+			type: constant('generate'),
+			config: option('-c', '--config', pathParser({ metavar: 'CONFIG' })),
+		}),
+	),
+	command(
+		'pull',
+		object({
+			type: constant('pull'),
+			config: option('-c', '--config', pathParser({ metavar: 'CONFIG' })),
+		}),
+	),
 );
 
 const result = run(parser, { programName: 'lex-cli' });
 
 if (result.type === 'generate') {
-	const configFilename = path.resolve(result.config);
-	const configDirname = path.dirname(configFilename);
-
-	let config: LexiconConfig;
-	try {
-		const configURL = url.pathToFileURL(configFilename);
-		const configMod = (await import(configURL.href)) as { default: LexiconConfig };
-		config = configMod.default;
-	} catch (err) {
-		console.error(pc.bold(pc.red(`failed to import config:`)));
-		console.error(err);
-
-		process.exit(1);
-	}
+	const config = await loadConfig(result.config);
 
 	// Resolve imports to mappings
-	const importMappings = config.imports ? await resolveImportsToMappings(config.imports, configDirname) : [];
+	const importMappings = config.imports ? await resolveImportsToMappings(config.imports, config.root) : [];
 	const allMappings = [...importMappings, ...(config.mappings ?? [])];
 
 	const documents: LexiconDoc[] = [];
 
-	for await (const filename of fs.glob(config.files, { cwd: configDirname })) {
+	for await (const filename of fs.glob(config.files, { cwd: config.root })) {
 		let source: string;
 		try {
-			source = await fs.readFile(path.join(configDirname, filename), 'utf8');
+			source = await fs.readFile(path.join(config.root, filename), 'utf8');
 		} catch (err) {
 			console.error(pc.bold(pc.red(`file read error with "${filename}"`)));
 			console.error(err);
@@ -182,6 +179,17 @@ if (result.type === 'generate') {
 			process.exit(1);
 		}
 
+		const issues = refineLexiconDoc(result.value, true);
+		if (issues.length > 0) {
+			console.error(pc.bold(pc.red(`lint validation failed for "${filename}"`)));
+
+			for (const issue of issues) {
+				console.log(`- ${issue.message} at .${issue.path.join('.')}`);
+			}
+
+			process.exit(1);
+		}
+
 		documents.push(result.value);
 	}
 
@@ -196,7 +204,7 @@ if (result.type === 'generate') {
 		},
 	});
 
-	const outdir = path.join(configDirname, config.outdir);
+	const outdir = path.join(config.root, config.outdir);
 
 	for (const file of generationResult.files) {
 		const filename = path.join(outdir, file.filename);
@@ -205,4 +213,7 @@ if (result.type === 'generate') {
 		await fs.mkdir(dirname, { recursive: true });
 		await fs.writeFile(filename, file.code);
 	}
+} else if (result.type === 'pull') {
+	const config = await loadConfig(result.config);
+	await runPull(config);
 }

package/src/codegen.ts

@@ -3,12 +3,9 @@ import { dirname as getDirname, relative as getRelativePath } from 'node:path/po
 import * as prettier from 'prettier';
 
 import type {
-	LexArray,
-	LexBlob,
+	LexDefinableField,
 	LexiconDoc,
-	LexIpldType,
 	LexObject,
-	LexPrimitive,
 	LexRecord,
 	LexRefVariant,
 	LexUnknown,
@@ -177,6 +174,10 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 					result = `${PURE} v.literal(${lit(stripMainHash(defUri))})`;
 					break;
 				}
+				case 'permission-set': {
+					// skip permission sets
+					continue;
+				}
 				default: {
 					result = generateType(imports, defUri, def);
 					break;
@@ -248,11 +249,7 @@ export const generateLexiconApi = async (opts: LexiconApiOptions): Promise<Lexic
 					}
 
 					if (def.message?.schema) {
-						if (def.message?.schema.type === 'object') {
-							file.sinterfaces += `export interface $message extends v.InferInput<${camelcased}Schema['message']> {}\n`;
-						} else {
-							file.sinterfaces += `export type $message = v.InferInput<${camelcased}Schema['message']>;\n`;
-						}
+						file.sinterfaces += `export type $message = v.InferInput<${camelcased}Schema['message']>;\n`;
 					}
 
 					break;
@@ -400,15 +397,9 @@ const generateXrpcSubscription = (imports: ImportSet, defUri: string, spec: LexX
 	inner += `"params": ${params},`;
 
 	if (schema) {
-		if (schema.type === 'object') {
-			const res = generateObject(imports, defUri, schema, 'none');
+		const res = generateType(imports, defUri, schema);
 
-			inner += `"message": ${res},`;
-		} else {
-			const res = generateType(imports, defUri, schema);
-
-			inner += `get "message" () { return ${res} },`;
-		}
+		inner += `get "message" () { return ${res} },`;
 	} else {
 		inner += `"message": null,`;
 	}
@@ -687,12 +678,7 @@ const generateJsdocField = (spec: LexUserType | LexRefVariant | LexUnknown) => {
 	return res;
 };
 
-const generateType = (
-	imports: ImportSet,
-	defUri: string,
-	spec: LexArray | LexPrimitive | LexIpldType | LexRefVariant | LexBlob,
-	lazy = false,
-): string => {
+const generateType = (imports: ImportSet, defUri: string, spec: LexDefinableField, lazy = false): string => {
 	switch (spec.type) {
 		// LexRefVariant
 		case 'ref': {
@@ -933,9 +919,7 @@ const generateType = (
 	}
 };
 
-const isRefVariant = (
-	spec: LexArray | LexPrimitive | LexIpldType | LexRefVariant | LexBlob,
-): spec is LexRefVariant => {
+const isRefVariant = (spec: LexDefinableField): spec is LexRefVariant => {
 	const type = spec.type;
 	return type === 'ref' || type === 'union';
 };

package/src/config.ts

@@ -0,0 +1,130 @@
+import * as path from 'node:path';
+import * as url from 'node:url';
+
+import * as v from '@badrap/valita';
+import pc from 'picocolors';
+
+import { isNsid } from '@atcute/lexicons/syntax';
+
+import type { ImportMapping } from './codegen.js';
+
+const gitSourceConfigSchema = v.object({
+	type: v.literal('git'),
+	remote: v.string().assert((value) => value.length > 0, `must not be empty`),
+	ref: v
+		.string()
+		.assert((value) => value.length > 0, `must not be empty`)
+		.optional(),
+	pattern: v
+		.array(v.string().assert((value) => value.length > 0, `must not be empty`))
+		.assert((value) => value.length > 0, `must include at least one glob pattern`),
+});
+
+const sourceConfigSchema = v.union(gitSourceConfigSchema);
+
+const pullConfigSchema = v.object({
+	outdir: v.string().assert((value) => value.length > 0, `must not be empty`),
+	clean: v.boolean().optional(),
+	sources: v
+		.array(sourceConfigSchema)
+		.assert((value) => value.length > 0, `must include at least one source`),
+});
+
+export type GitSourceConfig = v.Infer<typeof gitSourceConfigSchema>;
+export type SourceConfig = v.Infer<typeof sourceConfigSchema>;
+export type PullConfig = v.Infer<typeof pullConfigSchema>;
+
+const isValidLexiconPattern = (pattern: string): boolean => {
+	if (pattern.endsWith('.*')) {
+		return isNsid(`${pattern.slice(0, -2)}.x`);
+	}
+
+	return isNsid(pattern);
+};
+
+const mappingImports: v.Type<ImportMapping['imports']> = v.unknown().chain((value) => {
+	if (typeof value === 'string') {
+		if (value.length === 0) {
+			return v.err('imports must not be empty');
+		}
+
+		return v.ok(value);
+	}
+
+	if (typeof value === 'function') {
+		return v.ok(value as ImportMapping['imports']);
+	}
+
+	return v.err('imports must be a string or function');
+});
+
+const importMappingSchema: v.Type<ImportMapping> = v.object({
+	nsid: v
+		.array(
+			v.string().chain((value) => {
+				if (!isValidLexiconPattern(value)) {
+					return v.err(`invalid NSID pattern (must be valid NSID or end with .*)`);
+				}
+
+				return v.ok(value);
+			}),
+		)
+		.assert((patterns) => patterns.length > 0, `nsid requires at least one pattern`),
+	imports: mappingImports,
+});
+
+export const lexiconConfigSchema = v.object({
+	outdir: v.string().assert((value) => value.length > 0, `must not be empty`),
+	files: v
+		.array(v.string().assert((value) => value.length > 0, `must not be empty`))
+		.assert((value) => value.length > 0, `must include at least one glob pattern`),
+	imports: v.array(v.string().assert((value) => value.length > 0, `must not be empty`)).optional(),
+	mappings: v.array(importMappingSchema).optional(),
+	modules: v
+		.object({
+			importSuffix: v
+				.string()
+				.assert((value) => value.length > 0, `must not be empty`)
+				.optional(),
+		})
+		.partial()
+		.optional(),
+	pull: pullConfigSchema.optional(),
+});
+
+export type LexiconConfig = v.Infer<typeof lexiconConfigSchema>;
+
+export interface NormalizedConfig extends LexiconConfig {
+	root: string;
+}
+
+export const loadConfig = async (configPath: string): Promise<NormalizedConfig> => {
+	const configFilename = path.resolve(configPath);
+	const configDirname = path.dirname(configFilename);
+
+	let rawConfig: unknown;
+	try {
+		const configURL = url.pathToFileURL(configFilename);
+		const configMod = (await import(configURL.href)) as { default: unknown };
+		rawConfig = configMod.default;
+	} catch (err) {
+		console.error(pc.bold(pc.red(`failed to import config:`)));
+		console.error(err);
+
+		process.exit(1);
+	}
+
+	const configResult = lexiconConfigSchema.try(rawConfig, { mode: 'passthrough' });
+	if (!configResult.ok) {
+		console.error(pc.bold(pc.red(`invalid config:`)));
+		console.error(configResult.message);
+
+		for (const issue of configResult.issues) {
+			console.log(`- ${issue.code} at .${issue.path.join('.')}`);
+		}
+
+		process.exit(1);
+	}
+
+	return { ...configResult.value, root: configDirname };
+};