@aws/nx-plugin 0.89.0 → 0.90.1

package/src/utils/bundle/bundle.js

@@ -8,7 +8,6 @@ exports.addTypeScriptBundleTarget = exports.addPythonBundleTarget = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../versions");
 const ast_1 = require("../ast");
-const typescript_1 = require("typescript");
 const paths_1 = require("../paths");
 const nx_1 = require("../nx");
 /**
@@ -59,13 +58,8 @@ exports.addPythonBundleTarget = addPythonBundleTarget;
 /**
  * Add a TypeScript bundle target using rolldown
  */
-const addTypeScriptBundleTarget = (tree, project, opts) => {
+const addTypeScriptBundleTarget = async (tree, project, opts) => {
     project.targets ??= {};
-    // Check if AWS SDK is external
-    const awsSdkRegex = /@aws-sdk\/.*/;
-    const isAwsSdkExternal = opts.external?.some((ext) => ext instanceof RegExp
-        ? ext.source === awsSdkRegex.source
-        : ext === awsSdkRegex.source);
     // Generate empty rolldown config if it doesn't exist
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'ts'), project.root, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Add the bundle target
@@ -84,72 +78,33 @@ const addTypeScriptBundleTarget = (tree, project, opts) => {
     // Add bundle to the build target
     (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'bundle');
     const rolldownConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'rolldown.config.ts');
-    const rolldownConfigArraySelector = 'CallExpression:has(Identifier[name="defineConfig"]) > ArrayLiteralExpression';
-    // Add disableTreeShake function if AWS SDK is not external and it doesn't exist
-    // This is due to an issue with rolldown bundling for the SDK, and can likely be removed when resolved
-    // https://github.com/rolldown/rolldown/issues/6513
-    if (!isAwsSdkExternal) {
-        const disableTreeShakeSelector = 'VariableDeclaration:has(Identifier[name="disableTreeShake"])';
-        if ((0, ast_1.query)(tree, rolldownConfigPath, disableTreeShakeSelector).length === 0) {
-            const content = tree.read(rolldownConfigPath, 'utf-8');
-            const disableTreeShakeFunction = `// Disables tree-shaking for the given module patterns
-const disableTreeShake = (patterns: RegExp[]) => ({
-  name: 'disable-treeshake',
-  transform: (code, id) => {
-    if (patterns.some(p => p.test(id))) {
-      return { code, map: null, moduleSideEffects: 'no-treeshake' };
-    }
-    return null;
-  },
-});
-
-`;
-            const defineConfigIndex = content.indexOf('export default defineConfig');
-            if (defineConfigIndex !== -1) {
-                const newContent = content.slice(0, defineConfigIndex) +
-                    disableTreeShakeFunction +
-                    content.slice(defineConfigIndex);
-                tree.write(rolldownConfigPath, newContent);
-            }
+    const outputFile = (0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, project.name), 'dist', project.root, 'bundle', opts.bundleOutputDir ?? '.', 'index.js');
+    const external = opts.external?.length
+        ? opts.external
+            .map((ext) => typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`)
+            .join(', ')
+        : '';
+    const entry = `{
+    tsconfig: 'tsconfig.lib.json',
+    input: '${opts.targetFilePath}',
+    output: { file: '${outputFile}', format: 'cjs', inlineDynamicImports: true },
+    platform: '${opts.platform ?? 'node'}',
+    ${external ? `external: [${external}],` : ''}
+  }`;
+    // Use GritQL to append the config entry to the defineConfig array.
+    // First try the non-empty array case using the accumulate (+=) operator,
+    // with an idempotency guard that checks the input path is not already present.
+    const appended = await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: not contains \`'${opts.targetFilePath}'\`, $items += ", ${entry}" }`);
+    if (!appended) {
+        // Empty array — GritQL's += cannot accumulate into an empty list, so we
+        // first insert a placeholder to make the array non-empty, then replace
+        // the placeholder with the real entry via += (which handles regex
+        // literals that are invalid inside GritQL backtick snippets).
+        const inserted = await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([])\` => \`defineConfig([__PLACEHOLDER__])\``);
+        if (inserted) {
+            await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: \`__PLACEHOLDER__\` => ., $items += "${entry}" }`);
         }
     }
-    // Check whether we already have a config entry with input set to targetFilePath
-    if ((0, ast_1.query)(tree, rolldownConfigPath, `${rolldownConfigArraySelector} PropertyAssignment:has(Identifier[name="input"]):has(StringLiteral[value="${opts.targetFilePath}"])`).length === 0) {
-        // We don't have one, so append it
-        (0, ast_1.replace)(tree, rolldownConfigPath, rolldownConfigArraySelector, (node) => {
-            return typescript_1.factory.createArrayLiteralExpression([
-                ...node.elements,
-                typescript_1.factory.createObjectLiteralExpression([
-                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('tsconfig'), typescript_1.factory.createStringLiteral('tsconfig.lib.json', true)),
-                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('input'), typescript_1.factory.createStringLiteral(opts.targetFilePath, true)),
-                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('output'), typescript_1.factory.createObjectLiteralExpression([
-                        typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('file'), typescript_1.factory.createStringLiteral((0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, project.name), 'dist', project.root, 'bundle', opts.bundleOutputDir ?? '.', 'index.js'), true)),
-                        typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('format'), typescript_1.factory.createStringLiteral('cjs', true)),
-                        typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('inlineDynamicImports'), typescript_1.factory.createTrue()),
-                    ], true)),
-                    typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('platform'), typescript_1.factory.createStringLiteral(opts.platform ?? 'node', true)),
-                    ...(opts.external
-                        ? [
-                            typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('external'), typescript_1.factory.createArrayLiteralExpression(opts.external.map((ext) => typeof ext === 'string'
-                                ? typescript_1.factory.createStringLiteral(ext, true)
-                                : typescript_1.factory.createRegularExpressionLiteral(`/${ext.source}/`)))),
-                        ]
-                        : []),
-                    ...(!isAwsSdkExternal
-                        ? [
-                            typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier('plugins'), typescript_1.factory.createArrayLiteralExpression([
-                                typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('disableTreeShake'), undefined, [
-                                    typescript_1.factory.createArrayLiteralExpression([
-                                        typescript_1.factory.createRegularExpressionLiteral(`/${awsSdkRegex.source}/`),
-                                    ]),
-                                ]),
-                            ])),
-                        ]
-                        : []),
-                ], true),
-            ]);
-        });
-    }
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['rolldown']));
 };
 exports.addTypeScriptBundleTarget = addTypeScriptBundleTarget;

package/src/utils/bundle/bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"names":[],"mappings":"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"}

package/src/utils/commands.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Display-friendly command prefixes for each package manager.
+ *
+ * - `exec`: prefix for running local binaries (e.g. `npx nx`, `pnpm nx`, `bunx nx`)
+ * - `run`: prefix for running package.json scripts (e.g. `npm run build`, `pnpm build`)
+ *
+ * @see docs/src/components/package-manager-exec-command.astro
+ * @see docs/src/components/package-manager-short-command.astro
+ */
+export interface PackageManagerDisplayCommands {
+    /** Prefix for running local binaries: npx, pnpm, yarn, bunx */
+    exec: string;
+    /** Prefix for running package.json scripts: `npm run`, pnpm, yarn, bun */
+    run: string;
+}
+export declare const PACKAGE_MANAGER_COMMANDS: Record<string, PackageManagerDisplayCommands>;
+/**
+ * Build a package manager exec command (e.g. pnpm cmd, npx cmd, bunx cmd)
+ */
+export declare const buildPackageManagerExecCommand: (pm: string, command: string) => string;
+/**
+ * Build a short package manager command (e.g. pnpm build, npm run build)
+ */
+export declare const buildPackageManagerShortCommand: (pm: string, command: string) => string;
+/**
+ * Build an install command for a given package manager
+ */
+export declare const buildInstallCommand: (pm: string, pkg: string, dev: boolean) => string;
+/**
+ * Build a create-nx-workspace command.
+ * Defaults to the pinned create-nx-workspace version from TS_VERSIONS.
+ */
+export declare const buildCreateNxWorkspaceCommand: (pm: string, workspace: string, iacProvider?: "CDK" | "Terraform", yes?: boolean, nxVersion?: string, nxPluginVersion?: string) => string;

package/src/utils/commands.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildCreateNxWorkspaceCommand = exports.buildInstallCommand = exports.buildPackageManagerShortCommand = exports.buildPackageManagerExecCommand = exports.PACKAGE_MANAGER_COMMANDS = void 0;
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const versions_1 = require("./versions");
+exports.PACKAGE_MANAGER_COMMANDS = {
+    npm: { exec: 'npx', run: 'npm run' },
+    pnpm: { exec: 'pnpm', run: 'pnpm' },
+    yarn: { exec: 'yarn', run: 'yarn' },
+    bun: { exec: 'bunx', run: 'bun' },
+};
+/**
+ * Build a package manager exec command (e.g. pnpm cmd, npx cmd, bunx cmd)
+ */
+const buildPackageManagerExecCommand = (pm, command) => {
+    const prefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.exec ?? pm;
+    return `${prefix} ${command}`;
+};
+exports.buildPackageManagerExecCommand = buildPackageManagerExecCommand;
+/**
+ * Build a short package manager command (e.g. pnpm build, npm run build)
+ */
+const buildPackageManagerShortCommand = (pm, command) => {
+    const prefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.run ?? pm;
+    return `${prefix} ${command}`;
+};
+exports.buildPackageManagerShortCommand = buildPackageManagerShortCommand;
+/**
+ * Build an install command for a given package manager
+ */
+const buildInstallCommand = (pm, pkg, dev) => {
+    switch (pm) {
+        case 'pnpm':
+            return `pnpm add ${dev ? '-D' : '-'}w ${pkg}`;
+        case 'yarn':
+            return `yarn add ${dev ? '-D ' : ''}${pkg}`;
+        case 'npm':
+            return `npm install --legacy-peer-deps ${dev ? '-D ' : ''}${pkg}`;
+        case 'bun':
+            return `bun install ${dev ? '-D ' : ''}${pkg}`;
+        default:
+            return `${pm} install ${dev ? '-D ' : ''}${pkg}`;
+    }
+};
+exports.buildInstallCommand = buildInstallCommand;
+/**
+ * Build a create-nx-workspace command.
+ * Defaults to the pinned create-nx-workspace version from TS_VERSIONS.
+ */
+const buildCreateNxWorkspaceCommand = (pm, workspace, iacProvider, yes = false, nxVersion = versions_1.TS_VERSIONS['create-nx-workspace'], nxPluginVersion) => `npx ${yes ? '-y ' : ''}create-nx-workspace@${nxVersion} ${workspace} --pm=${pm} --preset=@aws/nx-plugin${nxPluginVersion ? `@${nxPluginVersion}` : ''}${iacProvider ? ` --iacProvider=${iacProvider}` : ''} --ci=skip --analytics=false --aiAgents`;
+exports.buildCreateNxWorkspaceCommand = buildCreateNxWorkspaceCommand;
+//# sourceMappingURL=commands.js.map

package/src/utils/commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/commands.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,yCAAyC;AAkB5B,QAAA,wBAAwB,GAGjC;IACF,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE;CAClC,CAAC;AAEF;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,gCAAwB,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;IACxD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,8BAA8B,kCAGzC;AAEF;;GAEG;AACI,MAAM,+BAA+B,GAAG,CAC7C,EAAU,EACV,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,gCAAwB,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;IACvD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,+BAA+B,mCAM1C;AAEF;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAE,GAAW,EAAE,GAAY,EAAE,EAAE;IAC3E,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QAChD,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QAC9C,KAAK,KAAK;YACR,OAAO,kCAAkC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACpE,KAAK,KAAK;YACR,OAAO,eAAe,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACjD;YACE,OAAO,GAAG,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;IACrD,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,CAC3C,EAAU,EACV,SAAiB,EACjB,WAAiC,EACjC,GAAG,GAAG,KAAK,EACX,YAAoB,sBAAW,CAAC,qBAAqB,CAAC,EACtD,eAAwB,EACxB,EAAE,CACF,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,uBAAuB,SAAS,IAAI,SAAS,SAAS,EAAE,2BAA2B,eAAe,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,yCAAyC,CAAC;AAR1O,QAAA,6BAA6B,iCAQ6M"}

package/src/utils/config/__snapshots__/utils.spec.ts.snap

@@ -1,5 +1,93 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`config utils > should add multiple new keys to an empty config 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  iac: { provider: 'CDK' },
+  tags: ['a', 'b'],
+} satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should handle config with special characters in values 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  license: {
+    header: {
+      content: { lines: ['Copyright "Foo" Inc.'] },
+      format: {
+        '**/*.{js,ts,jsx,tsx}': {
+          blockStart: '/**',
+          lineStart: ' * ',
+          blockEnd: ' */',
+        },
+      },
+    },
+  },
+} satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should handle config without satisfies clause 1`] = `
+"export default { iac: { provider: 'CDK' } };
+"
+`;
+
+exports[`config utils > should preserve JS expressions when updating a different key 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  license: {
+    header: {
+      content: { lines: [\`Copyright \${new Date().getFullYear()} Foo Inc.\`] },
+    },
+  },
+  iac: { provider: 'CDK' },
+} satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should preserve JS expressions when updating an unrelated key alongside 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  license: {
+    copyrightHolder: 'Acme',
+    header: {
+      content: { lines: [\`Copyright \${new Date().getFullYear()} Acme\`] },
+    },
+  },
+  iac: { provider: 'Terraform' },
+} satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should snapshot config with tags 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default { tags: ['tag1', 'tag2', 'tag3'] } satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should snapshot merged config with multiple keys 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  iac: { provider: 'CDK' },
+  tags: ['tag1'],
+} satisfies AwsNxPluginConfig;
+"
+`;
+
+exports[`config utils > should snapshot simple iac config 1`] = `
+"import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default { iac: { provider: 'CDK' } } satisfies AwsNxPluginConfig;
+"
+`;
+
 exports[`config utils > should update user config 1`] = `
 "import { AwsNxPluginConfig } from '@aws/nx-plugin';
 

package/src/utils/config/utils.d.ts

@@ -15,6 +15,7 @@ export declare const ensureAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPlugi
 export declare const readAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPluginConfig | undefined>;
 /**
  * Update the aws nx plugin config file.
- * Undefined top level keys in the config update will be untouched, otherwise config is replaced
+ * Only the specified top-level keys are replaced; all other properties
+ * (including those containing JS expressions) are left untouched in source.
  */
 export declare const updateAwsNxPluginConfig: (tree: Tree, configUpdate: Partial<AwsNxPluginConfig>) => Promise<void>;

package/src/utils/config/utils.js

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAwsNxPluginConfig = exports.readAwsNxPluginConfig = exports.ensureAwsNxPluginConfig = exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME = 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 ts = tslib_1.__importStar(require("typescript"));
 const ast_1 = require("../ast");
-const typescript_1 = require("typescript");
 const format_1 = require("../format");
 const js_1 = require("../js");
 exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME = 'aws-nx-plugin.config.mts';
@@ -36,36 +33,57 @@ const readAwsNxPluginConfig = async (tree) => {
     return await (0, js_1.importTypeScriptModule)(configTs);
 };
 exports.readAwsNxPluginConfig = readAwsNxPluginConfig;
+const PLACEHOLDER = '"__PLACEHOLDER__"';
+/**
+ * Use GritQL to set a top-level property in the export default object,
+ * then substitute the placeholder with the JSON-serialized value.
+ * Preserves all other properties (including JS expressions) untouched.
+ */
+const setConfigProperty = async (tree, filePath, key, value) => {
+    const json = JSON.stringify(value);
+    // Check if the property already exists using a named metavariable
+    // to avoid ambiguity with anonymous $_ in nested where clauses
+    const existsInSatisfies = await (0, ast_1.matchGritQL)(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_ satisfies $_\` }`);
+    const existsInPlain = !existsInSatisfies &&
+        (await (0, ast_1.matchGritQL)(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_\` }`));
+    if (existsInSatisfies || existsInPlain) {
+        // Replace only this property's value, scoped to the export default
+        const within = existsInSatisfies
+            ? `within \`export default $_ satisfies $_\``
+            : `within \`export default $_\``;
+        await (0, ast_1.applyGritQL)(tree, filePath, `\`${key}: $old\` => \`${key}: ${PLACEHOLDER}\` where { $old <: ${within} }`);
+    }
+    else {
+        // Add the new property using GritQL's += (accumulate) operator.
+        // For non-empty objects, += appends correctly without double commas.
+        // For empty objects, += fails so we fall back to a direct replacement.
+        let added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { $props } satisfies $type\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
+        if (!added) {
+            added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { } satisfies $type\` => \`export default { ${key}: ${PLACEHOLDER} } satisfies $type\``);
+        }
+        if (!added) {
+            added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { $props }\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
+        }
+        if (!added) {
+            await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { }\` => \`export default { ${key}: ${PLACEHOLDER} }\``);
+        }
+    }
+    // Substitute the placeholder with the actual JSON value
+    const content = tree.read(filePath).toString();
+    tree.write(filePath, content.replace(PLACEHOLDER, json));
+};
 /**
  * Update the aws nx plugin config file.
- * Undefined top level keys in the config update will be untouched, otherwise config is replaced
+ * Only the specified top-level keys are replaced; all other properties
+ * (including those containing JS expressions) are left untouched in source.
  */
 const updateAwsNxPluginConfig = async (tree, configUpdate) => {
-    // Replace the default export
-    (0, ast_1.replace)(tree, exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME, 'ExportAssignment ObjectLiteralExpression', (node) => {
-        const existingObj = node;
-        const existingProps = new Map();
-        existingObj.properties.forEach((prop) => {
-            if (ts.isPropertyAssignment(prop)) {
-                existingProps.set(prop.name.getText(), prop);
-            }
-        });
-        const properties = [];
-        for (const [key, value] of Object.entries(configUpdate)) {
-            properties.push(typescript_1.factory.createPropertyAssignment(key, (0, ast_1.jsonToAst)(value)));
-        }
-        existingObj.properties.forEach((prop) => {
-            if (ts.isPropertyAssignment(prop)) {
-                const name = prop.name.getText();
-                if (configUpdate[name] === undefined) {
-                    properties.push(prop);
-                }
-            }
-        });
-        return typescript_1.factory.createObjectLiteralExpression(properties, true);
-    });
-    // Format the config nicely after an update
-    await (0, format_1.formatFilesInSubtree)(tree, exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME);
+    const filePath = exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME;
+    for (const [key, value] of Object.entries(configUpdate)) {
+        await setConfigProperty(tree, filePath, key, value);
+    }
+    // Prettier formats the result into properly indented TypeScript
+    await (0, format_1.formatFilesInSubtree)(tree, filePath);
 };
 exports.updateAwsNxPluginConfig = updateAwsNxPluginConfig;
 //# sourceMappingURL=utils.js.map

package/src/utils/config/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/config/utils.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAoE;AAEpE,uDAAiC;AACjC,gCAA4C;AAC5C,2CAAqC;AACrC,sCAAiD;AACjD,8BAA+C;AAElC,QAAA,8BAA8B,GAAG,0BAA0B,CAAC;AAEzE;;GAEG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,IAAU,EACkB,EAAE;IAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,sCAA8B,CAAC,EAAE,CAAC;QACjD,0DAA0D;QAC1D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,oEAAoE;IACpE,OAAO,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAE,CAAC;AAC5C,CAAC,CAAC;AATW,QAAA,uBAAuB,2BASlC;AAEF;;GAEG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EAC8B,EAAE;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,sCAA8B,CAAC,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,sCAA8B,EAAE,OAAO,CAAC,CAAC;IACpE,OAAO,MAAM,IAAA,2BAAsB,EAAC,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAC;AARW,QAAA,qBAAqB,yBAQhC;AAEF;;;GAGG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,IAAU,EACV,YAAwC,EACzB,EAAE;IACjB,6BAA6B;IAC7B,IAAA,aAAO,EACL,IAAI,EACJ,sCAA8B,EAC9B,0CAA0C,EAC1C,CAAC,IAAI,EAAE,EAAE;QACP,MAAM,WAAW,GAAG,IAAkC,CAAC;QAEvD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiC,CAAC;QAC/D,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACtC,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAA4B,EAAE,CAAC;QAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,UAAU,CAAC,IAAI,CACb,oBAAO,CAAC,wBAAwB,CAC9B,GAAG,EACH,IAAA,eAAS,EAAC,KAAK,CAAkB,CAClC,CACF,CAAC;QACJ,CAAC;QAED,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACtC,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;oBACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,oBAAO,CAAC,6BAA6B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC,CACF,CAAC;IAEF,2CAA2C;IAC3C,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,sCAA8B,CAAC,CAAC;AACnE,CAAC,CAAC;AA7CW,QAAA,uBAAuB,2BA6ClC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/config/utils.ts"],"names":[],"mappings":"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"}

package/src/utils/connection/open-api/react.js

@@ -100,15 +100,15 @@ const addOpenApiReactClient = async (tree, { apiName, frontendProjectConfig, bac
     // Update main.tsx to add required providers
     const mainTsxPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'main.tsx');
     // Add the query client provider if it doesn't exist already
-    if (!(await (0, ast_1.hasGritQLMatch)(tree, mainTsxPath, '`<QueryClientProvider>$_</QueryClientProvider>`'))) {
+    if (!(await (0, ast_1.matchGritQL)(tree, mainTsxPath, '`<QueryClientProvider>$_</QueryClientProvider>`'))) {
         await (0, ast_1.addSingleImport)(tree, mainTsxPath, 'QueryClientProvider', './components/QueryClientProvider');
-        await (0, ast_1.applyGritQLTransform)(tree, mainTsxPath, '`<App />` => `<QueryClientProvider><App /></QueryClientProvider>`');
+        await (0, ast_1.applyGritQL)(tree, mainTsxPath, '`<App />` => `<QueryClientProvider><App /></QueryClientProvider>`');
     }
     // Add the api provider if it does not exist
     const providerName = `${apiNameClassName}Provider`;
-    if (!(await (0, ast_1.hasGritQLMatch)(tree, mainTsxPath, `\`<${providerName}>$_</${providerName}>\``))) {
+    if (!(await (0, ast_1.matchGritQL)(tree, mainTsxPath, `\`<${providerName}>$_</${providerName}>\``))) {
         await (0, ast_1.addSingleImport)(tree, mainTsxPath, providerName, `./components/${providerName}`);
-        await (0, ast_1.applyGritQLTransform)(tree, mainTsxPath, `\`<App />\` => \`<${providerName}><App /></${providerName}>\``);
+        await (0, ast_1.applyGritQL)(tree, mainTsxPath, `\`<App />\` => \`<${providerName}><App /></${providerName}>\``);
     }
     // Update serve-local on the website to use our local server
     await (0, serve_local_1.addTargetToServeLocal)(tree, frontendProjectConfig.name, backendProjectConfig.name, {

package/src/utils/connection/open-api/react.js.map

@@ -1 +1 @@
-{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/utils/connection/open-api/react.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAQoB;AACpB,uCAAqD;AACrD,yCAA8C;AAC9C,mCAA4C;AAC5C,2GAAwF;AACxF,mCAImB;AACnB,iEAAwE;AACxE,6CAA8C;AAqC9C;;GAEG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,EACE,OAAO,EACP,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,EACnB,IAAI,EACJ,IAAI,GACyB,EAC/B,EAAE;IACF,MAAM,eAAe,GAAG,YAAY,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAS,CAAC;IAChE,MAAM,oBAAoB,GAAG,SAAS,eAAe,EAAE,CAAC;IAExD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9E,MAAM,0BAA0B,GAAG,IAAA,0BAAiB,EAClD,qBAAqB,CAAC,UAAU,EAChC,kBAAkB,CACnB,CAAC;IAEF,4DAA4D;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,qBAAqB,CAAC,IAAI,EAAE;QAC3D,GAAG,qBAAqB;QACxB,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,qBAAqB,CAAC,OAAO;YAChC,oGAAoG;YACpG,GAAG,MAAM,CAAC,WAAW,CACnB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;gBACpC,MAAM;gBACN;oBACE,GAAG,qBAAqB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;oBAC1C,SAAS,EAAE;wBACT,GAAG,CACD,qBAAqB,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,SAAS,IAAI,EAAE,CACzD,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,eAAe,CAAC;wBACtC,eAAe;qBAChB;iBACF;aACF,CAAC,CACH;YACD,CAAC,eAAe,CAAC,EAAE;gBACjB,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,MAAM,EAAE;oBACN;wBACE,yBAAyB,EAAE,WAAW;qBACvC;iBACF;gBACD,OAAO,EAAE;oBACP,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,0BAA0B,CAAC;iBACjE;gBACD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,4DAA4D,QAAQ,mBAAmB,0BAA0B,oBAAoB;qBACtI;iBACF;gBACD,SAAS,EAAE,CAAC,mBAAmB,CAAC;aACjC;YACD,2CAA2C;YAC3C,CAAC,oBAAoB,CAAC,EAAE;gBACtB,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,uBAAuB,gBAAgB,CAAC,IAAI,yCAAyC,qBAAqB,CAAC,IAAI,KAAK,eAAe,GAAG;qBACvI;iBACF;gBACD,UAAU,EAAE,IAAI;aACjB;SACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAC3D,qBAAqB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CACtC,CAAC;IAEF,yCAAyC;IACzC,sFAAsF;IACtF,IAAA,qBAAe,EAAC,IAAI,EAAE,qBAAqB,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC9D,GAAG,QAAQ;QACX,IAAA,0BAAiB,EAAC,cAAc,EAAE,kBAAkB,CAAC;KACtD,CAAC,CAAC;IAEH,2FAA2F;IAC3F,MAAM,IAAA,mBAAsB,EAAC,IAAI,EAAE;QACjC,OAAO,EAAE,qBAAqB,CAAC,IAAI;KACpC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,iCAAiC,CAAC,EAC/D,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5D,EAAE,EACF;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;IACJ,CAAC;IAED,oEAAoE;IACpE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,+CAA+C,CAChD,EACD,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,EACjE,EAAE,EACF;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAE9C,uCAAuC;IACvC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,qBAAqB,CAAC,UAAU,EAChC;QACE,IAAI;QACJ,OAAO;QACP,gBAAgB;QAChB,kBAAkB;KACnB,CACF,CAAC;IAEF,4CAA4C;IAC5C,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,qBAAqB,CAAC,UAAU,EAChC,UAAU,CACX,CAAC;IAEF,4DAA4D;IAC5D,IACE,CAAC,CAAC,MAAM,IAAA,oBAAc,EACpB,IAAI,EACJ,WAAW,EACX,iDAAiD,CAClD,CAAC,EACF,CAAC;QACD,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,qBAAqB,EACrB,kCAAkC,CACnC,CAAC;QACF,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,WAAW,EACX,mEAAmE,CACpE,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,MAAM,YAAY,GAAG,GAAG,gBAAgB,UAAU,CAAC;IACnD,IACE,CAAC,CAAC,MAAM,IAAA,oBAAc,EACpB,IAAI,EACJ,WAAW,EACX,MAAM,YAAY,QAAQ,YAAY,KAAK,CAC5C,CAAC,EACF,CAAC;QACD,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,YAAY,EACZ,gBAAgB,YAAY,EAAE,CAC/B,CAAC;QACF,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,WAAW,EACX,qBAAqB,YAAY,aAAa,YAAY,KAAK,CAChE,CAAC;IACJ,CAAC;IAED,4DAA4D;IAC5D,MAAM,IAAA,mCAAqB,EACzB,IAAI,EACJ,qBAAqB,CAAC,IAAI,EAC1B,oBAAoB,CAAC,IAAI,EACzB;QACE,GAAG,EAAE,oBAAoB,IAAI,GAAG;QAChC,OAAO;QACP,mFAAmF;QACnF,wDAAwD;QACxD,qFAAqF;QACrF,uFAAuF;QACvF,2BAA2B,EAAE,CAAC,eAAe,EAAE,oBAAoB,CAAC;KACrE,CACF,CAAC;IAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;QACX,GAAI,CAAC,IAAI,KAAK,KAAK;YACjB,CAAC,CAAC;gBACE,gBAAgB;gBAChB,oBAAoB;gBACpB,+BAA+B;gBAC/B,WAAW;aACZ;YACH,CAAC,CAAC,EAAE,CAAS;QACf,GAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAS;QAC9D,uBAAuB;QACvB,gCAAgC;KACjC,CAAC,EACF,IAAA,uBAAY,EAAC,CAAC,eAAe,CAAC,CAAC,CAChC,CAAC;AACJ,CAAC,CAAC;AArNW,QAAA,qBAAqB,yBAqNhC"}
+{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/utils/connection/open-api/react.ts"],"names":[],"mappings":"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"}

package/src/utils/generators.d.ts

@@ -0,0 +1,13 @@
+export interface GeneratorInfo {
+    readonly id: string;
+    readonly metric: string;
+    readonly resolvedFactoryPath: string;
+    readonly resolvedSchemaPath: string;
+    readonly hidden?: boolean;
+    readonly description: string;
+    readonly guidePages?: string[];
+}
+/**
+ * Build the list of generator info, resolving schema/factory paths relative to the given base directory.
+ */
+export declare const buildGeneratorInfoList: (baseDir: string) => GeneratorInfo[];

package/src/utils/generators.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildGeneratorInfoList = void 0;
+const tslib_1 = require("tslib");
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const generators_json_1 = tslib_1.__importDefault(require("../../generators.json"));
+const path = tslib_1.__importStar(require("path"));
+/**
+ * Build the list of generator info, resolving schema/factory paths relative to the given base directory.
+ */
+const buildGeneratorInfoList = (baseDir) => Object.entries(generators_json_1.default.generators).map(([id, info]) => ({
+    id,
+    metric: info.metric,
+    resolvedFactoryPath: path.resolve(baseDir, info.factory),
+    resolvedSchemaPath: path.resolve(baseDir, info.schema),
+    description: info.description,
+    ...('hidden' in info && info.hidden ? { hidden: info.hidden } : {}),
+    ...('guidePages' in info && info.guidePages
+        ? { guidePages: info.guidePages }
+        : {}),
+}));
+exports.buildGeneratorInfoList = buildGeneratorInfoList;
+//# sourceMappingURL=generators.js.map

package/src/utils/generators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/generators.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,oFAAmD;AACnD,mDAA6B;AAY7B;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAmB,EAAE,CACzE,MAAM,CAAC,OAAO,CAAE,yBAAsC,CAAC,UAAU,CAAC,CAAC,GAAG,CACpE,CAAC,CAAC,EAAE,EAAE,IAAI,CAAgB,EAAE,EAAE,CAAC,CAAC;IAC9B,EAAE;IACF,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;IACxD,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;IACtD,WAAW,EAAE,IAAI,CAAC,WAAW;IAC7B,GAAG,CAAC,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,GAAG,CAAC,YAAY,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU;QACzC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;QACjC,CAAC,CAAC,EAAE,CAAC;CACR,CAAC,CACH,CAAC;AAbS,QAAA,sBAAsB,0BAa/B"}

package/src/utils/metrics.js

@@ -26,14 +26,14 @@ const addGeneratorMetricsIfApplicable = async (tree, generatorInfo) => {
     // Handle CDK metrics
     if (tree.exists(exports.METRICS_ASPECT_FILE_PATH)) {
         // Update the id
-        await (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const id = $old\` => \`const id = '${exports.METRIC_ID}'\`` +
+        await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const id = $old\` => \`const id = '${exports.METRIC_ID}'\`` +
             ` where { ${WITHIN_METRICS_ASPECT} }`);
         // Update the version
-        await (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const version = $old\` => \`const version = '${(0, nx_1.getPackageVersion)()}'\`` +
+        await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const version = $old\` => \`const version = '${(0, nx_1.getPackageVersion)()}'\`` +
             ` where { ${WITHIN_METRICS_ASPECT} }`);
         // Add each generator as a tag
         for (const info of generatorInfo) {
-            await (0, ast_1.applyGritQLTransform)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const tags: string[] = $old\`` +
+            await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const tags: string[] = $old\`` +
                 ` where { ${WITHIN_METRICS_ASPECT},` +
                 ` if ($old <: \`[]\`) { $old => \`['${info.metric}']\` }` +
                 ` else { $old <: \`[$items]\` where { $items += \`, '${info.metric}'\` } },` +
@@ -52,12 +52,12 @@ exports.addGeneratorMetricsIfApplicable = addGeneratorMetricsIfApplicable;
  */
 const updateTerraformMetrics = async (tree, generatorInfo) => {
     // Update metric_id
-    await (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_id = $old\` => \`metric_id = "${exports.METRIC_ID}"\``);
+    await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_id = $old\` => \`metric_id = "${exports.METRIC_ID}"\``);
     // Update metric_version
-    await (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_version = $old\` => \`metric_version = "${(0, nx_1.getPackageVersion)()}"\``);
+    await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_version = $old\` => \`metric_version = "${(0, nx_1.getPackageVersion)()}"\``);
     // Update metric_tags
     for (const info of generatorInfo) {
-        await (0, ast_1.applyGritQLTransform)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `or { \`metric_tags = []\` => \`metric_tags = ["${info.metric}"]\`,` +
+        await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `or { \`metric_tags = []\` => \`metric_tags = ["${info.metric}"]\`,` +
             ` \`metric_tags = [$items]\` where { $items += \`, "${info.metric}"\` }` +
             ` where { $items <: not contains \`"${info.metric}"\` } }`);
     }

package/src/utils/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,+BAA6C;AAC7C,qCAAgD;AAChD,6BAA0D;AAC1D,+EAIuC;AAEvC,iDAAiD;AACpC,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C,kDAAkD;AACrC,QAAA,wBAAwB,GAAG,IAAA,0BAAiB,EACvD,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,QAAQ,CACT,CAAC;AAEF,qEAAqE;AACxD,QAAA,2BAA2B,GAAG,IAAA,0BAAiB,EAC1D,0CAAY,EACZ,kDAAoB,EACpB,KAAK,EACL,SAAS,EACT,YAAY,CACb,CAAC;AAEF,0EAA0E;AAC1E,MAAM,qBAAqB,GACzB,2DAA2D,CAAC;AAE9D;;;GAGG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,qBAAqB;IACrB,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAwB,CAAC,EAAE,CAAC;QAC1C,gBAAgB;QAChB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,wCAAwC,iBAAS,KAAK;YACpD,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,qBAAqB;QACrB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,kDAAkD,IAAA,sBAAiB,GAAE,KAAK;YACxE,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,8BAA8B;QAC9B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gCAAwB,EACxB,iCAAiC;gBAC/B,YAAY,qBAAqB,GAAG;gBACpC,sCAAsC,IAAI,CAAC,MAAM,QAAQ;gBACzD,uDAAuD,IAAI,CAAC,MAAM,UAAU;gBAC5E,4BAA4B,IAAI,CAAC,MAAM,OAAO,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,gCAAwB,CAAC,CAAC;IAC7D,CAAC;IAED,2BAA2B;IAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,mCAA2B,CAAC,EAAE,CAAC;QAC7C,MAAM,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC;AA1CW,QAAA,+BAA+B,mCA0C1C;AAEF;;GAEG;AACH,MAAM,sBAAsB,GAAG,KAAK,EAClC,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,mBAAmB;IACnB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,0CAA0C,iBAAS,KAAK,CACzD,CAAC;IAEF,wBAAwB;IACxB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,oDAAoD,IAAA,sBAAiB,GAAE,KAAK,CAC7E,CAAC;IAEF,qBAAqB;IACrB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,mCAA2B,EAC3B,kDAAkD,IAAI,CAAC,MAAM,OAAO;YAClE,sDAAsD,IAAI,CAAC,MAAM,OAAO;YACxE,sCAAsC,IAAI,CAAC,MAAM,SAAS,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,+BAAoC;AACpC,qCAAgD;AAChD,6BAA0D;AAC1D,+EAIuC;AAEvC,iDAAiD;AACpC,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C,kDAAkD;AACrC,QAAA,wBAAwB,GAAG,IAAA,0BAAiB,EACvD,0CAAY,EACZ,mDAAqB,EACrB,KAAK,EACL,MAAM,EACN,QAAQ,CACT,CAAC;AAEF,qEAAqE;AACxD,QAAA,2BAA2B,GAAG,IAAA,0BAAiB,EAC1D,0CAAY,EACZ,kDAAoB,EACpB,KAAK,EACL,SAAS,EACT,YAAY,CACb,CAAC;AAEF,0EAA0E;AAC1E,MAAM,qBAAqB,GACzB,2DAA2D,CAAC;AAE9D;;;GAGG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,qBAAqB;IACrB,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAwB,CAAC,EAAE,CAAC;QAC1C,gBAAgB;QAChB,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gCAAwB,EACxB,wCAAwC,iBAAS,KAAK;YACpD,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,qBAAqB;QACrB,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gCAAwB,EACxB,kDAAkD,IAAA,sBAAiB,GAAE,KAAK;YACxE,YAAY,qBAAqB,IAAI,CACxC,CAAC;QAEF,8BAA8B;QAC9B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gCAAwB,EACxB,iCAAiC;gBAC/B,YAAY,qBAAqB,GAAG;gBACpC,sCAAsC,IAAI,CAAC,MAAM,QAAQ;gBACzD,uDAAuD,IAAI,CAAC,MAAM,UAAU;gBAC5E,4BAA4B,IAAI,CAAC,MAAM,OAAO,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,gCAAwB,CAAC,CAAC;IAC7D,CAAC;IAED,2BAA2B;IAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,mCAA2B,CAAC,EAAE,CAAC;QAC7C,MAAM,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC;AA1CW,QAAA,+BAA+B,mCA0C1C;AAEF;;GAEG;AACH,MAAM,sBAAsB,GAAG,KAAK,EAClC,IAAU,EACV,aAAgC,EAChC,EAAE;IACF,mBAAmB;IACnB,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,mCAA2B,EAC3B,0CAA0C,iBAAS,KAAK,CACzD,CAAC;IAEF,wBAAwB;IACxB,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,mCAA2B,EAC3B,oDAAoD,IAAA,sBAAiB,GAAE,KAAK,CAC7E,CAAC;IAEF,qBAAqB;IACrB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,mCAA2B,EAC3B,kDAAkD,IAAI,CAAC,MAAM,OAAO;YAClE,sDAAsD,IAAI,CAAC,MAAM,OAAO;YACxE,sCAAsC,IAAI,CAAC,MAAM,SAAS,CAC7D,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}