@aws/nx-plugin 1.0.0-rc.13 → 1.0.0-rc.14

package/src/ts/dynamodb/files/config.json.template

@@ -0,0 +1,24 @@
+{
+  "runtimeConfigKey": "<%= runtimeConfigKey %>",
+  "serveLocal": {
+    "port": <%= localDynamoDBPort %>,
+    "tableName": "<%= localTableName %>",
+    "image": "public.ecr.aws/aws-dynamodb-local/aws-dynamodb-local:latest",
+    "containerName": "<%= containerName %>",
+    "containerEngine": "<%= containerEngine %>"
+  },
+  "tableConfig": {
+    "globalSecondaryIndexes": [
+      {
+        "indexName": "gsi1pk-gsi1sk-index",
+        "partitionKey": "gsi1pk",
+        "sortKey": "gsi1sk"
+      },
+      {
+        "indexName": "gsi2pk-gsi2sk-index",
+        "partitionKey": "gsi2pk",
+        "sortKey": "gsi2sk"
+      }
+    ]
+  }
+}

package/src/ts/dynamodb/files/src/client.ts.template

@@ -1,17 +1,32 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { getAppConfig } from '@aws-lambda-powertools/parameters/appconfig';
-import { PACKAGE_NAME, LOCAL_ACCESS_KEY_ID, LOCAL_ENDPOINT, LOCAL_REGION, LOCAL_SECRET_ACCESS_KEY, LOCAL_TABLE_NAME } from './constants.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+// Generated: must match runtimeConfigKey in config.json
+const runtimeConfigKey = '<%= runtimeConfigKey %>';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+// config.json is only present in local dev (not included in the deployed bundle); guard with SERVE_LOCAL check
+const serveLocal = () =>
+  JSON.parse(readFileSync(join(__dirname, '../config.json'), 'utf-8')).serveLocal;
 
 let _client: DynamoDBClient | undefined;
 
 export const getDynamoDBClient = (): DynamoDBClient => {
-  _client ??= process.env.SERVE_LOCAL === 'true'
-    ? new DynamoDBClient({
-        endpoint: LOCAL_ENDPOINT,
-        region: LOCAL_REGION,
-        credentials: { accessKeyId: LOCAL_ACCESS_KEY_ID, secretAccessKey: LOCAL_SECRET_ACCESS_KEY },
-      })
-    : new DynamoDBClient({});
+  if (!_client) {
+    if (process.env.SERVE_LOCAL === 'true') {
+      const { port } = serveLocal();
+      _client = new DynamoDBClient({
+        endpoint: `http://localhost:${port}`,
+        region: 'us-east-1',
+        credentials: { accessKeyId: 'UNUSED', secretAccessKey: 'UNUSED' },
+      });
+    } else {
+      _client = new DynamoDBClient({});
+    }
+  }
   return _client;
 };
 
@@ -23,7 +38,8 @@ let _tableName: string | undefined;
 
 export const resolveTableName = async (): Promise<string> => {
   if (process.env.SERVE_LOCAL === 'true') {
-    return LOCAL_TABLE_NAME;
+    const { tableName } = serveLocal();
+    return tableName;
   }
   if (_tableName === undefined) {
     const appId = process.env.RUNTIME_CONFIG_APP_ID;
@@ -35,7 +51,7 @@ export const resolveTableName = async (): Promise<string> => {
       environment: 'default',
       transform: 'json',
     });
-    const tableName = config?.[PACKAGE_NAME]?.tableName;
+    const tableName = config?.[runtimeConfigKey]?.tableName;
     if (!tableName) {
       throw new Error('Could not resolve table name from runtime config');
     }

package/src/ts/dynamodb/files/src/index.ts.template

@@ -1,10 +1,2 @@
-export {
-  PACKAGE_NAME,
-  LOCAL_ACCESS_KEY_ID,
-  LOCAL_ENDPOINT,
-  LOCAL_REGION,
-  LOCAL_SECRET_ACCESS_KEY,
-  LOCAL_TABLE_NAME,
-} from './constants.js';
 export { getDynamoDBClient, resolveTableName } from './client.js';
 export * from './entities/index.js';

package/src/ts/dynamodb/generator.js

@@ -1,11 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsDynamoDBGenerator = exports.TS_DYNAMODB_GENERATOR_INFO = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tsDynamoDBGenerator = exports.TS_DYNAMODB_GENERATOR_INFO = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
 const containers_1 = require("../../utils/containers");
 const dynamodb_constructs_1 = require("../../utils/dynamodb-constructs/dynamodb-constructs");
@@ -17,10 +18,11 @@ const npm_scope_1 = require("../../utils/npm-scope");
 const nx_1 = require("../../utils/nx");
 const port_1 = require("../../utils/port");
 const shared_constructs_1 = require("../../utils/shared-constructs");
+const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
+const shared_dynamodb_scripts_1 = require("../../utils/shared-dynamodb-scripts");
 const versions_1 = require("../../utils/versions");
 const generator_1 = tslib_1.__importStar(require("../lib/generator"));
 exports.TS_DYNAMODB_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const DYNAMODB_LOCAL_IMAGE = 'public.ecr.aws/aws-dynamodb-local/aws-dynamodb-local:latest';
 const tsDynamoDBGenerator = async (tree, options) => {
     const nameKebabCase = (0, names_1.kebabCase)(options.name);
     const nameClassName = (0, names_1.toClassName)(options.name);
@@ -46,20 +48,22 @@ const tsDynamoDBGenerator = async (tree, options) => {
         });
     }
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-    const localDynamoPort = (0, port_1.assignSharedPort)(tree, projectConfig, exports.TS_DYNAMODB_GENERATOR_INFO.id, 8000);
+    const localDynamoDBPort = (0, port_1.assignSharedPort)(tree, projectConfig, shared_constructs_constants_1.DYNAMODB_GENERATOR_IDS, 8000);
+    const containerName = `${(0, npm_scope_1.getNpmScope)(tree)}-dynamodb`;
     const templateOptions = {
         runtimeConfigKey: nameClassName,
-        dynamoPackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
-        localDynamoPort,
+        localDynamoDBPort,
         localTableName,
+        containerName,
         containerEngine,
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), dir, templateOptions);
-    const containerName = `${(0, npm_scope_1.getNpmScope)(tree)}-dynamodb`;
+    await (0, shared_dynamodb_scripts_1.sharedDynamoDBScriptsGenerator)(tree);
+    const scriptsDir = (0, node_path_1.relative)(dir, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_SCRIPTS_DIR, 'src', 'dynamodb'));
     projectConfig.targets['pull-image'] = {
         executor: 'nx:run-commands',
         options: {
-            command: `tsx scripts/pull-image.ts ${DYNAMODB_LOCAL_IMAGE}`,
+            command: `tsx ${scriptsDir}/pull-image.ts`,
             cwd: '{projectRoot}',
         },
     };
@@ -69,8 +73,8 @@ const tsDynamoDBGenerator = async (tree, options) => {
         dependsOn: ['pull-image'],
         options: {
             commands: [
-                `tsx scripts/start-container.ts ${containerName} ${DYNAMODB_LOCAL_IMAGE} ${localDynamoPort}`,
-                `tsx scripts/create-local-table.ts ${localTableName} ${localDynamoPort}`,
+                `tsx ${scriptsDir}/start-container.ts`,
+                `tsx ${scriptsDir}/create-local-table.ts`,
             ],
             parallel: true,
             cwd: '{projectRoot}',
@@ -86,7 +90,6 @@ const tsDynamoDBGenerator = async (tree, options) => {
             projectName: fullyQualifiedName,
             nameClassName,
             nameKebabCase,
-            dynamoPackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
             tableName: localTableName,
             projectRoot: dir,
         });

package/src/ts/dynamodb/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/dynamodb/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/dynamodb/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/dynamodb/schema.d.ts

@@ -8,6 +8,7 @@ export interface TsDynamoDBGeneratorSchema {
   name: string;
   directory?: string;
   subDirectory?: string;
+  framework: 'electrodb';
   tableName?: string;
   infra: 'dynamodb' | 'none';
   iac: IacOption;

package/src/ts/dynamodb/schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "ts#dynamodb",
   "title": "ts#dynamodb",
-  "description": "Create a DynamoDB project",
+  "description": "Create a TypeScript DynamoDB project",
   "type": "object",
   "properties": {
     "name": {
@@ -27,9 +27,27 @@
       "description": "The sub directory the project is placed in. By default this is the project name.",
       "x-prompt": "Which sub directory do you want to create the project in? (By default this is the project name)"
     },
+    "framework": {
+      "type": "string",
+      "enum": ["electrodb"],
+      "default": "electrodb",
+      "description": "The framework to use for DynamoDB entities.",
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "Which framework would you like to use for DynamoDB entities?",
+        "type": "list",
+        "items": [
+          {
+            "value": "electrodb",
+            "label": "ElectroDB"
+          }
+        ],
+        "default": "electrodb"
+      }
+    },
     "tableName": {
       "type": "string",
-      "description": "The DynamoDB table name. Defaults to the project name."
+      "description": "The DynamoDB table name. Auto-generated if not specified."
     },
     "infra": {
       "type": "string",

package/src/utils/dynamodb-constructs/dynamodb-constructs.d.ts

@@ -8,7 +8,6 @@ export interface AddDynamoDBConstructOptions {
     projectName: string;
     nameClassName: string;
     nameKebabCase: string;
-    dynamoPackageAlias: string;
     tableName: string;
     projectRoot: string;
 }

package/src/utils/dynamodb-constructs/dynamodb-constructs.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamodb-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/dynamodb-constructs/dynamodb-constructs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dynamodb-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/dynamodb-constructs/dynamodb-constructs.ts"],"names":[],"mappings":"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"}

package/src/utils/dynamodb-constructs/files/cdk/app/dynamodb/__nameKebabCase__.ts.template

@@ -1,5 +1,4 @@
 import { Construct } from 'constructs';
-import { PACKAGE_NAME } from '<%= dynamoPackageAlias %>';
 import { AttributeType, ProjectionType } from 'aws-cdk-lib/aws-dynamodb';
 import {
   DynamoDBTable,
@@ -10,6 +9,16 @@ import { readFileSync } from 'fs';
 import { join } from "path";
 import { fileURLToPath } from "url";
 
+const { runtimeConfigKey, tableConfig } = JSON.parse(
+  readFileSync(
+    join(
+      findWorkspaceRoot(fileURLToPath(new URL(import.meta.url))),
+      '<%= projectRoot %>/config.json',
+    ),
+    'utf-8',
+  ),
+) as { runtimeConfigKey: string; tableConfig: { globalSecondaryIndexes: { indexName: string; partitionKey: string; sortKey?: string }[] } };
+
 export type <%= nameClassName %>Props = Omit<
   DynamoDBTableProps,
   'runtimeConfigKey'
@@ -19,20 +28,10 @@ export class <%= nameClassName %> extends DynamoDBTable {
   constructor(scope: Construct, id: string, props?: <%= nameClassName %>Props) {
     super(scope, id, {
       ...props,
-      runtimeConfigKey: PACKAGE_NAME,
+      runtimeConfigKey,
     });
 
-    const { globalSecondaryIndexes } = JSON.parse(
-      readFileSync(
-        join(
-          findWorkspaceRoot(fileURLToPath(new URL(import.meta.url))),
-          '<%= projectRoot %>/dynamodb.config.json',
-        ),
-        'utf-8',
-      ),
-    ) as { globalSecondaryIndexes: { indexName: string; partitionKey: string; sortKey?: string }[] };
-
-    for (const gsi of globalSecondaryIndexes) {
+    for (const gsi of tableConfig.globalSecondaryIndexes) {
       this.table.addGlobalSecondaryIndex({
         indexName: gsi.indexName,
         partitionKey: { name: gsi.partitionKey, type: AttributeType.STRING },

package/src/utils/dynamodb-constructs/files/terraform/app/dynamodb/__nameKebabCase__/__nameKebabCase__.tf.template

@@ -32,8 +32,8 @@ variable "enable_key_rotation" {
 }
 
 locals {
-  dynamodb_config = jsondecode(file("${path.module}/../../../../../../../<%= projectRoot %>/dynamodb.config.json"))
-  global_secondary_indexes = [for gsi in local.dynamodb_config.globalSecondaryIndexes : {
+  dynamodb_config = jsondecode(file("${path.module}/../../../../../../../<%= projectRoot %>/config.json"))
+  global_secondary_indexes = [for gsi in local.dynamodb_config.tableConfig.globalSecondaryIndexes : {
     name            = gsi.indexName
     hash_key        = gsi.partitionKey
     range_key       = try(gsi.sortKey, null)
@@ -55,7 +55,7 @@ module "add_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
 
   namespace = "dynamodb"
-  key       = "<%= nameClassName %>"
+  key       = local.dynamodb_config.runtimeConfigKey
   value = {
     tableName = module.dynamodb_table.table_name
   }

package/src/{ts/dynamodb/files/scripts → utils/files/common/scripts/src/dynamodb}/create-local-table.ts.template

@@ -1,33 +1,39 @@
 import {
+  BillingMode,
   CreateTableCommand,
   DescribeTableCommand,
   DynamoDBClient,
   GlobalSecondaryIndexDescription,
+  IndexStatus,
+  KeyType,
+  ProjectionType,
   ResourceInUseException,
+  ScalarAttributeType,
+  TableStatus,
   UpdateTableCommand,
-} from '@aws-sdk/client-dynamodb';
-import { readFileSync } from 'fs';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
+} from "@aws-sdk/client-dynamodb";
+import { readFileSync } from "fs";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const { globalSecondaryIndexes } = JSON.parse(
-  readFileSync(join(__dirname, '../dynamodb.config.json'), 'utf-8'),
-) as { globalSecondaryIndexes: { indexName: string; partitionKey: string; sortKey?: string }[] };
-
-const [tableName, port] = process.argv.slice(2);
-const endpoint = `http://localhost:${port}`;
+const {
+  serveLocal: { port, tableName },
+  tableConfig: { globalSecondaryIndexes },
+} = JSON.parse(readFileSync("config.json", "utf-8")) as {
+  serveLocal: { port: number; tableName: string };
+  tableConfig: {
+    globalSecondaryIndexes: {
+      indexName: string;
+      partitionKey: string;
+      sortKey?: string;
+    }[];
+  };
+};
 
-const REQUEST_TIMEOUT_MS = 10_000;
-const timeoutSignal = () => AbortSignal.timeout(REQUEST_TIMEOUT_MS);
+const timeoutSignal = () => AbortSignal.timeout(10000);
 
 const client = new DynamoDBClient({
-  endpoint,
+  endpoint: `http://localhost:${port}`,
   region: 'us-east-1',
-  credentials: {
-    accessKeyId: 'accessKeyId',
-    secretAccessKey: 'secretAccessKey',
-  },
+  credentials: { accessKeyId: 'UNUSED', secretAccessKey: 'UNUSED' },
 });
 
 const waitForTableActive = async (
@@ -40,9 +46,9 @@ const waitForTableActive = async (
       { abortSignal: timeoutSignal() },
     );
     const allActive =
-      Table?.TableStatus === 'ACTIVE' &&
+      Table?.TableStatus === TableStatus.ACTIVE &&
       (Table?.GlobalSecondaryIndexes ?? []).every(
-        (g: GlobalSecondaryIndexDescription) => g.IndexStatus === 'ACTIVE',
+        (g: GlobalSecondaryIndexDescription) => g.IndexStatus === IndexStatus.ACTIVE,
       );
     if (allActive) return;
     await new Promise((resolve) => setTimeout(resolve, 500));
@@ -55,12 +61,14 @@ const ensureTable = async (
   gsIs: { indexName: string; partitionKey: string; sortKey?: string }[],
 ): Promise<void> => {
   const gsiAttributeDefinitions = gsIs.flatMap((gsi) => [
-    { AttributeName: gsi.partitionKey, AttributeType: 'S' as const },
-    ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }] : []),
+    { AttributeName: gsi.partitionKey, AttributeType: ScalarAttributeType.S },
+    ...(gsi.sortKey
+      ? [{ AttributeName: gsi.sortKey, AttributeType: ScalarAttributeType.S }]
+      : []),
   ]);
   const attributeDefinitions = [
-    { AttributeName: 'pk', AttributeType: 'S' as const },
-    { AttributeName: 'sk', AttributeType: 'S' as const },
+    { AttributeName: "pk", AttributeType: ScalarAttributeType.S },
+    { AttributeName: "sk", AttributeType: ScalarAttributeType.S },
     ...gsiAttributeDefinitions.filter(
       (a, i, arr) =>
         arr.findIndex((b) => b.AttributeName === a.AttributeName) === i,
@@ -69,10 +77,12 @@ const ensureTable = async (
   const globalSecondaryIndexes = gsIs.map((gsi) => ({
     IndexName: gsi.indexName,
     KeySchema: [
-      { AttributeName: gsi.partitionKey, KeyType: 'HASH' as const },
-      ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' as const }] : []),
+      { AttributeName: gsi.partitionKey, KeyType: KeyType.HASH },
+      ...(gsi.sortKey
+        ? [{ AttributeName: gsi.sortKey, KeyType: KeyType.RANGE }]
+        : []),
     ],
-    Projection: { ProjectionType: 'ALL' as const },
+    Projection: { ProjectionType: ProjectionType.ALL },
   }));
 
   for (let attempt = 0; attempt < 30; attempt++) {
@@ -83,10 +93,10 @@ const ensureTable = async (
           TableName: tblName,
           AttributeDefinitions: attributeDefinitions,
           KeySchema: [
-            { AttributeName: 'pk', KeyType: 'HASH' },
-            { AttributeName: 'sk', KeyType: 'RANGE' },
+            { AttributeName: "pk", KeyType: KeyType.HASH },
+            { AttributeName: "sk", KeyType: KeyType.RANGE },
           ],
-          BillingMode: 'PAY_PER_REQUEST',
+          BillingMode: BillingMode.PAY_PER_REQUEST,
           ...(globalSecondaryIndexes.length > 0 && {
             GlobalSecondaryIndexes: globalSecondaryIndexes,
           }),
@@ -108,7 +118,7 @@ const ensureTable = async (
         const existingGSIs = Table?.GlobalSecondaryIndexes ?? [];
         const existingNames = new Set(
           existingGSIs.map(
-            (g: GlobalSecondaryIndexDescription) => g.IndexName ?? '',
+            (g: GlobalSecondaryIndexDescription) => g.IndexName ?? "",
           ),
         );
         const desiredNames = new Set(gsIs.map((g) => g.indexName));
@@ -136,18 +146,35 @@ const ensureTable = async (
             new UpdateTableCommand({
               TableName: tblName,
               AttributeDefinitions: [
-                { AttributeName: gsi.partitionKey, AttributeType: 'S' },
-                ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, AttributeType: 'S' as const }] : []),
+                { AttributeName: gsi.partitionKey, AttributeType: ScalarAttributeType.S },
+                ...(gsi.sortKey
+                  ? [
+                      {
+                        AttributeName: gsi.sortKey,
+                        AttributeType: ScalarAttributeType.S,
+                      },
+                    ]
+                  : []),
               ],
               GlobalSecondaryIndexUpdates: [
                 {
                   Create: {
                     IndexName: gsi.indexName,
                     KeySchema: [
-                      { AttributeName: gsi.partitionKey, KeyType: 'HASH' },
-                      ...(gsi.sortKey ? [{ AttributeName: gsi.sortKey, KeyType: 'RANGE' }] : []),
+                      {
+                        AttributeName: gsi.partitionKey,
+                        KeyType: KeyType.HASH,
+                      },
+                      ...(gsi.sortKey
+                        ? [
+                            {
+                              AttributeName: gsi.sortKey,
+                              KeyType: KeyType.RANGE,
+                            },
+                          ]
+                        : []),
                     ],
-                    Projection: { ProjectionType: 'ALL' },
+                    Projection: { ProjectionType: ProjectionType.ALL },
                   },
                 },
               ],

package/src/utils/files/common/scripts/src/dynamodb/pull-image.ts.template

@@ -0,0 +1,13 @@
+import { spawnSync } from 'child_process';
+import { readFileSync } from 'fs';
+
+const { containerEngine, image } =
+  JSON.parse(readFileSync('config.json', 'utf-8')).serveLocal;
+
+const inspect = spawnSync(containerEngine, ['image', 'inspect', image], { stdio: 'ignore' });
+if (inspect.status !== 0) {
+  const pull = spawnSync(containerEngine, ['pull', image], { stdio: 'inherit' });
+  if (pull.status !== 0) {
+    process.exit(pull.status ?? 1);
+  }
+}

package/src/{ts/dynamodb/files/scripts → utils/files/common/scripts/src/dynamodb}/start-container.ts.template

@@ -1,17 +1,17 @@
 import { spawn, spawnSync } from 'child_process';
+import { readFileSync } from 'fs';
 
-const ENGINE = '<%= containerEngine %>';
-
-const [containerName, image, hostPort] = process.argv.slice(2);
+const { containerEngine, containerName, image, port } =
+  JSON.parse(readFileSync('config.json', 'utf-8')).serveLocal;
 
 const containerExists = (): boolean =>
-  spawnSync(ENGINE, ['container', 'inspect', containerName], {
+  spawnSync(containerEngine, ['container', 'inspect', containerName], {
     stdio: 'ignore',
   }).status === 0;
 
 const isRunning = (): boolean => {
   const result = spawnSync(
-    ENGINE,
+    containerEngine,
     ['container', 'inspect', '-f', '{{.State.Running}}', containerName],
     { encoding: 'utf-8' },
   );
@@ -29,19 +29,29 @@ for (;;) {
     if (!isRunning()) {
       // Another process may have started it between our inspect and start — container engine start
       // exits 0 even if the container is already running, so no special-casing needed.
-      const start = spawnSync(ENGINE, ['start', containerName], {
+      const start = spawnSync(containerEngine, ['start', containerName], {
         stdio: 'inherit',
       });
       if (start.status !== 0) process.exit(start.status ?? 1);
     }
     break;
   }
-  const runArgs = (
-    `run <%- containerEngine === 'docker' ? '--rm ' : '' %>--name ${containerName} -u root -w /home/dynamodblocal` +
-    ` -p ${hostPort}:${hostPort} -v ${containerName}-data:/home/dynamodblocal/data` +
-    ` -d ${image} -jar DynamoDBLocal.jar -sharedDb -dbPath ./data -port ${hostPort} -optimizeDbBeforeStartup`
-  ).split(' ');
-  const create = spawnSync(ENGINE, runArgs, { stdio: 'pipe' });
+  const runArgs = [
+    'run',
+    ...(containerEngine === 'docker' ? ['--rm'] : []),
+    '--name', containerName,
+    '-u', 'root',
+    '-w', '/home/dynamodblocal',
+    `-p`, `${port}:${port}`,
+    '-v', `${containerName}-data:/home/dynamodblocal/data`,
+    '-d', image,
+    '-jar', 'DynamoDBLocal.jar',
+    '-sharedDb',
+    '-dbPath', './data',
+    '-port', `${port}`,
+    '-optimizeDbBeforeStartup',
+  ];
+  const create = spawnSync(containerEngine, runArgs, { stdio: 'pipe' });
   if (create.status === 0) {
     created = true;
     break;
@@ -52,7 +62,7 @@ for (;;) {
   }
 }
 
-const logs = spawn(ENGINE, ['logs', '-f', containerName], {
+const logs = spawn(containerEngine, ['logs', '-f', containerName], {
   stdio: ['ignore', 'inherit', 'inherit'],
 });
 
@@ -62,11 +72,11 @@ const cleanup = () => {
   if (exiting) return;
   exiting = true;
   if (created) {
-<%_ if (containerEngine === 'docker') { _%>
-    spawnSync(ENGINE, ['stop', containerName], { stdio: 'ignore' });
-<%_ } else { _%>
-    spawnSync(ENGINE, ['rm', '-f', containerName], { stdio: 'ignore' });
-<%_ } _%>
+    if (containerEngine === 'docker') {
+      spawnSync(containerEngine, ['stop', containerName], { stdio: 'ignore' });
+    } else {
+      spawnSync(containerEngine, ['rm', '-f', containerName], { stdio: 'ignore' });
+    }
   }
   logs.kill();
   process.exit(0);

package/src/utils/port.d.ts

@@ -20,12 +20,13 @@ export interface AssignPortOptions {
     };
 }
 /**
- * Assign a port shared across all projects created by the same generator.
- * If this project already has a port, or a sibling project created by the same
- * generator has one, reuse it; otherwise assign a fresh one. Mutates the
- * project to register the port in its metadata.ports.
+ * Assign a port shared across all projects created by the same generator (or
+ * family of generators). If this project already has a port, or a sibling
+ * project created by any of the given generator IDs has one, reuse it;
+ * otherwise assign a fresh one. Mutates the project to register the port in
+ * its metadata.ports.
  */
-export declare const assignSharedPort: (tree: Tree, project: ProjectConfiguration, generatorId: string, startPort: number) => number;
+export declare const assignSharedPort: (tree: Tree, project: ProjectConfiguration, generatorId: string | string[], startPort: number) => number;
 /**
  * Assign a port for a particular target within a project.
  * Mutates the project to add/update its metadata.ports with the newly assigned port.

package/src/utils/port.js

@@ -31,12 +31,14 @@ const getExistingComponentPort = (project, component) => {
     return typeof match?.port === 'number' ? match.port : undefined;
 };
 /**
- * Assign a port shared across all projects created by the same generator.
- * If this project already has a port, or a sibling project created by the same
- * generator has one, reuse it; otherwise assign a fresh one. Mutates the
- * project to register the port in its metadata.ports.
+ * Assign a port shared across all projects created by the same generator (or
+ * family of generators). If this project already has a port, or a sibling
+ * project created by any of the given generator IDs has one, reuse it;
+ * otherwise assign a fresh one. Mutates the project to register the port in
+ * its metadata.ports.
  */
 const assignSharedPort = (tree, project, generatorId, startPort) => {
+    const generatorIds = Array.isArray(generatorId) ? generatorId : [generatorId];
     // Reuse this project's own port if it already has one (idempotent on re-run)
     const ownPort = getExistingProjectPort(project);
     if (ownPort !== undefined) {
@@ -49,7 +51,7 @@ const assignSharedPort = (tree, project, generatorId, startPort) => {
         generator: p.metadata?.generator,
         port: getExistingProjectPort(p),
     }))
-        .find((p) => p.generator === generatorId && p.port !== undefined)?.port;
+        .find((p) => generatorIds.includes(p.generator) && p.port !== undefined)?.port;
     if (siblingPort !== undefined) {
         project.metadata ??= {};
         project.metadata.ports = [