@aws/nx-plugin 0.28.3 → 0.29.0
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/package.json +1 -1
- package/src/api-connection/serve-local.d.ts +15 -0
- package/src/api-connection/serve-local.js +46 -0
- package/src/api-connection/serve-local.js.map +1 -0
- package/src/cloudscape-website/app/generator.js +10 -0
- package/src/cloudscape-website/app/generator.js.map +1 -1
- package/src/cloudscape-website/cognito-auth/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/cloudscape-website/cognito-auth/files/app/components/CognitoAuth/index.tsx.template +6 -0
- package/src/cloudscape-website/runtime-config/__snapshots__/generator.spec.ts.snap +22 -18
- package/src/cloudscape-website/runtime-config/files/app/components/RuntimeConfig/index.tsx.template +20 -18
- package/src/open-api/ts-client/__snapshots__/generator.arrays.spec.ts.snap +1579 -0
- package/src/open-api/ts-client/__snapshots__/generator.complex-types.spec.ts.snap +3 -15
- package/src/open-api/ts-client/__snapshots__/generator.composite-types.spec.ts.snap +5 -17
- package/src/open-api/ts-client/files/client.gen.ts.template +18 -2
- package/src/open-api/ts-hooks/files/options-proxy.gen.ts.template +1 -1
- package/src/open-api/ts-hooks/generator.spec.tsx +16 -0
- package/src/py/fast-api/generator.js +5 -1
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.js +22 -1
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/trpc/backend/files/backend/src/local-server.ts.template +1 -1
- package/src/trpc/backend/generator.js +5 -1
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/trpc/react/generator.js +7 -1
- package/src/trpc/react/generator.js.map +1 -1
- package/src/utils/files/website/hooks/sigv4/useSigV4.tsx.template +4 -0
- package/src/utils/port.d.ts +12 -0
- package/src/utils/port.js +23 -0
- package/src/utils/port.js.map +1 -0
|
@@ -1002,9 +1002,7 @@ export class TestApi {
|
|
|
1002
1002
|
const body =
|
|
1003
1003
|
input === undefined
|
|
1004
1004
|
? undefined
|
|
1005
|
-
:
|
|
1006
|
-
? JSON.stringify(input === null ? null : input)
|
|
1007
|
-
: String(input === null ? null : input);
|
|
1005
|
+
: JSON.stringify(input === null ? null : input);
|
|
1008
1006
|
|
|
1009
1007
|
const response = await this.$fetch(
|
|
1010
1008
|
this.$url('/single-nullable-array', pathParameters, queryParameters),
|
|
@@ -1547,12 +1545,7 @@ export class TestApi {
|
|
|
1547
1545
|
if (!this.$config.options?.omitContentTypeHeader) {
|
|
1548
1546
|
headerParameters['Content-Type'] = 'application/json';
|
|
1549
1547
|
}
|
|
1550
|
-
const body =
|
|
1551
|
-
input === undefined
|
|
1552
|
-
? undefined
|
|
1553
|
-
: typeof input === 'object'
|
|
1554
|
-
? JSON.stringify(input)
|
|
1555
|
-
: String(input);
|
|
1548
|
+
const body = input === undefined ? undefined : JSON.stringify(input);
|
|
1556
1549
|
|
|
1557
1550
|
const response = await this.$fetch(
|
|
1558
1551
|
this.$url(
|
|
@@ -1584,12 +1577,7 @@ export class TestApi {
|
|
|
1584
1577
|
if (!this.$config.options?.omitContentTypeHeader) {
|
|
1585
1578
|
headerParameters['Content-Type'] = 'application/json';
|
|
1586
1579
|
}
|
|
1587
|
-
const body =
|
|
1588
|
-
input === undefined
|
|
1589
|
-
? undefined
|
|
1590
|
-
: typeof input === 'object'
|
|
1591
|
-
? JSON.stringify(input)
|
|
1592
|
-
: String(input);
|
|
1580
|
+
const body = input === undefined ? undefined : JSON.stringify(input);
|
|
1593
1581
|
|
|
1594
1582
|
const response = await this.$fetch(
|
|
1595
1583
|
this.$url('/array-of-maps-of-numbers', pathParameters, queryParameters),
|
|
@@ -1060,12 +1060,7 @@ export class TestApi {
|
|
|
1060
1060
|
if (!this.$config.options?.omitContentTypeHeader) {
|
|
1061
1061
|
headerParameters['Content-Type'] = 'application/json';
|
|
1062
1062
|
}
|
|
1063
|
-
const body =
|
|
1064
|
-
input === undefined
|
|
1065
|
-
? undefined
|
|
1066
|
-
: typeof input === 'object'
|
|
1067
|
-
? JSON.stringify(input)
|
|
1068
|
-
: String(input);
|
|
1063
|
+
const body = input === undefined ? undefined : JSON.stringify(input);
|
|
1069
1064
|
|
|
1070
1065
|
const response = await this.$fetch(
|
|
1071
1066
|
this.$url('/arrays', pathParameters, queryParameters),
|
|
@@ -1100,17 +1095,10 @@ export class TestApi {
|
|
|
1100
1095
|
const body =
|
|
1101
1096
|
input === undefined
|
|
1102
1097
|
? undefined
|
|
1103
|
-
:
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
).body,
|
|
1108
|
-
)
|
|
1109
|
-
: String(
|
|
1110
|
-
$IO.TestArraysWithOtherParametersRequestBodyParameters.toJson(
|
|
1111
|
-
input,
|
|
1112
|
-
).body,
|
|
1113
|
-
);
|
|
1098
|
+
: JSON.stringify(
|
|
1099
|
+
$IO.TestArraysWithOtherParametersRequestBodyParameters.toJson(input)
|
|
1100
|
+
.body,
|
|
1101
|
+
);
|
|
1114
1102
|
|
|
1115
1103
|
const response = await this.$fetch(
|
|
1116
1104
|
this.$url(
|
|
@@ -391,9 +391,25 @@ export class <%- className %> {
|
|
|
391
391
|
<%_ } else if (op.parametersBody.isPrimitive || ["binary", "any", "unknown"].includes(op.parametersBody.type) || op.parametersBody.isEnum || op.parametersBody.export === 'enum') { _%>
|
|
392
392
|
const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>input<%- op.explicitRequestBodyParameter ? `.${op.explicitRequestBodyParameter.typescriptName}` : '' %><%- op.parametersBody.type === 'unknown' ? ' as any' : '' %>;
|
|
393
393
|
<%_ } else if (op.explicitRequestBodyParameter) { _%>
|
|
394
|
-
const body = <% if (!op.explicitRequestBodyParameter.isRequired) { %>input === undefined ? undefined : <% } %>(
|
|
394
|
+
const body = <% if (!op.explicitRequestBodyParameter.isRequired) { %>input === undefined ? undefined : <% } %>(
|
|
395
|
+
<%_ if (op.explicitRequestBodyParameter.export !== 'array') { _%>
|
|
396
|
+
typeof input === 'object' ?
|
|
397
|
+
<%_ } _%>
|
|
398
|
+
JSON.stringify($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>)
|
|
399
|
+
<%_ if (op.explicitRequestBodyParameter.export !== 'array') { _%>
|
|
400
|
+
: String($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>)
|
|
401
|
+
<%_ } _%>
|
|
402
|
+
);
|
|
395
403
|
<%_ } else { _%>
|
|
396
|
-
const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>(
|
|
404
|
+
const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>(
|
|
405
|
+
<%_ if (op.parametersBody.export !== 'array') { _%>
|
|
406
|
+
typeof input === 'object' ?
|
|
407
|
+
<%_ } _%>
|
|
408
|
+
JSON.stringify(<%- renderToJsonValue(op.parametersBody, 'input') %>)
|
|
409
|
+
<%_ if (op.parametersBody.export !== 'array') { _%>
|
|
410
|
+
: String(<%- renderToJsonValue(op.parametersBody, 'input') %>)
|
|
411
|
+
<%_ } _%>
|
|
412
|
+
);
|
|
397
413
|
<%_ } _%>
|
|
398
414
|
<%_ } else { %>
|
|
399
415
|
const body = undefined;
|
|
@@ -33,7 +33,7 @@ import type {
|
|
|
33
33
|
});
|
|
34
34
|
} _%>
|
|
35
35
|
<%_ const modelsByName = Object.fromEntries(models.map(m => [m.name, m])); _%>
|
|
36
|
-
<%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [op.result.
|
|
36
|
+
<%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [op.result.type] : [])).forEach((returnTypeModel) => { _%>
|
|
37
37
|
<%- returnTypeModel %>,
|
|
38
38
|
<%_ }); _%>
|
|
39
39
|
} from './types.gen.js';
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
} from '@tanstack/react-query';
|
|
25
25
|
import React from 'react';
|
|
26
26
|
import { Mock } from 'vitest';
|
|
27
|
+
import { PET_STORE_SPEC } from '../ts-client/generator.petstore.spec';
|
|
27
28
|
|
|
28
29
|
describe('openApiTsHooksGenerator', () => {
|
|
29
30
|
let tree: Tree;
|
|
@@ -1784,4 +1785,19 @@ describe('openApiTsHooksGenerator', () => {
|
|
|
1784
1785
|
}),
|
|
1785
1786
|
);
|
|
1786
1787
|
});
|
|
1788
|
+
|
|
1789
|
+
it('should generate valid code for the petstore example ', async () => {
|
|
1790
|
+
tree.write('openapi.json', JSON.stringify(PET_STORE_SPEC));
|
|
1791
|
+
|
|
1792
|
+
await openApiTsHooksGenerator(tree, {
|
|
1793
|
+
openApiSpecPath: 'openapi.json',
|
|
1794
|
+
outputPath: 'src/generated',
|
|
1795
|
+
});
|
|
1796
|
+
|
|
1797
|
+
validateTypeScript([
|
|
1798
|
+
'src/generated/client.gen.ts',
|
|
1799
|
+
'src/generated/types.gen.ts',
|
|
1800
|
+
'src/generated/options-proxy.gen.ts',
|
|
1801
|
+
]);
|
|
1802
|
+
});
|
|
1787
1803
|
});
|
|
@@ -21,6 +21,7 @@ const metrics_1 = require("../../utils/metrics");
|
|
|
21
21
|
const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
|
|
22
22
|
const open_api_1 = require("./react/open-api");
|
|
23
23
|
const git_1 = require("../../utils/git");
|
|
24
|
+
const port_1 = require("../../utils/port");
|
|
24
25
|
exports.FAST_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
25
26
|
/**
|
|
26
27
|
* Generates a Python FastAPI project
|
|
@@ -35,6 +36,7 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
|
|
|
35
36
|
const apiNameSnakeCase = (0, names_1.toSnakeCase)(schema.name);
|
|
36
37
|
const apiNameKebabCase = (0, names_1.toKebabCase)(schema.name);
|
|
37
38
|
const apiNameClassName = (0, names_1.toClassName)(schema.name);
|
|
39
|
+
const port = (0, port_1.getLocalServerPortNumber)(tree, exports.FAST_API_GENERATOR_INFO, 8000);
|
|
38
40
|
yield (0, generator_1.default)(tree, {
|
|
39
41
|
name: normalizedName,
|
|
40
42
|
directory: schema.directory,
|
|
@@ -62,14 +64,16 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
|
|
|
62
64
|
projectConfig.targets.serve = {
|
|
63
65
|
executor: '@nxlv/python:run-commands',
|
|
64
66
|
options: {
|
|
65
|
-
command: `uv run fastapi dev ${normalizedName}/main.py`,
|
|
67
|
+
command: `uv run fastapi dev ${normalizedName}/main.py --port ${port}`,
|
|
66
68
|
cwd: dir,
|
|
67
69
|
},
|
|
70
|
+
continuous: true,
|
|
68
71
|
};
|
|
69
72
|
projectConfig.metadata = {
|
|
70
73
|
apiName: schema.name,
|
|
71
74
|
apiType: 'fast-api',
|
|
72
75
|
auth: schema.auth,
|
|
76
|
+
port,
|
|
73
77
|
};
|
|
74
78
|
projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
|
|
75
79
|
(0, devkit_1.updateProjectConfiguration)(tree, normalizedName, projectConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAWoB;AAEpB,oEAAmE;AACnE,oEAAiE;AACjE,0EAA+E;AAC/E,sCAA+C;AAE/C,qEAA0E;AAC1E,yFAGiD;AACjD,6CAA0E;AAC1E,+CAA0D;AAC1D,+CAAoD;AACpD,uCAIwB;AACxB,iDAAsE;AACtE,8EAAmF;AACnF,+CAAwD;AACxD,yCAAkD;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,10 @@ const ast_1 = require("../../../utils/ast");
|
|
|
18
18
|
const nx_1 = require("../../../utils/nx");
|
|
19
19
|
const metrics_1 = require("../../../utils/metrics");
|
|
20
20
|
const open_api_1 = require("./open-api");
|
|
21
|
+
const serve_local_1 = require("../../../api-connection/serve-local");
|
|
21
22
|
exports.FAST_API_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
22
23
|
const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
23
|
-
var _a;
|
|
24
|
+
var _a, _b;
|
|
24
25
|
const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
|
|
25
26
|
const fastApiProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.fastApiProjectName);
|
|
26
27
|
// Add OpenAPI spec generation to the project, run as part of build
|
|
@@ -30,7 +31,9 @@ const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
|
|
|
30
31
|
const metadata = fastApiProjectConfig.metadata;
|
|
31
32
|
const apiName = metadata === null || metadata === void 0 ? void 0 : metadata.apiName;
|
|
32
33
|
const auth = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.auth) !== null && _a !== void 0 ? _a : 'IAM';
|
|
34
|
+
const port = (_b = metadata === null || metadata === void 0 ? void 0 : metadata.port) !== null && _b !== void 0 ? _b : 8000;
|
|
33
35
|
const clientGenTarget = `generate:${(0, lodash_kebabcase_1.default)(apiName)}-client`;
|
|
36
|
+
const clientGenWatchTarget = `watch-${clientGenTarget}`;
|
|
34
37
|
const generatedClientDir = (0, devkit_1.joinPathFragments)('generated', (0, lodash_kebabcase_1.default)(apiName));
|
|
35
38
|
const generatedClientDirFromRoot = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, generatedClientDir);
|
|
36
39
|
// Add TypeScript client generation to Frontend project.json
|
|
@@ -60,6 +63,16 @@ const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
|
|
|
60
63
|
],
|
|
61
64
|
},
|
|
62
65
|
dependsOn: [`${fastApiProjectConfig.name}:openapi`],
|
|
66
|
+
},
|
|
67
|
+
// Watch target for regenerating the client
|
|
68
|
+
[clientGenWatchTarget]: {
|
|
69
|
+
executor: 'nx:run-commands',
|
|
70
|
+
options: {
|
|
71
|
+
commands: [
|
|
72
|
+
`nx watch --projects=${fastApiProjectConfig.name} --includeDependentProjects -- nx run ${frontendProjectConfig.name}:"${clientGenTarget}"`,
|
|
73
|
+
],
|
|
74
|
+
},
|
|
75
|
+
continuous: true,
|
|
63
76
|
} })) }));
|
|
64
77
|
const relativeSrcDir = frontendProjectConfig.sourceRoot.slice(frontendProjectConfig.root.length + 1);
|
|
65
78
|
// Ignore the generated client by default
|
|
@@ -103,6 +116,14 @@ const fastApiReactGenerator = (tree, options) => tslib_1.__awaiter(void 0, void
|
|
|
103
116
|
(0, ast_1.addSingleImport)(tree, mainTsxPath, providerName, `./components/${providerName}`);
|
|
104
117
|
(0, ast_1.replace)(tree, mainTsxPath, 'JsxSelfClosingElement[tagName.name="RouterProvider"]', (node) => (0, ast_1.createJsxElementFromIdentifier)(providerName, [node]));
|
|
105
118
|
}
|
|
119
|
+
// Update serve-local on the website to use our local FastAPI server
|
|
120
|
+
(0, serve_local_1.addTargetToServeLocal)(tree, frontendProjectConfig.name, fastApiProjectConfig.name, {
|
|
121
|
+
url: `http://localhost:${port}/`,
|
|
122
|
+
apiName,
|
|
123
|
+
// Additionally add a dependency on the generate watch command to ensure that local
|
|
124
|
+
// FastAPI changes that affect the client are also reloaded
|
|
125
|
+
additionalDependencyTargets: [clientGenWatchTarget],
|
|
126
|
+
});
|
|
106
127
|
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
|
|
107
128
|
...(auth === 'IAM'
|
|
108
129
|
? [
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const object_1 = require("../../utils/object");
|
|
|
20
20
|
const nx_1 = require("../../utils/nx");
|
|
21
21
|
const metrics_1 = require("../../utils/metrics");
|
|
22
22
|
const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
|
|
23
|
+
const port_1 = require("../../utils/port");
|
|
23
24
|
exports.TRPC_BACKEND_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
24
25
|
function tsTrpcApiGenerator(tree, options) {
|
|
25
26
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -35,9 +36,10 @@ function tsTrpcApiGenerator(tree, options) {
|
|
|
35
36
|
const schemaName = `${apiNameKebabCase}-schema`;
|
|
36
37
|
const backendProjectName = `${apiNamespace}${backendName}`;
|
|
37
38
|
const schemaProjectName = `${apiNamespace}${schemaName}`;
|
|
39
|
+
const port = (0, port_1.getLocalServerPortNumber)(tree, exports.TRPC_BACKEND_GENERATOR_INFO, 2022);
|
|
38
40
|
const enhancedOptions = Object.assign({ backendProjectName, backendProjectAlias: (0, npm_scope_1.toScopeAlias)(backendProjectName), schemaProjectName, schemaProjectAlias: (0, npm_scope_1.toScopeAlias)(schemaProjectName), apiNameKebabCase,
|
|
39
41
|
apiNameClassName,
|
|
40
|
-
backendRoot, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec, apiGatewayEventType: getApiGatewayEventType(options) }, options);
|
|
42
|
+
backendRoot, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec, apiGatewayEventType: getApiGatewayEventType(options), port }, options);
|
|
41
43
|
yield (0, generator_1.default)(tree, {
|
|
42
44
|
name: backendName,
|
|
43
45
|
directory: projectRoot,
|
|
@@ -65,6 +67,7 @@ function tsTrpcApiGenerator(tree, options) {
|
|
|
65
67
|
apiName: options.name,
|
|
66
68
|
apiType: 'trpc',
|
|
67
69
|
auth: options.auth,
|
|
70
|
+
port,
|
|
68
71
|
};
|
|
69
72
|
config.targets.serve = {
|
|
70
73
|
executor: 'nx:run-commands',
|
|
@@ -72,6 +75,7 @@ function tsTrpcApiGenerator(tree, options) {
|
|
|
72
75
|
commands: ['tsx src/local-server.ts'],
|
|
73
76
|
cwd: backendRoot,
|
|
74
77
|
},
|
|
78
|
+
continuous: true,
|
|
75
79
|
};
|
|
76
80
|
config.targets.bundle = {
|
|
77
81
|
cache: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -178,6 +178,10 @@ export const useSigV4 = () => {
|
|
|
178
178
|
|
|
179
179
|
return useCallback(
|
|
180
180
|
async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
|
|
181
|
+
if (!cognitoProps && import.meta.env.MODE === 'serve-local') {
|
|
182
|
+
// Skip request signing in serve-local mode when cognitoProps are not set
|
|
183
|
+
return fetch(input, init);
|
|
184
|
+
}
|
|
181
185
|
if (!cognitoProps) {
|
|
182
186
|
throw new Error('cognitoProps is undefined!');
|
|
183
187
|
}
|
|
@@ -16,16 +16,18 @@ const names_1 = require("../../utils/names");
|
|
|
16
16
|
const format_1 = require("../../utils/format");
|
|
17
17
|
const nx_1 = require("../../utils/nx");
|
|
18
18
|
const metrics_1 = require("../../utils/metrics");
|
|
19
|
+
const serve_local_1 = require("../../api-connection/serve-local");
|
|
19
20
|
exports.TRPC_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
20
21
|
function reactGenerator(tree, options) {
|
|
21
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
var _a;
|
|
23
|
+
var _a, _b;
|
|
23
24
|
const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
|
|
24
25
|
const backendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.backendProjectName);
|
|
25
26
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
26
27
|
const metadata = backendProjectConfig.metadata;
|
|
27
28
|
const apiName = metadata.apiName;
|
|
28
29
|
const auth = (_a = metadata.auth) !== null && _a !== void 0 ? _a : 'IAM';
|
|
30
|
+
const port = (_b = metadata.port) !== null && _b !== void 0 ? _b : 2022;
|
|
29
31
|
const apiNameClassName = (0, names_1.toClassName)(apiName);
|
|
30
32
|
const backendProjectAlias = (0, npm_scope_1.toScopeAlias)(backendProjectConfig.name);
|
|
31
33
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, Object.assign(Object.assign({ apiName, apiNameClassName: (0, names_1.toClassName)(apiName) }, options), { auth,
|
|
@@ -57,6 +59,10 @@ function reactGenerator(tree, options) {
|
|
|
57
59
|
if (!hasProvider) {
|
|
58
60
|
(0, ast_1.replace)(tree, mainTsxPath, 'JsxSelfClosingElement[tagName.name="RouterProvider"]', (node) => (0, ast_1.createJsxElementFromIdentifier)(clientProviderName, [node]));
|
|
59
61
|
}
|
|
62
|
+
(0, serve_local_1.addTargetToServeLocal)(tree, frontendProjectConfig.name, backendProjectConfig.name, {
|
|
63
|
+
url: `http://localhost:${port}/`,
|
|
64
|
+
apiName,
|
|
65
|
+
});
|
|
60
66
|
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
|
|
61
67
|
'@trpc/client',
|
|
62
68
|
'@trpc/tanstack-react-query',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,10 @@ export const useSigV4 = () => {
|
|
|
28
28
|
|
|
29
29
|
return useCallback(
|
|
30
30
|
async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
|
|
31
|
+
if (!cognitoProps && import.meta.env.MODE === 'serve-local') {
|
|
32
|
+
// Skip request signing in serve-local mode when cognitoProps are not set
|
|
33
|
+
return fetch(input, init);
|
|
34
|
+
}
|
|
31
35
|
if (!cognitoProps) {
|
|
32
36
|
throw new Error('cognitoProps is undefined!');
|
|
33
37
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
import { Tree } from '@nx/devkit';
|
|
6
|
+
import { NxGeneratorInfo } from './nx';
|
|
7
|
+
/**
|
|
8
|
+
* Get a unique port number for a local server created by the given generator.
|
|
9
|
+
* To be counted, projects must have 'port' in metadata.
|
|
10
|
+
* Assumes startPort is sufficiently spaced from other generators!
|
|
11
|
+
*/
|
|
12
|
+
export declare const getLocalServerPortNumber: (tree: Tree, generatorInfo: NxGeneratorInfo, startPort: number) => number;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getLocalServerPortNumber = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
6
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
7
|
+
*/
|
|
8
|
+
const devkit_1 = require("@nx/devkit");
|
|
9
|
+
/**
|
|
10
|
+
* Get a unique port number for a local server created by the given generator.
|
|
11
|
+
* To be counted, projects must have 'port' in metadata.
|
|
12
|
+
* Assumes startPort is sufficiently spaced from other generators!
|
|
13
|
+
*/
|
|
14
|
+
const getLocalServerPortNumber = (tree, generatorInfo, startPort) => {
|
|
15
|
+
const existingProjectCount = [...(0, devkit_1.getProjects)(tree).values()].filter((p) => {
|
|
16
|
+
var _a, _b;
|
|
17
|
+
return ((_a = p.metadata) === null || _a === void 0 ? void 0 : _a.generator) === generatorInfo.id &&
|
|
18
|
+
((_b = p.metadata) === null || _b === void 0 ? void 0 : _b.port);
|
|
19
|
+
}).length;
|
|
20
|
+
return startPort + existingProjectCount;
|
|
21
|
+
};
|
|
22
|
+
exports.getLocalServerPortNumber = getLocalServerPortNumber;
|
|
23
|
+
//# sourceMappingURL=port.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAA+C;AAG/C;;;;GAIG;AACI,MAAM,wBAAwB,GAAG,CACtC,IAAU,EACV,aAA8B,EAC9B,SAAiB,EACjB,EAAE;IACF,MAAM,oBAAoB,GAAG,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACjE,CAAC,CAAC,EAAE,EAAE;;QACJ,OAAA,CAAA,MAAC,CAAC,CAAC,QAAgB,0CAAE,SAAS,MAAK,aAAa,CAAC,EAAE;aACnD,MAAC,CAAC,CAAC,QAAgB,0CAAE,IAAI,CAAA,CAAA;KAAA,CAC5B,CAAC,MAAM,CAAC;IACT,OAAO,SAAS,GAAG,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAXW,QAAA,wBAAwB,4BAWnC"}
|