@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.31

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

@@ -42,7 +42,7 @@ CMD [ "node", "--require", "@aws/aws-distro-opentelemetry-node-autoinstrumentati
 "
 `;
 
-exports[`ts#rdb agent-connection generator > should add rdb serve-local dependency to the agent prefixed serve-local 1`] = `
+exports[`ts#rdb agent-connection generator > should add rdb dev dependency to the agent prefixed dev 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "metadata": {
@@ -58,14 +58,14 @@ exports[`ts#rdb agent-connection generator > should add rdb serve-local dependen
   "name": "my-service",
   "root": "packages/my-service",
   "targets": {
-    "my-agent-serve-local": {
+    "my-agent-dev": {
       "continuous": true,
       "dependsOn": [
         {
           "projects": [
             "db",
           ],
-          "target": "serve-local",
+          "target": "dev",
         },
       ],
       "executor": "nx:run-commands",
@@ -141,7 +141,7 @@ export const getAgent = async () => {
 "
 `;
 
-exports[`ts#rdb agent-connection generator > should fall back to agent-serve-local when no component name 1`] = `
+exports[`ts#rdb agent-connection generator > should fall back to agent-dev when no component name 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "metadata": {
@@ -157,14 +157,14 @@ exports[`ts#rdb agent-connection generator > should fall back to agent-serve-loc
   "name": "my-service",
   "root": "packages/my-service",
   "targets": {
-    "agent-serve-local": {
+    "agent-dev": {
       "continuous": true,
       "dependsOn": [
         {
           "projects": [
             "db",
           ],
-          "target": "serve-local",
+          "target": "dev",
         },
       ],
       "executor": "nx:run-commands",

package/src/ts/rdb/agent-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 { TsRdbAgentConnectionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { TsRdbAgentConnectionGeneratorSchema } from './schema';
 export declare const TS_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsRdbAgentConnectionGenerator: (tree: Tree, options: TsRdbAgentConnectionGeneratorSchema) => Promise<void>;
 export default tsRdbAgentConnectionGenerator;

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

@@ -1,52 +1,51 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsRdbAgentConnectionGenerator = exports.TS_RDB_AGENT_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_AGENT_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsRdbAgentConnectionGenerator = 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_AGENT_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsRdbAgentConnectionGenerator = async (tree, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, options.sourceProject);
+    const targetProject = readProjectConfigurationUnqualified(tree, options.targetProject);
     const agentName = options.sourceComponent?.name ?? 'agent';
-    const serveLocalTarget = `${agentName}-serve-local`;
-    if (sourceProject.targets?.[serveLocalTarget]) {
-        (0, nx_1.addDependencyToTargetIfNotPresent)(sourceProject, serveLocalTarget, {
-            projects: [targetProject.name],
-            target: 'serve-local',
+    const devTarget = `${agentName}-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 agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', agentName);
-    const agentPath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.ts');
+    const agentSourceDir = joinPathFragments(sourceProject.root, 'src', agentName);
+    const agentPath = joinPathFragments(agentSourceDir, 'agent.ts');
     // Dockerfile: install RDS CA bundle for direct Aurora SSL connections
-    const dockerfilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'Dockerfile');
-    (0, utils_1.injectRdsCaBundleIntoDockerfile)(tree, dockerfilePath);
+    const dockerfilePath = joinPathFragments(agentSourceDir, 'Dockerfile');
+    injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);
     if (tree.exists(agentPath)) {
-        await (0, ast_1.addDestructuredImport)(tree, agentPath, [getterAlias], rdbPackageAlias);
+        await addDestructuredImport(tree, agentPath, [
+            getterAlias
+        ], rdbPackageAlias);
         // Block body form: export const getAgent = async () => { ... }
-        await (0, ast_1.applyGritQL)(tree, agentPath, `\`export const getAgent = async () => { $body }\` => raw\`export const getAgent = async () => {
+        await applyGritQL(tree, agentPath, `\`export const getAgent = async () => { $body }\` => raw\`export const getAgent = async () => {
   const ${rdbNameCamel} = await get${rdbNamePascal}();
   $body
 }\` where { $body <: not some \`const ${rdbNameCamel} = await get${rdbNamePascal}()\` }`);
         // Expression body form: export const getAgent = async () => expr
-        await (0, ast_1.applyGritQL)(tree, agentPath, `\`export const getAgent = async () => $expr\` => raw\`export const getAgent = async () => {
+        await applyGritQL(tree, agentPath, `\`export const getAgent = async () => $expr\` => raw\`export const getAgent = async () => {
   const ${rdbNameCamel} = await get${rdbNamePascal}();
   return $expr;
 }\` where { $expr <: not \`{ $_ }\` }`);
@@ -59,11 +58,11 @@ const tsRdbAgentConnectionGenerator = async (tree, options) => {
             tree.write(agentPath, content.replace(dbDecl, `${dbDecl}\n  ${onCall}`));
         }
     }
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.TS_RDB_AGENT_CONNECTION_GENERATOR_INFO,
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_RDB_AGENT_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
+    await formatFilesInSubtree(tree);
 };
-exports.tsRdbAgentConnectionGenerator = tsRdbAgentConnectionGenerator;
-exports.default = exports.tsRdbAgentConnectionGenerator;
+export default tsRdbAgentConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/agent-connection/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAIoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAkD;AAClD,gFAAyC;AACzC,wDAAwD;AACxD,4CAAwE;AACxE,oCAA2D;AAE9C,QAAA,sCAAsC,GACjD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,6BAA6B,GAAG,KAAK,EAChD,IAAU,EACV,OAA4C,EAC7B,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,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,IAAI,OAAO,CAAC;IAC3D,MAAM,gBAAgB,GAAG,GAAG,SAAS,cAAc,CAAC;IAEpD,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC9C,IAAA,sCAAiC,EAAC,aAAa,EAAE,gBAAgB,EAAE;YACjE,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,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,WAAW,GAAG,mBAAmB,aAAa,EAAE,CAAC;IAEvD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,SAAS,CACV,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAEhE,sEAAsE;IACtE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACvE,IAAA,uCAA+B,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEtD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,SAAS,EACT,CAAC,WAAW,CAAC,EACb,eAAe,CAChB,CAAC;QAEF,+DAA+D;QAC/D,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,SAAS,EACT;UACI,YAAY,eAAe,aAAa;;wCAEV,YAAY,eAAe,aAAa,QAAQ,CACnF,CAAC;QAEF,iEAAiE;QACjE,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,SAAS,EACT;UACI,YAAY,eAAe,aAAa;;sCAEZ,CACjC,CAAC;QAEF,kDAAkD;QAClD,2EAA2E;QAC3E,MAAM,MAAM,GAAG,SAAS,YAAY,eAAe,aAAa,KAAK,CAAC;QACtE,MAAM,MAAM,GAAG,GAAG,YAAY,+BAA+B,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAE,CAAC;QAC/C,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,YAAY,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,MAAM,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,8CAAsC;KACvC,CAAC,CAAC;IACH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC;AAnFW,QAAA,6BAA6B,iCAmFxC;AAEF,kBAAe,qCAA6B,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/agent-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 { TsRdbAgentConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbAgentConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbAgentConnectionGeneratorSchema,\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 agentName = options.sourceComponent?.name ?? 'agent';\n  const devTarget = `${agentName}-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 agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    'src',\n    agentName,\n  );\n  const agentPath = joinPathFragments(agentSourceDir, 'agent.ts');\n\n  // Dockerfile: install RDS CA bundle for direct Aurora SSL connections\n  const dockerfilePath = joinPathFragments(agentSourceDir, 'Dockerfile');\n  injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n\n  if (tree.exists(agentPath)) {\n    await addDestructuredImport(\n      tree,\n      agentPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    // Block body form: export const getAgent = async () => { ... }\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => { $body }\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  $body\n}\\` where { $body <: not some \\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\` }`,\n    );\n\n    // Expression body form: export const getAgent = async () => expr\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => $expr\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  return $expr;\n}\\` where { $expr <: not \\`{ $_ }\\` }`,\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(agentPath, 'utf-8')!;\n    if (content.includes(dbDecl) && !content.includes(`${rdbNameCamel}.$on`)) {\n      tree.write(agentPath, content.replace(dbDecl, `${dbDecl}\\n  ${onCall}`));\n    }\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbAgentConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","camelCase","addDestructuredImport","applyGritQL","formatFilesInSubtree","addGeneratorMetricsIfApplicable","pascalCase","toScopeAlias","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","injectRdsCaBundleIntoDockerfile","TS_RDB_AGENT_CONNECTION_GENERATOR_INFO","filename","tsRdbAgentConnectionGenerator","tree","options","sourceProject","targetProject","agentName","sourceComponent","name","devTarget","targets","projects","target","rdbBaseName","split","pop","rdbNameCamel","rdbNamePascal","rdbPackageAlias","getterAlias","agentSourceDir","root","agentPath","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,yCACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvB,MAAMC,YAAYH,QAAQI,eAAe,EAAEC,QAAQ;IACnD,MAAMC,YAAY,GAAGH,UAAU,IAAI,CAAC;IAEpC,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,iBAAiBlC,kBACrBkB,cAAciB,IAAI,EAClB,OACAf;IAEF,MAAMgB,YAAYpC,kBAAkBkC,gBAAgB;IAEpD,sEAAsE;IACtE,MAAMG,iBAAiBrC,kBAAkBkC,gBAAgB;IACzDtB,gCAAgCI,MAAMqB;IAEtC,IAAIrB,KAAKsB,MAAM,CAACF,YAAY;QAC1B,MAAMjC,sBACJa,MACAoB,WACA;YAACH;SAAY,EACbD;QAGF,+DAA+D;QAC/D,MAAM5B,YACJY,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;sCAEb,EAAED,aAAa,YAAY,EAAEC,cAAc,MAAM,CAAC;QAGpF,iEAAiE;QACjE,MAAM3B,YACJY,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;qCAEd,CAAC;QAGlC,kDAAkD;QAClD,2EAA2E;QAC3E,MAAMQ,SAAS,CAAC,MAAM,EAAET,aAAa,YAAY,EAAEC,cAAc,GAAG,CAAC;QACrE,MAAMS,SAAS,GAAGV,aAAa,6BAA6B,CAAC;QAC7D,MAAMW,UAAUzB,KAAK0B,IAAI,CAACN,WAAW;QACrC,IAAIK,QAAQE,QAAQ,CAACJ,WAAW,CAACE,QAAQE,QAAQ,CAAC,GAAGb,aAAa,IAAI,CAAC,GAAG;YACxEd,KAAK4B,KAAK,CAACR,WAAWK,QAAQI,OAAO,CAACN,QAAQ,GAAGA,OAAO,IAAI,EAAEC,QAAQ;QACxE;IACF;IAEA,MAAMlC,gCAAgCU,MAAM;QAC1CH;KACD;IACD,MAAMR,qBAAqBW;AAC7B,EAAE;AAEF,eAAeD,8BAA8B"}

package/src/ts/rdb/agent-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/agent-connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/agent-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 TsRdbAgentConnectionGeneratorSchema {\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/agent-connection/schema.d.ts

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

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

@@ -16,6 +16,11 @@
     "sourceComponent": {
       "type": "string",
       "description": "The agent 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/files/config.json.template

@@ -0,0 +1,14 @@
+{
+  "runtimeConfigKey": "<%= runtimeConfigKey %>",
+  "localDev": {
+    "containerEngine": "<%= containerEngine %>",
+    "containerName": "<%= containerName %>",
+    "image": "<%= dockerImage %>",
+    "port": <%= localDbPort %>,
+    "host": "<%= localDbHost %>",
+    "dbName": "<%= localDbName %>",
+    "dbUser": "<%= localDbUser %>",
+    "dbPassword": "<%= localDbPassword %>",
+    "dbEngine": "<%= engine %>"
+  }
+}

package/src/ts/rdb/files/prisma.config.ts.template

@@ -1,13 +1,14 @@
 import { defineConfig } from 'prisma/config';
+import { readFileSync } from 'fs';
 
 const getDatabaseUrl = async () => {
-  if (process.env.SERVE_LOCAL === 'true') {
-    const { LOCAL_DB_HOST, LOCAL_DB_NAME, LOCAL_DB_PASSWORD, LOCAL_DB_PORT, LOCAL_DB_USER } =
-      await import('./src/constants.js');
+  if (process.env.LOCAL_DEV === 'true') {
+    const { host, port, dbName, dbUser, dbPassword } =
+      JSON.parse(readFileSync('config.json', 'utf-8')).localDev;
 <%_ if (engine === 'mysql') { _%>
-    return `mysql://${LOCAL_DB_USER}:${LOCAL_DB_PASSWORD}@${LOCAL_DB_HOST}:${LOCAL_DB_PORT}/${LOCAL_DB_NAME}`;
+    return `mysql://${dbUser}:${dbPassword}@${host}:${port}/${dbName}`;
 <%_ } else { _%>
-    return `postgresql://${LOCAL_DB_USER}:${LOCAL_DB_PASSWORD}@${LOCAL_DB_HOST}:${LOCAL_DB_PORT}/${LOCAL_DB_NAME}`;
+    return `postgresql://${dbUser}:${dbPassword}@${host}:${port}/${dbName}`;
 <%_ } _%>
   }
   return process.env.DATABASE_URL;

package/src/ts/rdb/files/src/create-db-user-handler.ts.template

@@ -49,7 +49,7 @@ const ensureDatabaseUser = async (dbUser: string): Promise<void> => {
       [
         `CREATE USER IF NOT EXISTS ${quotedUser}@${quotedHost} IDENTIFIED WITH AWSAuthenticationPlugin AS 'RDS'`,
         `ALTER USER ${quotedUser}@${quotedHost} IDENTIFIED WITH AWSAuthenticationPlugin AS 'RDS' REQUIRE SSL`,
-        `GRANT ALL PRIVILEGES ON ${quotedDbName}.* TO ${quotedUser}@${quotedHost}`,
+        `GRANT SELECT, INSERT, UPDATE, DELETE ON ${quotedDbName}.* TO ${quotedUser}@${quotedHost}`,
       ].join(';\n'),
     );
   } finally {
@@ -87,14 +87,12 @@ const ensureDatabaseUser = async (dbUser: string): Promise<void> => {
 
     await client.query(
       `ALTER ROLE ${quotedDbUser} WITH LOGIN;
-      GRANT ALL PRIVILEGES ON DATABASE ${quotedDbName} TO ${quotedDbUser};
-      GRANT USAGE, CREATE ON SCHEMA public TO ${quotedDbUser};
-      GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ${quotedDbUser};
-      GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ${quotedDbUser};
-      GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public TO ${quotedDbUser};
-      ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO ${quotedDbUser};
-      ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON SEQUENCES TO ${quotedDbUser};
-      ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON FUNCTIONS TO ${quotedDbUser};
+      GRANT CONNECT ON DATABASE ${quotedDbName} TO ${quotedDbUser};
+      GRANT USAGE ON SCHEMA public TO ${quotedDbUser};
+      GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO ${quotedDbUser};
+      GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO ${quotedDbUser};
+      ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO ${quotedDbUser};
+      ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT USAGE, SELECT ON SEQUENCES TO ${quotedDbUser};
       GRANT rds_iam TO ${quotedDbUser};`,
     );
 

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

@@ -1,2 +1 @@
-export { DB_PACKAGE_NAME } from './constants.js';
 export { getPrisma } from './prisma.js';

package/src/ts/rdb/files/src/migration-handler.ts.template

@@ -1,43 +1,16 @@
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-<%_ if (engine === 'mysql') { _%>
 import { getDatabaseSecret, withConnectionRetry } from './utils.js';
-<%_ } else { _%>
-import { Signer } from '@aws-sdk/rds-signer';
-import { withConnectionRetry } from './utils.js';
-<%_ } _%>
 
 const buildDatabaseUrl = async (): Promise<string> => {
-<%_ if (engine === 'mysql') { _%>
   const { host, port, dbname, username, password } = await getDatabaseSecret();
 
   return (
-    `mysql://${encodeURIComponent(username)}` +
+    `<%= engine === 'mysql' ? 'mysql' : 'postgresql' %>://${encodeURIComponent(username)}` +
     `:${encodeURIComponent(password)}` +
     `@${host}:${port}/${dbname}` +
     `?sslaccept=strict`
   );
-<%_ } else { _%>
-  const hostname = process.env.HOSTNAME!;
-  const port = process.env.PORT!;
-  const database = process.env.DATABASE!;
-  const dbUser = process.env.DBUSER!;
-  const region = process.env.AWS_REGION!;
-
-  const iamAuthToken = await new Signer({
-    hostname,
-    port: Number(port),
-    region,
-    username: dbUser,
-  }).getAuthToken();
-
-  return (
-    `postgresql://${encodeURIComponent(dbUser)}` +
-    `:${encodeURIComponent(iamAuthToken)}` +
-    `@${hostname}:${port}/${database}` +
-    `?sslaccept=strict` // `sslaccept` is the correct parameter here for postgresql. The Prisma CLI Rust engine does not use the standard libpq `sslmode` option.
-  );
-<%_ } _%>
 };
 
 export const handler = async () => {

package/src/ts/rdb/files/src/prisma.ts.template

@@ -4,27 +4,31 @@ import { Prisma, PrismaClient } from '../generated/prisma/client.js';
 <%_ if (engine === 'postgres') { _%>
 import { Pool } from 'pg';
 <%_ } _%>
-import {
-  DB_PACKAGE_NAME,
-  LOCAL_DB_HOST,
-  LOCAL_DB_NAME,
-  LOCAL_DB_PASSWORD,
-  LOCAL_DB_PORT,
-  LOCAL_DB_USER,
-} from './constants.js';
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
 import { getDatabaseConfig } from './utils.js';
-<%_ if (engine === 'mysql') { _%>
 
+// 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 LOCAL_DEV check
+const localDev = () =>
+  JSON.parse(readFileSync(join(__dirname, '../config.json'), 'utf-8')).localDev;
+
+<%_ if (engine === 'mysql') { _%>
 export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
   log: LogOpts[] = ['warn', 'error'] as LogOpts[],
 ): Promise<PrismaClient<LogOpts>> => {
-  if (process.env.SERVE_LOCAL === 'true') {
+  if (process.env.LOCAL_DEV === 'true') {
+    const { host, port, dbName, dbUser, dbPassword } = localDev();
     const adapter = new PrismaMariaDb({
-      host: LOCAL_DB_HOST,
-      port: LOCAL_DB_PORT,
-      database: LOCAL_DB_NAME,
-      user: LOCAL_DB_USER,
-      password: LOCAL_DB_PASSWORD,
+      host,
+      port,
+      database: dbName,
+      user: dbUser,
+      password: dbPassword,
       allowPublicKeyRetrieval: true,
     });
     return new PrismaClient({
@@ -34,7 +38,7 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
   }
 
   const { hostname, port, database, dbUser, region } =
-    await getDatabaseConfig(DB_PACKAGE_NAME);
+    await getDatabaseConfig(runtimeConfigKey);
   const iamAuthToken = await new Signer({
     hostname,
     port,
@@ -67,14 +71,15 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
 ): Promise<PrismaClient<LogOpts>> => {
   if (prismaClient) return prismaClient;
 
-  if (process.env.SERVE_LOCAL === 'true') {
+  if (process.env.LOCAL_DEV === 'true') {
+    const { host, port, dbName, dbUser, dbPassword } = localDev();
     const adapter = new PrismaPg(
       new Pool({
-        host: LOCAL_DB_HOST,
-        port: LOCAL_DB_PORT,
-        database: LOCAL_DB_NAME,
-        user: LOCAL_DB_USER,
-        password: LOCAL_DB_PASSWORD,
+        host,
+        port,
+        database: dbName,
+        user: dbUser,
+        password: dbPassword,
         allowExitOnIdle: true,
       }),
     );
@@ -86,7 +91,7 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
   }
 
   const { hostname, port, database, dbUser, region } =
-    await getDatabaseConfig(DB_PACKAGE_NAME);
+    await getDatabaseConfig(runtimeConfigKey);
   const adapter = new PrismaPg(
     new Pool({
       host: hostname,

package/src/ts/rdb/files/src/utils.ts.template

@@ -95,6 +95,9 @@ const transientErrorPatterns = [
   'ECONNREFUSED',
   'ENOTFOUND',
   'P1000', // Prisma: authentication failed
+  'P1001', // Prisma: can't reach database server
+  'P1002', // Prisma: database server reached but timed out
+  'P1010', // Prisma: user denied access (IAM auth grant not yet propagated)
   'ER_ACCESS_DENIED_ERROR', // MySQL: access denied
 ];
 

package/src/ts/rdb/generator.d.ts

@@ -1,10 +1,6 @@
-/**
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { TsRdbGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsRdbGeneratorSchema } from './schema';
 export declare const TS_RDB_GENERATOR_INFO: NxGeneratorInfo;
 export declare const tsRdbGenerator: (tree: Tree, options: TsRdbGeneratorSchema) => Promise<GeneratorCallback>;
 export default tsRdbGenerator;