@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

package/src/preset/generator.js

@@ -1,53 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.presetGenerator = exports.PRESET_GENERATOR_INFO = void 0;
-exports.isAmazonian = isAmazonian;
-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 js_1 = require("@nx/js");
-const child_process_1 = require("child_process");
-const enquirer = tslib_1.__importStar(require("enquirer"));
-const fs_1 = require("fs");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-const package_json_1 = require("nx/src/utils/package-json");
-const generators_json_1 = tslib_1.__importDefault(require("../../generators.json"));
-const generator_1 = require("../ts/sync/generator");
-const utils_1 = require("../utils/config/utils");
-const containers_1 = require("../utils/containers");
-const format_1 = require("../utils/format");
-const mcp_1 = require("../utils/mcp");
-const npm_scope_1 = require("../utils/npm-scope");
-const nx_1 = require("../utils/nx");
-const pkg_manager_1 = require("../utils/pkg-manager");
-const versions_1 = require("../utils/versions");
-const WORKSPACES = ['packages/*'];
-const NX_TYPESCRIPT_SYNC_GENERATOR = '@nx/js:typescript-sync';
-// Built dependencies whose install scripts the generated workspace trusts.
-// `onlyBuiltDependencies` is the pnpm 10 key (silently ignored by pnpm 11);
-// pnpm 11 reads `allowBuilds` instead. Any dep NOT in this allowlist will
-// have its install scripts skipped with a warning — matching pnpm 10's
-// default behaviour. The user can opt-in later via `pnpm approve-builds`.
-const PNPM_BUILT_DEPENDENCIES = ['@swc/core', 'esbuild', 'nx', 'sharp'];
-exports.PRESET_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const setUpWorkspaces = (tree) => {
-    if ((0, devkit_1.detectPackageManager)() === 'pnpm') {
-        tree.write('pnpm-workspace.yaml', js_yaml_1.default.dump({
-            packages: WORKSPACES,
-            allowBuilds: Object.fromEntries(PNPM_BUILT_DEPENDENCIES.map((dep) => [dep, true])),
-            onlyBuiltDependencies: PNPM_BUILT_DEPENDENCIES,
-        }, { quotingType: "'" }));
-    }
-    else {
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            json.workspaces = WORKSPACES;
-            return json;
-        });
-    }
-};
+ */ import { joinPathFragments, OverwriteStrategy, updateJson } from "@nx/devkit";
+import { execSync } from "child_process";
+import enquirer from "enquirer";
+import { readFileSync } from "fs";
+import { ensureAwsNxPluginConfig, updateAwsNxPluginConfig } from "../utils/config/utils.js";
+import { declareDependencies } from "../utils/declared-dependencies.js";
+import { addDependenciesToPackageJson } from "../utils/dependencies.js";
+import { formatFilesInSubtree } from "../utils/format.js";
+import { applyWorkspaceInit, INIT_DEPENDENCIES } from "../utils/init.js";
+import { installDependencies } from "../utils/install.js";
+import { getGeneratorInfo } from "../utils/nx.js";
+import { withVersions } from "../utils/versions.js";
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        {
+            name: 'husky'
+        },
+        ...INIT_DEPENDENCIES
+    ]
+});
+export const PRESET_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 /**
  * Determines if the current user is an Amazon employee based on their git configuration.
  *
@@ -69,12 +43,11 @@ const setUpWorkspaces = (tree) => {
  * @example
  * // Returns false when git config is not available or throws an error
  * isAmazonian(); // false
- */
-function isAmazonian() {
+ */ export function isAmazonian() {
     try {
         // Execute git command to retrieve the user's configured email address
-        const gitEmail = (0, child_process_1.execSync)('git config user.email', {
-            encoding: 'utf8',
+        const gitEmail = execSync('git config user.email', {
+            encoding: 'utf8'
         }).trim();
         // Return false if no email is configured
         if (!gitEmail) {
@@ -89,127 +62,79 @@ function isAmazonian() {
         const domain = emailParts[1].toLowerCase();
         // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)
         return domain.startsWith('amazon.');
-    }
-    catch (error) {
+    } catch (error) {
         // Return false if git command fails or any other error occurs
         // This handles cases where git is not installed or configured
         return false;
     }
 }
-const setUpGitSecrets = (tree) => {
-    const gitSecretsDir = (0, devkit_1.joinPathFragments)(__dirname, 'git-secrets-files', 'git-secrets-dir');
-    const huskyDir = (0, devkit_1.joinPathFragments)(__dirname, 'git-secrets-files', 'husky-dir');
-    tree.write('.git-secrets/git-secrets', (0, fs_1.readFileSync)((0, devkit_1.joinPathFragments)(gitSecretsDir, 'git-secrets'), 'utf-8'));
-    tree.write('.husky/pre-commit', (0, fs_1.readFileSync)((0, devkit_1.joinPathFragments)(huskyDir, 'pre-commit'), 'utf-8'));
+const setUpGitSecrets = (tree)=>{
+    const gitSecretsDir = joinPathFragments(import.meta.dirname, 'git-secrets-files', 'git-secrets-dir');
+    const huskyDir = joinPathFragments(import.meta.dirname, 'git-secrets-files', 'husky-dir');
+    tree.write('.git-secrets/git-secrets', readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'));
+    tree.write('.husky/pre-commit', readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'));
     tree.write('.gitallowed', '\\.git-secrets/git-secrets:\n');
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => ({
-        ...json,
-        scripts: {
-            ...json.scripts,
-            prepare: 'husky',
-        },
-    }));
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['husky']));
+    updateJson(tree, 'package.json', (json)=>({
+            ...json,
+            scripts: {
+                ...json.scripts,
+                prepare: 'husky'
+            }
+        }));
+    addDependenciesToPackageJson(tree, {}, withVersions(DEPENDENCIES, [
+        'husky'
+    ]));
 };
-const presetGenerator = async (tree, { addTsPlugin, iac, gitSecrets, mcp, containers }) => {
-    const resolvedContainers = !containers || containers === 'infer' ? (0, containers_1.inferContainers)() : containers;
-    if (isAmazonian() &&
-        !process.env.VITEST &&
-        !process.env.CI &&
-        process.env.NX_DRY_RUN !== 'true' &&
-        process.env.NX_INTERACTIVE !== 'false') {
+export const presetGenerator = async (tree, { iac, gitSecrets, mcp, containers, module, catalog, preferInstallDependencies })=>{
+    if (isAmazonian() && !process.env.VITEST && !process.env.CI && process.env.NX_DRY_RUN !== 'true' && process.env.NX_INTERACTIVE !== 'false') {
         const { engagementId } = await enquirer.prompt([
             {
                 name: 'engagementId',
                 message: 'Please enter your engagementId (if known)',
                 type: 'input',
-                initial: 'None',
-            },
+                initial: 'None'
+            }
         ]);
         if (engagementId != 'None') {
-            await (0, utils_1.ensureAwsNxPluginConfig)(tree);
-            await (0, utils_1.updateAwsNxPluginConfig)(tree, { tags: [engagementId] });
+            await ensureAwsNxPluginConfig(tree);
+            await updateAwsNxPluginConfig(tree, {
+                tags: [
+                    engagementId
+                ]
+            });
         }
     }
-    // Write IaC provider and container engine to plugin config
-    await (0, utils_1.ensureAwsNxPluginConfig)(tree);
-    await (0, utils_1.updateAwsNxPluginConfig)(tree, {
-        iac: { provider: iac },
-        containers: { engine: resolvedContainers },
-    });
-    await (0, js_1.initGenerator)(tree, {
-        formatter: 'none',
-        addTsPlugin: addTsPlugin ?? true,
-    });
+    // The preset owns the greenfield workspace's module format: write the root
+    // `type` explicitly from the chosen `--module` so later generators can
+    // infer it. The `init` generator never touches an existing workspace's
+    // `type` field.
+    updateJson(tree, 'package.json', (packageJson)=>({
+            ...packageJson,
+            type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs'
+        }));
+    // Apply the deterministic workspace configuration shared with the `init`
+    // generator. The preset owns the README of a greenfield workspace.
+    await applyWorkspaceInit(tree, {
+        iac,
+        containers,
+        mcp,
+        catalogs: catalog ?? true,
+        readmeOverwriteStrategy: OverwriteStrategy.Overwrite,
+        overwriteScripts: true
+    }, DEPENDENCIES);
     tree.delete('apps/.gitkeep');
     tree.delete('libs/.gitkeep');
     tree.write('packages/.gitkeep', '');
-    setUpWorkspaces(tree);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    (0, devkit_1.updateNxJson)(tree, {
-        ...nxJson,
-        analytics: false,
-        targetDefaults: {
-            ...nxJson.targetDefaults,
-            compile: {
-                ...nxJson.targetDefaults?.compile,
-                syncGenerators: [
-                    ...(nxJson.targetDefaults?.compile?.syncGenerators ?? []).filter((g) => ![generator_1.SYNC_GENERATOR_NAME, NX_TYPESCRIPT_SYNC_GENERATOR].includes(g)),
-                    NX_TYPESCRIPT_SYNC_GENERATOR,
-                    generator_1.SYNC_GENERATOR_NAME,
-                ],
-            },
-        },
-    });
-    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => ({
-        ...packageJson,
-        type: 'module',
-        scripts: {
-            ...packageJson.scripts,
-            build: 'nx run-many --target build',
-            lint: 'nx run-many --target lint --configuration=fix',
-            test: 'nx run-many --target test --all',
-            'build:skip-lint': 'nx run-many --target build --configuration=skip-lint',
-            'build:all': 'nx run-many --target build --all',
-            'affected:all': 'nx affected --target build',
-        },
-    }));
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@nx/workspace': (0, package_json_1.readModulePackageJson)('@nx/js').packageJson.version,
-        ...(0, versions_1.withVersions)(['typescript', '@biomejs/biome']),
-    });
-    // Write biome.json for formatting and linting
-    if (!tree.exists('biome.json')) {
-        tree.write('biome.json', JSON.stringify(format_1.DEFAULT_BIOME_CONFIG, null, 2));
-    }
-    (0, devkit_1.generateFiles)(tree, // the virtual file system
-    (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {
-        projectName: (0, npm_scope_1.getNpmScope)(tree),
-        generators: Object.entries(generators_json_1.default.generators)
-            .filter(([_, v]) => !v['hidden'])
-            .map(([k, v]) => ({ name: k, description: v.description })),
-        ...(() => {
-            const cmds = (0, pkg_manager_1.getPackageManagerDisplayCommands)();
-            return {
-                pkgMgrCmd: cmds.exec,
-                buildCmd: `${cmds.run} build`,
-                lintCmd: `${cmds.run} lint`,
-            };
-        })(),
-    }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
-    });
     if (gitSecrets !== false) {
         setUpGitSecrets(tree);
     }
-    if (mcp !== false) {
-        (0, mcp_1.configureMcpServers)(tree);
-    }
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.presetGenerator = presetGenerator;
-exports.default = exports.presetGenerator;
+export default presetGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { execSync } from 'child_process';\nimport enquirer from 'enquirer';\nimport { readFileSync } from 'fs';\nimport {\n  ensureAwsNxPluginConfig,\n  updateAwsNxPluginConfig,\n} from '../utils/config/utils';\nimport { declareDependencies } from '../utils/declared-dependencies';\nimport { addDependenciesToPackageJson } from '../utils/dependencies';\nimport { formatFilesInSubtree } from '../utils/format';\nimport { applyWorkspaceInit, INIT_DEPENDENCIES } from '../utils/init';\nimport { installDependencies } from '../utils/install';\nimport { getGeneratorInfo, type NxGeneratorInfo } from '../utils/nx';\nimport { withVersions } from '../utils/versions';\nimport type { PresetGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [{ name: 'husky' }, ...INIT_DEPENDENCIES],\n});\n\nexport const PRESET_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Determines if the current user is an Amazon employee based on their git configuration.\n *\n * This function checks the git user email configuration to identify Amazon employees\n * by looking for email addresses with Amazon domains (e.g., @amazon.com, @amazon.co.uk).\n *\n * @returns {boolean} True if the user's git email has an Amazon domain, false otherwise\n *\n * @example\n * // Returns true for Amazon employee emails\n * // git config user.email = \"john.doe@amazon.com\"\n * isAmazonian(); // true\n *\n * @example\n * // Returns false for non-Amazon emails\n * // git config user.email = \"user@example.com\"\n * isAmazonian(); // false\n *\n * @example\n * // Returns false when git config is not available or throws an error\n * isAmazonian(); // false\n */\nexport function isAmazonian(): boolean {\n  try {\n    // Execute git command to retrieve the user's configured email address\n    const gitEmail = execSync('git config user.email', {\n      encoding: 'utf8',\n    }).trim();\n\n    // Return false if no email is configured\n    if (!gitEmail) {\n      return false;\n    }\n\n    // Split email address to extract domain part\n    const emailParts = gitEmail.split('@');\n    if (emailParts.length < 2) {\n      return false;\n    }\n\n    // Extract domain and normalize to lowercase for comparison\n    const domain = emailParts[1].toLowerCase();\n\n    // Check if domain starts with 'amazon.' (covers amazon.com, amazon.co.uk, etc.)\n    return domain.startsWith('amazon.');\n  } catch (error) {\n    // Return false if git command fails or any other error occurs\n    // This handles cases where git is not installed or configured\n    return false;\n  }\n}\n\nconst setUpGitSecrets = (tree: Tree) => {\n  const gitSecretsDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'git-secrets-dir',\n  );\n  const huskyDir = joinPathFragments(\n    import.meta.dirname,\n    'git-secrets-files',\n    'husky-dir',\n  );\n\n  tree.write(\n    '.git-secrets/git-secrets',\n    readFileSync(joinPathFragments(gitSecretsDir, 'git-secrets'), 'utf-8'),\n  );\n  tree.write(\n    '.husky/pre-commit',\n    readFileSync(joinPathFragments(huskyDir, 'pre-commit'), 'utf-8'),\n  );\n  tree.write('.gitallowed', '\\\\.git-secrets/git-secrets:\\n');\n\n  updateJson(tree, 'package.json', (json) => ({\n    ...json,\n    scripts: {\n      ...json.scripts,\n      prepare: 'husky',\n    },\n  }));\n\n  addDependenciesToPackageJson(tree, {}, withVersions(DEPENDENCIES, ['husky']));\n};\n\nexport const presetGenerator = async (\n  tree: Tree,\n  {\n    iac,\n    gitSecrets,\n    mcp,\n    containers,\n    module,\n    catalog,\n    preferInstallDependencies,\n  }: PresetGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  if (\n    isAmazonian() &&\n    !process.env.VITEST &&\n    !process.env.CI &&\n    process.env.NX_DRY_RUN !== 'true' &&\n    process.env.NX_INTERACTIVE !== 'false'\n  ) {\n    const { engagementId } = await enquirer.prompt<{ engagementId?: string }>([\n      {\n        name: 'engagementId',\n        message: 'Please enter your engagementId (if known)',\n        type: 'input',\n        initial: 'None',\n      },\n    ]);\n\n    if (engagementId != 'None') {\n      await ensureAwsNxPluginConfig(tree);\n      await updateAwsNxPluginConfig(tree, { tags: [engagementId] });\n    }\n  }\n\n  // The preset owns the greenfield workspace's module format: write the root\n  // `type` explicitly from the chosen `--module` so later generators can\n  // infer it. The `init` generator never touches an existing workspace's\n  // `type` field.\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: (module ?? 'esm') === 'esm' ? 'module' : 'commonjs',\n  }));\n\n  // Apply the deterministic workspace configuration shared with the `init`\n  // generator. The preset owns the README of a greenfield workspace.\n  await applyWorkspaceInit(\n    tree,\n    {\n      iac,\n      containers,\n      mcp,\n      catalogs: catalog ?? true,\n      readmeOverwriteStrategy: OverwriteStrategy.Overwrite,\n      overwriteScripts: true,\n    },\n    DEPENDENCIES,\n  );\n\n  tree.delete('apps/.gitkeep');\n  tree.delete('libs/.gitkeep');\n  tree.write('packages/.gitkeep', '');\n\n  if (gitSecrets !== false) {\n    setUpGitSecrets(tree);\n  }\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default presetGenerator;\n"],"names":["joinPathFragments","OverwriteStrategy","updateJson","execSync","enquirer","readFileSync","ensureAwsNxPluginConfig","updateAwsNxPluginConfig","declareDependencies","addDependenciesToPackageJson","formatFilesInSubtree","applyWorkspaceInit","INIT_DEPENDENCIES","installDependencies","getGeneratorInfo","withVersions","DEPENDENCIES","ts","name","PRESET_GENERATOR_INFO","filename","isAmazonian","gitEmail","encoding","trim","emailParts","split","length","domain","toLowerCase","startsWith","error","setUpGitSecrets","tree","gitSecretsDir","dirname","huskyDir","write","json","scripts","prepare","presetGenerator","iac","gitSecrets","mcp","containers","module","catalog","preferInstallDependencies","process","env","VITEST","CI","NX_DRY_RUN","NX_INTERACTIVE","engagementId","prompt","message","type","initial","tags","packageJson","catalogs","readmeOverwriteStrategy","Overwrite","overwriteScripts","delete","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,iBAAiB,EACjBC,iBAAiB,EAEjBC,UAAU,QACL,aAAa;AACpB,SAASC,QAAQ,QAAQ,gBAAgB;AACzC,OAAOC,cAAc,WAAW;AAChC,SAASC,YAAY,QAAQ,KAAK;AAClC,SACEC,uBAAuB,EACvBC,uBAAuB,QAClB,2BAAwB;AAC/B,SAASC,mBAAmB,QAAQ,oCAAiC;AACrE,SAASC,4BAA4B,QAAQ,2BAAwB;AACrE,SAASC,oBAAoB,QAAQ,qBAAkB;AACvD,SAASC,kBAAkB,EAAEC,iBAAiB,QAAQ,mBAAgB;AACtE,SAASC,mBAAmB,QAAQ,sBAAmB;AACvD,SAASC,gBAAgB,QAA8B,iBAAc;AACrE,SAASC,YAAY,QAAQ,uBAAoB;AAGjD,OAAO,MAAMC,eAAeR,sBAAsB;IAChDS,IAAI;QAAC;YAAEC,MAAM;QAAQ;WAAMN;KAAkB;AAC/C,GAAG;AAEH,OAAO,MAAMO,wBAAyCL,iBACpD,YAAYM,QAAQ,EACpB;AAEF;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,OAAO,SAASC;IACd,IAAI;QACF,sEAAsE;QACtE,MAAMC,WAAWnB,SAAS,yBAAyB;YACjDoB,UAAU;QACZ,GAAGC,IAAI;QAEP,yCAAyC;QACzC,IAAI,CAACF,UAAU;YACb,OAAO;QACT;QAEA,6CAA6C;QAC7C,MAAMG,aAAaH,SAASI,KAAK,CAAC;QAClC,IAAID,WAAWE,MAAM,GAAG,GAAG;YACzB,OAAO;QACT;QAEA,2DAA2D;QAC3D,MAAMC,SAASH,UAAU,CAAC,EAAE,CAACI,WAAW;QAExC,gFAAgF;QAChF,OAAOD,OAAOE,UAAU,CAAC;IAC3B,EAAE,OAAOC,OAAO;QACd,8DAA8D;QAC9D,8DAA8D;QAC9D,OAAO;IACT;AACF;AAEA,MAAMC,kBAAkB,CAACC;IACvB,MAAMC,gBAAgBlC,kBACpB,YAAYmC,OAAO,EACnB,qBACA;IAEF,MAAMC,WAAWpC,kBACf,YAAYmC,OAAO,EACnB,qBACA;IAGFF,KAAKI,KAAK,CACR,4BACAhC,aAAaL,kBAAkBkC,eAAe,gBAAgB;IAEhED,KAAKI,KAAK,CACR,qBACAhC,aAAaL,kBAAkBoC,UAAU,eAAe;IAE1DH,KAAKI,KAAK,CAAC,eAAe;IAE1BnC,WAAW+B,MAAM,gBAAgB,CAACK,OAAU,CAAA;YAC1C,GAAGA,IAAI;YACPC,SAAS;gBACP,GAAGD,KAAKC,OAAO;gBACfC,SAAS;YACX;QACF,CAAA;IAEA/B,6BAA6BwB,MAAM,CAAC,GAAGlB,aAAaC,cAAc;QAAC;KAAQ;AAC7E;AAEA,OAAO,MAAMyB,kBAAkB,OAC7BR,MACA,EACES,GAAG,EACHC,UAAU,EACVC,GAAG,EACHC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,yBAAyB,EACH;IAExB,IACE3B,iBACA,CAAC4B,QAAQC,GAAG,CAACC,MAAM,IACnB,CAACF,QAAQC,GAAG,CAACE,EAAE,IACfH,QAAQC,GAAG,CAACG,UAAU,KAAK,UAC3BJ,QAAQC,GAAG,CAACI,cAAc,KAAK,SAC/B;QACA,MAAM,EAAEC,YAAY,EAAE,GAAG,MAAMnD,SAASoD,MAAM,CAA4B;YACxE;gBACEtC,MAAM;gBACNuC,SAAS;gBACTC,MAAM;gBACNC,SAAS;YACX;SACD;QAED,IAAIJ,gBAAgB,QAAQ;YAC1B,MAAMjD,wBAAwB2B;YAC9B,MAAM1B,wBAAwB0B,MAAM;gBAAE2B,MAAM;oBAACL;iBAAa;YAAC;QAC7D;IACF;IAEA,2EAA2E;IAC3E,uEAAuE;IACvE,uEAAuE;IACvE,gBAAgB;IAChBrD,WAAW+B,MAAM,gBAAgB,CAAC4B,cAAiB,CAAA;YACjD,GAAGA,WAAW;YACdH,MAAM,AAACZ,CAAAA,UAAU,KAAI,MAAO,QAAQ,WAAW;QACjD,CAAA;IAEA,yEAAyE;IACzE,mEAAmE;IACnE,MAAMnC,mBACJsB,MACA;QACES;QACAG;QACAD;QACAkB,UAAUf,WAAW;QACrBgB,yBAAyB9D,kBAAkB+D,SAAS;QACpDC,kBAAkB;IACpB,GACAjD;IAGFiB,KAAKiC,MAAM,CAAC;IACZjC,KAAKiC,MAAM,CAAC;IACZjC,KAAKI,KAAK,CAAC,qBAAqB;IAEhC,IAAIM,eAAe,OAAO;QACxBX,gBAAgBC;IAClB;IAEA,MAAMvB,qBAAqBuB;IAC3B,OAAO,IACLpB,oBAAoBoB,MAAMe,2BAA2B;YACnDmB,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAe1B,gBAAgB"}

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/preset/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Containers } from '../utils/containers';\nimport { Iac } from '../utils/iac';\nimport type { ModuleFormat } from '../utils/module-format';\n\nexport type PresetContainersOption = Containers | 'infer';\n\nexport interface PresetGeneratorSchema {\n  readonly iac: Iac;\n  readonly gitSecrets?: boolean;\n  readonly mcp?: boolean;\n  readonly containers?: PresetContainersOption;\n  readonly module?: ModuleFormat;\n  readonly catalog?: boolean;\n  readonly preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAQD,WAQC"}

package/src/preset/schema.d.ts

@@ -5,13 +5,16 @@
 
 import { Containers } from '../utils/containers';
 import { Iac } from '../utils/iac';
+import type { ModuleFormat } from '../utils/module-format';
 
 export type PresetContainersOption = Containers | 'infer';
 
 export interface PresetGeneratorSchema {
-  readonly addTsPlugin?: boolean;
   readonly iac: Iac;
   readonly gitSecrets?: boolean;
   readonly mcp?: boolean;
   readonly containers?: PresetContainersOption;
+  readonly module?: ModuleFormat;
+  readonly catalog?: boolean;
+  readonly preferInstallDependencies?: boolean;
 }

package/src/preset/schema.json

@@ -5,11 +5,6 @@
   "description": "The @aws/nx-plugin preset.",
   "type": "object",
   "properties": {
-    "addTsPlugin": {
-      "type": "boolean",
-      "description": "Whether to add the ts plugin.",
-      "default": true
-    },
     "iac": {
       "type": "string",
       "description": "The preferred IaC provider.",
@@ -35,6 +30,22 @@
       "default": "infer",
       "x-priority": "important",
       "x-prompt": "Which container engine would you like to use? (default: infer)"
+    },
+    "module": {
+      "type": "string",
+      "description": "Module format for generated TypeScript code and configuration.",
+      "enum": ["esm", "cjs"],
+      "default": "esm"
+    },
+    "catalog": {
+      "type": "boolean",
+      "description": "Whether generators record dependency versions in the package manager's catalog (pnpm/yarn/bun), keeping a single source of truth for versions. When false, dependencies are written directly to each project's package.json and keeping versions aligned is your responsibility.",
+      "default": true
+    },
+    "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
     }
   }
 }