@aligent/nx-cdk 0.3.1 → 0.5.0

package/README.md

@@ -21,6 +21,13 @@ npx create-nx-workspace@latest --preset=@aligent/nx-cdk
 | `name`        | string | Yes      | -         | The name of the project/application (alphanumeric and dashes only)               |
 | `nodeVersion` | string | No       | `24.11.0` | The target Node.js version for the project (must be valid semver, e.g., 22.10.0) |
 
+#### Post-generation setup
+
+After running the preset generator, review these defaults before committing:
+
+- **AWS profile** — The `pg:synth`, `pg:deploy`, `pg:diff`, and `pg:destroy` scripts in `package.json` use `--profile playground`. This assumes a profile named `playground` exists in your `~/.aws/config`. Update the profile name in the `pg:*` scripts if yours differs.
+- **`.github/CODEOWNERS`** — The generated file references Aligent's GitHub teams (`@aligent/microservices`, `@aligent/devops`). Replace these with your organisation's team handles.
+
 #### What it creates
 
 The preset generator scaffolds:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aligent/nx-cdk",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/generators/helpers/configs/base-package/package.json

@@ -0,0 +1,89 @@
+{
+  "author": "Aligent",
+  "private": true,
+  "license": "MIT",
+  "type": "module",
+  "scripts": {
+    "test": "nx affected -t test --coverage",
+    "test:all": "nx run-many -t test --coverage",
+    "lint": "nx affected -t lint",
+    "lint:all": "nx run-many -t lint",
+    "typecheck": "nx affected -t typecheck",
+    "typecheck:all": "nx run-many -t typecheck",
+    "audit": "nx run-many -t lint typecheck test --configuration coverage --skip-nx-cache",
+    "pg:synth": "nx run application:pg:synth --bundle-mode=dev --profile playground",
+    "pg:deploy": "nx run application:pg:deploy --bundle-mode=dev --method=direct --require-approval never --profile playground",
+    "pg:diff": "nx run application:pg:diff --profile playground",
+    "pg:destroy": "nx run application:pg:destroy --profile playground",
+    "postinstall": "[ -d .git ] && git config core.hooksPath '.git-hooks' && chmod +x .git-hooks/* || true"
+  },
+  "dependencies": {
+    "@aligent/microservice-util-lib": "^1.2.0"
+  },
+  "devDependencies": {
+    "@aligent/cdk-aspects": "^0.5.0",
+    "@aligent/cdk-step-function-from-file": "^0.3.2",
+    "@aligent/nx-openapi": "^1.0.0",
+    "@aligent/ts-code-standards": "^4.1.0",
+    "@nx/eslint": "22.1.3",
+    "@nx/eslint-plugin": "22.1.3",
+    "@nx/js": "22.1.3",
+    "@nx/vitest": "22.1.3",
+    "@nx/workspace": "22.1.3",
+    "@swc-node/register": "^1.10.10",
+    "@swc/core": "^1.13.3",
+    "@swc/helpers": "^0.5.17",
+    "@types/aws-lambda": "^8.10.152",
+    "@types/node": "^22.17.0",
+    "@typescript-eslint/eslint-plugin": "8.44.0",
+    "@typescript-eslint/parser": "8.44.0",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "aws-cdk": "^2.1033.0",
+    "aws-cdk-lib": "^2.235.1",
+    "cdk-nag": "^2.37.55",
+    "constructs": "^10.4.3",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "fast-glob": "^3.3.3",
+    "jiti": "2.5.1",
+    "jsonc-eslint-parser": "^2.4.0",
+    "nx": "22.1.3",
+    "prettier": "^3.6.2",
+    "rolldown": "1.0.0-rc.1",
+    "store-parameters": "^1.1.3",
+    "tslib": "^2.8.1",
+    "tsx": "^4.21.0",
+    "typescript": "~5.9.2",
+    "vite": "^7.2.6",
+    "vitest": "^3.2.4"
+  },
+  "nx": {
+    "includedScripts": [],
+    "targets": {
+      "parameters": {
+        "executor": "nx:run-commands",
+        "options": {
+          "color": true,
+          "cwd": "parameters"
+        },
+        "configurations": {
+          "import": {
+            "command": "store-parameters import {args.file} --delimiter=|"
+          },
+          "export": {
+            "command": "store-parameters export {args.file} --path={args.path} --delimiter=|"
+          }
+        }
+      }
+    }
+  },
+  "workspaces": [
+    "application",
+    "clients",
+    "libs/*",
+    "services/*"
+  ],
+  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8"
+}

package/src/generators/helpers/configs/nxJson.js

@@ -26,7 +26,7 @@ exports.NX_JSON = {
             cache: true,
             dependsOn: ['^build'],
             inputs: ['production', '^production'],
-            outputs: ['{projectRoot}/dist'],
+            outputs: ['{projectRoot}/dist'], // FIXME: It seems that this doesn't cache correctly. Investigate this.
         },
         lint: { cache: true, inputs: ['default', '^production'] },
         test: {
@@ -37,5 +37,7 @@ exports.NX_JSON = {
             configurations: { coverage: { coverage: true } },
         },
         typecheck: { cache: true, inputs: ['default', '^production'] },
+        cdk: { dependsOn: [{ target: 'build', params: 'forward', projects: '@services/*' }] },
+        pg: { dependsOn: [{ target: 'build', params: 'forward', projects: '@services/*' }] },
     },
 };

package/src/generators/helpers/utilities.d.ts

@@ -11,43 +11,11 @@ interface Service {
     stack: string;
 }
 export declare function constructPackageJsonFile(input: PackageJsonInput): {
-    [k: string]: string | true | readonly ["application", "clients", "libs/*", "services/*"] | {
-        readonly test: "nx affected -t test --coverage";
-        readonly 'test:all': "nx run-many -t test --coverage";
-        readonly lint: "nx affected -t lint";
-        readonly 'lint:all': "nx run-many -t lint";
-        readonly typecheck: "nx affected -t typecheck";
-        readonly 'typecheck:all': "nx run-many -t typecheck";
-        readonly postinstall: "[ -d .git ] && git config core.hooksPath '.git-hooks' && chmod +x .git-hooks/* || true";
-        readonly 'pg:synth': "nx run application:cdk synth 'dev/**' --exclusively --bundle-mode=dev --profile=playground";
-        readonly 'pg:deploy': "nx run application:cdk deploy 'dev/**' --method=direct --require-approval=never --exclusively --bundle-mode=dev --profile=playground";
-        readonly 'pg:destroy': "nx run application:cdk destroy 'dev/**' --profile playground";
-        readonly audit: "nx run-many -t lint typecheck test --configuration coverage --skip-nx-cache";
-    } | {
-        readonly '@aligent/microservice-util-lib': "^1.2.0";
-    } | {
+    [k: string]: string | boolean | string[] | Record<string, string> | {
         [k: string]: string;
     } | {
         node: string;
     } | {
-        includedScripts: readonly [];
-        targets: {
-            readonly parameters: {
-                readonly executor: "nx:run-commands";
-                readonly options: {
-                    readonly color: true;
-                    readonly cwd: "parameters";
-                };
-                readonly configurations: {
-                    readonly import: {
-                        readonly command: "store-parameters import {args.file} --delimiter=|";
-                    };
-                    readonly export: {
-                        readonly command: "store-parameters export {args.file} --path={args.path} --delimiter=|";
-                    };
-                };
-            };
-        };
         name: string;
         node?: never;
     };
@@ -92,7 +60,7 @@ export declare function getGeneratorVersion(): string;
  *
  * @throws {Error} If the ApplicationStage constructor cannot be found in service-stacks.ts
  */
-export declare function addServiceStackToMainApplication(tree: Tree, service: Service, projectName: string): Promise<void>;
+export declare function addServiceStackToMainApplication(tree: Tree, service: Service, projectName: string): void;
 /**
  * Splits a kebab-case name into an array of capitalized parts.
  *

package/src/generators/helpers/utilities.js

@@ -7,24 +7,35 @@ exports.addServiceStackToMainApplication = addServiceStackToMainApplication;
 exports.splitInputName = splitInputName;
 /* v8 ignore start */
 const devkit_1 = require("@nx/devkit");
-const fs_1 = require("fs");
 const path_1 = require("path");
 const ts_morph_1 = require("ts-morph");
-const packageJson_1 = require("./configs/packageJson");
 const tsConfigs_1 = require("./configs/tsConfigs");
+/**
+ * Reads the base package.json configuration from a JSON file.
+ *
+ * The configuration is stored as a standalone JSON file rather than a TypeScript constant
+ * so that Dependabot can automatically detect and upgrade the dependency versions within it.
+ *
+ * @returns The parsed package.json configuration.
+ */
+function readPackageJsonConfig() {
+    const configPath = (0, path_1.join)(__dirname, './configs/base-package/package.json');
+    return (0, devkit_1.readJsonFile)(configPath);
+}
 function constructPackageJsonFile(input) {
+    const config = readPackageJsonConfig();
     const devDependencies = Object.fromEntries(Object.entries({
         '@aligent/nx-cdk': input.version,
-        ...packageJson_1.PACKAGE_JSON.devDependencies,
+        ...config.devDependencies,
     }).sort());
     const packageJson = Object.fromEntries(Object.entries({
         name: `@${input.name}/integrations`,
         description: `${input.projectName} integrations mono-repository`,
         version: input.version,
-        ...packageJson_1.PACKAGE_JSON,
+        ...config,
         devDependencies,
         engines: { node: `^${input.nodeVersion}` },
-        nx: { name: `${input.name}-int`, ...packageJson_1.PACKAGE_JSON.nx },
+        nx: { name: `${input.name}-int`, ...config.nx },
     }));
     return packageJson;
 }
@@ -66,18 +77,24 @@ function getGeneratorVersion() {
  *
  * @throws {Error} If the ApplicationStage constructor cannot be found in service-stacks.ts
  */
-async function addServiceStackToMainApplication(tree, service, projectName) {
+function addServiceStackToMainApplication(tree, service, projectName) {
     const application = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (application.root.includes('..')) {
         throw new Error('Invalid application root path');
     }
-    const stacksPath = (0, path_1.join)(tree.root, application.root, 'lib/service-stacks.ts');
-    if (!(0, fs_1.existsSync)(stacksPath)) {
+    const stacksRelativePath = (0, path_1.join)(application.root, 'lib/service-stacks.ts');
+    if (!tree.exists(stacksRelativePath)) {
         console.log('Service Stacks does not exist, skipping service stacks registration.');
         return;
     }
-    const project = new ts_morph_1.Project();
-    const stackSource = project.addSourceFileAtPath(stacksPath);
+    const content = tree.read(stacksRelativePath, 'utf-8');
+    if (content === null) {
+        throw new Error(`Failed to read file: ${stacksRelativePath}`);
+    }
+    const fs = new ts_morph_1.InMemoryFileSystemHost();
+    fs.writeFileSync(stacksRelativePath, content);
+    const project = new ts_morph_1.Project({ fileSystem: fs });
+    const stackSource = project.addSourceFileAtPath(stacksRelativePath);
     const applicationStage = stackSource.getClassOrThrow('ApplicationStage');
     const stageConstructor = applicationStage.getConstructors()[0];
     if (!stageConstructor) {
@@ -90,7 +107,7 @@ async function addServiceStackToMainApplication(tree, service, projectName) {
     const sharedInfra = stageConstructor.getVariableStatement('sharedInfra');
     const sharedPropsStatement = sharedInfra ? `...sharedInfra.getProps(),` : '';
     stageConstructor.addStatements(`new ${service.stack}(this, ${service.constant}.NAME, { ...props, ${sharedPropsStatement} description: ${service.constant}.DESCRIPTION });`);
-    await stackSource.save();
+    tree.write(stacksRelativePath, stackSource.getFullText());
 }
 /**
  * Splits a kebab-case name into an array of capitalized parts.

package/src/generators/preset/files/.git-hooks/{pre-push.template → pre-commit.template}

@@ -1,8 +1,7 @@
 #!/bin/bash
 # Script adapted from https://github.com/kaczor6418/git-hooks-example/blob/master/git-hooks/pre-commit
 
-# Support using VSCode to commit
-# This loads nvm.sh and sets the correct PATH before running hook
+# Support using VSCode to commit. This loads nvm.sh and sets the correct PATH before running hook
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 

package/src/generators/preset/files/.github/CODEOWNERS.template

@@ -1,3 +1,5 @@
-# Both Microservice and DevOps teams own everything in this repo
-# We'll review this in few months time and adjust when needed
-* @aligent/microservices @aligent/devops
+# Default owners
+* @aligent/microservices
+
+# DevOps owns files inside .github/
+.github/** @aligent/devops

package/src/generators/preset/files/.github/workflows/release.yml.template

@@ -12,6 +12,6 @@ jobs:
     with:
       deploy: true
       deploy-command: yarn nx run application:cdk deploy
-      extra-arguments: --exclusively
+      environment-target: prd
       github-environment: production
     secrets: inherit

package/src/generators/preset/files/.github/workflows/stg-deployment.yml.template

@@ -12,6 +12,6 @@ jobs:
     with:
       deploy: true
       deploy-command: yarn nx run application:cdk deploy
-      extra-arguments: --exclusively
+      environment-target: stg
       github-environment: staging
     secrets: inherit

package/src/generators/preset/files/README.md.template

@@ -48,6 +48,25 @@ nvm use
 yarn install
 ```
 
+### Initial Setup Checklist
+
+Before committing this repository, review and update the following generated defaults:
+
+- **`.github/CODEOWNERS`** — The default file references Aligent's GitHub teams (`@aligent/microservices`, `@aligent/devops`). Replace these with your own organisation's team handles.
+- **`package.json` `pg:*` scripts** — The playground scripts use `--profile playground`. Ensure you have a matching profile in your `~/.aws/config` file:
+
+    ```ini
+    [profile playground]
+    source_profile = default
+    role_arn = arn:aws:iam::11111111111:role/RoleName
+    ```
+
+    If your profile has a different name, update the `pg:*` scripts in the root `package.json` to match.
+
+### Deployment
+
+For deployment instructions (synthesize, deploy, destroy), see the [CDK Application README](./application/README.md).
+
 ## Contributing
 
 We follow [trunk-based development framework](https://trunkbaseddevelopment.com/) as a start and will evolve depending on our need.

package/src/generators/preset/files/application/README.md.template

@@ -6,12 +6,44 @@ This application manages the deployment of microservices and their shared infras
 
 ### Using yarn script from workspace root (Recommended)
 
+##### Synthesize
+
 ```bash
-# Synthesize templates
+# Synthesize for default environment/stage (dev)
 yarn pg:synth
 
-# Deploy to playground
+# Synthesize for a custom environment/stage
+yarn pg:synth --args="plg/** -c environment=plg"
+```
+
+##### Deploy
+
+```bash
+# Deploy for default environment/stage (dev)
 yarn pg:deploy
+
+# Deploy to a custom environment/stage
+yarn pg:deploy --args="plg/** -c environment=plg"
+```
+
+##### Diff
+
+```bash
+# Diff checking for default environment/stage (dev)
+yarn pg:diff
+
+# Diff checking for a custom environment/stage
+yarn pg:diff --args="-c environment=plg"
+```
+
+##### Destroy
+
+```bash
+# Destroy default environment/stage (dev)
+yarn pg:destroy
+
+# Destroy a custom environment/stage
+yarn pg:destroy --args="-c environment=plg"
 ```
 
 ### Direct Nx Commands

package/src/generators/preset/files/application/bin/main.ts.template

@@ -1,69 +1,99 @@
 #!/usr/bin/env node
 import {
+    DynamoDbDefaultsAspect,
     LambdaAndStepFunctionVersioningAspect,
     LogGroupDefaultsAspect,
     MicroserviceChecks,
     NodeJsFunctionDefaultsAspect,
+    ResourcePrefixAspect,
+    S3DefaultsAspect,
     StepFunctionsDefaultsAspect,
 } from '@aligent/cdk-aspects';
-import { App, Aspects, Tags } from 'aws-cdk-lib';
+import { App, AspectOptions, AspectPriority, Aspects, IAspect, Tags } from 'aws-cdk-lib';
 import { Runtime } from 'aws-cdk-lib/aws-lambda';
 import { ApplicationStage } from '../lib/service-stacks.js';
 
-const APPLICATION_CONTEXT = { NAME: '<%= name %>-int', OWNER: 'aligent' } as const;
-const STAGE_NAMES = { DEV: 'dev', STG: 'stg', PRD: 'prd' } as const;
-
+const APPLICATION_CONTEXT = { NAME: '<%= name %>-int', OWNER: 'Aligent' } as const;
 const app = new App({ context: APPLICATION_CONTEXT });
-Tags.of(app).add('OWNER', APPLICATION_CONTEXT.OWNER);
 
 /**
- * Apply Application-Level Aspects
- * These aspects are applied to all resources across all stages
- */
-Aspects.of(app).add(new NodeJsFunctionDefaultsAspect({ runtime: Runtime.NODEJS_<%= nodeRuntime %> }));
-Aspects.of(app).add(new StepFunctionsDefaultsAspect());
-Aspects.of(app).add(new MicroserviceChecks());
-
-/**
- * Static Stage Creation Approach
- *
- * We use static stage creation (explicitly defining dev, stg, prd) for several reasons:
+ * Dynamic Stage (Environment) Creation
  *
- * 1. **Predictability**: All stages are known at synthesis time, making the CDK app
- *    behavior deterministic and easier to reason about.
+ * The stage (environment) name is provided via CDK context: `cdk synth -c environment=dev`
  *
- * 2. **Type Safety**: Static definitions provide better IDE support, autocompletion,
- *    and compile-time type checking for stage-specific configurations.
+ * - Stage name must be exactly 3 lowercase alphanumeric characters (e.g., dev (default), stg, prd)
+ * - Production-specific aspects (versioning, long log retention) are applied only to `prd`
+ * - Non-production stages get shorter log retention and debug-level logging
  *
- * 3. **Explicit Configuration**: Each stage's unique settings (e.g., log retention
- *    durations, aspects) are clearly visible in the code without needing to trace
- *    through dynamic logic.
- *
- * 4. **Simpler Deployment**: CDK can synthesize all stages in a single pass without
- *    requiring runtime context lookups or conditional logic.
+ * @see {@link https://dev.to/aws-heroes/how-to-use-aws-cdk-stage-and-when-to-choose-static-vs-dynamic-stack-creation-35h|Static vs Dynamic Stack Creation}
+ */
+const stageName = app.node.tryGetContext('environment') ?? 'dev';
+
+if (typeof stageName !== 'string' || !/^[a-z0-9]{3}$/.test(stageName)) {
+    throw new Error(
+        `Invalid stage (environment) name: "${stageName}". Stage must be exactly 3 lowercase alphanumeric characters (e.g., dev, stg, prd)`
+    );
+}
+
+const stage = new ApplicationStage(app, stageName);
+Tags.of(stage).add('APPLICATION', APPLICATION_CONTEXT.NAME);
+Tags.of(stage).add('OWNER', APPLICATION_CONTEXT.OWNER);
+Tags.of(stage).add('STAGE', stageName);
+
+/**
+ * Common aspects applied to every stage.
  *
- * 5. **CI/CD Integration**: Static stages integrate seamlessly with standard CI/CD
- *    pipelines where environment configuration is managed externally.
+ * Aspects must be registered on each `Stage` individually — a `Stage` creates a
+ * synthesis boundary that prevents `App`-level aspects from traversing into it.
  *
- * @see {@link https://dev.to/aws-heroes/how-to-use-aws-cdk-stage-and-when-to-choose-static-vs-dynamic-stack-creation-35h|Static vs Dynamic Stack Creation}
+ * Order matters: `ResourcePrefixAspect` runs first (priority 100) so that
+ * resource names are finalised before the versioning aspect reads them.
+ */
+const commonAspectsWithOptions: Array<{ aspect: IAspect; options: AspectOptions }> = [
+    {
+        aspect: new ResourcePrefixAspect({ prefix: `${APPLICATION_CONTEXT.NAME}-${stageName}` }),
+        options: { priority: 100 },
+    },
+    {
+        aspect: new NodeJsFunctionDefaultsAspect({ runtime: Runtime.NODEJS_<%= nodeRuntime %> }),
+        options: { priority: AspectPriority.MUTATING },
+    },
+    { aspect: new StepFunctionsDefaultsAspect(), options: { priority: AspectPriority.MUTATING } },
+    { aspect: new MicroserviceChecks(), options: { priority: AspectPriority.READONLY } },
+];
+
+/**
+ * Apply common aspects to the stage, then add stage-specific aspects.
  *
  * @remarks
- * Aspects visit all constructs in the tree after synthesis and can modify them
- * (e.g., applying log retention policies, enabling tracing).
+ * Aspects visit every construct in the tree after synthesis and may mutate them
+ * (e.g. setting log retention, enabling X-Ray tracing).
+ *
+ * Stage-specific behaviour:
+ * - `prd`: long log retention (2 years) for compliance; Lambda and Step Function
+ *   versioning enabled for zero-downtime deployments.
+ * - `stg`: medium log retention.
+ * - all others: short log retention.
  */
+commonAspectsWithOptions.forEach(({ aspect, options }) => {
+    Aspects.of(stage).add(aspect, options);
+});
 
-const dev = new ApplicationStage(app, STAGE_NAMES.DEV);
-Aspects.of(dev).add(new LogGroupDefaultsAspect({ duration: 'SHORT' }));
+const defaultAspectsOptions: AspectOptions = { priority: AspectPriority.MUTATING };
+let duration: 'SHORT' | 'MEDIUM' | 'LONG' = 'SHORT';
 
-const stg = new ApplicationStage(app, STAGE_NAMES.STG);
-Aspects.of(stg).add(new LogGroupDefaultsAspect({ duration: 'MEDIUM' }));
+switch (stageName) {
+    case 'prd':
+        Aspects.of(stage).add(new LambdaAndStepFunctionVersioningAspect(), defaultAspectsOptions);
+        duration = 'LONG';
+        break;
+    case 'stg':
+        duration = 'MEDIUM';
+        break;
+    default:
+        duration = 'SHORT';
+}
 
-/**
- * Production Stage
- * - Long log retention (2 years) for compliance and debugging
- * - Resources retained on stack deletion
- * - Lambda functions and Step Functions are automatically versioned, enabled for zero-downtime deployments
- */
-const prd = new ApplicationStage(app, STAGE_NAMES.PRD);
-Aspects.of(prd).add(new LogGroupDefaultsAspect({ duration: 'LONG' }));
-Aspects.of(prd).add(new LambdaAndStepFunctionVersioningAspect());
+Aspects.of(stage).add(new LogGroupDefaultsAspect({ duration }), defaultAspectsOptions);
+Aspects.of(stage).add(new DynamoDbDefaultsAspect({ duration }), defaultAspectsOptions);
+Aspects.of(stage).add(new S3DefaultsAspect({ duration }), defaultAspectsOptions);

package/src/generators/preset/files/application/cdk.json.template

@@ -1,5 +1,5 @@
 {
-    "app": "yarn tsx bin/main.ts",
+    "app": "npx tsx bin/main.ts",
     "watch": {
         "include": ["**"],
         "exclude": [

package/src/generators/preset/files/application/lib/service-stacks.ts.template

@@ -1,5 +1,5 @@
 import { SharedInfraStack } from '@libs/infra';
-import { Stage, Tags, type StageProps } from 'aws-cdk-lib';
+import { Stage, type StageProps } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
 
 /**
@@ -15,7 +15,6 @@ import type { Construct } from 'constructs';
 export class ApplicationStage extends Stage {
     constructor(scope: Construct, id: string, props?: StageProps) {
         super(scope, id, props);
-        Tags.of(this).add('STAGE', id);
 
         const sharedInfra = new SharedInfraStack(this, 'shared-infra', props);
 

package/src/generators/preset/files/application/package.json.template

@@ -14,14 +14,28 @@
           "color": true,
           "command": "cdk",
           "cwd": "{projectRoot}"
-        },
-        "dependsOn": [
-          {
-            "target": "build",
-            "params": "forward",
-            "projects": "@services/*"
+        }
+      },
+      "pg": {
+        "executor": "nx:run-commands",
+        "configurations": {
+          "synth": {
+            "command": "cdk synth"
+          },
+          "deploy": {
+            "command": "cdk deploy"
+          },
+          "diff": {
+            "command": "cdk diff"
+          },
+          "destroy": {
+            "command": "cdk destroy"
           }
-        ]
+        },
+        "options": {
+          "color": true,
+          "cwd": "{projectRoot}"
+        }
       }
     }
   }

package/src/generators/preset/files/eslint.config.mjs.template

@@ -24,7 +24,6 @@ const eslintBaseConfig = [
                 'error',
                 {
                     allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?[jt]s$'],
-                    enforceBuildableLibDependency: true,
                     depConstraints: [
                         {
                             sourceTag: 'scope:application',

package/src/generators/preset/files/libs/infra/README.md.template

@@ -56,6 +56,6 @@ Resources that are used by multiple services are created once in the shared infr
 
 The `SharedInfraStack` must be instantiated within a CDK Stage to properly resolve the stage name for resource naming and tagging.
 
-### Application Context
+### Resource Naming
 
-Requires the `NAME` context variable to be set for proper resource naming conventions.
+Resource prefixes are automatically applied via a CDK aspect, ensuring consistent naming conventions across all resources without manual configuration.

package/src/generators/preset/files/libs/infra/src/index.ts.template

@@ -1,44 +1,48 @@
-import { Stack, Stage, type StackProps } from 'aws-cdk-lib';
+import { Stack, Stage, StackProps, Tags } from 'aws-cdk-lib';
 import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
-import { StringParameter } from 'aws-cdk-lib/aws-ssm';
-import type { Construct } from 'constructs';
+import { IStringParameter, StringParameter } from 'aws-cdk-lib/aws-ssm';
+import { Construct } from 'constructs';
 
+// EXAMPLE ONLY: The following interface, class, and all related resource references
+// (eCommerceBaseUrl, eCommerceCredentials, etc.) are illustrative examples.
+// Replace them with your own resources and props that match your actual infrastructure.
 export interface SharedInfraProps {
-    eCommerceBaseUrl: string;
-    eCommerceCredentials: Secret;
+    // eCommerceBaseUrl: IStringParameter;
+    // eCommerceCredentials: Secret;
 }
 
 export class SharedInfraStack extends Stack {
-    readonly eCommerceBaseUrl: string;
-    readonly eCommerceCredentials: Secret;
+    // EXAMPLE: Replace these properties with your own shared resources
+    // readonly eCommerceBaseUrl: IStringParameter;
+    // readonly eCommerceCredentials: Secret;
 
     constructor(scope: Construct, id: string, props?: StackProps) {
         super(scope, id, props);
 
-        const STAGE = Stage.of(this)?.stageName;
-        if (!STAGE) {
+        if (!Stage.of(this)?.stageName) {
             throw new Error('This construct must be used within a CDK Stage');
         }
 
-        const applicationName = this.node.tryGetContext('NAME');
+        Tags.of(this).add('SERVICE', id);
 
-        this.eCommerceBaseUrl = StringParameter.fromStringParameterName(
-            this,
-            'ECommerceBaseUrl',
-            `/${applicationName}/e-commerce/base-url`
-        ).stringValue;
+        // EXAMPLE: Replace with your own SSM parameter lookup
+        // this.eCommerceBaseUrl = StringParameter.fromStringParameterName(
+        //     this,
+        //     'ECommerceBaseUrl',
+        //     `/e-commerce/base-url`
+        // );
 
-        // Create secrets once in the shared stack
-        this.eCommerceCredentials = new Secret(this, 'ECommerceCredentials', {
-            secretName: `${applicationName}/e-commerce-credentials`,
-            description: 'E-Commerce API credentials shared across services',
-        });
+        // EXAMPLE: Replace with your own secrets/resources
+        // this.eCommerceCredentials = new Secret(this, 'ECommerceCredentials', {
+        //     description: 'E-Commerce API credentials shared across services',
+        // });
     }
 
+    // EXAMPLE: Update getProps() to return your own resource props
     getProps(): SharedInfraProps {
         return {
-            eCommerceBaseUrl: this.eCommerceBaseUrl,
-            eCommerceCredentials: this.eCommerceCredentials,
+            // eCommerceBaseUrl: this.eCommerceBaseUrl,
+            // eCommerceCredentials: this.eCommerceCredentials,
         };
     }
 }

package/src/generators/service/files/src/index.ts.template

@@ -27,11 +27,10 @@ interface Props extends StackProps, SharedInfraProps {
  * Use 'resolve' helpers below when referencing lambda handlers, step function files etc.
  */
 export class <%= stack %> extends Stack {
-    constructor(scope: Construct, id: Id, props?: Props) {
+    constructor(scope: Construct, id: Id, props: Props) {
         super(scope, id, props);
 
-        const STAGE = Stage.of(this)?.stageName;
-        if (!STAGE) {
+        if (!Stage.of(this)?.stageName) {
             throw new Error('This construct must be used within a CDK Stage');
         }
 

package/src/generators/helpers/configs/packageJson.d.ts

@@ -1,83 +0,0 @@
-export declare const PACKAGE_JSON: {
-    readonly author: "Aligent";
-    readonly private: true;
-    readonly license: "MIT";
-    readonly type: "module";
-    readonly scripts: {
-        readonly test: "nx affected -t test --coverage";
-        readonly 'test:all': "nx run-many -t test --coverage";
-        readonly lint: "nx affected -t lint";
-        readonly 'lint:all': "nx run-many -t lint";
-        readonly typecheck: "nx affected -t typecheck";
-        readonly 'typecheck:all': "nx run-many -t typecheck";
-        readonly postinstall: "[ -d .git ] && git config core.hooksPath '.git-hooks' && chmod +x .git-hooks/* || true";
-        readonly 'pg:synth': "nx run application:cdk synth 'dev/**' --exclusively --bundle-mode=dev --profile=playground";
-        readonly 'pg:deploy': "nx run application:cdk deploy 'dev/**' --method=direct --require-approval=never --exclusively --bundle-mode=dev --profile=playground";
-        readonly 'pg:destroy': "nx run application:cdk destroy 'dev/**' --profile playground";
-        readonly audit: "nx run-many -t lint typecheck test --configuration coverage --skip-nx-cache";
-    };
-    readonly dependencies: {
-        readonly '@aligent/microservice-util-lib': "^1.2.0";
-    };
-    readonly devDependencies: {
-        readonly '@aligent/cdk-aspects': "^0.2.0";
-        readonly '@aligent/cdk-step-function-from-file': "^0.3.2";
-        readonly '@aligent/nx-openapi': "^1.0.0";
-        readonly '@aligent/ts-code-standards': "^4.1.0";
-        readonly '@nx/eslint': "22.1.3";
-        readonly '@nx/eslint-plugin': "22.1.3";
-        readonly '@nx/js': "22.1.3";
-        readonly '@nx/vitest': "22.1.3";
-        readonly '@nx/workspace': "22.1.3";
-        readonly '@swc-node/register': "^1.10.10";
-        readonly '@swc/core': "^1.13.3";
-        readonly '@swc/helpers': "^0.5.17";
-        readonly '@types/aws-lambda': "^8.10.152";
-        readonly '@types/node': "^22.17.0";
-        readonly '@typescript-eslint/eslint-plugin': "8.44.0";
-        readonly '@typescript-eslint/parser': "8.44.0";
-        readonly '@vitest/coverage-v8': "^3.2.4";
-        readonly '@vitest/ui': "^3.2.4";
-        readonly 'aws-cdk': "^2.1033.0";
-        readonly 'aws-cdk-lib': "^2.235.1";
-        readonly 'cdk-nag': "^2.37.55";
-        readonly constructs: "^10.4.3";
-        readonly eslint: "^9.32.0";
-        readonly 'eslint-config-prettier': "^10.1.8";
-        readonly 'eslint-plugin-import': "^2.32.0";
-        readonly 'fast-glob': "^3.3.3";
-        readonly jiti: "2.5.1";
-        readonly 'jsonc-eslint-parser': "^2.4.0";
-        readonly nx: "22.1.3";
-        readonly prettier: "^3.6.2";
-        readonly rolldown: "1.0.0-rc.1";
-        readonly 'store-parameters': "^1.1.3";
-        readonly tslib: "^2.8.1";
-        readonly tsx: "^4.21.0";
-        readonly typescript: "~5.9.2";
-        readonly vite: "^7.2.6";
-        readonly vitest: "^3.2.4";
-    };
-    readonly nx: {
-        readonly includedScripts: readonly [];
-        readonly targets: {
-            readonly parameters: {
-                readonly executor: "nx:run-commands";
-                readonly options: {
-                    readonly color: true;
-                    readonly cwd: "parameters";
-                };
-                readonly configurations: {
-                    readonly import: {
-                        readonly command: "store-parameters import {args.file} --delimiter=|";
-                    };
-                    readonly export: {
-                        readonly command: "store-parameters export {args.file} --path={args.path} --delimiter=|";
-                    };
-                };
-            };
-        };
-    };
-    readonly workspaces: readonly ["application", "clients", "libs/*", "services/*"];
-    readonly packageManager: "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8";
-};

package/src/generators/helpers/configs/packageJson.js

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PACKAGE_JSON = void 0;
-exports.PACKAGE_JSON = {
-    author: 'Aligent',
-    private: true,
-    license: 'MIT',
-    type: 'module',
-    scripts: {
-        test: 'nx affected -t test --coverage',
-        'test:all': 'nx run-many -t test --coverage',
-        lint: 'nx affected -t lint',
-        'lint:all': 'nx run-many -t lint',
-        typecheck: 'nx affected -t typecheck',
-        'typecheck:all': 'nx run-many -t typecheck',
-        postinstall: `[ -d .git ] && git config core.hooksPath '.git-hooks' && chmod +x .git-hooks/* || true`,
-        'pg:synth': `nx run application:cdk synth 'dev/**' --exclusively --bundle-mode=dev --profile=playground`,
-        'pg:deploy': `nx run application:cdk deploy 'dev/**' --method=direct --require-approval=never --exclusively --bundle-mode=dev --profile=playground`,
-        'pg:destroy': "nx run application:cdk destroy 'dev/**' --profile playground",
-        audit: 'nx run-many -t lint typecheck test --configuration coverage --skip-nx-cache',
-    },
-    dependencies: {
-        '@aligent/microservice-util-lib': '^1.2.0',
-    },
-    devDependencies: {
-        '@aligent/cdk-aspects': '^0.2.0',
-        '@aligent/cdk-step-function-from-file': '^0.3.2',
-        '@aligent/nx-openapi': '^1.0.0',
-        '@aligent/ts-code-standards': '^4.1.0',
-        '@nx/eslint': '22.1.3',
-        '@nx/eslint-plugin': '22.1.3',
-        '@nx/js': '22.1.3',
-        '@nx/vitest': '22.1.3',
-        '@nx/workspace': '22.1.3',
-        '@swc-node/register': '^1.10.10',
-        '@swc/core': '^1.13.3',
-        '@swc/helpers': '^0.5.17',
-        '@types/aws-lambda': '^8.10.152',
-        '@types/node': '^22.17.0',
-        '@typescript-eslint/eslint-plugin': '8.44.0',
-        '@typescript-eslint/parser': '8.44.0',
-        '@vitest/coverage-v8': '^3.2.4',
-        '@vitest/ui': '^3.2.4',
-        'aws-cdk': '^2.1033.0',
-        'aws-cdk-lib': '^2.235.1',
-        'cdk-nag': '^2.37.55',
-        constructs: '^10.4.3',
-        eslint: '^9.32.0',
-        'eslint-config-prettier': '^10.1.8',
-        'eslint-plugin-import': '^2.32.0',
-        'fast-glob': '^3.3.3',
-        jiti: '2.5.1',
-        'jsonc-eslint-parser': '^2.4.0',
-        nx: '22.1.3',
-        prettier: '^3.6.2',
-        // FIXME: [MI-251] Rolldown is still in RC. We pin the version and can upgrade with precaution.
-        rolldown: '1.0.0-rc.1',
-        'store-parameters': '^1.1.3',
-        tslib: '^2.8.1',
-        tsx: '^4.21.0',
-        typescript: '~5.9.2',
-        vite: '^7.2.6',
-        vitest: '^3.2.4',
-    },
-    nx: {
-        includedScripts: [],
-        targets: {
-            parameters: {
-                executor: 'nx:run-commands',
-                options: { color: true, cwd: 'parameters' },
-                configurations: {
-                    import: { command: 'store-parameters import {args.file} --delimiter=|' },
-                    export: {
-                        command: 'store-parameters export {args.file} --path={args.path} --delimiter=|',
-                    },
-                },
-            },
-        },
-    },
-    workspaces: ['application', 'clients', 'libs/*', 'services/*'],
-    packageManager: 'yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8',
-};