@aws/nx-plugin 1.0.0-rc.6 → 1.0.0-rc.61

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

@@ -1,5 +1,102 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`smithyProjectGenerator > shape libraries > should generate a shape library without a service > shapes-build.Dockerfile 1`] = `
+"FROM public.ecr.aws/docker/library/node:24 AS builder
+ENV CI=true
+
+# Output directory
+RUN mkdir /out
+
+# Install Smithy CLI
+# https://smithy.io/2.0/guides/smithy-cli/cli_installation.html
+WORKDIR /smithy
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCH="aarch64"; else ARCH="x86_64"; fi && \\
+    mkdir -p smithy-install/smithy && \\
+    curl -L https://github.com/smithy-lang/smithy/releases/download/1.61.0/smithy-cli-linux-$ARCH.zip -o smithy-install/smithy-cli-linux-$ARCH.zip && \\
+    unzip -qo smithy-install/smithy-cli-linux-$ARCH.zip -d smithy-install && \\
+    mv smithy-install/smithy-cli-linux-$ARCH/* smithy-install/smithy
+RUN smithy-install/smithy/install
+
+# Copy project files
+WORKDIR /project
+COPY smithy-build.json .
+COPY src src
+
+# Validate the model and assemble it into a single JSON model file
+RUN --mount=type=cache,target=/root/.m2/repository,id=maven-cache \\
+    smithy build
+
+# Copy the assembled model to the output location
+RUN mkdir -p /out/model
+RUN cp /project/build/smithy/source/model/model.json /out/model/model.json
+
+# Export the /out directory
+FROM scratch AS export
+COPY --from=builder /out /
+"
+`;
+
+exports[`smithyProjectGenerator > shape libraries > should generate a shape library without a service > shapes-main.smithy 1`] = `
+"$version: "2.0"
+
+namespace proj
+
+/// TODO: define the shapes you would like to share between your Smithy projects
+structure ExampleShape {
+    @required
+    id: String
+
+    description: String
+}
+"
+`;
+
+exports[`smithyProjectGenerator > shape libraries > should generate a shape library without a service > shapes-project.json 1`] = `
+"{
+  "name": "@proj/test-shapes",
+  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "test-shapes/src",
+  "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "smithyType": "shapes",
+    "namespace": "proj"
+  },
+  "targets": {
+    "build": {
+      "dependsOn": ["compile"]
+    },
+    "compile": {
+      "cache": true,
+      "outputs": ["{workspaceRoot}/dist/{projectRoot}/build"],
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "rimraf dist/{projectRoot}/build",
+          "make-dir dist/{projectRoot}/build",
+          "docker build -f {projectRoot}/build.Dockerfile --build-context workspace=. --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
+        ],
+        "parallel": false,
+        "cwd": "{workspaceRoot}"
+      }
+    }
+  }
+}
+"
+`;
+
+exports[`smithyProjectGenerator > shape libraries > should generate a shape library without a service > shapes-smithy-build.json 1`] = `
+"{
+  "version": "1.0",
+  "sources": ["src/"],
+  "maven": {
+    "dependencies": ["software.amazon.smithy:smithy-model:1.61.0"]
+  }
+}
+"
+`;
+
 exports[`smithyProjectGenerator > should generate smithy project with all custom options > all-custom-main.smithy 1`] = `
 "$version: "2.0"
 
@@ -29,6 +126,12 @@ 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",
+    "smithyType": "service",
+    "namespace": "com.mycompany.api",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -41,16 +144,12 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
         "commands": [
           "rimraf dist/{projectRoot}/build",
           "make-dir dist/{projectRoot}/build",
-          "docker build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
+          "docker build -f {projectRoot}/build.Dockerfile --build-context workspace=. --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
         ],
         "parallel": false,
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -62,6 +161,12 @@ 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",
+    "smithyType": "service",
+    "namespace": "proj",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -74,16 +179,12 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
         "commands": [
           "rimraf dist/{projectRoot}/build",
           "make-dir dist/{projectRoot}/build",
-          "docker build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
+          "docker build -f {projectRoot}/build.Dockerfile --build-context workspace=. --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
         ],
         "parallel": false,
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -155,7 +256,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@1.2.2
 
 # Copy project files
 COPY smithy-build.json .
@@ -173,13 +274,11 @@ 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
+    pnpm add -D rolldown-plugin-dts@0.28.0 @rollup/plugin-esm-shim@0.1.8
 
 RUN cat <<EOF > rolldown.config.js
 import { dts } from 'rolldown-plugin-dts';
@@ -225,8 +324,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 +347,7 @@ operation Echo {
     input := {
         @httpQuery("message")
         @required
+        @length(max: 1024)
         message: String
     }
     output := {
@@ -288,6 +387,12 @@ 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",
+    "smithyType": "service",
+    "namespace": "proj",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -300,16 +405,12 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
         "commands": [
           "rimraf dist/{projectRoot}/build",
           "make-dir dist/{projectRoot}/build",
-          "docker build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
+          "docker build -f {projectRoot}/build.Dockerfile --build-context workspace=. --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
         ],
         "parallel": false,
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -350,6 +451,12 @@ 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",
+    "smithyType": "service",
+    "namespace": "proj",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -362,16 +469,12 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
         "commands": [
           "rimraf dist/{projectRoot}/build",
           "make-dir dist/{projectRoot}/build",
-          "docker build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
+          "docker build -f {projectRoot}/build.Dockerfile --build-context workspace=. --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}"
         ],
         "parallel": false,
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -397,7 +500,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@1.2.2
 
 # Copy project files
 COPY smithy-build.json .
@@ -415,13 +518,11 @@ 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
+    pnpm add -D rolldown-plugin-dts@0.28.0 @rollup/plugin-esm-shim@0.1.8
 
 RUN cat <<EOF > rolldown.config.js
 import { dts } from 'rolldown-plugin-dts';
@@ -467,8 +568,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 → service/build.Dockerfile.template}

@@ -17,7 +17,7 @@ RUN smithy-install/smithy/install
 
 # Add node dependencies for bundling
 WORKDIR /project
-RUN npm i -g pnpm@11.1.1 rolldown@1.0.0-beta.38
+RUN npm i -g pnpm@11.1.1 rolldown@<%- rolldownVersion %>
 
 # Copy project files
 COPY smithy-build.json .
@@ -35,13 +35,11 @@ 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
+    pnpm add -D rolldown-plugin-dts@<%- rolldownDtsVersion %> @rollup/plugin-esm-shim@<%- esmShimVersion %>
 
 RUN cat <<EOF > rolldown.config.js
 import { dts } from 'rolldown-plugin-dts';
@@ -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 → service/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/files/shapes/build.Dockerfile.template

@@ -0,0 +1,33 @@
+FROM public.ecr.aws/docker/library/node:24 AS builder
+ENV CI=true
+
+# Output directory
+RUN mkdir /out
+
+# Install Smithy CLI
+# https://smithy.io/2.0/guides/smithy-cli/cli_installation.html
+WORKDIR /smithy
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCH="aarch64"; else ARCH="x86_64"; fi && \
+    mkdir -p smithy-install/smithy && \
+    curl -L https://github.com/smithy-lang/smithy/releases/download/1.61.0/smithy-cli-linux-$ARCH.zip -o smithy-install/smithy-cli-linux-$ARCH.zip && \
+    unzip -qo smithy-install/smithy-cli-linux-$ARCH.zip -d smithy-install && \
+    mv smithy-install/smithy-cli-linux-$ARCH/* smithy-install/smithy
+RUN smithy-install/smithy/install
+
+# Copy project files
+WORKDIR /project
+COPY smithy-build.json .
+COPY src src
+
+# Validate the model and assemble it into a single JSON model file
+RUN --mount=type=cache,target=/root/.m2/repository,id=maven-cache \
+    smithy build
+
+# Copy the assembled model to the output location
+RUN mkdir -p /out/model
+RUN cp /project/build/smithy/source/model/model.json /out/model/model.json
+
+# Export the /out directory
+FROM scratch AS export
+COPY --from=builder /out /

package/src/smithy/project/files/shapes/smithy-build.json.template

@@ -0,0 +1,7 @@
+{
+  "version": "1.0",
+  "sources": ["src/"],
+  "maven": {
+    "dependencies": ["software.amazon.smithy:smithy-model:1.61.0"]
+  }
+}

package/src/smithy/project/files/shapes/src/main.smithy.template

@@ -0,0 +1,11 @@
+$version: "2.0"
+
+namespace <%- namespace %>
+
+/// TODO: define the shapes you would like to share between your Smithy projects
+structure ExampleShape {
+    @required
+    id: String
+
+    description: String
+}

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

@@ -5,6 +5,38 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../utils/nx';
 import type { SmithyProjectGeneratorSchema } from './schema';
+/**
+ * Packages `build.Dockerfile` installs into the build image to bundle the Smithy
+ * SSDK. Pinned in the file body rather than declared in a manifest, so declaring
+ * them here — never installed into the workspace — is what keeps the version sync
+ * moving them forward.
+ */
+export declare const SSDK_BUNDLE_DEPENDENCIES: readonly [{
+    readonly name: "rolldown";
+}, {
+    readonly name: "rolldown-plugin-dts";
+}, {
+    readonly name: "@rollup/plugin-esm-shim";
+}];
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies").DependencyDeclaration<readonly [{
+    readonly name: "ncp";
+}, {
+    readonly name: "rimraf";
+}, {
+    readonly name: "make-dir-cli";
+}, {
+    readonly name: "rolldown";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rolldown-plugin-dts";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@rollup/plugin-esm-shim";
+} & {
+    versionOnly: true;
+}], readonly import("../../utils/declared-dependencies").DeclaredPyDependency<"a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "mcp" | "pip-check-updates" | "pip-licenses" | "ruff" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", Record<string, never>>[]>;
 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,115 @@
-"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 generator_1 = require("../../ts/lib/generator");
-const containers_1 = require("../../utils/containers");
-const format_1 = require("../../utils/format");
-const fs_1 = require("../../utils/fs");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const nx_1 = require("../../utils/nx");
-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, OverwriteStrategy } from "@nx/devkit";
+import { getTsLibDetails } from "../../ts/lib/generator.js";
+import { resolveContainers } from "../../utils/containers.js";
+import { declareDependencies, ownedElsewhere } from "../../utils/declared-dependencies.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FS_DEPENDENCIES, 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";
+import { TS_VERSIONS } from "../../utils/versions.js";
+/**
+ * Packages `build.Dockerfile` installs into the build image to bundle the Smithy
+ * SSDK. Pinned in the file body rather than declared in a manifest, so declaring
+ * them here — never installed into the workspace — is what keeps the version sync
+ * moving them forward.
+ */ export const SSDK_BUNDLE_DEPENDENCIES = [
+    {
+        name: 'rolldown'
+    },
+    {
+        name: 'rolldown-plugin-dts'
+    },
+    {
+        name: '@rollup/plugin-esm-shim'
+    }
+];
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        ...FS_DEPENDENCIES,
+        ...ownedElsewhere(SSDK_BUNDLE_DEPENDENCIES)
+    ]
+});
+export const SMITHY_PROJECT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const smithyProjectGenerator = async (tree, options)=>{
+    const cmd = new FsCommands(tree, DEPENDENCIES);
+    const containers = await resolveContainers(tree, 'inherit');
+    const type = options.type ?? 'service';
     // 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'),
+                            // The workspace build context lets a project's Dockerfile copy in
+                            // the built models of shape libraries it depends on. Commands run
+                            // from the workspace root, so it is the current directory.
+                            `${containers} build -f {projectRoot}/build.Dockerfile --build-context workspace=. --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', type), dir, {
         namespace,
         serviceNameClassName,
         serviceNameKebabCase,
         scope,
+        rolldownVersion: TS_VERSIONS.rolldown,
+        rolldownDtsVersion: TS_VERSIONS['rolldown-plugin-dts'],
+        esmShimVersion: TS_VERSIONS['@rollup/plugin-esm-shim']
+    }, {
+        // Smithy models are user-owned — a re-run must not discard edits
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.SMITHY_PROJECT_GENERATOR_INFO, {
-        apiName: options.name,
+    addGeneratorMetadata(tree, fullyQualifiedName, SMITHY_PROJECT_GENERATOR_INFO, {
+        smithyType: type,
+        namespace,
+        ...type === 'service' ? {
+            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;AACpB,sDAAyD;AACzD,uDAA2D;AAC3D,+CAA0D;AAC1D,uCAA4C;AAC5C,iDAAsE;AACtE,6CAA6D;AAC7D,qDAAoD;AACpD,uCAIwB;AAGX,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  OverwriteStrategy,\n  type Tree,\n} from '@nx/devkit';\nimport { getTsLibDetails } from '../../ts/lib/generator';\nimport { resolveContainers } from '../../utils/containers';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FS_DEPENDENCIES, 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 ITsDepVersion, TS_VERSIONS } from '../../utils/versions';\nimport type { SmithyProjectGeneratorSchema } from './schema';\n\n/**\n * Packages `build.Dockerfile` installs into the build image to bundle the Smithy\n * SSDK. Pinned in the file body rather than declared in a manifest, so declaring\n * them here — never installed into the workspace — is what keeps the version sync\n * moving them forward.\n */\nexport const SSDK_BUNDLE_DEPENDENCIES = [\n  { name: 'rolldown' },\n  { name: 'rolldown-plugin-dts' },\n  { name: '@rollup/plugin-esm-shim' },\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...FS_DEPENDENCIES, ...ownedElsewhere(SSDK_BUNDLE_DEPENDENCIES)],\n});\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, DEPENDENCIES);\n  const containers = await resolveContainers(tree, 'inherit');\n  const type = options.type ?? 'service';\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              // The workspace build context lets a project's Dockerfile copy in\n              // the built models of shape libraries it depends on. Commands run\n              // from the workspace root, so it is the current directory.\n              `${containers} build -f {projectRoot}/build.Dockerfile --build-context workspace=. --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(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', type),\n    dir,\n    {\n      namespace,\n      serviceNameClassName,\n      serviceNameKebabCase,\n      scope,\n      rolldownVersion: TS_VERSIONS.rolldown,\n      rolldownDtsVersion: TS_VERSIONS['rolldown-plugin-dts'],\n      esmShimVersion: TS_VERSIONS['@rollup/plugin-esm-shim'],\n    },\n    {\n      // Smithy models are user-owned — a re-run must not discard edits\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  addGeneratorMetadata(\n    tree,\n    fullyQualifiedName,\n    SMITHY_PROJECT_GENERATOR_INFO,\n    {\n      smithyType: type,\n      namespace,\n      ...(type === 'service' ? { 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","OverwriteStrategy","getTsLibDetails","resolveContainers","declareDependencies","ownedElsewhere","formatFilesInSubtree","FS_DEPENDENCIES","FsCommands","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","getNpmScope","addGeneratorMetadata","getGeneratorInfo","projectExists","TS_VERSIONS","SSDK_BUNDLE_DEPENDENCIES","name","DEPENDENCIES","ts","SMITHY_PROJECT_GENERATOR_INFO","filename","smithyProjectGenerator","tree","options","cmd","containers","type","fullyQualifiedName","dir","root","sourceRoot","projectType","targets","build","dependsOn","compile","cache","outputs","executor","commands","rm","mkdir","parallel","cwd","serviceName","serviceNameClassName","serviceNameKebabCase","scope","namespace","replace","dirname","rolldownVersion","rolldown","rolldownDtsVersion","esmShimVersion","overwriteStrategy","KeepExisting","smithyType","apiName","preferInstallDependencies","languages"],"mappings":"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"}