@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

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

@@ -48,7 +48,7 @@ exports[`openApiTsClientGenerator - FastAPI > should generate valid TypeScript f
  * Utility for serialisation and deserialisation of API types.
  */
 export class $IO {
-  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+  public static $mapValues = (data: any, fn: (item: any) => any) =>
     Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
 
   public static EchoOutput = {
@@ -185,7 +185,7 @@ export class $IO {
         ...(model.loc === undefined
           ? {}
           : {
-              loc: model.loc.map((item0) => item0),
+              loc: model.loc.map($IO.LocationItem.toJson),
             }),
         ...(model.msg === undefined
           ? {}
@@ -204,7 +204,7 @@ export class $IO {
         return json;
       }
       return {
-        loc: (json['loc'] as Array<any>).map((item0) => item0),
+        loc: (json['loc'] as Array<any>).map($IO.LocationItem.fromJson),
         msg: json['msg'],
         type: json['type'],
       };
@@ -250,11 +250,31 @@ export class TestApi {
     this.echo = this.echo.bind(this);
   }
 
+  private $collectionDelimiters: { [format: string]: string } = {
+    csv: ',',
+    ssv: ' ',
+    pipes: '|',
+  };
+
+  private $deepObject = (key: string, value: any): string[] => {
+    if (value === undefined || value === null) {
+      return [];
+    }
+    if (typeof value !== 'object') {
+      return [\`\${key}=\${encodeURIComponent(String(value))}\`];
+    }
+    return Object.entries(value).flatMap(([prop, v]) =>
+      this.$deepObject(\`\${key}[\${encodeURIComponent(prop)}]\`, v),
+    );
+  };
+
   private $url = (
     path: string,
     pathParameters: { [key: string]: any },
     queryParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: {
+      [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject';
+    },
   ): string => {
     const baseUrl = this.$config.url.endsWith('/')
       ? this.$config.url.slice(0, -1)
@@ -265,15 +285,24 @@ export class TestApi {
       path,
     );
     const queryString = Object.entries(queryParameters)
-      .map(([key, value]) => {
+      .flatMap(([key, value]) => {
         if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-          return value
-            .map(
-              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
-            )
-            .join('&');
+          return value.map(
+            (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+          );
+        }
+        if (
+          collectionFormats?.[key] === 'deepObject' &&
+          value !== null &&
+          typeof value === 'object'
+        ) {
+          return this.$deepObject(encodeURIComponent(key), value);
         }
-        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+        const delimiter =
+          this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+        return [
+          \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}\`,
+        ];
       })
       .join('&');
     return (
@@ -283,13 +312,22 @@ export class TestApi {
 
   private $headers = (
     headerParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' },
   ): [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)]];
+      const delimiter =
+        this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [
+        [
+          key,
+          Array.isArray(value)
+            ? value.map(String).join(delimiter)
+            : String(value),
+        ],
+      ];
     });
   };
 
@@ -301,16 +339,21 @@ export class TestApi {
     const queryParameters: { [key: string]: any } =
       $IO.EchoRequestQueryParameters.toJson(input);
     const headerParameters: { [key: string]: any } = {};
-    const collectionFormats = {
+    const queryCollectionFormats = {
       message: 'multi',
     } as const;
 
     const body = undefined;
 
     const response = await this.$fetch(
-      this.$url('/echo', pathParameters, queryParameters, collectionFormats),
+      this.$url(
+        '/echo',
+        pathParameters,
+        queryParameters,
+        queryCollectionFormats,
+      ),
       {
-        headers: this.$headers(headerParameters, collectionFormats),
+        headers: this.$headers(headerParameters),
         method: 'GET',
         body,
       },
@@ -375,7 +418,7 @@ exports[`openApiTsClientGenerator - FastAPI > should handle FastAPI validation e
  * Utility for serialisation and deserialisation of API types.
  */
 export class $IO {
-  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+  public static $mapValues = (data: any, fn: (item: any) => any) =>
     Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
 
   public static LocationItem = {
@@ -466,7 +509,7 @@ export class $IO {
         ...(model.loc === undefined
           ? {}
           : {
-              loc: model.loc.map((item0) => item0),
+              loc: model.loc.map($IO.LocationItem.toJson),
             }),
         ...(model.msg === undefined
           ? {}
@@ -485,7 +528,7 @@ export class $IO {
         return json;
       }
       return {
-        loc: (json['loc'] as Array<any>).map((item0) => item0),
+        loc: (json['loc'] as Array<any>).map($IO.LocationItem.fromJson),
         msg: json['msg'],
         type: json['type'],
       };
@@ -531,11 +574,31 @@ export class TestApi {
     this.testValidation = this.testValidation.bind(this);
   }
 
+  private $collectionDelimiters: { [format: string]: string } = {
+    csv: ',',
+    ssv: ' ',
+    pipes: '|',
+  };
+
+  private $deepObject = (key: string, value: any): string[] => {
+    if (value === undefined || value === null) {
+      return [];
+    }
+    if (typeof value !== 'object') {
+      return [\`\${key}=\${encodeURIComponent(String(value))}\`];
+    }
+    return Object.entries(value).flatMap(([prop, v]) =>
+      this.$deepObject(\`\${key}[\${encodeURIComponent(prop)}]\`, v),
+    );
+  };
+
   private $url = (
     path: string,
     pathParameters: { [key: string]: any },
     queryParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: {
+      [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject';
+    },
   ): string => {
     const baseUrl = this.$config.url.endsWith('/')
       ? this.$config.url.slice(0, -1)
@@ -546,15 +609,24 @@ export class TestApi {
       path,
     );
     const queryString = Object.entries(queryParameters)
-      .map(([key, value]) => {
+      .flatMap(([key, value]) => {
         if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-          return value
-            .map(
-              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
-            )
-            .join('&');
+          return value.map(
+            (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+          );
+        }
+        if (
+          collectionFormats?.[key] === 'deepObject' &&
+          value !== null &&
+          typeof value === 'object'
+        ) {
+          return this.$deepObject(encodeURIComponent(key), value);
         }
-        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+        const delimiter =
+          this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+        return [
+          \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}\`,
+        ];
       })
       .join('&');
     return (
@@ -564,13 +636,22 @@ export class TestApi {
 
   private $headers = (
     headerParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' },
   ): [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)]];
+      const delimiter =
+        this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [
+        [
+          key,
+          Array.isArray(value)
+            ? value.map(String).join(delimiter)
+            : String(value),
+        ],
+      ];
     });
   };
 
@@ -601,7 +682,7 @@ export class TestApi {
     );
 
     if (response.status === 200) {
-      return await response.text();
+      return await response.json();
     }
     if (response.status === 422) {
       throw {
@@ -801,7 +882,7 @@ exports[`openApiTsClientGenerator - FastAPI > should handle schemas with hyphens
  * Utility for serialisation and deserialisation of API types.
  */
 export class $IO {
-  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+  public static $mapValues = (data: any, fn: (item: any) => any) =>
     Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
 
   public static ContentBlockInput = {
@@ -879,7 +960,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ImageContent.fromJson(json),
+        ...$IO.ImageContent.$fromJsonPartial(json),
       };
     },
   };
@@ -898,7 +979,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ToolResultInput.fromJson(json),
+        ...$IO.ToolResultInput.$fromJsonPartial(json),
       };
     },
   };
@@ -917,7 +998,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ToolUse.fromJson(json),
+        ...$IO.ToolUse.$fromJsonPartial(json),
       };
     },
   };
@@ -997,7 +1078,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ImageContent.fromJson(json),
+        ...$IO.ImageContent.$fromJsonPartial(json),
       };
     },
   };
@@ -1016,7 +1097,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ToolResultOutput.fromJson(json),
+        ...$IO.ToolResultOutput.$fromJsonPartial(json),
       };
     },
   };
@@ -1035,7 +1116,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ToolUse.fromJson(json),
+        ...$IO.ToolUse.$fromJsonPartial(json),
       };
     },
   };
@@ -1096,6 +1177,20 @@ export class $IO {
         source: $IO.ImageSource.fromJson(json['source']),
       };
     },
+    $fromJsonPartial: (json: any): any => {
+      return {
+        ...(json['format'] === undefined
+          ? {}
+          : {
+              format: json['format'],
+            }),
+        ...(json['source'] === undefined
+          ? {}
+          : {
+              source: $IO.ImageSource.fromJson(json['source']),
+            }),
+      };
+    },
   };
 
   public static ImageSource = {
@@ -1485,7 +1580,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ImageContent.fromJson(json),
+        ...$IO.ImageContent.$fromJsonPartial(json),
       };
     },
   };
@@ -1551,7 +1646,7 @@ export class $IO {
         return json;
       }
       return {
-        ...$IO.ImageContent.fromJson(json),
+        ...$IO.ImageContent.$fromJsonPartial(json),
       };
     },
   };
@@ -1591,6 +1686,27 @@ export class $IO {
         toolUseId: json['toolUseId'],
       };
     },
+    $fromJsonPartial: (json: any): any => {
+      return {
+        ...(json['content'] === undefined
+          ? {}
+          : {
+              content: (json['content'] as Array<any>).map(
+                $IO.ToolResultContentInput.fromJson,
+              ),
+            }),
+        ...(json['status'] === undefined
+          ? {}
+          : {
+              status: json['status'],
+            }),
+        ...(json['toolUseId'] === undefined
+          ? {}
+          : {
+              toolUseId: json['toolUseId'],
+            }),
+      };
+    },
   };
 
   public static ToolResultOutput = {
@@ -1628,6 +1744,27 @@ export class $IO {
         toolUseId: json['toolUseId'],
       };
     },
+    $fromJsonPartial: (json: any): any => {
+      return {
+        ...(json['content'] === undefined
+          ? {}
+          : {
+              content: (json['content'] as Array<any>).map(
+                $IO.ToolResultContentOutput.fromJson,
+              ),
+            }),
+        ...(json['status'] === undefined
+          ? {}
+          : {
+              status: json['status'],
+            }),
+        ...(json['toolUseId'] === undefined
+          ? {}
+          : {
+              toolUseId: json['toolUseId'],
+            }),
+      };
+    },
   };
 
   public static ToolUse = {
@@ -1663,6 +1800,25 @@ export class $IO {
         toolUseId: json['toolUseId'],
       };
     },
+    $fromJsonPartial: (json: any): any => {
+      return {
+        ...(json['input'] === undefined
+          ? {}
+          : {
+              input: json['input'],
+            }),
+        ...(json['name'] === undefined
+          ? {}
+          : {
+              name: json['name'],
+            }),
+        ...(json['toolUseId'] === undefined
+          ? {}
+          : {
+              toolUseId: json['toolUseId'],
+            }),
+      };
+    },
   };
 
   public static ValidationError = {
@@ -1674,7 +1830,7 @@ export class $IO {
         ...(model.loc === undefined
           ? {}
           : {
-              loc: model.loc.map((item0) => item0),
+              loc: model.loc.map($IO.LocationItem.toJson),
             }),
         ...(model.msg === undefined
           ? {}
@@ -1693,7 +1849,7 @@ export class $IO {
         return json;
       }
       return {
-        loc: (json['loc'] as Array<any>).map((item0) => item0),
+        loc: (json['loc'] as Array<any>).map($IO.LocationItem.fromJson),
         msg: json['msg'],
         type: json['type'],
       };
@@ -1741,11 +1897,31 @@ export class TestApi {
     this.ping = this.ping.bind(this);
   }
 
+  private $collectionDelimiters: { [format: string]: string } = {
+    csv: ',',
+    ssv: ' ',
+    pipes: '|',
+  };
+
+  private $deepObject = (key: string, value: any): string[] => {
+    if (value === undefined || value === null) {
+      return [];
+    }
+    if (typeof value !== 'object') {
+      return [\`\${key}=\${encodeURIComponent(String(value))}\`];
+    }
+    return Object.entries(value).flatMap(([prop, v]) =>
+      this.$deepObject(\`\${key}[\${encodeURIComponent(prop)}]\`, v),
+    );
+  };
+
   private $url = (
     path: string,
     pathParameters: { [key: string]: any },
     queryParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: {
+      [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject';
+    },
   ): string => {
     const baseUrl = this.$config.url.endsWith('/')
       ? this.$config.url.slice(0, -1)
@@ -1756,15 +1932,24 @@ export class TestApi {
       path,
     );
     const queryString = Object.entries(queryParameters)
-      .map(([key, value]) => {
+      .flatMap(([key, value]) => {
         if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-          return value
-            .map(
-              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
-            )
-            .join('&');
+          return value.map(
+            (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+          );
         }
-        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+        if (
+          collectionFormats?.[key] === 'deepObject' &&
+          value !== null &&
+          typeof value === 'object'
+        ) {
+          return this.$deepObject(encodeURIComponent(key), value);
+        }
+        const delimiter =
+          this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+        return [
+          \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}\`,
+        ];
       })
       .join('&');
     return (
@@ -1774,13 +1959,22 @@ export class TestApi {
 
   private $headers = (
     headerParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' },
   ): [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)]];
+      const delimiter =
+        this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [
+        [
+          key,
+          Array.isArray(value)
+            ? value.map(String).join(delimiter)
+            : String(value),
+        ],
+      ];
     });
   };
 
@@ -1846,7 +2040,7 @@ export class TestApi {
     const queryParameters: { [key: string]: any } =
       $IO.ListMessagesRequestQueryParameters.toJson(input);
     const headerParameters: { [key: string]: any } = {};
-    const collectionFormats = {
+    const queryCollectionFormats = {
       session_id: 'multi',
     } as const;
 
@@ -1857,10 +2051,10 @@ export class TestApi {
         '/messages',
         pathParameters,
         queryParameters,
-        collectionFormats,
+        queryCollectionFormats,
       ),
       {
-        headers: this.$headers(headerParameters, collectionFormats),
+        headers: this.$headers(headerParameters),
         method: 'GET',
         body,
       },
@@ -1903,7 +2097,7 @@ export class TestApi {
     );
 
     if (response.status === 200) {
-      return await response.text();
+      return await response.json();
     }
     if (response.status === 500) {
       throw {
@@ -1935,7 +2129,7 @@ exports[`openApiTsClientGenerator - FastAPI > should hoist inline composite para
  * Utility for serialisation and deserialisation of API types.
  */
 export class $IO {
-  protected static $mapValues = (data: any, fn: (item: any) => any) =>
+  public static $mapValues = (data: any, fn: (item: any) => any) =>
     Object.fromEntries(Object.entries(data).map(([k, v]) => [k, fn(v)]));
 
   public static GetPetRequestCookieParameters = {
@@ -2152,11 +2346,31 @@ export class TestApi {
     this.getPet = this.getPet.bind(this);
   }
 
+  private $collectionDelimiters: { [format: string]: string } = {
+    csv: ',',
+    ssv: ' ',
+    pipes: '|',
+  };
+
+  private $deepObject = (key: string, value: any): string[] => {
+    if (value === undefined || value === null) {
+      return [];
+    }
+    if (typeof value !== 'object') {
+      return [\`\${key}=\${encodeURIComponent(String(value))}\`];
+    }
+    return Object.entries(value).flatMap(([prop, v]) =>
+      this.$deepObject(\`\${key}[\${encodeURIComponent(prop)}]\`, v),
+    );
+  };
+
   private $url = (
     path: string,
     pathParameters: { [key: string]: any },
     queryParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: {
+      [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' | 'deepObject';
+    },
   ): string => {
     const baseUrl = this.$config.url.endsWith('/')
       ? this.$config.url.slice(0, -1)
@@ -2167,15 +2381,24 @@ export class TestApi {
       path,
     );
     const queryString = Object.entries(queryParameters)
-      .map(([key, value]) => {
+      .flatMap(([key, value]) => {
         if (Array.isArray(value) && collectionFormats?.[key] === 'multi') {
-          return value
-            .map(
-              (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
-            )
-            .join('&');
+          return value.map(
+            (v) => \`\${encodeURIComponent(key)}=\${encodeURIComponent(\`\${v}\`)}\`,
+          );
+        }
+        if (
+          collectionFormats?.[key] === 'deepObject' &&
+          value !== null &&
+          typeof value === 'object'
+        ) {
+          return this.$deepObject(encodeURIComponent(key), value);
         }
-        return \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(',') : String(value))}\`;
+        const delimiter =
+          this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+        return [
+          \`\${encodeURIComponent(key)}=\${encodeURIComponent(Array.isArray(value) ? value.map(String).join(delimiter) : String(value))}\`,
+        ];
       })
       .join('&');
     return (
@@ -2185,13 +2408,22 @@ export class TestApi {
 
   private $headers = (
     headerParameters: { [key: string]: any },
-    collectionFormats?: { [key: string]: 'multi' | 'csv' },
+    collectionFormats?: { [key: string]: 'multi' | 'csv' | 'ssv' | 'pipes' },
   ): [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)]];
+      const delimiter =
+        this.$collectionDelimiters[collectionFormats?.[key] ?? 'csv'] ?? ',';
+      return [
+        [
+          key,
+          Array.isArray(value)
+            ? value.map(String).join(delimiter)
+            : String(value),
+        ],
+      ];
     });
   };
 
@@ -2215,10 +2447,12 @@ export class TestApi {
     if (cookiePairs.length > 0) {
       headerParameters['Cookie'] = cookiePairs.join('; ');
     }
-    const collectionFormats = {
-      'X-Client': 'csv',
+    const queryCollectionFormats = {
       tag: 'multi',
     } as const;
+    const headerCollectionFormats = {
+      'X-Client': 'csv',
+    } as const;
 
     const body = undefined;
 
@@ -2227,17 +2461,17 @@ export class TestApi {
         '/pets/{petId}',
         pathParameters,
         queryParameters,
-        collectionFormats,
+        queryCollectionFormats,
       ),
       {
-        headers: this.$headers(headerParameters, collectionFormats),
+        headers: this.$headers(headerParameters, headerCollectionFormats),
         method: 'GET',
         body,
       },
     );
 
     if (response.status === 200) {
-      return await response.text();
+      return await response.json();
     }
     throw new Error(
       \`Unknown response status \${response.status} returned by API\`,