@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

package/src/ts/rdb/mcp-server-connection/generator.js

@@ -1,46 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsRdbMcpServerConnectionGenerator = exports.TS_RDB_MCP_SERVER_CONNECTION_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
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
-const format_1 = require("../../../utils/format");
-const names_1 = require("../../../utils/names");
-const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
-const npm_scope_1 = require("../../../utils/npm-scope");
-const ast_1 = require("../../../utils/ast");
-const utils_1 = require("../utils");
-exports.TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsRdbMcpServerConnectionGenerator = async (tree, options) => {
-    const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
-    const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
+ */ import { joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import camelCase from "lodash.camelcase";
+import { addDestructuredImport, applyGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { pascalCase } from "../../../utils/names.js";
+import { toScopeAlias } from "../../../utils/npm-scope.js";
+import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { injectRdsCaBundleIntoDockerfile } from "../utils.js";
+export const TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsRdbMcpServerConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
     const mcpServerName = options.sourceComponent?.name ?? 'mcp-server';
-    const serveLocalTarget = `${mcpServerName}-serve-local`;
-    if (sourceProject.targets?.[serveLocalTarget]) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTarget, {
-            projects: [targetProject.name],
-            target: 'serve-local',
+    const devTarget = `${mcpServerName}-dev`;
+    if (sourceProject.targets?.[devTarget]) {
+        addDependencyToTargetIfNotPresent(sourceProject, devTarget, {
+            projects: [
+                targetProject.name
+            ],
+            target: 'dev'
         });
-        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+        updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
     const rdbBaseName = targetProject.name.split('/').pop();
-    const rdbNameCamel = (0, lodash_camelcase_1.default)(rdbBaseName);
-    const rdbNamePascal = (0, names_1.pascalCase)(rdbBaseName);
-    const rdbPackageAlias = (0, npm_scope_1.toScopeAlias)(targetProject.name);
+    const rdbNameCamel = camelCase(rdbBaseName);
+    const rdbNamePascal = pascalCase(rdbBaseName);
+    const rdbPackageAlias = toScopeAlias(targetProject.name);
     const getterAlias = `getPrisma as get${rdbNamePascal}`;
-    const serverPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', mcpServerName, 'server.ts');
+    const serverPath = joinPathFragments(sourceProject.root, 'src', mcpServerName, 'server.ts');
     // Dockerfile: install RDS CA bundle for direct Aurora SSL connections
-    const dockerfilePath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', mcpServerName, 'Dockerfile');
-    (0, utils_1.injectRdsCaBundleIntoDockerfile)(tree, dockerfilePath);
+    const dockerfilePath = joinPathFragments(sourceProject.root, 'src', mcpServerName, 'Dockerfile');
+    injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);
     // server.ts: inject db inside createServer body
     if (tree.exists(serverPath)) {
-        await (0, ast_1.addDestructuredImport)(tree, serverPath, [getterAlias], rdbPackageAlias);
-        await (0, ast_1.applyGritQL)(tree, serverPath, `\`export const createServer = async () => { $body }\` => raw\`export const createServer = async () => {
+        await addDestructuredImport(tree, serverPath, [
+            getterAlias
+        ], rdbPackageAlias);
+        await applyGritQL(tree, serverPath, `\`export const createServer = async () => { $body }\` => raw\`export const createServer = async () => {
   const ${rdbNameCamel} = await get${rdbNamePascal}();
   $body
 }\` where { $body <: not some \`const ${rdbNameCamel} = await get${rdbNamePascal}()\` }`);
@@ -53,11 +52,11 @@ const tsRdbMcpServerConnectionGenerator = async (tree, options) => {
             tree.write(serverPath, content.replace(dbDecl, `${dbDecl}\n  ${onCall}`));
         }
     }
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO,
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 };
-exports.tsRdbMcpServerConnectionGenerator = tsRdbMcpServerConnectionGenerator;
-exports.default = exports.tsRdbMcpServerConnectionGenerator;
+export default tsRdbMcpServerConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/rdb/mcp-server-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/mcp-server-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/mcp-server-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  joinPathFragments,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport { addDestructuredImport, applyGritQL } from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { pascalCase } from '../../../utils/names';\nimport { toScopeAlias } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { injectRdsCaBundleIntoDockerfile } from '../utils';\nimport type { TsRdbMcpServerConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbMcpServerConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbMcpServerConnectionGeneratorSchema,\n): Promise<void> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const mcpServerName = options.sourceComponent?.name ?? 'mcp-server';\n  const devTarget = `${mcpServerName}-dev`;\n\n  if (sourceProject.targets?.[devTarget]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTarget, {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const rdbBaseName = targetProject.name.split('/').pop();\n  const rdbNameCamel = camelCase(rdbBaseName);\n  const rdbNamePascal = pascalCase(rdbBaseName);\n  const rdbPackageAlias = toScopeAlias(targetProject.name);\n  const getterAlias = `getPrisma as get${rdbNamePascal}`;\n\n  const serverPath = joinPathFragments(\n    sourceProject.root,\n    'src',\n    mcpServerName,\n    'server.ts',\n  );\n\n  // Dockerfile: install RDS CA bundle for direct Aurora SSL connections\n  const dockerfilePath = joinPathFragments(\n    sourceProject.root,\n    'src',\n    mcpServerName,\n    'Dockerfile',\n  );\n  injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n\n  // server.ts: inject db inside createServer body\n  if (tree.exists(serverPath)) {\n    await addDestructuredImport(\n      tree,\n      serverPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    await applyGritQL(\n      tree,\n      serverPath,\n      `\\`export const createServer = async () => { $body }\\` => raw\\`export const createServer = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  $body\n}\\` where { $body <: not some \\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\` }`,\n    );\n\n    // Add $on error handler after the db declaration.\n    // Done via string replacement because GritQL treats $on as a metavariable.\n    const dbDecl = `const ${rdbNameCamel} = await get${rdbNamePascal}();`;\n    const onCall = `${rdbNameCamel}.$on('error', console.error);`;\n    const content = tree.read(serverPath, 'utf-8')!;\n    if (content.includes(dbDecl) && !content.includes(`${rdbNameCamel}.$on`)) {\n      tree.write(serverPath, content.replace(dbDecl, `${dbDecl}\\n  ${onCall}`));\n    }\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbMcpServerConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","camelCase","addDestructuredImport","applyGritQL","formatFilesInSubtree","addGeneratorMetricsIfApplicable","pascalCase","toScopeAlias","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","injectRdsCaBundleIntoDockerfile","TS_RDB_MCP_SERVER_CONNECTION_GENERATOR_INFO","filename","tsRdbMcpServerConnectionGenerator","tree","options","sourceProject","targetProject","mcpServerName","sourceComponent","name","devTarget","targets","projects","target","rdbBaseName","split","pop","rdbNameCamel","rdbNamePascal","rdbPackageAlias","getterAlias","serverPath","root","dockerfilePath","exists","dbDecl","onCall","content","read","includes","write","replace"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,OAAOC,eAAe,mBAAmB;AACzC,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,wBAAqB;AACxE,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,UAAU,QAAQ,0BAAuB;AAClD,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,+BAA+B,QAAQ,cAAW;AAG3D,OAAO,MAAMC,8CACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,oCAAoC,OAC/CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvB,MAAMC,gBAAgBH,QAAQI,eAAe,EAAEC,QAAQ;IACvD,MAAMC,YAAY,GAAGH,cAAc,IAAI,CAAC;IAExC,IAAIF,cAAcM,OAAO,EAAE,CAACD,UAAU,EAAE;QACtCd,kCAAkCS,eAAeK,WAAW;YAC1DE,UAAU;gBAACN,cAAcG,IAAI;aAAC;YAC9BI,QAAQ;QACV;QACAzB,2BAA2Be,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMS,cAAcR,cAAcG,IAAI,CAACM,KAAK,CAAC,KAAKC,GAAG;IACrD,MAAMC,eAAe5B,UAAUyB;IAC/B,MAAMI,gBAAgBxB,WAAWoB;IACjC,MAAMK,kBAAkBxB,aAAaW,cAAcG,IAAI;IACvD,MAAMW,cAAc,CAAC,gBAAgB,EAAEF,eAAe;IAEtD,MAAMG,aAAalC,kBACjBkB,cAAciB,IAAI,EAClB,OACAf,eACA;IAGF,sEAAsE;IACtE,MAAMgB,iBAAiBpC,kBACrBkB,cAAciB,IAAI,EAClB,OACAf,eACA;IAEFR,gCAAgCI,MAAMoB;IAEtC,gDAAgD;IAChD,IAAIpB,KAAKqB,MAAM,CAACH,aAAa;QAC3B,MAAM/B,sBACJa,MACAkB,YACA;YAACD;SAAY,EACbD;QAGF,MAAM5B,YACJY,MACAkB,YACA,CAAC;QACC,EAAEJ,aAAa,YAAY,EAAEC,cAAc;;sCAEb,EAAED,aAAa,YAAY,EAAEC,cAAc,MAAM,CAAC;QAGpF,kDAAkD;QAClD,2EAA2E;QAC3E,MAAMO,SAAS,CAAC,MAAM,EAAER,aAAa,YAAY,EAAEC,cAAc,GAAG,CAAC;QACrE,MAAMQ,SAAS,GAAGT,aAAa,6BAA6B,CAAC;QAC7D,MAAMU,UAAUxB,KAAKyB,IAAI,CAACP,YAAY;QACtC,IAAIM,QAAQE,QAAQ,CAACJ,WAAW,CAACE,QAAQE,QAAQ,CAAC,GAAGZ,aAAa,IAAI,CAAC,GAAG;YACxEd,KAAK2B,KAAK,CAACT,YAAYM,QAAQI,OAAO,CAACN,QAAQ,GAAGA,OAAO,IAAI,EAAEC,QAAQ;QACzE;IACF;IAEA,MAAMjC,gCAAgCU,MAAM;QAC1CH;KACD;IACD,MAAMR,qBAAqBW;AAC7B,EAAE;AAEF,eAAeD,kCAAkC"}

package/src/ts/rdb/mcp-server-connection/schema.d.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * TypeScript types for options defined in schema.json
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/rdb/mcp-server-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/mcp-server-connection/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { ComponentMetadata } from '../../../utils/nx';\n\n/**\n * TypeScript types for options defined in schema.json\n */\nexport interface TsRdbMcpServerConnectionGeneratorSchema {\n  sourceProject: string;\n  targetProject: string;\n  sourceComponent?: ComponentMetadata;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD;;CAEC,GACD,WAKC"}

package/src/ts/rdb/mcp-server-connection/schema.d.ts

@@ -11,4 +11,5 @@ export interface TsRdbMcpServerConnectionGeneratorSchema {
   sourceProject: string;
   targetProject: string;
   sourceComponent?: ComponentMetadata;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/rdb/mcp-server-connection/schema.json

@@ -16,6 +16,11 @@
     "sourceComponent": {
       "type": "string",
       "description": "The MCP server component name"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["sourceProject", "targetProject"]

package/src/ts/rdb/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/rdb/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/rdb/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { IacOption } from '../../utils/iac';\n\nexport interface TsRdbGeneratorSchema {\n  name: string;\n  directory?: string;\n  subDirectory?: string;\n  infra: 'aurora' | 'none';\n  engine: 'postgres' | 'mysql';\n  databaseUser?: string;\n  databaseName?: string;\n  framework: 'prisma';\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD,WAWC"}

package/src/ts/rdb/schema.d.ts

@@ -14,4 +14,5 @@ export interface TsRdbGeneratorSchema {
   databaseName?: string;
   framework: 'prisma';
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/rdb/schema.json

@@ -67,7 +67,12 @@
       "x-priority": "important",
       "default": "inherit",
       "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
-  "required": ["name", "infra", "engine", "framework"]
+  "required": ["name"]
 }

package/src/ts/rdb/smithy-connection/__snapshots__/generator.spec.ts.snap

@@ -1,19 +1,19 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ts#rdb smithy-connection generator > should add rdb serve-local dependency to smithy backend serve-local 1`] = `
+exports[`ts#rdb smithy-connection generator > should add rdb dev dependency to smithy backend dev 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "name": "api",
   "root": "packages/api",
   "targets": {
-    "serve-local": {
+    "dev": {
       "continuous": true,
       "dependsOn": [
         {
           "projects": [
             "db",
           ],
-          "target": "serve-local",
+          "target": "dev",
         },
       ],
       "executor": "nx:run-commands",

package/src/ts/rdb/smithy-connection/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { TsRdbSmithyConnectionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsRdbSmithyConnectionGeneratorSchema } from './schema';
 export declare const TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsRdbSmithyConnectionGenerator: (tree: Tree, options: TsRdbSmithyConnectionGeneratorSchema) => Promise<void>;
 export default tsRdbSmithyConnectionGenerator;

package/src/ts/rdb/smithy-connection/generator.js

@@ -1,72 +1,75 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsRdbSmithyConnectionGenerator = exports.TS_RDB_SMITHY_CONNECTION_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
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
-const format_1 = require("../../../utils/format");
-const names_1 = require("../../../utils/names");
-const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
-const npm_scope_1 = require("../../../utils/npm-scope");
-const ast_1 = require("../../../utils/ast");
-exports.TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsRdbSmithyConnectionGenerator = async (tree, options) => {
-    const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
-    const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
-    if (sourceProject.targets?.['serve-local']) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', {
-            projects: [targetProject.name],
-            target: 'serve-local',
+ */ import { joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import camelCase from "lodash.camelcase";
+import { addDestructuredImport, applyGritQL, matchGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { pascalCase } from "../../../utils/names.js";
+import { toScopeAlias } from "../../../utils/npm-scope.js";
+import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+export const TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsRdbSmithyConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
+    if (sourceProject.targets?.['dev']) {
+        addDependencyToTargetIfNotPresent(sourceProject, 'dev', {
+            projects: [
+                targetProject.name
+            ],
+            target: 'dev'
         });
-        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+        updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
     const rdbBaseName = targetProject.name.split('/').pop();
-    const rdbNameCamel = (0, lodash_camelcase_1.default)(rdbBaseName);
-    const rdbNamePascal = (0, names_1.pascalCase)(rdbBaseName);
-    const rdbPackageAlias = (0, npm_scope_1.toScopeAlias)(targetProject.name);
+    const rdbNameCamel = camelCase(rdbBaseName);
+    const rdbNamePascal = pascalCase(rdbBaseName);
+    const rdbPackageAlias = toScopeAlias(targetProject.name);
     const getterAlias = `getPrisma as get${rdbNamePascal}`;
-    const contextPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src/context.ts');
-    const handlerPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src/handler.ts');
-    const localServerPath = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src/local-server.ts');
+    const contextPath = joinPathFragments(sourceProject.root, 'src/context.ts');
+    const handlerPath = joinPathFragments(sourceProject.root, 'src/handler.ts');
+    const localServerPath = joinPathFragments(sourceProject.root, 'src/local-server.ts');
     if (tree.exists(contextPath)) {
-        await (0, ast_1.addDestructuredImport)(tree, contextPath, [getterAlias], rdbPackageAlias);
-        await (0, ast_1.applyGritQL)(tree, contextPath, `\`interface ServiceContext { $members }\` where {
+        await addDestructuredImport(tree, contextPath, [
+            getterAlias
+        ], rdbPackageAlias);
+        await applyGritQL(tree, contextPath, `\`interface ServiceContext { $members }\` where {
         $members <: not some \`${rdbNameCamel}: $_\`,
         $members += \`\n  ${rdbNameCamel}: Awaited<ReturnType<typeof get${rdbNamePascal}>>\`
       }`);
     }
     if (tree.exists(handlerPath)) {
-        await (0, ast_1.addDestructuredImport)(tree, handlerPath, [getterAlias], rdbPackageAlias);
-        const alreadyHasDecl = await (0, ast_1.matchGritQL)(tree, handlerPath, `\`const ${rdbNameCamel} = await get${rdbNamePascal}()\``);
+        await addDestructuredImport(tree, handlerPath, [
+            getterAlias
+        ], rdbPackageAlias);
+        const alreadyHasDecl = await matchGritQL(tree, handlerPath, `\`const ${rdbNameCamel} = await get${rdbNamePascal}()\``);
         if (!alreadyHasDecl) {
-            await (0, ast_1.applyGritQL)(tree, handlerPath, `\`const httpResponse = await serviceHandler.handle($req, $ctx)\` => \`const ${rdbNameCamel} = await get${rdbNamePascal}();\n  const httpResponse = await serviceHandler.handle($req, $ctx)\``);
+            await applyGritQL(tree, handlerPath, `\`const httpResponse = await serviceHandler.handle($req, $ctx)\` => \`const ${rdbNameCamel} = await get${rdbNamePascal}();\n  const httpResponse = await serviceHandler.handle($req, $ctx)\``);
         }
-        await (0, ast_1.applyGritQL)(tree, handlerPath, `\`serviceHandler.handle($req, { $props })\` where {
+        await applyGritQL(tree, handlerPath, `\`serviceHandler.handle($req, { $props })\` where {
         $props <: not some \`${rdbNameCamel}\`,
         $props += \`\n    ${rdbNameCamel}\`
       }`);
     }
     if (tree.exists(localServerPath)) {
-        await (0, ast_1.addDestructuredImport)(tree, localServerPath, [getterAlias], rdbPackageAlias);
-        const alreadyHasDeclLocal = await (0, ast_1.matchGritQL)(tree, localServerPath, `\`const ${rdbNameCamel} = await get${rdbNamePascal}()\``);
+        await addDestructuredImport(tree, localServerPath, [
+            getterAlias
+        ], rdbPackageAlias);
+        const alreadyHasDeclLocal = await matchGritQL(tree, localServerPath, `\`const ${rdbNameCamel} = await get${rdbNamePascal}()\``);
         if (!alreadyHasDeclLocal) {
-            await (0, ast_1.applyGritQL)(tree, localServerPath, `\`const httpResponse = await serviceHandler.handle($req, $ctx)\` => \`const ${rdbNameCamel} = await get${rdbNamePascal}();\n  const httpResponse = await serviceHandler.handle($req, $ctx)\``);
+            await applyGritQL(tree, localServerPath, `\`const httpResponse = await serviceHandler.handle($req, $ctx)\` => \`const ${rdbNameCamel} = await get${rdbNamePascal}();\n  const httpResponse = await serviceHandler.handle($req, $ctx)\``);
         }
-        await (0, ast_1.applyGritQL)(tree, localServerPath, `\`serviceHandler.handle($req, { $props })\` where {
+        await applyGritQL(tree, localServerPath, `\`serviceHandler.handle($req, { $props })\` where {
         $props <: not some \`${rdbNameCamel}\`,
         $props += \`\n    ${rdbNameCamel}\`
       }`);
     }
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO,
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 };
-exports.tsRdbSmithyConnectionGenerator = tsRdbSmithyConnectionGenerator;
-exports.default = exports.tsRdbSmithyConnectionGenerator;
+export default tsRdbSmithyConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/rdb/smithy-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/smithy-connection/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/smithy-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  joinPathFragments,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport {\n  addDestructuredImport,\n  applyGritQL,\n  matchGritQL,\n} from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { pascalCase } from '../../../utils/names';\nimport { toScopeAlias } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport type { TsRdbSmithyConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbSmithyConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbSmithyConnectionGeneratorSchema,\n): Promise<void> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  if (sourceProject.targets?.['dev']) {\n    addDependencyToTargetIfNotPresent(sourceProject, 'dev', {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const rdbBaseName = targetProject.name.split('/').pop();\n  const rdbNameCamel = camelCase(rdbBaseName);\n  const rdbNamePascal = pascalCase(rdbBaseName);\n  const rdbPackageAlias = toScopeAlias(targetProject.name);\n  const getterAlias = `getPrisma as get${rdbNamePascal}`;\n\n  const contextPath = joinPathFragments(sourceProject.root, 'src/context.ts');\n  const handlerPath = joinPathFragments(sourceProject.root, 'src/handler.ts');\n  const localServerPath = joinPathFragments(\n    sourceProject.root,\n    'src/local-server.ts',\n  );\n\n  if (tree.exists(contextPath)) {\n    await addDestructuredImport(\n      tree,\n      contextPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    await applyGritQL(\n      tree,\n      contextPath,\n      `\\`interface ServiceContext { $members }\\` where {\n        $members <: not some \\`${rdbNameCamel}: $_\\`,\n        $members += \\`\\n  ${rdbNameCamel}: Awaited<ReturnType<typeof get${rdbNamePascal}>>\\`\n      }`,\n    );\n  }\n\n  if (tree.exists(handlerPath)) {\n    await addDestructuredImport(\n      tree,\n      handlerPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    const alreadyHasDecl = await matchGritQL(\n      tree,\n      handlerPath,\n      `\\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\``,\n    );\n    if (!alreadyHasDecl) {\n      await applyGritQL(\n        tree,\n        handlerPath,\n        `\\`const httpResponse = await serviceHandler.handle($req, $ctx)\\` => \\`const ${rdbNameCamel} = await get${rdbNamePascal}();\\n  const httpResponse = await serviceHandler.handle($req, $ctx)\\``,\n      );\n    }\n\n    await applyGritQL(\n      tree,\n      handlerPath,\n      `\\`serviceHandler.handle($req, { $props })\\` where {\n        $props <: not some \\`${rdbNameCamel}\\`,\n        $props += \\`\\n    ${rdbNameCamel}\\`\n      }`,\n    );\n  }\n\n  if (tree.exists(localServerPath)) {\n    await addDestructuredImport(\n      tree,\n      localServerPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    const alreadyHasDeclLocal = await matchGritQL(\n      tree,\n      localServerPath,\n      `\\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\``,\n    );\n    if (!alreadyHasDeclLocal) {\n      await applyGritQL(\n        tree,\n        localServerPath,\n        `\\`const httpResponse = await serviceHandler.handle($req, $ctx)\\` => \\`const ${rdbNameCamel} = await get${rdbNamePascal}();\\n  const httpResponse = await serviceHandler.handle($req, $ctx)\\``,\n      );\n    }\n\n    await applyGritQL(\n      tree,\n      localServerPath,\n      `\\`serviceHandler.handle($req, { $props })\\` where {\n        $props <: not some \\`${rdbNameCamel}\\`,\n        $props += \\`\\n    ${rdbNameCamel}\\`\n      }`,\n    );\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbSmithyConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","camelCase","addDestructuredImport","applyGritQL","matchGritQL","formatFilesInSubtree","addGeneratorMetricsIfApplicable","pascalCase","toScopeAlias","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","TS_RDB_SMITHY_CONNECTION_GENERATOR_INFO","filename","tsRdbSmithyConnectionGenerator","tree","options","sourceProject","targetProject","targets","projects","name","target","rdbBaseName","split","pop","rdbNameCamel","rdbNamePascal","rdbPackageAlias","getterAlias","contextPath","root","handlerPath","localServerPath","exists","alreadyHasDecl","alreadyHasDeclLocal"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,OAAOC,eAAe,mBAAmB;AACzC,SACEC,qBAAqB,EACrBC,WAAW,EACXC,WAAW,QACN,wBAAqB;AAC5B,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,UAAU,QAAQ,0BAAuB;AAClD,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAG3B,OAAO,MAAMC,0CACXF,iBAAiB,YAAYG,QAAQ,EAAE;AAEzC,OAAO,MAAMC,iCAAiC,OAC5CC,MACAC;IAEA,MAAMC,gBAAgBN,oCACpBI,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBP,oCACpBI,MACAC,QAAQE,aAAa;IAGvB,IAAID,cAAcE,OAAO,EAAE,CAAC,MAAM,EAAE;QAClCV,kCAAkCQ,eAAe,OAAO;YACtDG,UAAU;gBAACF,cAAcG,IAAI;aAAC;YAC9BC,QAAQ;QACV;QACAtB,2BAA2Be,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMM,cAAcL,cAAcG,IAAI,CAACG,KAAK,CAAC,KAAKC,GAAG;IACrD,MAAMC,eAAezB,UAAUsB;IAC/B,MAAMI,gBAAgBpB,WAAWgB;IACjC,MAAMK,kBAAkBpB,aAAaU,cAAcG,IAAI;IACvD,MAAMQ,cAAc,CAAC,gBAAgB,EAAEF,eAAe;IAEtD,MAAMG,cAAc/B,kBAAkBkB,cAAcc,IAAI,EAAE;IAC1D,MAAMC,cAAcjC,kBAAkBkB,cAAcc,IAAI,EAAE;IAC1D,MAAME,kBAAkBlC,kBACtBkB,cAAcc,IAAI,EAClB;IAGF,IAAIhB,KAAKmB,MAAM,CAACJ,cAAc;QAC5B,MAAM5B,sBACJa,MACAe,aACA;YAACD;SAAY,EACbD;QAGF,MAAMzB,YACJY,MACAe,aACA,CAAC;+BACwB,EAAEJ,aAAa;0BACpB,EAAEA,aAAa,+BAA+B,EAAEC,cAAc;OACjF,CAAC;IAEN;IAEA,IAAIZ,KAAKmB,MAAM,CAACF,cAAc;QAC5B,MAAM9B,sBACJa,MACAiB,aACA;YAACH;SAAY,EACbD;QAGF,MAAMO,iBAAiB,MAAM/B,YAC3BW,MACAiB,aACA,CAAC,QAAQ,EAAEN,aAAa,YAAY,EAAEC,cAAc,IAAI,CAAC;QAE3D,IAAI,CAACQ,gBAAgB;YACnB,MAAMhC,YACJY,MACAiB,aACA,CAAC,4EAA4E,EAAEN,aAAa,YAAY,EAAEC,cAAc,qEAAqE,CAAC;QAElM;QAEA,MAAMxB,YACJY,MACAiB,aACA,CAAC;6BACsB,EAAEN,aAAa;0BAClB,EAAEA,aAAa;OAClC,CAAC;IAEN;IAEA,IAAIX,KAAKmB,MAAM,CAACD,kBAAkB;QAChC,MAAM/B,sBACJa,MACAkB,iBACA;YAACJ;SAAY,EACbD;QAGF,MAAMQ,sBAAsB,MAAMhC,YAChCW,MACAkB,iBACA,CAAC,QAAQ,EAAEP,aAAa,YAAY,EAAEC,cAAc,IAAI,CAAC;QAE3D,IAAI,CAACS,qBAAqB;YACxB,MAAMjC,YACJY,MACAkB,iBACA,CAAC,4EAA4E,EAAEP,aAAa,YAAY,EAAEC,cAAc,qEAAqE,CAAC;QAElM;QAEA,MAAMxB,YACJY,MACAkB,iBACA,CAAC;6BACsB,EAAEP,aAAa;0BAClB,EAAEA,aAAa;OAClC,CAAC;IAEN;IAEA,MAAMpB,gCAAgCS,MAAM;QAC1CH;KACD;IACD,MAAMP,qBAAqBU;AAC7B,EAAE;AAEF,eAAeD,+BAA+B"}

package/src/ts/rdb/smithy-connection/schema.d.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * TypeScript types for options defined in schema.json
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/rdb/smithy-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/smithy-connection/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\n/**\n * TypeScript types for options defined in schema.json\n */\nexport interface TsRdbSmithyConnectionGeneratorSchema {\n  sourceProject: string;\n  targetProject: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED;;CAEC,GACD,WAIC"}

package/src/ts/rdb/smithy-connection/schema.d.ts

@@ -9,4 +9,5 @@
 export interface TsRdbSmithyConnectionGeneratorSchema {
   sourceProject: string;
   targetProject: string;
+  preferInstallDependencies?: boolean;
 }

package/src/ts/rdb/smithy-connection/schema.json

@@ -12,6 +12,11 @@
     "targetProject": {
       "type": "string",
       "description": "The ts#rdb project to connect to"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["sourceProject", "targetProject"]

package/src/ts/rdb/trpc-connection/__snapshots__/generator.spec.ts.snap

@@ -1,19 +1,19 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ts#rdb trpc-connection generator > should add rdb serve-local dependency to trpc serve-local 1`] = `
+exports[`ts#rdb trpc-connection generator > should add rdb dev dependency to trpc dev 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "name": "api",
   "root": "packages/api",
   "targets": {
-    "serve-local": {
+    "dev": {
       "continuous": true,
       "dependsOn": [
         {
           "projects": [
             "db",
           ],
-          "target": "serve-local",
+          "target": "dev",
         },
       ],
       "executor": "nx:run-commands",

package/src/ts/rdb/trpc-connection/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { TsRdbTrpcConnectionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsRdbTrpcConnectionGeneratorSchema } from './schema';
 export declare const TS_RDB_TRPC_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsRdbTrpcConnectionGenerator: (tree: Tree, options: TsRdbTrpcConnectionGeneratorSchema) => Promise<void>;
 export default tsRdbTrpcConnectionGenerator;

package/src/ts/rdb/trpc-connection/generator.js

@@ -1,41 +1,46 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsRdbTrpcConnectionGenerator = exports.TS_RDB_TRPC_CONNECTION_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
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../../utils/nx");
-const metrics_1 = require("../../../utils/metrics");
-const format_1 = require("../../../utils/format");
-const names_1 = require("../../../utils/names");
-const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
-const npm_scope_1 = require("../../../utils/npm-scope");
-exports.TS_RDB_TRPC_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsRdbTrpcConnectionGenerator = async (tree, options) => {
-    const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
-    const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
-    if (sourceProject.targets?.['serve-local']) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, 'serve-local', {
-            projects: [targetProject.name],
-            target: 'serve-local',
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import camelCase from "lodash.camelcase";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { kebabCase, pascalCase } from "../../../utils/names.js";
+import { toScopeAlias } from "../../../utils/npm-scope.js";
+import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+export const TS_RDB_TRPC_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsRdbTrpcConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
+    if (sourceProject.targets?.['dev']) {
+        addDependencyToTargetIfNotPresent(sourceProject, 'dev', {
+            projects: [
+                targetProject.name
+            ],
+            target: 'dev'
         });
-        (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
+        updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
     const rdbBaseName = targetProject.name.split('/').pop();
-    const rdbNameKebab = (0, names_1.kebabCase)(rdbBaseName);
-    const rdbNameCamel = (0, lodash_camelcase_1.default)(rdbBaseName);
-    const rdbNamePascal = (0, names_1.pascalCase)(rdbBaseName);
-    const rdbPackageAlias = (0, npm_scope_1.toScopeAlias)(targetProject.name);
+    const rdbNameKebab = kebabCase(rdbBaseName);
+    const rdbNameCamel = camelCase(rdbBaseName);
+    const rdbNamePascal = pascalCase(rdbBaseName);
+    const rdbPackageAlias = toScopeAlias(targetProject.name);
     const engine = (targetProject.metadata ?? {}).engine ?? 'PostgreSQL';
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), sourceProject.root, { rdbNameKebab, rdbNameCamel, rdbNamePascal, rdbPackageAlias, engine }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_RDB_TRPC_CONNECTION_GENERATOR_INFO,
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), sourceProject.root, {
+        rdbNameKebab,
+        rdbNameCamel,
+        rdbNamePascal,
+        rdbPackageAlias,
+        engine
+    }, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_RDB_TRPC_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 };
-exports.tsRdbTrpcConnectionGenerator = tsRdbTrpcConnectionGenerator;
-exports.default = exports.tsRdbTrpcConnectionGenerator;
+export default tsRdbTrpcConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/ts/rdb/trpc-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/trpc-connection/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAMoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAA6D;AAC7D,gFAAyC;AACzC,wDAAwD;AAE3C,QAAA,qCAAqC,GAChD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,4BAA4B,GAAG,KAAK,EAC/C,IAAU,EACV,OAA2C,EAC5B,EAAE;IACjB,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3C,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE;YAC9D,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAA,0BAAS,EAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,IAAA,kBAAU,EAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,IAAA,wBAAY,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,CAAE,aAAa,CAAC,QAAgB,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC;IAE9E,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,aAAa,CAAC,IAAI,EAClB,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,EACtE,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,6CAAqC;KACtC,CAAC,CAAC;IACH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAxCW,QAAA,4BAA4B,gCAwCvC;AAEF,kBAAe,oCAA4B,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/trpc-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { kebabCase, pascalCase } from '../../../utils/names';\nimport { toScopeAlias } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport type { TsRdbTrpcConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_TRPC_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbTrpcConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbTrpcConnectionGeneratorSchema,\n): Promise<void> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  if (sourceProject.targets?.['dev']) {\n    addDependencyToTargetIfNotPresent(sourceProject, 'dev', {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const rdbBaseName = targetProject.name.split('/').pop();\n  const rdbNameKebab = kebabCase(rdbBaseName);\n  const rdbNameCamel = camelCase(rdbBaseName);\n  const rdbNamePascal = pascalCase(rdbBaseName);\n  const rdbPackageAlias = toScopeAlias(targetProject.name);\n  const engine = ((targetProject.metadata as any) ?? {}).engine ?? 'PostgreSQL';\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    sourceProject.root,\n    { rdbNameKebab, rdbNameCamel, rdbNamePascal, rdbPackageAlias, engine },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_TRPC_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbTrpcConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","camelCase","formatFilesInSubtree","addGeneratorMetricsIfApplicable","kebabCase","pascalCase","toScopeAlias","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","TS_RDB_TRPC_CONNECTION_GENERATOR_INFO","filename","tsRdbTrpcConnectionGenerator","tree","options","sourceProject","targetProject","targets","projects","name","target","rdbBaseName","split","pop","rdbNameKebab","rdbNameCamel","rdbNamePascal","rdbPackageAlias","engine","metadata","dirname","root","overwriteStrategy","KeepExisting"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,OAAOC,eAAe,mBAAmB;AACzC,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,SAAS,EAAEC,UAAU,QAAQ,0BAAuB;AAC7D,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAG3B,OAAO,MAAMC,wCACXF,iBAAiB,YAAYG,QAAQ,EAAE;AAEzC,OAAO,MAAMC,+BAA+B,OAC1CC,MACAC;IAEA,MAAMC,gBAAgBN,oCACpBI,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBP,oCACpBI,MACAC,QAAQE,aAAa;IAGvB,IAAID,cAAcE,OAAO,EAAE,CAAC,MAAM,EAAE;QAClCV,kCAAkCQ,eAAe,OAAO;YACtDG,UAAU;gBAACF,cAAcG,IAAI;aAAC;YAC9BC,QAAQ;QACV;QACApB,2BAA2Ba,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMM,cAAcL,cAAcG,IAAI,CAACG,KAAK,CAAC,KAAKC,GAAG;IACrD,MAAMC,eAAepB,UAAUiB;IAC/B,MAAMI,eAAexB,UAAUoB;IAC/B,MAAMK,gBAAgBrB,WAAWgB;IACjC,MAAMM,kBAAkBrB,aAAaU,cAAcG,IAAI;IACvD,MAAMS,SAAS,AAAC,CAAA,AAACZ,cAAca,QAAQ,IAAY,CAAC,CAAA,EAAGD,MAAM,IAAI;IAEjE/B,cACEgB,MACAf,kBAAkB,YAAYgC,OAAO,EAAE,UACvCf,cAAcgB,IAAI,EAClB;QAAEP;QAAcC;QAAcC;QAAeC;QAAiBC;IAAO,GACrE;QAAEI,mBAAmBjC,kBAAkBkC,YAAY;IAAC;IAGtD,MAAM9B,gCAAgCU,MAAM;QAC1CH;KACD;IACD,MAAMR,qBAAqBW;AAC7B,EAAE;AAEF,eAAeD,6BAA6B"}

package/src/ts/rdb/trpc-connection/schema.d.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * TypeScript types for options defined in schema.json
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/ts/rdb/trpc-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/trpc-connection/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\n/**\n * TypeScript types for options defined in schema.json\n */\nexport interface TsRdbTrpcConnectionGeneratorSchema {\n  sourceProject: string;\n  targetProject: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED;;CAEC,GACD,WAIC"}