@atcute/lex-cli 2.4.0 → 2.5.0

package/README.md

@@ -20,19 +20,24 @@ export default defineLexiconConfig({
 then run the tool:
 
 ```
-npm exec lex-cli generate -c ./lex.config.js
+npm exec lex-cli generate
 ```
 
 ## pulling lexicons
 
-configure sources to be pulled locally before code generation. pulled files are written using their
-nsids (e.g., `app.bsky.feed.post` becomes `app/bsky/feed/post.json`).
+you can pull lexicon files from other sources.
+
+### git sources
+
+pull lexicons from git repositories using sparse checkout:
 
 ```ts
 // file: lex.config.js
 import { defineLexiconConfig } from '@atcute/lex-cli';
 
 export default defineLexiconConfig({
+	files: ['lexicons/**/*.json'],
+	outdir: 'src/lexicons/',
 	pull: {
 		outdir: 'lexicons/',
 		clean: true,
@@ -45,23 +50,50 @@ export default defineLexiconConfig({
 			},
 		],
 	},
+});
+```
+
+### atproto sources
+
+pull lexicons directly from the AT Protocol network.
+
+```ts
+export default defineLexiconConfig({
 	files: ['lexicons/**/*.json'],
 	outdir: 'src/lexicons/',
+	pull: {
+		outdir: 'lexicons/',
+		sources: [
+			{
+				type: 'atproto',
+				mode: 'nsids',
+				nsids: ['app.bsky.feed.post', 'app.bsky.actor.profile'],
+			},
+			{
+				type: 'atproto',
+				mode: 'authority',
+				authority: 'atproto-lexicons.bsky.social',
+				pattern: ['com.atproto.*'],
+			},
+		],
+	},
 });
 ```
 
+### running the pull command
+
 pull the lexicons to disk, then generate types from them:
 
 ```
-npm exec lex-cli pull -c ./lex.config.js
-npm exec lex-cli generate -c ./lex.config.js
+npm exec lex-cli pull
+npm exec lex-cli generate
 ```
 
 ## publishing your schemas
 
-if you're packaging your generated schemas as a publishable library, add the `atcute:lexicons`
-field to your package.json. this allows other projects to automatically discover and import your
-schemas without manual configuration.
+if you're packaging your generated schemas as a publishable library, add the `atcute:lexicons` field
+to your package.json. this allows other projects to automatically discover and import your schemas
+without manual configuration.
 
 ```json
 {

package/dist/cli.js

@@ -1,175 +1,17 @@
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { lexiconDoc, refineLexiconDoc } 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 { generateLexiconApi } from './codegen.js';
-import { loadConfig } from './config.js';
-import { packageJsonSchema } from './lexicon-metadata.js';
-import { runPull } from './pull.js';
-/**
- * Resolves package imports to ImportMapping[]
- */
-const resolveImportsToMappings = async (imports, configDirname) => {
-    const mappings = [];
-    for (const packageName of imports) {
-        // Walk up from config directory to find package in node_modules
-        let packageJson;
-        let currentDir = configDirname;
-        let found = false;
-        while (currentDir !== path.dirname(currentDir)) {
-            const candidatePath = path.join(currentDir, 'node_modules', packageName, 'package.json');
-            try {
-                const content = await fs.readFile(candidatePath, 'utf8');
-                packageJson = JSON.parse(content);
-                found = true;
-                break;
-            }
-            catch (err) {
-                // Only continue to parent if file not found
-                if (err.code !== 'ENOENT') {
-                    console.error(pc.bold(pc.red(`failed to read package.json for "${packageName}":`)));
-                    console.error(err);
-                    process.exit(1);
-                }
-                // Not found, try parent directory
-                currentDir = path.dirname(currentDir);
-            }
-        }
-        if (!found) {
-            console.error(pc.bold(pc.red(`failed to resolve package "${packageName}"`)));
-            console.error(`Could not find package in node_modules starting from ${configDirname}`);
-            process.exit(1);
-        }
-        // Validate package.json
-        const result = packageJsonSchema.try(packageJson, { mode: 'passthrough' });
-        if (!result.ok) {
-            console.error(pc.bold(pc.red(`invalid atcute:lexicons in "${packageName}":`)));
-            console.error(result.message);
-            for (const issue of result.issues) {
-                console.log(`- ${issue.code} at .${issue.path.join('.')}`);
-            }
-            process.exit(1);
-        }
-        const lexicons = result.value['atcute:lexicons'];
-        if (!lexicons?.mappings) {
-            continue;
-        }
-        // Convert mapping to ImportMapping[]
-        for (const [pattern, entry] of Object.entries(lexicons.mappings)) {
-            const isWildcard = pattern.endsWith('.*');
-            mappings.push({
-                nsid: [pattern],
-                imports: (nsid) => {
-                    // Check if pattern matches
-                    if (isWildcard) {
-                        if (!nsid.startsWith(pattern.slice(0, -1))) {
-                            throw new Error(`NSID ${nsid} does not match pattern ${pattern}`);
-                        }
-                    }
-                    else {
-                        if (nsid !== pattern) {
-                            throw new Error(`NSID ${nsid} does not match pattern ${pattern}`);
-                        }
-                    }
-                    const nsidPrefix = isWildcard ? pattern.slice(0, -2) : pattern;
-                    const nsidRemainder = isWildcard ? nsid.slice(nsidPrefix.length + 1) : '';
-                    let expandedPath = entry.path
-                        .replaceAll('{{nsid}}', nsid.replaceAll('.', '/'))
-                        .replaceAll('{{nsid_remainder}}', nsidRemainder.replaceAll('.', '/'))
-                        .replaceAll('{{nsid_prefix}}', nsidPrefix.replaceAll('.', '/'));
-                    if (expandedPath === '.') {
-                        expandedPath = packageName;
-                    }
-                    else if (expandedPath.startsWith('./')) {
-                        expandedPath = `${packageName}/${expandedPath.slice(2)}`;
-                    }
-                    return {
-                        type: entry.type,
-                        from: expandedPath,
-                    };
-                },
-            });
-        }
-    }
-    return mappings;
-};
-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' });
+import { exportCommandSchema, runExport } from './commands/export.js';
+import { generateCommandSchema, runGenerate } from './commands/generate.js';
+import { pullCommandSchema, runPull } from './commands/pull.js';
+const parser = or(generateCommandSchema, pullCommandSchema, exportCommandSchema);
+const result = run(parser, { programName: 'lex-cli', help: 'both' });
 if (result.type === 'generate') {
-    const config = await loadConfig(result.config);
-    // Resolve imports to mappings
-    const importMappings = config.imports ? await resolveImportsToMappings(config.imports, config.root) : [];
-    const allMappings = [...importMappings, ...(config.mappings ?? [])];
-    const documents = [];
-    for await (const filename of fs.glob(config.files, { cwd: config.root })) {
-        let source;
-        try {
-            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);
-            process.exit(1);
-        }
-        let json;
-        try {
-            json = JSON.parse(source);
-        }
-        catch (err) {
-            console.error(pc.bold(pc.red(`json parse error in "${filename}"`)));
-            console.error(err);
-            process.exit(1);
-        }
-        const result = lexiconDoc.try(json, { mode: 'strip' });
-        if (!result.ok) {
-            console.error(pc.bold(pc.red(`schema validation failed for "${filename}"`)));
-            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 "${filename}"`)));
-            for (const issue of issues) {
-                console.log(`- ${issue.message} at .${issue.path.join('.')}`);
-            }
-            process.exit(1);
-        }
-        documents.push(result.value);
-    }
-    const generationResult = await 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);
-    }
+    await runGenerate(result);
 }
 else if (result.type === 'pull') {
-    const config = await loadConfig(result.config);
-    await runPull(config);
+    await runPull(result);
+}
+else if (result.type === 'export') {
+    await runExport(result);
 }
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAmB,MAAM,qBAAqB,CAAC;AAEpF,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAE,kBAAkB,EAAsB,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,wBAAwB,GAAG,KAAK,EACrC,OAAiB,EACjB,aAAqB,EACM,EAAE;IAC7B,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,KAAK,MAAM,WAAW,IAAI,OAAO,EAAE,CAAC;QACnC,gEAAgE;QAChE,IAAI,WAAoB,CAAC;QACzB,IAAI,UAAU,GAAG,aAAa,CAAC;QAC/B,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,OAAO,UAAU,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YACzF,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;gBACzD,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAClC,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACP,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBACnB,4CAA4C;gBAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC3B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,oCAAoC,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC;gBAED,kCAAkC;gBAClC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACvC,CAAC;QACF,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,8BAA8B,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,KAAK,CAAC,wDAAwD,aAAa,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,wBAAwB;QACxB,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,+BAA+B,WAAW,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/E,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAE9B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;YACzB,SAAS;QACV,CAAC;QAED,qCAAqC;QACrC,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE1C,QAAQ,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,CAAC,OAAO,CAAC;gBACf,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;oBACzB,2BAA2B;oBAC3B,IAAI,UAAU,EAAE,CAAC;wBAChB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC5C,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,2BAA2B,OAAO,EAAE,CAAC,CAAC;wBACnE,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;4BACtB,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,2BAA2B,OAAO,EAAE,CAAC,CAAC;wBACnE,CAAC;oBACF,CAAC;oBAED,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAC/D,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAE1E,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI;yBAC3B,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;yBACjD,UAAU,CAAC,oBAAoB,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;yBACpE,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;oBAEjE,IAAI,YAAY,KAAK,GAAG,EAAE,CAAC;wBAC1B,YAAY,GAAG,WAAW,CAAC;oBAC5B,CAAC;yBAAM,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1C,YAAY,GAAG,GAAG,WAAW,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1D,CAAC;oBAED,OAAO;wBACN,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,IAAI,EAAE,YAAY;qBAClB,CAAC;gBACH,CAAC;aACD,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,EAAE,CAChB,OAAO,CACN,UAAU,EACV,MAAM,CAAC;IACN,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;CACnE,CAAC,CACF,EACD,OAAO,CACN,MAAM,EACN,MAAM,CAAC;IACN,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;CACnE,CAAC,CACF,CACD,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;AAEvD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE/C,8BAA8B;IAC9B,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzG,MAAM,WAAW,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;IAEpE,MAAM,SAAS,GAAiB,EAAE,CAAC;IAEnC,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1E,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,yBAAyB,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,wBAAwB,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAE9B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,+BAA+B,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YAE3E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC;QACjD,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,WAAW;QACrB,OAAO,EAAE;YACR,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,IAAI,KAAK;SACnD;QACD,QAAQ,EAAE;YACT,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SAClB;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAErD,KAAK,MAAM,IAAI,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEvC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;AACF,CAAC;KAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAEhE,MAAM,MAAM,GAAG,EAAE,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;AAEjF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAErE,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;IAChC,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;KAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IACnC,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;KAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;IACrC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC"}

package/dist/codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../src/codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,UAAU,EAWV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,UAAU;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACZ,CAAC;CACF;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,UAAU,EAAE,CAAC;CACpB;AAuBD,eAAO,MAAM,kBAAkB,GAAU,MAAM,iBAAiB,KAAG,OAAO,CAAC,gBAAgB,CAmT1F,CAAC"}
+{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../src/codegen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEX,UAAU,EAWV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,UAAU;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACZ,CAAC;CACF;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,UAAU,EAAE,CAAC;CACpB;AAkDD,eAAO,MAAM,kBAAkB,GAAU,MAAM,iBAAiB,KAAG,OAAO,CAAC,gBAAgB,CAmT1F,CAAC"}

package/dist/codegen.js

@@ -1,6 +1,23 @@
 import { dirname as getDirname, relative as getRelativePath } from 'node:path/posix';
 import * as prettier from 'prettier';
 const lit = JSON.stringify;
+const toLexUri = (path) => {
+    const { nsid, defId } = path;
+    return defId === 'main' ? nsid : `${nsid}#${defId}`;
+};
+const resolvePath = (from, ref) => {
+    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 resolveExternalImport = (nsid, mappings) => {
     return mappings.find((mapping) => {
         return mapping.nsid.some((pattern) => {
@@ -51,57 +68,57 @@ export const generateLexiconApi = async (opts) => {
         });
         for (const defId of sortedDefIds) {
             const def = doc.defs[defId];
-            const defUri = `${doc.id}#${defId}`;
+            const path = { nsid: doc.id, defId };
             const camelcased = toCamelCase(defId);
             const varname = `${camelcased}Schema`;
             let result;
             switch (def.type) {
                 case 'query': {
-                    result = generateXrpcQuery(imports, defUri, def);
+                    result = generateXrpcQuery(imports, path, def);
                     file.imports += `import type {} from '@atcute/lexicons/ambient';\n`;
                     file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
                     file.ambients += `  interface XRPCQueries {\n`;
-                    file.ambients += `    ${lit(stripMainHash(defUri))}: ${camelcased}Schema;\n`;
+                    file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
                     file.ambients += `  }\n`;
                     file.ambients += `}`;
                     break;
                 }
                 case 'procedure': {
-                    result = generateXrpcProcedure(imports, defUri, def);
+                    result = generateXrpcProcedure(imports, path, def);
                     file.imports += `import type {} from '@atcute/lexicons/ambient';\n`;
                     file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
                     file.ambients += `  interface XRPCProcedures {\n`;
-                    file.ambients += `    ${lit(stripMainHash(defUri))}: ${camelcased}Schema;\n`;
+                    file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
                     file.ambients += `  }\n`;
                     file.ambients += `}`;
                     break;
                 }
                 case 'subscription': {
-                    result = generateXrpcSubscription(imports, defUri, def);
+                    result = generateXrpcSubscription(imports, path, def);
                     file.imports += `import type {} from '@atcute/lexicons/ambient';\n`;
                     file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
                     file.ambients += `  interface XRPCSubscriptions {\n`;
-                    file.ambients += `    ${lit(stripMainHash(defUri))}: ${camelcased}Schema;\n`;
+                    file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
                     file.ambients += `  }\n`;
                     file.ambients += `}`;
                     break;
                 }
                 case 'object': {
-                    result = generateObject(imports, defUri, def);
+                    result = generateObject(imports, path, def);
                     break;
                 }
                 case 'record': {
-                    result = generateRecord(imports, defUri, def);
+                    result = generateRecord(imports, path, def);
                     file.imports += `import type {} from '@atcute/lexicons/ambient';\n`;
                     file.ambients += `declare module '@atcute/lexicons/ambient' {\n`;
                     file.ambients += `  interface Records {\n`;
-                    file.ambients += `    ${lit(stripMainHash(defUri))}: ${camelcased}Schema;\n`;
+                    file.ambients += `    ${lit(toLexUri(path))}: ${camelcased}Schema;\n`;
                     file.ambients += `  }\n`;
                     file.ambients += `}`;
                     break;
                 }
                 case 'token': {
-                    result = `${PURE} v.literal(${lit(stripMainHash(defUri))})`;
+                    result = `${PURE} v.literal(${lit(toLexUri(path))})`;
                     break;
                 }
                 case 'permission-set': {
@@ -109,7 +126,7 @@ export const generateLexiconApi = async (opts) => {
                     continue;
                 }
                 default: {
-                    result = generateType(imports, defUri, def);
+                    result = generateType(imports, path, def);
                     break;
                 }
             }
@@ -279,32 +296,32 @@ export const generateLexiconApi = async (opts) => {
     }
     return { files };
 };
-const generateXrpcQuery = (imports, defUri, spec) => {
-    const params = generateXrpcParameters(imports, defUri, spec.parameters);
-    const output = generateXrpcBody(imports, defUri, spec.output);
-    return `${PURE} v.query(${lit(stripMainHash(defUri))}, {\n"params": ${params}, "output": ${output} })`;
+const generateXrpcQuery = (imports, path, spec) => {
+    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} })`;
 };
-const generateXrpcProcedure = (imports, defUri, spec) => {
-    const params = generateXrpcParameters(imports, defUri, spec.parameters);
-    const input = generateXrpcBody(imports, defUri, spec.input);
-    const output = generateXrpcBody(imports, defUri, spec.output);
-    return `${PURE} v.procedure(${lit(stripMainHash(defUri))}, {\n"params": ${params}, "input": ${input}, "output": ${output} })`;
+const generateXrpcProcedure = (imports, path, spec) => {
+    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} })`;
 };
-const generateXrpcSubscription = (imports, defUri, spec) => {
+const generateXrpcSubscription = (imports, path, spec) => {
     const schema = spec.message?.schema;
-    const params = generateXrpcParameters(imports, defUri, spec.parameters);
+    const params = generateXrpcParameters(imports, path, spec.parameters);
     let inner = ``;
     inner += `"params": ${params},`;
     if (schema) {
-        const res = generateType(imports, defUri, schema);
+        const res = generateType(imports, path, schema);
         inner += `get "message" () { return ${res} },`;
     }
     else {
         inner += `"message": null,`;
     }
-    return `${PURE} v.subscription(${lit(stripMainHash(defUri))}, {\n${inner}})`;
+    return `${PURE} v.subscription(${lit(toLexUri(path))}, {\n${inner}})`;
 };
-const generateXrpcBody = (imports, defUri, spec) => {
+const generateXrpcBody = (imports, path, spec) => {
     if (spec === undefined) {
         return `null`;
     }
@@ -314,11 +331,11 @@ const generateXrpcBody = (imports, defUri, spec) => {
         let inner = ``;
         inner += `"type": "lex",`;
         if (schema.type === 'object') {
-            const res = generateObject(imports, defUri, schema, 'none');
+            const res = generateObject(imports, path, schema, 'none');
             inner += `"schema": ${res},`;
         }
         else {
-            const res = generateType(imports, defUri, schema);
+            const res = generateType(imports, path, schema);
             inner += `get "schema" () { return ${res} },`;
         }
         return `{\n${inner}}`;
@@ -334,7 +351,7 @@ const generateXrpcBody = (imports, defUri, spec) => {
     }
     return `null`;
 };
-const generateXrpcParameters = (imports, defUri, spec) => {
+const generateXrpcParameters = (imports, path, spec) => {
     if (spec === undefined) {
         return `null`;
     }
@@ -363,10 +380,10 @@ const generateXrpcParameters = (imports, defUri, spec) => {
         required: spec.required,
         properties: transformedProperties ?? originalProperties,
     };
-    return generateObject(imports, defUri, mask, 'none');
+    return generateObject(imports, path, mask, 'none');
 };
-const generateRecord = (imports, defUri, spec) => {
-    const schema = generateObject(imports, defUri, spec.record, 'required');
+const generateRecord = (imports, path, spec) => {
+    const schema = generateObject(imports, path, spec.record, 'required');
     let key = `${PURE} v.string()`;
     if (spec.key) {
         if (spec.key === 'tid') {
@@ -381,17 +398,17 @@ const generateRecord = (imports, defUri, spec) => {
     }
     return `${PURE} v.record(${key}, ${schema})`;
 };
-const generateObject = (imports, defUri, spec, writeType = 'optional') => {
+const generateObject = (imports, path, spec, writeType = 'optional') => {
     const required = new Set(spec.required);
     const nullable = new Set(spec.nullable);
     let inner = ``;
     switch (writeType) {
         case 'optional': {
-            inner += `"$type": ${PURE} v.optional(${PURE} v.literal(${lit(stripMainHash(defUri))})),`;
+            inner += `"$type": ${PURE} v.optional(${PURE} v.literal(${lit(toLexUri(path))})),`;
             break;
         }
         case 'required': {
-            inner += `"$type": ${PURE} v.literal(${lit(stripMainHash(defUri))}),`;
+            inner += `"$type": ${PURE} v.literal(${lit(toLexUri(path))}),`;
             break;
         }
     }
@@ -406,9 +423,9 @@ const generateObject = (imports, defUri, spec, writeType = 'optional') => {
     });
     for (const [prop, propSpec] of sortedEntries) {
         const lazy = isRefVariant(propSpec.type === 'array' ? propSpec.items : propSpec);
-        const optional = !required.has(prop) && !('default' in propSpec);
+        const optional = !required.has(prop) && !('default' in propSpec && propSpec.default !== undefined);
         const nulled = nullable.has(prop);
-        let call = generateType(imports, defUri, propSpec, lazy);
+        let call = generateType(imports, path, propSpec, lazy);
         if (nulled) {
             call = `${PURE} v.nullable(${call})`;
         }
@@ -524,53 +541,44 @@ const generateJsdocField = (spec) => {
     }
     return res;
 };
-const generateType = (imports, defUri, spec, lazy = false) => {
+const generateType = (imports, path, spec, lazy = false) => {
     switch (spec.type) {
         // LexRefVariant
         case 'ref': {
-            const ref = spec.ref;
-            if (ref.startsWith('#')) {
-                const id = ref.slice(1);
-                return `${toCamelCase(id)}Schema`;
-            }
-            else {
-                const [ns, id = 'main'] = ref.split('#');
-                if (ns === stripHash(defUri)) {
-                    return `${toCamelCase(id)}Schema`;
-                }
-                imports.add(ns);
-                return `${toTitleCase(ns)}.${toCamelCase(id)}Schema`;
+            const refPath = resolvePath(path, spec.ref);
+            if (refPath.nsid === path.nsid) {
+                return `${toCamelCase(refPath.defId)}Schema`;
             }
+            imports.add(refPath.nsid);
+            return `${toTitleCase(refPath.nsid)}.${toCamelCase(refPath.defId)}Schema`;
         }
         case 'union': {
-            const normalizedRefs = spec.refs
+            const refs = spec.refs
                 .map((ref) => {
-                if (ref.startsWith('#')) {
-                    return ref;
+                const refPath = resolvePath(path, ref);
+                return { path: refPath, uri: toLexUri(refPath) };
+            })
+                .sort((a, b) => {
+                if (a.uri < b.uri) {
+                    return -1;
                 }
-                const [ns, id = 'main'] = ref.split('#');
-                if (ns === stripHash(defUri)) {
-                    return `#${id}`;
+                if (a.uri > b.uri) {
+                    return 1;
                 }
-                return `${ns}#${id}`;
+                return 0;
             })
-                .sort();
-            const refs = normalizedRefs.map((ref) => {
-                if (ref.startsWith('#')) {
-                    const id = ref.slice(1);
-                    return `${toCamelCase(id)}Schema`;
-                }
-                else {
-                    const [ns, id = 'main'] = ref.split('#');
-                    imports.add(ns);
-                    return `${toTitleCase(ns)}.${toCamelCase(id)}Schema`;
+                .map(({ path: refPath }) => {
+                if (refPath.nsid === path.nsid) {
+                    return `${toCamelCase(refPath.defId)}Schema`;
                 }
+                imports.add(refPath.nsid);
+                return `${toTitleCase(refPath.nsid)}.${toCamelCase(refPath.defId)}Schema`;
             });
             return `${PURE} v.variant([${refs.join(', ')}]${spec.closed ? `, true` : ``})`;
         }
         // LexArray
         case 'array': {
-            let item = generateType(imports, defUri, spec.items);
+            let item = generateType(imports, path, spec.items);
             if (!lazy && (spec.items.type === 'ref' || spec.items.type === 'union')) {
                 item = `(() => { return ${item}; })`;
             }
@@ -740,16 +748,6 @@ const isRefVariant = (spec) => {
     const type = spec.type;
     return type === 'ref' || type === 'union';
 };
-const stripHash = (defUri) => {
-    const index = defUri.indexOf('#');
-    if (index === -1) {
-        return defUri;
-    }
-    return defUri.slice(0, index);
-};
-const stripMainHash = (defUri) => {
-    return defUri.endsWith('#main') ? defUri.slice(0, -'#main'.length) : defUri;
-};
 const toTitleCase = (v) => {
     v = v.replace(/^([a-z])/gi, (_, g) => g.toUpperCase());
     v = v.replace(/[.#-]([a-z])/gi, (_, g) => g.toUpperCase());