@aws/nx-plugin 1.0.0-rc.52 → 1.0.0-rc.54

package/README.md

@@ -171,6 +171,7 @@ pnpm nx g @aws/nx-plugin:ts#infra
 | `ts#mcp-server`         | MCP server (TypeScript)                                                                                           |
 | `ts#agent`              | [Strands Agent](https://strandsagents.com/) (TypeScript)                                                          |
 | `ts#nx-generator`       | Nx generator scaffold                                                                                             |
+| `smithy#project`        | Smithy model project — a service model, or a shape library shared between Smithy projects                          |
 | `py#project`            | Python project (uv)                                                                                               |
 | `py#api`                | Python API (FastAPI) with API Gateway + Lambda + [Powertools](https://github.com/aws-powertools/powertools-lambda-python)      |
 | `py#lambda-function`    | Python Lambda with type-safe event sources                                                                        |

package/generators.json

@@ -165,9 +165,9 @@
     "smithy#project": {
       "factory": "./src/smithy/project/generator",
       "schema": "./src/smithy/project/schema.json",
-      "description": "Generate a Smithy model project",
+      "description": "Generate a Smithy model project, either defining a service or a library of reusable shapes",
       "metric": "g27",
-      "hidden": true
+      "guidePages": ["smithy-project"]
     },
     "smithy#react-connection": {
       "factory": "./src/smithy/react-connection/generator",

package/migrations.json

@@ -21,6 +21,11 @@
       "version": "1.0.0-rc.52",
       "description": "Count the EC2MetaDataSSRF_QUERYARGUMENTS WAF rule on the UserIdentity Web ACL so sign-in from a local dev server is not blocked",
       "implementation": "./src/migrations/latest/user-identity-waf-allow-localhost-callback/migration"
+    },
+    "latest-order-access-log-delivery-after-bucket-policy": {
+      "version": "1.0.0-rc.54",
+      "description": "Order the S3 server access log delivery source after the bucket policy to avoid a 409 from concurrent bucket configuration writes",
+      "implementation": "./src/migrations/latest/order-access-log-delivery-after-bucket-policy/migration"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "1.0.0-rc.52",
+  "version": "1.0.0-rc.54",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

package/src/migrations/latest/order-access-log-delivery-after-bucket-policy/migration.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { MigrationReturnObject, Tree } from '@nx/devkit';
+export default function migration(tree: Tree): Promise<MigrationReturnObject>;

package/src/migrations/latest/order-access-log-delivery-after-bucket-policy/migration.js

@@ -0,0 +1,94 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { addDestructuredImport, applyGritQL, captureGritQL, matchGritQL } from "../../../utils/ast.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR } from "../../../utils/shared-constructs-constants.js";
+/**
+ * Order the S3 server access log delivery source after the bucket policy.
+ *
+ * S3 rejects concurrent configuration writes against the same bucket with a 409
+ * (OperationAborted). The generated StaticWebsite construct left the delivery
+ * source and the bucket policy unordered, so CloudFormation could submit both at
+ * once and fail the stack.
+ */ const STATIC_WEBSITE_FILE = `${PACKAGES_DIR}/${SHARED_CONSTRUCTS_DIR}/src/core/static-website.ts`;
+const BUCKET_ARN_SUFFIX = '.bucketArn';
+/**
+ * The bucket whose policy the delivery source must be ordered after is the one
+ * the delivery source itself targets, so read it off `resourceArn` rather than
+ * assuming the generated parameter name. Returns undefined unless exactly one
+ * simple identifier is found, so a diverged helper is left alone.
+ */ const findDeliverySourceBucket = async (tree, filePath)=>{
+    const captured = await captureGritQL(tree, filePath, '`resourceArn: $bucket.bucketArn`');
+    if (!captured) return undefined;
+    const bucket = captured.slice(captured.indexOf(':') + 1).replace(BUCKET_ARN_SUFFIX, '').trim();
+    // Only a plain identifier can be cast and dereferenced safely in the
+    // statement this migration writes.
+    return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(bucket) ? bucket : undefined;
+};
+/**
+ * Confirm the bucket the delivery source targets is declared as a parameter of
+ * the enclosing helper, so the statement this migration writes references a
+ * variable that is actually in scope.
+ */ const isBucketDeclaredParameter = async (tree, filePath, bucket)=>await matchGritQL(tree, filePath, `\`private deliverAccessLogsToCloudWatch($params) { $_ }\` where {
+      $params <: contains \`${bucket}: $bucketType\`,
+      $bucketType <: or { \`IBucket\`, \`Bucket\` }
+    }`);
+// Inserts the bucket policy dependency between the delivery source and the
+// delivery destination, matching the shape generators produced prior to this
+// fix. Anchored on the destination declaration so the source's own (multi-line,
+// Lazy-valued) arguments don't need to be matched.
+const addDependencyPattern = (bucket)=>`\`const $dest: CfnDeliveryDestination = new CfnDeliveryDestination($destArgs)\` as $decl where {
+  $dest <: \`destination\`
+} => \`const bucketPolicy = (${bucket} as Bucket).policy;
+    if (bucketPolicy) {
+      source.node.addDependency(bucketPolicy);
+    }
+    $decl\``;
+export default async function migration(tree) {
+    const nextSteps = [];
+    if (!tree.exists(STATIC_WEBSITE_FILE)) {
+        // No vended StaticWebsite construct in this workspace - nothing to migrate.
+        return {
+            nextSteps
+        };
+    }
+    const contents = tree.read(STATIC_WEBSITE_FILE, 'utf-8') ?? '';
+    if (contents.includes('source.node.addDependency(bucketPolicy)')) {
+        // Already migrated.
+        return {
+            nextSteps
+        };
+    }
+    const divergedMessage = `${STATIC_WEBSITE_FILE}: deliverAccessLogsToCloudWatch has diverged from the generated shape - left untouched. Manually order the S3 server access log delivery source after the bucket policy of the bucket it targets (\`source.node.addDependency(bucketPolicy)\`), avoiding a 409 (OperationAborted) from concurrent bucket configuration writes.`;
+    // The rewrite is anchored on the delivery destination but references the
+    // `source` variable, so only apply it when the delivery source still has the
+    // generated shape.
+    const hasGeneratedSource = await matchGritQL(tree, STATIC_WEBSITE_FILE, '`const source: CfnDeliverySource = new CfnDeliverySource($_)`');
+    const bucket = hasGeneratedSource ? await findDeliverySourceBucket(tree, STATIC_WEBSITE_FILE) : undefined;
+    if (!bucket || !await isBucketDeclaredParameter(tree, STATIC_WEBSITE_FILE, bucket)) {
+        nextSteps.push(divergedMessage);
+        return {
+            nextSteps
+        };
+    }
+    const rewrote = await applyGritQL(tree, STATIC_WEBSITE_FILE, addDependencyPattern(bucket));
+    if (!rewrote) {
+        nextSteps.push(divergedMessage);
+        return {
+            nextSteps
+        };
+    }
+    // The inserted statement casts to the concrete Bucket to reach its policy,
+    // which the helper's own `IBucket` parameter type does not expose.
+    await addDestructuredImport(tree, STATIC_WEBSITE_FILE, [
+        'Bucket'
+    ], 'aws-cdk-lib/aws-s3');
+    nextSteps.push(`${STATIC_WEBSITE_FILE}: the S3 server access log delivery source is now created after the policy of the bucket it targets, avoiding a 409 (OperationAborted) from concurrent bucket configuration writes.`);
+    await formatFilesInSubtree(tree);
+    return {
+        nextSteps
+    };
+}
+
+//# sourceMappingURL=migration.js.map

package/src/migrations/latest/order-access-log-delivery-after-bucket-policy/migration.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/migrations/latest/order-access-log-delivery-after-bucket-policy/migration.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { MigrationReturnObject, Tree } from '@nx/devkit';\nimport {\n  addDestructuredImport,\n  applyGritQL,\n  captureGritQL,\n  matchGritQL,\n} from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n} from '../../../utils/shared-constructs-constants';\n\n/**\n * Order the S3 server access log delivery source after the bucket policy.\n *\n * S3 rejects concurrent configuration writes against the same bucket with a 409\n * (OperationAborted). The generated StaticWebsite construct left the delivery\n * source and the bucket policy unordered, so CloudFormation could submit both at\n * once and fail the stack.\n */\n\nconst STATIC_WEBSITE_FILE = `${PACKAGES_DIR}/${SHARED_CONSTRUCTS_DIR}/src/core/static-website.ts`;\n\nconst BUCKET_ARN_SUFFIX = '.bucketArn';\n\n/**\n * The bucket whose policy the delivery source must be ordered after is the one\n * the delivery source itself targets, so read it off `resourceArn` rather than\n * assuming the generated parameter name. Returns undefined unless exactly one\n * simple identifier is found, so a diverged helper is left alone.\n */\nconst findDeliverySourceBucket = async (\n  tree: Tree,\n  filePath: string,\n): Promise<string | undefined> => {\n  const captured = await captureGritQL(\n    tree,\n    filePath,\n    '`resourceArn: $bucket.bucketArn`',\n  );\n  if (!captured) return undefined;\n\n  const bucket = captured\n    .slice(captured.indexOf(':') + 1)\n    .replace(BUCKET_ARN_SUFFIX, '')\n    .trim();\n\n  // Only a plain identifier can be cast and dereferenced safely in the\n  // statement this migration writes.\n  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(bucket) ? bucket : undefined;\n};\n\n/**\n * Confirm the bucket the delivery source targets is declared as a parameter of\n * the enclosing helper, so the statement this migration writes references a\n * variable that is actually in scope.\n */\nconst isBucketDeclaredParameter = async (\n  tree: Tree,\n  filePath: string,\n  bucket: string,\n): Promise<boolean> =>\n  await matchGritQL(\n    tree,\n    filePath,\n    `\\`private deliverAccessLogsToCloudWatch($params) { $_ }\\` where {\n      $params <: contains \\`${bucket}: $bucketType\\`,\n      $bucketType <: or { \\`IBucket\\`, \\`Bucket\\` }\n    }`,\n  );\n\n// Inserts the bucket policy dependency between the delivery source and the\n// delivery destination, matching the shape generators produced prior to this\n// fix. Anchored on the destination declaration so the source's own (multi-line,\n// Lazy-valued) arguments don't need to be matched.\nconst addDependencyPattern = (bucket: string) =>\n  `\\`const $dest: CfnDeliveryDestination = new CfnDeliveryDestination($destArgs)\\` as $decl where {\n  $dest <: \\`destination\\`\n} => \\`const bucketPolicy = (${bucket} as Bucket).policy;\n    if (bucketPolicy) {\n      source.node.addDependency(bucketPolicy);\n    }\n    $decl\\``;\n\nexport default async function migration(\n  tree: Tree,\n): Promise<MigrationReturnObject> {\n  const nextSteps: string[] = [];\n\n  if (!tree.exists(STATIC_WEBSITE_FILE)) {\n    // No vended StaticWebsite construct in this workspace - nothing to migrate.\n    return { nextSteps };\n  }\n\n  const contents = tree.read(STATIC_WEBSITE_FILE, 'utf-8') ?? '';\n  if (contents.includes('source.node.addDependency(bucketPolicy)')) {\n    // Already migrated.\n    return { nextSteps };\n  }\n\n  const divergedMessage = `${STATIC_WEBSITE_FILE}: deliverAccessLogsToCloudWatch has diverged from the generated shape - left untouched. Manually order the S3 server access log delivery source after the bucket policy of the bucket it targets (\\`source.node.addDependency(bucketPolicy)\\`), avoiding a 409 (OperationAborted) from concurrent bucket configuration writes.`;\n\n  // The rewrite is anchored on the delivery destination but references the\n  // `source` variable, so only apply it when the delivery source still has the\n  // generated shape.\n  const hasGeneratedSource = await matchGritQL(\n    tree,\n    STATIC_WEBSITE_FILE,\n    '`const source: CfnDeliverySource = new CfnDeliverySource($_)`',\n  );\n\n  const bucket = hasGeneratedSource\n    ? await findDeliverySourceBucket(tree, STATIC_WEBSITE_FILE)\n    : undefined;\n\n  if (\n    !bucket ||\n    !(await isBucketDeclaredParameter(tree, STATIC_WEBSITE_FILE, bucket))\n  ) {\n    nextSteps.push(divergedMessage);\n    return { nextSteps };\n  }\n\n  const rewrote = await applyGritQL(\n    tree,\n    STATIC_WEBSITE_FILE,\n    addDependencyPattern(bucket),\n  );\n\n  if (!rewrote) {\n    nextSteps.push(divergedMessage);\n    return { nextSteps };\n  }\n\n  // The inserted statement casts to the concrete Bucket to reach its policy,\n  // which the helper's own `IBucket` parameter type does not expose.\n  await addDestructuredImport(\n    tree,\n    STATIC_WEBSITE_FILE,\n    ['Bucket'],\n    'aws-cdk-lib/aws-s3',\n  );\n\n  nextSteps.push(\n    `${STATIC_WEBSITE_FILE}: the S3 server access log delivery source is now created after the policy of the bucket it targets, avoiding a 409 (OperationAborted) from concurrent bucket configuration writes.`,\n  );\n\n  await formatFilesInSubtree(tree);\n\n  return { nextSteps };\n}\n"],"names":["addDestructuredImport","applyGritQL","captureGritQL","matchGritQL","formatFilesInSubtree","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","STATIC_WEBSITE_FILE","BUCKET_ARN_SUFFIX","findDeliverySourceBucket","tree","filePath","captured","undefined","bucket","slice","indexOf","replace","trim","test","isBucketDeclaredParameter","addDependencyPattern","migration","nextSteps","exists","contents","read","includes","divergedMessage","hasGeneratedSource","push","rewrote"],"mappings":"AAAA;;;CAGC,GAED,SACEA,qBAAqB,EACrBC,WAAW,EACXC,aAAa,EACbC,WAAW,QACN,wBAAqB;AAC5B,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SACEC,YAAY,EACZC,qBAAqB,QAChB,gDAA6C;AAEpD;;;;;;;CAOC,GAED,MAAMC,sBAAsB,GAAGF,aAAa,CAAC,EAAEC,sBAAsB,2BAA2B,CAAC;AAEjG,MAAME,oBAAoB;AAE1B;;;;;CAKC,GACD,MAAMC,2BAA2B,OAC/BC,MACAC;IAEA,MAAMC,WAAW,MAAMV,cACrBQ,MACAC,UACA;IAEF,IAAI,CAACC,UAAU,OAAOC;IAEtB,MAAMC,SAASF,SACZG,KAAK,CAACH,SAASI,OAAO,CAAC,OAAO,GAC9BC,OAAO,CAACT,mBAAmB,IAC3BU,IAAI;IAEP,qEAAqE;IACrE,mCAAmC;IACnC,OAAO,6BAA6BC,IAAI,CAACL,UAAUA,SAASD;AAC9D;AAEA;;;;CAIC,GACD,MAAMO,4BAA4B,OAChCV,MACAC,UACAG,SAEA,MAAMX,YACJO,MACAC,UACA,CAAC;4BACuB,EAAEG,OAAO;;KAEhC,CAAC;AAGN,2EAA2E;AAC3E,6EAA6E;AAC7E,gFAAgF;AAChF,mDAAmD;AACnD,MAAMO,uBAAuB,CAACP,SAC5B,CAAC;;6BAE0B,EAAEA,OAAO;;;;WAI3B,CAAC;AAEZ,eAAe,eAAeQ,UAC5BZ,IAAU;IAEV,MAAMa,YAAsB,EAAE;IAE9B,IAAI,CAACb,KAAKc,MAAM,CAACjB,sBAAsB;QACrC,4EAA4E;QAC5E,OAAO;YAAEgB;QAAU;IACrB;IAEA,MAAME,WAAWf,KAAKgB,IAAI,CAACnB,qBAAqB,YAAY;IAC5D,IAAIkB,SAASE,QAAQ,CAAC,4CAA4C;QAChE,oBAAoB;QACpB,OAAO;YAAEJ;QAAU;IACrB;IAEA,MAAMK,kBAAkB,GAAGrB,oBAAoB,8TAA8T,CAAC;IAE9W,yEAAyE;IACzE,6EAA6E;IAC7E,mBAAmB;IACnB,MAAMsB,qBAAqB,MAAM1B,YAC/BO,MACAH,qBACA;IAGF,MAAMO,SAASe,qBACX,MAAMpB,yBAAyBC,MAAMH,uBACrCM;IAEJ,IACE,CAACC,UACD,CAAE,MAAMM,0BAA0BV,MAAMH,qBAAqBO,SAC7D;QACAS,UAAUO,IAAI,CAACF;QACf,OAAO;YAAEL;QAAU;IACrB;IAEA,MAAMQ,UAAU,MAAM9B,YACpBS,MACAH,qBACAc,qBAAqBP;IAGvB,IAAI,CAACiB,SAAS;QACZR,UAAUO,IAAI,CAACF;QACf,OAAO;YAAEL;QAAU;IACrB;IAEA,2EAA2E;IAC3E,mEAAmE;IACnE,MAAMvB,sBACJU,MACAH,qBACA;QAAC;KAAS,EACV;IAGFgB,UAAUO,IAAI,CACZ,GAAGvB,oBAAoB,mLAAmL,CAAC;IAG7M,MAAMH,qBAAqBM;IAE3B,OAAO;QAAEa;IAAU;AACrB"}

package/src/preset/__snapshots__/generator.spec.ts.snap

@@ -108,6 +108,8 @@ The following list of generators are what is currently available in the \`@aws/n
 
 - **py#agent**: Add an AI Agent to a Python project
 
+- **smithy#project**: Generate a Smithy model project, either defining a service or a library of reusable shapes
+
 - **terraform#project**: Generates a Terraform project
 
 - **ts#docs**: Generates a documentation site

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"
 
@@ -31,6 +128,8 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
   "projectType": "library",
   "metadata": {
     "generator": "smithy#project",
+    "smithyType": "service",
+    "namespace": "com.mycompany.api",
     "apiName": "test-api"
   },
   "targets": {
@@ -45,7 +144,7 @@ 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}"
@@ -64,6 +163,8 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
   "projectType": "library",
   "metadata": {
     "generator": "smithy#project",
+    "smithyType": "service",
+    "namespace": "proj",
     "apiName": "test-api"
   },
   "targets": {
@@ -78,7 +179,7 @@ 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}"
@@ -288,6 +389,8 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
   "projectType": "library",
   "metadata": {
     "generator": "smithy#project",
+    "smithyType": "service",
+    "namespace": "proj",
     "apiName": "test-api"
   },
   "targets": {
@@ -302,7 +405,7 @@ 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}"
@@ -350,6 +453,8 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
   "projectType": "library",
   "metadata": {
     "generator": "smithy#project",
+    "smithyType": "service",
+    "namespace": "proj",
     "apiName": "test-api"
   },
   "targets": {
@@ -364,7 +469,7 @@ 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}"

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.js

@@ -1,7 +1,7 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addProjectConfiguration, generateFiles, joinPathFragments } from "@nx/devkit";
+ */ import { addProjectConfiguration, generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
 import { getTsLibDetails } from "../../ts/lib/generator.js";
 import { resolveContainers } from "../../utils/containers.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
@@ -15,6 +15,7 @@ export const SMITHY_PROJECT_GENERATOR_INFO = getGeneratorInfo(import.meta.filena
 export const smithyProjectGenerator = async (tree, options)=>{
     const cmd = new FsCommands(tree);
     const containers = await resolveContainers(tree, 'inherit');
+    const type = options.type ?? 'service';
     // Create project.json
     const { fullyQualifiedName, dir } = getTsLibDetails(tree, options);
     if (!projectExists(tree, fullyQualifiedName)) {
@@ -39,7 +40,10 @@ export const smithyProjectGenerator = async (tree, 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}`
+                            // 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}'
@@ -53,14 +57,21 @@ export const smithyProjectGenerator = async (tree, options)=>{
     const serviceNameKebabCase = toKebabCase(serviceName);
     const scope = getNpmScope(tree);
     const namespace = options.namespace ?? toKebabCase(scope).replace(/-/g, '.');
-    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, {
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', type), dir, {
         namespace,
         serviceNameClassName,
         serviceNameKebabCase,
         scope
+    }, {
+        // Smithy models are user-owned — a re-run must not discard edits
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     addGeneratorMetadata(tree, fullyQualifiedName, SMITHY_PROJECT_GENERATOR_INFO, {
-        apiName: options.name
+        smithyType: type,
+        namespace,
+        ...type === 'service' ? {
+            apiName: options.name
+        } : {}
     });
     await addGeneratorMetricsIfApplicable(tree, [
         SMITHY_PROJECT_GENERATOR_INFO

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

@@ -1 +1 @@
-{"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"}
+{"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 { 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  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    },\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","formatFilesInSubtree","FsCommands","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","getNpmScope","addGeneratorMetadata","getGeneratorInfo","projectExists","SMITHY_PROJECT_GENERATOR_INFO","filename","smithyProjectGenerator","tree","options","cmd","containers","type","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","overwriteStrategy","KeepExisting","smithyType","apiName","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SACEA,uBAAuB,EAEvBC,aAAa,EACbC,iBAAiB,EACjBC,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;IACjD,MAAMI,OAAOH,QAAQG,IAAI,IAAI;IAE7B,sBAAsB;IACtB,MAAM,EAAEC,kBAAkB,EAAEC,GAAG,EAAE,GAAGrB,gBAAgBe,MAAMC;IAE1D,IAAI,CAACL,cAAcI,MAAMK,qBAAqB;QAC5CxB,wBAAwBmB,MAAMK,oBAAoB;YAChDE,MAAMF;YACNG,MAAMF;YACNG,YAAY1B,kBAAkBuB,KAAK;YACnCI,aAAa;YACbC,SAAS;gBACPC,OAAO;oBACLC,WAAW;wBAAC;qBAAU;gBACxB;gBACAC,SAAS;oBACPC,OAAO;oBACPC,SAAS;wBAAC;qBAA2C;oBACrDC,UAAU;oBACVhB,SAAS;wBACPiB,UAAU;4BACRhB,IAAIiB,EAAE,CAAC;4BACPjB,IAAIkB,KAAK,CAAC;4BACV,kEAAkE;4BAClE,kEAAkE;4BAClE,2DAA2D;4BAC3D,GAAGjB,WAAW,oJAAoJ,CAAC;yBACpK;wBACDkB,UAAU;wBACVC,KAAK;oBACP;gBACF;YACF;QACF;IACF;IAEA,MAAMC,cAActB,QAAQsB,WAAW,IAAItB,QAAQM,IAAI;IACvD,MAAMiB,uBAAuBjC,YAAYgC;IACzC,MAAME,uBAAuBjC,YAAY+B;IACzC,MAAMG,QAAQjC,YAAYO;IAC1B,MAAM2B,YAAY1B,QAAQ0B,SAAS,IAAInC,YAAYkC,OAAOE,OAAO,CAAC,MAAM;IAExE9C,cACEkB,MACAjB,kBAAkB,YAAY8C,OAAO,EAAE,SAASzB,OAChDE,KACA;QACEqB;QACAH;QACAC;QACAC;IACF,GACA;QACE,iEAAiE;QACjEI,mBAAmB9C,kBAAkB+C,YAAY;IACnD;IAGFrC,qBACEM,MACAK,oBACAR,+BACA;QACEmC,YAAY5B;QACZuB;QACA,GAAIvB,SAAS,YAAY;YAAE6B,SAAShC,QAAQM,IAAI;QAAC,IAAI,CAAC,CAAC;IACzD;IAGF,MAAMjB,gCAAgCU,MAAM;QAACH;KAA8B;IAE3E,MAAMV,qBAAqBa;IAC3B,OAAO,IACLX,oBAAoBW,MAAMC,QAAQiC,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAepC,uBAAuB"}

package/src/smithy/project/schema.d.js.map

@@ -1 +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"}
+{"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,6 +4,7 @@
  */
 export interface SmithyProjectGeneratorSchema {
   name: string;
+  type?: 'service' | 'shapes';
   serviceName?: string;
   namespace?: string;
   directory?: string;

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": {

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

@@ -1743,6 +1743,8 @@ exports[`tsSmithyApiGenerator > should generate smithy ts api with default optio
   "projectType": "library",
   "metadata": {
     "generator": "smithy#project",
+    "smithyType": "service",
+    "namespace": "proj",
     "apiName": "test-api-model",
     "backendProject": "@proj/test-api"
   },
@@ -1758,7 +1760,7 @@ exports[`tsSmithyApiGenerator > should generate smithy ts api with default optio
         "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}"

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -1940,6 +1940,10 @@ export class StaticWebsite extends Construct {
         resourceArn: bucket.bucketArn,
       },
     );
+    const bucketPolicy = (bucket as Bucket).policy;
+    if (bucketPolicy) {
+      source.node.addDependency(bucketPolicy);
+    }
     const destination: CfnDeliveryDestination = new CfnDeliveryDestination(
       this,
       \`\${id}AccessLogsDestination\`,
@@ -3750,6 +3754,10 @@ export class StaticWebsite extends Construct {
         resourceArn: bucket.bucketArn,
       },
     );
+    const bucketPolicy = (bucket as Bucket).policy;
+    if (bucketPolicy) {
+      source.node.addDependency(bucketPolicy);
+    }
     const destination: CfnDeliveryDestination = new CfnDeliveryDestination(
       this,
       \`\${id}AccessLogsDestination\`,
@@ -5420,6 +5428,10 @@ export class StaticWebsite extends Construct {
         resourceArn: bucket.bucketArn,
       },
     );
+    const bucketPolicy = (bucket as Bucket).policy;
+    if (bucketPolicy) {
+      source.node.addDependency(bucketPolicy);
+    }
     const destination: CfnDeliveryDestination = new CfnDeliveryDestination(
       this,
       \`\${id}AccessLogsDestination\`,

package/src/utils/website-constructs/files/cdk/core/static-website.ts.template

@@ -324,6 +324,10 @@ export class StaticWebsite extends Construct {
         resourceArn: bucket.bucketArn,
       },
     );
+    const bucketPolicy = (bucket as Bucket).policy;
+    if (bucketPolicy) {
+      source.node.addDependency(bucketPolicy);
+    }
     const destination: CfnDeliveryDestination = new CfnDeliveryDestination(
       this,
       `${id}AccessLogsDestination`,