@aws/nx-plugin 1.0.0-rc.8 → 1.0.0-rc.80

package/src/smithy/project/files/ssdk-bundle/ssdk.rolldown.config.mjs.template

@@ -0,0 +1,52 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { dts } from 'rolldown-plugin-dts';
+
+// The Smithy CLI generates the Server SDK under dist, along with its own
+// dependencies, so paths are resolved from there rather than this project. The
+// compile target runs from the workspace root, so these resolve there.
+const ssdkDir = path.resolve(
+  'dist',
+  '<%- projectRoot %>',
+  'smithy/source/typescript-ssdk-codegen',
+);
+
+// Embed the re2 wasm binary in its emscripten glue module (`Module.wasmBinary`),
+// so the bundle stays a single self-contained file. `__dirname` is what the
+// glue's on-disk fallback would read, which an ES module doesn't define.
+const inlineRe2Wasm = () => ({
+  name: 'inline-re2-wasm',
+  load: (id) => {
+    if (!/re2-wasm.*[\\/]wasm[\\/]re2\.js$/.test(id)) return null;
+    const wasm = fs.readFileSync(path.join(path.dirname(id), 're2.wasm'));
+    return `var __dirname = '';\nvar Module = { wasmBinary: Buffer.from("${wasm.toString('base64')}", "base64") };\n${fs.readFileSync(id, 'utf8')}`;
+  },
+});
+
+// Drop any import whose specifier resolves to the importing module itself. A
+// module cannot import its own exports — the Smithy CLI's Windows codegen writes
+// exactly that, which the bundler rejects as an assignment to an import.
+const dropSelfImports = () => ({
+  name: 'drop-self-imports',
+  transform: (code, id) => ({
+    code: code.replace(
+      /^import\s+[^;]*?\s+from\s+["'](\.[^"']*)["'];?\s*$/gm,
+      (line, specifier) =>
+        path.resolve(path.dirname(id), specifier) === id.replace(/\.[cm]?tsx?$/, '')
+          ? ''
+          : line,
+    ),
+    map: null,
+  }),
+});
+
+const outDir = path.resolve('dist', '<%- projectRoot %>', 'build/ssdk');
+
+// Bundle from the generated TypeScript sources, emitting the module and its
+// declarations in one pass.
+export default {
+  input: path.join(ssdkDir, 'src/index.ts'),
+  plugins: [dropSelfImports(), inlineRe2Wasm(), dts({ resolve: true })],
+  output: [{ dir: outDir, format: 'es' }],
+  platform: 'node',
+};

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

@@ -3,8 +3,98 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
-import { type NxGeneratorInfo } from '../../utils/nx';
+import { FsCommands } from '../../utils/fs.js';
+import { type NxGeneratorInfo } from '../../utils/nx.js';
 import type { SmithyProjectGeneratorSchema } from './schema';
+/** The metadata this generator records, which its predicates read. */
+export interface SmithyProjectMetadata {
+    readonly smithyType: NonNullable<SmithyProjectGeneratorSchema['type']>;
+    readonly namespace: string;
+}
+/**
+ * Everything a Smithy build runs, all of it workspace tooling in the root
+ * manifest rather than anything the model itself imports.
+ *
+ * Neither the Smithy CLI nor `mise` is among them: the compile target fetches mise
+ * with `npx` and mise resolves the CLI, so neither is a workspace dependency — see
+ * `utils/smithy.ts`.
+ */
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies.js").DependencyDeclaration<readonly [{
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "cpy-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rolldown";
+    readonly dev: true;
+    readonly root: true;
+    readonly when: (metadata: SmithyProjectMetadata) => boolean;
+}, {
+    readonly name: "rolldown-plugin-dts";
+    readonly dev: true;
+    readonly root: true;
+    readonly when: (metadata: SmithyProjectMetadata) => boolean;
+}, {
+    readonly name: "typescript";
+    readonly dev: true;
+    readonly root: true;
+    readonly when: (metadata: SmithyProjectMetadata) => boolean;
+}], readonly import("../../utils/declared-dependencies.js").DeclaredPyDependency<"a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aiosqlite" | "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" | "langgraph-checkpoint-aws" | "langgraph-checkpoint-sqlite" | "mcp" | "pip-check-updates" | "pip-licenses" | "ruff" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", SmithyProjectMetadata>[]>;
 export declare const SMITHY_PROJECT_GENERATOR_INFO: NxGeneratorInfo;
+/**
+ * The commands that build a Smithy project's model, run from the workspace root.
+ *
+ * This is the whole of a shape library's build. A service's Server SDK is built
+ * separately by {@link smithyGenerateSsdkCommands}, from the codegen output this
+ * leaves under {@link SMITHY_OUT_DIR}.
+ */
+export declare const smithyCompileCommands: (cmd: FsCommands<typeof DEPENDENCIES>, type: SmithyProjectGeneratorSchema["type"]) => string[];
+/**
+ * The commands that turn a service's generated TypeScript Server SDK into the
+ * single module its consumer imports, run from the workspace root.
+ *
+ * Only a service has one, and it reads what the model build left behind, so this
+ * runs after `compile`.
+ */
+export declare const smithyGenerateSsdkCommands: () => string[];
+/**
+ * What the model build publishes, listed per artifact rather than as the whole
+ * `build` directory: a service's `generate-ssdk` writes into that directory too, and
+ * restoring `compile` from cache would otherwise discard the Server SDK beside it.
+ */
+export declare const smithyCompileOutputs: (type: SmithyProjectGeneratorSchema["type"]) => string[];
+/**
+ * The target that builds a service's Server SDK, shared with the migration moving
+ * an existing project onto it.
+ */
+export declare const smithyGenerateSsdkTarget: () => {
+    cache: boolean;
+    outputs: string[];
+    executor: string;
+    dependsOn: string[];
+    options: {
+        commands: string[];
+        parallel: boolean;
+        cwd: string;
+    };
+};
+/**
+ * Write the rolldown config that bundles a service's generated Server SDK.
+ *
+ * Shared with the migration moving an existing project off the container build,
+ * so a migrated project's config cannot drift from a freshly generated one.
+ */
+export declare const writeSsdkBundleConfig: (tree: Tree, projectRoot: string) => void;
 export declare const smithyProjectGenerator: (tree: Tree, options: SmithyProjectGeneratorSchema) => Promise<GeneratorCallback>;
 export default smithyProjectGenerator;

package/src/smithy/project/generator.js

@@ -1,70 +1,237 @@
-"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');
-    // 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}',
-                },
-            },
+ */ import { addProjectConfiguration, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { getTsLibDetails } from "../../ts/lib/generator.js";
+import { addTsDependencies } from "../../utils/add-dependencies.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 { getRelativePathToRootByDirectory } from "../../utils/paths.js";
+import { smithyCliCommand, smithyMavenVersions, warnIfSmithyMissing } from "../../utils/smithy.js";
+/**
+ * Only a service project generates a Server SDK, so only a service needs the
+ * bundler that turns it into the single module its backend imports. A shape
+ * library assembles a model and stops.
+ */ const isService = (metadata)=>metadata.smithyType === 'service';
+/**
+ * Everything a Smithy build runs, all of it workspace tooling in the root
+ * manifest rather than anything the model itself imports.
+ *
+ * Neither the Smithy CLI nor `mise` is among them: the compile target fetches mise
+ * with `npx` and mise resolves the CLI, so neither is a workspace dependency — see
+ * `utils/smithy.ts`.
+ */ export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        // Added to the root by `FsCommands` as it builds each command.
+        ...ownedElsewhere(FS_DEPENDENCIES),
+        {
+            name: 'rolldown',
+            dev: true,
+            root: true,
+            when: isService
+        },
+        {
+            name: 'rolldown-plugin-dts',
+            dev: true,
+            root: true,
+            when: isService
         },
+        // Resolved by `rolldown-plugin-dts` to emit the bundled declaration.
+        {
+            name: 'typescript',
+            dev: true,
+            root: true,
+            when: isService
+        }
+    ]
+});
+export const SMITHY_PROJECT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+/**
+ * Where the Smithy CLI writes its artifacts, and where the build publishes the
+ * ones consumers read. Both sit under `dist` so a build writes nothing into the
+ * project, keeping the source tree clean and the target's outputs cacheable.
+ *
+ * The CLI's own output is kept beside the published tree rather than inside it:
+ * it holds the generated SSDK package and its installed `node_modules`, which
+ * must not be mistaken for a build artifact.
+ */ const SMITHY_OUT_DIR = 'dist/{projectRoot}/smithy';
+const BUILD_DIR = 'dist/{projectRoot}/build';
+/** The projection every generated `smithy-build.json` builds. */ const SOURCE_PROJECTION = `${SMITHY_OUT_DIR}/source`;
+/** Where the generated TypeScript Server SDK lands before it is bundled. */ const SSDK_CODEGEN_DIR = `${SOURCE_PROJECTION}/typescript-ssdk-codegen`;
+/**
+ * The commands that build a Smithy project's model, run from the workspace root.
+ *
+ * This is the whole of a shape library's build. A service's Server SDK is built
+ * separately by {@link smithyGenerateSsdkCommands}, from the codegen output this
+ * leaves under {@link SMITHY_OUT_DIR}.
+ */ export const smithyCompileCommands = (cmd, type)=>[
+        cmd.rm(BUILD_DIR),
+        cmd.rm(SMITHY_OUT_DIR),
+        cmd.mkdir(BUILD_DIR),
+        // `imports` in smithy-build.json resolve relative to that file, so a shape
+        // library is referenced by its path from the consuming project.
+        `${smithyCliCommand()} build -c {projectRoot}/smithy-build.json --output ${SMITHY_OUT_DIR}`,
+        ...type === 'shapes' ? [
+            cmd.cp(`${SOURCE_PROJECTION}/model/model.json`, `${BUILD_DIR}/model.json`)
+        ] : [
+            // Named after the service shape by the OpenAPI plugin, so it is matched
+            // rather than named, and published under a stable name.
+            cmd.cpGlobToFile(`${SOURCE_PROJECTION}/openapi/*.openapi.json`, `${BUILD_DIR}/openapi`, 'openapi.json')
+        ]
+    ];
+/**
+ * The commands that turn a service's generated TypeScript Server SDK into the
+ * single module its consumer imports, run from the workspace root.
+ *
+ * Only a service has one, and it reads what the model build left behind, so this
+ * runs after `compile`.
+ */ export const smithyGenerateSsdkCommands = ()=>[
+        // `npm` regardless of the workspace's package manager: this installs a generated
+        // package under `dist` that is not a workspace member, and npm ships with Node so
+        // it is always present. It reads the user's `.npmrc`, so a private registry still
+        // applies. `--include=dev` because the bundler resolves types from the generated
+        // package's devDependencies, which `NODE_ENV=production` would otherwise omit.
+        `npm install --prefix ${SSDK_CODEGEN_DIR} --include=dev --ignore-scripts --no-audit --no-fund`,
+        // Bundled straight from the generated TypeScript sources, emitting the module and
+        // its declarations together — see ssdk.rolldown.config.mjs for why the sources
+        // rather than a `tsc` pre-pass.
+        `rolldown -c {projectRoot}/ssdk.rolldown.config.mjs`
+    ];
+/**
+ * What the model build publishes, listed per artifact rather than as the whole
+ * `build` directory: a service's `generate-ssdk` writes into that directory too, and
+ * restoring `compile` from cache would otherwise discard the Server SDK beside it.
+ */ export const smithyCompileOutputs = (type)=>[
+        `{workspaceRoot}/${SMITHY_OUT_DIR}`,
+        type === 'shapes' ? `{workspaceRoot}/${BUILD_DIR}/model.json` : `{workspaceRoot}/${BUILD_DIR}/openapi`
+    ];
+/**
+ * The target that builds a service's Server SDK, shared with the migration moving
+ * an existing project onto it.
+ */ export const smithyGenerateSsdkTarget = ()=>({
+        cache: true,
+        outputs: [
+            `{workspaceRoot}/${BUILD_DIR}/ssdk`
+        ],
+        executor: 'nx:run-commands',
+        dependsOn: [
+            'compile'
+        ],
+        options: {
+            commands: smithyGenerateSsdkCommands(),
+            parallel: false,
+            cwd: '{workspaceRoot}'
+        }
+    });
+/**
+ * Write the rolldown config that bundles a service's generated Server SDK.
+ *
+ * Shared with the migration moving an existing project off the container build,
+ * so a migrated project's config cannot drift from a freshly generated one.
+ */ export const writeSsdkBundleConfig = (tree, projectRoot)=>generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'ssdk-bundle'), projectRoot, // The config's paths are workspace-root relative, so it needs only the
+    // project's root — the compile target runs from the workspace root.
+    {
+        projectRoot
+    }, // Generated configuration rather than anything the user edits, so a re-run
+    // refreshes it — unlike the models beside it.
+    {
+        overwriteStrategy: OverwriteStrategy.Overwrite
     });
+export const smithyProjectGenerator = async (tree, options)=>{
+    const cmd = new FsCommands(tree, DEPENDENCIES);
+    const type = options.type ?? 'service';
+    // Create project.json
+    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: type === 'shapes' ? [
+                        'compile'
+                    ] : [
+                        'compile',
+                        'generate-ssdk'
+                    ]
+                },
+                compile: {
+                    cache: true,
+                    outputs: smithyCompileOutputs(type),
+                    executor: 'nx:run-commands',
+                    options: {
+                        commands: smithyCompileCommands(cmd, type),
+                        parallel: false,
+                        cwd: '{workspaceRoot}'
+                    }
+                },
+                // Only a service generates a Server SDK, and it is built from what the
+                // model build leaves behind.
+                ...type === 'shapes' ? {} : {
+                    'generate-ssdk': smithyGenerateSsdkTarget()
+                }
+            }
+        });
+    }
     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,
+        projectRoot: dir,
+        relativePathToWorkspaceRoot: getRelativePathToRootByDirectory(dir),
+        ...smithyMavenVersions()
+    }, {
+        // 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,
-    });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.SMITHY_PROJECT_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
+    if (type === 'service') {
+        writeSsdkBundleConfig(tree, dir);
+    }
+    // Recorded here and read by the declaration's predicates, so the packages
+    // added below are exactly the ones the version sync will own.
+    const metadata = {
+        smithyType: type,
+        namespace
     };
+    addGeneratorMetadata(tree, fullyQualifiedName, SMITHY_PROJECT_GENERATOR_INFO, {
+        ...metadata,
+        ...type === 'service' ? {
+            apiName: options.name
+        } : {}
+    });
+    // No projectRoot: a Smithy model project has no manifest of its own, and every
+    // dependency here is workspace tooling the build runs rather than anything the
+    // model imports.
+    addTsDependencies(tree, DEPENDENCIES, {
+        metadata
+    });
+    await addGeneratorMetricsIfApplicable(tree, [
+        SMITHY_PROJECT_GENERATOR_INFO
+    ]);
+    // On Windows the build runs the Smithy CLI from the PATH rather than through
+    // mise, so flag a missing prerequisite while the project is still being set up.
+    warnIfSmithyMissing();
+    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.js';\nimport { addTsDependencies } from '../../utils/add-dependencies.js';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { FS_DEPENDENCIES, FsCommands } from '../../utils/fs.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { toClassName, toKebabCase } from '../../utils/names.js';\nimport { getNpmScope } from '../../utils/npm-scope.js';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx.js';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths.js';\nimport {\n  smithyCliCommand,\n  smithyMavenVersions,\n  warnIfSmithyMissing,\n} from '../../utils/smithy.js';\nimport type { SmithyProjectGeneratorSchema } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface SmithyProjectMetadata {\n  readonly smithyType: NonNullable<SmithyProjectGeneratorSchema['type']>;\n  readonly namespace: string;\n}\n\n/**\n * Only a service project generates a Server SDK, so only a service needs the\n * bundler that turns it into the single module its backend imports. A shape\n * library assembles a model and stops.\n */\nconst isService = (metadata: SmithyProjectMetadata) =>\n  metadata.smithyType === 'service';\n\n/**\n * Everything a Smithy build runs, all of it workspace tooling in the root\n * manifest rather than anything the model itself imports.\n *\n * Neither the Smithy CLI nor `mise` is among them: the compile target fetches mise\n * with `npx` and mise resolves the CLI, so neither is a workspace dependency — see\n * `utils/smithy.ts`.\n */\nexport const DEPENDENCIES = declareDependencies<SmithyProjectMetadata>()({\n  ts: [\n    // Added to the root by `FsCommands` as it builds each command.\n    ...ownedElsewhere(FS_DEPENDENCIES),\n    { name: 'rolldown', dev: true, root: true, when: isService },\n    { name: 'rolldown-plugin-dts', dev: true, root: true, when: isService },\n    // Resolved by `rolldown-plugin-dts` to emit the bundled declaration.\n    { name: 'typescript', dev: true, root: true, when: isService },\n  ],\n});\n\nexport const SMITHY_PROJECT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Where the Smithy CLI writes its artifacts, and where the build publishes the\n * ones consumers read. Both sit under `dist` so a build writes nothing into the\n * project, keeping the source tree clean and the target's outputs cacheable.\n *\n * The CLI's own output is kept beside the published tree rather than inside it:\n * it holds the generated SSDK package and its installed `node_modules`, which\n * must not be mistaken for a build artifact.\n */\nconst SMITHY_OUT_DIR = 'dist/{projectRoot}/smithy';\nconst BUILD_DIR = 'dist/{projectRoot}/build';\n\n/** The projection every generated `smithy-build.json` builds. */\nconst SOURCE_PROJECTION = `${SMITHY_OUT_DIR}/source`;\n\n/** Where the generated TypeScript Server SDK lands before it is bundled. */\nconst SSDK_CODEGEN_DIR = `${SOURCE_PROJECTION}/typescript-ssdk-codegen`;\n\n/**\n * The commands that build a Smithy project's model, run from the workspace root.\n *\n * This is the whole of a shape library's build. A service's Server SDK is built\n * separately by {@link smithyGenerateSsdkCommands}, from the codegen output this\n * leaves under {@link SMITHY_OUT_DIR}.\n */\nexport const smithyCompileCommands = (\n  cmd: FsCommands<typeof DEPENDENCIES>,\n  type: SmithyProjectGeneratorSchema['type'],\n): string[] => [\n  cmd.rm(BUILD_DIR),\n  cmd.rm(SMITHY_OUT_DIR),\n  cmd.mkdir(BUILD_DIR),\n  // `imports` in smithy-build.json resolve relative to that file, so a shape\n  // library is referenced by its path from the consuming project.\n  `${smithyCliCommand()} build -c {projectRoot}/smithy-build.json --output ${SMITHY_OUT_DIR}`,\n  ...(type === 'shapes'\n    ? [\n        cmd.cp(\n          `${SOURCE_PROJECTION}/model/model.json`,\n          `${BUILD_DIR}/model.json`,\n        ),\n      ]\n    : [\n        // Named after the service shape by the OpenAPI plugin, so it is matched\n        // rather than named, and published under a stable name.\n        cmd.cpGlobToFile(\n          `${SOURCE_PROJECTION}/openapi/*.openapi.json`,\n          `${BUILD_DIR}/openapi`,\n          'openapi.json',\n        ),\n      ]),\n];\n\n/**\n * The commands that turn a service's generated TypeScript Server SDK into the\n * single module its consumer imports, run from the workspace root.\n *\n * Only a service has one, and it reads what the model build left behind, so this\n * runs after `compile`.\n */\nexport const smithyGenerateSsdkCommands = (): string[] => [\n  // `npm` regardless of the workspace's package manager: this installs a generated\n  // package under `dist` that is not a workspace member, and npm ships with Node so\n  // it is always present. It reads the user's `.npmrc`, so a private registry still\n  // applies. `--include=dev` because the bundler resolves types from the generated\n  // package's devDependencies, which `NODE_ENV=production` would otherwise omit.\n  `npm install --prefix ${SSDK_CODEGEN_DIR} --include=dev --ignore-scripts --no-audit --no-fund`,\n  // Bundled straight from the generated TypeScript sources, emitting the module and\n  // its declarations together — see ssdk.rolldown.config.mjs for why the sources\n  // rather than a `tsc` pre-pass.\n  `rolldown -c {projectRoot}/ssdk.rolldown.config.mjs`,\n];\n\n/**\n * What the model build publishes, listed per artifact rather than as the whole\n * `build` directory: a service's `generate-ssdk` writes into that directory too, and\n * restoring `compile` from cache would otherwise discard the Server SDK beside it.\n */\nexport const smithyCompileOutputs = (\n  type: SmithyProjectGeneratorSchema['type'],\n): string[] => [\n  `{workspaceRoot}/${SMITHY_OUT_DIR}`,\n  type === 'shapes'\n    ? `{workspaceRoot}/${BUILD_DIR}/model.json`\n    : `{workspaceRoot}/${BUILD_DIR}/openapi`,\n];\n\n/**\n * The target that builds a service's Server SDK, shared with the migration moving\n * an existing project onto it.\n */\nexport const smithyGenerateSsdkTarget = () => ({\n  cache: true,\n  outputs: [`{workspaceRoot}/${BUILD_DIR}/ssdk`],\n  executor: 'nx:run-commands',\n  dependsOn: ['compile'],\n  options: {\n    commands: smithyGenerateSsdkCommands(),\n    parallel: false,\n    cwd: '{workspaceRoot}',\n  },\n});\n\n/**\n * Write the rolldown config that bundles a service's generated Server SDK.\n *\n * Shared with the migration moving an existing project off the container build,\n * so a migrated project's config cannot drift from a freshly generated one.\n */\nexport const writeSsdkBundleConfig = (tree: Tree, projectRoot: string): void =>\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'ssdk-bundle'),\n    projectRoot,\n    // The config's paths are workspace-root relative, so it needs only the\n    // project's root — the compile target runs from the workspace root.\n    { projectRoot },\n    // Generated configuration rather than anything the user edits, so a re-run\n    // refreshes it — unlike the models beside it.\n    { overwriteStrategy: OverwriteStrategy.Overwrite },\n  );\n\nexport const smithyProjectGenerator = async (\n  tree: Tree,\n  options: SmithyProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const cmd = new FsCommands(tree, DEPENDENCIES);\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:\n            type === 'shapes' ? ['compile'] : ['compile', 'generate-ssdk'],\n        },\n        compile: {\n          cache: true,\n          outputs: smithyCompileOutputs(type),\n          executor: 'nx:run-commands',\n          options: {\n            commands: smithyCompileCommands(cmd, type),\n            parallel: false,\n            cwd: '{workspaceRoot}',\n          },\n        },\n        // Only a service generates a Server SDK, and it is built from what the\n        // model build leaves behind.\n        ...(type === 'shapes'\n          ? {}\n          : { 'generate-ssdk': smithyGenerateSsdkTarget() }),\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      projectRoot: dir,\n      relativePathToWorkspaceRoot: getRelativePathToRootByDirectory(dir),\n      ...smithyMavenVersions(),\n    },\n    {\n      // Smithy models are user-owned — a re-run must not discard edits\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  if (type === 'service') {\n    writeSsdkBundleConfig(tree, dir);\n  }\n\n  // Recorded here and read by the declaration's predicates, so the packages\n  // added below are exactly the ones the version sync will own.\n  const metadata: SmithyProjectMetadata = { smithyType: type, namespace };\n\n  addGeneratorMetadata(\n    tree,\n    fullyQualifiedName,\n    SMITHY_PROJECT_GENERATOR_INFO,\n    {\n      ...metadata,\n      ...(type === 'service' ? { apiName: options.name } : {}),\n    },\n  );\n\n  // No projectRoot: a Smithy model project has no manifest of its own, and every\n  // dependency here is workspace tooling the build runs rather than anything the\n  // model imports.\n  addTsDependencies(tree, DEPENDENCIES, { metadata });\n\n  await addGeneratorMetricsIfApplicable(tree, [SMITHY_PROJECT_GENERATOR_INFO]);\n\n  // On Windows the build runs the Smithy CLI from the PATH rather than through\n  // mise, so flag a missing prerequisite while the project is still being set up.\n  warnIfSmithyMissing();\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","addTsDependencies","declareDependencies","ownedElsewhere","formatFilesInSubtree","FS_DEPENDENCIES","FsCommands","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","getNpmScope","addGeneratorMetadata","getGeneratorInfo","projectExists","getRelativePathToRootByDirectory","smithyCliCommand","smithyMavenVersions","warnIfSmithyMissing","isService","metadata","smithyType","DEPENDENCIES","ts","name","dev","root","when","SMITHY_PROJECT_GENERATOR_INFO","filename","SMITHY_OUT_DIR","BUILD_DIR","SOURCE_PROJECTION","SSDK_CODEGEN_DIR","smithyCompileCommands","cmd","type","rm","mkdir","cp","cpGlobToFile","smithyGenerateSsdkCommands","smithyCompileOutputs","smithyGenerateSsdkTarget","cache","outputs","executor","dependsOn","options","commands","parallel","cwd","writeSsdkBundleConfig","tree","projectRoot","dirname","overwriteStrategy","Overwrite","smithyProjectGenerator","fullyQualifiedName","dir","sourceRoot","projectType","targets","build","compile","serviceName","serviceNameClassName","serviceNameKebabCase","scope","namespace","replace","relativePathToWorkspaceRoot","KeepExisting","apiName","preferInstallDependencies","languages"],"mappings":"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"}

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  type?: 'service' | 'shapes';\n  serviceName?: string;\n  namespace?: string;\n  directory?: string;\n  subDirectory?: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAQC"}

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

@@ -4,8 +4,10 @@
  */
 export interface SmithyProjectGeneratorSchema {
   name: string;
+  type?: 'service' | 'shapes';
   serviceName?: string;
   namespace?: string;
   directory?: string;
   subDirectory?: string;
+  preferInstallDependencies?: boolean;
 }

package/src/smithy/project/schema.json

@@ -15,9 +15,31 @@
       "x-priority": "important",
       "x-prompt": "What would you like to call your Smithy project?"
     },
+    "type": {
+      "type": "string",
+      "description": "The type of Smithy project to create. Choose between service (a model with a service shape, ready for an implementation) and shapes (a shape library of reusable shapes, shared between multiple Smithy projects).",
+      "default": "service",
+      "enum": ["service", "shapes"],
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "What type of Smithy project would you like to create?",
+        "type": "list",
+        "items": [
+          {
+            "value": "service",
+            "label": "service (a model which defines a service and its operations)"
+          },
+          {
+            "value": "shapes",
+            "label": "shapes (a library of reusable shapes, shared between Smithy projects)"
+          }
+        ],
+        "default": "service"
+      }
+    },
     "serviceName": {
       "type": "string",
-      "description": "The name of your Smithy service. Uses the supplied name by default.",
+      "description": "The name of your Smithy service. Uses the supplied name by default. Not applicable to shape libraries.",
       "x-prompt": "What name would you like your Smithy Service to have? i.e: MyService"
     },
     "namespace": {
@@ -36,6 +58,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

@@ -3,8 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
-import { type NxGeneratorInfo } from '../../utils/nx';
+import { type NxGeneratorInfo } from '../../utils/nx.js';
 import type { SmithyReactConnectionGeneratorSchema } from './schema';
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies.js").DependencyDeclaration<readonly [{
+    readonly name: "oidc-client-ts";
+}, {
+    readonly name: "react-oidc-context";
+}, {
+    readonly name: "@aws-sdk/credential-provider-cognito-identity";
+}, {
+    readonly name: "aws4fetch";
+}, {
+    readonly name: "@tanstack/react-query";
+}, {
+    readonly name: "@tanstack/react-query-devtools";
+}, {
+    readonly name: "@smithy/types";
+}], readonly import("../../utils/declared-dependencies.js").DeclaredPyDependency<"a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aiosqlite" | "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" | "langgraph-checkpoint-aws" | "langgraph-checkpoint-sqlite" | "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_REACT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
 export declare const smithyReactConnectionGenerator: (tree: Tree, options: SmithyReactConnectionGeneratorSchema) => Promise<GeneratorCallback>;
 export default smithyReactConnectionGenerator;