@aws/nx-plugin 0.12.0 → 0.13.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/LICENSE-THIRD-PARTY +28 -0
- package/package.json +1 -1
- package/src/open-api/ts-client/__snapshots__/generator.spec.ts.snap +24 -24
- package/src/open-api/ts-client/__snapshots__/generator.streaming.spec.ts.snap +6 -6
- package/src/open-api/ts-client/files/client.gen.ts.template +1 -1
- package/src/open-api/ts-hooks/generator.js +1 -1
- package/src/open-api/ts-hooks/generator.js.map +1 -1
- package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +22 -2
- package/src/py/fast-api/files/app/__name__/init.py.template +21 -2
- package/src/py/fast-api/react/__snapshots__/generator.spec.ts.snap +2 -9
- package/src/py/fast-api/react/files/fast-api/scripts/generate_open_api.py.template +1 -8
- package/src/py/fast-api/react/generator.js +2 -2
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/trpc/react/files/src/components/TrpcClients/TrpcProvider.tsx.template +1 -1
- package/src/ts/lib/__snapshots__/generator.spec.ts.snap +12 -36
- package/src/ts/lib/eslint.d.ts +1 -1
- package/src/ts/lib/eslint.js +2 -3
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +21 -10
- package/src/ts/lib/generator.js.map +1 -1
- package/src/utils/shared-constructs.js +2 -2
- package/src/utils/shared-constructs.js.map +1 -1
package/LICENSE-THIRD-PARTY
CHANGED
|
@@ -4410,6 +4410,34 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
|
4410
4410
|
|
|
4411
4411
|
---
|
|
4412
4412
|
|
|
4413
|
+
The following software may be included in this product: @nx/react (20.4.0)
|
|
4414
|
+
This software contains the following license and notice below:
|
|
4415
|
+
|
|
4416
|
+
(The MIT License)
|
|
4417
|
+
|
|
4418
|
+
Copyright (c) 2017-2025 Narwhal Technologies Inc.
|
|
4419
|
+
|
|
4420
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
|
4421
|
+
a copy of this software and associated documentation files (the
|
|
4422
|
+
'Software'), to deal in the Software without restriction, including
|
|
4423
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
|
4424
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
|
4425
|
+
permit persons to whom the Software is furnished to do so, subject to
|
|
4426
|
+
the following conditions:
|
|
4427
|
+
|
|
4428
|
+
The above copyright notice and this permission notice shall be
|
|
4429
|
+
included in all copies or substantial portions of the Software.
|
|
4430
|
+
|
|
4431
|
+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
4432
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
4433
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
4434
|
+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
4435
|
+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
4436
|
+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
4437
|
+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
4438
|
+
|
|
4439
|
+
---
|
|
4440
|
+
|
|
4413
4441
|
The following software may be included in this product: @nx/vite (20.4.0)
|
|
4414
4442
|
This software contains the following license and notice below:
|
|
4415
4443
|
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@ exports[`openApiTsClientGenerator > should allow duplicate operation ids discrim
|
|
|
10
10
|
"/**
|
|
11
11
|
* Utility for serialisation and deserialisation of API types.
|
|
12
12
|
*/
|
|
13
|
-
class $IO {
|
|
13
|
+
export class $IO {
|
|
14
14
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
15
15
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
16
16
|
}
|
|
@@ -189,7 +189,7 @@ exports[`openApiTsClientGenerator > should allow duplicate operation ids discrim
|
|
|
189
189
|
"/**
|
|
190
190
|
* Utility for serialisation and deserialisation of API types.
|
|
191
191
|
*/
|
|
192
|
-
class $IO {
|
|
192
|
+
export class $IO {
|
|
193
193
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
194
194
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
195
195
|
}
|
|
@@ -376,7 +376,7 @@ exports[`openApiTsClientGenerator > should generate valid TypeScript for arrays
|
|
|
376
376
|
/**
|
|
377
377
|
* Utility for serialisation and deserialisation of API types.
|
|
378
378
|
*/
|
|
379
|
-
class $IO {
|
|
379
|
+
export class $IO {
|
|
380
380
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
381
381
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
382
382
|
|
|
@@ -676,7 +676,7 @@ exports[`openApiTsClientGenerator > should generate valid TypeScript for composi
|
|
|
676
676
|
/**
|
|
677
677
|
* Utility for serialisation and deserialisation of API types.
|
|
678
678
|
*/
|
|
679
|
-
class $IO {
|
|
679
|
+
export class $IO {
|
|
680
680
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
681
681
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
682
682
|
|
|
@@ -1030,7 +1030,7 @@ exports[`openApiTsClientGenerator > should generate valid TypeScript for paramet
|
|
|
1030
1030
|
/**
|
|
1031
1031
|
* Utility for serialisation and deserialisation of API types.
|
|
1032
1032
|
*/
|
|
1033
|
-
class $IO {
|
|
1033
|
+
export class $IO {
|
|
1034
1034
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1035
1035
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1036
1036
|
|
|
@@ -1326,7 +1326,7 @@ exports[`openApiTsClientGenerator > should generate valid TypeScript for primiti
|
|
|
1326
1326
|
/**
|
|
1327
1327
|
* Utility for serialisation and deserialisation of API types.
|
|
1328
1328
|
*/
|
|
1329
|
-
class $IO {
|
|
1329
|
+
export class $IO {
|
|
1330
1330
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1331
1331
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1332
1332
|
|
|
@@ -1546,7 +1546,7 @@ exports[`openApiTsClientGenerator > should handle composite primitive and array
|
|
|
1546
1546
|
/**
|
|
1547
1547
|
* Utility for serialisation and deserialisation of API types.
|
|
1548
1548
|
*/
|
|
1549
|
-
class $IO {
|
|
1549
|
+
export class $IO {
|
|
1550
1550
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1551
1551
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1552
1552
|
|
|
@@ -1864,7 +1864,7 @@ exports[`openApiTsClientGenerator > should handle date and date-time formats 2`]
|
|
|
1864
1864
|
/**
|
|
1865
1865
|
* Utility for serialisation and deserialisation of API types.
|
|
1866
1866
|
*/
|
|
1867
|
-
class $IO {
|
|
1867
|
+
export class $IO {
|
|
1868
1868
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1869
1869
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1870
1870
|
|
|
@@ -2134,7 +2134,7 @@ exports[`openApiTsClientGenerator > should handle default responses 2`] = `
|
|
|
2134
2134
|
/**
|
|
2135
2135
|
* Utility for serialisation and deserialisation of API types.
|
|
2136
2136
|
*/
|
|
2137
|
-
class $IO {
|
|
2137
|
+
export class $IO {
|
|
2138
2138
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
2139
2139
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
2140
2140
|
|
|
@@ -2320,7 +2320,7 @@ exports[`openApiTsClientGenerator > should handle enum request and response bodi
|
|
|
2320
2320
|
/**
|
|
2321
2321
|
* Utility for serialisation and deserialisation of API types.
|
|
2322
2322
|
*/
|
|
2323
|
-
class $IO {
|
|
2323
|
+
export class $IO {
|
|
2324
2324
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
2325
2325
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
2326
2326
|
}
|
|
@@ -2510,7 +2510,7 @@ exports[`openApiTsClientGenerator > should handle inline primitives and composit
|
|
|
2510
2510
|
/**
|
|
2511
2511
|
* Utility for serialisation and deserialisation of API types.
|
|
2512
2512
|
*/
|
|
2513
|
-
class $IO {
|
|
2513
|
+
export class $IO {
|
|
2514
2514
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
2515
2515
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
2516
2516
|
|
|
@@ -3153,7 +3153,7 @@ exports[`openApiTsClientGenerator > should handle multiple response status codes
|
|
|
3153
3153
|
/**
|
|
3154
3154
|
* Utility for serialisation and deserialisation of API types.
|
|
3155
3155
|
*/
|
|
3156
|
-
class $IO {
|
|
3156
|
+
export class $IO {
|
|
3157
3157
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
3158
3158
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
3159
3159
|
|
|
@@ -3436,7 +3436,7 @@ exports[`openApiTsClientGenerator > should handle not schema type 2`] = `
|
|
|
3436
3436
|
/**
|
|
3437
3437
|
* Utility for serialisation and deserialisation of API types.
|
|
3438
3438
|
*/
|
|
3439
|
-
class $IO {
|
|
3439
|
+
export class $IO {
|
|
3440
3440
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
3441
3441
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
3442
3442
|
|
|
@@ -3747,7 +3747,7 @@ exports[`openApiTsClientGenerator > should handle nullable schemas in various co
|
|
|
3747
3747
|
/**
|
|
3748
3748
|
* Utility for serialisation and deserialisation of API types.
|
|
3749
3749
|
*/
|
|
3750
|
-
class $IO {
|
|
3750
|
+
export class $IO {
|
|
3751
3751
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
3752
3752
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
3753
3753
|
|
|
@@ -4587,7 +4587,7 @@ exports[`openApiTsClientGenerator > should handle number and string constraints
|
|
|
4587
4587
|
/**
|
|
4588
4588
|
* Utility for serialisation and deserialisation of API types.
|
|
4589
4589
|
*/
|
|
4590
|
-
class $IO {
|
|
4590
|
+
export class $IO {
|
|
4591
4591
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
4592
4592
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
4593
4593
|
|
|
@@ -4822,7 +4822,7 @@ exports[`openApiTsClientGenerator > should handle only default response 2`] = `
|
|
|
4822
4822
|
/**
|
|
4823
4823
|
* Utility for serialisation and deserialisation of API types.
|
|
4824
4824
|
*/
|
|
4825
|
-
class $IO {
|
|
4825
|
+
export class $IO {
|
|
4826
4826
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
4827
4827
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
4828
4828
|
|
|
@@ -4968,7 +4968,7 @@ exports[`openApiTsClientGenerator > should handle operation tags and multiple se
|
|
|
4968
4968
|
"/**
|
|
4969
4969
|
* Utility for serialisation and deserialisation of API types.
|
|
4970
4970
|
*/
|
|
4971
|
-
class $IO {
|
|
4971
|
+
export class $IO {
|
|
4972
4972
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
4973
4973
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
4974
4974
|
}
|
|
@@ -5263,7 +5263,7 @@ exports[`openApiTsClientGenerator > should handle operations with complex map ty
|
|
|
5263
5263
|
/**
|
|
5264
5264
|
* Utility for serialisation and deserialisation of API types.
|
|
5265
5265
|
*/
|
|
5266
|
-
class $IO {
|
|
5266
|
+
export class $IO {
|
|
5267
5267
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
5268
5268
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
5269
5269
|
|
|
@@ -5785,7 +5785,7 @@ exports[`openApiTsClientGenerator > should handle operations with multiple tags
|
|
|
5785
5785
|
"/**
|
|
5786
5786
|
* Utility for serialisation and deserialisation of API types.
|
|
5787
5787
|
*/
|
|
5788
|
-
class $IO {
|
|
5788
|
+
export class $IO {
|
|
5789
5789
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
5790
5790
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
5791
5791
|
}
|
|
@@ -6014,7 +6014,7 @@ exports[`openApiTsClientGenerator > should handle operations with simple request
|
|
|
6014
6014
|
/**
|
|
6015
6015
|
* Utility for serialisation and deserialisation of API types.
|
|
6016
6016
|
*/
|
|
6017
|
-
class $IO {
|
|
6017
|
+
export class $IO {
|
|
6018
6018
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
6019
6019
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
6020
6020
|
|
|
@@ -6481,7 +6481,7 @@ exports[`openApiTsClientGenerator > should handle recursive schema references 2`
|
|
|
6481
6481
|
/**
|
|
6482
6482
|
* Utility for serialisation and deserialisation of API types.
|
|
6483
6483
|
*/
|
|
6484
|
-
class $IO {
|
|
6484
|
+
export class $IO {
|
|
6485
6485
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
6486
6486
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
6487
6487
|
|
|
@@ -6709,7 +6709,7 @@ exports[`openApiTsClientGenerator > should handle refs and hoisting of inline sc
|
|
|
6709
6709
|
/**
|
|
6710
6710
|
* Utility for serialisation and deserialisation of API types.
|
|
6711
6711
|
*/
|
|
6712
|
-
class $IO {
|
|
6712
|
+
export class $IO {
|
|
6713
6713
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
6714
6714
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
6715
6715
|
|
|
@@ -7017,7 +7017,7 @@ exports[`openApiTsClientGenerator > should handle request body property matching
|
|
|
7017
7017
|
/**
|
|
7018
7018
|
* Utility for serialisation and deserialisation of API types.
|
|
7019
7019
|
*/
|
|
7020
|
-
class $IO {
|
|
7020
|
+
export class $IO {
|
|
7021
7021
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
7022
7022
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
7023
7023
|
|
|
@@ -7317,7 +7317,7 @@ exports[`openApiTsClientGenerator > should handle special formats and vendor ext
|
|
|
7317
7317
|
/**
|
|
7318
7318
|
* Utility for serialisation and deserialisation of API types.
|
|
7319
7319
|
*/
|
|
7320
|
-
class $IO {
|
|
7320
|
+
export class $IO {
|
|
7321
7321
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
7322
7322
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
7323
7323
|
|
|
@@ -30,7 +30,7 @@ exports[`openApiTsClientGenerator - streaming > should handle error responses fo
|
|
|
30
30
|
/**
|
|
31
31
|
* Utility for serialisation and deserialisation of API types.
|
|
32
32
|
*/
|
|
33
|
-
class $IO {
|
|
33
|
+
export class $IO {
|
|
34
34
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
35
35
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
36
36
|
|
|
@@ -247,7 +247,7 @@ exports[`openApiTsClientGenerator - streaming > should return an iterator over a
|
|
|
247
247
|
/**
|
|
248
248
|
* Utility for serialisation and deserialisation of API types.
|
|
249
249
|
*/
|
|
250
|
-
class $IO {
|
|
250
|
+
export class $IO {
|
|
251
251
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
252
252
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
253
253
|
|
|
@@ -599,7 +599,7 @@ exports[`openApiTsClientGenerator - streaming > should return an iterator over a
|
|
|
599
599
|
/**
|
|
600
600
|
* Utility for serialisation and deserialisation of API types.
|
|
601
601
|
*/
|
|
602
|
-
class $IO {
|
|
602
|
+
export class $IO {
|
|
603
603
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
604
604
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
605
605
|
|
|
@@ -1186,7 +1186,7 @@ exports[`openApiTsClientGenerator - streaming > should return an iterator over a
|
|
|
1186
1186
|
"/**
|
|
1187
1187
|
* Utility for serialisation and deserialisation of API types.
|
|
1188
1188
|
*/
|
|
1189
|
-
class $IO {
|
|
1189
|
+
export class $IO {
|
|
1190
1190
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1191
1191
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1192
1192
|
}
|
|
@@ -1391,7 +1391,7 @@ exports[`openApiTsClientGenerator - streaming > should return an iterator over a
|
|
|
1391
1391
|
/**
|
|
1392
1392
|
* Utility for serialisation and deserialisation of API types.
|
|
1393
1393
|
*/
|
|
1394
|
-
class $IO {
|
|
1394
|
+
export class $IO {
|
|
1395
1395
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1396
1396
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1397
1397
|
|
|
@@ -1553,7 +1553,7 @@ exports[`openApiTsClientGenerator - streaming > should return an iterator over a
|
|
|
1553
1553
|
"/**
|
|
1554
1554
|
* Utility for serialisation and deserialisation of API types.
|
|
1555
1555
|
*/
|
|
1556
|
-
class $IO {
|
|
1556
|
+
export class $IO {
|
|
1557
1557
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
1558
1558
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
1559
1559
|
}
|
|
@@ -152,7 +152,7 @@ _%>
|
|
|
152
152
|
/**
|
|
153
153
|
* Utility for serialisation and deserialisation of API types.
|
|
154
154
|
*/
|
|
155
|
-
class $IO {
|
|
155
|
+
export class $IO {
|
|
156
156
|
protected static $mapValues = (data: any, fn: (item: any) => any) =>
|
|
157
157
|
Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
|
|
158
158
|
<%_ models.filter(m => m.export !== 'enum').forEach((model) => { _%>
|
|
@@ -14,7 +14,7 @@ const openApiTsHooksGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
14
14
|
const data = yield (0, codegen_data_1.buildOpenApiCodeGenData)(spec);
|
|
15
15
|
(0, generator_1.generateOpenApiTsClient)(tree, data, options.outputPath);
|
|
16
16
|
// TODO: generate hooks which wrap the client
|
|
17
|
-
(0, format_1.formatFilesInSubtree)(tree);
|
|
17
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
18
18
|
});
|
|
19
19
|
exports.openApiTsHooksGenerator = openApiTsHooksGenerator;
|
|
20
20
|
exports.default = exports.openApiTsHooksGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/open-api/ts-hooks/generator.ts"],"names":[],"mappings":";;;;AAMA,0CAAkD;AAClD,wDAAgE;AAChE,sDAAiE;AACjE,+CAA0D;AAE1D;;GAEG;AACI,MAAM,uBAAuB,GAAG,CACrC,IAAU,EACV,OAA2B,EAC3B,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnE,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAuB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAA,mCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAExD,6CAA6C;IAE7C,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/open-api/ts-hooks/generator.ts"],"names":[],"mappings":";;;;AAMA,0CAAkD;AAClD,wDAAgE;AAChE,sDAAiE;AACjE,+CAA0D;AAE1D;;GAEG;AACI,MAAM,uBAAuB,GAAG,CACrC,IAAU,EACV,OAA2B,EAC3B,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAEnE,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAuB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAA,mCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAExD,6CAA6C;IAE7C,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAA,CAAC;AAbW,QAAA,uBAAuB,2BAalC;AAEF,kBAAe,+BAAuB,CAAC"}
|
|
@@ -11,6 +11,7 @@ from collections.abc import Callable
|
|
|
11
11
|
from aws_lambda_powertools import Logger, Metrics, Tracer
|
|
12
12
|
from aws_lambda_powertools.metrics import MetricUnit
|
|
13
13
|
from fastapi import FastAPI, Request, Response
|
|
14
|
+
from fastapi.openapi.utils import get_openapi
|
|
14
15
|
from fastapi.responses import JSONResponse
|
|
15
16
|
from fastapi.routing import APIRoute
|
|
16
17
|
from mangum import Mangum
|
|
@@ -53,7 +54,7 @@ async def metrics_handler(request: Request, call_next):
|
|
|
53
54
|
metrics.add_metric(name="RequestCount", unit=MetricUnit.Count, value=1)
|
|
54
55
|
|
|
55
56
|
response = await call_next(request)
|
|
56
|
-
|
|
57
|
+
|
|
57
58
|
if response.status_code == 200:
|
|
58
59
|
metrics.add_metric(name="Success", unit=MetricUnit.Count, value=1)
|
|
59
60
|
|
|
@@ -98,7 +99,26 @@ class LoggerRouteHandler(APIRoute):
|
|
|
98
99
|
|
|
99
100
|
return route_handler
|
|
100
101
|
|
|
101
|
-
app.router.route_class = LoggerRouteHandler
|
|
102
|
+
app.router.route_class = LoggerRouteHandler
|
|
103
|
+
|
|
104
|
+
def custom_openapi():
|
|
105
|
+
if app.openapi_schema:
|
|
106
|
+
return app.openapi_schema
|
|
107
|
+
for route in app.routes:
|
|
108
|
+
if isinstance(route, APIRoute):
|
|
109
|
+
route.operation_id = route.name
|
|
110
|
+
openapi_schema = get_openapi(
|
|
111
|
+
title=app.title,
|
|
112
|
+
version=app.version,
|
|
113
|
+
openapi_version=app.openapi_version,
|
|
114
|
+
description=app.description,
|
|
115
|
+
routes=app.routes,
|
|
116
|
+
)
|
|
117
|
+
app.openapi_schema = openapi_schema
|
|
118
|
+
return app.openapi_schema
|
|
119
|
+
|
|
120
|
+
app.openapi = custom_openapi
|
|
121
|
+
",
|
|
102
122
|
"apps/test_api/test_api/main.py": "from .init import app, lambda_handler, tracer
|
|
103
123
|
|
|
104
124
|
handler = lambda_handler
|
|
@@ -5,6 +5,7 @@ from collections.abc import Callable
|
|
|
5
5
|
from aws_lambda_powertools import Logger, Metrics, Tracer
|
|
6
6
|
from aws_lambda_powertools.metrics import MetricUnit
|
|
7
7
|
from fastapi import FastAPI, Request, Response
|
|
8
|
+
from fastapi.openapi.utils import get_openapi
|
|
8
9
|
from fastapi.responses import JSONResponse
|
|
9
10
|
from fastapi.routing import APIRoute
|
|
10
11
|
from mangum import Mangum
|
|
@@ -47,7 +48,7 @@ async def metrics_handler(request: Request, call_next):
|
|
|
47
48
|
metrics.add_metric(name="RequestCount", unit=MetricUnit.Count, value=1)
|
|
48
49
|
|
|
49
50
|
response = await call_next(request)
|
|
50
|
-
|
|
51
|
+
|
|
51
52
|
if response.status_code == 200:
|
|
52
53
|
metrics.add_metric(name="Success", unit=MetricUnit.Count, value=1)
|
|
53
54
|
|
|
@@ -92,4 +93,22 @@ class LoggerRouteHandler(APIRoute):
|
|
|
92
93
|
|
|
93
94
|
return route_handler
|
|
94
95
|
|
|
95
|
-
app.router.route_class = LoggerRouteHandler
|
|
96
|
+
app.router.route_class = LoggerRouteHandler
|
|
97
|
+
|
|
98
|
+
def custom_openapi():
|
|
99
|
+
if app.openapi_schema:
|
|
100
|
+
return app.openapi_schema
|
|
101
|
+
for route in app.routes:
|
|
102
|
+
if isinstance(route, APIRoute):
|
|
103
|
+
route.operation_id = route.name
|
|
104
|
+
openapi_schema = get_openapi(
|
|
105
|
+
title=app.title,
|
|
106
|
+
version=app.version,
|
|
107
|
+
openapi_version=app.openapi_version,
|
|
108
|
+
description=app.description,
|
|
109
|
+
routes=app.routes,
|
|
110
|
+
)
|
|
111
|
+
app.openapi_schema = openapi_schema
|
|
112
|
+
return app.openapi_schema
|
|
113
|
+
|
|
114
|
+
app.openapi = custom_openapi
|
|
@@ -1,19 +1,12 @@
|
|
|
1
1
|
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
2
2
|
|
|
3
3
|
exports[`fastapi react generator > should generate OpenAPI spec script > generate_open_api.py 1`] = `
|
|
4
|
-
"from
|
|
5
|
-
from src.main import app
|
|
4
|
+
"from src.main import app
|
|
6
5
|
import json, os, sys
|
|
7
6
|
|
|
8
7
|
os.makedirs(os.path.dirname(sys.argv[1]), exist_ok=True)
|
|
9
8
|
with open(sys.argv[1], 'w') as f:
|
|
10
|
-
json.dump(
|
|
11
|
-
title=app.title,
|
|
12
|
-
version=app.version,
|
|
13
|
-
openapi_version=app.openapi_version,
|
|
14
|
-
description=app.description,
|
|
15
|
-
routes=app.routes,
|
|
16
|
-
), f)
|
|
9
|
+
json.dump(app.openapi(), f)
|
|
17
10
|
"
|
|
18
11
|
`;
|
|
19
12
|
|
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
from fastapi.openapi.utils import get_openapi
|
|
2
1
|
from <%= moduleName %>.main import app
|
|
3
2
|
import json, os, sys
|
|
4
3
|
|
|
5
4
|
os.makedirs(os.path.dirname(sys.argv[1]), exist_ok=True)
|
|
6
5
|
with open(sys.argv[1], 'w') as f:
|
|
7
|
-
json.dump(
|
|
8
|
-
title=app.title,
|
|
9
|
-
version=app.version,
|
|
10
|
-
openapi_version=app.openapi_version,
|
|
11
|
-
description=app.description,
|
|
12
|
-
routes=app.routes,
|
|
13
|
-
), f)
|
|
6
|
+
json.dump(app.openapi(), f)
|
|
@@ -48,8 +48,8 @@ const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
|
|
|
48
48
|
// Add TypeScript client generation to Frontend project.json
|
|
49
49
|
(0, devkit_1.updateProjectConfiguration)(tree, options.frontendProjectName, Object.assign(Object.assign({}, frontendProjectConfig), { targets: (0, nx_1.sortObjectKeys)(Object.assign(Object.assign({}, frontendProjectConfig.targets), {
|
|
50
50
|
// Generate should run before compile as the client is created as part of the website src
|
|
51
|
-
compile: Object.assign(Object.assign({}, (_f = frontendProjectConfig.targets) === null || _f === void 0 ? void 0 : _f.
|
|
52
|
-
...((_j = (_h = (_g = frontendProjectConfig.targets) === null || _g === void 0 ? void 0 : _g.
|
|
51
|
+
compile: Object.assign(Object.assign({}, (_f = frontendProjectConfig.targets) === null || _f === void 0 ? void 0 : _f.compile), { dependsOn: [
|
|
52
|
+
...((_j = (_h = (_g = frontendProjectConfig.targets) === null || _g === void 0 ? void 0 : _g.compile) === null || _h === void 0 ? void 0 : _h.dependsOn) !== null && _j !== void 0 ? _j : []).filter((t) => t !== clientGenTarget),
|
|
53
53
|
clientGenTarget,
|
|
54
54
|
] }), [clientGenTarget]: {
|
|
55
55
|
cache: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,oFAA8F;AAC9F,gFAAyC;AACzC,mDAA6B;AAC7B,gFAAyC;AACzC,0CAAmD;AACnD,gDAAmD;AACnD,kDAA6D;AAC7D,sDAAuD;AACvD,4CAAqD;AAE9C,MAAM,qBAAqB,GAAG,CACnC,IAAU,EACV,OAAoC,EACpC,EAAE;;IACF,MAAM,qBAAqB,GAAG,IAAA,iCAAwB,EACpD,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACF,MAAM,UAAU,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;IAE9D,oFAAoF;IACpF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,oBAAoB,CAAC,IAAI,EACzB;QACE,UAAU;KACX,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,MAAM,EACN,oBAAoB,CAAC,IAAI,EACzB,SAAS,CACV,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,kCACtD,oBAAoB,KACvB,OAAO,EAAE,IAAA,mBAAc,kCAClB,oBAAoB,CAAC,OAAO,KAC/B,KAAK,kCACA,MAAA,oBAAoB,CAAC,OAAO,0CAAE,KAAK,KACtC,SAAS,EAAE;oBACT,GAAG,CAAC,MAAA,MAAA,MAAA,oBAAoB,CAAC,OAAO,0CAAE,KAAK,0CAAE,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV,KAEH,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;gBACnE,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,iBAAiB,IAAA,0BAAiB,EAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,sBAAsB,CAAC,KAAK,QAAQ,GAAG;qBACjH;iBACF;aACF,IACD,IACF,CAAC;IAEH,MAAM,OAAO,GAAG,MAAC,oBAAoB,CAAC,QAAgB,0CAAE,OAAO,CAAC;IAChE,MAAM,eAAe,GAAG,YAAY,IAAA,0BAAS,EAAC,OAAO,CAAC,SAAS,CAAC;IAEhE,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,IAAA,0BAAS,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9E,MAAM,0BAA0B,GAAG,IAAA,0BAAiB,EAClD,qBAAqB,CAAC,UAAU,EAChC,kBAAkB,CACnB,CAAC;IAEF,4DAA4D;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,mBAAmB,kCACvD,qBAAqB,KACxB,OAAO,EAAE,IAAA,mBAAc,kCAClB,qBAAqB,CAAC,OAAO;YAChC,yFAAyF;YACzF,OAAO,kCACF,MAAA,qBAAqB,CAAC,OAAO,0CAAE,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
exports[`ts lib generator > should generate library with custom directory > custom-dir-index.ts 1`] = `
|
|
4
4
|
"export function hello() {
|
|
5
|
-
return
|
|
5
|
+
return 'Hello!';
|
|
6
6
|
}
|
|
7
7
|
"
|
|
8
8
|
`;
|
|
@@ -16,17 +16,11 @@ exports[`ts lib generator > should generate library with custom directory > cust
|
|
|
16
16
|
"tags": [],
|
|
17
17
|
"targets": {
|
|
18
18
|
"build": {
|
|
19
|
-
"dependsOn": [
|
|
20
|
-
"lint",
|
|
21
|
-
"compile",
|
|
22
|
-
"test"
|
|
23
|
-
]
|
|
19
|
+
"dependsOn": ["lint", "compile", "test"]
|
|
24
20
|
},
|
|
25
21
|
"compile": {
|
|
26
22
|
"executor": "nx:run-commands",
|
|
27
|
-
"outputs": [
|
|
28
|
-
"{workspaceRoot}/dist/libs/test-lib/tsc"
|
|
29
|
-
],
|
|
23
|
+
"outputs": ["{workspaceRoot}/dist/libs/test-lib/tsc"],
|
|
30
24
|
"options": {
|
|
31
25
|
"command": "tsc --build tsconfig.lib.json",
|
|
32
26
|
"cwd": "{projectRoot}"
|
|
@@ -34,9 +28,7 @@ exports[`ts lib generator > should generate library with custom directory > cust
|
|
|
34
28
|
},
|
|
35
29
|
"test": {
|
|
36
30
|
"executor": "@nx/vite:test",
|
|
37
|
-
"outputs": [
|
|
38
|
-
"{options.reportsDirectory}"
|
|
39
|
-
],
|
|
31
|
+
"outputs": ["{options.reportsDirectory}"],
|
|
40
32
|
"options": {
|
|
41
33
|
"reportsDirectory": "../../coverage/libs/test-lib"
|
|
42
34
|
}
|
|
@@ -66,7 +58,7 @@ exports[`ts lib generator > should generate library with custom directory > cust
|
|
|
66
58
|
|
|
67
59
|
exports[`ts lib generator > should generate library with default options > index.ts 1`] = `
|
|
68
60
|
"export function hello() {
|
|
69
|
-
return
|
|
61
|
+
return 'Hello!';
|
|
70
62
|
}
|
|
71
63
|
"
|
|
72
64
|
`;
|
|
@@ -80,17 +72,11 @@ exports[`ts lib generator > should generate library with default options > proje
|
|
|
80
72
|
"tags": [],
|
|
81
73
|
"targets": {
|
|
82
74
|
"build": {
|
|
83
|
-
"dependsOn": [
|
|
84
|
-
"lint",
|
|
85
|
-
"compile",
|
|
86
|
-
"test"
|
|
87
|
-
]
|
|
75
|
+
"dependsOn": ["lint", "compile", "test"]
|
|
88
76
|
},
|
|
89
77
|
"compile": {
|
|
90
78
|
"executor": "nx:run-commands",
|
|
91
|
-
"outputs": [
|
|
92
|
-
"{workspaceRoot}/dist/test-lib/tsc"
|
|
93
|
-
],
|
|
79
|
+
"outputs": ["{workspaceRoot}/dist/test-lib/tsc"],
|
|
94
80
|
"options": {
|
|
95
81
|
"command": "tsc --build tsconfig.lib.json",
|
|
96
82
|
"cwd": "{projectRoot}"
|
|
@@ -98,9 +84,7 @@ exports[`ts lib generator > should generate library with default options > proje
|
|
|
98
84
|
},
|
|
99
85
|
"test": {
|
|
100
86
|
"executor": "@nx/vite:test",
|
|
101
|
-
"outputs": [
|
|
102
|
-
"{options.reportsDirectory}"
|
|
103
|
-
],
|
|
87
|
+
"outputs": ["{options.reportsDirectory}"],
|
|
104
88
|
"options": {
|
|
105
89
|
"reportsDirectory": "../coverage/test-lib"
|
|
106
90
|
}
|
|
@@ -130,7 +114,7 @@ exports[`ts lib generator > should generate library with default options > tscon
|
|
|
130
114
|
|
|
131
115
|
exports[`ts lib generator > should generate library with subdirectory > subdir-index.ts 1`] = `
|
|
132
116
|
"export function hello() {
|
|
133
|
-
return
|
|
117
|
+
return 'Hello!';
|
|
134
118
|
}
|
|
135
119
|
"
|
|
136
120
|
`;
|
|
@@ -144,17 +128,11 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
|
|
|
144
128
|
"tags": [],
|
|
145
129
|
"targets": {
|
|
146
130
|
"build": {
|
|
147
|
-
"dependsOn": [
|
|
148
|
-
"lint",
|
|
149
|
-
"compile",
|
|
150
|
-
"test"
|
|
151
|
-
]
|
|
131
|
+
"dependsOn": ["lint", "compile", "test"]
|
|
152
132
|
},
|
|
153
133
|
"compile": {
|
|
154
134
|
"executor": "nx:run-commands",
|
|
155
|
-
"outputs": [
|
|
156
|
-
"{workspaceRoot}/dist/feature/test-lib/tsc"
|
|
157
|
-
],
|
|
135
|
+
"outputs": ["{workspaceRoot}/dist/feature/test-lib/tsc"],
|
|
158
136
|
"options": {
|
|
159
137
|
"command": "tsc --build tsconfig.lib.json",
|
|
160
138
|
"cwd": "{projectRoot}"
|
|
@@ -162,9 +140,7 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
|
|
|
162
140
|
},
|
|
163
141
|
"test": {
|
|
164
142
|
"executor": "@nx/vite:test",
|
|
165
|
-
"outputs": [
|
|
166
|
-
"{options.reportsDirectory}"
|
|
167
|
-
],
|
|
143
|
+
"outputs": ["{options.reportsDirectory}"],
|
|
168
144
|
"options": {
|
|
169
145
|
"reportsDirectory": "../../coverage/feature/test-lib"
|
|
170
146
|
}
|
package/src/ts/lib/eslint.d.ts
CHANGED
package/src/ts/lib/eslint.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureEslint = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
/**
|
|
6
5
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
6
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -11,7 +10,7 @@ const versions_1 = require("../../utils/versions");
|
|
|
11
10
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
12
11
|
const typescript_1 = require("typescript");
|
|
13
12
|
const ast_1 = require("../../utils/ast");
|
|
14
|
-
const configureEslint = (tree) =>
|
|
13
|
+
const configureEslint = (tree) => {
|
|
15
14
|
var _a, _b, _c, _d;
|
|
16
15
|
// Configure the lint task
|
|
17
16
|
let nxJson = (0, devkit_1.readNxJson)(tree);
|
|
@@ -93,6 +92,6 @@ const configureEslint = (tree) => tslib_1.__awaiter(void 0, void 0, void 0, func
|
|
|
93
92
|
'{projectRoot}/eslint.config.mjs',
|
|
94
93
|
] }) }) }));
|
|
95
94
|
}
|
|
96
|
-
}
|
|
95
|
+
};
|
|
97
96
|
exports.configureEslint = configureEslint;
|
|
98
97
|
//# sourceMappingURL=eslint.js.map
|
package/src/ts/lib/eslint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":"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"}
|
package/src/ts/lib/generator.js
CHANGED
|
@@ -68,18 +68,29 @@ const tsLibGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void
|
|
|
68
68
|
projectConfiguration.targets = (0, nx_1.sortObjectKeys)(targets);
|
|
69
69
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
70
70
|
(0, devkit_1.updateJson)(tree, 'nx.json', (nxJson) => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
71
|
+
var _a;
|
|
72
|
+
nxJson.targetDefaults = Object.assign(Object.assign({}, nxJson.targetDefaults), { compile: Object.assign({ cache: true }, (_a = nxJson.targetDefaults) === null || _a === void 0 ? void 0 : _a.compile) });
|
|
73
|
+
// Ensure we only declare a single typescript plugin with the correct settings
|
|
74
|
+
nxJson.plugins = [
|
|
75
|
+
{
|
|
76
|
+
plugin: '@nx/js/typescript',
|
|
77
|
+
options: {
|
|
78
|
+
typecheck: {
|
|
79
|
+
targetName: 'typecheck',
|
|
80
|
+
},
|
|
81
|
+
build: {
|
|
82
|
+
targetName: 'compile',
|
|
83
|
+
configName: 'tsconfig.lib.json',
|
|
84
|
+
buildDepsName: 'build-deps',
|
|
85
|
+
watchDepsName: 'watch-deps',
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
...nxJson.plugins.filter((p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript'),
|
|
90
|
+
];
|
|
80
91
|
return nxJson;
|
|
81
92
|
});
|
|
82
|
-
(0, format_1.formatFilesInSubtree)(tree);
|
|
93
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
83
94
|
return () => {
|
|
84
95
|
if (!schema.skipInstall) {
|
|
85
96
|
(0, devkit_1.installPackagesTask)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ function sharedConstructsGenerator(tree) {
|
|
|
40
40
|
}, {
|
|
41
41
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
42
42
|
});
|
|
43
|
-
(0, format_1.formatFilesInSubtree)(tree);
|
|
43
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
44
44
|
}
|
|
45
45
|
if (!tree.exists((0, devkit_1.joinPathFragments)(exports.PACKAGES_DIR, exports.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
|
|
46
46
|
yield (0, generator_1.default)(tree, {
|
|
@@ -63,7 +63,7 @@ function sharedConstructsGenerator(tree) {
|
|
|
63
63
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
64
64
|
});
|
|
65
65
|
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@types/node']));
|
|
66
|
-
(0, format_1.formatFilesInSubtree)(tree);
|
|
66
|
+
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
67
67
|
}
|
|
68
68
|
});
|
|
69
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":";;;AAqBA,8DAmFC;;AAxGD;;;GAGG;AACH,uCAOoB;AACpB,2CAA8D;AAC9D,4EAAiD;AACjD,yCAA0C;AAC1C,qCAAgD;AACnC,QAAA,YAAY,GAAG,UAAU,CAAC;AAC1B,QAAA,qBAAqB,GAAG,cAAc,CAAC;AACvC,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAC7C,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,qBAAqB,GAAG,mBAAmB,CAAC;AACzD,SAAsB,yBAAyB,CAAC,IAAU;;QACxD,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,IACE,CAAC,IAAI,CAAC,MAAM,CACV,IAAA,0BAAiB,EAAC,oBAAY,EAAE,4BAAoB,EAAE,cAAc,CAAC,CACtE,EACD,CAAC;YACD,MAAM,IAAA,mBAAc,EAAC,IAAI,EAAE;gBACzB,IAAI,EAAE,6BAAqB;gBAC3B,SAAS,EAAE,oBAAY;gBACvB,YAAY,EAAE,4BAAoB;aACnC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,oBAAY,EAAE,4BAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1E,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,4BAAoB,EAAE,KAAK,CAAC,EAClE,IAAA,0BAAiB,EAAC,oBAAY,EAAE,4BAAoB,EAAE,KAAK,CAAC,EAC5D;gBACE,cAAc;aACf,EACD;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;aAClD,CACF,CAAC;YACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,IAAA,0BAAiB,EAAC,oBAAY,EAAE,4BAAoB,CAAC,EACrD;gBACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,6BAAqB,EAAE;gBAC/D,IAAI,EAAE,6BAAqB;gBAC3B,SAAS,EAAE,IAAA,iCAAwB,GAAE,CAAC,IAAI;aAC3C,EACD;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;aAC/C,CACF,CAAC;YACF,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
|