@aws/nx-plugin 0.1.6 → 0.2.1

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

@@ -16,11 +16,37 @@ export type IEcho = z.TypeOf<typeof EchoSchema>;
 "
 `;
 
-exports[`trpc backend generator > should set up shared constructs > shared-constructs.ts 1`] = `
+exports[`trpc backend generator > should set up shared constructs > index.ts 1`] = `
+"export * from './test-api.js';
+"
+`;
+
+exports[`trpc backend generator > should set up shared constructs > test-api.ts 1`] = `
+"import { Construct } from 'constructs';
+import * as url from 'url';
+import { TrpcApi } from '../../core/trpc-api.js';
+import { HttpIamAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
+
+export class TestApi extends TrpcApi {
+  constructor(scope: Construct, id: string) {
+    super(scope, id, {
+      defaultAuthorizer: new HttpIamAuthorizer(),
+      handlerFilePath: url.fileURLToPath(
+        new URL(
+          '../../../../../../apps/test-api/backend/src/lambdas/router.ts',
+          import.meta.url,
+        ),
+      ),
+    });
+  }
+}
+"
+`;
+
+exports[`trpc backend generator > should set up shared constructs > trpc-api.ts 1`] = `
 "import { Construct } from 'constructs';
 import { Runtime, RuntimeFamily } from 'aws-cdk-lib/aws-lambda';
 import { CfnOutput, Duration } from 'aws-cdk-lib';
-import * as url from 'url';
 import {
   CorsHttpMethod,
   HttpApi,
@@ -30,35 +56,31 @@ import {
 import { HttpLambdaIntegration } from 'aws-cdk-lib/aws-apigatewayv2-integrations';
 import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Effect, IRole, PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { RuntimeConfig } from '../runtime-config/index.js';
+import { RuntimeConfig } from './runtime-config.js';
 
-export interface TestApiProps {
+export interface TrpcApiProps {
+  readonly handlerFilePath: string;
   readonly defaultAuthorizer: IHttpRouteAuthorizer;
   readonly allowedOrigins?: string[];
 }
 
-export class TestApi extends Construct {
+export class TrpcApi extends Construct {
   public readonly api: HttpApi;
 
-  constructor(scope: Construct, id: string, props: TestApiProps) {
+  constructor(scope: Construct, id: string, props: TrpcApiProps) {
     super(scope, id);
 
-    const routerFunction = new NodejsFunction(this, 'TestApiHandler', {
+    const routerFunction = new NodejsFunction(this, \`\${id}Handler\`, {
       timeout: Duration.seconds(30),
       runtime: new Runtime('nodejs20.x', RuntimeFamily.NODEJS),
       handler: 'handler',
-      entry: url.fileURLToPath(
-        new URL(
-          '../../../../../apps/test-api/backend/src/lambdas/router.ts',
-          import.meta.url
-        )
-      ),
+      entry: props.handlerFilePath,
       environment: {
-        AWS_CONNECTION_REUSE_ENABLED: '1'
+        AWS_CONNECTION_REUSE_ENABLED: '1',
       },
     });
 
-    this.api = new HttpApi(this, 'TestApi', {
+    this.api = new HttpApi(this, id, {
       corsPreflight: {
         allowOrigins: props.allowedOrigins ?? ['*'],
         allowMethods: [CorsHttpMethod.ANY],
@@ -85,14 +107,15 @@ export class TestApi extends Construct {
       ],
       integration: new HttpLambdaIntegration(
         'RouterIntegration',
-        routerFunction
+        routerFunction,
       ),
     });
 
-    new CfnOutput(this, 'TestApiUrl', { value: this.api.url! });
+    new CfnOutput(this, \`\${id}Url\`, { value: this.api.url! });
 
     RuntimeConfig.ensure(this).config.trpcApis = {
-      'TestApi': this.api.url!
+      ...RuntimeConfig.ensure(this).config.trpcApis!,
+      [id]: this.api.url!,
     };
   }
 
@@ -102,7 +125,7 @@ export class TestApi extends Construct {
         effect: Effect.ALLOW,
         actions: ['execute-api:Invoke'],
         resources: [this.api.arnForExecuteApi('*', '/*', '*')],
-      })
+      }),
     );
   }
 }

package/src/trpc/backend/files/backend/README.md.template

@@ -0,0 +1,33 @@
+# <%= backendProjectName %>
+
+This library was generated with [@aws/nx-plugin](https://github.com/awslabs/nx-plugin-for-aws/).
+
+## Building
+
+Run `<%= pkgMgrCmd %> nx build <%= backendProjectName %> [--skip-nx-cache]` to build the application.
+
+## Running unit tests
+
+Run `<%= pkgMgrCmd %> nx test <%= backendProjectName %>` to execute the unit tests via Vitest.
+
+### Updating snapshots
+
+To update snapshots, run the following command:
+
+`<%= pkgMgrCmd %> nx test <%= backendProjectName %> --configuration=update-snapshot`
+
+## Run lint
+
+Run `<%= pkgMgrCmd %> nx lint <%= backendProjectName %>`
+
+### Fixable issues
+
+You can also automatiaclly fix some lint errors by running the following command:
+
+`<%= pkgMgrCmd %> nx lint <%= backendProjectName %> --configuration=fix`
+
+## Useful links
+
+- [Trpc reference docs](TODO)
+- [Learn more about NX](https://nx.dev/getting-started/intro)
+

package/src/trpc/backend/files/common/constructs/src/app/trpc-apis/__apiNameKebabCase__.ts.template

@@ -0,0 +1,18 @@
+import { Construct } from 'constructs';
+import * as url from 'url';
+import { TrpcApi } from '../../core/trpc-api.js';
+import { HttpIamAuthorizer } from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
+
+export class <%= apiNameClassName %> extends TrpcApi {
+  constructor(scope: Construct, id: string) {
+    super(scope, id, {
+        defaultAuthorizer: new HttpIamAuthorizer(),
+        handlerFilePath: url.fileURLToPath(
+            new URL(
+              '../../../<%= relativePathToProjectRoot %>/backend/src/lambdas/router.ts',
+              import.meta.url
+            )
+          )
+    });
+  }
+}

package/src/trpc/backend/files/common/constructs/src/{__apiNameKebabCase__/index.ts.template → core/trpc-api.ts.template}

@@ -1,7 +1,6 @@
 import { Construct } from 'constructs';
 import { Runtime, RuntimeFamily } from 'aws-cdk-lib/aws-lambda';
 import { CfnOutput, Duration } from 'aws-cdk-lib';
-import * as url from 'url';
 import {
   CorsHttpMethod,
   HttpApi,
@@ -11,35 +10,31 @@ import {
 import { HttpLambdaIntegration } from 'aws-cdk-lib/aws-apigatewayv2-integrations';
 import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Effect, IRole, PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { RuntimeConfig } from '../runtime-config/index.js';
+import { RuntimeConfig } from './runtime-config.js';
 
-export interface <%= apiNameClassName %>Props {
+export interface TrpcApiProps {
+  readonly handlerFilePath: string;
   readonly defaultAuthorizer: IHttpRouteAuthorizer;
   readonly allowedOrigins?: string[];
 }
 
-export class <%= apiNameClassName %> extends Construct {
+export class TrpcApi extends Construct {
   public readonly api: HttpApi;
 
-  constructor(scope: Construct, id: string, props: <%= apiNameClassName %>Props) {
+  constructor(scope: Construct, id: string, props: TrpcApiProps) {
     super(scope, id);
 
-    const routerFunction = new NodejsFunction(this, '<%= apiNameClassName %>Handler', {
+    const routerFunction = new NodejsFunction(this, `${id}Handler`, {
       timeout: Duration.seconds(30),
       runtime: new Runtime('nodejs20.x', RuntimeFamily.NODEJS),
       handler: 'handler',
-      entry: url.fileURLToPath(
-        new URL(
-          '../../<%= relativePathToProjectRoot %>/backend/src/lambdas/router.ts',
-          import.meta.url
-        )
-      ),
+      entry: props.handlerFilePath,
       environment: {
-        AWS_CONNECTION_REUSE_ENABLED: '1'
+        AWS_CONNECTION_REUSE_ENABLED: '1',
       },
     });
 
-    this.api = new HttpApi(this, '<%= apiNameClassName %>', {
+    this.api = new HttpApi(this, id, {
       corsPreflight: {
         allowOrigins: props.allowedOrigins ?? ['*'],
         allowMethods: [CorsHttpMethod.ANY],
@@ -70,10 +65,11 @@ export class <%= apiNameClassName %> extends Construct {
       ),
     });
 
-    new CfnOutput(this, '<%= apiNameClassName %>Url', { value: this.api.url! });
+    new CfnOutput(this, `${id}Url`, { value: this.api.url! });
 
     RuntimeConfig.ensure(this).config.trpcApis = {
-      '<%= apiName %>': this.api.url!
+      ...RuntimeConfig.ensure(this).config.trpcApis!,
+      [id]: this.api.url!,
     };
   }
 

package/src/trpc/backend/files/schema/README.md.template

@@ -0,0 +1,33 @@
+# <%= schemaProjectName %>
+
+This library was generated with [@aws/nx-plugin](https://github.com/awslabs/nx-plugin-for-aws/).
+
+## Building
+
+Run `<%= pkgMgrCmd %> nx build <%= schemaProjectName %> [--skip-nx-cache]` to build the application.
+
+## Running unit tests
+
+Run `<%= pkgMgrCmd %> nx test <%= schemaProjectName %>` to execute the unit tests via Vitest.
+
+### Updating snapshots
+
+To update snapshots, run the following command:
+
+`<%= pkgMgrCmd %> nx test <%= schemaProjectName %> --configuration=update-snapshot`
+
+## Run lint
+
+Run `<%= pkgMgrCmd %> nx lint <%= schemaProjectName %>`
+
+### Fixable issues
+
+You can also automatiaclly fix some lint errors by running the following command:
+
+`<%= pkgMgrCmd %> nx lint <%= schemaProjectName %> --configuration=fix`
+
+## Useful links
+
+- [Trpc reference docs](TODO)
+- [Learn more about NX](https://nx.dev/getting-started/intro)
+

package/src/trpc/backend/generator.js

@@ -9,71 +9,55 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lodash_kebabcase_1 = tslib_1.__importDefault(require("lodash.kebabcase"));
 const shared_constructs_1 = require("../../utils/shared-constructs");
-const typescript_1 = require("typescript");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
 const generator_1 = tslib_1.__importDefault(require("../../ts/lib/generator"));
 const npm_scope_1 = require("../../utils/npm-scope");
 const versions_1 = require("../../utils/versions");
 const paths_1 = require("../../utils/paths");
+const names_1 = require("../../utils/names");
+const ast_1 = require("../../utils/ast");
 const format_1 = require("../../utils/format");
-const toClassName = (str) => {
-    const words = str.replace(/[^a-zA-Z0-9]/g, ' ').split(/\s+/);
-    return words
-        .map((word, index) => {
-        if (index === 0 && /^\d/.test(word)) {
-            return '_' + word;
-        }
-        return word.charAt(0).toUpperCase() + word.slice(1);
-    })
-        .join('');
-};
 function trpcBackendGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         var _a;
         yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
+        const apiNamespace = (0, npm_scope_1.getNpmScopePrefix)(tree);
         const apiNameKebabCase = (0, lodash_kebabcase_1.default)(options.apiName);
-        const apiNameClassName = toClassName(options.apiName);
+        const apiNameClassName = (0, names_1.toClassName)(options.apiName);
         const projectRoot = (0, devkit_1.joinPathFragments)((_a = options.directory) !== null && _a !== void 0 ? _a : '.', apiNameKebabCase);
         const relativePathToProjectRoot = `${(0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, `${(0, npm_scope_1.getNpmScopePrefix)(tree)}common-constructs`), projectRoot)}`;
         const schemaRoot = (0, devkit_1.joinPathFragments)(projectRoot, 'schema');
         const backendRoot = (0, devkit_1.joinPathFragments)(projectRoot, 'backend');
         const backendName = `${apiNameKebabCase}-backend`;
         const schemaName = `${apiNameKebabCase}-schema`;
-        const backendProjectName = `${options.apiNamespace}/${backendName}`;
-        const schemaProjectName = `${options.apiNamespace}/${schemaName}`;
+        const backendProjectName = `${apiNamespace}${backendName}`;
+        const schemaProjectName = `${apiNamespace}${schemaName}`;
         const enhancedOptions = Object.assign({ backendProjectName, backendProjectAlias: (0, npm_scope_1.toScopeAlias)(backendProjectName), schemaProjectName, schemaProjectAlias: (0, npm_scope_1.toScopeAlias)(schemaProjectName), apiNameKebabCase,
             apiNameClassName,
-            relativePathToProjectRoot }, options);
+            relativePathToProjectRoot, pkgMgrCmd: (0, devkit_1.getPackageManagerCommand)().exec }, options);
         yield (0, generator_1.default)(tree, {
-            scope: options.apiNamespace,
             name: backendName,
             directory: projectRoot,
             subDirectory: 'backend',
-            unitTestRunner: options.unitTestRunner,
         });
         yield (0, generator_1.default)(tree, {
-            scope: options.apiNamespace,
             name: schemaName,
             directory: projectRoot,
             subDirectory: 'schema',
-            unitTestRunner: options.unitTestRunner,
         });
-        const constructsPath = (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', apiNameKebabCase, 'index.ts');
-        if (!tree.exists(constructsPath)) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR), enhancedOptions);
-            (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), {});
-            const sharedConstructsIndexTsPath = (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'index.ts');
-            const sharedConstructsIndexContents = tree
-                .read(sharedConstructsIndexTsPath)
-                .toString();
-            const apiExportDeclaration = typescript_1.factory.createExportDeclaration(undefined, undefined, undefined, typescript_1.factory.createStringLiteral(`./${apiNameKebabCase}/index.js`));
-            const updatedIndex = tsquery_1.tsquery
-                .map((0, tsquery_1.ast)(sharedConstructsIndexContents), 'SourceFile', (node) => {
-                return Object.assign(Object.assign({}, node), { statements: [apiExportDeclaration, ...node.statements] });
-            })
-                .getFullText();
-            if (sharedConstructsIndexContents !== updatedIndex) {
-                tree.write(sharedConstructsIndexTsPath, updatedIndex);
+        if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'trpc-apis', `${apiNameKebabCase}.ts`))) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), enhancedOptions, {
+                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            });
+            const shouldGenerateCoreTrpcApiConstruct = !tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'trpc-api.ts'));
+            if (shouldGenerateCoreTrpcApiConstruct) {
+                (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core'), enhancedOptions, {
+                    overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+                });
+            }
+            (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'index.ts'), './trpc-apis/index.js');
+            (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'trpc-apis', 'index.ts'), `./${apiNameKebabCase}.js`);
+            if (shouldGenerateCoreTrpcApiConstruct) {
+                (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'index.ts'), './trpc-api.js');
             }
         }
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(backendRoot, 'project.json'), (config) => {
@@ -82,23 +66,25 @@ function trpcBackendGenerator(tree, options) {
             };
             return config;
         });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'backend'), backendRoot, enhancedOptions);
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'schema'), schemaRoot, enhancedOptions);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'backend'), backendRoot, enhancedOptions, {
+            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        });
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'schema'), schemaRoot, enhancedOptions, {
+            overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        });
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'lib'));
         tree.delete((0, devkit_1.joinPathFragments)(schemaRoot, 'src', 'lib'));
         (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
-            'zod',
-            '@trpc/server',
             'aws-xray-sdk-core',
-            'aws-cdk-lib',
-            'constructs',
+            'zod',
             '@aws-lambda-powertools/logger',
             '@aws-lambda-powertools/metrics',
             '@aws-lambda-powertools/tracer',
+            '@trpc/server',
         ]), (0, versions_1.withVersions)(['@types/aws-lambda']));
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'package.json'));
         tree.delete((0, devkit_1.joinPathFragments)(schemaRoot, 'package.json'));
-        yield (0, format_1.formatFilesInSubtree)(tree, projectRoot);
+        yield (0, format_1.formatFilesInSubtree)(tree);
         return () => {
             (0, devkit_1.installPackagesTask)(tree);
         };

package/src/trpc/backend/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}

package/src/trpc/backend/schema.d.ts

@@ -2,10 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { Linter } from '@nx/eslint';
+
 export interface TrpcBackendGeneratorSchema {
   apiName: string;
-  apiNamespace: string;
   bundler: TsLibGeneratorSchema['bundler'];
   directory?: TsLibGeneratorSchema['directory'];
   unitTestRunner: TsLibGeneratorSchema['unitTestRunner'];
+  linter?: Linter;
 }

package/src/trpc/backend/schema.json

@@ -13,16 +13,6 @@
       },
       "x-prompt": "What name would your API to be? i.e: MyApi"
     },
-    "apiNamespace": {
-      "type": "string",
-      "description": "",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "pattern": "^@[a-z0-9-]+(?:/[a-z0-9-]+)?$",
-      "x-prompt": "What namespace would you like your API to have? i.e: @myapi"
-    },
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",
@@ -36,9 +26,14 @@
       "enum": ["jest", "vitest", "none"],
       "description": "Test runner to use for unit tests.",
       "x-prompt": "Which unit test runner would you like to use?",
-      "default": "vitest",
-      "x-priority": "important"
+      "default": "vitest"
+    },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint"
     }
   },
-  "required": ["apiName", "apiNamespace"]
+  "required": ["apiName"]
 }