@aws/nx-plugin 1.0.0-rc.22 → 1.0.0-rc.24

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 lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
-const ast_1 = require("../../../utils/ast");
-const format_1 = require("../../../utils/format");
-const metrics_1 = require("../../../utils/metrics");
-const names_1 = require("../../../utils/names");
-const npm_scope_1 = require("../../../utils/npm-scope");
-const nx_1 = require("../../../utils/nx");
-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":"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"}
+{"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}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD;;CAEC,GACD,WAIC"}

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

@@ -1,6 +1,6 @@
 {
   "runtimeConfigKey": "<%= runtimeConfigKey %>",
-  "serveLocal": {
+  "localDev": {
     "containerEngine": "<%= containerEngine %>",
     "containerName": "<%= containerName %>",
     "image": "<%= dockerImage %>",

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

@@ -2,9 +2,9 @@ import { defineConfig } from 'prisma/config';
 import { readFileSync } from 'fs';
 
 const getDatabaseUrl = async () => {
-  if (process.env.SERVE_LOCAL === 'true') {
+  if (process.env.LOCAL_DEV === 'true') {
     const { host, port, dbName, dbUser, dbPassword } =
-      JSON.parse(readFileSync('config.json', 'utf-8')).serveLocal;
+      JSON.parse(readFileSync('config.json', 'utf-8')).localDev;
 <%_ if (engine === 'mysql') { _%>
     return `mysql://${dbUser}:${dbPassword}@${host}:${port}/${dbName}`;
 <%_ } else { _%>

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

@@ -13,16 +13,16 @@ import { getDatabaseConfig } from './utils.js';
 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;
+// 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') {
-    const { host, port, dbName, dbUser, dbPassword } = serveLocal();
+  if (process.env.LOCAL_DEV === 'true') {
+    const { host, port, dbName, dbUser, dbPassword } = localDev();
     const adapter = new PrismaMariaDb({
       host,
       port,
@@ -71,8 +71,8 @@ export const getPrisma = async <LogOpts extends Prisma.LogLevel>(
 ): Promise<PrismaClient<LogOpts>> => {
   if (prismaClient) return prismaClient;
 
-  if (process.env.SERVE_LOCAL === 'true') {
-    const { host, port, dbName, dbUser, dbPassword } = serveLocal();
+  if (process.env.LOCAL_DEV === 'true') {
+    const { host, port, dbName, dbUser, dbPassword } = localDev();
     const adapter = new PrismaPg(
       new Pool({
         host,

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.js

@@ -1,80 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsRdbGenerator = exports.TS_RDB_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 node_path_1 = require("node:path");
-const devkit_1 = require("@nx/devkit");
-const bundle_1 = require("../../utils/bundle/bundle");
-const containers_1 = require("../../utils/containers");
-const format_1 = require("../../utils/format");
-const fs_1 = require("../../utils/fs");
-const git_1 = require("../../utils/git");
-const iac_1 = require("../../utils/iac");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const nx_1 = require("../../utils/nx");
-const paths_1 = require("../../utils/paths");
-const pnpm_workspace_1 = require("../../utils/pnpm-workspace");
-const port_1 = require("../../utils/port");
-const rdb_constructs_1 = require("../../utils/rdb-constructs/rdb-constructs");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
-const shared_rdb_scripts_1 = require("../../utils/shared-rdb-scripts");
-const versions_1 = require("../../utils/versions");
-const generator_1 = tslib_1.__importStar(require("../lib/generator"));
-exports.TS_RDB_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsRdbGenerator = async (tree, options) => {
-    const nameKebabCase = (0, names_1.kebabCase)(options.name);
-    const nameClassName = (0, names_1.toClassName)(options.name);
+ */ import { relative } from "node:path";
+import { addDependenciesToPackageJson, generateFiles, installPackagesTask, joinPathFragments, readProjectConfiguration, updateJson, updateProjectConfiguration } from "@nx/devkit";
+import { addTypeScriptBundleTarget } from "../../utils/bundle/bundle.js";
+import { resolveContainers } from "../../utils/containers.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FsCommands } from "../../utils/fs.js";
+import { updateGitIgnore } from "../../utils/git.js";
+import { resolveIac } from "../../utils/iac.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { kebabCase, snakeCase, toClassName } from "../../utils/names.js";
+import { getNpmScope, toScopeAlias } from "../../utils/npm-scope.js";
+import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
+import { getRelativePathToRootByDirectory } from "../../utils/paths.js";
+import { registerPnpmBuiltDependencies } from "../../utils/pnpm-workspace.js";
+import { assignPort } from "../../utils/port.js";
+import { addRdbInfra } from "../../utils/rdb-constructs/rdb-constructs.js";
+import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import { PACKAGES_DIR, SHARED_SCRIPTS_DIR } from "../../utils/shared-constructs-constants.js";
+import { sharedRdbScriptsGenerator } from "../../utils/shared-rdb-scripts.js";
+import { TS_VERSIONS, withVersions } from "../../utils/versions.js";
+import tsProjectGenerator, { getTsLibDetails } from "../lib/generator.js";
+export const TS_RDB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsRdbGenerator = async (tree, options)=>{
+    const nameKebabCase = kebabCase(options.name);
+    const nameClassName = toClassName(options.name);
     const databaseUser = options.databaseUser ?? 'dbadmin';
-    const databaseName = (0, names_1.snakeCase)(options.databaseName ?? options.name);
-    const containerEngine = await (0, containers_1.resolveContainers)(tree, 'inherit');
-    const { fullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, {
+    const databaseName = snakeCase(options.databaseName ?? options.name);
+    const containerEngine = await resolveContainers(tree, 'inherit');
+    const { fullyQualifiedName, dir } = getTsLibDetails(tree, {
         name: options.name,
         directory: options.directory,
-        subDirectory: options.subDirectory,
+        subDirectory: options.subDirectory
     });
     let projectExists;
     try {
-        (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+        readProjectConfiguration(tree, fullyQualifiedName);
         projectExists = true;
-    }
-    catch {
+    } catch  {
         projectExists = false;
     }
     if (!projectExists) {
-        await (0, generator_1.default)(tree, {
+        await tsProjectGenerator(tree, {
             name: options.name,
-            directory: options.directory,
+            directory: options.directory
         });
     }
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(dir, 'tsconfig.lib.json'), (tsConfig) => ({
-        ...tsConfig,
-        include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],
-    }));
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-    const localDbPort = (0, port_1.assignPort)(tree, projectConfig, options.engine === 'mysql' ? 3306 : 5432);
+    updateJson(tree, joinPathFragments(dir, 'tsconfig.lib.json'), (tsConfig)=>({
+            ...tsConfig,
+            include: [
+                'src/**/*.ts',
+                'generated/prisma/**/*.ts'
+            ]
+        }));
+    const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);
+    const localDbPort = assignPort(tree, projectConfig, options.engine === 'mysql' ? 3306 : 5432);
     const localDbHost = 'localhost';
     const localDbUser = options.engine === 'mysql' ? 'root' : 'dbadmin';
     const localDbPassword = 'password';
-    const containerName = `${(0, npm_scope_1.getNpmScope)(tree)}-${databaseName}`;
-    const dockerImage = options.engine === 'mysql'
-        ? 'public.ecr.aws/docker/library/mysql:8.0.44'
-        : 'public.ecr.aws/docker/library/postgres:17.7';
+    const containerName = `${getNpmScope(tree)}-${databaseName}`;
+    const dockerImage = options.engine === 'mysql' ? 'public.ecr.aws/docker/library/mysql:8.0.44' : 'public.ecr.aws/docker/library/postgres:17.7';
     const templateOptions = {
         engine: options.engine,
         runtimeConfigKey: nameClassName,
-        databasePackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
+        databasePackageAlias: toScopeAlias(fullyQualifiedName),
         databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',
-        prismaVersion: versions_1.TS_VERSIONS.prisma,
-        prismaAdapterPackage: options.engine === 'mysql'
-            ? '@prisma/adapter-mariadb'
-            : '@prisma/adapter-pg',
+        prismaVersion: TS_VERSIONS.prisma,
+        prismaAdapterPackage: options.engine === 'mysql' ? '@prisma/adapter-mariadb' : '@prisma/adapter-pg',
         prismaAdapterClassName: options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',
         localDbPort,
         localDbHost,
@@ -83,24 +76,28 @@ const tsRdbGenerator = async (tree, options) => {
         localDbPassword,
         containerEngine,
         containerName,
-        dockerImage,
+        dockerImage
     };
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), dir, templateOptions);
-    (0, git_1.updateGitIgnore)(tree, dir, (patterns) => [...patterns, 'generated/prisma']);
-    await (0, shared_rdb_scripts_1.sharedRdbScriptsGenerator)(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', 'rdb'));
-    const relativePathToRoot = (0, paths_1.getRelativePathToRootByDirectory)(projectConfig.root);
-    const fs = new fs_1.FsCommands(tree);
-    const migrationBundleDir = (0, devkit_1.joinPathFragments)('dist', projectConfig.root, 'bundle', 'migration');
-    const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${(0, names_1.kebabCase)(options.name)}-migration:latest`;
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, templateOptions);
+    updateGitIgnore(tree, dir, (patterns)=>[
+            ...patterns,
+            'generated/prisma'
+        ]);
+    await sharedRdbScriptsGenerator(tree, options.engine === 'mysql' ? 'mysql' : 'postgres');
+    const waitForDbScript = options.engine === 'mysql' ? 'wait-for-mysql-db.ts' : 'wait-for-postgres-db.ts';
+    const scriptsDir = relative(dir, joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'));
+    const relativePathToRoot = getRelativePathToRootByDirectory(projectConfig.root);
+    const fs = new FsCommands(tree);
+    const migrationBundleDir = joinPathFragments('dist', projectConfig.root, 'bundle', 'migration');
+    const dockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;
     if (options.infra !== 'none') {
-        await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
+        await addTypeScriptBundleTarget(tree, projectConfig, {
             targetFilePath: 'src/migration-handler.ts',
-            bundleOutputDir: 'migration',
+            bundleOutputDir: 'migration'
         });
-        await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
+        await addTypeScriptBundleTarget(tree, projectConfig, {
             targetFilePath: 'src/create-db-user-handler.ts',
-            bundleOutputDir: 'create-db-user',
+            bundleOutputDir: 'create-db-user'
         });
         const bundleTarget = projectConfig.targets['bundle'];
         // The bundle target starts with a single rolldown `command`. Wrap it with
@@ -117,121 +114,137 @@ const tsRdbGenerator = async (tree, options) => {
                     fs.cp('prisma', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`),
                     fs.cp('prisma.config.ts', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`),
                     fs.cp('Dockerfile', `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`),
-                    rolldownCommand,
+                    rolldownCommand
                 ],
-                parallel: false,
+                parallel: false
             };
         }
     }
     projectConfig.targets.generate = {
         executor: 'nx:run-commands',
-        outputs: ['{projectRoot}/generated/prisma'],
+        outputs: [
+            '{projectRoot}/generated/prisma'
+        ],
         options: {
             command: 'prisma generate',
-            cwd: '{projectRoot}',
-        },
+            cwd: '{projectRoot}'
+        }
     };
     projectConfig.targets['pull-image'] = {
         executor: 'nx:run-commands',
         options: {
             command: `tsx ${scriptsDir}/pull-image.ts`,
-            cwd: '{projectRoot}',
-        },
+            cwd: '{projectRoot}'
+        }
     };
-    projectConfig.targets['serve-local'] = {
+    projectConfig.targets['dev'] = {
         executor: 'nx:run-commands',
         options: {
             command: `tsx ${scriptsDir}/start-container.ts`,
-            cwd: '{projectRoot}',
+            cwd: '{projectRoot}'
         },
-        continuous: true,
-        dependsOn: ['pull-image'],
+        continuous: true
     };
     projectConfig.targets['wait-for-db'] = {
         executor: 'nx:run-commands',
-        dependsOn: ['serve-local'],
+        dependsOn: [
+            'dev'
+        ],
         options: {
-            command: `tsx ${scriptsDir}/wait-for-db.ts`,
-            cwd: '{projectRoot}',
-        },
+            command: `tsx ${scriptsDir}/${waitForDbScript}`,
+            cwd: '{projectRoot}'
+        }
     };
     projectConfig.targets.prisma = {
         executor: 'nx:run-commands',
-        dependsOn: ['serve-local', 'wait-for-db'],
+        dependsOn: [
+            'dev',
+            'wait-for-db'
+        ],
         options: {
             cwd: '{projectRoot}',
             command: 'prisma',
             env: {
-                SERVE_LOCAL: 'true',
-            },
-        },
+                LOCAL_DEV: 'true'
+            }
+        }
     };
     if (options.infra !== 'none') {
-        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        const iac = await resolveIac(tree, options.iac);
         if (iac === 'terraform') {
             projectConfig.targets['docker'] = {
                 cache: true,
                 executor: 'nx:run-commands',
                 options: {
-                    command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`,
+                    command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`
                 },
-                dependsOn: ['bundle'],
+                dependsOn: [
+                    'bundle'
+                ]
             };
-            (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'docker');
+            addDependencyToTargetIfNotPresent(projectConfig, 'build', 'docker');
         }
-        (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
+        addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');
     }
-    (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'compile', 'generate');
-    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfig);
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_RDB_GENERATOR_INFO, {
-        engine: options.engine,
+    addDependencyToTargetIfNotPresent(projectConfig, 'compile', 'generate');
+    updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);
+    addGeneratorMetadata(tree, fullyQualifiedName, TS_RDB_GENERATOR_INFO, {
+        engine: options.engine
     });
     if (options.infra !== 'none') {
-        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
-        await (0, rdb_constructs_1.addRdbInfra)(tree, {
+        const iac = await resolveIac(tree, options.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
+        });
+        await addRdbInfra(tree, {
             iac,
             projectName: fullyQualifiedName,
             projectRoot: dir,
             nameClassName,
             nameKebabCase,
-            databasePackageAlias: (0, npm_scope_1.toScopeAlias)(fullyQualifiedName),
+            databasePackageAlias: toScopeAlias(fullyQualifiedName),
             databaseName,
             adminUser: databaseUser,
             engine: options.engine === 'mysql' ? 'mysql' : 'postgres',
             migrationBundleDir,
-            createDbUserBundleDir: (0, devkit_1.joinPathFragments)('dist', projectConfig.root, 'bundle', 'create-db-user'),
+            createDbUserBundleDir: joinPathFragments('dist', projectConfig.root, 'bundle', 'create-db-user'),
             dockerImageTag,
-            containerEngine,
+            containerEngine
         });
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
+    addDependenciesToPackageJson(tree, withVersions([
         '@aws-lambda-powertools/parameters',
         '@aws-sdk/client-appconfigdata',
         '@aws-sdk/client-secrets-manager',
         '@aws-sdk/rds-signer',
         '@prisma/client',
-        ...(options.engine === 'mysql'
-            ? ['@prisma/adapter-mariadb', 'mariadb']
-            : ['@prisma/adapter-pg', 'pg']),
-    ]), (0, versions_1.withVersions)([
+        ...options.engine === 'mysql' ? [
+            '@prisma/adapter-mariadb',
+            'mariadb'
+        ] : [
+            '@prisma/adapter-pg',
+            'pg'
+        ]
+    ]), withVersions([
         'prisma',
         'tsx',
         '@types/aws-lambda',
-        ...(options.engine === 'mysql'
-            ? []
-            : ['@types/pg']),
+        ...options.engine === 'mysql' ? [] : [
+            '@types/pg'
+        ]
     ]));
-    (0, pnpm_workspace_1.registerPnpmBuiltDependencies)(tree, {
+    registerPnpmBuiltDependencies(tree, {
         '@prisma/engines': false,
-        prisma: false,
+        prisma: false
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_RDB_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_RDB_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>{
+        installPackagesTask(tree);
     };
 };
-exports.tsRdbGenerator = tsRdbGenerator;
-exports.default = exports.tsRdbGenerator;
+export default tsRdbGenerator;
+
 //# sourceMappingURL=generator.js.map