@atproto/lex-cli 0.9.0 → 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.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
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
|
+
|
|
3
9
|
## 0.9.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
|
@@ -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;
|
|
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
|
-
[
|
|
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 ${
|
|
238
|
+
.map((lex) => `\n ${(0, util_1.toTitleCase)(lex.id)}: ${JSON.stringify(lex.id)},`)
|
|
244
239
|
.join('')}\n} as const`,
|
|
245
240
|
},
|
|
246
241
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
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
|
-
[
|
|
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 ${
|
|
256
|
+
(lex) => `\n ${toTitleCase(lex.id)}: ${JSON.stringify(lex.id)},`,
|
|
263
257
|
)
|
|
264
258
|
.join('')}\n} as const`,
|
|
265
259
|
},
|