@aws/nx-plugin 0.28.2 → 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',
+    ]);
+  });
 });

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

@@ -18,6 +18,7 @@ from collections.abc import Callable
 from aws_lambda_powertools import Logger, Metrics, Tracer
 from aws_lambda_powertools.metrics import MetricUnit
 from fastapi import FastAPI, Request, Response
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
 from fastapi.responses import JSONResponse
 from fastapi.routing import APIRoute
@@ -51,6 +52,12 @@ lambda_handler = logger.inject_lambda_context(lambda_handler, clear_state=True)
 # Add metrics last to properly flush metrics.
 lambda_handler = metrics.log_metrics(lambda_handler, capture_cold_start_metric=True)
 
+# Add cors middleware
+app.add_middleware(CORSMiddleware,
+                   allow_origins=['*'],
+                   allow_methods=['*'],
+                   allow_headers=['*'])
+
 # Add exception middleware(s)
 app.add_middleware(ExceptionMiddleware, handlers=app.exception_handlers)
 

package/src/py/fast-api/files/app/__name__/init.py.template

@@ -5,9 +5,7 @@ from collections.abc import Callable
 from aws_lambda_powertools import Logger, Metrics, Tracer
 from aws_lambda_powertools.metrics import MetricUnit
 from fastapi import FastAPI, Request, Response
-<%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
 from fastapi.middleware.cors import CORSMiddleware
-<%_ } _%>
 from fastapi.openapi.utils import get_openapi
 from fastapi.responses import JSONResponse
 from fastapi.routing import APIRoute
@@ -41,11 +39,12 @@ lambda_handler = logger.inject_lambda_context(lambda_handler, clear_state=True)
 # Add metrics last to properly flush metrics.
 lambda_handler = metrics.log_metrics(lambda_handler, capture_cold_start_metric=True)
 
-<%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
 # Add cors middleware
-app.add_middleware(CORSMiddleware, allow_origins=['*'], allow_methods=['*'])
+app.add_middleware(CORSMiddleware,
+                   allow_origins=['*'],
+                   allow_methods=['*'],
+                   allow_headers=['*'])
 
-<%_ } _%>
 # Add exception middleware(s)
 app.add_middleware(ExceptionMiddleware, handlers=app.exception_handlers)
 

package/src/trpc/backend/__snapshots__/generator.spec.ts.snap

@@ -391,9 +391,11 @@ export interface TestApiProps<
    */
   integrations: TIntegrations;
   /**
-   * User pool for Cognito authentication
+   * Identity details for Cognito Authentication
    */
-  userPool: IUserPool;
+  identity: {
+    userPool: IUserPool;
+  };
 }
 
 /**
@@ -448,7 +450,7 @@ export class TestApi<
       defaultMethodOptions: {
         authorizationType: AuthorizationType.COGNITO,
         authorizer: new CognitoUserPoolsAuthorizer(scope, 'TestApiAuthorizer', {
-          cognitoUserPools: [props.userPool],
+          cognitoUserPools: [props.identity.userPool],
         }),
       },
       defaultCorsPreflightOptions: {

package/src/utils/api-constructs/files/app/apis/rest/__apiNameKebabCase__.ts.template

@@ -67,9 +67,11 @@ export interface <%= apiNameClassName %>Props<
   integrations: TIntegrations;
   <%_ if (auth === 'Cognito') { _%>
   /**
-   * User pool for Cognito authentication
+   * Identity details for Cognito Authentication
    */
-  userPool: IUserPool;
+  identity: {
+    userPool: IUserPool;
+  };
   <%_ } _%>
 }
 
@@ -145,7 +147,7 @@ export class <%= apiNameClassName %><
         <%_ } else if (auth === 'Cognito') { _%>
         authorizationType: AuthorizationType.COGNITO,
         authorizer: new CognitoUserPoolsAuthorizer(scope, '<%= apiNameClassName %>Authorizer', {
-          cognitoUserPools: [props.userPool],
+          cognitoUserPools: [props.identity.userPool],
         }),
         <%_ } else if (auth === 'None') { _%>
         authorizationType: AuthorizationType.NONE,

package/src/utils/git.d.ts

@@ -7,6 +7,10 @@ import { Tree } from '@nx/devkit';
  * Returns all files from the tree root that are not gitignored (both tracked and untracked)
  */
 export declare const getGitIncludedFiles: (tree: Tree) => string[];
+/**
+ * Return whether or not a tree is within a git repo
+ */
+export declare const isWithinGitRepo: (tree: Tree) => boolean;
 /**
  * Update a .gitignore file. Will create a new .gitignore file if it does not exist
  */

package/src/utils/git.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateGitIgnore = exports.getGitIncludedFiles = void 0;
+exports.updateGitIgnore = exports.isWithinGitRepo = exports.getGitIncludedFiles = void 0;
 const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -31,6 +31,24 @@ const getGitIncludedFiles = (tree) => {
     ].filter((f) => tree.exists(f));
 };
 exports.getGitIncludedFiles = getGitIncludedFiles;
+/**
+ * Return whether or not a tree is within a git repo
+ */
+const isWithinGitRepo = (tree) => {
+    if (tree.exists('.git')) {
+        return true;
+    }
+    try {
+        return (0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', {
+            encoding: 'utf-8',
+            cwd: tree.root,
+        }).startsWith('true');
+    }
+    catch (_a) {
+        return false;
+    }
+};
+exports.isWithinGitRepo = isWithinGitRepo;
 /**
  * Update a .gitignore file. Will create a new .gitignore file if it does not exist
  */

package/src/utils/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/git.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,iDAAyC;AACzC,0EAAmC;AAEnC;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,IAAU,EAAY,EAAE;IAC1D,OAAO;QACL,oBAAoB;QACpB,GAAG,IAAA,wBAAQ,EAAC,iCAAiC,EAAE;YAC7C,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;aACC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnB,sCAAsC;QACtC,GAAG,IAAA,wBAAQ,EAAC,0CAA0C,EAAE;YACtD,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;aACC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;KACpB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAjBW,QAAA,mBAAmB,uBAiB9B;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,GAAW,EACX,QAA0C,EAC1C,EAAE;;IACF,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,0CAAE,KAAK,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;IAC9E,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,IAAA,uBAAM,EAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B"}
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/git.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAqD;AACrD,iDAAyC;AACzC,0EAAmC;AAEnC;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,IAAU,EAAY,EAAE;IAC1D,OAAO;QACL,oBAAoB;QACpB,GAAG,IAAA,wBAAQ,EAAC,iCAAiC,EAAE;YAC7C,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;aACC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACnB,sCAAsC;QACtC,GAAG,IAAA,wBAAQ,EAAC,0CAA0C,EAAE;YACtD,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;aACC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;KACpB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAjBW,QAAA,mBAAmB,uBAiB9B;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,IAAU,EAAW,EAAE;IACrD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,qCAAqC,EAAE;YACrD,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,IAAI;SACf,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,GAAW,EACX,QAA0C,EAC1C,EAAE;;IACF,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,0CAAE,KAAK,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;IAC9E,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/C,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,IAAA,uBAAM,EAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B"}