@aws/nx-plugin 1.0.0-rc.8 → 1.0.0-rc.9
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 +0 -27
- package/README.md +8 -8
- package/package.json +1 -1
- package/src/connection/agent-serve-local.js +1 -1
- package/src/connection/agent-serve-local.js.map +1 -1
- package/src/infra/app/generator.js +6 -4
- package/src/infra/app/generator.js.map +1 -1
- package/src/mcp-server/tools/create-workspace-command.js +2 -2
- package/src/mcp-server/tools/create-workspace-command.js.map +1 -1
- package/src/py/agent/__snapshots__/generator.spec.ts.snap +2 -0
- package/src/py/agent/files/common/agent.py.template +2 -0
- package/src/py/agent/generator.js +3 -1
- package/src/py/agent/generator.js.map +1 -1
- package/src/py/agent/mcp-connection/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/py/fast-api/generator.js +11 -5
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/open-api.js +4 -1
- package/src/py/fast-api/react/open-api.js.map +1 -1
- package/src/py/mcp-server/generator.js +5 -15
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/project/generator.js +74 -62
- package/src/py/project/generator.js.map +1 -1
- package/src/smithy/project/__snapshots__/generator.spec.ts.snap +16 -16
- package/src/smithy/project/generator.js +25 -23
- package/src/smithy/project/generator.js.map +1 -1
- package/src/smithy/ts/api/generator.js +8 -0
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/terraform/project/generator.js +7 -2
- package/src/terraform/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.js +1 -0
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/ts/agent/__snapshots__/generator.spec.ts.snap +6 -2
- package/src/ts/agent/files/common/agent.ts.template +6 -2
- package/src/ts/agent/generator.js +8 -3
- package/src/ts/agent/generator.js.map +1 -1
- package/src/ts/agent/mcp-connection/__snapshots__/generator.spec.ts.snap +1 -0
- package/src/ts/astro-docs/__snapshots__/generator.spec.ts.snap +6 -6
- package/src/ts/astro-docs/generator.js +10 -7
- package/src/ts/astro-docs/generator.js.map +1 -1
- package/src/ts/lib/__snapshots__/generator.spec.ts.snap +9 -9
- package/src/ts/lib/biome.js +5 -2
- package/src/ts/lib/biome.js.map +1 -1
- package/src/ts/lib/generator.js +21 -17
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/ts-project-utils.d.ts +10 -0
- package/src/ts/lib/ts-project-utils.js +22 -8
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/mcp-server/generator.js +8 -3
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/nx-generator/generator.js +16 -11
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/nx-plugin/generator.js +7 -6
- package/src/ts/nx-plugin/generator.js.map +1 -1
- package/src/ts/nx-plugin/utils.js +9 -3
- package/src/ts/nx-plugin/utils.js.map +1 -1
- package/src/ts/rdb/__snapshots__/generator.spec.ts.snap +36 -18
- package/src/ts/rdb/generator.js +19 -14
- package/src/ts/rdb/generator.js.map +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +38 -38
- package/src/ts/react-website/app/generator.js +8 -4
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap +0 -2
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.ux-provider.spec.ts.snap +0 -20
- package/src/ts/react-website/cognito-auth/generator.js +0 -3
- package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/grit/cloudscape-auth-menu.grit +3 -1
- package/src/ts/react-website/cognito-auth/grit/none-auth-menu.grit +1 -0
- package/src/ts/react-website/cognito-auth/grit/shadcn-auth-menu.grit +3 -1
- package/src/ts/react-website/cognito-auth/grit/shadcn-state-declarations.grit +3 -1
- package/src/utils/agent-connection/agent-connection.js +8 -2
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/utils/agent-connection/files/core-runtime-config/model-errors.ts.template +36 -0
- package/src/utils/agent-connection/files/py-core-runtime-config/model_errors.py.template +40 -0
- package/src/utils/agent-core-constructs/agent-core-constructs.js +2 -10
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/ast/website.js +1 -1
- package/src/utils/ast.d.ts +4 -0
- package/src/utils/ast.js +24 -1
- package/src/utils/ast.js.map +1 -1
- package/src/utils/dynamodb-constructs/dynamodb-constructs.js +2 -10
- package/src/utils/dynamodb-constructs/dynamodb-constructs.js.map +1 -1
- package/src/utils/metrics.d.ts +7 -1
- package/src/utils/metrics.js +58 -28
- package/src/utils/metrics.js.map +1 -1
- package/src/utils/nx.d.ts +5 -0
- package/src/utils/nx.js +44 -12
- package/src/utils/nx.js.map +1 -1
- package/src/utils/port.d.ts +25 -4
- package/src/utils/port.js +56 -9
- package/src/utils/port.js.map +1 -1
- package/src/utils/py.js +12 -5
- package/src/utils/py.js.map +1 -1
- package/src/utils/rdb-constructs/files/terraform/core/rdb/aurora/aurora.tf.template +18 -9
- package/src/utils/rdb-constructs/rdb-constructs.js +2 -10
- package/src/utils/rdb-constructs/rdb-constructs.js.map +1 -1
|
@@ -1056,10 +1056,19 @@ variable "tags" {
|
|
|
1056
1056
|
default = {}
|
|
1057
1057
|
}
|
|
1058
1058
|
|
|
1059
|
+
# Suffix appended to physical resource names so that multiple deployments
|
|
1060
|
+
# (e.g. separate environments in the same account and region) don't collide.
|
|
1061
|
+
resource "random_string" "suffix" {
|
|
1062
|
+
length = 8
|
|
1063
|
+
special = false
|
|
1064
|
+
upper = false
|
|
1065
|
+
}
|
|
1066
|
+
|
|
1059
1067
|
locals {
|
|
1060
1068
|
default_port = var.engine == "aurora-mysql" ? 3306 : 5432
|
|
1061
1069
|
default_engine_version = var.engine == "aurora-mysql" ? "8.0.mysql_aurora.3.12.0" : "17.7"
|
|
1062
1070
|
parameter_group_family = var.engine == "aurora-mysql" ? "aurora-mysql8.0" : "aurora-postgresql\${split(".", coalesce(var.engine_version, local.default_engine_version))[0]}"
|
|
1071
|
+
cluster_name = "\${var.name}-aurora-\${random_string.suffix.result}"
|
|
1063
1072
|
}
|
|
1064
1073
|
|
|
1065
1074
|
resource "aws_rds_cluster_parameter_group" "database" {
|
|
@@ -1157,7 +1166,7 @@ resource "aws_security_group" "database" {
|
|
|
1157
1166
|
}
|
|
1158
1167
|
|
|
1159
1168
|
resource "aws_db_subnet_group" "database" {
|
|
1160
|
-
name =
|
|
1169
|
+
name = local.cluster_name
|
|
1161
1170
|
subnet_ids = var.subnet_ids
|
|
1162
1171
|
|
|
1163
1172
|
tags = merge(var.tags, {
|
|
@@ -1197,7 +1206,7 @@ resource "aws_secretsmanager_secret_version" "credentials" {
|
|
|
1197
1206
|
resource "aws_rds_cluster" "database" {
|
|
1198
1207
|
#checkov:skip=CKV2_AWS_27:Query logging can be enabled with enable_cloudwatch_logs; this module defaults to CDK-equivalent behavior unless logging is requested
|
|
1199
1208
|
#checkov:skip=CKV_AWS_139:Deletion protection is enabled but checkov is unable to detect it correctly
|
|
1200
|
-
cluster_identifier =
|
|
1209
|
+
cluster_identifier = local.cluster_name
|
|
1201
1210
|
engine = var.engine
|
|
1202
1211
|
engine_version = coalesce(var.engine_version, local.default_engine_version)
|
|
1203
1212
|
database_name = var.database_name
|
|
@@ -1211,7 +1220,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
1211
1220
|
kms_key_id = aws_kms_key.database.arn
|
|
1212
1221
|
deletion_protection = var.deletion_protection
|
|
1213
1222
|
skip_final_snapshot = var.skip_final_snapshot
|
|
1214
|
-
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${
|
|
1223
|
+
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${local.cluster_name}-final-snapshot"
|
|
1215
1224
|
iam_database_authentication_enabled = true
|
|
1216
1225
|
monitoring_interval = 5
|
|
1217
1226
|
monitoring_role_arn = aws_iam_role.enhanced_monitoring.arn
|
|
@@ -1231,7 +1240,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
1231
1240
|
resource "aws_rds_cluster_instance" "database" {
|
|
1232
1241
|
count = var.instance_count
|
|
1233
1242
|
|
|
1234
|
-
identifier = "\${
|
|
1243
|
+
identifier = "\${local.cluster_name}-\${count.index + 1}"
|
|
1235
1244
|
cluster_identifier = aws_rds_cluster.database.id
|
|
1236
1245
|
instance_class = "db.serverless"
|
|
1237
1246
|
engine = aws_rds_cluster.database.engine
|
|
@@ -1285,7 +1294,7 @@ resource "aws_vpc_security_group_ingress_rule" "rotation_to_database" {
|
|
|
1285
1294
|
resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
1286
1295
|
#checkov:skip=CKV_AWS_124:SNS event notifications are not required for the credentials rotation stack
|
|
1287
1296
|
count = var.enable_credential_rotation ? 1 : 0
|
|
1288
|
-
name = "\${
|
|
1297
|
+
name = "\${local.cluster_name}-credentials-rotation"
|
|
1289
1298
|
|
|
1290
1299
|
capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
|
|
1291
1300
|
|
|
@@ -1299,7 +1308,7 @@ resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
|
1299
1308
|
SecretId = aws_secretsmanager_secret.credentials.arn
|
|
1300
1309
|
HostedRotationLambda = {
|
|
1301
1310
|
RotationType = var.engine == "aurora-mysql" ? "MySQLSingleUser" : "PostgreSQLSingleUser"
|
|
1302
|
-
RotationLambdaName = "\${
|
|
1311
|
+
RotationLambdaName = "\${local.cluster_name}-credentials-rotation"
|
|
1303
1312
|
VpcSecurityGroupIds = aws_security_group.rotation[0].id
|
|
1304
1313
|
VpcSubnetIds = join(",", var.lambda_subnet_ids)
|
|
1305
1314
|
}
|
|
@@ -1379,7 +1388,7 @@ resource "aws_security_group" "proxy" {
|
|
|
1379
1388
|
resource "aws_db_proxy" "aurora" {
|
|
1380
1389
|
count = var.enable_rds_proxy ? 1 : 0
|
|
1381
1390
|
|
|
1382
|
-
name = "\${var.name}-proxy"
|
|
1391
|
+
name = "\${var.name}-proxy-\${random_string.suffix.result}"
|
|
1383
1392
|
default_auth_scheme = "IAM_AUTH"
|
|
1384
1393
|
engine_family = var.engine == "aurora-mysql" ? "MYSQL" : "POSTGRESQL"
|
|
1385
1394
|
role_arn = aws_iam_role.proxy[0].arn
|
|
@@ -1525,7 +1534,7 @@ resource "aws_iam_role_policy_attachment" "backup" {
|
|
|
1525
1534
|
resource "aws_backup_vault" "database" {
|
|
1526
1535
|
count = var.enable_backup ? 1 : 0
|
|
1527
1536
|
|
|
1528
|
-
name = "\${
|
|
1537
|
+
name = "\${local.cluster_name}-backup"
|
|
1529
1538
|
kms_key_arn = aws_kms_key.database.arn
|
|
1530
1539
|
tags = var.tags
|
|
1531
1540
|
}
|
|
@@ -1533,7 +1542,7 @@ resource "aws_backup_vault" "database" {
|
|
|
1533
1542
|
resource "aws_backup_plan" "database" {
|
|
1534
1543
|
count = var.enable_backup ? 1 : 0
|
|
1535
1544
|
|
|
1536
|
-
name = "\${
|
|
1545
|
+
name = "\${local.cluster_name}-backup"
|
|
1537
1546
|
|
|
1538
1547
|
rule {
|
|
1539
1548
|
rule_name = "daily-backup"
|
|
@@ -2506,10 +2515,19 @@ variable "tags" {
|
|
|
2506
2515
|
default = {}
|
|
2507
2516
|
}
|
|
2508
2517
|
|
|
2518
|
+
# Suffix appended to physical resource names so that multiple deployments
|
|
2519
|
+
# (e.g. separate environments in the same account and region) don't collide.
|
|
2520
|
+
resource "random_string" "suffix" {
|
|
2521
|
+
length = 8
|
|
2522
|
+
special = false
|
|
2523
|
+
upper = false
|
|
2524
|
+
}
|
|
2525
|
+
|
|
2509
2526
|
locals {
|
|
2510
2527
|
default_port = var.engine == "aurora-mysql" ? 3306 : 5432
|
|
2511
2528
|
default_engine_version = var.engine == "aurora-mysql" ? "8.0.mysql_aurora.3.12.0" : "17.7"
|
|
2512
2529
|
parameter_group_family = var.engine == "aurora-mysql" ? "aurora-mysql8.0" : "aurora-postgresql\${split(".", coalesce(var.engine_version, local.default_engine_version))[0]}"
|
|
2530
|
+
cluster_name = "\${var.name}-aurora-\${random_string.suffix.result}"
|
|
2513
2531
|
}
|
|
2514
2532
|
|
|
2515
2533
|
resource "aws_rds_cluster_parameter_group" "database" {
|
|
@@ -2607,7 +2625,7 @@ resource "aws_security_group" "database" {
|
|
|
2607
2625
|
}
|
|
2608
2626
|
|
|
2609
2627
|
resource "aws_db_subnet_group" "database" {
|
|
2610
|
-
name =
|
|
2628
|
+
name = local.cluster_name
|
|
2611
2629
|
subnet_ids = var.subnet_ids
|
|
2612
2630
|
|
|
2613
2631
|
tags = merge(var.tags, {
|
|
@@ -2647,7 +2665,7 @@ resource "aws_secretsmanager_secret_version" "credentials" {
|
|
|
2647
2665
|
resource "aws_rds_cluster" "database" {
|
|
2648
2666
|
#checkov:skip=CKV2_AWS_27:Query logging can be enabled with enable_cloudwatch_logs; this module defaults to CDK-equivalent behavior unless logging is requested
|
|
2649
2667
|
#checkov:skip=CKV_AWS_139:Deletion protection is enabled but checkov is unable to detect it correctly
|
|
2650
|
-
cluster_identifier =
|
|
2668
|
+
cluster_identifier = local.cluster_name
|
|
2651
2669
|
engine = var.engine
|
|
2652
2670
|
engine_version = coalesce(var.engine_version, local.default_engine_version)
|
|
2653
2671
|
database_name = var.database_name
|
|
@@ -2661,7 +2679,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
2661
2679
|
kms_key_id = aws_kms_key.database.arn
|
|
2662
2680
|
deletion_protection = var.deletion_protection
|
|
2663
2681
|
skip_final_snapshot = var.skip_final_snapshot
|
|
2664
|
-
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${
|
|
2682
|
+
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${local.cluster_name}-final-snapshot"
|
|
2665
2683
|
iam_database_authentication_enabled = true
|
|
2666
2684
|
monitoring_interval = 5
|
|
2667
2685
|
monitoring_role_arn = aws_iam_role.enhanced_monitoring.arn
|
|
@@ -2681,7 +2699,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
2681
2699
|
resource "aws_rds_cluster_instance" "database" {
|
|
2682
2700
|
count = var.instance_count
|
|
2683
2701
|
|
|
2684
|
-
identifier = "\${
|
|
2702
|
+
identifier = "\${local.cluster_name}-\${count.index + 1}"
|
|
2685
2703
|
cluster_identifier = aws_rds_cluster.database.id
|
|
2686
2704
|
instance_class = "db.serverless"
|
|
2687
2705
|
engine = aws_rds_cluster.database.engine
|
|
@@ -2735,7 +2753,7 @@ resource "aws_vpc_security_group_ingress_rule" "rotation_to_database" {
|
|
|
2735
2753
|
resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
2736
2754
|
#checkov:skip=CKV_AWS_124:SNS event notifications are not required for the credentials rotation stack
|
|
2737
2755
|
count = var.enable_credential_rotation ? 1 : 0
|
|
2738
|
-
name = "\${
|
|
2756
|
+
name = "\${local.cluster_name}-credentials-rotation"
|
|
2739
2757
|
|
|
2740
2758
|
capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
|
|
2741
2759
|
|
|
@@ -2749,7 +2767,7 @@ resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
|
2749
2767
|
SecretId = aws_secretsmanager_secret.credentials.arn
|
|
2750
2768
|
HostedRotationLambda = {
|
|
2751
2769
|
RotationType = var.engine == "aurora-mysql" ? "MySQLSingleUser" : "PostgreSQLSingleUser"
|
|
2752
|
-
RotationLambdaName = "\${
|
|
2770
|
+
RotationLambdaName = "\${local.cluster_name}-credentials-rotation"
|
|
2753
2771
|
VpcSecurityGroupIds = aws_security_group.rotation[0].id
|
|
2754
2772
|
VpcSubnetIds = join(",", var.lambda_subnet_ids)
|
|
2755
2773
|
}
|
|
@@ -2829,7 +2847,7 @@ resource "aws_security_group" "proxy" {
|
|
|
2829
2847
|
resource "aws_db_proxy" "aurora" {
|
|
2830
2848
|
count = var.enable_rds_proxy ? 1 : 0
|
|
2831
2849
|
|
|
2832
|
-
name = "\${var.name}-proxy"
|
|
2850
|
+
name = "\${var.name}-proxy-\${random_string.suffix.result}"
|
|
2833
2851
|
default_auth_scheme = "IAM_AUTH"
|
|
2834
2852
|
engine_family = var.engine == "aurora-mysql" ? "MYSQL" : "POSTGRESQL"
|
|
2835
2853
|
role_arn = aws_iam_role.proxy[0].arn
|
|
@@ -2975,7 +2993,7 @@ resource "aws_iam_role_policy_attachment" "backup" {
|
|
|
2975
2993
|
resource "aws_backup_vault" "database" {
|
|
2976
2994
|
count = var.enable_backup ? 1 : 0
|
|
2977
2995
|
|
|
2978
|
-
name = "\${
|
|
2996
|
+
name = "\${local.cluster_name}-backup"
|
|
2979
2997
|
kms_key_arn = aws_kms_key.database.arn
|
|
2980
2998
|
tags = var.tags
|
|
2981
2999
|
}
|
|
@@ -2983,7 +3001,7 @@ resource "aws_backup_vault" "database" {
|
|
|
2983
3001
|
resource "aws_backup_plan" "database" {
|
|
2984
3002
|
count = var.enable_backup ? 1 : 0
|
|
2985
3003
|
|
|
2986
|
-
name = "\${
|
|
3004
|
+
name = "\${local.cluster_name}-backup"
|
|
2987
3005
|
|
|
2988
3006
|
rule {
|
|
2989
3007
|
rule_name = "daily-backup"
|
package/src/ts/rdb/generator.js
CHANGED
|
@@ -92,20 +92,25 @@ const tsRdbGenerator = async (tree, options) => {
|
|
|
92
92
|
bundleOutputDir: 'create-db-user',
|
|
93
93
|
});
|
|
94
94
|
const bundleTarget = projectConfig.targets['bundle'];
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
95
|
+
// The bundle target starts with a single rolldown `command`. Wrap it with
|
|
96
|
+
// the migration asset copy steps, unless it has already been transformed
|
|
97
|
+
// into a `commands` array on a previous run.
|
|
98
|
+
if (!bundleTarget.options.commands) {
|
|
99
|
+
const rolldownCommand = bundleTarget.options.command;
|
|
100
|
+
delete bundleTarget.options.command;
|
|
101
|
+
bundleTarget.options = {
|
|
102
|
+
...bundleTarget.options,
|
|
103
|
+
commands: [
|
|
104
|
+
fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),
|
|
105
|
+
fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),
|
|
106
|
+
fs.cp('prisma', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`),
|
|
107
|
+
fs.cp('prisma.config.ts', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`),
|
|
108
|
+
fs.cp('Dockerfile', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`),
|
|
109
|
+
rolldownCommand,
|
|
110
|
+
],
|
|
111
|
+
parallel: false,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
109
114
|
}
|
|
110
115
|
projectConfig.targets.generate = {
|
|
111
116
|
executor: 'nx:run-commands',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1134,6 +1134,9 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1134
1134
|
"sourceRoot": "packages/common/constructs/src",
|
|
1135
1135
|
"projectType": "library",
|
|
1136
1136
|
"tags": [],
|
|
1137
|
+
"metadata": {
|
|
1138
|
+
"generator": "ts#project"
|
|
1139
|
+
},
|
|
1137
1140
|
"targets": {
|
|
1138
1141
|
"build": {
|
|
1139
1142
|
"dependsOn": ["lint", "compile", "test", "@proj/test-app:build"]
|
|
@@ -1169,9 +1172,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1169
1172
|
"reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}"
|
|
1170
1173
|
}
|
|
1171
1174
|
}
|
|
1172
|
-
},
|
|
1173
|
-
"metadata": {
|
|
1174
|
-
"generator": "ts#project"
|
|
1175
1175
|
}
|
|
1176
1176
|
}
|
|
1177
1177
|
"
|
|
@@ -1993,6 +1993,22 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
1993
1993
|
"cwd": "{projectRoot}"
|
|
1994
1994
|
}
|
|
1995
1995
|
},
|
|
1996
|
+
"lint": {
|
|
1997
|
+
"executor": "nx:run-commands",
|
|
1998
|
+
"cache": true,
|
|
1999
|
+
"inputs": ["biome"],
|
|
2000
|
+
"options": {
|
|
2001
|
+
"command": "biome lint {projectRoot}"
|
|
2002
|
+
},
|
|
2003
|
+
"configurations": {
|
|
2004
|
+
"fix": {
|
|
2005
|
+
"command": "biome check --write {projectRoot}"
|
|
2006
|
+
},
|
|
2007
|
+
"skip-lint": {
|
|
2008
|
+
"command": "node -e \\"\\""
|
|
2009
|
+
}
|
|
2010
|
+
}
|
|
2011
|
+
},
|
|
1996
2012
|
"load:runtime-config": {
|
|
1997
2013
|
"executor": "nx:run-commands",
|
|
1998
2014
|
"metadata": {
|
|
@@ -2058,22 +2074,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2058
2074
|
"options": {
|
|
2059
2075
|
"reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}"
|
|
2060
2076
|
}
|
|
2061
|
-
},
|
|
2062
|
-
"lint": {
|
|
2063
|
-
"executor": "nx:run-commands",
|
|
2064
|
-
"cache": true,
|
|
2065
|
-
"inputs": ["biome"],
|
|
2066
|
-
"options": {
|
|
2067
|
-
"command": "biome lint {projectRoot}"
|
|
2068
|
-
},
|
|
2069
|
-
"configurations": {
|
|
2070
|
-
"fix": {
|
|
2071
|
-
"command": "biome check --write {projectRoot}"
|
|
2072
|
-
},
|
|
2073
|
-
"skip-lint": {
|
|
2074
|
-
"command": "node -e \\"\\""
|
|
2075
|
-
}
|
|
2076
|
-
}
|
|
2077
2077
|
}
|
|
2078
2078
|
}
|
|
2079
2079
|
}
|
|
@@ -2693,6 +2693,9 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2693
2693
|
"sourceRoot": "packages/common/constructs/src",
|
|
2694
2694
|
"projectType": "library",
|
|
2695
2695
|
"tags": [],
|
|
2696
|
+
"metadata": {
|
|
2697
|
+
"generator": "ts#project"
|
|
2698
|
+
},
|
|
2696
2699
|
"targets": {
|
|
2697
2700
|
"build": {
|
|
2698
2701
|
"dependsOn": ["lint", "compile", "test", "@proj/test-app:build"]
|
|
@@ -2728,9 +2731,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
2728
2731
|
"reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}"
|
|
2729
2732
|
}
|
|
2730
2733
|
}
|
|
2731
|
-
},
|
|
2732
|
-
"metadata": {
|
|
2733
|
-
"generator": "ts#project"
|
|
2734
2734
|
}
|
|
2735
2735
|
}
|
|
2736
2736
|
"
|
|
@@ -3552,6 +3552,22 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3552
3552
|
"cwd": "{projectRoot}"
|
|
3553
3553
|
}
|
|
3554
3554
|
},
|
|
3555
|
+
"lint": {
|
|
3556
|
+
"executor": "nx:run-commands",
|
|
3557
|
+
"cache": true,
|
|
3558
|
+
"inputs": ["biome"],
|
|
3559
|
+
"options": {
|
|
3560
|
+
"command": "biome lint {projectRoot}"
|
|
3561
|
+
},
|
|
3562
|
+
"configurations": {
|
|
3563
|
+
"fix": {
|
|
3564
|
+
"command": "biome check --write {projectRoot}"
|
|
3565
|
+
},
|
|
3566
|
+
"skip-lint": {
|
|
3567
|
+
"command": "node -e \\"\\""
|
|
3568
|
+
}
|
|
3569
|
+
}
|
|
3570
|
+
},
|
|
3555
3571
|
"load:runtime-config": {
|
|
3556
3572
|
"executor": "nx:run-commands",
|
|
3557
3573
|
"metadata": {
|
|
@@ -3617,22 +3633,6 @@ exports[`react-website generator > Tanstack router integration > should generate
|
|
|
3617
3633
|
"options": {
|
|
3618
3634
|
"reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}"
|
|
3619
3635
|
}
|
|
3620
|
-
},
|
|
3621
|
-
"lint": {
|
|
3622
|
-
"executor": "nx:run-commands",
|
|
3623
|
-
"cache": true,
|
|
3624
|
-
"inputs": ["biome"],
|
|
3625
|
-
"options": {
|
|
3626
|
-
"command": "biome lint {projectRoot}"
|
|
3627
|
-
},
|
|
3628
|
-
"configurations": {
|
|
3629
|
-
"fix": {
|
|
3630
|
-
"command": "biome check --write {projectRoot}"
|
|
3631
|
-
},
|
|
3632
|
-
"skip-lint": {
|
|
3633
|
-
"command": "node -e \\"\\""
|
|
3634
|
-
}
|
|
3635
|
-
}
|
|
3636
3636
|
}
|
|
3637
3637
|
}
|
|
3638
3638
|
}
|
|
@@ -192,24 +192,28 @@ async function tsReactWebsiteGenerator(tree, schema) {
|
|
|
192
192
|
libraryRoot, // destination path of the files
|
|
193
193
|
templateOptions, // config object to replace variable in file templates
|
|
194
194
|
{
|
|
195
|
-
|
|
195
|
+
// User-editable source - preserve any edits on re-run
|
|
196
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
196
197
|
});
|
|
197
198
|
(0, devkit_1.generateFiles)(tree, // the virtual file system
|
|
198
199
|
appTemplatePath, // path to the file templates
|
|
199
200
|
libraryRoot, // destination path of the files
|
|
200
201
|
templateOptions, // config object to replace variable in file templates
|
|
201
202
|
{
|
|
202
|
-
|
|
203
|
+
// User-editable source - preserve any edits on re-run
|
|
204
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
203
205
|
});
|
|
204
206
|
if (tanstackRouter) {
|
|
205
207
|
const routerCommonTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, './files/tanstack-router/common');
|
|
206
208
|
const routerTemplatePath = (0, devkit_1.joinPathFragments)(__dirname, `./files/tanstack-router/${ux.toLowerCase()}`);
|
|
207
209
|
(0, devkit_1.generateFiles)(tree, routerCommonTemplatePath, libraryRoot, templateOptions, {
|
|
208
|
-
|
|
210
|
+
// User-editable source (and the TanStack-managed route tree) - preserve on re-run
|
|
211
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
209
212
|
});
|
|
210
213
|
(0, devkit_1.generateFiles)(tree, routerTemplatePath, libraryRoot, templateOptions, // config object to replace variable in file templates
|
|
211
214
|
{
|
|
212
|
-
|
|
215
|
+
// User-editable source - preserve any edits on re-run
|
|
216
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
213
217
|
});
|
|
214
218
|
tree.delete((0, devkit_1.joinPathFragments)(websiteContentPath, 'src', 'app.tsx'));
|
|
215
219
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":";;;AAyDA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -281,8 +281,6 @@ export class UserIdentity extends Construct {
|
|
|
281
281
|
"
|
|
282
282
|
`;
|
|
283
283
|
|
|
284
|
-
exports[`cognito-auth generator > should not be able to run the generator multiple times 1`] = `[Error: This generator has already been run on test-project.]`;
|
|
285
|
-
|
|
286
284
|
exports[`cognito-auth generator > should update main.tsx when RuntimeConfigProvider exists > main-tsx-with-runtime-config 1`] = `
|
|
287
285
|
"import CognitoAuth from './components/CognitoAuth';
|
|
288
286
|
import { RuntimeConfigProvider } from './components/RuntimeConfig';
|
|
@@ -286,26 +286,6 @@ const AppLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
|
|
|
286
286
|
Sign out
|
|
287
287
|
</button>
|
|
288
288
|
</div>
|
|
289
|
-
<div className="user-greeting">
|
|
290
|
-
<span>Hi, {\`\${user?.profile?.['cognito:username']}\`}</span>
|
|
291
|
-
<button
|
|
292
|
-
type="button"
|
|
293
|
-
className="signout-link"
|
|
294
|
-
onClick={() => {
|
|
295
|
-
removeUser();
|
|
296
|
-
signoutRedirect({
|
|
297
|
-
post_logout_redirect_uri: window.location.origin,
|
|
298
|
-
extraQueryParams: {
|
|
299
|
-
redirect_uri: window.location.origin,
|
|
300
|
-
response_type: 'code',
|
|
301
|
-
},
|
|
302
|
-
});
|
|
303
|
-
clearStaleState();
|
|
304
|
-
}}
|
|
305
|
-
>
|
|
306
|
-
Sign out
|
|
307
|
-
</button>
|
|
308
|
-
</div>
|
|
309
289
|
</div>
|
|
310
290
|
</header>
|
|
311
291
|
<main className="app-main">
|
|
@@ -27,9 +27,6 @@ exports.COGNITO_AUTH_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
|
27
27
|
async function tsReactWebsiteAuthGenerator(tree, options) {
|
|
28
28
|
const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
29
29
|
const srcRoot = projectConfig.sourceRoot;
|
|
30
|
-
if (tree.exists((0, devkit_1.joinPathFragments)(srcRoot, 'components/CognitoAuth/index.tsx'))) {
|
|
31
|
-
throw new Error(`This generator has already been run on ${options.project}.`);
|
|
32
|
-
}
|
|
33
30
|
const cognitoDomain = options.cognitoDomain && options.cognitoDomain.length > 0
|
|
34
31
|
? options.cognitoDomain
|
|
35
32
|
: (0, utils_1.deriveCognitoDomainPrefix)((0, npm_scope_1.getNpmScope)(tree), projectConfig.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/generator.ts"],"names":[],"mappings":";;;AAiDA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
`<header className="app-header">$hbody</header>` => `<header className="app-header">$hbody</header>` where {
|
|
2
|
+
$hbody <: not contains `<button type="button" className="signout-link" $_>$_</button>`,
|
|
2
3
|
$hbody <: contains `<div className="app-header-inner">$inner</div>` => raw`<div className="app-header-inner">$inner
|
|
3
4
|
<div className="user-greeting">
|
|
4
5
|
<span>Hi, {\`\${user?.profile?.['cognito:username']}\`}</span>
|
|
@@ -92,6 +92,7 @@ async function ensureTypeScriptAgentConnectionProject(tree) {
|
|
|
92
92
|
// the agent-connection internals.
|
|
93
93
|
await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/session-context.js');
|
|
94
94
|
await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/with-session-id.js');
|
|
95
|
+
await (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(exports.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), './core/model-errors.js');
|
|
95
96
|
}
|
|
96
97
|
/**
|
|
97
98
|
* Emit one of the TypeScript core client templates (mcp or a2a) into the
|
|
@@ -139,8 +140,13 @@ async function ensurePythonAgentConnectionProject(tree) {
|
|
|
139
140
|
await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'get_current_session_id');
|
|
140
141
|
await addPythonReExport(tree, moduleInitPath, '.core.session_context', 'session_id_context');
|
|
141
142
|
await addPythonReExport(tree, moduleInitPath, '.core.with_session_id', 'with_session_id');
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
await addPythonReExport(tree, moduleInitPath, '.core.model_errors', 'log_model_errors');
|
|
144
|
+
// Shared core helpers depend on aws-lambda-powertools for AppConfig access
|
|
145
|
+
// and strands-agents for the model error-logging hook.
|
|
146
|
+
(0, py_1.addDependenciesToPyProjectToml)(tree, projectDir, [
|
|
147
|
+
'aws-lambda-powertools',
|
|
148
|
+
'strands-agents',
|
|
149
|
+
]);
|
|
144
150
|
}
|
|
145
151
|
/**
|
|
146
152
|
* Emit a Python core client template (mcp / a2a / shared auth) into the
|