@atproto/lex-cli 0.4.0 → 0.5.0-rc.0

package/dist/index.js

@@ -39,24 +39,19 @@ program.name('lex').description('Lexicon CLI').version('0.0.0');
 program
     .command('gen-md')
     .description('Generate markdown documentation')
+    .option('--yes', 'skip confirmation')
     .argument('<outfile>', 'path of the file to write to', toPath)
     .argument('<lexicons...>', 'paths of the lexicon files to include', toPaths)
-    .action(async (outFilePath, lexiconPaths) => {
-    if (!outFilePath.endsWith('.md')) {
+    .action(async (outFile, lexiconPaths, o) => {
+    if (!outFile.endsWith('.md')) {
         console.error('Must supply the path to a .md file as the first parameter');
         process.exit(1);
     }
-    console.log('Writing', outFilePath);
-    const ok = await (0, yesno_1.default)({
-        question: 'Are you sure you want to continue? [y/N]',
-        defaultValue: false,
-    });
-    if (!ok) {
-        console.log('Aborted.');
-        process.exit(0);
-    }
+    if (!o?.yes)
+        await confirmOrExit();
+    console.log('Writing', outFile);
     const lexicons = (0, util_1.readAllLexicons)(lexiconPaths);
-    await mdGen.process(outFilePath, lexicons);
+    await mdGen.process(outFile, lexicons);
 });
 program
     .command('gen-ts-obj')
@@ -69,44 +64,34 @@ program
 program
     .command('gen-api')
     .description('Generate a TS client API')
+    .option('--yes', 'skip confirmation')
     .argument('<outdir>', 'path of the directory to write to', toPath)
     .argument('<lexicons...>', 'paths of the lexicon files to include', toPaths)
-    .action(async (outDir, lexiconPaths) => {
+    .action(async (outDir, lexiconPaths, o) => {
     const lexicons = (0, util_1.readAllLexicons)(lexiconPaths);
     const api = await (0, client_1.genClientApi)(lexicons);
     const diff = (0, util_1.genFileDiff)(outDir, api);
     console.log('This will write the following files:');
     (0, util_1.printFileDiff)(diff);
-    const ok = await (0, yesno_1.default)({
-        question: 'Are you sure you want to continue? [y/N]',
-        defaultValue: false,
-    });
-    if (!ok) {
-        console.log('Aborted.');
-        process.exit(0);
-    }
+    if (!o?.yes)
+        await confirmOrExit();
     (0, util_1.applyFileDiff)(diff);
     console.log('API generated.');
 });
 program
     .command('gen-server')
     .description('Generate a TS server API')
+    .option('--yes', 'skip confirmation')
     .argument('<outdir>', 'path of the directory to write to', toPath)
     .argument('<lexicons...>', 'paths of the lexicon files to include', toPaths)
-    .action(async (outDir, lexiconPaths) => {
+    .action(async (outDir, lexiconPaths, o) => {
     const lexicons = (0, util_1.readAllLexicons)(lexiconPaths);
     const api = await (0, server_1.genServerApi)(lexicons);
     const diff = (0, util_1.genFileDiff)(outDir, api);
     console.log('This will write the following files:');
     (0, util_1.printFileDiff)(diff);
-    const ok = await (0, yesno_1.default)({
-        question: 'Are you sure you want to continue? [y/N]',
-        defaultValue: false,
-    });
-    if (!ok) {
-        console.log('Aborted.');
-        process.exit(0);
-    }
+    if (!o?.yes)
+        await confirmOrExit();
     (0, util_1.applyFileDiff)(diff);
     console.log('API generated.');
 });
@@ -119,4 +104,14 @@ function toPaths(v, acc) {
     acc.push(path_1.default.resolve(v));
     return acc;
 }
+async function confirmOrExit() {
+    const ok = await (0, yesno_1.default)({
+        question: 'Are you sure you want to continue? [y/N]',
+        defaultValue: false,
+    });
+    if (!ok) {
+        console.log('Aborted.');
+        process.exit(0);
+    }
+}
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.4.0",
+  "version": "0.5.0-rc.0",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [
@@ -21,10 +21,11 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "commander": "^9.4.0",
+    "prettier": "^3.2.5",
     "ts-morph": "^16.0.0",
     "yesno": "^0.4.0",
-    "zod": "^3.21.4",
-    "@atproto/lexicon": "^0.4.0",
+    "zod": "^3.23.8",
+    "@atproto/lexicon": "^0.4.1-rc.0",
     "@atproto/syntax": "^0.3.0"
   },
   "scripts": {

package/src/codegen/client.ts

@@ -61,13 +61,14 @@ const indexTs = (
   nsidTokens: Record<string, string[]>,
 ) =>
   gen(project, '/index.ts', async (file) => {
-    //= import {Client as XrpcClient, AtpServiceClient as XrpcServiceClient} from '@atproto/xrpc'
+    //= import { XrpcClient, FetchHandler, FetchHandlerOptions } from '@atproto/xrpc'
     const xrpcImport = file.addImportDeclaration({
       moduleSpecifier: '@atproto/xrpc',
     })
     xrpcImport.addNamedImports([
-      { name: 'Client', alias: 'XrpcClient' },
-      { name: 'ServiceClient', alias: 'XrpcServiceClient' },
+      { name: 'XrpcClient' },
+      { name: 'FetchHandler' },
+      { name: 'FetchHandlerOptions' },
     ])
     //= import {schemas} from './lexicons'
     file
@@ -119,87 +120,44 @@ const indexTs = (
     const clientCls = file.addClass({
       name: 'AtpBaseClient',
       isExported: true,
+      extends: 'XrpcClient',
     })
-    //= xrpc: XrpcClient = new XrpcClient()
-    clientCls.addProperty({
-      name: 'xrpc',
-      type: 'XrpcClient',
-      initializer: 'new XrpcClient()',
-    })
-    //= constructor () {
-    //=   this.xrpc.addLexicons(schemas)
-    //= }
-    clientCls.addConstructor().setBodyText(`this.xrpc.addLexicons(schemas)`)
-    //= service(serviceUri: string | URL): AtpServiceClient {
-    //=   return new AtpServiceClient(this, this.xrpc.service(serviceUri))
-    //= }
-    clientCls
-      .addMethod({
-        name: 'service',
-        parameters: [{ name: 'serviceUri', type: 'string | URL' }],
-        returnType: 'AtpServiceClient',
-      })
-      .setBodyText(
-        `return new AtpServiceClient(this, this.xrpc.service(serviceUri))`,
-      )
 
-    //= export class AtpServiceClient {...}
-    const serviceClientCls = file.addClass({
-      name: 'AtpServiceClient',
-      isExported: true,
-    })
-    //= _baseClient: AtpBaseClient
-    serviceClientCls.addProperty({ name: '_baseClient', type: 'AtpBaseClient' })
-    //= xrpc: XrpcServiceClient
-    serviceClientCls.addProperty({
-      name: 'xrpc',
-      type: 'XrpcServiceClient',
-    })
     for (const ns of nsidTree) {
       //= ns: NS
-      serviceClientCls.addProperty({
+      clientCls.addProperty({
         name: ns.propName,
         type: ns.className,
       })
     }
-    //= constructor (baseClient: AtpBaseClient, xrpcService: XrpcServiceClient) {
-    //=   this.baseClient = baseClient
-    //=   this.xrpcService = xrpcService
+
+    //= constructor (options: FetchHandler | FetchHandlerOptions) {
+    //=   super(options, schemas)
     //=   {namespace declarations}
     //= }
-    serviceClientCls
-      .addConstructor({
-        parameters: [
-          { name: 'baseClient', type: 'AtpBaseClient' },
-          { name: 'xrpcService', type: 'XrpcServiceClient' },
-        ],
-      })
-      .setBodyText(
-        [
-          `this._baseClient = baseClient`,
-          `this.xrpc = xrpcService`,
-          ...nsidTree.map(
-            (ns) => `this.${ns.propName} = new ${ns.className}(this)`,
-          ),
-        ].join('\n'),
-      )
+    clientCls.addConstructor({
+      parameters: [
+        { name: 'options', type: 'FetchHandler | FetchHandlerOptions' },
+      ],
+      statements: [
+        'super(options, schemas)',
+        ...nsidTree.map(
+          (ns) => `this.${ns.propName} = new ${ns.className}(this)`,
+        ),
+      ],
+    })
 
-    //= setHeader(key: string, value: string): void {
-    //=   this.xrpc.setHeader(key, value)
+    //= /** @deprecated use `this` instead */
+    //= get xrpc(): XrpcClient {
+    //=   return this
     //= }
-    const setHeaderMethod = serviceClientCls.addMethod({
-      name: 'setHeader',
-      returnType: 'void',
-    })
-    setHeaderMethod.addParameter({
-      name: 'key',
-      type: 'string',
-    })
-    setHeaderMethod.addParameter({
-      name: 'value',
-      type: 'string',
-    })
-    setHeaderMethod.setBodyText('this.xrpc.setHeader(key, value)')
+    clientCls
+      .addGetAccessor({
+        name: 'xrpc',
+        returnType: 'XrpcClient',
+        statements: ['return this'],
+      })
+      .addJsDoc('@deprecated use `this` instead')
 
     // generate classes for the schemas
     for (const ns of nsidTree) {
@@ -213,10 +171,10 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
     name: ns.className,
     isExported: true,
   })
-  //= _service: AtpServiceClient
+  //= _client: XrpcClient
   cls.addProperty({
-    name: '_service',
-    type: 'AtpServiceClient',
+    name: '_client',
+    type: 'XrpcClient',
   })
 
   for (const userType of ns.userTypes) {
@@ -242,21 +200,22 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
     genNamespaceCls(file, child)
   }
 
-  //= constructor(service: AtpServiceClient) {
-  //=  this._service = service
+  //= constructor(public client: XrpcClient) {
+  //=  this._client = client
   //=  {child namespace prop declarations}
   //=  {record prop declarations}
   //= }
-  const cons = cls.addConstructor()
-  cons.addParameter({
-    name: 'service',
-    type: 'AtpServiceClient',
-  })
-  cons.setBodyText(
-    [
-      `this._service = service`,
+  cls.addConstructor({
+    parameters: [
+      {
+        name: 'client',
+        type: 'XrpcClient',
+      },
+    ],
+    statements: [
+      `this._client = client`,
       ...ns.children.map(
-        (ns) => `this.${ns.propName} = new ${ns.className}(service)`,
+        (ns) => `this.${ns.propName} = new ${ns.className}(client)`,
       ),
       ...ns.userTypes
         .filter((ut) => ut.def.type === 'record')
@@ -264,10 +223,10 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
           const name = NSID.parse(ut.nsid).name || ''
           return `this.${toCamelCase(name)} = new ${toTitleCase(
             name,
-          )}Record(service)`
+          )}Record(client)`
         }),
-    ].join('\n'),
-  )
+    ],
+  })
 
   // methods
   for (const userType of ns.userTypes) {
@@ -298,13 +257,14 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
     })
     method.setBodyText(
       [
-        `return this._service.xrpc`,
+        `return this._client`,
         isGetReq
           ? `.call('${userType.nsid}', params, undefined, opts)`
           : `.call('${userType.nsid}', opts?.qp, data, opts)`,
-        `  .catch((e) => {`,
-        `    throw ${moduleName}.toKnownErr(e)`,
-        `  })`,
+        userType.def.errors?.length
+          ? // Only add a catch block if there are custom errors
+            `  .catch((e) => { throw ${moduleName}.toKnownErr(e) })`
+          : '',
       ].join('\n'),
     )
   }
@@ -325,21 +285,21 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     name: `${toTitleCase(name)}Record`,
     isExported: true,
   })
-  //= _service: AtpServiceClient
+  //= _client: XrpcClient
   cls.addProperty({
-    name: '_service',
-    type: 'AtpServiceClient',
+    name: '_client',
+    type: 'XrpcClient',
   })
 
-  //= constructor(service: AtpServiceClient) {
-  //=  this._service = service
+  //= constructor(client: XrpcClient) {
+  //=  this._client = client
   //= }
   const cons = cls.addConstructor()
   cons.addParameter({
-    name: 'service',
-    type: 'AtpServiceClient',
+    name: 'client',
+    type: 'XrpcClient',
   })
-  cons.setBodyText(`this._service = service`)
+  cons.setBodyText(`this._client = client`)
 
   // methods
   const typeModule = toTitleCase(nsid)
@@ -356,7 +316,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.setBodyText(
       [
-        `const res = await this._service.xrpc.call('${ATP_METHODS.list}', { collection: '${nsid}', ...params })`,
+        `const res = await this._client.call('${ATP_METHODS.list}', { collection: '${nsid}', ...params })`,
         `return res.data`,
       ].join('\n'),
     )
@@ -374,7 +334,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.setBodyText(
       [
-        `const res = await this._service.xrpc.call('${ATP_METHODS.get}', { collection: '${nsid}', ...params })`,
+        `const res = await this._client.call('${ATP_METHODS.get}', { collection: '${nsid}', ...params })`,
         `return res.data`,
       ].join('\n'),
     )
@@ -406,7 +366,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     method.setBodyText(
       [
         `record.$type = '${nsid}'`,
-        `const res = await this._service.xrpc.call('${ATP_METHODS.create}', undefined, { collection: '${nsid}', ${maybeRkeyPart}...params, record }, {encoding: 'application/json', headers })`,
+        `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection: '${nsid}', ${maybeRkeyPart}...params, record }, {encoding: 'application/json', headers })`,
         `return res.data`,
       ].join('\n'),
     )
@@ -433,7 +393,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
   //   method.setBodyText(
   //     [
   //       `record.$type = '${userType.nsid}'`,
-  //       `const res = await this._service.xrpc.call('${ATP_METHODS.put}', undefined, { collection: '${userType.nsid}', record, ...params }, {encoding: 'application/json', headers})`,
+  //       `const res = await this._client.call('${ATP_METHODS.put}', undefined, { collection: '${userType.nsid}', record, ...params }, {encoding: 'application/json', headers})`,
   //       `return res.data`,
   //     ].join('\n'),
   //   )
@@ -458,7 +418,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
 
     method.setBodyText(
       [
-        `await this._service.xrpc.call('${ATP_METHODS.delete}', undefined, { collection: '${nsid}', ...params }, { headers })`,
+        `await this._client.call('${ATP_METHODS.delete}', undefined, { collection: '${nsid}', ...params }, { headers })`,
       ].join('\n'),
     )
   }
@@ -477,11 +437,14 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
         main?.type === 'subscription' ||
         main?.type === 'procedure'
       ) {
-        //= import {Headers, XRPCError} from '@atproto/xrpc'
+        //= import {HeadersMap, XRPCError} from '@atproto/xrpc'
         const xrpcImport = file.addImportDeclaration({
           moduleSpecifier: '@atproto/xrpc',
         })
-        xrpcImport.addNamedImports([{ name: 'Headers' }, { name: 'XRPCError' }])
+        xrpcImport.addNamedImports([
+          { name: 'HeadersMap' },
+          { name: 'XRPCError' },
+        ])
       }
       //= import {ValidationResult, BlobRef} from '@atproto/lexicon'
       file
@@ -550,7 +513,8 @@ function genClientXrpcCommon(
     name: 'CallOptions',
     isExported: true,
   })
-  opts.addProperty({ name: 'headers?', type: 'Headers' })
+  opts.addProperty({ name: 'signal?', type: 'AbortSignal' })
+  opts.addProperty({ name: 'headers?', type: 'HeadersMap' })
   if (def.type === 'procedure') {
     opts.addProperty({ name: 'qp?', type: 'QueryParams' })
   }
@@ -563,7 +527,7 @@ function genClientXrpcCommon(
         .join(' | ')
     }
     opts.addProperty({
-      name: 'encoding',
+      name: 'encoding?',
       type: encodingType,
     })
   }
@@ -574,7 +538,7 @@ function genClientXrpcCommon(
     isExported: true,
   })
   res.addProperty({ name: 'success', type: 'boolean' })
-  res.addProperty({ name: 'headers', type: 'Headers' })
+  res.addProperty({ name: 'headers', type: 'HeadersMap' })
   if (def.output?.schema) {
     if (def.output.encoding?.includes(',')) {
       res.addProperty({ name: 'data', type: 'OutputSchema | Uint8Array' })
@@ -595,30 +559,32 @@ function genClientXrpcCommon(
       extends: 'XRPCError',
       isExported: true,
     })
-    errCls
-      .addConstructor({
-        parameters: [{ name: 'src', type: 'XRPCError' }],
-      })
-      .setBodyText(`super(src.status, src.error, src.message, src.headers)`)
+    errCls.addConstructor({
+      parameters: [{ name: 'src', type: 'XRPCError' }],
+      statements: [
+        'super(src.status, src.error, src.message, src.headers, { cause: src })',
+      ],
+    })
+
     customErrors.push({ name: error.name, cls: name })
   }
 
   // export function toKnownErr(err: any) {...}
-  const toKnownErrFn = file.addFunction({
+  file.addFunction({
     name: 'toKnownErr',
     isExported: true,
+    parameters: [{ name: 'e', type: 'any' }],
+    statements: customErrors.length
+      ? [
+          'if (e instanceof XRPCError) {',
+          ...customErrors.map(
+            (err) => `if (e.error === '${err.name}') return new ${err.cls}(e)`,
+          ),
+          '}',
+          'return e',
+        ]
+      : ['return e'],
   })
-  toKnownErrFn.addParameter({ name: 'e', type: 'any' })
-  toKnownErrFn.setBodyText(
-    [
-      `if (e instanceof XRPCError) {`,
-      ...customErrors.map(
-        (err) => `if (e.error === '${err.name}') return new ${err.cls}(e)`,
-      ),
-      `}`,
-      `return e`,
-    ].join('\n'),
-  )
 }
 
 function genClientRecord(

package/src/codegen/common.ts

@@ -4,7 +4,7 @@ import prettier from 'prettier'
 import { GeneratedFile } from '../types'
 
 const PRETTIER_OPTS = {
-  parser: 'babel-ts',
+  parser: 'typescript',
   tabWidth: 2,
   semi: false,
   singleQuote: true,
@@ -14,17 +14,17 @@ const PRETTIER_OPTS = {
 export const utilTs = (project) =>
   gen(project, '/util.ts', async (file) => {
     file.replaceWithText(`
-  export function isObj(v: unknown): v is Record<string, unknown> {
-    return typeof v === 'object' && v !== null
-  }
-  
-  export function hasProp<K extends PropertyKey>(
-    data: object,
-    prop: K,
-  ): data is Record<K, unknown> {
-    return prop in data
-  }
-  `)
+export function isObj(v: unknown): v is Record<string, unknown> {
+  return typeof v === 'object' && v !== null
+}
+
+export function hasProp<K extends PropertyKey>(
+  data: object,
+  prop: K,
+): data is Record<K, unknown> {
+  return prop in data
+}
+`)
   })
 
 export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
@@ -122,7 +122,7 @@ export async function gen(
   const src = project.getFileSystem().readFileSync(path)
   return {
     path: path,
-    content: `${banner()}${prettier.format(src, PRETTIER_OPTS)}`,
+    content: `${banner()}${await prettier.format(src, PRETTIER_OPTS)}`,
   }
 }
 

package/src/codegen/lex-gen.ts

@@ -335,11 +335,11 @@ export function genXrpcInput(
       )
     }
   } else if (def.type === 'procedure' && def.input?.encoding) {
-    //= export type InputSchema = string | Uint8Array
+    //= export type InputSchema = string | Uint8Array | Blob
     file.addTypeAlias({
       isExported: true,
       name: 'InputSchema',
-      type: 'string | Uint8Array',
+      type: 'string | Uint8Array | Blob',
     })
   } else {
     //= export type InputSchema = undefined