@aws/nx-plugin 1.0.0-rc.1 → 1.0.0-rc.2
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/generators.json +10 -5
- package/package.json +1 -1
- package/src/py/api/schema.d.ts +1 -1
- package/src/py/api/schema.json +2 -2
- package/src/py/fast-api/generator.js +48 -36
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/schema.d.ts +1 -1
- package/src/py/fast-api/schema.json +2 -2
- package/src/py/lambda-function/generator.js +19 -16
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/lambda-function/schema.d.ts +3 -0
- package/src/py/lambda-function/schema.json +8 -0
- package/src/smithy/ts/api/generator.js +71 -54
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/smithy/ts/api/schema.d.ts +1 -1
- package/src/smithy/ts/api/schema.json +1 -1
- package/src/trpc/backend/generator.js +56 -38
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/backend/schema.d.ts +1 -1
- package/src/trpc/backend/schema.json +2 -2
- package/src/ts/api/generator.js +3 -1
- package/src/ts/api/generator.js.map +1 -1
- package/src/ts/api/schema.d.ts +1 -1
- package/src/ts/api/schema.json +1 -1
- package/src/ts/lambda-function/generator.js +26 -21
- package/src/ts/lambda-function/generator.js.map +1 -1
- package/src/ts/lambda-function/schema.d.ts +3 -0
- package/src/ts/lambda-function/schema.json +8 -0
- package/src/ts/rdb/generator.js +73 -55
- package/src/ts/rdb/generator.js.map +1 -1
- package/src/ts/rdb/schema.d.ts +1 -1
- package/src/ts/rdb/schema.json +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +4 -2
- package/src/ts/react-website/app/generator.js +81 -75
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/app/schema.d.ts +3 -0
- package/src/ts/website/app/schema.d.ts +2 -0
- package/src/ts/website/app/schema.json +8 -0
package/generators.json
CHANGED
|
@@ -100,7 +100,8 @@
|
|
|
100
100
|
"factory": "./src/py/mcp-server/generator",
|
|
101
101
|
"schema": "./src/py/mcp-server/schema.json",
|
|
102
102
|
"description": "Generate a Python Model Context Protocol (MCP) server for providing context to Large Language Models",
|
|
103
|
-
"metric": "g24"
|
|
103
|
+
"metric": "g24",
|
|
104
|
+
"guidePages": ["py-mcp-server"]
|
|
104
105
|
},
|
|
105
106
|
"py#project": {
|
|
106
107
|
"factory": "./src/py/project/generator",
|
|
@@ -113,7 +114,8 @@
|
|
|
113
114
|
"factory": "./src/py/agent/generator",
|
|
114
115
|
"schema": "./src/py/agent/schema.json",
|
|
115
116
|
"description": "Add an AI Agent to a Python project",
|
|
116
|
-
"metric": "g25"
|
|
117
|
+
"metric": "g25",
|
|
118
|
+
"guidePages": ["py-agent"]
|
|
117
119
|
},
|
|
118
120
|
"py#agent#mcp-connection": {
|
|
119
121
|
"factory": "./src/py/agent/mcp-connection/generator",
|
|
@@ -182,7 +184,8 @@
|
|
|
182
184
|
"factory": "./src/ts/mcp-server/generator",
|
|
183
185
|
"schema": "./src/ts/mcp-server/schema.json",
|
|
184
186
|
"description": "Generate a TypeScript Model Context Protocol (MCP) server for providing context to Large Language Models",
|
|
185
|
-
"metric": "g18"
|
|
187
|
+
"metric": "g18",
|
|
188
|
+
"guidePages": ["ts-mcp-server"]
|
|
186
189
|
},
|
|
187
190
|
"ts#nx-generator": {
|
|
188
191
|
"factory": "./src/ts/nx-generator/generator",
|
|
@@ -252,7 +255,8 @@
|
|
|
252
255
|
"factory": "./src/ts/agent/generator",
|
|
253
256
|
"schema": "./src/ts/agent/schema.json",
|
|
254
257
|
"description": "Add an AI Agent to a TypeScript project",
|
|
255
|
-
"metric": "g30"
|
|
258
|
+
"metric": "g30",
|
|
259
|
+
"guidePages": ["ts-agent"]
|
|
256
260
|
},
|
|
257
261
|
"ts#agent#mcp-connection": {
|
|
258
262
|
"factory": "./src/ts/agent/mcp-connection/generator",
|
|
@@ -315,7 +319,8 @@
|
|
|
315
319
|
"factory": "./src/ts/rdb/generator",
|
|
316
320
|
"schema": "./src/ts/rdb/schema.json",
|
|
317
321
|
"description": "Create a relational database project",
|
|
318
|
-
"metric": "g38"
|
|
322
|
+
"metric": "g38",
|
|
323
|
+
"guidePages": ["ts-rdb"]
|
|
319
324
|
},
|
|
320
325
|
"ts#rdb#smithy-connection": {
|
|
321
326
|
"factory": "./src/ts/rdb/smithy-connection/generator",
|
package/package.json
CHANGED
package/src/py/api/schema.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { IacOption } from '../../utils/iac';
|
|
|
7
7
|
export interface PyApiGeneratorSchema {
|
|
8
8
|
readonly name: string;
|
|
9
9
|
readonly framework?: 'fastapi';
|
|
10
|
-
readonly infra: 'rest-lambda' | 'http-lambda';
|
|
10
|
+
readonly infra: 'rest-lambda' | 'http-lambda' | 'none';
|
|
11
11
|
readonly integrationPattern?: 'isolated' | 'shared';
|
|
12
12
|
readonly auth: 'iam' | 'cognito' | 'custom';
|
|
13
13
|
readonly directory?: string;
|
package/src/py/api/schema.json
CHANGED
|
@@ -89,9 +89,9 @@
|
|
|
89
89
|
},
|
|
90
90
|
"infra": {
|
|
91
91
|
"type": "string",
|
|
92
|
-
"description": "The type of infrastructure to use to deploy this API.
|
|
92
|
+
"description": "The type of infrastructure to use to deploy this API.",
|
|
93
93
|
"default": "rest-lambda",
|
|
94
|
-
"enum": ["rest-lambda", "http-lambda"],
|
|
94
|
+
"enum": ["rest-lambda", "http-lambda", "none"],
|
|
95
95
|
"x-prompt": "What infrastructure would you like to deploy your API with?",
|
|
96
96
|
"x-priority": "important"
|
|
97
97
|
}
|
|
@@ -29,10 +29,6 @@ exports.FAST_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
|
29
29
|
*/
|
|
30
30
|
const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
31
31
|
const integrationPattern = getIntegrationPattern(schema);
|
|
32
|
-
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
33
|
-
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
34
|
-
iac,
|
|
35
|
-
});
|
|
36
32
|
const { dir, normalizedModuleName, fullyQualifiedName } = (0, generator_1.getPyProjectDetails)(tree, {
|
|
37
33
|
name: schema.name,
|
|
38
34
|
directory: schema.directory,
|
|
@@ -41,13 +37,23 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
41
37
|
});
|
|
42
38
|
const apiNameKebabCase = (0, names_1.toKebabCase)(schema.name);
|
|
43
39
|
const apiNameClassName = (0, names_1.toClassName)(schema.name);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
40
|
+
let projectExists;
|
|
41
|
+
try {
|
|
42
|
+
(0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
|
|
43
|
+
projectExists = true;
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
projectExists = false;
|
|
47
|
+
}
|
|
48
|
+
if (!projectExists) {
|
|
49
|
+
await (0, generator_1.default)(tree, {
|
|
50
|
+
name: schema.name,
|
|
51
|
+
directory: schema.directory,
|
|
52
|
+
subDirectory: schema.subDirectory,
|
|
53
|
+
moduleName: normalizedModuleName,
|
|
54
|
+
type: 'application',
|
|
55
|
+
});
|
|
56
|
+
}
|
|
51
57
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
|
|
52
58
|
const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
|
|
53
59
|
const { bundleOutputDir, bundleTargetName } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
|
|
@@ -99,33 +105,39 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
99
105
|
}, {
|
|
100
106
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
101
107
|
});
|
|
102
|
-
if (schema.
|
|
103
|
-
const
|
|
104
|
-
(0,
|
|
105
|
-
|
|
108
|
+
if (schema.infra !== 'none') {
|
|
109
|
+
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
110
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
111
|
+
iac,
|
|
112
|
+
});
|
|
113
|
+
if (schema.auth === 'custom') {
|
|
114
|
+
const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';
|
|
115
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), (0, devkit_1.joinPathFragments)(dir, normalizedModuleName), {}, {
|
|
116
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
// Add the CDK construct to deploy the FastAPI to shared constructs
|
|
120
|
+
await (0, api_constructs_1.addApiGatewayInfra)(tree, {
|
|
121
|
+
apiProjectName: projectConfig.name,
|
|
122
|
+
apiNameClassName,
|
|
123
|
+
apiNameKebabCase,
|
|
124
|
+
constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',
|
|
125
|
+
backend: {
|
|
126
|
+
type: 'fastapi',
|
|
127
|
+
moduleName: normalizedModuleName,
|
|
128
|
+
bundleOutputDir,
|
|
129
|
+
integrationPattern,
|
|
130
|
+
},
|
|
131
|
+
auth: schema.auth,
|
|
132
|
+
iac,
|
|
133
|
+
});
|
|
134
|
+
(0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
|
|
135
|
+
iac,
|
|
136
|
+
apiNameKebabCase,
|
|
137
|
+
specPath,
|
|
138
|
+
specBuildTargetName: `${projectConfig.name}:openapi`,
|
|
106
139
|
});
|
|
107
140
|
}
|
|
108
|
-
// Add the CDK construct to deploy the FastAPI to shared constructs
|
|
109
|
-
await (0, api_constructs_1.addApiGatewayInfra)(tree, {
|
|
110
|
-
apiProjectName: projectConfig.name,
|
|
111
|
-
apiNameClassName,
|
|
112
|
-
apiNameKebabCase,
|
|
113
|
-
constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',
|
|
114
|
-
backend: {
|
|
115
|
-
type: 'fastapi',
|
|
116
|
-
moduleName: normalizedModuleName,
|
|
117
|
-
bundleOutputDir,
|
|
118
|
-
integrationPattern,
|
|
119
|
-
},
|
|
120
|
-
auth: schema.auth,
|
|
121
|
-
iac,
|
|
122
|
-
});
|
|
123
|
-
(0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
|
|
124
|
-
iac,
|
|
125
|
-
apiNameKebabCase,
|
|
126
|
-
specPath,
|
|
127
|
-
specBuildTargetName: `${projectConfig.name}:openapi`,
|
|
128
|
-
});
|
|
129
141
|
(0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
|
|
130
142
|
'fastapi',
|
|
131
143
|
'uvicorn',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAUoB;AAEpB,yDAA6D;AAC7D,0EAA+E;AAC/E,qEAA0E;AAC1E,6CAA6D;AAC7D,+CAA0D;AAC1D,+CAAoD;AACpD,uCAIwB;AACxB,iDAAsE;AACtE,8EAA+E;AAC/E,uCAA4C;AAC5C,+CAAwD;AACxD,2CAA8C;AAC9C,sDAAkE;AAClE,uCAGwB;AACxB,yCAA6C;AAC7C,oFAAgH;AAEnG,QAAA,uBAAuB,GAClC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B;;GAEG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC5C,IAAU,EACV,MAAuC,EACX,EAAE;IAC9B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { IacOption } from '../../utils/iac';
|
|
|
7
7
|
|
|
8
8
|
export interface PyFastApiProjectGeneratorSchema {
|
|
9
9
|
readonly name: string;
|
|
10
|
-
readonly infra: 'rest-lambda' | 'http-lambda';
|
|
10
|
+
readonly infra: 'rest-lambda' | 'http-lambda' | 'none';
|
|
11
11
|
readonly integrationPattern?: 'isolated' | 'shared';
|
|
12
12
|
readonly auth: 'iam' | 'cognito' | 'custom';
|
|
13
13
|
readonly directory?: string;
|
|
@@ -71,9 +71,9 @@
|
|
|
71
71
|
},
|
|
72
72
|
"infra": {
|
|
73
73
|
"type": "string",
|
|
74
|
-
"description": "The type of infrastructure to use to deploy this API.
|
|
74
|
+
"description": "The type of infrastructure to use to deploy this API.",
|
|
75
75
|
"default": "rest-lambda",
|
|
76
|
-
"enum": ["rest-lambda", "http-lambda"],
|
|
76
|
+
"enum": ["rest-lambda", "http-lambda", "none"],
|
|
77
77
|
"x-prompt": "What infrastructure would you like to deploy your API with?",
|
|
78
78
|
"x-priority": "important"
|
|
79
79
|
}
|
|
@@ -61,25 +61,28 @@ const pyLambdaFunctionGenerator = async (tree, schema) => {
|
|
|
61
61
|
const lambdaFunctionClassName = (0, names_1.toClassName)(schema.name);
|
|
62
62
|
const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.name);
|
|
63
63
|
const functionPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? '', `${normalizedFunctionName}.py`);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
const infra = schema.infra ?? 'lambda';
|
|
65
|
+
const handlerAlreadyExists = tree.exists(functionPath);
|
|
66
|
+
if (handlerAlreadyExists && infra === 'none') {
|
|
67
|
+
throw new Error(`This project already has a lambda function with the name ${normalizedFunctionName}. Please remove the lambda function before running this generator or use a different name.`);
|
|
67
68
|
}
|
|
68
|
-
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
69
|
-
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
70
|
-
iac,
|
|
71
|
-
});
|
|
72
69
|
// Check if the project has a bundle target and if not add it
|
|
73
70
|
const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
71
|
+
if (infra !== 'none') {
|
|
72
|
+
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
73
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
74
|
+
iac,
|
|
75
|
+
});
|
|
76
|
+
await (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
|
|
77
|
+
functionProjectName: projectConfig.name,
|
|
78
|
+
nameClassName: constructFunctionClassName,
|
|
79
|
+
nameKebabCase: constructFunctionKebabCase,
|
|
80
|
+
handler: normalizedFunctionPath,
|
|
81
|
+
bundlePathFromRoot: bundleOutputDir,
|
|
82
|
+
runtime: 'python',
|
|
83
|
+
iac,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
83
86
|
const enhancedOptions = {
|
|
84
87
|
...schema,
|
|
85
88
|
dir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,yDAA6D;AAC7D,qEAA0E;AAC1E,6CAK2B;AAC3B,+CAA0D;AAC1D,qDAAoD;AACpD,+CAAoD;AACpD,uCAKwB;AACxB,iDAAsE;AACtE,sDAAkE;AAClE,uCAAgE;AAChE,6FAA6F;AAC7F,6CAA0D;AAC1D,yCAA6C;AAEhC,QAAA,8BAA8B,GACzC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAiB/B,MAAM,wBAAwB,GAAG,CAC/B,IAAU,EACV,MAAmE,EAC5C,EAAE;IACzB,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,sBAAsB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,0BAA0B,GAAG,GAAG,KAAK,IAAI,sBAAsB,EAAE,CAAC;IACxE,MAAM,sBAAsB,GAAG,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAA,qBAAa,EAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,sBAAsB,iBAAiB,CAAC;IAErK,OAAO;QACL,0BAA0B;QAC1B,sBAAsB;QACtB,sBAAsB;KACvB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC5C,IAAU,EACV,MAAuC,EACX,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,MAAM,CAAC,OAAO,CACf,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE9E,iDAAiD;IACjD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,oDAAoD,MAAM,CAAC,OAAO,EAAE,CACrE,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,gIAAgI,CACjI,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC;IAC/B,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,IAAA,mBAAW,EAAC,uBAAuB,CAAC,CAAC;IAEnE,mDAAmD;IACnD,MAAM,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEvD,MAAM,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GACtD,wBAAwB,CAAC,IAAI,EAAE;QAC7B,UAAU;QACV,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IAEL,MAAM,qBAAqB,GAAG,GAAG,qBAAqB,IAAI,sBAAsB,EAAE,CAAC;IACnF,MAAM,0BAA0B,GAAG,IAAA,mBAAW,EAAC,qBAAqB,CAAC,CAAC;IACtE,MAAM,0BAA0B,GAAG,IAAA,mBAAW,EAAC,qBAAqB,CAAC,CAAC;IACtE,MAAM,uBAAuB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,UAAU,EACxB,MAAM,CAAC,YAAY,IAAI,EAAE,EACzB,GAAG,sBAAsB,KAAK,CAC/B,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,10 +47,13 @@ type EventSource =
|
|
|
47
47
|
| 'VpcLatticeModel'
|
|
48
48
|
| 'VpcLatticeV2Model';
|
|
49
49
|
|
|
50
|
+
export type LambdaInfraOption = 'lambda' | 'none';
|
|
51
|
+
|
|
50
52
|
export interface PyLambdaFunctionGeneratorSchema {
|
|
51
53
|
readonly project: string;
|
|
52
54
|
readonly name: string;
|
|
53
55
|
readonly functionPath?: string;
|
|
54
56
|
readonly event?: EventSource;
|
|
57
|
+
readonly infra?: LambdaInfraOption;
|
|
55
58
|
readonly iac: IacOption;
|
|
56
59
|
}
|
|
@@ -75,6 +75,14 @@
|
|
|
75
75
|
"default": "Any",
|
|
76
76
|
"x-prompt": "Enter the event source model to use for the lambda function"
|
|
77
77
|
},
|
|
78
|
+
"infra": {
|
|
79
|
+
"type": "string",
|
|
80
|
+
"description": "The type of infrastructure to deploy your Lambda function with.",
|
|
81
|
+
"enum": ["lambda", "none"],
|
|
82
|
+
"default": "lambda",
|
|
83
|
+
"x-priority": "important",
|
|
84
|
+
"x-prompt": "What infrastructure would you like to deploy your Lambda function with?"
|
|
85
|
+
},
|
|
78
86
|
"iac": {
|
|
79
87
|
"type": "string",
|
|
80
88
|
"description": "The preferred IaC provider. By default this is inherited from your initial selection.",
|
|
@@ -25,19 +25,40 @@ const api_constructs_1 = require("../../../utils/api-constructs/api-constructs")
|
|
|
25
25
|
const open_api_metadata_1 = require("../../../utils/api-constructs/open-api-metadata");
|
|
26
26
|
exports.TS_SMITHY_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
27
27
|
const tsSmithyApiGenerator = async (tree, options) => {
|
|
28
|
+
if (options.infra !== 'rest-lambda' &&
|
|
29
|
+
options.infra !== 'none') {
|
|
30
|
+
throw new Error(`Unsupported infra '${options.infra}' for Smithy TypeScript API. ` +
|
|
31
|
+
`Only 'rest-lambda' (API Gateway REST API) is supported.`);
|
|
32
|
+
}
|
|
28
33
|
const integrationPattern = getIntegrationPattern(options);
|
|
29
34
|
const apiNameClassName = (0, names_1.toClassName)(options.name);
|
|
30
35
|
const apiNameKebabCase = (0, names_1.toKebabCase)(options.name);
|
|
31
36
|
const { fullyQualifiedName: backendFullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, options);
|
|
32
37
|
const modelProjectName = `${apiNameKebabCase}-model`;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
38
|
+
let projectExists;
|
|
39
|
+
try {
|
|
40
|
+
(0, nx_1.readProjectConfigurationUnqualified)(tree, backendFullyQualifiedName);
|
|
41
|
+
projectExists = true;
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
projectExists = false;
|
|
45
|
+
}
|
|
46
|
+
if (!projectExists) {
|
|
47
|
+
// Generate the model project
|
|
48
|
+
await (0, generator_2.default)(tree, {
|
|
49
|
+
name: modelProjectName,
|
|
50
|
+
serviceName: apiNameClassName,
|
|
51
|
+
namespace: options.namespace,
|
|
52
|
+
directory: dir,
|
|
53
|
+
subDirectory: 'model',
|
|
54
|
+
});
|
|
55
|
+
// Generate the backend project
|
|
56
|
+
await (0, generator_1.default)(tree, {
|
|
57
|
+
name: options.name,
|
|
58
|
+
directory: dir,
|
|
59
|
+
subDirectory: 'backend',
|
|
60
|
+
});
|
|
61
|
+
}
|
|
41
62
|
// Add metadata to associate backend project with model project
|
|
42
63
|
const modelProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, modelProjectName);
|
|
43
64
|
(0, devkit_1.updateProjectConfiguration)(tree, modelProjectConfig.name, {
|
|
@@ -47,12 +68,6 @@ const tsSmithyApiGenerator = async (tree, options) => {
|
|
|
47
68
|
backendProject: backendFullyQualifiedName,
|
|
48
69
|
},
|
|
49
70
|
});
|
|
50
|
-
// Generate the backend project
|
|
51
|
-
await (0, generator_1.default)(tree, {
|
|
52
|
-
name: options.name,
|
|
53
|
-
directory: dir,
|
|
54
|
-
subDirectory: 'backend',
|
|
55
|
-
});
|
|
56
71
|
(0, nx_1.addGeneratorMetadata)(tree, backendFullyQualifiedName, exports.TS_SMITHY_API_GENERATOR_INFO, {
|
|
57
72
|
apiName: options.name,
|
|
58
73
|
auth: options.auth,
|
|
@@ -66,49 +81,51 @@ const tsSmithyApiGenerator = async (tree, options) => {
|
|
|
66
81
|
apiNameClassName,
|
|
67
82
|
port,
|
|
68
83
|
});
|
|
69
|
-
if (options.
|
|
70
|
-
|
|
71
|
-
|
|
84
|
+
if (options.infra !== 'none') {
|
|
85
|
+
if (options.auth === 'custom') {
|
|
86
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', 'rest'), backendProjectConfig.sourceRoot, {}, {
|
|
87
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
// Add infrastructure
|
|
91
|
+
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
92
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
93
|
+
iac,
|
|
72
94
|
});
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
iac,
|
|
97
|
-
apiNameKebabCase,
|
|
98
|
-
specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
|
|
99
|
-
specBuildTargetName: `${modelProjectConfig.name}:build`,
|
|
100
|
-
});
|
|
101
|
-
// Add bundle target using rolldown
|
|
102
|
-
await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
|
|
103
|
-
targetFilePath: 'src/handler.ts',
|
|
104
|
-
external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
|
|
105
|
-
});
|
|
106
|
-
if (options.auth === 'custom') {
|
|
95
|
+
await (0, api_constructs_1.addApiGatewayInfra)(tree, {
|
|
96
|
+
iac,
|
|
97
|
+
apiProjectName: backendFullyQualifiedName,
|
|
98
|
+
apiNameClassName,
|
|
99
|
+
apiNameKebabCase,
|
|
100
|
+
auth: options.auth,
|
|
101
|
+
constructType: 'rest',
|
|
102
|
+
backend: {
|
|
103
|
+
type: 'smithy',
|
|
104
|
+
bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle'),
|
|
105
|
+
integrationPattern,
|
|
106
|
+
...(options.auth === 'custom' && {
|
|
107
|
+
authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle', 'authorizer'),
|
|
108
|
+
}),
|
|
109
|
+
},
|
|
110
|
+
});
|
|
111
|
+
(0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
|
|
112
|
+
iac,
|
|
113
|
+
apiNameKebabCase,
|
|
114
|
+
specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
|
|
115
|
+
specBuildTargetName: `${modelProjectConfig.name}:build`,
|
|
116
|
+
});
|
|
117
|
+
// Add bundle target using rolldown
|
|
107
118
|
await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
|
|
108
|
-
targetFilePath: 'src/
|
|
109
|
-
|
|
110
|
-
external: [/@aws-sdk\/.*/],
|
|
119
|
+
targetFilePath: 'src/handler.ts',
|
|
120
|
+
external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
|
|
111
121
|
});
|
|
122
|
+
if (options.auth === 'custom') {
|
|
123
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
|
|
124
|
+
targetFilePath: 'src/authorizer.ts',
|
|
125
|
+
bundleOutputDir: 'authorizer',
|
|
126
|
+
external: [/@aws-sdk\/.*/],
|
|
127
|
+
});
|
|
128
|
+
}
|
|
112
129
|
}
|
|
113
130
|
const cmd = new fs_1.FsCommands(tree);
|
|
114
131
|
const generatedSrcDirFromRoot = '{projectRoot}/src/generated';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,0CAM2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,4CAAgD;AAChD,wEAA6E;AAC7E,gDAAgE;AAChE,+EAAgF;AAChF,8CAAiD;AACjD,sDAAuD;AACvD,gFAA6D;AAC7D,yDAAyE;AACzE,4CAAqD;AACrD,mDAAkE;AAClE,0CAA+C;AAC/C,iFAAkF;AAClF,uFAAmH;AAEtG,QAAA,4BAA4B,GACvC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,oBAAoB,GAAG,KAAK,EACvC,IAAU,EACV,OAAmC,EACP,EAAE;IAC9B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,GAAG,EAAE,GAC1D,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,gBAAgB,GAAG,GAAG,gBAAgB,QAAQ,CAAC;IAErD,6BAA6B;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { IacOption } from '../../../utils/iac';
|
|
|
8
8
|
export interface TsSmithyApiGeneratorSchema {
|
|
9
9
|
name: string;
|
|
10
10
|
namespace?: string;
|
|
11
|
-
infra: 'rest-lambda';
|
|
11
|
+
infra: 'rest-lambda' | 'none';
|
|
12
12
|
integrationPattern?: 'isolated' | 'shared';
|
|
13
13
|
auth: 'iam' | 'cognito' | 'custom';
|
|
14
14
|
directory?: TsProjectGeneratorSchema['directory'];
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"type": "string",
|
|
75
75
|
"description": "The type of infrastructure to use to deploy this API.",
|
|
76
76
|
"default": "rest-lambda",
|
|
77
|
-
"enum": ["rest-lambda"],
|
|
77
|
+
"enum": ["rest-lambda", "none"],
|
|
78
78
|
"x-prompt": "What infrastructure would you like to deploy your API with?",
|
|
79
79
|
"x-priority": "internal"
|
|
80
80
|
}
|