framework-do-dede 6.0.0 → 6.0.2

package/README.md

@@ -346,12 +346,9 @@ class CreatePhotoUseCase extends UseCase<void, void> {
 Entities sao dominio puro. `Model` vive na borda e faz o mapeamento banco <-> model, alem de converter `Entity` <-> `Model`. Repositorios trabalham com `Model`, nao com `Entity`.
 
 ```ts
-import { Entity, Model, model, column } from './src';
+import { Entity, Model, column } from './src';
 
-type UserTable = 'users';
-
-@model<UserTable>('users')
-class UserModel extends Model<UserTable, User> {
+class UserModel extends Model<User> {
   @column('id')
   id!: string;
 
@@ -398,7 +395,7 @@ return Optional.ofNullable(model);
 
 Regras principais:
 
-- `Model` guarda metadados de coluna (via `@column`) e nome da tabela (via `@model`)
+- `Model` guarda metadados de coluna (via `@column`)
 - `fromModel` aplica o mapeamento coluna -> propriedade e ignora `null/undefined` (retorna o proprio model)
 - `fromEntity` / `toEntity` fazem a conversao entity <-> model
 - `Entity` recebe o `Model` no construtor (acoplamento forte na borda)
@@ -494,11 +491,10 @@ Quando um erro e lancado, o handler padroniza a resposta. Erros de dominio (`App
 Interfaces tipadas para padrao de repositorio:
 
 - `Optional<T>` (helper inspirado em micronaut/spring)
-- `RepositoryModel` (base para o acoplamento do repositorio com Model)
-- `RepositoryCreate<T extends RepositoryModel>`
-- `RepositoryUpdate<T extends RepositoryModel>`
+- `RepositoryCreate<T extends Entity>`
+- `RepositoryUpdate<T extends Entity>`
 - `RepositoryRemove`
-- `RepositoryRestore<T extends RepositoryModel>`
+- `RepositoryRestore<T extends Entity>`
 - `RepositoryRemoveBy<T>`
 - `RepositoryRestoreBy<T>`
 - `RepositoryExistsBy<T>`
@@ -511,7 +507,7 @@ Interfaces tipadas para padrao de repositorio:
 import { Optional } from './src';
 
 class UserRepository {
-  async restore(id: string): Promise<Optional<UserModel>> {
+  async restore(id: string): Promise<Optional<User>> {
     const result = await this.orm
       .select()
       .from(userTable)
@@ -519,12 +515,19 @@ class UserRepository {
 
     const row = result[0] ?? null;
     const model = row ? new UserModel().fromModel(row) : null;
-    return Optional.ofNullable(model);
+    const entity = model ? model.toEntity() : null;
+    return Optional.ofNullable(entity);
   }
 }
 
 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(
+  () => new Unauthorized('Usuario ou senha invalida')
+);
+const userOrThrow2 = await repo.restoreByEmail('a@b.com').orElseThrow(
+  new Unauthorized('Usuario ou senha invalida')
+);
 ```
 
 ## Exemplos

package/dist/application/index.d.ts

@@ -1,8 +1,8 @@
 import { Controller, Post, Get, Put, Delete, Patch, UseMiddleware, UseMiddlewares, Tracing, Version, PresetIgnore, type Middleware, type Input, type Tracer, type TracerData } from './controller';
 import { Entity, Restrict, VirtualProperty, GetterPrefix, Transform } from '../infra/serialization/entity';
-import { Model, model, column } from '../infra/model/model';
+import { Model, column } from '../infra/model/model';
 import { DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter } from './usecase';
-export { Controller, UseMiddleware, UseMiddlewares, Post, Get, Put, Delete, Patch, Tracing, Version, PresetIgnore, DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, };
+export { Controller, UseMiddleware, UseMiddlewares, Post, Get, Put, Delete, Patch, Tracing, Version, PresetIgnore, DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, };
 export { Storage, CacheGateway, EventDispatcher } from './services';
 export type { Middleware, Input, Tracer, TracerData };
 export type { StorageGateway } from './services';

package/dist/application/index.js

@@ -1,6 +1,6 @@
 import { Controller, Post, Get, Put, Delete, Patch, UseMiddleware, UseMiddlewares, Tracing, Version, PresetIgnore } from './controller';
 import { Entity, Restrict, VirtualProperty, GetterPrefix, Transform } from '../infra/serialization/entity';
-import { Model, model, column } from '../infra/model/model';
+import { Model, column } from '../infra/model/model';
 import { DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, } from './usecase';
-export { Controller, UseMiddleware, UseMiddlewares, Post, Get, Put, Delete, Patch, Tracing, Version, PresetIgnore, DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, };
+export { Controller, UseMiddleware, UseMiddlewares, Post, Get, Put, Delete, Patch, Tracing, Version, PresetIgnore, DecorateUseCase, UseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, };
 export { Storage, CacheGateway, EventDispatcher } from './services';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Post, Get, Put, Delete, Patch, Controller, Input, Version, PresetIgnore, Middleware, UseMiddleware, UseMiddlewares, Tracer, Tracing, TracerData, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher } from "./application";
+import { Post, Get, Put, Delete, Patch, Controller, Input, Version, PresetIgnore, Middleware, UseMiddleware, UseMiddlewares, Tracer, Tracing, TracerData, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher } from "./application";
 import { Container, DefaultContainer, Inject, setDefaultContainer } from './infra/di/registry';
 import { Dede, type Options, Register } from './dede';
 import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError, CustomServerError } from './http/errors/server';
@@ -8,5 +8,5 @@ import type { ValidatorDefinition } from './interface/validation/validator';
 import type { StorageGateway, Event, EventPayload } from './application';
 import { RepositoryModel } from './protocols/model';
 import type { RepositoryCreate, RepositoryUpdate, RepositoryRemove, RepositoryRemoveBy, RepositoryExistsBy, RepositoryRestore, RepositoryRestoreBy, RepositoryNotExistsBy, RepositoryPagination } from './protocols/repository';
-export { Controller, Post, Get, Put, Delete, Patch, Input, Version, PresetIgnore, Middleware, UseMiddleware, UseMiddlewares, Tracer, Tracing, TracerData, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher, Inject, Container, DefaultContainer, setDefaultContainer, Dede, Options, Register, ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError, CustomServerError, AppError, Optional, RepositoryModel, RepositoryCreate, RepositoryUpdate, RepositoryRemove, RepositoryRemoveBy, RepositoryRestore, RepositoryExistsBy, RepositoryRestoreBy, RepositoryNotExistsBy, RepositoryPagination };
+export { Controller, Post, Get, Put, Delete, Patch, Input, Version, PresetIgnore, Middleware, UseMiddleware, UseMiddlewares, Tracer, Tracing, TracerData, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher, Inject, Container, DefaultContainer, setDefaultContainer, Dede, Options, Register, ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError, CustomServerError, AppError, Optional, RepositoryModel, RepositoryCreate, RepositoryUpdate, RepositoryRemove, RepositoryRemoveBy, RepositoryRestore, RepositoryExistsBy, RepositoryRestoreBy, RepositoryNotExistsBy, RepositoryPagination };
 export type { ValidatorDefinition, StorageGateway, Event, EventPayload };

package/dist/index.js

@@ -3,7 +3,7 @@ import {
 Post, Get, Put, Delete, Patch, Controller, Version, PresetIgnore, UseMiddleware, UseMiddlewares, Tracing, 
 // controller
 // entity
-Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, 
+Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, 
 // entity
 // usecase
 UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, 
@@ -18,4 +18,4 @@ import { ServerError, NotFound, Forbidden, Conflict, Unauthorized, Unprocessable
 import { AppError } from './domain/errors/app-error';
 import { Optional } from './domain/optional';
 import { RepositoryModel } from './protocols/model';
-export { Controller, Post, Get, Put, Delete, Patch, Version, PresetIgnore, UseMiddleware, UseMiddlewares, Tracing, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher, Inject, Container, DefaultContainer, setDefaultContainer, Dede, ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError, CustomServerError, AppError, Optional, RepositoryModel };
+export { Controller, Post, Get, Put, Delete, Patch, Version, PresetIgnore, UseMiddleware, UseMiddlewares, Tracing, Entity, Restrict, VirtualProperty, GetterPrefix, Transform, Model, column, UseCase, DecorateUseCase, Hook, BeforeHook, AfterHook, HookBefore, HookAfter, Storage, CacheGateway, EventDispatcher, Inject, Container, DefaultContainer, setDefaultContainer, Dede, ServerError, NotFound, Forbidden, Conflict, Unauthorized, UnprocessableEntity, BadRequest, InternalServerError, CustomServerError, AppError, Optional, RepositoryModel };

package/dist/infra/model/model.d.ts

@@ -1,10 +1,10 @@
+import { Entity } from "../../infra/serialization/entity";
 import { RepositoryModel } from "../../protocols/model";
 export type ColumnDefinition = {
     column: string;
     property: string;
 };
-export declare abstract class Model<TTable = string, TEntity = any> extends RepositoryModel<TEntity> {
-    table: TTable;
+export declare abstract class Model<TEntity extends Entity = Entity> extends RepositoryModel<TEntity> {
     columns: ColumnDefinition[];
     [property: string]: any;
     fromModel(input: Record<string, any> | null | undefined): this;
@@ -12,5 +12,4 @@ export declare abstract class Model<TTable = string, TEntity = any> extends Repo
     toModel(): Record<string, any>;
     abstract toEntity(): TEntity;
 }
-export declare function model<TTable>(table: TTable): (target: any) => void;
 export declare function column(columnName: string): (target: any, propertyKey: string) => void;

package/dist/infra/model/model.js

@@ -32,11 +32,6 @@ export class Model extends RepositoryModel {
         return record;
     }
 }
-export function model(table) {
-    return function (target) {
-        target.prototype.table = table;
-    };
-}
 export function column(columnName) {
     return function (target, propertyKey) {
         target.columns = target.columns || [];

package/dist/protocols/repository.d.ts

@@ -1,15 +1,14 @@
-import { Optional } from "../domain";
-import { RepositoryModel } from "../protocols/model";
-export interface RepositoryCreate<T extends RepositoryModel> {
+import { Entity, Optional } from "../domain";
+export interface RepositoryCreate<T extends Entity> {
     create(input: T): Promise<void>;
 }
-export interface RepositoryUpdate<T extends RepositoryModel> {
+export interface RepositoryUpdate<T extends Entity> {
     update(input: T): Promise<void>;
 }
 export interface RepositoryRemove {
     remove(id: string | number): Promise<void>;
 }
-export interface RepositoryRestore<T extends RepositoryModel> {
+export interface RepositoryRestore<T extends Entity> {
     restore(id: string | number): Promise<Optional<T>>;
 }
 export type RepositoryRemoveBy<T> = {

package/package.json

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