fix: move example-architecture into src and setup tsconfig for build

aleios-cloud · Oct 19, 2023 · 33b53f3 · 33b53f3
1 parent 8f6fe25
commit 33b53f3
Show file tree

Hide file tree

Showing 33 changed files with 41 additions and 23 deletions.
diff --git a/example-architecture/tsconfig.json b/example-architecture/tsconfig.json
diff --git a/src/classes/Event.ts b/src/classes/Event.ts
@@ -4,7 +4,7 @@ import {
   type PutEventsResponse,
   type PutEventsResultEntry,
 } from "@aws-sdk/client-eventbridge";
-import { Contract, Detail } from "src/types/Contract";
+import { Contract, Detail } from "types/Contract";
 
 export const eventBridge = new EventBridgeClient({});
 
@@ -44,7 +44,7 @@ export class Event implements Contract {
 
   publish = async (
     eventBusArn: string,
-    eventSource: string,
+    eventSource: string
   ): Promise<PutEventsResponse> => {
     const params = {
       Entries: [
@@ -58,13 +58,13 @@ export class Event implements Contract {
     };
 
     const eventBridgeResponse = await eventBridge.send(
-      new PutEventsCommand(params),
+      new PutEventsCommand(params)
     );
     if (eventBridgeResponse.Entries === undefined) {
       console.error("Error publishing event to event bus");
     } else {
       eventBridgeResponse.Entries.forEach((entry) =>
-        logResponseOnPublishFailure(entry),
+        logResponseOnPublishFailure(entry)
       );
     }
 

diff --git a/src/classes/__tests__/Event.test.ts b/src/classes/__tests__/Event.test.ts
@@ -1,6 +1,6 @@
 import { PutEventsCommand } from "@aws-sdk/client-eventbridge";
-import { Event } from "src/classes";
-import { Contract, Detail } from "src/types";
+import { Event } from "classes";
+import { Contract, Detail } from "types";
 import { describe, expect, it, vi } from "vitest";
 
 type MockDataDetail = {
@@ -73,7 +73,7 @@ describe("Given an Event class", () => {
       await event.publish("MOCK_EVENT_BUS_ARN", "mockSource");
       expect(mockSend).toHaveBeenCalled();
       expect(consoleMock).toHaveBeenCalledWith(
-        "Error publishing event to event bus",
+        "Error publishing event to event bus"
       );
     });
 
@@ -90,7 +90,7 @@ describe("Given an Event class", () => {
         {
           ErrorCode: "mockErrorCode",
           ErrorMessage: "mockErrorMessage",
-        },
+        }
       );
     });
   });

diff --git a/example-architecture/.DS_Store → src/example-architecture/.DS_Store b/example-architecture/.DS_Store → src/example-architecture/.DS_Store
diff --git a/...__tests__/importEvent.integration.test.ts → ...__tests__/importEvent.integration.test.ts b/...__tests__/importEvent.integration.test.ts → ...__tests__/importEvent.integration.test.ts
diff --git a/...ple-architecture/consumer/bin/consumer.ts → ...ple-architecture/consumer/bin/consumer.ts b/...ple-architecture/consumer/bin/consumer.ts → ...ple-architecture/consumer/bin/consumer.ts
@@ -1,6 +1,5 @@
 import { App } from "aws-cdk-lib";
-
-import { ConsumerStack } from "../lib/consumerStack";
+import { ConsumerStack } from "example-architecture/consumer/lib/consumerStack";
 
 const app = new App();
 new ConsumerStack(app, "ConsumerStack");
diff --git a/example-architecture/consumer/cdk.json → src/example-architecture/consumer/cdk.json b/example-architecture/consumer/cdk.json → src/example-architecture/consumer/cdk.json
diff --git a/...ctions/consumer/__tests__/handler.test.ts → ...ctions/consumer/__tests__/handler.test.ts b/...ctions/consumer/__tests__/handler.test.ts → ...ctions/consumer/__tests__/handler.test.ts
diff --git a/...ure/consumer/functions/consumer/config.ts → ...ure/consumer/functions/consumer/config.ts b/...ure/consumer/functions/consumer/config.ts → ...ure/consumer/functions/consumer/config.ts
diff --git a/...re/consumer/functions/consumer/handler.ts → ...re/consumer/functions/consumer/handler.ts b/...re/consumer/functions/consumer/handler.ts → ...re/consumer/functions/consumer/handler.ts
@@ -1,7 +1,7 @@
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient, PutCommand } from "@aws-sdk/lib-dynamodb";
 import { getEnvVariable } from "example-architecture/helpers/getEnvVariable";
-import { Contract } from "src/types/Contract";
+import { Contract } from "types/Contract";
 
 type EventBridgeConsumerEvent = {
   id: string;
@@ -14,7 +14,7 @@ type EventBridgeConsumerEvent = {
 } & Contract;
 
 export const handler = async (
-  event: EventBridgeConsumerEvent,
+  event: EventBridgeConsumerEvent
 ): Promise<void> => {
   const dynamoDB = DynamoDBDocumentClient.from(new DynamoDBClient());
 

diff --git a/...rchitecture/consumer/lib/consumerStack.ts → ...rchitecture/consumer/lib/consumerStack.ts b/...rchitecture/consumer/lib/consumerStack.ts → ...rchitecture/consumer/lib/consumerStack.ts
diff --git a/example-architecture/consumer/package.json → ...xample-architecture/consumer/package.json b/example-architecture/consumer/package.json → ...xample-architecture/consumer/package.json
diff --git a/example-architecture/consumer/pnpm-lock.yaml → ...mple-architecture/consumer/pnpm-lock.yaml b/example-architecture/consumer/pnpm-lock.yaml → ...mple-architecture/consumer/pnpm-lock.yaml
diff --git a/example-architecture/events/bin/events.ts → ...example-architecture/events/bin/events.ts b/example-architecture/events/bin/events.ts → ...example-architecture/events/bin/events.ts
diff --git a/example-architecture/events/cdk.json → src/example-architecture/events/cdk.json b/example-architecture/events/cdk.json → src/example-architecture/events/cdk.json
diff --git a/...s/contracts/personRegisteredContractV1.ts → ...s/contracts/personRegisteredContractV1.ts b/...s/contracts/personRegisteredContractV1.ts → ...s/contracts/personRegisteredContractV1.ts
@@ -1,4 +1,4 @@
-import { Contract } from "src/types";
+import { Contract } from "types";
 export interface PersonRegisteredContract extends Contract {
   "detail-type": "PersonRegisteredContract";
   detail: {

diff --git a/...s/contracts/personRegisteredContractV2.ts → ...s/contracts/personRegisteredContractV2.ts b/...s/contracts/personRegisteredContractV2.ts → ...s/contracts/personRegisteredContractV2.ts
@@ -1,4 +1,4 @@
-import { Contract } from "src/types";
+import { Contract } from "types";
 export interface PersonRegisteredContract extends Contract {
   "detail-type": "PersonRegisteredContract";
   detail: {

diff --git a/...le-architecture/events/lib/eventsStack.ts → ...le-architecture/events/lib/eventsStack.ts b/...le-architecture/events/lib/eventsStack.ts → ...le-architecture/events/lib/eventsStack.ts
diff --git a/example-architecture/events/package.json → src/example-architecture/events/package.json b/example-architecture/events/package.json → src/example-architecture/events/package.json
diff --git a/example-architecture/events/pnpm-lock.yaml → ...xample-architecture/events/pnpm-lock.yaml b/example-architecture/events/pnpm-lock.yaml → ...xample-architecture/events/pnpm-lock.yaml
diff --git a/...lpers/__tests__/getCdkHandlerPath.test.ts → ...lpers/__tests__/getCdkHandlerPath.test.ts b/...lpers/__tests__/getCdkHandlerPath.test.ts → ...lpers/__tests__/getCdkHandlerPath.test.ts
diff --git a/...architecture/helpers/getCdkHandlerPath.ts → ...architecture/helpers/getCdkHandlerPath.ts b/...architecture/helpers/getCdkHandlerPath.ts → ...architecture/helpers/getCdkHandlerPath.ts
diff --git a/...le-architecture/helpers/getEnvVariable.ts → ...le-architecture/helpers/getEnvVariable.ts b/...le-architecture/helpers/getEnvVariable.ts → ...le-architecture/helpers/getEnvVariable.ts
diff --git a/...ple-architecture/producer/bin/producer.ts → ...ple-architecture/producer/bin/producer.ts b/...ple-architecture/producer/bin/producer.ts → ...ple-architecture/producer/bin/producer.ts
diff --git a/example-architecture/producer/cdk.json → src/example-architecture/producer/cdk.json b/example-architecture/producer/cdk.json → src/example-architecture/producer/cdk.json
diff --git a/...ctions/producer/__tests__/handler.test.ts → ...ctions/producer/__tests__/handler.test.ts b/...ctions/producer/__tests__/handler.test.ts → ...ctions/producer/__tests__/handler.test.ts
@@ -9,7 +9,7 @@ mockPublish.mockReturnValue({
   eventId: "mockEventId",
 });
 
-vi.mock("src/classes/Event", () => {
+vi.mock("classes/Event", () => {
   return {
     Event: vi.fn().mockReturnValue({
       publish: mockPublish,

diff --git a/...ure/producer/functions/producer/config.ts → ...ure/producer/functions/producer/config.ts b/...ure/producer/functions/producer/config.ts → ...ure/producer/functions/producer/config.ts
diff --git a/...re/producer/functions/producer/handler.ts → ...re/producer/functions/producer/handler.ts b/...re/producer/functions/producer/handler.ts → ...re/producer/functions/producer/handler.ts
@@ -1,7 +1,7 @@
 import { type PutEventsResponse } from "@aws-sdk/client-eventbridge";
 import { PersonRegisteredContract } from "example-architecture/events/contracts/personRegisteredContractV1";
 import { getEnvVariable } from "example-architecture/helpers/getEnvVariable";
-import { Event } from "src/classes/Event";
+import { Event } from "classes/Event";
 
 export const handler = async (): Promise<PutEventsResponse> => {
   const contract: PersonRegisteredContract = {

diff --git a/...rchitecture/producer/lib/producerStack.ts → ...rchitecture/producer/lib/producerStack.ts b/...rchitecture/producer/lib/producerStack.ts → ...rchitecture/producer/lib/producerStack.ts
diff --git a/example-architecture/producer/package.json → ...xample-architecture/producer/package.json b/example-architecture/producer/package.json → ...xample-architecture/producer/package.json
diff --git a/example-architecture/producer/pnpm-lock.yaml → ...mple-architecture/producer/pnpm-lock.yaml b/example-architecture/producer/pnpm-lock.yaml → ...mple-architecture/producer/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",
-    "baseUrl": ".",
+    "baseUrl": "src",
     "esModuleInterop": true,
     "declaration": true, // generate .d.ts files
     "sourceMap": true, // show TS sourcemap
@@ -13,8 +13,7 @@
     "strict": true,
     "skipLibCheck": true
   },
-  "include": ["src/**/*.ts"],
-  "exclude": ["src/**/*.test.ts"],
+  "include": ["**/*.ts"],
   "ts-node": {
     "compilerOptions": {
       "module": "NodeNext"

diff --git a/tsconfig.prod.json b/tsconfig.prod.json
@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "baseUrl": "src",
+    "esModuleInterop": true,
+    "declaration": true, // generate .d.ts files
+    "sourceMap": true, // show TS sourcemap
+    "outDir": "./dist",
+    "types": ["node"],
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": ["src"],
+  "exclude": ["**/*.test.ts", "src/example-architecture"],
+  "ts-node": {
+    "compilerOptions": {
+      "module": "NodeNext"
+    },
+    "require": ["tsconfig-paths/register"]
+  }
+}