framework-do-dede 6.0.2 → 6.0.4

package/README.md

@@ -501,12 +501,26 @@ Interfaces tipadas para padrao de repositorio:
 - `RepositoryNotExistsBy<T>`
 - `RepositoryPagination<T>`
 
-`RepositoryRestore` e `RepositoryRestoreBy` retornam `Optional<T>` para desacoplar a mensagem de erro do repositório:
+`RepositoryRestore` e `RepositoryRestoreBy` podem retornar a entidade diretamente (padrão) ou `Optional<T>` quando quiser usar `orElse*`:
 
 ```ts
 import { Optional } from './src';
 
 class UserRepository {
+  async restore(id: string): Promise<User> {
+    const result = await this.orm
+      .select()
+      .from(userTable)
+      .where(eq(userTable.id, id));
+
+    const row = result[0] ?? null;
+    const model = row ? new UserModel().fromModel(row) : null;
+    if (!model) throw new Error('Usuario nao encontrado');
+    return model.toEntity();
+  }
+}
+
+class UserRepositoryOptional implements RepositoryRestore<User, User, true> {
   async restore(id: string): Promise<Optional<User>> {
     const result = await this.orm
       .select()
@@ -520,12 +534,12 @@ class UserRepository {
   }
 }
 
-const user = await repo.restore('1').orElseThrow('Usuario nao encontrado');
-const userByEmail = await repo.restoreByEmail('a@b.com').orElseNull();
-const userOrThrow = await repo.restoreByEmail('a@b.com').orElseThrow(
+const user = await repo.restore('1');
+const userByEmail = await repo.restoreByEmail('a@b.com');
+const userOrThrow = await repoOptional.restoreByEmail('a@b.com').orElseThrow(
   () => new Unauthorized('Usuario ou senha invalida')
 );
-const userOrThrow2 = await repo.restoreByEmail('a@b.com').orElseThrow(
+const userOrThrow2 = await repoOptional.restoreByEmail('a@b.com').orElseThrow(
   new Unauthorized('Usuario ou senha invalida')
 );
 ```

package/dist/protocols/repository.d.ts

@@ -1,4 +1,5 @@
 import { Entity, Optional } from "../domain";
+type MaybeOptional<TResult, TOptional extends boolean> = TOptional extends true ? Optional<TResult> : TResult;
 export interface RepositoryCreate<T extends Entity> {
     create(input: T): Promise<void>;
 }
@@ -8,14 +9,14 @@ export interface RepositoryUpdate<T extends Entity> {
 export interface RepositoryRemove {
     remove(id: string | number): Promise<void>;
 }
-export interface RepositoryRestore<T extends Entity> {
-    restore(id: string | number): Promise<Optional<T>>;
+export interface RepositoryRestore<T extends Entity, TResult = T, TOptional extends boolean = false> {
+    restore(id: string | number): Promise<MaybeOptional<TResult, TOptional>>;
 }
 export type RepositoryRemoveBy<T> = {
     [K in keyof T & string as `removeBy${Capitalize<K>}`]: (value: T[K]) => Promise<void>;
 };
-export type RepositoryRestoreBy<T> = {
-    [K in keyof T & string as `restoreBy${Capitalize<K>}`]: (value: T[K]) => Promise<Optional<T>>;
+export type RepositoryRestoreBy<TKeys, TResult = TKeys extends Entity ? TKeys : Entity, TOptional extends boolean = false> = {
+    [K in keyof TKeys & string as `restoreBy${Capitalize<K>}`]: (value: TKeys[K]) => Promise<MaybeOptional<TResult, TOptional>>;
 };
 export type RepositoryExistsBy<T> = {
     [K in keyof T & string as `existsBy${Capitalize<K>}`]: (value: T[K]) => Promise<boolean>;
@@ -32,3 +33,4 @@ export interface RepositoryPagination<T> {
         };
     }): Promise<T>;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-do-dede",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",