@atproto/lex-cli 0.8.3 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/codegen/common.d.ts.map +1 -1
  3. package/dist/codegen/common.js +3 -8
  4. package/dist/codegen/common.js.map +1 -1
  5. package/dist/codegen/lex-gen.d.ts +7 -5
  6. package/dist/codegen/lex-gen.d.ts.map +1 -1
  7. package/dist/codegen/lex-gen.js +38 -17
  8. package/dist/codegen/lex-gen.js.map +1 -1
  9. package/dist/codegen/server.js +32 -142
  10. package/dist/codegen/server.js.map +1 -1
  11. package/package.json +2 -2
  12. package/src/codegen/common.ts +3 -9
  13. package/src/codegen/lex-gen.ts +52 -31
  14. package/src/codegen/server.ts +32 -153
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atproto/lex-cli
2
2
 
3
+ ## 0.9.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`8d56743a1`](https://github.com/bluesky-social/atproto/commit/8d56743a18413a73e6bbca358336c770553d861f) Thanks [@devinivy](https://github.com/devinivy)! - Fix codegen for nsids containing dashes.
8
+
9
+ ## 0.9.0
10
+
11
+ ### Minor Changes
12
+
13
+ - [#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`
14
+
15
+ ### Patch Changes
16
+
17
+ - Updated dependencies [[`8ef976d38`](https://github.com/bluesky-social/atproto/commit/8ef976d3852df4bfa376e515e131cc0810a42f20)]:
18
+ - @atproto/lexicon@0.4.12
19
+
3
20
  ## 0.8.3
4
21
 
5
22
  ### Patch Changes
package/dist/codegen/common.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAA2B,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAA;AAU7C,eAAO,MAAM,MAAM,GAAI,YAAO,2BAuH1B,CAAA;AAEJ,eAAO,MAAM,UAAU,GAAI,YAAO,EAAE,UAAU,UAAU,EAAE,2BAqItD,CAAA;AAEJ,wBAAsB,GAAG,CACvB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GACvC,OAAO,CAAC,aAAa,CAAC,CAQxB"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAA2B,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAA;AAW7C,eAAO,MAAM,MAAM,GAAI,YAAO,2BAuH1B,CAAA;AAEJ,eAAO,MAAM,UAAU,GAAI,YAAO,EAAE,UAAU,UAAU,EAAE,2BA8HtD,CAAA;AAEJ,wBAAsB,GAAG,CACvB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GACvC,OAAO,CAAC,aAAa,CAAC,CAQxB"}
package/dist/codegen/common.js CHANGED
@@ -4,6 +4,7 @@ exports.lexiconsTs = exports.utilTs = void 0;
4
4
  exports.gen = gen;
5
5
  const prettier_1 = require("prettier");
6
6
  const ts_morph_1 = require("ts-morph");
7
+ const util_1 = require("./util");
7
8
  const PRETTIER_OPTS = {
8
9
  parser: 'typescript',
9
10
  tabWidth: 2,
@@ -131,12 +132,6 @@ export function asPredicate<V extends Validator>(validate: V) {
131
132
  });
132
133
  exports.utilTs = utilTs;
133
134
  const lexiconsTs = (project, lexicons) => gen(project, '/lexicons.ts', async (file) => {
134
- const nsidToEnum = (nsid) => {
135
- return nsid
136
- .split('.')
137
- .map((word) => word[0].toUpperCase() + word.slice(1))
138
- .join('');
139
- };
140
135
  //= import { type LexiconDoc, Lexicons } from '@atproto/lexicon'
141
136
  file
142
137
  .addImportDeclaration({
@@ -167,7 +162,7 @@ const lexiconsTs = (project, lexicons) => gen(project, '/lexicons.ts', async (fi
167
162
  name: 'schemaDict',
168
163
  initializer: JSON.stringify(lexicons.reduce((acc, cur) => ({
169
164
  ...acc,
170
- [nsidToEnum(cur.id)]: cur,
165
+ [(0, util_1.toTitleCase)(cur.id)]: cur,
171
166
  }), {}), null, 2) + ' as const satisfies Record<string, LexiconDoc>',
172
167
  },
173
168
  ],
@@ -240,7 +235,7 @@ const lexiconsTs = (project, lexicons) => gen(project, '/lexicons.ts', async (fi
240
235
  {
241
236
  name: 'ids',
242
237
  initializer: `{${lexicons
243
- .map((lex) => `\n ${nsidToEnum(lex.id)}: ${JSON.stringify(lex.id)},`)
238
+ .map((lex) => `\n ${(0, util_1.toTitleCase)(lex.id)}: ${JSON.stringify(lex.id)},`)
244
239
  .join('')}\n} as const`,
245
240
  },
246
241
  ],
package/dist/codegen/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":"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"}
package/dist/codegen/lex-gen.d.ts CHANGED
@@ -1,11 +1,13 @@
1
- import { SourceFile } from 'ts-morph';
2
- import { type LexArray, type LexBlob, type LexBytes, type LexCidLink, type LexIpldType, type LexPrimitive, type LexToken, type LexUserType, Lexicons } from '@atproto/lexicon';
3
- interface Commentable<T> {
1
+ import { JSDoc, SourceFile } from 'ts-morph';
2
+ import { type LexArray, type LexBlob, type LexBytes, type LexCidLink, type LexIpldType, type LexPrimitive, type LexToken, Lexicons } from '@atproto/lexicon';
3
+ interface Commentable {
4
4
  addJsDoc: ({ description }: {
5
5
  description: string;
6
- }) => T;
6
+ }) => JSDoc;
7
7
  }
8
- export declare function genComment<T>(commentable: Commentable<T>, def: LexUserType): T;
8
+ export declare function genComment<T extends Commentable>(commentable: T, def: {
9
+ description?: string;
10
+ }): T;
9
11
  export declare function genCommonImports(file: SourceFile, baseNsid: string): void;
10
12
  export declare function genImports(file: SourceFile, imports: Set<string>, baseNsid: string): void;
11
13
  export declare function genUserType(file: SourceFile, imports: Set<string>, lexicons: Lexicons, lexUri: string): void;
package/dist/codegen/lex-gen.d.ts.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -286,25 +286,46 @@ function genXrpcParams(file, lexicons, lexUri, defaultsArePresent = true) {
286
286
  'subscription',
287
287
  'procedure',
288
288
  ]);
289
- //= export interface QueryParams {...}
290
- const iface = file.addInterface({
291
- name: 'QueryParams',
292
- isExported: true,
293
- });
289
+ // @NOTE We need to use a `type` here instead of an `interface` because we
290
+ // need the generated type to be used as generic type parameter like this:
291
+ //
292
+ // type QueryParams = {} // Generated by this function
293
+ //
294
+ // type MyUtil<P extends xrpcServer.QueryParam> = (...)
295
+ // type NsType = MyUtil<NS.QueryParams> // ERROR if `NS.QueryParams` is an `interface`
296
+ //
297
+ // Second line will fail if `NS.QueryParams` is an `interface` that does
298
+ // not explicitly extend `xrpcServer.QueryParam`, or have a string index
299
+ // signature that encompasses `xrpcServer.QueryParam`.
300
+ //= export type QueryParams = {...}
294
301
  if (def.parameters) {
295
- for (const paramKey in def.parameters.properties) {
296
- const paramDef = def.parameters.properties[paramKey];
297
- const req = def.parameters.required?.includes(paramKey) ||
298
- (defaultsArePresent &&
299
- 'default' in paramDef &&
300
- paramDef.default !== undefined);
301
- genComment(iface.addProperty({
302
- name: `${paramKey}${req ? '' : '?'}`,
303
- type: paramDef.type === 'array'
302
+ genComment(file.addTypeAlias({
303
+ name: 'QueryParams',
304
+ isExported: true,
305
+ type: `{
306
+ ${Object.entries(def.parameters.properties)
307
+ .map(([paramKey, paramDef]) => {
308
+ const req = def.parameters.required?.includes(paramKey) ||
309
+ (defaultsArePresent &&
310
+ 'default' in paramDef &&
311
+ paramDef.default !== undefined);
312
+ const jsDoc = paramDef.description
313
+ ? `/** ${paramDef.description} */\n`
314
+ : '';
315
+ return `${jsDoc}${paramKey}${req ? '' : '?'}: ${paramDef.type === 'array'
304
316
  ? primitiveToType(paramDef.items) + '[]'
305
- : primitiveToType(paramDef),
306
- }), paramDef);
307
- }
317
+ : primitiveToType(paramDef)}`;
318
+ })
319
+ .join('\n')}
320
+ }`,
321
+ }), def.parameters);
322
+ }
323
+ else {
324
+ file.addTypeAlias({
325
+ name: 'QueryParams',
326
+ isExported: true,
327
+ type: '{}',
328
+ });
308
329
  }
309
330
  }
310
331
  function genXrpcInput(file, imports, lexicons, lexUri, defaultsArePresent = true) {
package/dist/codegen/lex-gen.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lex-gen.js","sourceRoot":"","sources":["../../src/codegen/lex-gen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lex-gen.js","sourceRoot":"","sources":["../../src/codegen/lex-gen.ts"],"names":[],"mappings":"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"}
package/dist/codegen/server.js CHANGED
@@ -29,21 +29,12 @@ const indexTs = (project, lexiconDocs, nsidTree, nsidTokens) => (0, common_1.gen
29
29
  file.addImportDeclaration({
30
30
  moduleSpecifier: '@atproto/xrpc-server',
31
31
  namedImports: [
32
- {
33
- name: 'createServer',
34
- alias: 'createXrpcServer',
35
- },
36
- {
37
- name: 'Server',
38
- alias: 'XrpcServer',
39
- },
40
- {
41
- name: 'Options',
42
- alias: 'XrpcOptions',
43
- isTypeOnly: true,
44
- },
45
- { name: 'AuthVerifier', isTypeOnly: true },
46
- { name: 'StreamAuthVerifier', isTypeOnly: true },
32
+ { name: 'Auth', isTypeOnly: true },
33
+ { name: 'Options', alias: 'XrpcOptions', isTypeOnly: true },
34
+ { name: 'Server', alias: 'XrpcServer' },
35
+ { name: 'StreamConfigOrHandler', isTypeOnly: true },
36
+ { name: 'MethodConfigOrHandler', isTypeOnly: true },
37
+ { name: 'createServer', alias: 'createXrpcServer' },
47
38
  ],
48
39
  });
49
40
  //= import {schemas} from './lexicons.js'
@@ -131,60 +122,6 @@ const indexTs = (project, lexiconDocs, nsidTree, nsidTokens) => (0, common_1.gen
131
122
  'this.xrpc = createXrpcServer(schemas, options)',
132
123
  ...nsidTree.map((ns) => `this.${ns.propName} = new ${ns.className}(this)`),
133
124
  ].join('\n'));
134
- file.addTypeAlias({
135
- name: 'SharedRateLimitOpts',
136
- typeParameters: [{ name: 'T' }],
137
- type: `{
138
- name: string
139
- calcKey?: (ctx: T) => string | null
140
- calcPoints?: (ctx: T) => number
141
- }`,
142
- });
143
- file.addTypeAlias({
144
- name: 'RouteRateLimitOpts',
145
- typeParameters: [{ name: 'T' }],
146
- type: `{
147
- durationMs: number
148
- points: number
149
- calcKey?: (ctx: T) => string | null
150
- calcPoints?: (ctx: T) => number
151
- }`,
152
- });
153
- file.addTypeAlias({
154
- name: 'HandlerOpts',
155
- type: `{ blobLimit?: number }`,
156
- });
157
- file.addTypeAlias({
158
- name: 'HandlerRateLimitOpts',
159
- typeParameters: [{ name: 'T' }],
160
- type: `SharedRateLimitOpts<T> | RouteRateLimitOpts<T>`,
161
- });
162
- file.addTypeAlias({
163
- name: 'ConfigOf',
164
- typeParameters: [
165
- { name: 'Auth' },
166
- { name: 'Handler' },
167
- { name: 'ReqCtx' },
168
- ],
169
- type: `
170
- | Handler
171
- | {
172
- auth?: Auth
173
- opts?: HandlerOpts
174
- rateLimit?: HandlerRateLimitOpts<ReqCtx> | HandlerRateLimitOpts<ReqCtx>[]
175
- handler: Handler
176
- }`,
177
- });
178
- file.addTypeAlias({
179
- name: 'ExtractAuth',
180
- typeParameters: [
181
- { name: 'AV', constraint: 'AuthVerifier | StreamAuthVerifier' },
182
- ],
183
- type: `Extract<
184
- Awaited<ReturnType<AV>>,
185
- { credentials: unknown }
186
- >`,
187
- });
188
125
  });
189
126
  function genNamespaceCls(file, ns) {
190
127
  //= export class {ns}NS {...}
@@ -233,14 +170,26 @@ function genNamespaceCls(file, ns) {
233
170
  name,
234
171
  typeParameters: [
235
172
  {
236
- name: 'AV',
237
- constraint: isSubscription ? 'StreamAuthVerifier' : 'AuthVerifier',
173
+ name: 'A',
174
+ constraint: 'Auth',
175
+ default: 'void',
238
176
  },
239
177
  ],
240
178
  });
241
179
  method.addParameter({
242
180
  name: 'cfg',
243
- type: `ConfigOf<AV, ${moduleName}.Handler<ExtractAuth<AV>>, ${moduleName}.HandlerReqCtx<ExtractAuth<AV>>>`,
181
+ type: isSubscription
182
+ ? `StreamConfigOrHandler<
183
+ A,
184
+ ${moduleName}.QueryParams,
185
+ ${moduleName}.HandlerOutput,
186
+ >`
187
+ : `MethodConfigOrHandler<
188
+ A,
189
+ ${moduleName}.QueryParams,
190
+ ${moduleName}.HandlerInput,
191
+ ${moduleName}.HandlerOutput,
192
+ >`,
244
193
  });
245
194
  const methodType = isSubscription ? 'streamMethod' : 'method';
246
195
  method.setBodyText([
@@ -254,11 +203,6 @@ function genNamespaceCls(file, ns) {
254
203
  const lexiconTs = (project, lexicons, lexiconDoc) => (0, common_1.gen)(project, `/types/${lexiconDoc.id.split('.').join('/')}.ts`, async (file) => {
255
204
  const main = lexiconDoc.defs.main;
256
205
  if (main?.type === 'query' || main?.type === 'procedure') {
257
- //= import express from 'express'
258
- file.addImportDeclaration({
259
- moduleSpecifier: 'express',
260
- defaultImport: 'express',
261
- });
262
206
  const streamingInput = main?.type === 'procedure' &&
263
207
  main.input?.encoding &&
264
208
  !main.input.schema;
@@ -303,10 +247,6 @@ const lexiconTs = (project, lexicons, lexiconDoc) => (0, common_1.gen)(project,
303
247
  });
304
248
  function genServerXrpcMethod(file, lexicons, lexUri) {
305
249
  const def = lexicons.getDefOrThrow(lexUri, ['query', 'procedure']);
306
- file.addImportDeclaration({
307
- moduleSpecifier: '@atproto/xrpc-server',
308
- namedImports: [{ name: 'HandlerAuth' }, { name: 'HandlerPipeThrough' }],
309
- });
310
250
  //= export interface HandlerInput {...}
311
251
  if (def.type === 'procedure' && def.input?.encoding) {
312
252
  const handlerInput = file.addInterface({
@@ -320,26 +260,20 @@ function genServerXrpcMethod(file, lexicons, lexUri) {
320
260
  .map((v) => `'${v.trim()}'`)
321
261
  .join(' | '),
322
262
  });
323
- if (def.input.schema) {
324
- if (def.input.encoding.includes(',')) {
325
- handlerInput.addProperty({
326
- name: 'body',
327
- type: 'InputSchema | stream.Readable',
328
- });
329
- }
330
- else {
331
- handlerInput.addProperty({ name: 'body', type: 'InputSchema' });
332
- }
333
- }
334
- else if (def.input.encoding) {
335
- handlerInput.addProperty({ name: 'body', type: 'stream.Readable' });
336
- }
263
+ handlerInput.addProperty({
264
+ name: 'body',
265
+ type: def.input.schema
266
+ ? def.input.encoding.includes(',')
267
+ ? 'InputSchema | stream.Readable'
268
+ : 'InputSchema'
269
+ : 'stream.Readable',
270
+ });
337
271
  }
338
272
  else {
339
273
  file.addTypeAlias({
340
274
  isExported: true,
341
275
  name: 'HandlerInput',
342
- type: 'undefined',
276
+ type: 'void',
343
277
  });
344
278
  }
345
279
  // export interface HandlerSuccess {...}
@@ -400,37 +334,14 @@ function genServerXrpcMethod(file, lexicons, lexUri) {
400
334
  file.addTypeAlias({
401
335
  isExported: true,
402
336
  name: 'HandlerOutput',
403
- type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess | HandlerPipeThrough' : 'void'}`,
404
- });
405
- file.addTypeAlias({
406
- name: 'HandlerReqCtx',
407
- isExported: true,
408
- typeParameters: [
409
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
410
- ],
411
- type: `{
412
- auth: HA
413
- params: QueryParams
414
- input: HandlerInput
415
- req: express.Request
416
- res: express.Response
417
- resetRouteRateLimits: () => Promise<void>
418
- }`,
419
- });
420
- file.addTypeAlias({
421
- name: 'Handler',
422
- isExported: true,
423
- typeParameters: [
424
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
425
- ],
426
- type: `(ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput`,
337
+ type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess' : 'void'}`,
427
338
  });
428
339
  }
429
340
  function genServerXrpcStreaming(file, lexicons, lexUri) {
430
341
  const def = lexicons.getDefOrThrow(lexUri, ['subscription']);
431
342
  file.addImportDeclaration({
432
343
  moduleSpecifier: '@atproto/xrpc-server',
433
- namedImports: [{ name: 'HandlerAuth' }, { name: 'ErrorFrame' }],
344
+ namedImports: [{ name: 'ErrorFrame' }],
434
345
  });
435
346
  file.addImportDeclaration({
436
347
  moduleSpecifier: 'node:http',
@@ -448,27 +359,6 @@ function genServerXrpcStreaming(file, lexicons, lexUri) {
448
359
  name: 'HandlerOutput',
449
360
  type: `HandlerError | ${def.message?.schema ? 'OutputSchema' : 'void'}`,
450
361
  });
451
- file.addTypeAlias({
452
- name: 'HandlerReqCtx',
453
- isExported: true,
454
- typeParameters: [
455
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
456
- ],
457
- type: `{
458
- auth: HA
459
- params: QueryParams
460
- req: IncomingMessage
461
- signal: AbortSignal
462
- }`,
463
- });
464
- file.addTypeAlias({
465
- name: 'Handler',
466
- isExported: true,
467
- typeParameters: [
468
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
469
- ],
470
- type: `(ctx: HandlerReqCtx<HA>) => AsyncIterable<HandlerOutput>`,
471
- });
472
362
  }
473
363
  function arrayToUnion(arr) {
474
364
  if (!arr?.length) {
package/dist/codegen/server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/codegen/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/codegen/server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atproto/lex-cli",
3
- "version": "0.8.3",
3
+ "version": "0.9.1",
4
4
  "license": "MIT",
5
5
  "description": "TypeScript codegen tool for atproto Lexicon schemas",
6
6
  "keywords": [
@@ -28,7 +28,7 @@
28
28
  "ts-morph": "^24.0.0",
29
29
  "yesno": "^0.4.0",
30
30
  "zod": "^3.23.8",
31
- "@atproto/lexicon": "^0.4.11",
31
+ "@atproto/lexicon": "^0.4.12",
32
32
  "@atproto/syntax": "^0.4.0"
33
33
  },
34
34
  "devDependencies": {
package/src/codegen/common.ts CHANGED
@@ -2,6 +2,7 @@ import { Options as PrettierOptions, format } from 'prettier'
2
2
  import { Project, SourceFile, VariableDeclarationKind } from 'ts-morph'
3
3
  import { type LexiconDoc } from '@atproto/lexicon'
4
4
  import { type GeneratedFile } from '../types'
5
+ import { toTitleCase } from './util'
5
6
 
6
7
  const PRETTIER_OPTS: PrettierOptions = {
7
8
  parser: 'typescript',
@@ -134,13 +135,6 @@ export function asPredicate<V extends Validator>(validate: V) {
134
135
 
135
136
  export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
136
137
  gen(project, '/lexicons.ts', async (file) => {
137
- const nsidToEnum = (nsid: string): string => {
138
- return nsid
139
- .split('.')
140
- .map((word) => word[0].toUpperCase() + word.slice(1))
141
- .join('')
142
- }
143
-
144
138
  //= import { type LexiconDoc, Lexicons } from '@atproto/lexicon'
145
139
  file
146
140
  .addImportDeclaration({
@@ -176,7 +170,7 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
176
170
  lexicons.reduce(
177
171
  (acc, cur) => ({
178
172
  ...acc,
179
- [nsidToEnum(cur.id)]: cur,
173
+ [toTitleCase(cur.id)]: cur,
180
174
  }),
181
175
  {},
182
176
  ),
@@ -259,7 +253,7 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
259
253
  name: 'ids',
260
254
  initializer: `{${lexicons
261
255
  .map(
262
- (lex) => `\n ${nsidToEnum(lex.id)}: ${JSON.stringify(lex.id)},`,
256
+ (lex) => `\n ${toTitleCase(lex.id)}: ${JSON.stringify(lex.id)},`,
263
257
  )
264
258
  .join('')}\n} as const`,
265
259
  },
package/src/codegen/lex-gen.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { relative as getRelativePath } from 'node:path/posix'
2
- import { SourceFile, VariableDeclarationKind } from 'ts-morph'
2
+ import { JSDoc, SourceFile, VariableDeclarationKind } from 'ts-morph'
3
3
  import {
4
4
  type LexArray,
5
5
  type LexBlob,
@@ -9,22 +9,21 @@ import {
9
9
  type LexObject,
10
10
  type LexPrimitive,
11
11
  type LexToken,
12
- type LexUserType,
13
12
  Lexicons,
14
13
  } from '@atproto/lexicon'
15
14
  import { toCamelCase, toScreamingSnakeCase, toTitleCase } from './util'
16
15
 
17
- interface Commentable<T> {
18
- addJsDoc: ({ description }: { description: string }) => T
16
+ interface Commentable {
17
+ addJsDoc: ({ description }: { description: string }) => JSDoc
19
18
  }
20
- export function genComment<T>(
21
- commentable: Commentable<T>,
22
- def: LexUserType,
19
+ export function genComment<T extends Commentable>(
20
+ commentable: T,
21
+ def: { description?: string },
23
22
  ): T {
24
23
  if (def.description) {
25
24
  commentable.addJsDoc({ description: def.description })
26
25
  }
27
- return commentable as T
26
+ return commentable
28
27
  }
29
28
 
30
29
  export function genCommonImports(file: SourceFile, baseNsid: string) {
@@ -370,30 +369,52 @@ export function genXrpcParams(
370
369
  'procedure',
371
370
  ])
372
371
 
373
- //= export interface QueryParams {...}
374
- const iface = file.addInterface({
375
- name: 'QueryParams',
376
- isExported: true,
377
- })
372
+ // @NOTE We need to use a `type` here instead of an `interface` because we
373
+ // need the generated type to be used as generic type parameter like this:
374
+ //
375
+ // type QueryParams = {} // Generated by this function
376
+ //
377
+ // type MyUtil<P extends xrpcServer.QueryParam> = (...)
378
+ // type NsType = MyUtil<NS.QueryParams> // ERROR if `NS.QueryParams` is an `interface`
379
+ //
380
+ // Second line will fail if `NS.QueryParams` is an `interface` that does
381
+ // not explicitly extend `xrpcServer.QueryParam`, or have a string index
382
+ // signature that encompasses `xrpcServer.QueryParam`.
383
+
384
+ //= export type QueryParams = {...}
378
385
  if (def.parameters) {
379
- for (const paramKey in def.parameters.properties) {
380
- const paramDef = def.parameters.properties[paramKey]
381
- const req =
382
- def.parameters.required?.includes(paramKey) ||
383
- (defaultsArePresent &&
384
- 'default' in paramDef &&
385
- paramDef.default !== undefined)
386
- genComment(
387
- iface.addProperty({
388
- name: `${paramKey}${req ? '' : '?'}`,
389
- type:
390
- paramDef.type === 'array'
391
- ? primitiveToType(paramDef.items) + '[]'
392
- : primitiveToType(paramDef),
393
- }),
394
- paramDef,
395
- )
396
- }
386
+ genComment(
387
+ file.addTypeAlias({
388
+ name: 'QueryParams',
389
+ isExported: true,
390
+ type: `{
391
+ ${Object.entries(def.parameters.properties)
392
+ .map(([paramKey, paramDef]) => {
393
+ const req =
394
+ def.parameters!.required?.includes(paramKey) ||
395
+ (defaultsArePresent &&
396
+ 'default' in paramDef &&
397
+ paramDef.default !== undefined)
398
+ const jsDoc = paramDef.description
399
+ ? `/** ${paramDef.description} */\n`
400
+ : ''
401
+ return `${jsDoc}${paramKey}${req ? '' : '?'}: ${
402
+ paramDef.type === 'array'
403
+ ? primitiveToType(paramDef.items) + '[]'
404
+ : primitiveToType(paramDef)
405
+ }`
406
+ })
407
+ .join('\n')}
408
+ }`,
409
+ }),
410
+ def.parameters,
411
+ )
412
+ } else {
413
+ file.addTypeAlias({
414
+ name: 'QueryParams',
415
+ isExported: true,
416
+ type: '{}',
417
+ })
397
418
  }
398
419
  }
399
420
 
package/src/codegen/server.ts CHANGED
@@ -57,21 +57,12 @@ const indexTs = (
57
57
  file.addImportDeclaration({
58
58
  moduleSpecifier: '@atproto/xrpc-server',
59
59
  namedImports: [
60
- {
61
- name: 'createServer',
62
- alias: 'createXrpcServer',
63
- },
64
- {
65
- name: 'Server',
66
- alias: 'XrpcServer',
67
- },
68
- {
69
- name: 'Options',
70
- alias: 'XrpcOptions',
71
- isTypeOnly: true,
72
- },
73
- { name: 'AuthVerifier', isTypeOnly: true },
74
- { name: 'StreamAuthVerifier', isTypeOnly: true },
60
+ { name: 'Auth', isTypeOnly: true },
61
+ { name: 'Options', alias: 'XrpcOptions', isTypeOnly: true },
62
+ { name: 'Server', alias: 'XrpcServer' },
63
+ { name: 'StreamConfigOrHandler', isTypeOnly: true },
64
+ { name: 'MethodConfigOrHandler', isTypeOnly: true },
65
+ { name: 'createServer', alias: 'createXrpcServer' },
75
66
  ],
76
67
  })
77
68
  //= import {schemas} from './lexicons.js'
@@ -175,66 +166,6 @@ const indexTs = (
175
166
  ),
176
167
  ].join('\n'),
177
168
  )
178
-
179
- file.addTypeAlias({
180
- name: 'SharedRateLimitOpts',
181
- typeParameters: [{ name: 'T' }],
182
- type: `{
183
- name: string
184
- calcKey?: (ctx: T) => string | null
185
- calcPoints?: (ctx: T) => number
186
- }`,
187
- })
188
-
189
- file.addTypeAlias({
190
- name: 'RouteRateLimitOpts',
191
- typeParameters: [{ name: 'T' }],
192
- type: `{
193
- durationMs: number
194
- points: number
195
- calcKey?: (ctx: T) => string | null
196
- calcPoints?: (ctx: T) => number
197
- }`,
198
- })
199
-
200
- file.addTypeAlias({
201
- name: 'HandlerOpts',
202
- type: `{ blobLimit?: number }`,
203
- })
204
-
205
- file.addTypeAlias({
206
- name: 'HandlerRateLimitOpts',
207
- typeParameters: [{ name: 'T' }],
208
- type: `SharedRateLimitOpts<T> | RouteRateLimitOpts<T>`,
209
- })
210
-
211
- file.addTypeAlias({
212
- name: 'ConfigOf',
213
- typeParameters: [
214
- { name: 'Auth' },
215
- { name: 'Handler' },
216
- { name: 'ReqCtx' },
217
- ],
218
- type: `
219
- | Handler
220
- | {
221
- auth?: Auth
222
- opts?: HandlerOpts
223
- rateLimit?: HandlerRateLimitOpts<ReqCtx> | HandlerRateLimitOpts<ReqCtx>[]
224
- handler: Handler
225
- }`,
226
- })
227
-
228
- file.addTypeAlias({
229
- name: 'ExtractAuth',
230
- typeParameters: [
231
- { name: 'AV', constraint: 'AuthVerifier | StreamAuthVerifier' },
232
- ],
233
- type: `Extract<
234
- Awaited<ReturnType<AV>>,
235
- { credentials: unknown }
236
- >`,
237
- })
238
169
  })
239
170
 
240
171
  function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
@@ -294,14 +225,26 @@ function genNamespaceCls(file: SourceFile, ns: DefTreeNode) {
294
225
  name,
295
226
  typeParameters: [
296
227
  {
297
- name: 'AV',
298
- constraint: isSubscription ? 'StreamAuthVerifier' : 'AuthVerifier',
228
+ name: 'A',
229
+ constraint: 'Auth',
230
+ default: 'void',
299
231
  },
300
232
  ],
301
233
  })
302
234
  method.addParameter({
303
235
  name: 'cfg',
304
- type: `ConfigOf<AV, ${moduleName}.Handler<ExtractAuth<AV>>, ${moduleName}.HandlerReqCtx<ExtractAuth<AV>>>`,
236
+ type: isSubscription
237
+ ? `StreamConfigOrHandler<
238
+ A,
239
+ ${moduleName}.QueryParams,
240
+ ${moduleName}.HandlerOutput,
241
+ >`
242
+ : `MethodConfigOrHandler<
243
+ A,
244
+ ${moduleName}.QueryParams,
245
+ ${moduleName}.HandlerInput,
246
+ ${moduleName}.HandlerOutput,
247
+ >`,
305
248
  })
306
249
  const methodType = isSubscription ? 'streamMethod' : 'method'
307
250
  method.setBodyText(
@@ -322,12 +265,6 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
322
265
  async (file) => {
323
266
  const main = lexiconDoc.defs.main
324
267
  if (main?.type === 'query' || main?.type === 'procedure') {
325
- //= import express from 'express'
326
- file.addImportDeclaration({
327
- moduleSpecifier: 'express',
328
- defaultImport: 'express',
329
- })
330
-
331
268
  const streamingInput =
332
269
  main?.type === 'procedure' &&
333
270
  main.input?.encoding &&
@@ -378,10 +315,6 @@ function genServerXrpcMethod(
378
315
  ) {
379
316
  const def = lexicons.getDefOrThrow(lexUri, ['query', 'procedure'])
380
317
 
381
- file.addImportDeclaration({
382
- moduleSpecifier: '@atproto/xrpc-server',
383
- namedImports: [{ name: 'HandlerAuth' }, { name: 'HandlerPipeThrough' }],
384
- })
385
318
  //= export interface HandlerInput {...}
386
319
  if (def.type === 'procedure' && def.input?.encoding) {
387
320
  const handlerInput = file.addInterface({
@@ -396,23 +329,19 @@ function genServerXrpcMethod(
396
329
  .map((v) => `'${v.trim()}'`)
397
330
  .join(' | '),
398
331
  })
399
- if (def.input.schema) {
400
- if (def.input.encoding.includes(',')) {
401
- handlerInput.addProperty({
402
- name: 'body',
403
- type: 'InputSchema | stream.Readable',
404
- })
405
- } else {
406
- handlerInput.addProperty({ name: 'body', type: 'InputSchema' })
407
- }
408
- } else if (def.input.encoding) {
409
- handlerInput.addProperty({ name: 'body', type: 'stream.Readable' })
410
- }
332
+ handlerInput.addProperty({
333
+ name: 'body',
334
+ type: def.input.schema
335
+ ? def.input.encoding.includes(',')
336
+ ? 'InputSchema | stream.Readable'
337
+ : 'InputSchema'
338
+ : 'stream.Readable',
339
+ })
411
340
  } else {
412
341
  file.addTypeAlias({
413
342
  isExported: true,
414
343
  name: 'HandlerInput',
415
- type: 'undefined',
344
+ type: 'void',
416
345
  })
417
346
  }
418
347
 
@@ -475,34 +404,7 @@ function genServerXrpcMethod(
475
404
  file.addTypeAlias({
476
405
  isExported: true,
477
406
  name: 'HandlerOutput',
478
- type: `HandlerError | ${
479
- hasHandlerSuccess ? 'HandlerSuccess | HandlerPipeThrough' : 'void'
480
- }`,
481
- })
482
-
483
- file.addTypeAlias({
484
- name: 'HandlerReqCtx',
485
- isExported: true,
486
- typeParameters: [
487
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
488
- ],
489
- type: `{
490
- auth: HA
491
- params: QueryParams
492
- input: HandlerInput
493
- req: express.Request
494
- res: express.Response
495
- resetRouteRateLimits: () => Promise<void>
496
- }`,
497
- })
498
-
499
- file.addTypeAlias({
500
- name: 'Handler',
501
- isExported: true,
502
- typeParameters: [
503
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
504
- ],
505
- type: `(ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput`,
407
+ type: `HandlerError | ${hasHandlerSuccess ? 'HandlerSuccess' : 'void'}`,
506
408
  })
507
409
  }
508
410
 
@@ -515,7 +417,7 @@ function genServerXrpcStreaming(
515
417
 
516
418
  file.addImportDeclaration({
517
419
  moduleSpecifier: '@atproto/xrpc-server',
518
- namedImports: [{ name: 'HandlerAuth' }, { name: 'ErrorFrame' }],
420
+ namedImports: [{ name: 'ErrorFrame' }],
519
421
  })
520
422
 
521
423
  file.addImportDeclaration({
@@ -536,29 +438,6 @@ function genServerXrpcStreaming(
536
438
  name: 'HandlerOutput',
537
439
  type: `HandlerError | ${def.message?.schema ? 'OutputSchema' : 'void'}`,
538
440
  })
539
-
540
- file.addTypeAlias({
541
- name: 'HandlerReqCtx',
542
- isExported: true,
543
- typeParameters: [
544
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
545
- ],
546
- type: `{
547
- auth: HA
548
- params: QueryParams
549
- req: IncomingMessage
550
- signal: AbortSignal
551
- }`,
552
- })
553
-
554
- file.addTypeAlias({
555
- name: 'Handler',
556
- isExported: true,
557
- typeParameters: [
558
- { name: 'HA', constraint: 'HandlerAuth', default: 'never' },
559
- ],
560
- type: `(ctx: HandlerReqCtx<HA>) => AsyncIterable<HandlerOutput>`,
561
- })
562
441
  }
563
442
 
564
443
  function arrayToUnion(arr?: string[]) {