@aws/nx-plugin 0.28.3 → 0.28.4

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

@@ -1002,9 +1002,7 @@ export class TestApi {
     const body =
       input === undefined
         ? undefined
-        : typeof input === 'object'
-          ? JSON.stringify(input === null ? null : input)
-          : String(input === null ? null : input);
+        : JSON.stringify(input === null ? null : input);
 
     const response = await this.$fetch(
       this.$url('/single-nullable-array', pathParameters, queryParameters),
@@ -1547,12 +1545,7 @@ export class TestApi {
     if (!this.$config.options?.omitContentTypeHeader) {
       headerParameters['Content-Type'] = 'application/json';
     }
-    const body =
-      input === undefined
-        ? undefined
-        : typeof input === 'object'
-          ? JSON.stringify(input)
-          : String(input);
+    const body = input === undefined ? undefined : JSON.stringify(input);
 
     const response = await this.$fetch(
       this.$url(
@@ -1584,12 +1577,7 @@ export class TestApi {
     if (!this.$config.options?.omitContentTypeHeader) {
       headerParameters['Content-Type'] = 'application/json';
     }
-    const body =
-      input === undefined
-        ? undefined
-        : typeof input === 'object'
-          ? JSON.stringify(input)
-          : String(input);
+    const body = input === undefined ? undefined : JSON.stringify(input);
 
     const response = await this.$fetch(
       this.$url('/array-of-maps-of-numbers', pathParameters, queryParameters),

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

@@ -1060,12 +1060,7 @@ export class TestApi {
     if (!this.$config.options?.omitContentTypeHeader) {
       headerParameters['Content-Type'] = 'application/json';
     }
-    const body =
-      input === undefined
-        ? undefined
-        : typeof input === 'object'
-          ? JSON.stringify(input)
-          : String(input);
+    const body = input === undefined ? undefined : JSON.stringify(input);
 
     const response = await this.$fetch(
       this.$url('/arrays', pathParameters, queryParameters),
@@ -1100,17 +1095,10 @@ export class TestApi {
     const body =
       input === undefined
         ? undefined
-        : typeof input === 'object'
-          ? JSON.stringify(
-              $IO.TestArraysWithOtherParametersRequestBodyParameters.toJson(
-                input,
-              ).body,
-            )
-          : String(
-              $IO.TestArraysWithOtherParametersRequestBodyParameters.toJson(
-                input,
-              ).body,
-            );
+        : JSON.stringify(
+            $IO.TestArraysWithOtherParametersRequestBodyParameters.toJson(input)
+              .body,
+          );
 
     const response = await this.$fetch(
       this.$url(

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

@@ -391,9 +391,25 @@ export class <%- className %> {
     <%_ } else if (op.parametersBody.isPrimitive || ["binary", "any", "unknown"].includes(op.parametersBody.type) || op.parametersBody.isEnum || op.parametersBody.export === 'enum') { _%>
     const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>input<%- op.explicitRequestBodyParameter ? `.${op.explicitRequestBodyParameter.typescriptName}` : '' %><%- op.parametersBody.type === 'unknown' ? ' as any' : '' %>;
     <%_ } else if (op.explicitRequestBodyParameter) { _%>
-    const body = <% if (!op.explicitRequestBodyParameter.isRequired) { %>input === undefined ? undefined : <% } %>(typeof input === 'object' ? JSON.stringify($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>) : String($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>));
+    const body = <% if (!op.explicitRequestBodyParameter.isRequired) { %>input === undefined ? undefined : <% } %>(
+      <%_ if (op.explicitRequestBodyParameter.export !== 'array') { _%>
+      typeof input === 'object' ?
+      <%_ } _%>
+      JSON.stringify($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>)
+      <%_ if (op.explicitRequestBodyParameter.export !== 'array') { _%>
+      : String($IO.<%- op.operationIdPascalCase %>RequestBodyParameters.toJson(input).<%- op.explicitRequestBodyParameter.prop %>)
+      <%_ } _%>
+      );
     <%_ } else { _%>
-    const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>(typeof input === 'object' ? JSON.stringify(<%- renderToJsonValue(op.parametersBody, 'input') %>) : String(<%- renderToJsonValue(op.parametersBody, 'input') %>));
+    const body = <% if (!op.parametersBody.isRequired) { %>input === undefined ? undefined : <% } %>(
+      <%_ if (op.parametersBody.export !== 'array') { _%>
+      typeof input === 'object' ?
+      <%_ } _%>
+      JSON.stringify(<%- renderToJsonValue(op.parametersBody, 'input') %>)
+      <%_ if (op.parametersBody.export !== 'array') { _%>
+      : String(<%- renderToJsonValue(op.parametersBody, 'input') %>)
+      <%_ } _%>
+    );
     <%_ } _%>
     <%_ } else { %>
     const body = undefined;

package/src/open-api/ts-hooks/files/options-proxy.gen.ts.template

@@ -33,7 +33,7 @@ import type {
   });
 } _%>
 <%_ const modelsByName = Object.fromEntries(models.map(m => [m.name, m])); _%>
-<%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [op.result.typescriptType] : [])).forEach((returnTypeModel) => { _%>
+<%_ uniq(allOperations.flatMap((op) => op.result && modelsByName[op.result.type] ? [op.result.type] : [])).forEach((returnTypeModel) => { _%>
   <%- returnTypeModel %>,
 <%_ }); _%>
 } from './types.gen.js';

package/src/open-api/ts-hooks/generator.spec.tsx

@@ -24,6 +24,7 @@ import {
 } from '@tanstack/react-query';
 import React from 'react';
 import { Mock } from 'vitest';
+import { PET_STORE_SPEC } from '../ts-client/generator.petstore.spec';
 
 describe('openApiTsHooksGenerator', () => {
   let tree: Tree;
@@ -1784,4 +1785,19 @@ describe('openApiTsHooksGenerator', () => {
       }),
     );
   });
+
+  it('should generate valid code for the petstore example ', async () => {
+    tree.write('openapi.json', JSON.stringify(PET_STORE_SPEC));
+
+    await openApiTsHooksGenerator(tree, {
+      openApiSpecPath: 'openapi.json',
+      outputPath: 'src/generated',
+    });
+
+    validateTypeScript([
+      'src/generated/client.gen.ts',
+      'src/generated/types.gen.ts',
+      'src/generated/options-proxy.gen.ts',
+    ]);
+  });
 });