vsrepo 1.2.1 → 1.2.2

package/README.md

@@ -1018,8 +1018,9 @@ import type { MethodOptions, MethodOptionsModel } from "../../generated/vsrepo";
 // S = chave do select model ou false
 type Opts = MethodOptions<"public" | "minimal">;
 
-// MethodOptionsModel<T> — versão derivada do tipo do repository
-type OptsModel = MethodOptionsModel<typeof usuarioSelectModels>;
+// MethodOptionsModel<TRepo> — derivado diretamente de uma instância VSRepository configurada
+const usuarioVSRepo = setupVSRepo<Usuario, "usuario">()(config);
+type OptsModel = MethodOptionsModel<typeof usuarioVSRepo>;
 ```
 
 ### Tipos de configuração
@@ -1031,7 +1032,6 @@ import type {
   BuildConfig,
   RepositoryRelations,
   ExtractRelationConfig,
-  UpsertWithRelations,
 } from "../../generated/vsrepo";
 
 // Configuração de um método dinâmico
@@ -1048,18 +1048,12 @@ type UsuarioRelations = RepositoryRelations<Usuario>;
 
 // Configuração de relação inferida a partir de um campo
 type PerfilRelationConfig = ExtractRelationConfig<Usuario["perfil"]>;
-
-// Payload do save com relações
-type UsuarioComRelacoes = UpsertWithRelations<Usuario, "usuario", typeof relations>;
 ```
 
 ### Tipo do repository construído
 
 ```ts
-import type { BuiltRepository, RepositoryOf } from "../../generated/vsrepo";
-
-// Tipo completo de um repository construído
-type MeuRepo = BuiltRepository<Usuario, "usuario", typeof config, typeof buildConfig>;
+import type { RepositoryOf } from "../../generated/vsrepo";
 
 // Inferência a partir de uma instância VSRepository (útil para injeção de dependência)
 const usuarioVSRepo = setupVSRepo<Usuario, "usuario">()({ ... });
@@ -1080,15 +1074,31 @@ const extension = { buscarPorDominio: (dominio: string) => Promise<Usuario[]> };
 type UsuarioRepositoryExtended = RepositoryOf<typeof usuarioVSRepo, undefined, typeof extension>;
 ```
 
-### Tipo auxiliar
+### Tipos do payload dos métodos `save` e `patch`
+
+Use `SaveObject` e `PatchObject` para extrair o tipo do payload esperado pelos métodos `save` e `patch` diretamente a partir de uma instância `VSRepository` configurada. Esses tipos já levam em conta as relações configuradas.
 
 ```ts
-import type { DistributiveOmit } from "../../generated/vsrepo";
+import type { SaveObject, PacthObject } from "../../generated/vsrepo";
 
-// Omit distributivo — preserva unions ao omitir propriedades
-type SemEmail = DistributiveOmit<Usuario | Perfil, "email">;
+const usuarioVSRepo = setupVSRepo<Usuario, "usuario">()({
+  tableName: "usuario",
+  pkName: "id",
+  relations: {
+    perfil: { pk: "id", mode: "oto", restriction: "set" },
+    postagens: { pk: "id", mode: "otm", restriction: "add" },
+  },
+});
+
+// Tipo do objeto aceito pelo .save()
+type UsuarioSavePayload = SaveObject<typeof usuarioVSRepo>;
+
+// Tipo do objeto aceito pelo .patch()
+type UsuarioPatchPayload = PacthObject<typeof usuarioVSRepo>;
 ```
 
+> Útil para tipar DTOs, funções auxiliares ou serviços que chamam `save`/`patch` e precisam do tipo correto do payload sem referenciar diretamente os tipos internos do Prisma.
+
 ---
 
 ## API Reference

package/VSRepository/VSRepository.d.ts

@@ -55,12 +55,18 @@ type ValidMethodPatterns =
     | `findWhere${string}` | `findListWhere${string}`
     | 'aggregate' | 'groupBy';
 
-type StringModifiers = 
-    | 'NotStartsWith' | 'StartsWith' | 'NotEndsWith' | 'EndsWith' 
-    | 'NotContains' | 'Contains' | 'NotIn' | 'In' | 'Not';
-
 type StripModifier<S extends string> =
-  S extends `${infer Base}${StringModifiers}Insensitive` ? Base :
+  // Expansão explícita para resolver o problema do 'Insensitive'
+  S extends `${infer Base}NotStartsWithInsensitive` ? Base :
+  S extends `${infer Base}StartsWithInsensitive` ? Base :
+  S extends `${infer Base}NotEndsWithInsensitive` ? Base :
+  S extends `${infer Base}EndsWithInsensitive` ? Base :
+  S extends `${infer Base}NotContainsInsensitive` ? Base :
+  S extends `${infer Base}ContainsInsensitive` ? Base :
+  S extends `${infer Base}NotInInsensitive` ? Base :
+  S extends `${infer Base}InInsensitive` ? Base :
+  S extends `${infer Base}NotInsensitive` ? Base :
+  // Modificadores normais
   S extends `${infer Base}NotStartsWith` ? Base :
   S extends `${infer Base}StartsWith` ? Base :
   S extends `${infer Base}NotEndsWith` ? Base :
@@ -94,7 +100,7 @@ type GetFieldType<T, S extends string, I> = ExtractFieldName<S> extends infer Fi
             ? T[FieldName][]
             : NonNullable<T[FieldName]> extends object | any[]
               ? I extends { whereInput: infer W }
-                  ? FieldName extends keyof NonNullable<W> ? NonNullable<W>[FieldName] : T[FieldName]
+                  ? FieldName extends keyof NonNullable<W> ? Exclude<NonNullable<W>[FieldName], undefined> : T[FieldName]
                   : T[FieldName]
               : T[FieldName]
         : ParseRelation<S> extends [infer Rel extends keyof T, any, infer Rest extends string]
@@ -125,8 +131,6 @@ type MapToContractTypes<T, Arr extends string[], I> =
                 : never
         : [];
 
-type HasMultipleANDs<S extends string> = S extends `${string}AND${string}AND${string}` ? true : false;
-
 type SplitAllTokens<S extends string> =
     S extends `${infer L}AND${infer R}` ? [...SplitAllTokens<L>, ...SplitAllTokens<R>] :
     S extends `${infer L}And${infer R}` ? [...SplitAllTokens<L>, ...SplitAllTokens<R>] :
@@ -153,18 +157,26 @@ type ResolveReturnType<M extends string, TSelected> =
     M extends 'findUniqueOrThrow' | 'findFirstOrThrow' | 'create' | 'updateBy' | 'upsertBy' | 'deleteBy' ? TSelected :
     M extends 'count' | 'countWhere' ? number : never;
 
+type GetUpdateInput<I> = I extends { updateInput: infer U } ? U : unknown;
+type GetCreateInput<I> = I extends { createInput: infer C } ? C : unknown;
+type GetCreateManyInput<I> = I extends { createManyInput: infer CM } ? CM : unknown;
+type GetUpdateManyInput<I> = I extends { updateManyInput: infer UM } ? UM : unknown;
+type GetWhereInput<I> = I extends { whereInput: infer W } ? NonNullable<W> : unknown;
+type GetCursorInput<I> = I extends { cursorInput: infer C } ? C : unknown;
+type GetOrderByInput<I> = I extends { orderByInput: infer OB } ? OB : OrderOptions;
+
 type ExtraArgs<M extends string, R extends string, I> = [
-    ...(M extends 'upsertBy' ? [update: I extends { updateInput: infer U } ? U : unknown, create: I extends { createInput: infer C } ? C : unknown]
-      : M extends 'create' ? [data: I extends { createInput: infer C } ? C : unknown]
-      : M extends 'updateBy' ? [data: I extends { updateInput: infer U } ? U : unknown]
-      : M extends 'createMany' | 'createManyAndReturn' ? [data: I extends { createManyInput: infer CM } ? CM : unknown]
-      : M extends 'updateManyBy' | 'updateManyAndReturnBy' ? [data: I extends { updateManyInput: infer UM } ? UM : unknown]
-      : M extends 'findWhere' | 'findListWhere' | 'countWhere' ? [where: I extends { whereInput: infer W } ? NonNullable<W> : unknown]
+    ...(M extends 'upsertBy' ? [update: GetUpdateInput<I>, create: GetCreateInput<I>]
+      : M extends 'create' ? [data: GetCreateInput<I>]
+      : M extends 'updateBy' ? [data: GetUpdateInput<I>]
+      : M extends 'createMany' | 'createManyAndReturn' ? [data: GetCreateManyInput<I>]
+      : M extends 'updateManyBy' | 'updateManyAndReturnBy' ? [data: GetUpdateManyInput<I>]
+      : M extends 'findWhere' | 'findListWhere' | 'countWhere' ? [where: GetWhereInput<I>]
       : []),
-    ...(R extends `${string}PaginatedAndOrdered` ? [pagination: PaginationOptions<I extends { cursorInput: infer C } ? C : unknown>, order: I extends { orderByInput: infer OB } ? OB : OrderOptions]
-      : R extends `${string}OrderedAndPaginated` ? [order: I extends { orderByInput: infer OB } ? OB : OrderOptions, pagination: PaginationOptions<I extends { cursorInput: infer C } ? C : unknown>]
-      : R extends `${string}Paginated` ? [pagination: PaginationOptions<I extends { cursorInput: infer C } ? C : unknown>]
-      : R extends `${string}Ordered` ? [order: I extends { orderByInput: infer OB } ? OB : OrderOptions]
+    ...(R extends `${string}PaginatedAndOrdered` ? [pagination: PaginationOptions<GetCursorInput<I>>, order: GetOrderByInput<I>]
+      : R extends `${string}OrderedAndPaginated` ? [order: GetOrderByInput<I>, pagination: PaginationOptions<GetCursorInput<I>>]
+      : R extends `${string}Paginated` ? [pagination: PaginationOptions<GetCursorInput<I>>]
+      : R extends `${string}Ordered` ? [order: GetOrderByInput<I>]
       : [])
 ];
 
@@ -173,13 +185,17 @@ type PrismaDelegate<M extends Prisma.ModelName> = Uncapitalize<M> extends keyof
 type FullModelType<M extends Prisma.ModelName> = 
   Prisma.Result<PrismaDelegate<M>, {}, 'findMany'> extends Array<infer U> ? U : never;
 
+type PrecomputedSelects<M extends Prisma.ModelName, SelectModels> = {
+    [S in keyof SelectModels]: Prisma.Result<PrismaDelegate<M>, { select: SelectModels[S] }, 'findMany'> extends Array<infer U> ? U : never
+};
+
 type SelectedModel<M extends Prisma.ModelName, S, SelectModels> = 
     [S] extends [false] 
         ? FullModelType<M>
         : [S] extends [never] 
             ? FullModelType<M> 
             : [S] extends [keyof SelectModels] 
-                ? (Prisma.Result<PrismaDelegate<M>, { select: SelectModels[S] }, 'findMany'> extends Array<infer U> ? U : never)
+                ? PrecomputedSelects<M, SelectModels>[S]
                 : FullModelType<M>;
 
 type CleanFields<R extends string> =
@@ -208,9 +224,18 @@ export type MethodOptions<S> = {
 };
 
 /**
- * Versão de `MethodOptions` derivada de um mapa de select models.
+ * Versão de `MethodOptions` derivada diretamente de uma instância configurada de `VSRepository`.
+ *
+ * @template TRepo Instância de `VSRepository` configurada (use `typeof meuVSRepo`).
+ *
+ * @example
+ * const usuarioVSRepo = setupVSRepo<Usuario, "usuario">()(config);
+ * type Opts = MethodOptionsModel<typeof usuarioVSRepo>;
  */
-export type MethodOptionsModel<T> = MethodOptions<keyof T | false>;
+export type MethodOptionsModel<TRepo> =
+    TRepo extends VSRepository<any, any, infer Config>
+        ? MethodOptions<keyof ExtractSelectModels<Config> | false>
+        : never;
 
 type MethodFn<MethodName extends string, T, M extends Prisma.ModelName, R extends string, SelectModels, DefaultSelect extends keyof SelectModels | false, I> = 
     <S extends keyof SelectModels | false = DefaultSelect>(...args: [...ExtractFields<T, CleanFields<R>, I>, ...ExtraArgs<MethodName, R, I>, options?: MethodOptions<S>]) => Promise<ResolveReturnType<MethodName, SelectedModel<M, S, SelectModels>>>;
@@ -494,7 +519,7 @@ type InjectedRemove<
 /**
  * Versão distributiva de `Omit`, preservando unions ao remover propriedades.
  */
-export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
+type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
 type ExtractUnionProp<T, K extends PropertyKey> = T extends any ? (K extends keyof T ? T[K] : never) : never;
 
 type ExtractNestedCreateInput<M extends Prisma.ModelName, K extends PropertyKey> = 
@@ -514,7 +539,7 @@ type RelationPayload<TField, TRelationConfig, M extends Prisma.ModelName, K exte
  * Substitui os campos relacionais pelo formato compatível com os modos
  * configurados em `relations`.
  */
-export type UpsertWithRelations<T, M extends Prisma.ModelName, TRelations> = 
+type UpsertWithRelations<T, M extends Prisma.ModelName, TRelations> = 
     DistributiveOmit<ModelUpsertInput<M>, keyof TRelations> & {
         [K in Extract<keyof TRelations, keyof T>]?: RelationPayload<T[K], TRelations[K], M, K>;
     };
@@ -542,11 +567,27 @@ type RelationUpdatePayload<TField, TRelationConfig, M extends Prisma.ModelName,
  * Substitui os campos relacionais pelo formato compatível com os modos
  * configurados em `relations` para fluxos de Update.
  */
-export type UpdateWithRelations<T, M extends Prisma.ModelName, TRelations> = 
+type UpdateWithRelations<T, M extends Prisma.ModelName, TRelations> = 
     DistributiveOmit<PrismaModelInputs<M>['updateInput'], keyof TRelations> & {
         [K in Extract<keyof TRelations, keyof T>]?: RelationUpdatePayload<T[K], TRelations[K], M, K>;
     };
 
+/**
+ * Extrai o tipo de payload do método `save` a partir de uma instância de VSRepository configurada.
+ */
+export type SaveObject<TRepo> = 
+    TRepo extends VSRepository<infer T, infer M, infer Config>
+        ? UpsertWithRelations<T, M, Config extends { relations: infer R } ? (R extends object ? R : {}) : {}>
+        : never;
+
+/**
+ * Extrai o tipo de payload do método `patch` a partir de uma instância de VSRepository configurada.
+ */
+export type PacthObject<TRepo> = 
+    TRepo extends VSRepository<infer T, infer M, infer Config>
+        ? UpdateWithRelations<T, M, Config extends { relations: infer R } ? (R extends object ? R : {}) : {}>
+        : never;
+
 type InjectedSave<
     T, M extends Prisma.ModelName, Config, C extends BuildConfig<any> | undefined,
     TSelects = ExtractSelectModels<Config>,
@@ -560,7 +601,7 @@ type InjectedSave<
      * @returns O registro salvo com tipos refinados conforme a entrada.
      */
     save<
-        O extends UpsertWithRelations<T, M, TRelations>, 
+        O, 
         S extends keyof TSelects | false = ResolveMethodDefaultSelect<Config, C, 'save', TSelects>
     >(
         obj: O & UpsertWithRelations<T, M, TRelations>, 
@@ -583,7 +624,7 @@ type InjectedPatch<
      * @returns O registro atualizado refinado conforme a entrada.
      */
     patch<
-        O extends UpdateWithRelations<T, M, TRelations>,
+        O,
         S extends keyof TSelects | false = ResolveMethodDefaultSelect<Config, C, 'patch', TSelects>
     >(
         pk: T[TPk extends keyof T ? TPk : never],
@@ -757,7 +798,7 @@ export type RepoConfig<T, M extends Prisma.ModelName, SM extends Record<string,
  *
  * Combina métodos dinâmicos, métodos base e extensões personalizadas.
  */
-export type BuiltRepository<T extends object, M extends Prisma.ModelName, Config extends RepoConfig<T, M, any>, C extends BuildConfig<any> | undefined> = {
+type BuiltRepository<T extends object, M extends Prisma.ModelName, Config extends RepoConfig<T, M, any>, C extends BuildConfig<any> | undefined> = {
     /**
      * Estende o repository com métodos personalizados sem perder a tipagem.
      */
@@ -815,9 +856,7 @@ export type ValidateRepoConfig<T extends object, M extends Prisma.ModelName, Con
     /** Mapa dos métodos dinâmicos e suas regras de validação. */
     methods?: {
         [K in keyof (Config extends { methods: infer Meth } ? Meth : {})]: K extends string
-            ? HasMultipleANDs<K> extends true
-                ? MethodConfig<M, Config extends { selectModels: infer SM } ? SM : any> & { proxyTo: ValidMethodPatterns }
-                : MethodConfig<M, Config extends { selectModels: infer SM } ? SM : any> & (K extends ValidMethodPatterns ? {} : { proxyTo: ValidMethodPatterns })
+            ? MethodConfig<M, Config extends { selectModels: infer SM } ? SM : any> & (K extends ValidMethodPatterns ? {} : { proxyTo: ValidMethodPatterns })
             : never;
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsrepo",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Uma biblioteca de repository pattern para Prisma",
   "homepage": "https://github.com/jaobrabo123/VSRepository#readme",
   "repository": {
@@ -38,8 +38,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "vsrepo": "node ./scripts/configure-prisma-import.mjs",
-    "configure:prisma-import": "node ./scripts/configure-prisma-import.mjs"
+    "vsrepo": "node ./scripts/configure-prisma-import.mjs"
   },
   "keywords": [
     "prisma",
@@ -47,7 +46,8 @@
     "orm",
     "typescript",
     "vsrepo",
-    "vsrepository"
+    "vsrepository",
+    "jparepository"
   ],
   "author": "João Pedro Azevedo Freire Mecenas",
   "license": "MIT",