@atproto/lex-cli 0.8.2 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atproto/lex-cli
 
+## 0.9.0
+
+### Minor Changes
+
+- [#3999](https://github.com/bluesky-social/atproto/pull/3999) [`8ef976d38`](https://github.com/bluesky-social/atproto/commit/8ef976d3852df4bfa376e515e131cc0810a42f20) Thanks [@matthieusieben](https://github.com/matthieusieben)! - `QueryParams` is now always generated as a `type` instead of an `interface`
+
+### Patch Changes
+
+- Updated dependencies [[`8ef976d38`](https://github.com/bluesky-social/atproto/commit/8ef976d3852df4bfa376e515e131cc0810a42f20)]:
+  - @atproto/lexicon@0.4.12
+
+## 0.8.3
+
+### Patch Changes
+
+- [#3995](https://github.com/bluesky-social/atproto/pull/3995) [`e3e31b2b9`](https://github.com/bluesky-social/atproto/commit/e3e31b2b9bf8c4de6b2d7fa992c3b3795686ea72) Thanks [@mozzius](https://github.com/mozzius)! - Add put method to record utility classes
+
 ## 0.8.2
 
 ### Patch Changes

package/dist/codegen/client.js

@@ -309,37 +309,35 @@ function genRecordCls(file, nsid, lexRecord) {
             : '';
         method.setBodyText([
             `const collection = '${nsid}'`,
-            `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection, ${maybeRkeyPart}...params, record: { ...record, $type: collection} }, {encoding: 'application/json', headers })`,
+            `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection, ${maybeRkeyPart}...params, record: { ...record, $type: collection } }, { encoding: 'application/json', headers })`,
+            `return res.data`,
+        ].join('\n'));
+    }
+    {
+        //= put()
+        const method = cls.addMethod({
+            isAsync: true,
+            name: 'put',
+            returnType: 'Promise<{uri: string, cid: string}>',
+        });
+        method.addParameter({
+            name: 'params',
+            type: `OmitKey<${(0, util_1.toTitleCase)(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
+        });
+        method.addParameter({
+            name: 'record',
+            type: `Un$Typed<${typeModule}.Record>`,
+        });
+        method.addParameter({
+            name: 'headers?',
+            type: `Record<string, string>`,
+        });
+        method.setBodyText([
+            `const collection = '${nsid}'`,
+            `const res = await this._client.call('${ATP_METHODS.put}', undefined, { collection, ...params, record: { ...record, $type: collection } }, { encoding: 'application/json', headers })`,
             `return res.data`,
         ].join('\n'));
     }
-    // {
-    //   //= put()
-    //   const method = cls.addMethod({
-    //     isAsync: true,
-    //     name: 'put',
-    //     returnType: 'Promise<{uri: string, cid: string}>',
-    //   })
-    //   method.addParameter({
-    //     name: 'params',
-    //     type: `OmitKey<${toTitleCase(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
-    //   })
-    //   method.addParameter({
-    //     name: 'record',
-    //     type: `${typeModule}.Record`,
-    //   })
-    //   method.addParameter({
-    //     name: 'headers?',
-    //     type: `Record<string, string>`,
-    //   })
-    //   method.setBodyText(
-    //     [
-    //       `record.$type = '${userType.nsid}'`,
-    //       `const res = await this._client.call('${ATP_METHODS.put}', undefined, { collection: '${userType.nsid}', record, ...params }, {encoding: 'application/json', headers})`,
-    //       `return res.data`,
-    //     ].join('\n'),
-    //   )
-    // }
     {
         //= delete()
         const method = cls.addMethod({

package/dist/codegen/client.js.map

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

package/dist/codegen/lex-gen.d.ts

@@ -1,11 +1,13 @@
-import { SourceFile } from 'ts-morph';
-import { type LexArray, type LexBlob, type LexBytes, type LexCidLink, type LexIpldType, type LexPrimitive, type LexToken, type LexUserType, Lexicons } from '@atproto/lexicon';
-interface Commentable<T> {
+import { JSDoc, SourceFile } from 'ts-morph';
+import { type LexArray, type LexBlob, type LexBytes, type LexCidLink, type LexIpldType, type LexPrimitive, type LexToken, Lexicons } from '@atproto/lexicon';
+interface Commentable {
     addJsDoc: ({ description }: {
         description: string;
-    }) => T;
+    }) => JSDoc;
 }
-export declare function genComment<T>(commentable: Commentable<T>, def: LexUserType): T;
+export declare function genComment<T extends Commentable>(commentable: T, def: {
+    description?: string;
+}): T;
 export declare function genCommonImports(file: SourceFile, baseNsid: string): void;
 export declare function genImports(file: SourceFile, imports: Set<string>, baseNsid: string): void;
 export declare function genUserType(file: SourceFile, imports: Set<string>, lexicons: Lexicons, lexUri: string): void;

package/dist/codegen/lex-gen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lex-gen.d.ts","sourceRoot":"","sources":["../../src/codegen/lex-gen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA2B,MAAM,UAAU,CAAA;AAC9D,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAEhB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAGzB,UAAU,WAAW,CAAC,CAAC;IACrB,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,CAAC,CAAA;CAC1D;AACD,wBAAgB,UAAU,CAAC,CAAC,EAC1B,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC3B,GAAG,EAAE,WAAW,GACf,CAAC,CAKH;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,QA8DlE;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,MAAM,QAgBjB;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,QAoCf;AAqID,wBAAgB,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,QAgBvE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,QAAQ,QAkCd;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,YAAY,GAAG,OAAO,GAAG,WAAW,QAU1C;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAiC1B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAkD1B;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAgC1B;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,QAef;AAiDD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,wBAKpD;AA+BD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,WAAW,GACxC,MAAM,CAWR;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAiCzD"}
+{"version":3,"file":"lex-gen.d.ts","sourceRoot":"","sources":["../../src/codegen/lex-gen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,UAAU,EAA2B,MAAM,UAAU,CAAA;AACrE,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAEhB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAGzB,UAAU,WAAW;IACnB,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,KAAK,CAAA;CAC9D;AACD,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAC9C,WAAW,EAAE,CAAC,EACd,GAAG,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5B,CAAC,CAKH;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,QA8DlE;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,MAAM,QAgBjB;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,QAoCf;AAqID,wBAAgB,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,QAgBvE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,QAAQ,QAkCd;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,YAAY,GAAG,OAAO,GAAG,WAAW,QAU1C;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAuD1B;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAkD1B;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,kBAAkB,UAAO,QAgC1B;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,QAef;AAiDD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG/C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,wBAKpD;AA+BD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,GAAG,YAAY,GAAG,WAAW,GACxC,MAAM,CAWR;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAiCzD"}

package/dist/codegen/lex-gen.js

@@ -286,25 +286,46 @@ function genXrpcParams(file, lexicons, lexUri, defaultsArePresent = true) {
         'subscription',
         'procedure',
     ]);
-    //= export interface QueryParams {...}
-    const iface = file.addInterface({
-        name: 'QueryParams',
-        isExported: true,
-    });
+    // @NOTE We need to use a `type` here instead of  an `interface` because we
+    // need the generated type to be used as generic type parameter like this:
+    //
+    // type QueryParams = {} // Generated by this function
+    //
+    // type MyUtil<P extends xrpcServer.QueryParam> = (...)
+    // type NsType = MyUtil<NS.QueryParams> // ERROR if `NS.QueryParams` is an `interface`
+    //
+    // Second line will fail if `NS.QueryParams` is an `interface` that does
+    // not explicitly extend `xrpcServer.QueryParam`, or have a string index
+    // signature that encompasses `xrpcServer.QueryParam`.
+    //= export type QueryParams = {...}
     if (def.parameters) {
-        for (const paramKey in def.parameters.properties) {
-            const paramDef = def.parameters.properties[paramKey];
-            const req = def.parameters.required?.includes(paramKey) ||
-                (defaultsArePresent &&
-                    'default' in paramDef &&
-                    paramDef.default !== undefined);
-            genComment(iface.addProperty({
-                name: `${paramKey}${req ? '' : '?'}`,
-                type: paramDef.type === 'array'
+        genComment(file.addTypeAlias({
+            name: 'QueryParams',
+            isExported: true,
+            type: `{
+          ${Object.entries(def.parameters.properties)
+                .map(([paramKey, paramDef]) => {
+                const req = def.parameters.required?.includes(paramKey) ||
+                    (defaultsArePresent &&
+                        'default' in paramDef &&
+                        paramDef.default !== undefined);
+                const jsDoc = paramDef.description
+                    ? `/** ${paramDef.description} */\n`
+                    : '';
+                return `${jsDoc}${paramKey}${req ? '' : '?'}: ${paramDef.type === 'array'
                     ? primitiveToType(paramDef.items) + '[]'
-                    : primitiveToType(paramDef),
-            }), paramDef);
-        }
+                    : primitiveToType(paramDef)}`;
+            })
+                .join('\n')}
+        }`,
+        }), def.parameters);
+    }
+    else {
+        file.addTypeAlias({
+            name: 'QueryParams',
+            isExported: true,
+            type: '{}',
+        });
     }
 }
 function genXrpcInput(file, imports, lexicons, lexUri, defaultsArePresent = true) {

package/dist/codegen/lex-gen.js.map

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

package/dist/codegen/server.js

@@ -29,21 +29,12 @@ const indexTs = (project, lexiconDocs, nsidTree, nsidTokens) => (0, common_1.gen
     file.addImportDeclaration({
         moduleSpecifier: '@atproto/xrpc-server',
         namedImports: [
-            {
-                name: 'createServer',
-                alias: 'createXrpcServer',
-            },
-            {
-                name: 'Server',
-                alias: 'XrpcServer',
-            },
-            {
-                name: 'Options',
-                alias: 'XrpcOptions',
-                isTypeOnly: true,
-            },
-            { name: 'AuthVerifier', isTypeOnly: true },
-            { name: 'StreamAuthVerifier', isTypeOnly: true },
+            { name: 'Auth', isTypeOnly: true },
+            { name: 'Options', alias: 'XrpcOptions', isTypeOnly: true },
+            { name: 'Server', alias: 'XrpcServer' },
+            { name: 'StreamConfigOrHandler', isTypeOnly: true },
+            { name: 'MethodConfigOrHandler', isTypeOnly: true },
+            { name: 'createServer', alias: 'createXrpcServer' },
         ],
     });
     //= import {schemas} from './lexicons.js'
@@ -131,60 +122,6 @@ const indexTs = (project, lexiconDocs, nsidTree, nsidTokens) => (0, common_1.gen
         'this.xrpc = createXrpcServer(schemas, options)',
         ...nsidTree.map((ns) => `this.${ns.propName} = new ${ns.className}(this)`),
     ].join('\n'));
-    file.addTypeAlias({
-        name: 'SharedRateLimitOpts',
-        typeParameters: [{ name: 'T' }],
-        type: `{
-        name: string
-        calcKey?: (ctx: T) => string | null
-        calcPoints?: (ctx: T) => number
-      }`,
-    });
-    file.addTypeAlias({
-        name: 'RouteRateLimitOpts',
-        typeParameters: [{ name: 'T' }],
-        type: `{
-        durationMs: number
-        points: number
-        calcKey?: (ctx: T) => string | null
-        calcPoints?: (ctx: T) => number
-      }`,
-    });
-    file.addTypeAlias({
-        name: 'HandlerOpts',
-        type: `{ blobLimit?: number }`,
-    });
-    file.addTypeAlias({
-        name: 'HandlerRateLimitOpts',
-        typeParameters: [{ name: 'T' }],
-        type: `SharedRateLimitOpts<T> | RouteRateLimitOpts<T>`,
-    });
-    file.addTypeAlias({
-        name: 'ConfigOf',
-        typeParameters: [
-            { name: 'Auth' },
-            { name: 'Handler' },
-            { name: 'ReqCtx' },
-        ],
-        type: `
-        | Handler
-        | {
-          auth?: Auth
-          opts?: HandlerOpts
-          rateLimit?: HandlerRateLimitOpts<ReqCtx> | HandlerRateLimitOpts<ReqCtx>[]
-          handler: Handler
-        }`,
-    });
-    file.addTypeAlias({
-        name: 'ExtractAuth',
-        typeParameters: [
-            { name: 'AV', constraint: 'AuthVerifier | StreamAuthVerifier' },
-        ],
-        type: `Extract<
-        Awaited<ReturnType<AV>>,
-        { credentials: unknown }
-      >`,
-    });
 });
 function genNamespaceCls(file, ns) {
     //= export class {ns}NS {...}
@@ -233,14 +170,26 @@ function genNamespaceCls(file, ns) {
             name,
             typeParameters: [
                 {
-                    name: 'AV',
-                    constraint: isSubscription ? 'StreamAuthVerifier' : 'AuthVerifier',
+                    name: 'A',
+                    constraint: 'Auth',
+                    default: 'void',
                 },
             ],
         });
         method.addParameter({
             name: 'cfg',
-            type: `ConfigOf<AV, ${moduleName}.Handler<ExtractAuth<AV>>, ${moduleName}.HandlerReqCtx<ExtractAuth<AV>>>`,
+            type: isSubscription
+                ? `StreamConfigOrHandler<
+          A,
+          ${moduleName}.QueryParams,
+          ${moduleName}.HandlerOutput,
+        >`
+                : `MethodConfigOrHandler<
+          A,
+          ${moduleName}.QueryParams,
+          ${moduleName}.HandlerInput,
+          ${moduleName}.HandlerOutput,
+        >`,
         });
         const methodType = isSubscription ? 'streamMethod' : 'method';
         method.setBodyText([
@@ -254,11 +203,6 @@ function genNamespaceCls(file, ns) {
 const lexiconTs = (project, lexicons, lexiconDoc) => (0, common_1.gen)(project, `/types/${lexiconDoc.id.split('.').join('/')}.ts`, async (file) => {
     const main = lexiconDoc.defs.main;
     if (main?.type === 'query' || main?.type === 'procedure') {
-        //= import express from 'express'
-        file.addImportDeclaration({
-            moduleSpecifier: 'express',
-            defaultImport: 'express',
-        });
         const streamingInput = main?.type === 'procedure' &&
             main.input?.encoding &&
             !main.input.schema;
@@ -303,10 +247,6 @@ const lexiconTs = (project, lexicons, lexiconDoc) => (0, common_1.gen)(project,
 });
 function genServerXrpcMethod(file, lexicons, lexUri) {
     const def = lexicons.getDefOrThrow(lexUri, ['query', 'procedure']);
-    file.addImportDeclaration({
-        moduleSpecifier: '@atproto/xrpc-server',
-        namedImports: [{ name: 'HandlerAuth' }, { name: 'HandlerPipeThrough' }],
-    });
     //= export interface HandlerInput {...}
     if (def.type === 'procedure' && def.input?.encoding) {
         const handlerInput = file.addInterface({
@@ -320,26 +260,20 @@ function genServerXrpcMethod(file, lexicons, lexUri) {
                 .map((v) => `'${v.trim()}'`)
                 .join(' | '),
         });
-        if (def.input.schema) {
-            if (def.input.encoding.includes(',')) {
-                handlerInput.addProperty({
-                    name: 'body',
-                    type: 'InputSchema | stream.Readable',
-                });
-            }
-            else {
-                handlerInput.addProperty({ name: 'body', type: 'InputSchema' });
-            }
-        }
-        else if (def.input.encoding) {
-            handlerInput.addProperty({ name: 'body', type: 'stream.Readable' });
-        }
+        handlerInput.addProperty({
+            name: 'body',
+            type: def.input.schema
+                ? def.input.encoding.includes(',')
+                    ? 'InputSchema | stream.Readable'
+                    : 'InputSchema'
+                : 'stream.Readable',
+        });
     }
     else {
         file.addTypeAlias({
             isExported: true,
             name: 'HandlerInput',
-            type: 'undefined',
+            type: 'void',
         });
     }
     // export interface HandlerSuccess {...}
@@ -400,37 +334,14 @@ function genServerXrpcMethod(file, lexicons, lexUri) {
     file.addTypeAlias({
         isExported: true,
         name: 'HandlerOutput',
-        type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess | HandlerPipeThrough' : 'void'}`,
-    });
-    file.addTypeAlias({
-        name: 'HandlerReqCtx',
-        isExported: true,
-        typeParameters: [
-            { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-        ],
-        type: `{
-        auth: HA
-        params: QueryParams
-        input: HandlerInput
-        req: express.Request
-        res: express.Response
-        resetRouteRateLimits: () => Promise<void>
-      }`,
-    });
-    file.addTypeAlias({
-        name: 'Handler',
-        isExported: true,
-        typeParameters: [
-            { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-        ],
-        type: `(ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput`,
+        type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess' : 'void'}`,
     });
 }
 function genServerXrpcStreaming(file, lexicons, lexUri) {
     const def = lexicons.getDefOrThrow(lexUri, ['subscription']);
     file.addImportDeclaration({
         moduleSpecifier: '@atproto/xrpc-server',
-        namedImports: [{ name: 'HandlerAuth' }, { name: 'ErrorFrame' }],
+        namedImports: [{ name: 'ErrorFrame' }],
     });
     file.addImportDeclaration({
         moduleSpecifier: 'node:http',
@@ -448,27 +359,6 @@ function genServerXrpcStreaming(file, lexicons, lexUri) {
         name: 'HandlerOutput',
         type: `HandlerError | ${def.message?.schema ? 'OutputSchema' : 'void'}`,
     });
-    file.addTypeAlias({
-        name: 'HandlerReqCtx',
-        isExported: true,
-        typeParameters: [
-            { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-        ],
-        type: `{
-        auth: HA
-        params: QueryParams
-        req: IncomingMessage
-        signal: AbortSignal
-      }`,
-    });
-    file.addTypeAlias({
-        name: 'Handler',
-        isExported: true,
-        typeParameters: [
-            { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-        ],
-        type: `(ctx: HandlerReqCtx<HA>) => AsyncIterable<HandlerOutput>`,
-    });
 }
 function arrayToUnion(arr) {
     if (!arr?.length) {

package/dist/codegen/server.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [
@@ -28,7 +28,7 @@
     "ts-morph": "^24.0.0",
     "yesno": "^0.4.0",
     "zod": "^3.23.8",
-    "@atproto/lexicon": "^0.4.11",
+    "@atproto/lexicon": "^0.4.12",
     "@atproto/syntax": "^0.4.0"
   },
   "devDependencies": {

package/src/codegen/client.ts

@@ -373,38 +373,38 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     method.setBodyText(
       [
         `const collection = '${nsid}'`,
-        `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection, ${maybeRkeyPart}...params, record: { ...record, $type: collection} }, {encoding: 'application/json', headers })`,
+        `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection, ${maybeRkeyPart}...params, record: { ...record, $type: collection } }, { encoding: 'application/json', headers })`,
+        `return res.data`,
+      ].join('\n'),
+    )
+  }
+  {
+    //= put()
+    const method = cls.addMethod({
+      isAsync: true,
+      name: 'put',
+      returnType: 'Promise<{uri: string, cid: string}>',
+    })
+    method.addParameter({
+      name: 'params',
+      type: `OmitKey<${toTitleCase(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
+    })
+    method.addParameter({
+      name: 'record',
+      type: `Un$Typed<${typeModule}.Record>`,
+    })
+    method.addParameter({
+      name: 'headers?',
+      type: `Record<string, string>`,
+    })
+    method.setBodyText(
+      [
+        `const collection = '${nsid}'`,
+        `const res = await this._client.call('${ATP_METHODS.put}', undefined, { collection, ...params, record: { ...record, $type: collection } }, { encoding: 'application/json', headers })`,
         `return res.data`,
       ].join('\n'),
     )
   }
-  // {
-  //   //= put()
-  //   const method = cls.addMethod({
-  //     isAsync: true,
-  //     name: 'put',
-  //     returnType: 'Promise<{uri: string, cid: string}>',
-  //   })
-  //   method.addParameter({
-  //     name: 'params',
-  //     type: `OmitKey<${toTitleCase(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
-  //   })
-  //   method.addParameter({
-  //     name: 'record',
-  //     type: `${typeModule}.Record`,
-  //   })
-  //   method.addParameter({
-  //     name: 'headers?',
-  //     type: `Record<string, string>`,
-  //   })
-  //   method.setBodyText(
-  //     [
-  //       `record.$type = '${userType.nsid}'`,
-  //       `const res = await this._client.call('${ATP_METHODS.put}', undefined, { collection: '${userType.nsid}', record, ...params }, {encoding: 'application/json', headers})`,
-  //       `return res.data`,
-  //     ].join('\n'),
-  //   )
-  // }
   {
     //= delete()
     const method = cls.addMethod({

package/src/codegen/lex-gen.ts

@@ -1,5 +1,5 @@
 import { relative as getRelativePath } from 'node:path/posix'
-import { SourceFile, VariableDeclarationKind } from 'ts-morph'
+import { JSDoc, SourceFile, VariableDeclarationKind } from 'ts-morph'
 import {
   type LexArray,
   type LexBlob,
@@ -9,22 +9,21 @@ import {
   type LexObject,
   type LexPrimitive,
   type LexToken,
-  type LexUserType,
   Lexicons,
 } from '@atproto/lexicon'
 import { toCamelCase, toScreamingSnakeCase, toTitleCase } from './util'
 
-interface Commentable<T> {
-  addJsDoc: ({ description }: { description: string }) => T
+interface Commentable {
+  addJsDoc: ({ description }: { description: string }) => JSDoc
 }
-export function genComment<T>(
-  commentable: Commentable<T>,
-  def: LexUserType,
+export function genComment<T extends Commentable>(
+  commentable: T,
+  def: { description?: string },
 ): T {
   if (def.description) {
     commentable.addJsDoc({ description: def.description })
   }
-  return commentable as T
+  return commentable
 }
 
 export function genCommonImports(file: SourceFile, baseNsid: string) {
@@ -370,30 +369,52 @@ export function genXrpcParams(
     'procedure',
   ])
 
-  //= export interface QueryParams {...}
-  const iface = file.addInterface({
-    name: 'QueryParams',
-    isExported: true,
-  })
+  // @NOTE We need to use a `type` here instead of  an `interface` because we
+  // need the generated type to be used as generic type parameter like this:
+  //
+  // type QueryParams = {} // Generated by this function
+  //
+  // type MyUtil<P extends xrpcServer.QueryParam> = (...)
+  // type NsType = MyUtil<NS.QueryParams> // ERROR if `NS.QueryParams` is an `interface`
+  //
+  // Second line will fail if `NS.QueryParams` is an `interface` that does
+  // not explicitly extend `xrpcServer.QueryParam`, or have a string index
+  // signature that encompasses `xrpcServer.QueryParam`.
+
+  //= export type QueryParams = {...}
   if (def.parameters) {
-    for (const paramKey in def.parameters.properties) {
-      const paramDef = def.parameters.properties[paramKey]
-      const req =
-        def.parameters.required?.includes(paramKey) ||
-        (defaultsArePresent &&
-          'default' in paramDef &&
-          paramDef.default !== undefined)
-      genComment(
-        iface.addProperty({
-          name: `${paramKey}${req ? '' : '?'}`,
-          type:
-            paramDef.type === 'array'
-              ? primitiveToType(paramDef.items) + '[]'
-              : primitiveToType(paramDef),
-        }),
-        paramDef,
-      )
-    }
+    genComment(
+      file.addTypeAlias({
+        name: 'QueryParams',
+        isExported: true,
+        type: `{
+          ${Object.entries(def.parameters.properties)
+            .map(([paramKey, paramDef]) => {
+              const req =
+                def.parameters!.required?.includes(paramKey) ||
+                (defaultsArePresent &&
+                  'default' in paramDef &&
+                  paramDef.default !== undefined)
+              const jsDoc = paramDef.description
+                ? `/** ${paramDef.description} */\n`
+                : ''
+              return `${jsDoc}${paramKey}${req ? '' : '?'}: ${
+                paramDef.type === 'array'
+                  ? primitiveToType(paramDef.items) + '[]'
+                  : primitiveToType(paramDef)
+              }`
+            })
+            .join('\n')}
+        }`,
+      }),
+      def.parameters,
+    )
+  } else {
+    file.addTypeAlias({
+      name: 'QueryParams',
+      isExported: true,
+      type: '{}',
+    })
   }
 }
 

package/src/codegen/server.ts

@@ -57,21 +57,12 @@ const indexTs = (
     file.addImportDeclaration({
       moduleSpecifier: '@atproto/xrpc-server',
       namedImports: [
-        {
-          name: 'createServer',
-          alias: 'createXrpcServer',
-        },
-        {
-          name: 'Server',
-          alias: 'XrpcServer',
-        },
-        {
-          name: 'Options',
-          alias: 'XrpcOptions',
-          isTypeOnly: true,
-        },
-        { name: 'AuthVerifier', isTypeOnly: true },
-        { name: 'StreamAuthVerifier', isTypeOnly: true },
+        { name: 'Auth', isTypeOnly: true },
+        { name: 'Options', alias: 'XrpcOptions', isTypeOnly: true },
+        { name: 'Server', alias: 'XrpcServer' },
+        { name: 'StreamConfigOrHandler', isTypeOnly: true },
+        { name: 'MethodConfigOrHandler', isTypeOnly: true },
+        { name: 'createServer', alias: 'createXrpcServer' },
       ],
     })
     //= import {schemas} from './lexicons.js'
@@ -175,66 +166,6 @@ const indexTs = (
           ),
         ].join('\n'),
       )
-
-    file.addTypeAlias({
-      name: 'SharedRateLimitOpts',
-      typeParameters: [{ name: 'T' }],
-      type: `{
-        name: string
-        calcKey?: (ctx: T) => string | null
-        calcPoints?: (ctx: T) => number
-      }`,
-    })
-
-    file.addTypeAlias({
-      name: 'RouteRateLimitOpts',
-      typeParameters: [{ name: 'T' }],
-      type: `{
-        durationMs: number
-        points: number
-        calcKey?: (ctx: T) => string | null
-        calcPoints?: (ctx: T) => number
-      }`,
-    })
-
-    file.addTypeAlias({
-      name: 'HandlerOpts',
-      type: `{ blobLimit?: number }`,
-    })
-
-    file.addTypeAlias({
-      name: 'HandlerRateLimitOpts',
-      typeParameters: [{ name: 'T' }],
-      type: `SharedRateLimitOpts<T> | RouteRateLimitOpts<T>`,
-    })
-
-    file.addTypeAlias({
-      name: 'ConfigOf',
-      typeParameters: [
-        { name: 'Auth' },
-        { name: 'Handler' },
-        { name: 'ReqCtx' },
-      ],
-      type: `
-        | Handler
-        | {
-          auth?: Auth
-          opts?: HandlerOpts
-          rateLimit?: HandlerRateLimitOpts<ReqCtx> | HandlerRateLimitOpts<ReqCtx>[]
-          handler: Handler
-        }`,
-    })
-
-    file.addTypeAlias({
-      name: 'ExtractAuth',
-      typeParameters: [
-        { name: 'AV', constraint: 'AuthVerifier | StreamAuthVerifier' },
-      ],
-      type: `Extract<
-        Awaited<ReturnType<AV>>,
-        { credentials: unknown }
-      >`,
-    })
   })
 
 function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
@@ -294,14 +225,26 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
       name,
       typeParameters: [
         {
-          name: 'AV',
-          constraint: isSubscription ? 'StreamAuthVerifier' : 'AuthVerifier',
+          name: 'A',
+          constraint: 'Auth',
+          default: 'void',
         },
       ],
     })
     method.addParameter({
       name: 'cfg',
-      type: `ConfigOf<AV, ${moduleName}.Handler<ExtractAuth<AV>>, ${moduleName}.HandlerReqCtx<ExtractAuth<AV>>>`,
+      type: isSubscription
+        ? `StreamConfigOrHandler<
+          A,
+          ${moduleName}.QueryParams,
+          ${moduleName}.HandlerOutput,
+        >`
+        : `MethodConfigOrHandler<
+          A,
+          ${moduleName}.QueryParams,
+          ${moduleName}.HandlerInput,
+          ${moduleName}.HandlerOutput,
+        >`,
     })
     const methodType = isSubscription ? 'streamMethod' : 'method'
     method.setBodyText(
@@ -322,12 +265,6 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
     async (file) => {
       const main = lexiconDoc.defs.main
       if (main?.type === 'query' || main?.type === 'procedure') {
-        //= import express from 'express'
-        file.addImportDeclaration({
-          moduleSpecifier: 'express',
-          defaultImport: 'express',
-        })
-
         const streamingInput =
           main?.type === 'procedure' &&
           main.input?.encoding &&
@@ -378,10 +315,6 @@ function genServerXrpcMethod(
 ) {
   const def = lexicons.getDefOrThrow(lexUri, ['query', 'procedure'])
 
-  file.addImportDeclaration({
-    moduleSpecifier: '@atproto/xrpc-server',
-    namedImports: [{ name: 'HandlerAuth' }, { name: 'HandlerPipeThrough' }],
-  })
   //= export interface HandlerInput {...}
   if (def.type === 'procedure' && def.input?.encoding) {
     const handlerInput = file.addInterface({
@@ -396,23 +329,19 @@ function genServerXrpcMethod(
         .map((v) => `'${v.trim()}'`)
         .join(' | '),
     })
-    if (def.input.schema) {
-      if (def.input.encoding.includes(',')) {
-        handlerInput.addProperty({
-          name: 'body',
-          type: 'InputSchema | stream.Readable',
-        })
-      } else {
-        handlerInput.addProperty({ name: 'body', type: 'InputSchema' })
-      }
-    } else if (def.input.encoding) {
-      handlerInput.addProperty({ name: 'body', type: 'stream.Readable' })
-    }
+    handlerInput.addProperty({
+      name: 'body',
+      type: def.input.schema
+        ? def.input.encoding.includes(',')
+          ? 'InputSchema | stream.Readable'
+          : 'InputSchema'
+        : 'stream.Readable',
+    })
   } else {
     file.addTypeAlias({
       isExported: true,
       name: 'HandlerInput',
-      type: 'undefined',
+      type: 'void',
     })
   }
 
@@ -475,34 +404,7 @@ function genServerXrpcMethod(
   file.addTypeAlias({
     isExported: true,
     name: 'HandlerOutput',
-    type: `HandlerError | ${
-      hasHandlerSuccess ? 'HandlerSuccess | HandlerPipeThrough' : 'void'
-    }`,
-  })
-
-  file.addTypeAlias({
-    name: 'HandlerReqCtx',
-    isExported: true,
-    typeParameters: [
-      { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-    ],
-    type: `{
-        auth: HA
-        params: QueryParams
-        input: HandlerInput
-        req: express.Request
-        res: express.Response
-        resetRouteRateLimits: () => Promise<void>
-      }`,
-  })
-
-  file.addTypeAlias({
-    name: 'Handler',
-    isExported: true,
-    typeParameters: [
-      { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-    ],
-    type: `(ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput`,
+    type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess' : 'void'}`,
   })
 }
 
@@ -515,7 +417,7 @@ function genServerXrpcStreaming(
 
   file.addImportDeclaration({
     moduleSpecifier: '@atproto/xrpc-server',
-    namedImports: [{ name: 'HandlerAuth' }, { name: 'ErrorFrame' }],
+    namedImports: [{ name: 'ErrorFrame' }],
   })
 
   file.addImportDeclaration({
@@ -536,29 +438,6 @@ function genServerXrpcStreaming(
     name: 'HandlerOutput',
     type: `HandlerError | ${def.message?.schema ? 'OutputSchema' : 'void'}`,
   })
-
-  file.addTypeAlias({
-    name: 'HandlerReqCtx',
-    isExported: true,
-    typeParameters: [
-      { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-    ],
-    type: `{
-        auth: HA
-        params: QueryParams
-        req: IncomingMessage
-        signal: AbortSignal
-      }`,
-  })
-
-  file.addTypeAlias({
-    name: 'Handler',
-    isExported: true,
-    typeParameters: [
-      { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
-    ],
-    type: `(ctx: HandlerReqCtx<HA>) => AsyncIterable<HandlerOutput>`,
-  })
 }
 
 function arrayToUnion(arr?: string[]) {