@aws/nx-plugin 1.0.0-rc.4 → 1.0.0-rc.41

package/{sdk → src/sdk}/utils/format.d.ts

@@ -2,4 +2,4 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-export { formatFilesInSubtree } from '../../src/utils/format';
+export { formatFilesInSubtree } from '../../utils/format';

package/src/sdk/utils/format.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { formatFilesInSubtree } from "../../utils/format.js";
+
+//# sourceMappingURL=format.js.map

package/src/sdk/utils/format.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/sdk/utils/format.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport { formatFilesInSubtree } from '../../utils/format';\n"],"names":["formatFilesInSubtree"],"mappings":"AAAA;;;CAGC,GAED,SAASA,oBAAoB,QAAQ,wBAAqB"}

package/{sdk → src/sdk}/utils/test.d.ts

@@ -2,4 +2,4 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-export { createTreeUsingTsSolutionSetup } from '../../src/utils/test';
+export { createTreeUsingTsSolutionSetup } from '../../utils/test';

package/src/sdk/utils/test.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { createTreeUsingTsSolutionSetup } from "../../utils/test.js";
+
+//# sourceMappingURL=test.js.map

package/src/sdk/utils/test.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/sdk/utils/test.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport { createTreeUsingTsSolutionSetup } from '../../utils/test';\n"],"names":["createTreeUsingTsSolutionSetup"],"mappings":"AAAA;;;CAGC,GAED,SAASA,8BAA8B,QAAQ,sBAAmB"}

package/src/smithy/project/__snapshots__/generator.spec.ts.snap

@@ -29,6 +29,10 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "backend/model/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -47,10 +51,6 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -62,6 +62,10 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apis/test-api/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -80,10 +84,6 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -173,12 +173,10 @@ WORKDIR /project/build/smithy/source/typescript-ssdk-codegen
 
 # Install SSDK dependencies with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \\
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
     pnpm install --prefer-offline
 
 # Install rolldown plugins with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \\
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
     pnpm add -D rolldown-plugin-dts@0.16.5 @rollup/plugin-esm-shim@0.1.8
 
 RUN cat <<EOF > rolldown.config.js
@@ -225,8 +223,7 @@ export default {
 EOF
 
 # Create SSDK bundle with rolldown
-RUN --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
-    rolldown -c
+RUN rolldown -c
 
 RUN mkdir -p /out/ssdk
 RUN cp dist/* /out/ssdk/
@@ -249,6 +246,7 @@ operation Echo {
     input := {
         @httpQuery("message")
         @required
+        @length(max: 1024)
         message: String
     }
     output := {
@@ -288,6 +286,10 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "test-api/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -306,10 +308,6 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -350,6 +348,10 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "services/model/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -368,10 +370,6 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -415,12 +413,10 @@ WORKDIR /project/build/smithy/source/typescript-ssdk-codegen
 
 # Install SSDK dependencies with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \\
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
     pnpm install --prefer-offline
 
 # Install rolldown plugins with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \\
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
     pnpm add -D rolldown-plugin-dts@0.16.5 @rollup/plugin-esm-shim@0.1.8
 
 RUN cat <<EOF > rolldown.config.js
@@ -467,8 +463,7 @@ export default {
 EOF
 
 # Create SSDK bundle with rolldown
-RUN --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \\
-    rolldown -c
+RUN rolldown -c
 
 RUN mkdir -p /out/ssdk
 RUN cp dist/* /out/ssdk/

package/src/smithy/project/files/build.Dockerfile.template

@@ -35,12 +35,10 @@ WORKDIR /project/build/smithy/source/typescript-ssdk-codegen
 
 # Install SSDK dependencies with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \
     pnpm install --prefer-offline
 
 # Install rolldown plugins with pnpm cache mount
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,id=pnpm-store \
-    --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \
     pnpm add -D rolldown-plugin-dts@0.16.5 @rollup/plugin-esm-shim@0.1.8
 
 RUN cat <<EOF > rolldown.config.js
@@ -87,8 +85,7 @@ export default {
 EOF
 
 # Create SSDK bundle with rolldown
-RUN --mount=type=cache,target=/project/build/smithy/source/typescript-ssdk-codegen/node_modules,id=ssdk-node-modules \
-    rolldown -c
+RUN rolldown -c
 
 RUN mkdir -p /out/ssdk
 RUN cp dist/* /out/ssdk/

package/src/smithy/project/files/src/operations/echo.smithy.template

@@ -9,6 +9,7 @@ operation Echo {
     input := {
         @httpQuery("message")
         @required
+        @length(max: 1024)
         message: String
     }
     output := {

package/src/smithy/project/generator.d.ts

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

package/src/smithy/project/generator.js

@@ -1,70 +1,77 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.smithyProjectGenerator = exports.SMITHY_PROJECT_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const format_1 = require("../../utils/format");
-const generator_1 = require("../../ts/lib/generator");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const fs_1 = require("../../utils/fs");
-const containers_1 = require("../../utils/containers");
-exports.SMITHY_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const smithyProjectGenerator = async (tree, options) => {
-    const cmd = new fs_1.FsCommands(tree);
-    const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
+ */ import { addProjectConfiguration, generateFiles, joinPathFragments } from "@nx/devkit";
+import { getTsLibDetails } from "../../ts/lib/generator.js";
+import { resolveContainers } from "../../utils/containers.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FsCommands } from "../../utils/fs.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { toClassName, toKebabCase } from "../../utils/names.js";
+import { getNpmScope } from "../../utils/npm-scope.js";
+import { addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
+export const SMITHY_PROJECT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const smithyProjectGenerator = async (tree, options)=>{
+    const cmd = new FsCommands(tree);
+    const containers = await resolveContainers(tree, 'inherit');
     // Create project.json
-    const { fullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, options);
-    (0, devkit_1.addProjectConfiguration)(tree, fullyQualifiedName, {
-        name: fullyQualifiedName,
-        root: dir,
-        sourceRoot: (0, devkit_1.joinPathFragments)(dir, 'src'),
-        projectType: 'library',
-        targets: {
-            build: {
-                dependsOn: ['compile'],
-            },
-            compile: {
-                cache: true,
-                outputs: ['{workspaceRoot}/dist/{projectRoot}/build'],
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        cmd.rm('dist/{projectRoot}/build'),
-                        cmd.mkdir('dist/{projectRoot}/build'),
-                        `${containers} build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}`,
-                    ],
-                    parallel: false,
-                    cwd: '{workspaceRoot}',
+    const { fullyQualifiedName, dir } = getTsLibDetails(tree, options);
+    if (!projectExists(tree, fullyQualifiedName)) {
+        addProjectConfiguration(tree, fullyQualifiedName, {
+            name: fullyQualifiedName,
+            root: dir,
+            sourceRoot: joinPathFragments(dir, 'src'),
+            projectType: 'library',
+            targets: {
+                build: {
+                    dependsOn: [
+                        'compile'
+                    ]
                 },
-            },
-        },
-    });
+                compile: {
+                    cache: true,
+                    outputs: [
+                        '{workspaceRoot}/dist/{projectRoot}/build'
+                    ],
+                    executor: 'nx:run-commands',
+                    options: {
+                        commands: [
+                            cmd.rm('dist/{projectRoot}/build'),
+                            cmd.mkdir('dist/{projectRoot}/build'),
+                            `${containers} build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}`
+                        ],
+                        parallel: false,
+                        cwd: '{workspaceRoot}'
+                    }
+                }
+            }
+        });
+    }
     const serviceName = options.serviceName ?? options.name;
-    const serviceNameClassName = (0, names_1.toClassName)(serviceName);
-    const serviceNameKebabCase = (0, names_1.toKebabCase)(serviceName);
-    const scope = (0, npm_scope_1.getNpmScope)(tree);
-    const namespace = options.namespace ?? (0, names_1.toKebabCase)(scope).replace(/-/g, '.');
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), dir, {
+    const serviceNameClassName = toClassName(serviceName);
+    const serviceNameKebabCase = toKebabCase(serviceName);
+    const scope = getNpmScope(tree);
+    const namespace = options.namespace ?? toKebabCase(scope).replace(/-/g, '.');
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, {
         namespace,
         serviceNameClassName,
         serviceNameKebabCase,
-        scope,
+        scope
     });
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.SMITHY_PROJECT_GENERATOR_INFO, {
-        apiName: options.name,
+    addGeneratorMetadata(tree, fullyQualifiedName, SMITHY_PROJECT_GENERATOR_INFO, {
+        apiName: options.name
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.SMITHY_PROJECT_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await addGeneratorMetricsIfApplicable(tree, [
+        SMITHY_PROJECT_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.smithyProjectGenerator = smithyProjectGenerator;
-exports.default = exports.smithyProjectGenerator;
+export default smithyProjectGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/smithy/project/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/smithy/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AAEpB,uCAIwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,sDAAyD;AACzD,6CAA6D;AAC7D,qDAAoD;AACpD,uCAA4C;AAC5C,uDAA2D;AAE9C,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,OAAqC,EACT,EAAE;IAC9B,MAAM,GAAG,GAAG,IAAI,eAAU,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAE5D,sBAAsB;IACtB,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnE,IAAA,gCAAuB,EAAC,IAAI,EAAE,kBAAkB,EAAE;QAChD,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,GAAG;QACT,UAAU,EAAE,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC;QACzC,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,CAAC,0CAA0C,CAAC;gBACrD,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;wBAClC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC;wBACrC,GAAG,UAAU,0HAA0H;qBACxI;oBACD,QAAQ,EAAE,KAAK;oBACf,GAAG,EAAE,iBAAiB;iBACvB;aACF;SACF;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACxD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAE7E,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;QAC9D,SAAS;QACT,oBAAoB;QACpB,oBAAoB;QACpB,KAAK;KACN,CAAC,CAAC;IAEH,IAAA,yBAAoB,EAClB,IAAI,EACJ,kBAAkB,EAClB,qCAA6B,EAC7B;QACE,OAAO,EAAE,OAAO,CAAC,IAAI;KACtB,CACF,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AA/DW,QAAA,sBAAsB,0BA+DjC;AAEF,kBAAe,8BAAsB,CAAC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/smithy/project/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addProjectConfiguration,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  type Tree,\n} from '@nx/devkit';\nimport { getTsLibDetails } from '../../ts/lib/generator';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toClassName, toKebabCase } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport type { SmithyProjectGeneratorSchema } from './schema';\n\nexport const SMITHY_PROJECT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const smithyProjectGenerator = async (\n  tree: Tree,\n  options: SmithyProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const cmd = new FsCommands(tree);\n  const containers = await resolveContainers(tree, 'inherit');\n\n  // Create project.json\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, options);\n\n  if (!projectExists(tree, fullyQualifiedName)) {\n    addProjectConfiguration(tree, fullyQualifiedName, {\n      name: fullyQualifiedName,\n      root: dir,\n      sourceRoot: joinPathFragments(dir, 'src'),\n      projectType: 'library',\n      targets: {\n        build: {\n          dependsOn: ['compile'],\n        },\n        compile: {\n          cache: true,\n          outputs: ['{workspaceRoot}/dist/{projectRoot}/build'],\n          executor: 'nx:run-commands',\n          options: {\n            commands: [\n              cmd.rm('dist/{projectRoot}/build'),\n              cmd.mkdir('dist/{projectRoot}/build'),\n              `${containers} build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}`,\n            ],\n            parallel: false,\n            cwd: '{workspaceRoot}',\n          },\n        },\n      },\n    });\n  }\n\n  const serviceName = options.serviceName ?? options.name;\n  const serviceNameClassName = toClassName(serviceName);\n  const serviceNameKebabCase = toKebabCase(serviceName);\n  const scope = getNpmScope(tree);\n  const namespace = options.namespace ?? toKebabCase(scope).replace(/-/g, '.');\n\n  generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, {\n    namespace,\n    serviceNameClassName,\n    serviceNameKebabCase,\n    scope,\n  });\n\n  addGeneratorMetadata(\n    tree,\n    fullyQualifiedName,\n    SMITHY_PROJECT_GENERATOR_INFO,\n    {\n      apiName: options.name,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [SMITHY_PROJECT_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default smithyProjectGenerator;\n"],"names":["addProjectConfiguration","generateFiles","joinPathFragments","getTsLibDetails","resolveContainers","formatFilesInSubtree","FsCommands","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","getNpmScope","addGeneratorMetadata","getGeneratorInfo","projectExists","SMITHY_PROJECT_GENERATOR_INFO","filename","smithyProjectGenerator","tree","options","cmd","containers","fullyQualifiedName","dir","name","root","sourceRoot","projectType","targets","build","dependsOn","compile","cache","outputs","executor","commands","rm","mkdir","parallel","cwd","serviceName","serviceNameClassName","serviceNameKebabCase","scope","namespace","replace","dirname","apiName","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SACEA,uBAAuB,EAEvBC,aAAa,EACbC,iBAAiB,QAEZ,aAAa;AACpB,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,iBAAiB,QAAQ,4BAAyB;AAC3D,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,mBAAmB,QAAQ,yBAAsB;AAC1D,SAASC,+BAA+B,QAAQ,yBAAsB;AACtE,SAASC,WAAW,EAAEC,WAAW,QAAQ,uBAAoB;AAC7D,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SACEC,oBAAoB,EACpBC,gBAAgB,EAEhBC,aAAa,QACR,oBAAiB;AAGxB,OAAO,MAAMC,gCAAiDF,iBAC5D,YAAYG,QAAQ,EACpB;AAEF,OAAO,MAAMC,yBAAyB,OACpCC,MACAC;IAEA,MAAMC,MAAM,IAAId,WAAWY;IAC3B,MAAMG,aAAa,MAAMjB,kBAAkBc,MAAM;IAEjD,sBAAsB;IACtB,MAAM,EAAEI,kBAAkB,EAAEC,GAAG,EAAE,GAAGpB,gBAAgBe,MAAMC;IAE1D,IAAI,CAACL,cAAcI,MAAMI,qBAAqB;QAC5CtB,wBAAwBkB,MAAMI,oBAAoB;YAChDE,MAAMF;YACNG,MAAMF;YACNG,YAAYxB,kBAAkBqB,KAAK;YACnCI,aAAa;YACbC,SAAS;gBACPC,OAAO;oBACLC,WAAW;wBAAC;qBAAU;gBACxB;gBACAC,SAAS;oBACPC,OAAO;oBACPC,SAAS;wBAAC;qBAA2C;oBACrDC,UAAU;oBACVf,SAAS;wBACPgB,UAAU;4BACRf,IAAIgB,EAAE,CAAC;4BACPhB,IAAIiB,KAAK,CAAC;4BACV,GAAGhB,WAAW,wHAAwH,CAAC;yBACxI;wBACDiB,UAAU;wBACVC,KAAK;oBACP;gBACF;YACF;QACF;IACF;IAEA,MAAMC,cAAcrB,QAAQqB,WAAW,IAAIrB,QAAQK,IAAI;IACvD,MAAMiB,uBAAuBhC,YAAY+B;IACzC,MAAME,uBAAuBhC,YAAY8B;IACzC,MAAMG,QAAQhC,YAAYO;IAC1B,MAAM0B,YAAYzB,QAAQyB,SAAS,IAAIlC,YAAYiC,OAAOE,OAAO,CAAC,MAAM;IAExE5C,cAAciB,MAAMhB,kBAAkB,YAAY4C,OAAO,EAAE,UAAUvB,KAAK;QACxEqB;QACAH;QACAC;QACAC;IACF;IAEA/B,qBACEM,MACAI,oBACAP,+BACA;QACEgC,SAAS5B,QAAQK,IAAI;IACvB;IAGF,MAAMhB,gCAAgCU,MAAM;QAACH;KAA8B;IAE3E,MAAMV,qBAAqBa;IAC3B,OAAO,IACLX,oBAAoBW,MAAMC,QAAQ6B,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAehC,uBAAuB"}

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/smithy/project/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface SmithyProjectGeneratorSchema {\n  name: string;\n  serviceName?: string;\n  namespace?: string;\n  directory?: string;\n  subDirectory?: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAOC"}

package/src/smithy/project/schema.d.ts

@@ -8,4 +8,5 @@ export interface SmithyProjectGeneratorSchema {
   namespace?: string;
   directory?: string;
   subDirectory?: string;
+  preferInstallDependencies?: boolean;
 }

package/src/smithy/project/schema.json

@@ -36,6 +36,11 @@
       "type": "string",
       "description": "The sub directory the Smithy project is placed in. By default this is the project name.",
       "x-prompt": "Which sub directory do you want to create the Smithy project in? (By default this is the project name)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"]

package/src/smithy/react-connection/__snapshots__/generator.spec.ts.snap

@@ -105,7 +105,7 @@ const useCreateTestApiClient = (): TestApi => {
   const user = auth?.user;
   const cognitoClient: typeof fetch = (url, init) => {
     const headers = new Headers(init?.headers);
-    headers.set('Authorization', \`Bearer \${user?.id_token}\`);
+    headers.set('Authorization', \`Bearer \${user?.access_token}\`);
     return fetch(url, { ...init, headers });
   };
   return useMemo(

package/src/smithy/react-connection/generator.d.ts

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

package/src/smithy/react-connection/generator.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.smithyReactConnectionGenerator = exports.SMITHY_REACT_CONNECTION_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const format_1 = require("../../utils/format");
-const generator_1 = require("../project/generator");
-const generator_2 = require("../ts/api/generator");
-const react_1 = require("../../utils/connection/open-api/react");
-exports.SMITHY_REACT_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const smithyReactConnectionGenerator = async (tree, options) => {
-    const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
-    const targetConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.smithyModelOrBackendProjectName);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { addOpenApiReactClient } from "../../utils/connection/open-api/react.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { SMITHY_PROJECT_GENERATOR_INFO } from "../project/generator.js";
+import { TS_SMITHY_API_GENERATOR_INFO } from "../ts/api/generator.js";
+export const SMITHY_REACT_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const smithyReactConnectionGenerator = async (tree, options)=>{
+    const frontendProjectConfig = readProjectConfigurationUnqualified(tree, options.frontendProjectName);
+    const targetConfig = readProjectConfigurationUnqualified(tree, options.smithyModelOrBackendProjectName);
     // Target could either be the model or backend project
     const { modelProjectConfig, backendProjectConfig } = resolveProjectConfig(tree, targetConfig);
     const backendMetadata = backendProjectConfig.metadata;
@@ -24,74 +21,69 @@ const smithyReactConnectionGenerator = async (tree, options) => {
     const port = backendMetadata?.port ?? backendMetadata?.ports?.[0] ?? 3001;
     const namespace = inferNamespace(tree, modelProjectConfig);
     // Add extensions.smithy for customising the client
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'model'), modelProjectConfig.sourceRoot, {
-        namespace,
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'model'), modelProjectConfig.sourceRoot, {
+        namespace
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
-    await (0, react_1.addOpenApiReactClient)(tree, {
+    await addOpenApiReactClient(tree, {
         apiName,
         frontendProjectConfig,
         backendProjectConfig,
         specBuildProject: modelProjectConfig,
-        specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
+        specPath: joinPathFragments('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
         specBuildTargetName: `${modelProjectConfig.name}:build`,
         auth,
-        port,
+        port
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
-        exports.SMITHY_REACT_CONNECTION_GENERATOR_INFO,
+    await addGeneratorMetricsIfApplicable(tree, [
+        SMITHY_REACT_CONNECTION_GENERATOR_INFO
     ]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.smithyReactConnectionGenerator = smithyReactConnectionGenerator;
-const resolveProjectConfig = (tree, modelOrBackendConfig) => {
-    if ((modelOrBackendConfig.metadata ?? {}).generator ===
-        generator_1.SMITHY_PROJECT_GENERATOR_INFO.id) {
+const resolveProjectConfig = (tree, modelOrBackendConfig)=>{
+    if ((modelOrBackendConfig.metadata ?? {}).generator === SMITHY_PROJECT_GENERATOR_INFO.id) {
         // It's the model project
-        const backendProjectName = (modelOrBackendConfig.metadata ?? {})
-            .backendProject;
+        const backendProjectName = (modelOrBackendConfig.metadata ?? {}).backendProject;
         if (!backendProjectName) {
             throw new Error(`Could not find associated backend for Smithy model project ${modelOrBackendConfig.name}`);
         }
         return {
             modelProjectConfig: modelOrBackendConfig,
-            backendProjectConfig: (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName),
+            backendProjectConfig: readProjectConfigurationUnqualified(tree, backendProjectName)
         };
-    }
-    else if ((modelOrBackendConfig.metadata ?? {}).generator ===
-        generator_2.TS_SMITHY_API_GENERATOR_INFO.id) {
+    } else if ((modelOrBackendConfig.metadata ?? {}).generator === TS_SMITHY_API_GENERATOR_INFO.id) {
         // It's the backend project
-        const modelProjectName = (modelOrBackendConfig.metadata ?? {})
-            .modelProject;
+        const modelProjectName = (modelOrBackendConfig.metadata ?? {}).modelProject;
         if (!modelProjectName) {
             throw new Error(`Could not find associated model for Smithy backend project ${modelOrBackendConfig.name}`);
         }
         return {
-            modelProjectConfig: (0, nx_1.readProjectConfigurationUnqualified)(tree, (modelOrBackendConfig.metadata ?? {}).modelProject),
-            backendProjectConfig: modelOrBackendConfig,
+            modelProjectConfig: readProjectConfigurationUnqualified(tree, (modelOrBackendConfig.metadata ?? {}).modelProject),
+            backendProjectConfig: modelOrBackendConfig
         };
     }
     throw new Error(`Unsupported connection target ${modelOrBackendConfig.name}. Expected a Smithy model or backend project.`);
 };
 /**
  * Get the namespace from a model project
- */
-const inferNamespace = (tree, modelProject) => {
-    const smithyBuildJsonPath = (0, devkit_1.joinPathFragments)(modelProject.root, 'smithy-build.json');
+ */ const inferNamespace = (tree, modelProject)=>{
+    const smithyBuildJsonPath = joinPathFragments(modelProject.root, 'smithy-build.json');
     if (!tree.exists(smithyBuildJsonPath)) {
         throw new Error(`No smithy-build.json file found for model project ${modelProject.name}`);
     }
     try {
         const smithyBuild = JSON.parse(tree.read(smithyBuildJsonPath, 'utf-8'));
         return smithyBuild.plugins.openapi.service.split('#')[0];
-    }
-    catch {
+    } catch  {
         throw new Error(`Unable to determine namespace from ${smithyBuildJsonPath}. Expected plugins.openapi.service to be defined.`);
     }
 };
-exports.default = exports.smithyReactConnectionGenerator;
+export default smithyReactConnectionGenerator;
+
 //# sourceMappingURL=generator.js.map