@aws/nx-plugin 1.0.0-rc.47 → 1.0.0-rc.49

package/src/ts/nx-migration/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/nx-migration/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-migration/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport type NxMigrationKind = 'deterministic' | 'agentic' | 'hybrid';\n\nexport interface TsNxMigrationGeneratorSchema {\n  project: string;\n  name: string;\n  description?: string;\n  kind?: NxMigrationKind;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAGD,WAMC"}

package/src/ts/nx-migration/schema.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export type NxMigrationKind = 'deterministic' | 'agentic' | 'hybrid';
+
+export interface TsNxMigrationGeneratorSchema {
+  project: string;
+  name: string;
+  description?: string;
+  kind?: NxMigrationKind;
+  preferInstallDependencies?: boolean;
+}

package/src/ts/nx-migration/schema.json

@@ -0,0 +1,63 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "TsNxMigration",
+  "title": "Create an Nx Migration",
+  "description": "Scaffold a migration for an Nx Plugin, applied by nx migrate when users upgrade",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The Nx Plugin project to add the migration to. We recommend using the ts#nx-plugin generator to create this.",
+      "x-priority": "important",
+      "x-prompt": "Choose the Nx Plugin project to add the migration to",
+      "x-dropdown": "projects",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "Migration name, in kebab-case (e.g. rename-foo-target)",
+      "x-priority": "important",
+      "x-prompt": "What is the name of the migration? (kebab-case, e.g. rename-foo-target)"
+    },
+    "description": {
+      "type": "string",
+      "description": "A description of what the migration does, shown by nx migrate",
+      "x-priority": "important",
+      "x-prompt": "Describe what the migration does"
+    },
+    "kind": {
+      "type": "string",
+      "description": "The kind of migration: deterministic (a codemod), agentic (an AI-applied prompt for user-owned code), or hybrid (a codemod that does the mechanical part then hands off to an agent)",
+      "enum": ["deterministic", "agentic", "hybrid"],
+      "default": "deterministic",
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "What kind of migration is this?",
+        "type": "list",
+        "items": [
+          {
+            "value": "deterministic",
+            "label": "Deterministic — a codemod with an exact before/after (runs unattended, incl. CI)"
+          },
+          {
+            "value": "agentic",
+            "label": "Agentic — an AI-applied prompt for changes to user-owned code"
+          },
+          {
+            "value": "hybrid",
+            "label": "Hybrid — a codemod for the mechanical part that hands off to an agent for the rest"
+          }
+        ]
+      }
+    },
+    "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": ["project", "name"]
+}

package/src/ts/nx-plugin/utils.d.ts

@@ -2,8 +2,28 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type Tree } from '@nx/devkit';
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+import type { PackageJson } from 'nx/src/utils/package-json';
+/**
+ * Read the configuration of a project which can host Nx Plugin generators or
+ * migrations, ie a TypeScript project.
+ */
+export declare const readNxPluginProject: (tree: Tree, projectName: string) => ProjectConfiguration;
+/** `package.json` field pointing Nx at one of a plugin's manifests. */
+type NxPluginManifestField = 'generators' | 'nx-migrations';
+/**
+ * Create the plugin project's package.json if absent and point it at the given
+ * manifest, returning its path.
+ */
+export declare const configureNxPluginPackageJson: <TField extends NxPluginManifestField>(tree: Tree, project: ProjectConfiguration, manifestField: TField, manifestValue: PackageJson[TField]) => string;
+/**
+ * Declare the dependencies the plugin's `.ts` files import on both the
+ * workspace and the plugin, since both must resolve for Nx to load them. A
+ * no-op inside the plugin's own monorepo, where they are already present.
+ */
+export declare const addNxPluginDependencies: (tree: Tree, pluginPackageJsonPath: string) => void;
 /**
  * Configures a TypeScript project as an Nx Plugin
  */
 export declare const configureTsProjectAsNxPlugin: (tree: Tree, projectName: string) => void;
+export {};

package/src/ts/nx-plugin/utils.js

@@ -1,31 +1,26 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
-import PackageJson from "../../../package.json" with {
-    type: 'json'
-};
+ */ import { joinPathFragments, updateJson, writeJson } from "@nx/devkit";
 import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
 import { isEsmWorkspace } from "../../utils/module-format.js";
-import { readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { nxPluginSelfDependency, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { withVersions } from "../../utils/versions.js";
 /**
- * Configures a TypeScript project as an Nx Plugin
- */ export const configureTsProjectAsNxPlugin = (tree, projectName)=>{
+ * Read the configuration of a project which can host Nx Plugin generators or
+ * migrations, ie a TypeScript project.
+ */ export const readNxPluginProject = (tree, projectName)=>{
     const project = readProjectConfigurationUnqualified(tree, projectName);
     const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');
     if (!tree.exists(tsConfigPath)) {
         throw new Error(`Selected plugin project ${projectName} is not a TypeScript project`);
     }
-    // Create an empty generators.json if one dosn't exist
-    const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');
-    if (!tree.exists(generatorsJsonPath)) {
-        writeJson(tree, generatorsJsonPath, {
-            generators: {}
-        });
-    }
-    // Create a package.json if one doesn't exist, and configure "type", "main"
-    // and "generators"
+    return project;
+};
+/**
+ * Create the plugin project's package.json if absent and point it at the given
+ * manifest, returning its path.
+ */ export const configureNxPluginPackageJson = (tree, project, manifestField, manifestValue)=>{
     const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');
     if (!tree.exists(pluginPackageJsonPath)) {
         writeJson(tree, pluginPackageJsonPath, {
@@ -34,31 +29,47 @@ import { withVersions } from "../../utils/versions.js";
     }
     const esm = isEsmWorkspace(tree);
     updateJson(tree, pluginPackageJsonPath, (pkg)=>{
-        // Match the plugin's module system to the workspace. Nx loads `.ts`
-        // generators via Node's native type stripping, as ESM (workspace root is
+        // Match the plugin's module system to the workspace. Nx loads `.ts` files
+        // via Node's native type stripping, as ESM (workspace root is
         // `type: module`) or CommonJS accordingly.
         pkg.type ??= esm ? 'module' : 'commonjs';
         pkg.main ??= esm ? './src/index.js' : './src/index';
-        pkg.generators ??= './generators.json';
+        pkg[manifestField] ??= manifestValue;
         return pkg;
     });
-    const rootPackageJson = tree.exists('package.json') ? readJson(tree, 'package.json') : undefined;
-    const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';
-    if (!isNxPluginForAws) {
-        // Add the required dependencies to the root package.json, and project's package.json
-        const deps = {
-            ...withVersions([
-                '@nx/devkit'
-            ]),
-            // Include dependency on @aws/nx-plugin
-            [PackageJson.name]: `^${PackageJson.version}`
-        };
-        // Generated workspaces are `"type": "module"`, so Nx loads the plugin's
-        // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node
-        // transpiler is required.
-        addDependenciesToPackageJson(tree, {}, deps);
-        addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);
+    return pluginPackageJsonPath;
+};
+/**
+ * Declare the dependencies the plugin's `.ts` files import on both the
+ * workspace and the plugin, since both must resolve for Nx to load them. A
+ * no-op inside the plugin's own monorepo, where they are already present.
+ */ export const addNxPluginDependencies = (tree, pluginPackageJsonPath)=>{
+    const selfDependency = nxPluginSelfDependency(tree);
+    if (Object.keys(selfDependency).length === 0) {
+        return;
+    }
+    const deps = {
+        ...withVersions([
+            '@nx/devkit'
+        ]),
+        ...selfDependency
+    };
+    addDependenciesToPackageJson(tree, {}, deps);
+    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);
+};
+/**
+ * Configures a TypeScript project as an Nx Plugin
+ */ export const configureTsProjectAsNxPlugin = (tree, projectName)=>{
+    const project = readNxPluginProject(tree, projectName);
+    // Create an empty generators.json if one dosn't exist
+    const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');
+    if (!tree.exists(generatorsJsonPath)) {
+        writeJson(tree, generatorsJsonPath, {
+            generators: {}
+        });
     }
+    const pluginPackageJsonPath = configureNxPluginPackageJson(tree, project, 'generators', './generators.json');
+    addNxPluginDependencies(tree, pluginPackageJsonPath);
 };
 
 //# sourceMappingURL=utils.js.map

package/src/ts/nx-plugin/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.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  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { readProjectConfigurationUnqualified } from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  // Create a package.json if one doesn't exist, and configure \"type\", \"main\"\n  // and \"generators\"\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  const esm = isEsmWorkspace(tree);\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Match the plugin's module system to the workspace. Nx loads `.ts`\n    // generators via Node's native type stripping, as ESM (workspace root is\n    // `type: module`) or CommonJS accordingly.\n    pkg.type ??= esm ? 'module' : 'commonjs';\n    pkg.main ??= esm ? './src/index.js' : './src/index';\n    pkg.generators ??= './generators.json';\n    return pkg;\n  });\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  if (!isNxPluginForAws) {\n    // Add the required dependencies to the root package.json, and project's package.json\n    const deps = {\n      ...withVersions(['@nx/devkit']),\n      // Include dependency on @aws/nx-plugin\n      [PackageJson.name]: `^${PackageJson.version}`,\n    };\n    // Generated workspaces are `\"type\": \"module\"`, so Nx loads the plugin's\n    // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node\n    // transpiler is required.\n    addDependenciesToPackageJson(tree, {}, deps);\n    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n  }\n};\n"],"names":["joinPathFragments","readJson","updateJson","writeJson","PackageJson","type","addDependenciesToPackageJson","isEsmWorkspace","readProjectConfigurationUnqualified","withVersions","configureTsProjectAsNxPlugin","tree","projectName","project","tsConfigPath","root","exists","Error","generatorsJsonPath","generators","pluginPackageJsonPath","name","esm","pkg","main","rootPackageJson","undefined","isNxPluginForAws","deps","version"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,OAAOC,iBAAiB,6BAA6B;IAAEC,MAAM;AAAO,EAAE;AACtE,SAASC,4BAA4B,QAAQ,8BAA2B;AACxE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SAASC,mCAAmC,QAAQ,oBAAiB;AACrE,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;CAEC,GACD,OAAO,MAAMC,+BAA+B,CAC1CC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAed,kBAAkBa,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,sDAAsD;IACtD,MAAMM,qBAAqBlB,kBAAkBa,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACE,qBAAqB;QACpCf,UAAUQ,MAAMO,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,2EAA2E;IAC3E,mBAAmB;IACnB,MAAMC,wBAAwBpB,kBAAkBa,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACI,wBAAwB;QACvCjB,UAAUQ,MAAMS,uBAAuB;YACrCC,MAAMR,QAAQQ,IAAI;QACpB;IACF;IACA,MAAMC,MAAMf,eAAeI;IAC3BT,WAAWS,MAAMS,uBAAuB,CAACG;QACvC,oEAAoE;QACpE,yEAAyE;QACzE,2CAA2C;QAC3CA,IAAIlB,IAAI,KAAKiB,MAAM,WAAW;QAC9BC,IAAIC,IAAI,KAAKF,MAAM,mBAAmB;QACtCC,IAAIJ,UAAU,KAAK;QACnB,OAAOI;IACT;IAEA,MAAME,kBAAkBd,KAAKK,MAAM,CAAC,kBAChCf,SAASU,MAAM,kBACfe;IACJ,MAAMC,mBAAmBF,iBAAiBJ,SAAS;IAEnD,IAAI,CAACM,kBAAkB;QACrB,qFAAqF;QACrF,MAAMC,OAAO;YACX,GAAGnB,aAAa;gBAAC;aAAa,CAAC;YAC/B,uCAAuC;YACvC,CAACL,YAAYiB,IAAI,CAAC,EAAE,CAAC,CAAC,EAAEjB,YAAYyB,OAAO,EAAE;QAC/C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,0BAA0B;QAC1BvB,6BAA6BK,MAAM,CAAC,GAAGiB;QACvCtB,6BAA6BK,MAAMiB,MAAM,CAAC,GAAGR;IAC/C;AACF,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.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 ProjectConfiguration,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport type { PackageJson } from 'nx/src/utils/package-json';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport {\n  nxPluginSelfDependency,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Read the configuration of a project which can host Nx Plugin generators or\n * migrations, ie a TypeScript project.\n */\nexport const readNxPluginProject = (\n  tree: Tree,\n  projectName: string,\n): ProjectConfiguration => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  return project;\n};\n\n/** `package.json` field pointing Nx at one of a plugin's manifests. */\ntype NxPluginManifestField = 'generators' | 'nx-migrations';\n\n/**\n * Create the plugin project's package.json if absent and point it at the given\n * manifest, returning its path.\n */\nexport const configureNxPluginPackageJson = <\n  TField extends NxPluginManifestField,\n>(\n  tree: Tree,\n  project: ProjectConfiguration,\n  manifestField: TField,\n  manifestValue: PackageJson[TField],\n): string => {\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  const esm = isEsmWorkspace(tree);\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Match the plugin's module system to the workspace. Nx loads `.ts` files\n    // via Node's native type stripping, as ESM (workspace root is\n    // `type: module`) or CommonJS accordingly.\n    pkg.type ??= esm ? 'module' : 'commonjs';\n    pkg.main ??= esm ? './src/index.js' : './src/index';\n    pkg[manifestField] ??= manifestValue;\n    return pkg;\n  });\n  return pluginPackageJsonPath;\n};\n\n/**\n * Declare the dependencies the plugin's `.ts` files import on both the\n * workspace and the plugin, since both must resolve for Nx to load them. A\n * no-op inside the plugin's own monorepo, where they are already present.\n */\nexport const addNxPluginDependencies = (\n  tree: Tree,\n  pluginPackageJsonPath: string,\n): void => {\n  const selfDependency = nxPluginSelfDependency(tree);\n  if (Object.keys(selfDependency).length === 0) {\n    return;\n  }\n  const deps = {\n    ...withVersions(['@nx/devkit']),\n    ...selfDependency,\n  };\n  addDependenciesToPackageJson(tree, {}, deps);\n  addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n};\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readNxPluginProject(tree, projectName);\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  const pluginPackageJsonPath = configureNxPluginPackageJson(\n    tree,\n    project,\n    'generators',\n    './generators.json',\n  );\n\n  addNxPluginDependencies(tree, pluginPackageJsonPath);\n};\n"],"names":["joinPathFragments","updateJson","writeJson","addDependenciesToPackageJson","isEsmWorkspace","nxPluginSelfDependency","readProjectConfigurationUnqualified","withVersions","readNxPluginProject","tree","projectName","project","tsConfigPath","root","exists","Error","configureNxPluginPackageJson","manifestField","manifestValue","pluginPackageJsonPath","name","esm","pkg","type","main","addNxPluginDependencies","selfDependency","Object","keys","length","deps","configureTsProjectAsNxPlugin","generatorsJsonPath","generators"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAGjBC,UAAU,EACVC,SAAS,QACJ,aAAa;AAEpB,SAASC,4BAA4B,QAAQ,8BAA2B;AACxE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SACEC,sBAAsB,EACtBC,mCAAmC,QAC9B,oBAAiB;AACxB,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;;CAGC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAeZ,kBAAkBW,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,OAAOC;AACT,EAAE;AAKF;;;CAGC,GACD,OAAO,MAAMK,+BAA+B,CAG1CP,MACAE,SACAM,eACAC;IAEA,MAAMC,wBAAwBnB,kBAAkBW,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACK,wBAAwB;QACvCjB,UAAUO,MAAMU,uBAAuB;YACrCC,MAAMT,QAAQS,IAAI;QACpB;IACF;IACA,MAAMC,MAAMjB,eAAeK;IAC3BR,WAAWQ,MAAMU,uBAAuB,CAACG;QACvC,0EAA0E;QAC1E,8DAA8D;QAC9D,2CAA2C;QAC3CA,IAAIC,IAAI,KAAKF,MAAM,WAAW;QAC9BC,IAAIE,IAAI,KAAKH,MAAM,mBAAmB;QACtCC,GAAG,CAACL,cAAc,KAAKC;QACvB,OAAOI;IACT;IACA,OAAOH;AACT,EAAE;AAEF;;;;CAIC,GACD,OAAO,MAAMM,0BAA0B,CACrChB,MACAU;IAEA,MAAMO,iBAAiBrB,uBAAuBI;IAC9C,IAAIkB,OAAOC,IAAI,CAACF,gBAAgBG,MAAM,KAAK,GAAG;QAC5C;IACF;IACA,MAAMC,OAAO;QACX,GAAGvB,aAAa;YAAC;SAAa,CAAC;QAC/B,GAAGmB,cAAc;IACnB;IACAvB,6BAA6BM,MAAM,CAAC,GAAGqB;IACvC3B,6BAA6BM,MAAMqB,MAAM,CAAC,GAAGX;AAC/C,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMY,+BAA+B,CAC1CtB,MACAC;IAEA,MAAMC,UAAUH,oBAAoBC,MAAMC;IAE1C,sDAAsD;IACtD,MAAMsB,qBAAqBhC,kBAAkBW,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACkB,qBAAqB;QACpC9B,UAAUO,MAAMuB,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,MAAMd,wBAAwBH,6BAC5BP,MACAE,SACA,cACA;IAGFc,wBAAwBhB,MAAMU;AAChC,EAAE"}

package/src/ts/rdb/__snapshots__/generator.spec.ts.snap

@@ -105,6 +105,7 @@ exports[`ts#rdb generator > should add mysql prisma dependencies when engine is
 
 exports[`ts#rdb generator > should add mysql prisma dependencies when engine is MySQL > packages/db/src/migration-handler.ts 1`] = `
 "import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils.js';
 
@@ -122,7 +123,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,
@@ -3882,6 +3884,7 @@ exports[`ts#rdb generator > should generate the aurora shared construct > packag
 
 exports[`ts#rdb generator > should generate the aurora shared construct > packages/db/src/migration-handler.ts 1`] = `
 "import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils.js';
 
@@ -3899,7 +3902,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,
@@ -4680,9 +4684,13 @@ WORKDIR \${LAMBDA_TASK_ROOT}
 
 # npm blocks dependency install scripts by default; allow prisma's so its
 # postinstall downloads the schema-engine binary needed to run migrations.
+# npm is removed once prisma is installed — the handler runs prisma's own
+# binary directly, and npm's bundled dependencies would otherwise carry known
+# HIGH/CRITICAL vulnerabilities into the image.
 RUN printf 'allow-scripts[]=prisma\\nallow-scripts[]=@prisma/engines\\n' > .npmrc \\
     && npm install prisma@7.8.0 \\
-    && rm .npmrc
+    && rm .npmrc \\
+    && npm uninstall -g npm
 
 COPY index.js ./index.js
 COPY prisma ./prisma

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

@@ -14,9 +14,13 @@ WORKDIR ${LAMBDA_TASK_ROOT}
 
 # npm blocks dependency install scripts by default; allow prisma's so its
 # postinstall downloads the schema-engine binary needed to run migrations.
+# npm is removed once prisma is installed — the handler runs prisma's own
+# binary directly, and npm's bundled dependencies would otherwise carry known
+# HIGH/CRITICAL vulnerabilities into the image.
 RUN printf 'allow-scripts[]=prisma\nallow-scripts[]=@prisma/engines\n' > .npmrc \
     && npm install prisma@<%= prismaVersion %> \
-    && rm .npmrc
+    && rm .npmrc \
+    && npm uninstall -g npm
 
 COPY index.js ./index.js
 COPY prisma ./prisma

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

@@ -1,4 +1,5 @@
 import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils<% if (esm) { %>.js<% } %>';
 
@@ -16,7 +17,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,

package/src/ts/rdb/generator.js

@@ -6,7 +6,7 @@ import { generateFiles, joinPathFragments, readProjectConfiguration, updateJson,
 import { addTypeScriptBundleTarget } from "../../utils/bundle/bundle.js";
 import { resolveContainers } from "../../utils/containers.js";
 import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
-import { addDockerScanTarget } from "../../utils/docker.js";
+import { addDockerScanTarget, nodeImageVersions } from "../../utils/docker.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { FsCommands } from "../../utils/fs.js";
 import { updateGitIgnore } from "../../utils/git.js";
@@ -72,7 +72,7 @@ export const tsRdbGenerator = async (tree, options)=>{
         databasePackageAlias: fullyQualifiedName,
         databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',
         prismaVersion: TS_VERSIONS.prisma,
-        npmVersion: TS_VERSIONS.npm,
+        ...nodeImageVersions(),
         prismaAdapterPackage: options.engine === 'mysql' ? '@prisma/adapter-mariadb' : '@prisma/adapter-pg',
         prismaAdapterClassName: options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',
         localDbPort,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { relative } from 'node:path';\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { addDockerScanTarget } from '../../utils/docker';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { updateGitIgnore } from '../../utils/git';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase, snakeCase, toClassName } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace';\nimport { assignPort } from '../../utils/port';\nimport { addRdbInfra } from '../../utils/rdb-constructs/rdb-constructs';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedRdbScriptsGenerator } from '../../utils/shared-rdb-scripts';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsRdbGeneratorSchema } from './schema';\n\nexport const TS_RDB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsRdbGenerator = async (\n  tree: Tree,\n  options: TsRdbGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const databaseUser = options.databaseUser ?? 'dbadmin';\n  const databaseName = snakeCase(options.databaseName ?? options.name);\n  const containerEngine = await resolveContainers(tree, 'inherit');\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, {\n    name: options.name,\n    directory: options.directory,\n    subDirectory: options.subDirectory,\n  });\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: options.name,\n      directory: options.directory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  updateJson(tree, joinPathFragments(dir, 'tsconfig.lib.json'), (tsConfig) => ({\n    ...tsConfig,\n    include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],\n  }));\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const localDbPort = assignPort(\n    tree,\n    projectConfig,\n    options.engine === 'mysql' ? 3306 : 5432,\n  );\n  const localDbHost = 'localhost';\n  const localDbUser = options.engine === 'mysql' ? 'root' : 'dbadmin';\n  const localDbPassword = 'password';\n  const containerName = `${getNpmScope(tree)}-${databaseName}`;\n  const dockerImage =\n    options.engine === 'mysql'\n      ? 'public.ecr.aws/docker/library/mysql:8.0.44'\n      : 'public.ecr.aws/docker/library/postgres:17.7';\n\n  const templateOptions = {\n    engine: options.engine,\n    runtimeConfigKey: nameClassName,\n    databasePackageAlias: fullyQualifiedName,\n    databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',\n    prismaVersion: TS_VERSIONS.prisma,\n    npmVersion: TS_VERSIONS.npm,\n    prismaAdapterPackage:\n      options.engine === 'mysql'\n        ? '@prisma/adapter-mariadb'\n        : '@prisma/adapter-pg',\n    prismaAdapterClassName:\n      options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',\n    localDbPort,\n    localDbHost,\n    localDbName: databaseName,\n    localDbUser,\n    localDbPassword,\n    containerEngine,\n    containerName,\n    dockerImage,\n    ...esmVars(tree),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n  updateGitIgnore(tree, dir, (patterns) => [...patterns, 'generated/prisma']);\n  await sharedRdbScriptsGenerator(tree, options.engine);\n  const waitForDbScript =\n    options.engine === 'mysql'\n      ? 'wait-for-mysql-db.ts'\n      : 'wait-for-postgres-db.ts';\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'),\n  );\n  const relativePathToRoot = getRelativePathToRootByDirectory(\n    projectConfig.root,\n  );\n  const fs = new FsCommands(tree);\n  const migrationBundleDir = joinPathFragments(\n    'dist',\n    projectConfig.root,\n    'bundle',\n    'migration',\n  );\n  const migrationDockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/migration-handler.ts',\n      bundleOutputDir: 'migration',\n    });\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/create-db-user-handler.ts',\n      bundleOutputDir: 'create-db-user',\n    });\n    const bundleTarget = projectConfig.targets['bundle'];\n    // The bundle target starts with a single rolldown `command`. Wrap it with\n    // the migration asset copy steps, unless it has already been transformed\n    // into a `commands` array on a previous run.\n    if (!bundleTarget.options.commands) {\n      const rolldownCommand = bundleTarget.options.command;\n      delete bundleTarget.options.command;\n      bundleTarget.options = {\n        ...bundleTarget.options,\n        commands: [\n          fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.cp(\n            'prisma',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`,\n          ),\n          fs.cp(\n            'prisma.config.ts',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`,\n          ),\n          fs.cp(\n            'Dockerfile',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`,\n          ),\n          rolldownCommand,\n        ],\n        parallel: false,\n      };\n    }\n  }\n\n  projectConfig.targets.generate = {\n    executor: 'nx:run-commands',\n    outputs: ['{projectRoot}/generated/prisma'],\n    options: {\n      command: 'prisma generate',\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['pull-image'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/pull-image.ts`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['dev'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/start-container.ts`,\n      cwd: '{projectRoot}',\n    },\n    continuous: true,\n  };\n  projectConfig.targets['wait-for-db'] = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev'],\n    options: {\n      command: `tsx ${scriptsDir}/${waitForDbScript}`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets.prisma = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev', 'wait-for-db'],\n    options: {\n      cwd: '{projectRoot}',\n      command: 'prisma',\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    if (iac === 'terraform') {\n      projectConfig.targets['docker'] = {\n        cache: true,\n        executor: 'nx:run-commands',\n        options: {\n          command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${migrationDockerImageTag} ${migrationBundleDir}`,\n        },\n        dependsOn: ['bundle'],\n      };\n      addDependencyToTargetIfNotPresent(projectConfig, 'build', 'docker');\n\n      addDockerScanTarget(tree, {\n        project: projectConfig,\n        containerEngine,\n        trivyTargetName: 'trivy',\n        dockerTargetName: 'docker',\n        imageTags: [migrationDockerImageTag],\n      });\n    }\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n  addDependencyToTargetIfNotPresent(projectConfig, 'compile', 'generate');\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_RDB_GENERATOR_INFO, {\n    engine: options.engine,\n  });\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addRdbInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      projectRoot: dir,\n      nameClassName,\n      nameKebabCase,\n      databasePackageAlias: fullyQualifiedName,\n      databaseName,\n      adminUser: databaseUser,\n      engine: options.engine,\n      migrationBundleDir,\n      createDbUserBundleDir: joinPathFragments(\n        'dist',\n        projectConfig.root,\n        'bundle',\n        'create-db-user',\n      ),\n      framework: options.framework,\n      migrationDockerImageTag,\n      containerEngine,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      '@aws-sdk/client-secrets-manager',\n      '@aws-sdk/rds-signer',\n      '@prisma/client',\n      ...(options.engine === 'mysql'\n        ? (['@prisma/adapter-mariadb', 'mariadb'] as const)\n        : (['@prisma/adapter-pg', 'pg'] as const)),\n    ]),\n    withVersions([\n      '@types/aws-lambda',\n      ...(options.engine === 'mysql'\n        ? ([] as const)\n        : (['@types/pg'] as const)),\n    ]),\n    joinPathFragments(projectConfig.root, 'package.json'),\n  );\n  // The prisma CLI and tsx run migration/seed scripts from the root.\n  addDependenciesToPackageJson(tree, {}, withVersions(['prisma', 'tsx']));\n\n  registerPnpmBuiltDependencies(tree, {\n    '@prisma/engines': false,\n    prisma: false,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_RDB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsRdbGenerator;\n"],"names":["relative","generateFiles","joinPathFragments","readProjectConfiguration","updateJson","updateProjectConfiguration","addTypeScriptBundleTarget","resolveContainers","addDependenciesToPackageJson","addDockerScanTarget","formatFilesInSubtree","FsCommands","updateGitIgnore","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","snakeCase","toClassName","getNpmScope","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","getRelativePathToRootByDirectory","registerPnpmBuiltDependencies","assignPort","addRdbInfra","sharedConstructsGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedRdbScriptsGenerator","TS_VERSIONS","withVersions","tsProjectGenerator","getTsLibDetails","TS_RDB_GENERATOR_INFO","filename","tsRdbGenerator","tree","options","nameKebabCase","name","nameClassName","databaseUser","databaseName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","tsConfig","include","projectConfig","localDbPort","engine","localDbHost","localDbUser","localDbPassword","containerName","dockerImage","templateOptions","runtimeConfigKey","databasePackageAlias","databaseProvider","prismaVersion","prisma","npmVersion","npm","prismaAdapterPackage","prismaAdapterClassName","localDbName","dirname","patterns","waitForDbScript","scriptsDir","relativePathToRoot","root","fs","migrationBundleDir","migrationDockerImageTag","infra","targetFilePath","bundleOutputDir","bundleTarget","targets","commands","rolldownCommand","command","rm","mkdir","cp","parallel","generate","executor","outputs","cwd","continuous","dependsOn","env","LOCAL_DEV","iac","cache","project","trivyTargetName","dockerTargetName","imageTags","projectName","projectRoot","adminUser","createDbUserBundleDir","framework","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { relative } from 'node:path';\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { addDockerScanTarget, nodeImageVersions } from '../../utils/docker';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { updateGitIgnore } from '../../utils/git';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase, snakeCase, toClassName } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace';\nimport { assignPort } from '../../utils/port';\nimport { addRdbInfra } from '../../utils/rdb-constructs/rdb-constructs';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedRdbScriptsGenerator } from '../../utils/shared-rdb-scripts';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsRdbGeneratorSchema } from './schema';\n\nexport const TS_RDB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsRdbGenerator = async (\n  tree: Tree,\n  options: TsRdbGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const databaseUser = options.databaseUser ?? 'dbadmin';\n  const databaseName = snakeCase(options.databaseName ?? options.name);\n  const containerEngine = await resolveContainers(tree, 'inherit');\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, {\n    name: options.name,\n    directory: options.directory,\n    subDirectory: options.subDirectory,\n  });\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: options.name,\n      directory: options.directory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  updateJson(tree, joinPathFragments(dir, 'tsconfig.lib.json'), (tsConfig) => ({\n    ...tsConfig,\n    include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],\n  }));\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const localDbPort = assignPort(\n    tree,\n    projectConfig,\n    options.engine === 'mysql' ? 3306 : 5432,\n  );\n  const localDbHost = 'localhost';\n  const localDbUser = options.engine === 'mysql' ? 'root' : 'dbadmin';\n  const localDbPassword = 'password';\n  const containerName = `${getNpmScope(tree)}-${databaseName}`;\n  const dockerImage =\n    options.engine === 'mysql'\n      ? 'public.ecr.aws/docker/library/mysql:8.0.44'\n      : 'public.ecr.aws/docker/library/postgres:17.7';\n\n  const templateOptions = {\n    engine: options.engine,\n    runtimeConfigKey: nameClassName,\n    databasePackageAlias: fullyQualifiedName,\n    databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',\n    prismaVersion: TS_VERSIONS.prisma,\n    ...nodeImageVersions(),\n    prismaAdapterPackage:\n      options.engine === 'mysql'\n        ? '@prisma/adapter-mariadb'\n        : '@prisma/adapter-pg',\n    prismaAdapterClassName:\n      options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',\n    localDbPort,\n    localDbHost,\n    localDbName: databaseName,\n    localDbUser,\n    localDbPassword,\n    containerEngine,\n    containerName,\n    dockerImage,\n    ...esmVars(tree),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n  updateGitIgnore(tree, dir, (patterns) => [...patterns, 'generated/prisma']);\n  await sharedRdbScriptsGenerator(tree, options.engine);\n  const waitForDbScript =\n    options.engine === 'mysql'\n      ? 'wait-for-mysql-db.ts'\n      : 'wait-for-postgres-db.ts';\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'),\n  );\n  const relativePathToRoot = getRelativePathToRootByDirectory(\n    projectConfig.root,\n  );\n  const fs = new FsCommands(tree);\n  const migrationBundleDir = joinPathFragments(\n    'dist',\n    projectConfig.root,\n    'bundle',\n    'migration',\n  );\n  const migrationDockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/migration-handler.ts',\n      bundleOutputDir: 'migration',\n    });\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/create-db-user-handler.ts',\n      bundleOutputDir: 'create-db-user',\n    });\n    const bundleTarget = projectConfig.targets['bundle'];\n    // The bundle target starts with a single rolldown `command`. Wrap it with\n    // the migration asset copy steps, unless it has already been transformed\n    // into a `commands` array on a previous run.\n    if (!bundleTarget.options.commands) {\n      const rolldownCommand = bundleTarget.options.command;\n      delete bundleTarget.options.command;\n      bundleTarget.options = {\n        ...bundleTarget.options,\n        commands: [\n          fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.cp(\n            'prisma',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`,\n          ),\n          fs.cp(\n            'prisma.config.ts',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`,\n          ),\n          fs.cp(\n            'Dockerfile',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`,\n          ),\n          rolldownCommand,\n        ],\n        parallel: false,\n      };\n    }\n  }\n\n  projectConfig.targets.generate = {\n    executor: 'nx:run-commands',\n    outputs: ['{projectRoot}/generated/prisma'],\n    options: {\n      command: 'prisma generate',\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['pull-image'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/pull-image.ts`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['dev'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/start-container.ts`,\n      cwd: '{projectRoot}',\n    },\n    continuous: true,\n  };\n  projectConfig.targets['wait-for-db'] = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev'],\n    options: {\n      command: `tsx ${scriptsDir}/${waitForDbScript}`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets.prisma = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev', 'wait-for-db'],\n    options: {\n      cwd: '{projectRoot}',\n      command: 'prisma',\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    if (iac === 'terraform') {\n      projectConfig.targets['docker'] = {\n        cache: true,\n        executor: 'nx:run-commands',\n        options: {\n          command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${migrationDockerImageTag} ${migrationBundleDir}`,\n        },\n        dependsOn: ['bundle'],\n      };\n      addDependencyToTargetIfNotPresent(projectConfig, 'build', 'docker');\n\n      addDockerScanTarget(tree, {\n        project: projectConfig,\n        containerEngine,\n        trivyTargetName: 'trivy',\n        dockerTargetName: 'docker',\n        imageTags: [migrationDockerImageTag],\n      });\n    }\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n  addDependencyToTargetIfNotPresent(projectConfig, 'compile', 'generate');\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_RDB_GENERATOR_INFO, {\n    engine: options.engine,\n  });\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addRdbInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      projectRoot: dir,\n      nameClassName,\n      nameKebabCase,\n      databasePackageAlias: fullyQualifiedName,\n      databaseName,\n      adminUser: databaseUser,\n      engine: options.engine,\n      migrationBundleDir,\n      createDbUserBundleDir: joinPathFragments(\n        'dist',\n        projectConfig.root,\n        'bundle',\n        'create-db-user',\n      ),\n      framework: options.framework,\n      migrationDockerImageTag,\n      containerEngine,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      '@aws-sdk/client-secrets-manager',\n      '@aws-sdk/rds-signer',\n      '@prisma/client',\n      ...(options.engine === 'mysql'\n        ? (['@prisma/adapter-mariadb', 'mariadb'] as const)\n        : (['@prisma/adapter-pg', 'pg'] as const)),\n    ]),\n    withVersions([\n      '@types/aws-lambda',\n      ...(options.engine === 'mysql'\n        ? ([] as const)\n        : (['@types/pg'] as const)),\n    ]),\n    joinPathFragments(projectConfig.root, 'package.json'),\n  );\n  // The prisma CLI and tsx run migration/seed scripts from the root.\n  addDependenciesToPackageJson(tree, {}, withVersions(['prisma', 'tsx']));\n\n  registerPnpmBuiltDependencies(tree, {\n    '@prisma/engines': false,\n    prisma: false,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_RDB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsRdbGenerator;\n"],"names":["relative","generateFiles","joinPathFragments","readProjectConfiguration","updateJson","updateProjectConfiguration","addTypeScriptBundleTarget","resolveContainers","addDependenciesToPackageJson","addDockerScanTarget","nodeImageVersions","formatFilesInSubtree","FsCommands","updateGitIgnore","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","snakeCase","toClassName","getNpmScope","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","getRelativePathToRootByDirectory","registerPnpmBuiltDependencies","assignPort","addRdbInfra","sharedConstructsGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedRdbScriptsGenerator","TS_VERSIONS","withVersions","tsProjectGenerator","getTsLibDetails","TS_RDB_GENERATOR_INFO","filename","tsRdbGenerator","tree","options","nameKebabCase","name","nameClassName","databaseUser","databaseName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","tsConfig","include","projectConfig","localDbPort","engine","localDbHost","localDbUser","localDbPassword","containerName","dockerImage","templateOptions","runtimeConfigKey","databasePackageAlias","databaseProvider","prismaVersion","prisma","prismaAdapterPackage","prismaAdapterClassName","localDbName","dirname","patterns","waitForDbScript","scriptsDir","relativePathToRoot","root","fs","migrationBundleDir","migrationDockerImageTag","infra","targetFilePath","bundleOutputDir","bundleTarget","targets","commands","rolldownCommand","command","rm","mkdir","cp","parallel","generate","executor","outputs","cwd","continuous","dependsOn","env","LOCAL_DEV","iac","cache","project","trivyTargetName","dockerTargetName","imageTags","projectName","projectRoot","adminUser","createDbUserBundleDir","framework","languages"],"mappings":"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"}

package/src/utils/agent-connection/agent-connection.js

@@ -81,6 +81,10 @@ const FRAMEWORKS = {
                 {
                     fromModule: './core/model-errors-strands.js',
                     importName: '*'
+                },
+                {
+                    fromModule: './core/tool-errors-strands.js',
+                    importName: '*'
                 }
             ],
             protocols: {