get the project in a buildable state

accounting-service-api/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ftgo/accounting-service-api",
   "version": "0.0.1",
+  "type": "module",
   "dependencies": {
     "tslib": "^2.3.0"
   },
-  "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
   "private": true
 }

accounting-service-api/src/index.ts

@@ -1,2 +1,2 @@
-export * from './lib/entities';
-export * from './lib/service';
+export * from './lib/entities.js';
+export * from './lib/service.js';

accounting-service-api/src/lib/entities.ts

@@ -0,0 +1,13 @@
+import { entity, JSONEntity, JSONPartial, uuid, UUID } from '@deepkit/type';
+
+import { Consumer } from '@ftgo/consumer-service-api';
+
+@entity.name('account')
+export class Account {
+  readonly id: UUID = uuid();
+  readonly consumerId: Consumer['id'];
+
+  static create(data: JSONPartial<Account>): Account {
+    return Object.assign(new Account(), data);
+  }
+}

accounting-service-api/tsconfig.lib.json

@@ -3,6 +3,8 @@
   "compilerOptions": {
     "outDir": "../dist/out-tsc",
     "declaration": true,
+    "module": "esnext",
+    "moduleResolution": "node",
     "types": ["node"]
   },
   "include": ["src/**/*.ts"],

accounting-service/project.json

@@ -10,13 +10,9 @@
       "executor": "@nx/vite:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "development",
-      "inputs": ["accounting-service"],
       "options": {
-        "buildLibsFromSource": false,
-        "generatePackageJson": true,
         "outputPath": "dist/accounting-service",
         "ssr": "src/main.ts",
-        "emptyOutDir": true,
         "outputFileName": "main.mjs"
       },
       "configurations": {

accounting-service/src/account.repository.ts

@@ -1,4 +1,4 @@
-import { Repository } from '@ftgo/common';
+import { RestateRepository } from '@ftgo/common';
 import { Account } from '@ftgo/accounting-service-api';
 
-export class AccountRepository extends Repository(Account) {}
+export class AccountRepository extends RestateRepository(Account) {}

accounting-service/src/accounting.service.ts

@@ -1,12 +1,12 @@
 import { restate, RestateServiceContext } from 'deepkit-restate';
 
+import { Consumer, KafkaConsumerTopic } from '@ftgo/consumer-service-api';
 import {
   AccountingServiceApi,
   AccountingServiceHandlers,
 } from '@ftgo/accounting-service-api';
-import { Consumer, KafkaConsumerTopic } from '@ftgo/consumer-service-api';
 
-import { AccountRepository } from './account.repository';
+import { AccountRepository } from './account.repository.js';
 
 @restate.service<AccountingServiceApi>()
 export class AccountingService implements AccountingServiceHandlers {

accounting-service/src/main.ts

@@ -5,9 +5,9 @@ import { RestateModule } from 'deepkit-restate';
 import { provideDatabase } from '@ftgo/common';
 import { Account } from '@ftgo/accounting-service-api';
 
-import { AccountingServiceConfig } from './config';
-import { AccountingService } from './accounting.service';
-import { AccountRepository } from './account.repository';
+import { AccountingServiceConfig } from './config.js';
+import { AccountingService } from './accounting.service.js';
+import { AccountRepository } from './account.repository.js';
 
 void new App({
   config: AccountingServiceConfig,

common/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ftgo/common",
   "version": "0.0.1",
+  "type": "module",
   "dependencies": {
     "tslib": "^2.3.0"
   },
-  "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
   "private": true
 }

common/project.json

@@ -19,7 +19,7 @@
       "executor": "@nx/vite:test",
       "outputs": ["{options.reportsDirectory}"],
       "options": {
-        "reportsDirectory": "../coverage/common"
+        "reportsDirectory": "../../coverage/common"
       }
     }
   }

common/src/index.ts

@@ -1,5 +1,5 @@
-export * from './lib/config';
-export * from './lib/database';
-export * from './lib/entities';
-export * from './lib/repository';
-export * from './lib/types';
+export * from './lib/config.js';
+export * from './lib/database.js';
+export * from './lib/entities.js';
+export * from './lib/repository.js';
+export * from './lib/types.js';

common/src/lib/config.ts

@@ -14,5 +14,5 @@ export class DatabaseConfig {
 export class ServiceConfig {
   readonly database: DatabaseConfig;
   readonly restate: RestateConfig;
-  readonly framework?: FrameworkConfig;
+  readonly framework: FrameworkConfig = new FrameworkConfig();
 }

common/src/lib/database.ts

@@ -3,20 +3,20 @@ import { PostgresDatabaseAdapter } from '@deepkit/postgres';
 import { ClassType } from '@deepkit/core';
 import { FactoryProvider } from '@deepkit/injector';
 
-import { DatabaseConfig } from './config';
+import { DatabaseConfig } from './config.js';
 
 export class Database extends OrmDatabase {
   constructor(
     { user, host, password, port, name, schema }: DatabaseConfig,
-    entities: readonly ClassType[],
+    entities: ClassType[],
   ) {
     const uri = `postgres://${user}:${password}@${host}:${port}/${name}?schema=${schema}`;
     super(new PostgresDatabaseAdapter(uri), entities);
   }
 }
 
 export function provideDatabase(
-  entities: readonly ClassType[],
+  entities: ClassType[],
 ): FactoryProvider<Database> {
   return {
     provide: Database,

common/src/lib/entities.ts

@@ -1,7 +1,7 @@
-import {float} from "@deepkit/type";
+import { float } from '@deepkit/type';
 
 export class Money {
-  static ZERO = new Money(0)
+  static ZERO = new Money(0);
 
   constructor(readonly amount: float) {}
 

common/src/lib/repository.ts

@@ -1,5 +1,15 @@
 import { ClassType } from '@deepkit/core';
-import { ChangesInterface, DeepPartial, JSONEntity } from '@deepkit/type';
+import {
+  ChangesInterface,
+  DeepPartial,
+  JSONEntity,
+  JSONPartial,
+} from '@deepkit/type';
+import {
+  RestateContextStorage,
+  RestateCustomContext,
+  RunAction,
+} from 'deepkit-restate';
 import {
   Database,
   DatabaseQueryModel,
@@ -8,37 +18,58 @@ import {
   PatchResult,
 } from '@deepkit/orm';
 
-export function Repository<T extends OrmEntity>(
-  entity: ClassType<T> & { create(data: JSONEntity<T>): T },
+export function RestateRepository<T extends OrmEntity>(
+  entity: ClassType<T> & { create(data: JSONPartial<T>): T },
 ) {
-  return class BaseRepository {
-    constructor(readonly database: Database) {}
+  return class Repository {
+    constructor(
+      readonly contextStorage: RestateContextStorage,
+      readonly database: Database,
+    ) {}
 
-    async findOne(filter: DatabaseQueryModel<T>['filter']): Promise<T> {
-      return await this.database.query(entity).filter(filter).findOne();
+    get #ctx(): Pick<RestateCustomContext, 'run'> {
+      return (
+        this.contextStorage.getStore() || {
+          run: async (action: RunAction<any>) => action(),
+        }
+      );
     }
 
-    async deleteOne(
+    // async findOne(filter: DatabaseQueryModel<T>['filter']): Promise<T> {
+    //   return await this.database.query(entity).filter(filter).findOne();
+    // }
+
+    async delete(
       filter: DatabaseQueryModel<T>['filter'],
     ): Promise<DeleteResult<T>> {
-      return await this.database.query(entity).filter(filter).deleteOne();
+      return await this.#ctx.run<DeleteResult<T>>(() =>
+        this.database.query(entity).filter(filter).deleteOne(),
+      );
     }
 
-    async find(filter: DatabaseQueryModel<T>['filter']): Promise<readonly T[]> {
-      return await this.database.query(entity).filter(filter).find();
+    // async find(filter: DatabaseQueryModel<T>['filter']): Promise<readonly T[]> {
+    //   return await this.database.query(entity).filter(filter).find();
+    // }
+
+    async find(filter: DatabaseQueryModel<T>['filter']): Promise<T> {
+      return await this.database.query(entity).filter(filter).findOne();
     }
 
     async update(
       filter: DatabaseQueryModel<T>['filter'],
       changes: ChangesInterface<T> | DeepPartial<T>,
     ): Promise<PatchResult<T>> {
-      return await this.database.query(entity).filter(filter).patchOne(changes);
+      return await this.#ctx.run<PatchResult<T>>(() =>
+        this.database.query(entity).filter(filter).patchOne(changes),
+      );
     }
 
-    async create(data: JSONEntity<T>): Promise<T> {
-      const et = entity.create(data);
-      await this.database.persist(et);
-      return et;
+    async create(data: JSONPartial<T>): Promise<T> {
+      return await this.#ctx.run<T>(async () => {
+        const et = entity.create(data);
+        await this.database.persist(et);
+        return et;
+      });
     }
   };
 }

common/tsconfig.lib.json

@@ -3,6 +3,8 @@
   "compilerOptions": {
     "outDir": "../dist/out-tsc",
     "declaration": true,
+    "module": "esnext",
+    "moduleResolution": "node",
     "types": ["node"]
   },
   "include": ["src/**/*.ts"],

consumer-service-api/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ftgo/consumer-service-api",
   "version": "0.0.1",
+  "type": "module",
   "dependencies": {
     "tslib": "^2.3.0"
   },
-  "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
   "private": true
 }

consumer-service-api/src/index.ts

@@ -1,3 +1,3 @@
-export * from './lib/entities';
-export * from './lib/service';
-export * from './lib/topics';
+export * from './lib/entities.js';
+export * from './lib/service.js';
+export * from './lib/topics.js';

consumer-service-api/src/lib/entities.ts

@@ -0,0 +1,20 @@
+import {
+  entity,
+  JSONEntity,
+  JSONPartial,
+  PrimaryKey,
+  uuid,
+  UUID,
+} from '@deepkit/type';
+
+import { PersonName } from '@ftgo/common';
+
+@entity.name('consumer')
+export class Consumer {
+  readonly id: UUID & PrimaryKey = uuid();
+  readonly name: PersonName;
+
+  static create(data: JSONPartial<Consumer>) {
+    return Object.assign(new Consumer(), data);
+  }
+}

consumer-service-api/src/lib/topics.ts

@@ -1,6 +1,6 @@
 import { RestateKafkaTopic } from 'deepkit-restate';
 
-import { Consumer } from './entities';
+import { Consumer } from './entities.js';
 
 export type KafkaConsumerTopic = RestateKafkaTopic<
   'consumer',

consumer-service-api/tsconfig.lib.json

@@ -3,6 +3,8 @@
   "compilerOptions": {
     "outDir": "../dist/out-tsc",
     "declaration": true,
+    "module": "esnext",
+    "moduleResolution": "node",
     "types": ["node"]
   },
   "include": ["src/**/*.ts"],

consumer-service/project.json

@@ -10,13 +10,9 @@
       "executor": "@nx/vite:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "development",
-      "inputs": ["consumer-service"],
       "options": {
-        "buildLibsFromSource": false,
-        "generatePackageJson": true,
         "outputPath": "dist/consumer-service",
         "ssr": "src/main.ts",
-        "emptyOutDir": true,
         "outputFileName": "main.mjs"
       },
       "configurations": {

consumer-service/src/consumer.repository.ts

@@ -1,4 +1,4 @@
-import { Repository } from '@ftgo/common';
+import { RestateRepository } from '@ftgo/common';
 import { Consumer } from '@ftgo/consumer-service-api';
 
-export class ConsumerRepository extends Repository(Consumer) {}
+export class ConsumerRepository extends RestateRepository(Consumer) {}

consumer-service/src/consumer.service.ts

@@ -2,15 +2,15 @@ import { restate, RestateServiceContext } from 'deepkit-restate';
 import { RestateKafkaProducer } from 'deepkit-restate/kafka';
 import { UUID } from '@deepkit/type';
 
+import { PersonName } from '@ftgo/common';
 import {
   Consumer,
   ConsumerServiceApi,
   ConsumerServiceHandlers,
   KafkaConsumerTopic,
 } from '@ftgo/consumer-service-api';
-import { PersonName } from '@ftgo/common';
 
-import { ConsumerRepository } from './consumer.repository';
+import { ConsumerRepository } from './consumer.repository.js';
 
 @restate.service<ConsumerServiceApi>()
 export class ConsumerService implements ConsumerServiceHandlers {
@@ -26,5 +26,6 @@ export class ConsumerService implements ConsumerServiceHandlers {
       this.consumer.create({ name }),
     );
     await this.kafka.produce<KafkaConsumerTopic>([consumer]);
+    return consumer.id;
   }
 }