@atproto/lex-cli 0.4.0 → 0.4.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 +6 -0
- package/dist/codegen/common.js +13 -13
- package/dist/codegen/common.js.map +1 -1
- package/package.json +3 -2
- package/src/codegen/common.ts +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @atproto/lex-cli
|
|
2
2
|
|
|
3
|
+
## 0.4.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2691](https://github.com/bluesky-social/atproto/pull/2691) [`08ef309c9`](https://github.com/bluesky-social/atproto/commit/08ef309c9c1f35f0e7093cb845321e876133d23e) Thanks [@dholms](https://github.com/dholms)! - Fix use of prettier.format for codegen
|
|
8
|
+
|
|
3
9
|
## 0.4.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
package/dist/codegen/common.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.gen = exports.lexiconsTs = exports.utilTs = void 0;
|
|
|
7
7
|
const ts_morph_1 = require("ts-morph");
|
|
8
8
|
const prettier_1 = __importDefault(require("prettier"));
|
|
9
9
|
const PRETTIER_OPTS = {
|
|
10
|
-
parser: '
|
|
10
|
+
parser: 'typescript',
|
|
11
11
|
tabWidth: 2,
|
|
12
12
|
semi: false,
|
|
13
13
|
singleQuote: true,
|
|
@@ -15,17 +15,17 @@ const PRETTIER_OPTS = {
|
|
|
15
15
|
};
|
|
16
16
|
const utilTs = (project) => gen(project, '/util.ts', async (file) => {
|
|
17
17
|
file.replaceWithText(`
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
18
|
+
export function isObj(v: unknown): v is Record<string, unknown> {
|
|
19
|
+
return typeof v === 'object' && v !== null
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export function hasProp<K extends PropertyKey>(
|
|
23
|
+
data: object,
|
|
24
|
+
prop: K,
|
|
25
|
+
): data is Record<K, unknown> {
|
|
26
|
+
return prop in data
|
|
27
|
+
}
|
|
28
|
+
`);
|
|
29
29
|
});
|
|
30
30
|
exports.utilTs = utilTs;
|
|
31
31
|
const lexiconsTs = (project, lexicons) => gen(project, '/lexicons.ts', async (file) => {
|
|
@@ -104,7 +104,7 @@ async function gen(project, path, gen) {
|
|
|
104
104
|
const src = project.getFileSystem().readFileSync(path);
|
|
105
105
|
return {
|
|
106
106
|
path: path,
|
|
107
|
-
content: `${banner()}${prettier_1.default.format(src, PRETTIER_OPTS)}`,
|
|
107
|
+
content: `${banner()}${await prettier_1.default.format(src, PRETTIER_OPTS)}`,
|
|
108
108
|
};
|
|
109
109
|
}
|
|
110
110
|
exports.gen = gen;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuE;AAEvE,wDAA+B;AAG/B,MAAM,aAAa,GAAG;IACpB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/codegen/common.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.4.
|
|
3
|
+
"version": "0.4.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "TypeScript codegen tool for atproto Lexicon schemas",
|
|
6
6
|
"keywords": [
|
|
@@ -21,9 +21,10 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"chalk": "^4.1.2",
|
|
23
23
|
"commander": "^9.4.0",
|
|
24
|
+
"prettier": "^3.2.5",
|
|
24
25
|
"ts-morph": "^16.0.0",
|
|
25
26
|
"yesno": "^0.4.0",
|
|
26
|
-
"zod": "^3.
|
|
27
|
+
"zod": "^3.23.8",
|
|
27
28
|
"@atproto/lexicon": "^0.4.0",
|
|
28
29
|
"@atproto/syntax": "^0.3.0"
|
|
29
30
|
},
|
package/src/codegen/common.ts
CHANGED
|
@@ -4,7 +4,7 @@ import prettier from 'prettier'
|
|
|
4
4
|
import { GeneratedFile } from '../types'
|
|
5
5
|
|
|
6
6
|
const PRETTIER_OPTS = {
|
|
7
|
-
parser: '
|
|
7
|
+
parser: 'typescript',
|
|
8
8
|
tabWidth: 2,
|
|
9
9
|
semi: false,
|
|
10
10
|
singleQuote: true,
|
|
@@ -14,17 +14,17 @@ const PRETTIER_OPTS = {
|
|
|
14
14
|
export const utilTs = (project) =>
|
|
15
15
|
gen(project, '/util.ts', async (file) => {
|
|
16
16
|
file.replaceWithText(`
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
17
|
+
export function isObj(v: unknown): v is Record<string, unknown> {
|
|
18
|
+
return typeof v === 'object' && v !== null
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function hasProp<K extends PropertyKey>(
|
|
22
|
+
data: object,
|
|
23
|
+
prop: K,
|
|
24
|
+
): data is Record<K, unknown> {
|
|
25
|
+
return prop in data
|
|
26
|
+
}
|
|
27
|
+
`)
|
|
28
28
|
})
|
|
29
29
|
|
|
30
30
|
export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
|
|
@@ -122,7 +122,7 @@ export async function gen(
|
|
|
122
122
|
const src = project.getFileSystem().readFileSync(path)
|
|
123
123
|
return {
|
|
124
124
|
path: path,
|
|
125
|
-
content: `${banner()}${prettier.format(src, PRETTIER_OPTS)}`,
|
|
125
|
+
content: `${banner()}${await prettier.format(src, PRETTIER_OPTS)}`,
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
128
|
|