@aws/nx-plugin 0.1.6 → 0.2.1

package/src/infra/app/files/common/constructs/src/core/cfn-guard.ts.template

@@ -0,0 +1,63 @@
+import * as url from 'url';
+import { CfnGuardValidator as _CfnGuardValidator } from '@cdklabs/cdk-validator-cfnguard';
+import { IConstruct } from 'constructs';
+import { CfnResource } from 'aws-cdk-lib';
+
+/**
+ * Suppresses a rule for a construct tree.
+ *
+ * @param construct The root construct to suppress the rule for.
+ * @param ruleName The name of the rule to suppress.
+ * @param predicate A predicate function that determines whether the rule should be suppressed for the given construct or any of its descendants.
+ *
+ * @example
+ * The following example suppresses the RULE_NAME for the given construct.
+ * suppressRule(construct, 'RULE_NAME')
+ *
+ * @example
+ * The following example suppresses the RULE_NAME for the construct or any of its descendants if it is an instance of Bucket:
+ * suppressRule(construct, 'RULE_NAME', (construct) => construct instanceof Bucket)
+ */
+export const suppressRule = (
+  construct: IConstruct,
+  ruleName: string,
+  predicate?: (construct: IConstruct) => boolean,
+) => {
+  const resources = (
+    predicate ? construct.node.findAll().filter(predicate) : [construct]
+  )
+    .map((resource) => resource.node.defaultChild)
+    .filter((resource) => CfnResource.isCfnResource(resource));
+
+  resources.forEach((resource) => {
+    const metadata = resource.getMetadata('guard') || {};
+    metadata['SuppressedRules'] = [
+      ...(metadata['SuppressedRules'] ?? []),
+      ruleName,
+    ];
+    resource.addMetadata('guard', metadata);
+  });
+};
+
+export enum RuleSet {
+  AWS_PROTOTYPING = 'aws-prototyping.guard',
+  CFN_NAG = 'cfn-nag.guard',
+  HIPAA = 'hipaa-security.guard',
+  NIST_CSF = 'nist-csf.guard',
+  PCI_DSS_3_2_1 = 'pci-dss-3-2-1.guard',
+  WELL_ARCHITECTED_RELIABILITY = 'wa-reliability-pillar.guard',
+  WELL_ARCHITECTED_SECURITY = 'wa-security-pillar.guard',
+}
+
+export class CfnGuardValidator extends _CfnGuardValidator {
+  constructor(guardRule: RuleSet) {
+    super({
+      controlTowerRulesEnabled: false,
+      rules: [
+        url.fileURLToPath(
+          new URL(`./cfn-guard-rules/${guardRule}`, import.meta.url),
+        ),
+      ],
+    });
+  }
+}

package/src/infra/app/generator.js

@@ -9,11 +9,16 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
 const versions_1 = require("../../utils/versions");
+const npm_scope_1 = require("../../utils/npm-scope");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const ast_1 = require("../../utils/ast");
+const path_1 = tslib_1.__importDefault(require("path"));
 const format_1 = require("../../utils/format");
 function infraGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const lib = (0, generator_1.getTsLibDetails)(tree, schema);
-        const tsLibGeneratorCallback = yield (0, generator_1.default)(tree, schema);
+        yield (0, generator_1.default)(tree, schema);
+        yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
         const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;
         const synthDirFromProject = lib.dir
             .split('/')
@@ -21,13 +26,28 @@ function infraGenerator(tree, schema) {
             .join('/') + synthDirFromRoot;
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, lib.fullyQualifiedName);
         const libraryRoot = projectConfig.root;
+        const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
+        const scopeAlias = (0, npm_scope_1.toScopeAlias)(npmScopePrefix);
+        const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;
         tree.delete((0, devkit_1.joinPathFragments)(libraryRoot, 'src'));
         (0, devkit_1.generateFiles)(tree, // the virtual file system
-        (0, devkit_1.joinPathFragments)(__dirname, './files'), // path to the file templates
-        libraryRoot, Object.assign({ synthDir: synthDirFromProject }, schema));
+        (0, devkit_1.joinPathFragments)(__dirname, './files/app'), // path to the file templates
+        libraryRoot, Object.assign(Object.assign({ synthDir: synthDirFromProject, scopeAlias: scopeAlias, fullyQualifiedName, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec }, schema), { ruleSet: schema.ruleSet.toUpperCase() }), {
+            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        });
+        (0, devkit_1.generateFiles)(tree, // the virtual file system
+        (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), Object.assign({ synthDir: synthDirFromProject, scopeAlias: (0, npm_scope_1.toScopeAlias)((0, npm_scope_1.getNpmScopePrefix)(tree)) }, schema), {
+            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        });
         (0, devkit_1.updateJson)(tree, `${libraryRoot}/project.json`, (config) => {
+            var _a;
             config.projectType = 'application';
-            config.targets.build = {
+            config.targets.build.dependsOn = [
+                ...((_a = config.targets.build.dependsOn) !== null && _a !== void 0 ? _a : []),
+                'synth',
+            ];
+            config.targets.compile.options.main = (0, devkit_1.joinPathFragments)(libraryRoot, 'src', 'main.ts');
+            config.targets.synth = {
                 cache: true,
                 executor: 'nx:run-commands',
                 outputs: [`{workspaceRoot}${synthDirFromRoot}`],
@@ -46,16 +66,25 @@ function infraGenerator(tree, schema) {
             };
             return config;
         });
+        (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './cfn-guard.js');
         (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
-            '@aws/pdk',
+            '@cdklabs/cdk-validator-cfnguard',
             'aws-cdk-lib',
             'aws-cdk',
             'esbuild',
             'constructs',
             'source-map-support',
         ]), (0, versions_1.withVersions)(['tsx']));
-        yield (0, format_1.formatFilesInSubtree)(tree, libraryRoot);
-        return tsLibGeneratorCallback;
+        (0, devkit_1.updateJson)(tree, `${libraryRoot}/tsconfig.json`, (tsConfig) => (Object.assign(Object.assign({}, tsConfig), { references: [
+                ...(tsConfig.references || []),
+                {
+                    path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_1.PACKAGES_DIR}`)}/${shared_constructs_1.SHARED_CONSTRUCTS_DIR}/tsconfig.json`,
+                },
+            ] })));
+        yield (0, format_1.formatFilesInSubtree)(tree);
+        return () => {
+            (0, devkit_1.installPackagesTask)(tree);
+        };
     });
 }
 exports.default = infraGenerator;

package/src/infra/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":";;AAmBA,wCAuEC;;AA1FD;;;GAGG;AACH,uCASoB;AAEpB,4EAAyE;AACzE,mDAAoD;AACpD,+CAA0D;AAE1D,SAAsB,cAAc,CAClC,IAAU,EACV,MAA4B;;QAE5B,MAAM,GAAG,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,sBAAsB,GAAG,MAAM,IAAA,mBAAc,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAElE,MAAM,gBAAgB,GAAG,SAAS,GAAG,CAAC,GAAG,UAAU,CAAC;QACpD,MAAM,mBAAmB,GACvB,GAAG,CAAC,GAAG;aACJ,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;QAClC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QACnD,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;QAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,6BAA6B;QACtE,WAAW,kBAET,QAAQ,EAAE,mBAAmB,IAC1B,MAAM,EAEZ,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,GAAG,WAAW,eAAe,EAC7B,CAAC,MAA4B,EAAE,EAAE;YAC/B,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC;YAEnC,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG;gBACrB,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,kBAAkB,gBAAgB,EAAE,CAAC;gBAC/C,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO,EAAE;oBACP,GAAG,EAAE,WAAW;oBAChB,OAAO,EAAE,WAAW;iBACrB;aACF,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG;gBACtB,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,GAAG,EAAE,WAAW;oBAChB,OAAO,EAAE,6CAA6C,mBAAmB,EAAE;iBAC5E;aACF,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;YACX,UAAU;YACV,aAAa;YACb,SAAS;YACT,SAAS;YACT,YAAY;YACZ,oBAAoB;SACrB,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,KAAK,CAAC,CAAC,CACtB,CAAC;QAEF,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE9C,OAAO,sBAAsB,CAAC;IAChC,CAAC;CAAA;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":";;AA+BA,wCA2HC;;AA1JD;;;GAGG;AACH,uCAYoB;AAEpB,4EAAyE;AACzE,mDAAoD;AACpD,qDAAwE;AACxE,qEAKuC;AACvC,yCAAgD;AAChD,wDAAwB;AACxB,+CAA0D;AAE1D,SAAsB,cAAc,CAClC,IAAU,EACV,MAA4B;;QAE5B,MAAM,GAAG,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,IAAA,mBAAc,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,MAAM,IAAA,6CAAyB,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,gBAAgB,GAAG,SAAS,GAAG,CAAC,GAAG,UAAU,CAAC;QACpD,MAAM,mBAAmB,GACvB,GAAG,CAAC,GAAG;aACJ,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;QAClC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACvC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;QAChD,MAAM,kBAAkB,GAAG,GAAG,cAAc,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QACnD,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;QAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE,6BAA6B;QAC1E,WAAW,gCAET,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAClB,SAAS,EAAE,IAAA,iCAAwB,GAAE,CAAC,IAAI,IACvC,MAAM,KACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAEvC;YACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;SAC/C,CACF,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;QAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,yCAAqB,EAAE,KAAK,EAAE,MAAM,CAAC,EAC3E,IAAA,0BAAiB,EAAC,gCAAY,EAAE,yCAAqB,EAAE,KAAK,EAAE,MAAM,CAAC,kBAEnE,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,IAAA,wBAAY,EAAC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC,IAC9C,MAAM,GAEX;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QACF,IAAA,mBAAU,EACR,IAAI,EACJ,GAAG,WAAW,eAAe,EAC7B,CAAC,MAA4B,EAAE,EAAE;;YAC/B,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG;gBAC/B,GAAG,CAAC,MAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,mCAAI,EAAE,CAAC;gBACzC,OAAO;aACR,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAA,0BAAiB,EACrD,WAAW,EACX,KAAK,EACL,SAAS,CACV,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG;gBACrB,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,kBAAkB,gBAAgB,EAAE,CAAC;gBAC/C,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO,EAAE;oBACP,GAAG,EAAE,WAAW;oBAChB,OAAO,EAAE,WAAW;iBACrB;aACF,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG;gBACtB,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,GAAG,EAAE,WAAW;oBAChB,OAAO,EAAE,6CAA6C,mBAAmB,EAAE;iBAC5E;aACF,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QACF,IAAA,mBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,gCAAY,EACZ,yCAAqB,EACrB,KAAK,EACL,MAAM,EACN,UAAU,CACX,EACD,gBAAgB,CACjB,CAAC;QACF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;YACX,iCAAiC;YACjC,aAAa;YACb,SAAS;YACT,SAAS;YACT,YAAY;YACZ,oBAAoB;SACrB,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,KAAK,CAAC,CAAC,CACtB,CAAC;QAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,WAAW,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,iCAC1D,QAAQ,KACX,UAAU,EAAE;gBACV,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC9B;oBACE,IAAI,EAAE,GAAG,cAAI,CAAC,QAAQ,CACpB,WAAW,EACX,GAAG,IAAI,CAAC,IAAI,IAAI,gCAAY,EAAE,CAC/B,IAAI,yCAAqB,gBAAgB;iBAC3C;aACF,IACD,CAAC,CAAC;QAEJ,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AACD,kBAAe,cAAc,CAAC"}

package/src/infra/app/schema.d.ts

@@ -4,7 +4,16 @@
  */
 export interface InfraGeneratorSchema {
   name: string;
+  ruleSet:
+    | 'aws_prototyping'
+    | 'cfn_nag'
+    | 'hipaa'
+    | 'nist_csf'
+    | 'pci_dss_3_2_1'
+    | 'well_architected_reliability'
+    | 'well_architected_security';
   directory?: string;
-  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  //   unitTestRunner?: 'jest' | 'vitest' | 'none';
+  //   linter?: Linter;
   skipInstall?: boolean;
 }

package/src/infra/app/schema.json

@@ -14,6 +14,22 @@
       "x-prompt": "What name would you like to use for the application?",
       "pattern": "^[a-zA-Z][^:]*$"
     },
+    "ruleSet": {
+      "type": "string",
+      "enum": [
+        "aws_prototyping",
+        "cfn_nag",
+        "hipaa",
+        "nist_csf",
+        "pci_dss_3_2_1",
+        "well_architected_reliability",
+        "well_architected_security"
+      ],
+      "x-priority": "important",
+      "x-prompt": "What rule set do you want to validate your AWS resources with?",
+      "description": "Rule set to validate your AWS resources with.",
+      "default": "aws_prototyping"
+    },
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",
@@ -21,14 +37,6 @@
       "x-priority": "important",
       "default": "packages",
       "x-prompt": "What directory would you like to store your application in?"
-    },
-    "unitTestRunner": {
-      "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "x-priority": "important",
-      "x-prompt": "What unit test runner would you like to use?",
-      "description": "Test runner to use for unit tests.",
-      "default": "vitest"
     }
   },
   "required": ["name"]

package/src/trpc/backend/README.md

@@ -1,6 +1,7 @@
 # tRPC Backend Generator
 
 ## Overview
+
 This generator creates a new tRPC backend application with AWS CDK infrastructure setup. The generated backend uses AWS Lambda for serverless deployment and includes schema validation using Zod. The codebase is structured using ES Modules (ESM) for modern JavaScript module system compatibility. It sets up a complete type-safe API using tRPC with AWS Lambda integration, AWS X-Ray tracing, and AWS Lambda Powertools for observability.
 
 ## Usage
@@ -10,12 +11,14 @@ You can generate a new tRPC backend in two ways:
 ### 1. Using VSCode IDE
 
 First, install the NX Console extension for VSCode:
+
 1. Open VSCode
 2. Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X)
 3. Search for "Nx Console"
 4. Install [Nx Console](https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console)
 
 Then generate your API:
+
 1. Open the NX Console in VSCode
 2. Click on "Generate"
 3. Search for "trpc#backend"
@@ -25,33 +28,35 @@ Then generate your API:
 ### 2. Using CLI
 
 Generate the API:
+
 ```bash
-nx g @aws/nx-plugin:trpc#backend my-api --apiNamespace=@myorg --directory=apps/api
+nx g @aws/nx-plugin:trpc#backend my-api --directory=apps/api
 ```
 
 You can also perform a dry-run to see what files would be generated without actually creating them:
+
 ```bash
-nx g @aws/nx-plugin:trpc#backend my-api --apiNamespace=@myorg --directory=apps/api --dry-run
+nx g @aws/nx-plugin:trpc#backend my-api --directory=apps/api --dry-run
 ```
 
 Both methods will create a new tRPC backend API in the specified directory with all the necessary configuration and infrastructure code.
 
 ## Input Parameters
 
-| Parameter | Type | Default | Description |
-|-----------|------|---------|-------------|
-| apiName* | string | - | The name of the API (required). Used to generate class names and file paths. |
-| apiNamespace* | string | - | The namespace for the API (required). Must be in the format @scope or @scope/subscore. |
-| directory | string | "packages" | The directory to store the application in. |
-| unitTestRunner | string | "vitest" | Test runner for unit tests. Options: jest, vitest, none |
+| Parameter      | Type   | Default    | Description                                                                  |
+| -------------- | ------ | ---------- | ---------------------------------------------------------------------------- |
+| apiName\*      | string | -          | The name of the API (required). Used to generate class names and file paths. |
+| directory      | string | "packages" | The directory to store the application in.                                   |
+| unitTestRunner | string | "vitest"   | Test runner for unit tests. Options: jest, vitest, none                      |
 
-*Required parameter
+\*Required parameter
 
 ## Expected Output
 
 The generator creates three main components:
 
 ### 1. Backend API Code
+
 ```
 <directory>/<api-name>/backend/
 ├── src/
@@ -65,6 +70,7 @@ The generator creates three main components:
 ```
 
 ### 2. Schema Code
+
 ```
 <directory>/<api-name>/schema/
 ├── src/
@@ -74,17 +80,29 @@ The generator creates three main components:
 ```
 
 ### 3. Infrastructure Code
+
 ```
-common/constructs/
-├── src/
-│   ├── <api-name>/       # Infrastructure specific to this API
-│   │   └── index.ts      # API infrastructure stack
-│   └── index.ts          # Exports for all constructs
+common/
+|   └── constructs/
+|   |    └── src/
+|   │       ├── app/       # Infrastructure specific to this API
+|   │       │   └── index.ts
+|   │       │   └── trpc-apis
+|   │       │       └── index.ts
+|   │       │       └── <name>.ts # Application specific cdk construct i.e: MyApi
+|   │       ├── core/       # Infrastructure specific to this API
+|   │       │   └── index.ts
+|   │       │   └── trpc-api.ts # Generic Trpc API construct
+|   │       └── index.ts          # Exports for all constructs
+|   └── types/
+|        └── src/
+|               └── runtime-config.ts # Updates IRuntimeConfig to add trpcApis
 ├── tsconfig.json         # TypeScript configuration
 └── project.json         # Project configuration and build targets
 ```
 
 Additionally, it:
+
 1. Configures build settings for production deployment
 2. Installs required dependencies:
    - @trpc/server
@@ -107,13 +125,7 @@ The router is configured in `router.ts` with AWS Lambda integration:
 ```typescript
 import { initTRPC } from '@trpc/server';
 import { awsLambdaRequestHandler } from '@trpc/server/adapters/aws-lambda';
-import {
-  createErrorPlugin,
-  createLoggerPlugin,
-  createMetricsPlugin,
-  createTracerPlugin,
-  IMiddlewareContext,
-} from './middleware.js';
+import { createErrorPlugin, createLoggerPlugin, createMetricsPlugin, createTracerPlugin, IMiddlewareContext } from './middleware.js';
 
 // Initialize tRPC with context type
 export type Context = IMiddlewareContext;
@@ -121,11 +133,7 @@ const t = initTRPC.context<Context>().create();
 
 // Create base router and procedure which automatically instruments all middleware
 export const router = t.router;
-export const publicProcedure = t.procedure
-  .unstable_concat(createLoggerPlugin().loggerPlugin)
-  .unstable_concat(createTracerPlugin().tracerPlugin)
-  .unstable_concat(createMetricsPlugin().metricsPlugin)
-  .unstable_concat(createErrorPlugin().errorPlugin);
+export const publicProcedure = t.procedure.unstable_concat(createLoggerPlugin().loggerPlugin).unstable_concat(createTracerPlugin().tracerPlugin).unstable_concat(createMetricsPlugin().metricsPlugin).unstable_concat(createErrorPlugin().errorPlugin);
 
 // Define your procedures here
 const appRouter = router({
@@ -137,7 +145,7 @@ const appRouter = router({
 
 // Create Lambda handler
 export const handler = awsLambdaRequestHandler({
-  router: appRouter
+  router: appRouter,
 });
 
 // Import this type in the frontend when setting up your integration
@@ -149,17 +157,20 @@ export type AppRouter = typeof appRouter;
 The generator includes four powerful middleware plugins whcih are automatically instrumented:
 
 1. **Logger Plugin**
+
    - Automatically logs procedure execution
    - Captures errors with detailed context
    - Uses structured logging format
 
 2. **Metrics Plugin**
+
    - Captures cold start metrics
    - Tracks request counts
    - Records success/error metrics
    - Automatically publishes metrics to CloudWatch
 
 3. **Tracer Plugin**
+
    - Integrates with AWS X-Ray
    - Creates subsegments for each procedure
    - Annotates cold starts
@@ -176,23 +187,21 @@ You can access the context in your procedures to utilize the observability tools
 
 ```typescript
 const appRouter = router({
-  getData: publicProcedure
-    .input(z.string())
-    .query(async (opts) => {
-      // Access logger
-      opts.ctx.logger.info('Processing getData request', {
-        input: opts.input
-      });
-
-      // Add custom metrics
-      opts.ctx.metrics.addMetric('getData.calls', MetricUnit.Count, 1);
-
-      // Use tracer for subsegments
-      return opts.ctx.tracer.captureMethod('getData.process', async () => {
-        // Your business logic here
-        return { data: 'result' };
-      });
-    }),
+  getData: publicProcedure.input(z.string()).query(async (opts) => {
+    // Access logger
+    opts.ctx.logger.info('Processing getData request', {
+      input: opts.input,
+    });
+
+    // Add custom metrics
+    opts.ctx.metrics.addMetric('getData.calls', MetricUnit.Count, 1);
+
+    // Use tracer for subsegments
+    return opts.ctx.tracer.captureMethod('getData.process', async () => {
+      // Your business logic here
+      return { data: 'result' };
+    });
+  }),
 });
 ```
 
@@ -201,7 +210,7 @@ const appRouter = router({
 ```mermaid
 graph TD
     subgraph AWS Cloud
-        APIGW[API Gateway] --> Lambda[Lambda Functions]
+        APIGW[API Gateway] --> Lambda[Lambda Function]
         Lambda --> XRay[X-Ray Tracing]
         Lambda --> CW[CloudWatch Logs]
         Lambda --> Metrics[CloudWatch Metrics]
@@ -209,12 +218,15 @@ graph TD
 ```
 
 The infrastructure stack deploys:
+
 1. **API Gateway**
+
    - HTTP API endpoint
    - Request validation
    - CORS configuration
 
 2. **Lambda Functions**
+
    - Serverless compute
    - Auto-scaling
    - Pay-per-use pricing
@@ -225,7 +237,6 @@ The infrastructure stack deploys:
    - CloudWatch Metrics via Lambda Powertools
    - Structured logging with Lambda Powertools
 
-
 ## Using the Generated CDK Constructs
 
 After generating your tRPC backend, you'll find a CDK construct in the `common/constructs` directory. Here's how to use it in your infrastructure:
@@ -242,10 +253,7 @@ export class MyStack extends Stack {
     super(scope, id);
 
     // Create the API with no authentication
-    const api = new MyApi(this, 'MyApi', {
-      defaultAuthorizer: new HttpNoneAuthorizer(),
-      allowedOrigins: ['http://localhost:4200']
-    });
+    const api = new MyApi(this, 'MyApi');
   }
 }
 ```
@@ -255,7 +263,7 @@ export class MyStack extends Stack {
 ```typescript
 import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import { UserIdentity, MyApi } from ':my-org/common-constructs'
+import { UserIdentity, MyApi } from ':my-org/common-constructs';
 import { HttpIamAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
 
 export class ApplicationStack extends cdk.Stack {
@@ -263,9 +271,7 @@ export class ApplicationStack extends cdk.Stack {
     super(scope, id, props);
 
     const identity = new UserIdentity(this, 'UserIdentity');
-    const myapi = new MyApi(this, 'MyApi', {
-      defaultAuthorizer: new HttpIamAuthorizer(),
-    });
+    const myapi = new MyApi(this, 'MyApi');
     myapi.grantInvokeAccess(identity.identityPool.authenticatedRole);
   }
 }
@@ -282,15 +288,13 @@ export class MyStack extends Stack {
   constructor(scope: App, id: string) {
     super(scope, id);
 
-    const api = new MyApi(this, 'MyApi', {
-      // ... configuration
-    });
+    const api = new MyApi(this, 'MyApi');
 
     // Grant access to other roles if needed
     const consumerRole = new Role(this, 'ConsumerRole', {
       // ... role configuration
     });
-    
+
     api.grantInvokeAccess(consumerRole);
   }
 }
@@ -298,6 +302,29 @@ export class MyStack extends Stack {
 
 The API URL will be automatically registered in the RuntimeConfig system and can be accessed in your frontend application.
 
+### Updating CORS configuration
+
+To update the CORS configuration, you can do this directly by modifying the generated APi construct located in `common/constructs/src/app/trpc-apis`.
+
+For example:
+
+```typescript
+import { Construct } from 'constructs';
+import * as url from 'url';
+import { TrpcApi } from '../../core/trpc-api.js';
+import { HttpIamAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
+
+export class MyApi extends TrpcApi {
+  constructor(scope: Construct, id: string) {
+    super(scope, id, {
+      defaultAuthorizer: new HttpIamAuthorizer(),
+      handlerFilePath: url.fileURLToPath(new URL('../../../../../../packages/my-api/backend/src/lambdas/router.ts', import.meta.url)),
+      allowedOrigins: ['http://localhost:4200/'], // Allow CORS from local vite dev server
+    });
+  }
+}
+```
+
 ## Schema Code and Zod
 
 The generator creates a separate schema package that uses [Zod](https://zod.dev), a TypeScript-first schema declaration and validation library. This package can be shared between your backend and frontend code to ensure type safety across your entire application.
@@ -305,6 +332,7 @@ The generator creates a separate schema package that uses [Zod](https://zod.dev)
 ### Introduction to Zod
 
 Zod is a schema declaration and validation library designed specifically for TypeScript. It allows you to:
+
 - Define schemas with a fluent API
 - Automatically infer TypeScript types from schemas
 - Validate data at runtime
@@ -368,17 +396,9 @@ export const CustomerSchema = z.object({
 ```typescript
 import { z } from 'zod';
 
-export const OrderStatusSchema = z.enum([
-  'pending',
-  'processing',
-  'shipped',
-  'delivered'
-]);
+export const OrderStatusSchema = z.enum(['pending', 'processing', 'shipped', 'delivered']);
 
-export const PaymentMethodSchema = z.union([
-  z.object({ type: z.literal('credit_card'), cardNumber: z.string() }),
-  z.object({ type: z.literal('paypal'), email: z.string().email() }),
-]);
+export const PaymentMethodSchema = z.union([z.object({ type: z.literal('credit_card'), cardNumber: z.string() }), z.object({ type: z.literal('paypal'), email: z.string().email() })]);
 
 export const OrderSchema = z.object({
   id: z.string().uuid(),
@@ -428,12 +448,7 @@ Your schemas can be used directly in your tRPC procedures for input validation a
 
 ```typescript
 import { router, publicProcedure } from './router';
-import { 
-  UserSchema,
-  CreateUserSchema,
-  UpdateUserSchema,
-  SearchParamsSchema 
-} from ':my-org/schema';
+import { UserSchema, CreateUserSchema, UpdateUserSchema, SearchParamsSchema } from ':my-org/schema';
 
 export const userRouter = router({
   // Create user with input validation
@@ -457,10 +472,12 @@ export const userRouter = router({
 
   // Update user with partial data
   update: publicProcedure
-    .input(z.object({
-      id: z.string().uuid(),
-      data: UpdateUserSchema,
-    }))
+    .input(
+      z.object({
+        id: z.string().uuid(),
+        data: UpdateUserSchema,
+      })
+    )
     .output(UserSchema)
     .mutation(async (opts) => {
       const { id, data } = opts.input;
@@ -474,6 +491,7 @@ export const userRouter = router({
 1. **Keep Schemas Centralized**: Store all schemas in the schema package to ensure they're easily shared between frontend and backend.
 
 2. **Use Type Inference**: Let TypeScript infer types from your schemas instead of maintaining separate type definitions:
+
    ```typescript
    // Do this:
    export const UserSchema = z.object({ ... });
@@ -485,6 +503,7 @@ export const userRouter = router({
    ```
 
 3. **Compose Schemas**: Build complex schemas by composing simpler ones:
+
    ```typescript
    const BaseUserSchema = z.object({
      email: z.string().email(),
@@ -497,6 +516,7 @@ export const userRouter = router({
    ```
 
 4. **Version Your Schemas**: When making breaking changes, consider versioning your schemas:
+
    ```typescript
    export const UserSchemaV1 = z.object({ ... });
    export const UserSchemaV2 = UserSchemaV1.extend({ ... });
@@ -505,7 +525,7 @@ export const userRouter = router({
 5. **Document Your Schemas**: Add JSDoc comments to explain complex validation rules:
    ```typescript
    export const ConfigSchema = z.object({
-     /** 
+     /**
       * API key must be in format: prefix_<32 chars>
       * Example: myapp_a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
       */
@@ -516,15 +536,18 @@ export const userRouter = router({
 ## Building the Application
 
 To create a production build:
+
 ```bash
 nx build @my-org/my-api
 ```
 
 All built code is located in the `dist` folder at the root of your workspace. For example:
+
 - Backend code: `dist/apps/api/my-api/backend`
 - Schema code: `dist/apps/api/my-api/schema`
 
 The production build:
+
 - Bundles Lambda functions for optimal cold start performance
 - Generates TypeScript declaration files
 - Creates source maps for debugging
@@ -546,4 +569,3 @@ new NodejsFunction(this, 'MyApiHandler', {
 ```
 
 This will ensure that whichever `@aws-sdk` version you have installed locally will be the one that is used in the Lambda.
-