@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
|
@@ -28,23 +28,33 @@ const VALID_TRPC_INTEGRATION_PERMUTATIONS = new Set([
|
|
|
28
28
|
'rest-lambda::shared',
|
|
29
29
|
'http-lambda::isolated',
|
|
30
30
|
'http-lambda::shared',
|
|
31
|
+
'none::isolated',
|
|
32
|
+
'none::shared',
|
|
31
33
|
]);
|
|
32
34
|
async function tsTrpcApiGenerator(tree, options) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
iac,
|
|
37
|
-
});
|
|
35
|
+
if (options.infra !== 'none') {
|
|
36
|
+
validateTrpcInfraAndIntegrationPatternCombination(options);
|
|
37
|
+
}
|
|
38
38
|
const apiNamespace = (0, npm_scope_1.getNpmScopePrefix)(tree);
|
|
39
39
|
const apiNameKebabCase = (0, names_1.kebabCase)(options.name);
|
|
40
40
|
const apiNameClassName = (0, names_1.toClassName)(options.name);
|
|
41
41
|
const backendName = apiNameKebabCase;
|
|
42
42
|
const backendProjectName = `${apiNamespace}${backendName}`;
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
43
|
+
let projectExists;
|
|
44
|
+
try {
|
|
45
|
+
(0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
|
|
46
|
+
projectExists = true;
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
projectExists = false;
|
|
50
|
+
}
|
|
51
|
+
if (!projectExists) {
|
|
52
|
+
await (0, generator_1.default)(tree, {
|
|
53
|
+
name: backendName,
|
|
54
|
+
directory: options.directory,
|
|
55
|
+
subDirectory: options.subDirectory,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
48
58
|
const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
|
|
49
59
|
const backendRoot = projectConfig.root;
|
|
50
60
|
const port = (0, port_1.assignPort)(tree, projectConfig, 2022);
|
|
@@ -59,23 +69,29 @@ async function tsTrpcApiGenerator(tree, options) {
|
|
|
59
69
|
port,
|
|
60
70
|
...options,
|
|
61
71
|
};
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
72
|
+
if (options.infra !== 'none') {
|
|
73
|
+
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
74
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
75
|
+
iac,
|
|
76
|
+
});
|
|
77
|
+
await (0, api_constructs_1.addApiGatewayInfra)(tree, {
|
|
78
|
+
apiProjectName: backendProjectName,
|
|
79
|
+
apiNameClassName,
|
|
80
|
+
apiNameKebabCase,
|
|
81
|
+
constructType: options.infra === 'http-lambda' ? 'http' : 'rest',
|
|
82
|
+
backend: {
|
|
83
|
+
type: 'trpc',
|
|
84
|
+
projectAlias: enhancedOptions.backendProjectAlias,
|
|
85
|
+
bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle'),
|
|
86
|
+
integrationPattern: getIntegrationPattern(options),
|
|
87
|
+
...(options.auth === 'custom' && {
|
|
88
|
+
authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle', 'authorizer'),
|
|
89
|
+
}),
|
|
90
|
+
},
|
|
91
|
+
auth: options.auth,
|
|
92
|
+
iac,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
79
95
|
projectConfig.metadata = {
|
|
80
96
|
...projectConfig.metadata,
|
|
81
97
|
apiName: options.name,
|
|
@@ -101,32 +117,34 @@ async function tsTrpcApiGenerator(tree, options) {
|
|
|
101
117
|
},
|
|
102
118
|
},
|
|
103
119
|
};
|
|
104
|
-
|
|
105
|
-
targetFilePath: 'src/handler.ts',
|
|
106
|
-
external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
|
|
107
|
-
});
|
|
108
|
-
if (options.auth === 'custom') {
|
|
120
|
+
if (options.infra !== 'none') {
|
|
109
121
|
await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
|
|
110
|
-
targetFilePath: 'src/
|
|
111
|
-
|
|
112
|
-
external: [/@aws-sdk\/.*/],
|
|
122
|
+
targetFilePath: 'src/handler.ts',
|
|
123
|
+
external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
|
|
113
124
|
});
|
|
125
|
+
if (options.auth === 'custom') {
|
|
126
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
|
|
127
|
+
targetFilePath: 'src/authorizer.ts',
|
|
128
|
+
bundleOutputDir: 'authorizer',
|
|
129
|
+
external: [/@aws-sdk\/.*/],
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
|
|
114
133
|
}
|
|
115
|
-
(0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
|
|
116
134
|
projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
|
|
117
135
|
(0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
|
|
118
136
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), backendRoot, enhancedOptions, {
|
|
119
137
|
overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
|
|
120
138
|
});
|
|
121
139
|
tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'lib'));
|
|
122
|
-
if (options.auth === 'custom') {
|
|
140
|
+
if (options.infra !== 'none' && options.auth === 'custom') {
|
|
123
141
|
const authorizerType = options.infra === 'http-lambda' ? 'http' : 'rest';
|
|
124
142
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', authorizerType), (0, devkit_1.joinPathFragments)(backendRoot, 'src'), {}, {
|
|
125
143
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
126
144
|
});
|
|
127
145
|
}
|
|
128
146
|
// Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)
|
|
129
|
-
if (options.infra !== 'rest-lambda') {
|
|
147
|
+
if (options.infra !== 'rest-lambda' && options.infra !== 'none') {
|
|
130
148
|
tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'schema', 'z-async-iterable.ts'));
|
|
131
149
|
}
|
|
132
150
|
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
|
|
@@ -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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"}
|
|
@@ -8,7 +8,7 @@ import { TsProjectGeneratorSchema } from '../../ts/lib/schema';
|
|
|
8
8
|
|
|
9
9
|
export interface TsTrpcApiGeneratorSchema {
|
|
10
10
|
name: string;
|
|
11
|
-
infra: 'rest-lambda' | 'http-lambda';
|
|
11
|
+
infra: 'rest-lambda' | 'http-lambda' | 'none';
|
|
12
12
|
integrationPattern?: 'isolated' | 'shared';
|
|
13
13
|
auth: 'iam' | 'cognito' | 'custom';
|
|
14
14
|
directory?: TsProjectGeneratorSchema['directory'];
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
},
|
|
67
67
|
"infra": {
|
|
68
68
|
"type": "string",
|
|
69
|
-
"description": "The type of infrastructure to use to deploy this API.
|
|
69
|
+
"description": "The type of infrastructure to use to deploy this API.",
|
|
70
70
|
"default": "rest-lambda",
|
|
71
|
-
"enum": ["rest-lambda", "http-lambda"],
|
|
71
|
+
"enum": ["rest-lambda", "http-lambda", "none"],
|
|
72
72
|
"x-prompt": "What infrastructure would you like to deploy your API with?",
|
|
73
73
|
"x-priority": "important"
|
|
74
74
|
}
|
package/src/ts/api/generator.js
CHANGED
|
@@ -23,7 +23,9 @@ async function tsApiGenerator(tree, options) {
|
|
|
23
23
|
return (0, generator_2.tsSmithyApiGenerator)(tree, {
|
|
24
24
|
name: options.name,
|
|
25
25
|
namespace: options.namespace,
|
|
26
|
-
infra: '
|
|
26
|
+
infra: options.infra === 'none'
|
|
27
|
+
? 'none'
|
|
28
|
+
: (options.infra ?? 'rest-lambda'),
|
|
27
29
|
integrationPattern: options.integrationPattern,
|
|
28
30
|
auth: options.auth,
|
|
29
31
|
directory: options.directory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/api/generator.ts"],"names":[],"mappings":";;;AAaA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/api/generator.ts"],"names":[],"mappings":";;;AAaA,wCAgCC;AAvCD,uCAAmE;AACnE,4DAAkE;AAClE,6DAAqE;AAExD,QAAA,qBAAqB,GAChC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,cAAc,CAClC,IAAU,EACV,OAA6B;IAE7B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;IAE9C,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,IAAA,8BAAkB,EAAC,IAAI,EAAE;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;gBAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;QACL,KAAK,QAAQ;YACX,OAAO,IAAA,gCAAoB,EAAC,IAAI,EAAE;gBAChC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,KAAK,EACH,OAAO,CAAC,KAAK,KAAK,MAAM;oBACtB,CAAC,CAAC,MAAM;oBACR,CAAC,CAAE,CAAC,OAAO,CAAC,KAAK,IAAI,aAAa,CAAmB;gBACzD,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;gBAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;IACP,CAAC;AACH,CAAC;AAED,kBAAe,cAAc,CAAC"}
|
package/src/ts/api/schema.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export interface TsApiGeneratorSchema {
|
|
|
9
9
|
name: string;
|
|
10
10
|
framework?: 'trpc' | 'smithy';
|
|
11
11
|
namespace?: string;
|
|
12
|
-
infra: 'rest-lambda' | 'http-lambda';
|
|
12
|
+
infra: 'rest-lambda' | 'http-lambda' | 'none';
|
|
13
13
|
integrationPattern?: 'isolated' | 'shared';
|
|
14
14
|
auth: 'iam' | 'cognito' | 'custom';
|
|
15
15
|
directory?: TsProjectGeneratorSchema['directory'];
|
package/src/ts/api/schema.json
CHANGED
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"type": "string",
|
|
97
97
|
"description": "The type of infrastructure to use to deploy this API.",
|
|
98
98
|
"default": "rest-lambda",
|
|
99
|
-
"enum": ["rest-lambda", "http-lambda"],
|
|
99
|
+
"enum": ["rest-lambda", "http-lambda", "none"],
|
|
100
100
|
"x-prompt": "What infrastructure would you like to deploy your API with?",
|
|
101
101
|
"x-priority": "important"
|
|
102
102
|
}
|
|
@@ -44,24 +44,27 @@ const tsLambdaFunctionGenerator = async (tree, schema) => {
|
|
|
44
44
|
const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.name);
|
|
45
45
|
const functionPathFromProjectRoot = (0, devkit_1.joinPathFragments)('src', schema.functionPath ?? '', `${lambdaFunctionKebabCase}.ts`);
|
|
46
46
|
const functionPath = (0, devkit_1.joinPathFragments)(projectConfig.root, functionPathFromProjectRoot);
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
const infra = schema.infra ?? 'lambda';
|
|
48
|
+
const handlerAlreadyExists = tree.exists(functionPath);
|
|
49
|
+
if (handlerAlreadyExists && infra === 'none') {
|
|
49
50
|
throw new Error(`This project already has a lambda function with the name ${nameKebabCase}. Please remove the lambda function before running this generator or use a different name.`);
|
|
50
51
|
}
|
|
51
|
-
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
52
|
-
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
53
|
-
iac,
|
|
54
|
-
});
|
|
55
52
|
const bundleOutputDir = (0, devkit_1.joinPathFragments)('lambda', lambdaFunctionKebabCase);
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
53
|
+
if (infra !== 'none') {
|
|
54
|
+
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
55
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
56
|
+
iac,
|
|
57
|
+
});
|
|
58
|
+
await (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
|
|
59
|
+
functionProjectName: projectConfig.name,
|
|
60
|
+
nameClassName: constructFunctionClassName,
|
|
61
|
+
nameKebabCase: constructFunctionNameKebabCase,
|
|
62
|
+
handler: 'index.handler',
|
|
63
|
+
runtime: 'node',
|
|
64
|
+
bundlePathFromRoot: (0, devkit_1.joinPathFragments)('dist', dir, 'bundle', bundleOutputDir),
|
|
65
|
+
iac,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
65
68
|
const enhancedOptions = {
|
|
66
69
|
...schema,
|
|
67
70
|
lambdaFunctionCamelCase,
|
|
@@ -69,12 +72,14 @@ const tsLambdaFunctionGenerator = async (tree, schema) => {
|
|
|
69
72
|
lambdaFunctionKebabCase,
|
|
70
73
|
returnType: io_1.TS_HANDLER_RETURN_TYPES[schema.event],
|
|
71
74
|
};
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
if (infra !== 'none') {
|
|
76
|
+
// Add a bundle target for the function
|
|
77
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
|
|
78
|
+
targetFilePath: functionPathFromProjectRoot,
|
|
79
|
+
bundleOutputDir,
|
|
80
|
+
external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
|
|
81
|
+
});
|
|
82
|
+
}
|
|
78
83
|
projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
|
|
79
84
|
(0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
|
|
80
85
|
// Generate the lambda handler file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lambda-function/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,qEAA0E;AAC1E,6CAAyE;AACzE,+CAA0D;AAC1D,+CAAoD;AACpD,uCAKwB;AACxB,iDAAsE;AACtE,mDAAoD;AACpD,gFAAyC;AACzC,6BAA+C;AAC/C,6FAA6F;AAC7F,yCAA6C;AAC7C,sDAAsE;AAEzD,QAAA,iCAAiC,GAC5C,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B;;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,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAE5E,gDAAgD;IAChD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,oDAAoD,MAAM,CAAC,OAAO,yEAAyE,CAC5I,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,oBAAoB,GAAG,IAAA,mBAAW,EAAC,uBAAuB,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,8BAA8B,GAAG,GAAG,oBAAoB,IAAI,aAAa,EAAE,CAAC;IAClF,MAAM,0BAA0B,GAAG,IAAA,mBAAW,EAC5C,8BAA8B,CAC/B,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,0BAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,uBAAuB,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,uBAAuB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,KAAK,EACL,MAAM,CAAC,YAAY,IAAI,EAAE,EACzB,GAAG,uBAAuB,KAAK,CAChC,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,2BAA2B,CAC5B,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lambda-function/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,qEAA0E;AAC1E,6CAAyE;AACzE,+CAA0D;AAC1D,+CAAoD;AACpD,uCAKwB;AACxB,iDAAsE;AACtE,mDAAoD;AACpD,gFAAyC;AACzC,6BAA+C;AAC/C,6FAA6F;AAC7F,yCAA6C;AAC7C,sDAAsE;AAEzD,QAAA,iCAAiC,GAC5C,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B;;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,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAE5E,gDAAgD;IAChD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,oDAAoD,MAAM,CAAC,OAAO,yEAAyE,CAC5I,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,oBAAoB,GAAG,IAAA,mBAAW,EAAC,uBAAuB,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,8BAA8B,GAAG,GAAG,oBAAoB,IAAI,aAAa,EAAE,CAAC;IAClF,MAAM,0BAA0B,GAAG,IAAA,mBAAW,EAC5C,8BAA8B,CAC/B,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,0BAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,uBAAuB,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,uBAAuB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,KAAK,EACL,MAAM,CAAC,YAAY,IAAI,EAAE,EACzB,GAAG,uBAAuB,KAAK,CAChC,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,2BAA2B,CAC5B,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,QAAQ,CAAC;IACvC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAEvD,IAAI,oBAAoB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,4DAA4D,aAAa,4FAA4F,CACtK,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAE7E,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,MAAM,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAE/C,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE;YACpC,GAAG;SACJ,CAAC,CAAC;QAEH,MAAM,IAAA,4CAAsB,EAAC,IAAI,EAAE;YACjC,mBAAmB,EAAE,aAAa,CAAC,IAAI;YACvC,aAAa,EAAE,0BAA0B;YACzC,aAAa,EAAE,8BAA8B;YAC7C,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE,MAAM;YACf,kBAAkB,EAAE,IAAA,0BAAiB,EACnC,MAAM,EACN,GAAG,EACH,QAAQ,EACR,eAAe,CAChB;YACD,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GAAG;QACtB,GAAG,MAAM;QACT,uBAAuB;QACvB,uBAAuB;QACvB,uBAAuB;QACvB,UAAU,EAAE,4BAAuB,CAAC,MAAM,CAAC,KAAK,CAAC;KAClD,CAAC;IAEF,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACrB,uCAAuC;QACvC,MAAM,IAAA,kCAAyB,EAAC,IAAI,EAAE,aAAa,EAAE;YACnD,cAAc,EAAE,2BAA2B;YAC3C,eAAe;YACf,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,kCAAkC;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,OAAO,GAAG,IAAA,uBAAc,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,mCAAmC;IACnC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,EAChD,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,EACtE,eAAe,EACf,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;QACX,+BAA+B;QAC/B,+BAA+B;QAC/B,gCAAgC;QAChC,mCAAmC;QACnC,+BAA+B;QAC/B,+BAA+B;QAC/B,aAAa;QACb,KAAK;KACN,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,mBAAmB,CAAC,CAAC,CACpC,CAAC;IAEF,IAAA,kCAA6B,EAC3B,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,yCAAiC,EACjC,2BAA2B,EAC3B,uBAAuB,CACxB,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,yCAAiC;KAClC,CAAC,CAAC;IAEH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AA9IW,QAAA,yBAAyB,6BA8IpC;AAEF,kBAAe,iCAAyB,CAAC"}
|
|
@@ -49,10 +49,13 @@ export type EventSource =
|
|
|
49
49
|
| 'VpcLatticeSchema'
|
|
50
50
|
| 'VpcLatticeV2Schema';
|
|
51
51
|
|
|
52
|
+
export type LambdaInfraOption = 'lambda' | 'none';
|
|
53
|
+
|
|
52
54
|
export interface TsLambdaFunctionGeneratorSchema {
|
|
53
55
|
readonly project: string;
|
|
54
56
|
readonly name: string;
|
|
55
57
|
readonly functionPath?: string;
|
|
56
58
|
readonly event?: EventSource;
|
|
59
|
+
readonly infra?: LambdaInfraOption;
|
|
57
60
|
readonly iac: IacOption;
|
|
58
61
|
}
|
|
@@ -77,6 +77,14 @@
|
|
|
77
77
|
"default": "Any",
|
|
78
78
|
"x-prompt": "Enter the event source schema to use for the lambda function"
|
|
79
79
|
},
|
|
80
|
+
"infra": {
|
|
81
|
+
"type": "string",
|
|
82
|
+
"description": "The type of infrastructure to deploy your Lambda function with.",
|
|
83
|
+
"enum": ["lambda", "none"],
|
|
84
|
+
"default": "lambda",
|
|
85
|
+
"x-priority": "important",
|
|
86
|
+
"x-prompt": "What infrastructure would you like to deploy your Lambda function with?"
|
|
87
|
+
},
|
|
80
88
|
"iac": {
|
|
81
89
|
"type": "string",
|
|
82
90
|
"description": "The preferred IaC provider. By default this is inherited from your initial selection.",
|
package/src/ts/rdb/generator.js
CHANGED
|
@@ -31,17 +31,26 @@ const tsRdbGenerator = async (tree, options) => {
|
|
|
31
31
|
const nameClassName = (0, names_1.toClassName)(options.name);
|
|
32
32
|
const databaseUser = options.databaseUser ?? 'dbadmin';
|
|
33
33
|
const databaseName = (0, names_1.snakeCase)(options.databaseName ?? options.name);
|
|
34
|
-
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
35
34
|
const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
|
|
36
35
|
const { fullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, {
|
|
37
36
|
name: options.name,
|
|
38
37
|
directory: options.directory,
|
|
39
38
|
subDirectory: options.subDirectory,
|
|
40
39
|
});
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
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: options.name,
|
|
51
|
+
directory: options.directory,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
45
54
|
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(dir, 'tsconfig.lib.json'), (tsConfig) => ({
|
|
46
55
|
...tsConfig,
|
|
47
56
|
include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],
|
|
@@ -73,29 +82,33 @@ const tsRdbGenerator = async (tree, options) => {
|
|
|
73
82
|
(0, git_1.updateGitIgnore)(tree, dir, (patterns) => [...patterns, 'generated/prisma']);
|
|
74
83
|
const relativePathToRoot = (0, paths_1.getRelativePathToRootByDirectory)(projectConfig.root);
|
|
75
84
|
const fs = new fs_1.FsCommands(tree);
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
85
|
+
const migrationBundleDir = (0, devkit_1.joinPathFragments)('dist', projectConfig.root, 'bundle', 'migration');
|
|
86
|
+
const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${(0, names_1.kebabCase)(options.name)}-migration:latest`;
|
|
87
|
+
if (options.infra !== 'none') {
|
|
88
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
|
|
89
|
+
targetFilePath: 'src/migration-handler.ts',
|
|
90
|
+
bundleOutputDir: 'migration',
|
|
91
|
+
});
|
|
92
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
|
|
93
|
+
targetFilePath: 'src/create-db-user-handler.ts',
|
|
94
|
+
bundleOutputDir: 'create-db-user',
|
|
95
|
+
});
|
|
96
|
+
const bundleTarget = projectConfig.targets['bundle'];
|
|
97
|
+
const rolldownCommand = bundleTarget.options.command;
|
|
98
|
+
delete bundleTarget.options.command;
|
|
99
|
+
bundleTarget.options = {
|
|
100
|
+
...bundleTarget.options,
|
|
101
|
+
commands: [
|
|
102
|
+
fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),
|
|
103
|
+
fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),
|
|
104
|
+
fs.cp('prisma', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`),
|
|
105
|
+
fs.cp('prisma.config.ts', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`),
|
|
106
|
+
fs.cp('Dockerfile', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`),
|
|
107
|
+
rolldownCommand,
|
|
108
|
+
],
|
|
109
|
+
parallel: false,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
99
112
|
projectConfig.targets.generate = {
|
|
100
113
|
executor: 'nx:run-commands',
|
|
101
114
|
outputs: ['{projectRoot}/generated/prisma'],
|
|
@@ -143,39 +156,44 @@ const tsRdbGenerator = async (tree, options) => {
|
|
|
143
156
|
},
|
|
144
157
|
},
|
|
145
158
|
};
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
159
|
+
if (options.infra !== 'none') {
|
|
160
|
+
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
161
|
+
if (iac === 'terraform') {
|
|
162
|
+
projectConfig.targets['docker'] = {
|
|
163
|
+
cache: true,
|
|
164
|
+
executor: 'nx:run-commands',
|
|
165
|
+
options: {
|
|
166
|
+
command: `${containers} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`,
|
|
167
|
+
},
|
|
168
|
+
dependsOn: ['bundle'],
|
|
169
|
+
};
|
|
170
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'docker');
|
|
171
|
+
}
|
|
172
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
|
|
158
173
|
}
|
|
159
174
|
(0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'compile', 'generate');
|
|
160
175
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfig);
|
|
161
176
|
(0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_RDB_GENERATOR_INFO, {
|
|
162
177
|
engine: options.engine,
|
|
163
178
|
});
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
iac
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
+
if (options.infra !== 'none') {
|
|
180
|
+
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
181
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
|
|
182
|
+
await (0, rdb_constructs_1.addRdbInfra)(tree, {
|
|
183
|
+
iac,
|
|
184
|
+
projectName: fullyQualifiedName,
|
|
185
|
+
nameClassName,
|
|
186
|
+
nameKebabCase,
|
|
187
|
+
databasePackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
|
|
188
|
+
databaseName,
|
|
189
|
+
adminUser: databaseUser,
|
|
190
|
+
engine: options.engine === 'mysql' ? 'mysql' : 'postgres',
|
|
191
|
+
migrationBundleDir,
|
|
192
|
+
createDbUserBundleDir: (0, devkit_1.joinPathFragments)('dist', projectConfig.root, 'bundle', 'create-db-user'),
|
|
193
|
+
dockerImageTag,
|
|
194
|
+
containers,
|
|
195
|
+
});
|
|
196
|
+
}
|
|
179
197
|
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
|
|
180
198
|
'@aws-lambda-powertools/parameters',
|
|
181
199
|
'@aws-sdk/client-appconfigdata',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAUoB;AAEpB,uCAKwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,qEAA0E;AAC1E,8EAAwE;AACxE,6CAAsE;AACtE,uCAA4C;AAC5C,6CAAqE;AACrE,sEAAuE;AACvE,0CAAyD;AACzD,sDAAsE;AACtE,mDAAiE;AACjE,yCAA6C;AAC7C,uDAA2D;AAC3D,qDAAkE;AAClE,yCAAkD;AAClD,2CAA8C;AAC9C,+DAA2E;AAE9D,QAAA,qBAAqB,GAChC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,cAAc,GAAG,KAAK,EACjC,IAAU,EACV,OAA6B,EACD,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,SAAS,CAAC;IACvD,MAAM,YAAY,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,MAAM,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":"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"}
|
package/src/ts/rdb/schema.d.ts
CHANGED
package/src/ts/rdb/schema.json
CHANGED
|
@@ -2030,7 +2030,8 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2030
2030
|
"metadata": {
|
|
2031
2031
|
"generator": "ts#react-website",
|
|
2032
2032
|
"ux": "cloudscape",
|
|
2033
|
-
"framework": "react"
|
|
2033
|
+
"framework": "react",
|
|
2034
|
+
"infra": "cloudfront-s3"
|
|
2034
2035
|
},
|
|
2035
2036
|
"targets": {
|
|
2036
2037
|
"build": {
|
|
@@ -3657,7 +3658,8 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3657
3658
|
"metadata": {
|
|
3658
3659
|
"generator": "ts#react-website",
|
|
3659
3660
|
"ux": "cloudscape",
|
|
3660
|
-
"framework": "react"
|
|
3661
|
+
"framework": "react",
|
|
3662
|
+
"infra": "cloudfront-s3"
|
|
3661
3663
|
},
|
|
3662
3664
|
"targets": {
|
|
3663
3665
|
"build": {
|