@sentzunhat/zacatl 0.0.13 → 0.0.14

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentzunhat/zacatl",
   "main": "src/index.ts",
   "module": "src/index.ts",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/sentzunhat/zacatl.git"

package/src/micro-service/architecture/application/application.ts

@@ -1,15 +1,11 @@
 import i18n from "i18n";
 import path from "path";
 
-import { AbstractArchitecture } from "../architecture";
+import { AbstractArchitecture, Constructor } from "../architecture";
 import { HookHandler, RouteHandler } from "./entry-points/rest";
 
-export type ApplicationHookHandlers = Array<
-  new (...args: unknown[]) => HookHandler
->;
-export type ApplicationRouteHandlers = Array<
-  new (...args: unknown[]) => RouteHandler
->;
+export type ApplicationHookHandlers = Array<Constructor<HookHandler>>;
+export type ApplicationRouteHandlers = Array<Constructor<RouteHandler>>;
 
 export type ApplicationEntryPoints = {
   rest: {

package/src/micro-service/architecture/application/entry-points/rest/route-handlers/route-handler.ts

@@ -6,10 +6,11 @@ export type RouteHandler<
   TBody = void,
   TQuerystring = void,
   TParams = void,
-  THeaders = void
+  THeaders = void,
+  TReply = unknown
 > = {
   url: string;
   method: HTTPMethods;
   schema: FastifySchema;
-  execute: Handler<TBody, TQuerystring, TParams, THeaders>;
+  execute: Handler<TBody, TQuerystring, TParams, THeaders, TReply>;
 };

package/src/micro-service/architecture/architecture.ts

@@ -1,5 +1,7 @@
 import { container } from "tsyringe";
 
+export type Constructor<T = unknown> = new (...args: unknown[]) => T;
+
 type Architecture = {
   start: () => void;
 };
@@ -9,7 +11,7 @@ export abstract class AbstractArchitecture implements Architecture {
    * A generic helper method to register an array of handler classes.
    * @param handlers - An array of class constructors that implement the handler functionality.
    */
-  protected registerDependencies<T>(dependencies: Array<new () => T>): void {
+  protected registerDependencies<T>(dependencies: Array<Constructor<T>>): void {
     for (const dependency of dependencies) {
       const instance = new dependency();
 

package/src/micro-service/architecture/domain/domain.ts

@@ -1,7 +1,7 @@
-import { AbstractArchitecture } from "../architecture";
+import { AbstractArchitecture, Constructor } from "../architecture";
 
 export type ConfigDomain = {
-  providers: Array<new (...args: unknown[]) => unknown>;
+  providers: Array<Constructor>;
 };
 
 export class Domain extends AbstractArchitecture {

package/src/micro-service/architecture/infrastructure/infrastructure.ts

@@ -1,7 +1,7 @@
-import { AbstractArchitecture } from "../architecture";
+import { AbstractArchitecture, Constructor } from "../architecture";
 
 export type ConfigInfrastructure = {
-  repositories: Array<new (...args: unknown[]) => unknown>;
+  repositories: Array<Constructor>;
 };
 
 export class Infrastructure extends AbstractArchitecture {

package/src/micro-service/architecture/infrastructure/repositories/abstract.ts

@@ -43,6 +43,28 @@ export abstract class BaseRepository<D, T> implements Repository<D, T> {
     return this.implementation.model;
   }
 
+  public isMongoose(): boolean {
+    return this.implementation instanceof MongooseRepository;
+  }
+
+  public isSequelize(): boolean {
+    return this.implementation instanceof SequelizeRepository;
+  }
+
+  public getMongooseModel(): MongooseModel<D> {
+    if (!this.isMongoose()) {
+      throw new Error("Repository is not using Mongoose");
+    }
+    return this.implementation.model as MongooseModel<D>;
+  }
+
+  public getSequelizeModel(): ModelCtor<any> {
+    if (!this.isSequelize()) {
+      throw new Error("Repository is not using Sequelize");
+    }
+    return this.implementation.model as ModelCtor<any>;
+  }
+
   public toLean(input: ToLeanInput<D, T>): LeanDocument<T> | null {
     return this.implementation.toLean(input);
   }

package/test/unit/micro-service/architecture/infrastructure/repositories/abstract.test.ts

@@ -29,14 +29,14 @@ describe("BaseRepository", () => {
   });
 
   it("should create a model using the provided name and schema", async () => {
-    expect((repository.model as any).modelName).toBe("User");
-    expect((repository.model as any).schema).toBe(schemaUserTest);
+    expect(repository.getMongooseModel().modelName).toBe("User");
+    expect(repository.getMongooseModel().schema).toBe(schemaUserTest);
   });
 
   it("should call create() and return the created user document", async () => {
     const user = { name: "Alice" };
 
-    const spyFunction = vi.spyOn(repository.model as any, "create");
+    const spyFunction = vi.spyOn(repository.getMongooseModel(), "create");
 
     const result = await repository.create(user);
 
@@ -46,7 +46,7 @@ describe("BaseRepository", () => {
 
   it("should call findById() and return the user document", async () => {
     const user = await repository.create({ name: "Alice" });
-    const spyFunction = vi.spyOn(repository.model as any, "findById");
+    const spyFunction = vi.spyOn(repository.getMongooseModel(), "findById");
     const result = await repository.findById(user.id);
     expect(spyFunction).toHaveBeenNthCalledWith(1, user.id);
     expect(result).toMatchObject({ name: user.name });
@@ -58,7 +58,10 @@ describe("BaseRepository", () => {
 
     const update = { name: "Alice Updated" };
 
-    const spyFunction = vi.spyOn(repository.model as any, "findByIdAndUpdate");
+    const spyFunction = vi.spyOn(
+      repository.getMongooseModel(),
+      "findByIdAndUpdate"
+    );
 
     const result = await repository.update(user.id, update);
 
@@ -70,7 +73,10 @@ describe("BaseRepository", () => {
 
   it("should call delete() and return the deleted user document", async () => {
     const user = await repository.create({ name: "Alice" });
-    const spyFunction = vi.spyOn(repository.model as any, "findByIdAndDelete");
+    const spyFunction = vi.spyOn(
+      repository.getMongooseModel(),
+      "findByIdAndDelete"
+    );
     const result = await repository.delete(user.id);
     expect(spyFunction).toHaveBeenNthCalledWith(1, user.id);
     // Patch: allow for id only (ignore _id)