@aws/nx-plugin 0.104.0 → 0.105.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.104.0",
+  "version": "0.105.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
@@ -19,8 +19,8 @@
   },
   "generators": "./generators.json",
   "peerDependencies": {
-    "nx": "22.6.5",
-    "prettier": "3.8.2"
+    "nx": "22.7.0",
+    "prettier": "3.8.3"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "12.1.0",
@@ -28,12 +28,12 @@
     "@hey-api/openapi-ts": "0.64.13",
     "@iarna/toml": "2.2.5",
     "@modelcontextprotocol/sdk": "1.29.0",
-    "@nx/devkit": "22.6.5",
-    "@nx/eslint": "22.6.5",
-    "@nx/js": "22.6.5",
-    "@nx/react": "22.6.5",
-    "@nx/vite": "22.6.5",
-    "@nxlv/python": "22.1.1",
+    "@nx/devkit": "22.7.0",
+    "@nx/eslint": "22.7.0",
+    "@nx/js": "22.7.0",
+    "@nx/react": "22.7.0",
+    "@nx/vite": "22.7.0",
+    "@nxlv/python": "22.1.3",
     "@phenomnomnominal/tsquery": "6.2.0",
     "enquirer": "2.4.1",
     "fast-glob": "3.3.3",
@@ -46,9 +46,9 @@
     "minimatch": "10.2.5",
     "openapi-types": "12.1.3",
     "pip-requirements-js": "1.0.3",
-    "typescript": "6.0.2",
-    "vite": "8.0.8",
-    "vitest": "4.1.4",
+    "typescript": "6.0.3",
+    "vite": "8.0.10",
+    "vitest": "4.1.5",
     "zod": "4.3.6"
   },
   "types": "./src/index.d.ts"

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1118.0",
-  "aws-cdk-lib": "2.248.0",
+  "aws-cdk": "2.1119.0",
+  "aws-cdk-lib": "2.251.0",
   "constructs": "10.6.0",
   "esbuild": "0.28.0",
   "source-map-support": "0.5.21",
@@ -13,60 +13,60 @@ exports[`infra generator > should add required dependencies to package.json > de
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
   "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.6.5",
-  "@nx/eslint-plugin": "22.6.5",
-  "@nx/js": "22.6.5",
-  "@nx/vitest": "22.6.5",
+  "@nx/eslint": "22.7.0",
+  "@nx/eslint-plugin": "22.7.0",
+  "@nx/js": "22.7.0",
+  "@nx/vitest": "22.7.0",
   "@swc-node/register": "~1.11.1",
   "@swc/core": "~1.15.5",
   "@swc/helpers": "~0.5.18",
   "@types/node": "25.6.0",
-  "@vitest/coverage-v8": "4.1.4",
+  "@vitest/coverage-v8": "4.1.5",
   "eslint": "^9.8.0",
   "eslint-config-prettier": "^10.0.0",
   "eslint-plugin-prettier": "5.5.5",
   "jsdom": "^27.1.0",
   "jsonc-eslint-parser": "3.1.0",
-  "prettier": "3.8.2",
+  "prettier": "3.8.3",
   "tsx": "4.21.0",
   "typescript": "~5.9.2",
   "typescript-eslint": "^8.40.0",
   "vite": "8.0.8",
-  "vitest": "4.1.4",
+  "vitest": "4.1.5",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "aws-cdk": "2.1118.0",
-    "aws-cdk-lib": "2.248.0",
+    "aws-cdk": "2.1119.0",
+    "aws-cdk-lib": "2.251.0",
     "constructs": "10.6.0",
     "esbuild": "0.28.0",
     "source-map-support": "0.5.21",
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.6.5",
-    "@nx/eslint-plugin": "22.6.5",
-    "@nx/js": "22.6.5",
-    "@nx/vitest": "22.6.5",
+    "@nx/eslint": "22.7.0",
+    "@nx/eslint-plugin": "22.7.0",
+    "@nx/js": "22.7.0",
+    "@nx/vitest": "22.7.0",
     "@swc-node/register": "~1.11.1",
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
     "@types/node": "25.6.0",
-    "@vitest/coverage-v8": "4.1.4",
+    "@vitest/coverage-v8": "4.1.5",
     "eslint": "^9.8.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-prettier": "5.5.5",
     "jsdom": "^27.1.0",
     "jsonc-eslint-parser": "3.1.0",
-    "prettier": "3.8.2",
+    "prettier": "3.8.3",
     "tsx": "4.21.0",
     "typescript": "~5.9.2",
     "typescript-eslint": "^8.40.0",
     "vite": "8.0.8",
-    "vitest": "4.1.4",
+    "vitest": "4.1.5",
   },
   "name": "@proj/source",
   "type": "module",
@@ -84,7 +84,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +177,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -739,7 +739,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.525 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",

package/src/open-api/ts-client/__snapshots__/generator.composite-types.spec.ts.snap

@@ -354,6 +354,254 @@ export class TestApi {
 "
 `;
 
+exports[`openApiTsClientGenerator - composite schemas > should handle FastAPI-style discriminated unions with string const (Literal) 1`] = `
+"export type Circle = {
+  kind: string;
+  radius: number;
+};
+export type Kind = 'circle';
+export type Kind1 = 'square';
+export type ShapesOut = {
+  canonical: ShapesOutCanonical;
+};
+export type ShapesOutCanonical = Circle | Square;
+export type Square = {
+  kind: string;
+  side: number;
+};
+export type GetShapesError = never;
+"
+`;
+
+exports[`openApiTsClientGenerator - composite schemas > should handle FastAPI-style discriminated unions with string const (Literal) 2`] = `
+"import type {
+  Circle,
+  ShapesOut,
+  ShapesOutCanonical,
+  Square,
+} from './types.gen.js';
+
+/**
+ * Utility for serialisation and deserialisation of API types.
+ */
+export class $IO {
+  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+    Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
+
+  public static Circle = {
+    toJson: (model: Circle): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return {
+        ...(model.kind === undefined
+          ? {}
+          : {
+              kind: model.kind,
+            }),
+        ...(model.radius === undefined
+          ? {}
+          : {
+              radius: model.radius,
+            }),
+      };
+    },
+    fromJson: (json: any): Circle => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return {
+        kind: json['kind'],
+        radius: json['radius'],
+      };
+    },
+  };
+
+  public static ShapesOut = {
+    toJson: (model: ShapesOut): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return {
+        ...(model.canonical === undefined
+          ? {}
+          : {
+              canonical: $IO.ShapesOutCanonical.toJson(model.canonical),
+            }),
+      };
+    },
+    fromJson: (json: any): ShapesOut => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return {
+        canonical: $IO.ShapesOutCanonical.fromJson(json['canonical']),
+      };
+    },
+  };
+
+  public static ShapesOutCanonical = {
+    toJson: (model: ShapesOutCanonical): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return {
+        ...$IO.Circle.toJson(model as Circle),
+        ...$IO.Square.toJson(model as Square),
+      };
+    },
+    fromJson: (json: any): ShapesOutCanonical => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return {
+        ...$IO.Circle.fromJson(json),
+        ...$IO.Square.fromJson(json),
+      };
+    },
+  };
+
+  public static Square = {
+    toJson: (model: Square): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return {
+        ...(model.kind === undefined
+          ? {}
+          : {
+              kind: model.kind,
+            }),
+        ...(model.side === undefined
+          ? {}
+          : {
+              side: model.side,
+            }),
+      };
+    },
+    fromJson: (json: any): Square => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return {
+        kind: json['kind'],
+        side: json['side'],
+      };
+    },
+  };
+}
+
+/**
+ * Client configuration for TestApi
+ */
+export interface TestApiConfig {
+  /**
+   * Base URL for the API
+   */
+  url: string;
+  /**
+   * Custom instance of fetch. By default the global 'fetch' is used.
+   * You can override this to add custom middleware for use cases such as adding authentication headers.
+   */
+  fetch?: typeof fetch;
+  /**
+   * Additional configuration
+   */
+  options?: {
+    /**
+     * By default, the client will add a Content-Type header, set to the media type defined for
+     * the request in the OpenAPI specification.
+     * Set this to false to omit this header.
+     */
+    omitContentTypeHeader?: boolean;
+  };
+}
+
+/**
+ * API Client for TestApi
+ */
+export class TestApi {
+  private $config: TestApiConfig;
+
+  constructor(config: TestApiConfig) {
+    this.$config = config;
+
+    this.getShapes = this.getShapes.bind(this);
+  }
+
+  private $url = (
+    path: string,
+    pathParameters: { [key: string]: any },
+    queryParameters: { [key: string]: any },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+  ): string => {
+    const baseUrl = this.$config.url.endsWith('/')
+      ? this.$config.url.slice(0, -1)
+      : this.$config.url;
+    const pathWithParameters = Object.entries(pathParameters).reduce(
+      (withParams, [key, value]) =>
+        withParams.replace(\`{\${key}}\`, encodeURIComponent(\`\${value}\`)),
+      path,
+    );
+    const queryString = Object.entries(queryParameters)
+      .map(([key, value]) => {
+        if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
+          return value
+            .map(
+              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+            )
+            .join('&');
+        }
+        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+      })
+      .join('&');
+    return (
+      baseUrl + pathWithParameters + (queryString ? \`?\${queryString}\` : '')
+    );
+  };
+
+  private $headers = (
+    headerParameters: { [key: string]: any },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+  ): [string, string][] => {
+    return Object.entries(headerParameters).flatMap(([key, value]) => {
+      if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
+        return value.map((v) => [key, String(v)]) as [string, string][];
+      }
+      return [[key, String(value)]];
+    });
+  };
+
+  private $fetch: typeof fetch = (...args) =>
+    (this.$config.fetch ?? fetch)(...args);
+
+  public async getShapes(): Promise<ShapesOut> {
+    const pathParameters: { [key: string]: any } = {};
+    const queryParameters: { [key: string]: any } = {};
+    const headerParameters: { [key: string]: any } = {};
+
+    const body = undefined;
+
+    const response = await this.$fetch(
+      this.$url('/shapes', pathParameters, queryParameters),
+      {
+        headers: this.$headers(headerParameters),
+        method: 'GET',
+        body,
+      },
+    );
+
+    if (response.status === 200) {
+      return $IO.ShapesOut.fromJson(await response.json());
+    }
+    throw new Error(
+      \`Unknown response status \${response.status} returned by API\`,
+    );
+  }
+}
+"
+`;
+
 exports[`openApiTsClientGenerator - composite schemas > should handle anyOf with any type 1`] = `
 "export type TestAnyOfAny200Response = {
   result?: string;
@@ -1920,3 +2168,193 @@ export class TestApi {
 }
 "
 `;
+
+exports[`openApiTsClientGenerator - composite schemas > should round-trip Date through a composite alias using instanceof checks 1`] = `
+"export type MaybeDate = Date | MaybeDateOneOf;
+export type MaybeDateOneOf = {
+  marker: string;
+};
+
+export type PostMaybeDateRequest = MaybeDate;
+export type PostMaybeDateError = never;
+"
+`;
+
+exports[`openApiTsClientGenerator - composite schemas > should round-trip Date through a composite alias using instanceof checks 2`] = `
+"import type {
+  MaybeDate,
+  MaybeDateOneOf,
+  PostMaybeDateRequest,
+} from './types.gen.js';
+
+/**
+ * Utility for serialisation and deserialisation of API types.
+ */
+export class $IO {
+  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+    Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
+
+  public static MaybeDate = {
+    toJson: (model: MaybeDate): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      if (model instanceof Date) {
+        return model.toISOString();
+      }
+      return {
+        ...$IO.MaybeDateOneOf.toJson(model as MaybeDateOneOf),
+      };
+    },
+    fromJson: (json: any): MaybeDate => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      if (typeof json === 'string' || json instanceof Date) {
+        return new Date(json);
+      }
+      return {
+        ...$IO.MaybeDateOneOf.fromJson(json),
+      };
+    },
+  };
+
+  public static MaybeDateOneOf = {
+    toJson: (model: MaybeDateOneOf): any => {
+      if (model === undefined || model === null) {
+        return model;
+      }
+      return {
+        ...(model.marker === undefined
+          ? {}
+          : {
+              marker: model.marker,
+            }),
+      };
+    },
+    fromJson: (json: any): MaybeDateOneOf => {
+      if (json === undefined || json === null) {
+        return json;
+      }
+      return {
+        marker: json['marker'],
+      };
+    },
+  };
+}
+
+/**
+ * Client configuration for TestApi
+ */
+export interface TestApiConfig {
+  /**
+   * Base URL for the API
+   */
+  url: string;
+  /**
+   * Custom instance of fetch. By default the global 'fetch' is used.
+   * You can override this to add custom middleware for use cases such as adding authentication headers.
+   */
+  fetch?: typeof fetch;
+  /**
+   * Additional configuration
+   */
+  options?: {
+    /**
+     * By default, the client will add a Content-Type header, set to the media type defined for
+     * the request in the OpenAPI specification.
+     * Set this to false to omit this header.
+     */
+    omitContentTypeHeader?: boolean;
+  };
+}
+
+/**
+ * API Client for TestApi
+ */
+export class TestApi {
+  private $config: TestApiConfig;
+
+  constructor(config: TestApiConfig) {
+    this.$config = config;
+
+    this.postMaybeDate = this.postMaybeDate.bind(this);
+  }
+
+  private $url = (
+    path: string,
+    pathParameters: { [key: string]: any },
+    queryParameters: { [key: string]: any },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+  ): string => {
+    const baseUrl = this.$config.url.endsWith('/')
+      ? this.$config.url.slice(0, -1)
+      : this.$config.url;
+    const pathWithParameters = Object.entries(pathParameters).reduce(
+      (withParams, [key, value]) =>
+        withParams.replace(\`{\${key}}\`, encodeURIComponent(\`\${value}\`)),
+      path,
+    );
+    const queryString = Object.entries(queryParameters)
+      .map(([key, value]) => {
+        if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
+          return value
+            .map(
+              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+            )
+            .join('&');
+        }
+        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+      })
+      .join('&');
+    return (
+      baseUrl + pathWithParameters + (queryString ? \`?\${queryString}\` : '')
+    );
+  };
+
+  private $headers = (
+    headerParameters: { [key: string]: any },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+  ): [string, string][] => {
+    return Object.entries(headerParameters).flatMap(([key, value]) => {
+      if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
+        return value.map((v) => [key, String(v)]) as [string, string][];
+      }
+      return [[key, String(value)]];
+    });
+  };
+
+  private $fetch: typeof fetch = (...args) =>
+    (this.$config.fetch ?? fetch)(...args);
+
+  public async postMaybeDate(input: PostMaybeDateRequest): Promise<string> {
+    const pathParameters: { [key: string]: any } = {};
+    const queryParameters: { [key: string]: any } = {};
+    const headerParameters: { [key: string]: any } = {};
+    if (!this.$config.options?.omitContentTypeHeader) {
+      headerParameters['Content-Type'] = 'application/json';
+    }
+    const body =
+      typeof input === 'object'
+        ? JSON.stringify($IO.MaybeDate.toJson(input))
+        : String($IO.MaybeDate.toJson(input));
+
+    const response = await this.$fetch(
+      this.$url('/maybe-date', pathParameters, queryParameters),
+      {
+        headers: this.$headers(headerParameters),
+        method: 'POST',
+        body,
+      },
+    );
+
+    if (response.status === 200) {
+      return await response.text();
+    }
+    throw new Error(
+      \`Unknown response status \${response.status} returned by API\`,
+    );
+  }
+}
+"
+`;

package/src/open-api/ts-client/files/client.gen.ts.template

@@ -175,9 +175,19 @@ export class $IO {
       }
       <%_ if (isComposite) { _%>
       <%_ model.composedPrimitives.filter(p => !['array', 'dictionary', 'enum'].includes(p.export) && !['null', 'unknown'].includes(p.type)).forEach((primitive) => { _%>
+      <%_ if (primitive.typescriptType === 'Date') { _%>
+      if (model instanceof Date) {
+          return <%- renderToJsonDateValue('model', primitive.format) %>;
+      }
+      <%_ } else if (primitive.typescriptType === 'Blob') { _%>
+      if (model instanceof Blob) {
+          return model;
+      }
+      <%_ } else { _%>
       if (typeof model === "<%- primitive.typescriptType %>") {
           return model;
       }
+      <%_ } _%>
       <%_ }); _%>
       <%_ const arrayOfPrimitives = [...model.composedPrimitives, ...model.composedModels].find(p => p.export === 'array' && canShortCircuitConversion(p)); _%>
       <%_ if (arrayOfPrimitives) { _%>
@@ -234,9 +244,19 @@ export class $IO {
       }
       <%_ if (isComposite) { _%>
       <%_ model.composedPrimitives.filter(p => !['array', 'dictionary', 'enum'].includes(p.export) && !['null', 'unknown'].includes(p.type)).forEach((primitive) => { _%>
+      <%_ if (primitive.typescriptType === 'Date') { _%>
+      if (typeof json === 'string' || json instanceof Date) {
+          return new Date(json);
+      }
+      <%_ } else if (primitive.typescriptType === 'Blob') { _%>
+      if (json instanceof Blob) {
+          return json;
+      }
+      <%_ } else { _%>
       if (typeof json === "<%- primitive.typescriptType %>") {
           return json;
       }
+      <%_ } _%>
       <%_ }); _%>
       <%_ const arrayOfPrimitives = [...model.composedPrimitives, ...model.composedModels].find(p => p.export === 'array' && canShortCircuitConversion(p)); _%>
       <%_ if (arrayOfPrimitives) { _%>

package/src/open-api/utils/codegen-data/languages.js

@@ -38,9 +38,13 @@ const toTypeScriptType = (property) => {
             return (0, exports.toTypeScriptModelName)(property.name);
         case 'reference':
         default:
-            return property.type === 'unknown'
-                ? 'unknown'
-                : (0, exports.toTypeScriptModelName)(property.type);
+            if (property.type === 'unknown') {
+                return 'unknown';
+            }
+            if (types_1.PRIMITIVE_TYPES.has(property.type)) {
+                return toTypescriptPrimitive(property);
+            }
+            return (0, exports.toTypeScriptModelName)(property.type);
     }
 };
 exports.toTypeScriptType = toTypeScriptType;