vsrepo 1.3.0 → 1.3.2

package/dist/VSRepository.d.ts

@@ -239,12 +239,21 @@ type SelectedModel<M extends Prisma.ModelName, S, SelectModels, IM = never, Incl
             ? PrecomputedIncludes<M, IncludeModels>[IM]
             : FullModelType<M>;
 
+/**
+ * Strips the `Distinct{Fields}` suffix used by read methods (e.g. `findManyDistinctIdadeAndCargo`).
+ * The distinct fields are resolved from the method name at build time, so they never
+ * become part of the runtime `where` fields extracted by `ExtractFields`.
+ */
+type StripDistinctFields<R extends string> =
+    R extends `${infer F}Distinct${string}` ? F : R;
+
 type CleanFields<R extends string> =
-    R extends `${infer F}PaginatedAndOrdered` ? F :
-    R extends `${infer F}OrderedAndPaginated` ? F :
-    R extends `${infer F}Paginated` ? F :
-    R extends `${infer F}Ordered` ? F :
-    R extends `${infer F}SkipDuplicates` ? F : R;
+    R extends `${infer F}PaginatedAndOrdered` ? StripDistinctFields<F> :
+    R extends `${infer F}OrderedAndPaginated` ? StripDistinctFields<F> :
+    R extends `${infer F}Paginated` ? StripDistinctFields<F> :
+    R extends `${infer F}Ordered` ? StripDistinctFields<F> :
+    R extends `${infer F}SkipDuplicates` ? StripDistinctFields<F> :
+    StripDistinctFields<R>;
 
 /**
  * Additional options accepted by repository methods.
@@ -291,9 +300,17 @@ export type MethodOptionsModel<TRepo> =
         ? MethodOptions<keyof ExtractSelectModels<Config> | false, keyof ExtractIncludeModels<Config>>
         : never;
 
+type MethodOptionsWithInclude<
+    S,
+    IM extends PropertyKey,
+    TIncludes,
+    Excluded extends keyof MethodOptions<S, keyof TIncludes> = never
+> = Omit<MethodOptions<S, keyof TIncludes>, Excluded>
+    & ({ includeModel: IM } | { includeModel?: never });
+
 type MethodFn<MethodName extends string, T, M extends Prisma.ModelName, R extends string, SelectModels, DefaultSelect extends keyof SelectModels | false, I, IncludeModels> = 
     <S extends keyof SelectModels | false = DefaultSelect, IM extends keyof IncludeModels = never>(
-        ...args: [...ExtractFields<T, CleanFields<R>, I>, ...ExtraArgs<MethodName, R, I>, options?: MethodOptions<S, keyof IncludeModels> & ({ includeModel: IM } | { includeModel?: never })]
+        ...args: [...ExtractFields<T, CleanFields<R>, I>, ...ExtraArgs<MethodName, R, I>, options?: MethodOptionsWithInclude<S, IM, IncludeModels>]
     ) => Promise<ResolveReturnType<MethodName, SelectedModel<M, S, SelectModels, IM, IncludeModels>>>;
 
 type GetMappedMethod<K extends string, MethodConf> = 
@@ -349,7 +366,7 @@ type MethodFactory<T, M extends Prisma.ModelName, K extends string, SelectModels
     K extends `findWhere${string}`
         ? {
             /** @deprecated Use findOneWhere instead. */
-            <S extends keyof SelectModels | false = DefaultSelect, IM extends keyof IncludeModels = never>(...args: [...ExtractFields<T, CleanFields<ExtractPatternBase<K>>, I>, ...ExtraArgs<GetMappedMethod<K, MethodConf>, ExtractPatternBase<K>, I>, options?: MethodOptions<S, keyof IncludeModels> & ({ includeModel: IM } | { includeModel?: never })]): Promise<ResolveReturnType<GetMappedMethod<K, MethodConf>, SelectedModel<M, S, SelectModels, IM, IncludeModels>>>;
+            <S extends keyof SelectModels | false = DefaultSelect, IM extends keyof IncludeModels = never>(...args: [...ExtractFields<T, CleanFields<ExtractPatternBase<K>>, I>, ...ExtraArgs<GetMappedMethod<K, MethodConf>, ExtractPatternBase<K>, I>, options?: MethodOptionsWithInclude<S, IM, IncludeModels>]): Promise<ResolveReturnType<GetMappedMethod<K, MethodConf>, SelectedModel<M, S, SelectModels, IM, IncludeModels>>>;
           }
         : MethodFn<GetMappedMethod<K, MethodConf>, T, M, ExtractPatternBase<K>, SelectModels, DefaultSelect, I, IncludeModels>;
 
@@ -703,47 +720,47 @@ type AllBaseMethods<
 > = {
     /** Fetches a record by its primary key (PK). */
     get: <S extends keyof TSelects | false = _DS<Config, C, 'get', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes> | null>;
 
     /** Fetches a record by PK and throws `VSRepoRuntimeError` if not found. */
     getOrThrow: <S extends keyof TSelects | false = _DS<Config, C, 'getOrThrow', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Fetches multiple records by a list of primary keys (PKs). */
     getList: <S extends keyof TSelects | false = _DS<Config, C, 'getList', TSelects>, IM extends keyof TIncludes = never>(
-        pks: _Pk<T, Config>[], options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pks: _Pk<T, Config>[], options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>[]>;
 
     /** Deletes a record identified by its primary key (PK). */
     remove: <S extends keyof TSelects | false = _DS<Config, C, 'remove', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Inserts or updates (upsert) a record. */
     save: <S extends keyof TSelects | false = _DS<Config, C, 'save', TSelects>, IM extends keyof TIncludes = never>(
-        obj: UpsertWithRelations<T, M, TRelations>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        obj: UpsertWithRelations<T, M, TRelations>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Saves an array of objects in a single automatic transaction. */
     saveList: <S extends keyof TSelects | false = _DS<Config, C, 'saveList', TSelects>, IM extends keyof TIncludes = never>(
-        objs: UpsertWithRelations<T, M, TRelations>[], options?: Omit<MethodOptions<S, keyof TIncludes>, 'db'> & ({ includeModel: IM } | { includeModel?: never }) & { db?: DbTransaction }
+        objs: UpsertWithRelations<T, M, TRelations>[], options?: MethodOptionsWithInclude<S, IM, TIncludes, 'db'> & { db?: DbTransaction }
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>[]>;
 
     /** Partially updates (patch) an existing record by its primary key (PK). */
     patch: <S extends keyof TSelects | false = _DS<Config, C, 'patch', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, obj: PatchWithRelations<T, M, TRelations>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, obj: PatchWithRelations<T, M, TRelations>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Partially updates multiple records via `[pk, obj]` tuples in an automatic transaction. */
     patchList: <S extends keyof TSelects | false = _DS<Config, C, 'patchList', TSelects>, IM extends keyof TIncludes = never>(
-        tuples: [pk: _Pk<T, Config>, obj: PatchWithRelations<T, M, TRelations>][], options?: Omit<MethodOptions<S, keyof TIncludes>, 'db'> & ({ includeModel: IM } | { includeModel?: never }) & { db?: DbTransaction }
+        tuples: [pk: _Pk<T, Config>, obj: PatchWithRelations<T, M, TRelations>][], options?: MethodOptionsWithInclude<S, IM, TIncludes, 'db'> & { db?: DbTransaction }
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>[]>;
 
     /** Fetches a record by PK and deep-merges it with the provided object **in memory**. */
     merge: <S extends keyof TSelects | false = _DS<Config, C, 'merge', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, obj: UpdateWithRelations<T, M, TRelations>, options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, obj: UpdateWithRelations<T, M, TRelations>, options?: MethodOptionsWithInclude<S, IM, TIncludes>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes> | null>;
 
     /** Deletes multiple records by their primary keys. */
@@ -751,7 +768,7 @@ type AllBaseMethods<
 
     /** Fetches all records (respects `requiredWhere` when set). */
     getAll: <S extends keyof TSelects | false = _DS<Config, C, 'getAll', TSelects>, IM extends keyof TIncludes = never>(
-        options?: MethodOptions<S, keyof TIncludes> & ({ includeModel: IM } | { includeModel?: never }) & {
+        options?: MethodOptionsWithInclude<S, IM, TIncludes> & {
             pagination?: PaginationOptions<I extends { cursorInput: infer Curs } ? Curs : unknown>;
             /**
              * Ordering to apply to the query.
@@ -770,7 +787,7 @@ type AllBaseMethods<
 
     /** Marks a record as deleted (soft-delete). */
     softRemove: <S extends keyof TSelects | false = _DS<Config, C, 'softRemove', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, options?: Omit<MethodOptions<S, keyof TIncludes>, 'see'> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, options?: MethodOptionsWithInclude<S, IM, TIncludes, 'see'>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Marks multiple records as deleted (soft-delete) in batch. */
@@ -778,7 +795,7 @@ type AllBaseMethods<
 
     /** Restores a record previously marked as deleted (soft-delete). */
     restore: <S extends keyof TSelects | false = _DS<Config, C, 'restore', TSelects>, IM extends keyof TIncludes = never>(
-        pk: _Pk<T, Config>, options?: Omit<MethodOptions<S, keyof TIncludes>, 'see'> & ({ includeModel: IM } | { includeModel?: never })
+        pk: _Pk<T, Config>, options?: MethodOptionsWithInclude<S, IM, TIncludes, 'see'>
     ) => Promise<_Ret<M, TSelects, S, TDefault, IM, TIncludes>>;
 
     /** Restores multiple records previously marked as deleted (soft-delete) in batch. */

package/dist/VSRepository.js

@@ -144,6 +144,7 @@ class VSRepository {
                             ? args.at(dinamicMethodInfo.updateIndex)
                             : undefined,
                         withOrdenationAndPagination: !dinamicMethodInfo.ignoreOrderByAndPagination,
+                        distinctKeys: dinamicMethodCustomization.distinctKeys,
                     };
                     if (!dinamicMethodInfo.ignoreWhere) {
                         resolveDbAndPrismaArgsData.specificWhere = (0, specific_where_resolve_1.resolveSpecificWhere)(args, dinamicMethodWhereOps.prettyWheres);

package/dist/internal/resolvers/dbAndPrismaArgs.resolve.js

@@ -5,7 +5,7 @@ const method_options_validate_1 = require("../validation/method-options.validate
 const merge_wheres_resolve_1 = require("./merge-wheres.resolve");
 const select_resolve_1 = require("./select.resolve");
 function resolveDbAndPrismaArgs(data) {
-    const { baseConfig, instance, options, wherePkValue, withoutSelect, withoutWhere, specificSelect, dataPayload, createPayload, updatePayload, alreadyValidatedOptions, specificWhere, pushWhere, ordenation, pagination, skipDuplicates, forceSeeMode, withOrdenationAndPagination, } = data;
+    const { baseConfig, instance, options, wherePkValue, withoutSelect, withoutWhere, specificSelect, dataPayload, createPayload, updatePayload, alreadyValidatedOptions, specificWhere, pushWhere, ordenation, pagination, skipDuplicates, forceSeeMode, withOrdenationAndPagination, distinctKeys, } = data;
     const validatedOptions = alreadyValidatedOptions && options
         ? options
         : (0, method_options_validate_1.validateMethodOptions)(options, instance);
@@ -50,5 +50,8 @@ function resolveDbAndPrismaArgs(data) {
     if (skipDuplicates !== undefined) {
         prismaArgs.skipDuplicates = skipDuplicates;
     }
+    if (distinctKeys !== undefined) {
+        prismaArgs.distinct = distinctKeys;
+    }
     return { db, prismaArgs };
 }

package/dist/internal/resolvers/dinamic-method-customization.resolve.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDinamicMethodCustomization = resolveDinamicMethodCustomization;
+const uncapitalize_util_1 = require("../utils/uncapitalize.util");
 function resolveDinamicMethodCustomization(instance, dinamicMethodInfo, originalKey) {
     const dinamicMethodCustomization = {};
     if (!dinamicMethodInfo.ignoreSkipDuplicates) {
@@ -10,8 +11,10 @@ function resolveDinamicMethodCustomization(instance, dinamicMethodInfo, original
         }
     }
     if (!dinamicMethodInfo.ignoreOrderByAndPagination) {
-        dinamicMethodCustomization.injectOrdenation = instance.methods?.[originalKey]?.injectOrdenation;
-        dinamicMethodCustomization.injectPagination = instance.methods?.[originalKey]?.injectPagination;
+        dinamicMethodCustomization.injectOrdenation =
+            instance.methods?.[originalKey]?.injectOrdenation;
+        dinamicMethodCustomization.injectPagination =
+            instance.methods?.[originalKey]?.injectPagination;
         if (dinamicMethodInfo.keyToMapReplaced.endsWith("PaginatedAndOrdered")) {
             dinamicMethodCustomization.orderPosition = -2;
             dinamicMethodCustomization.paginationPosition = -3;
@@ -41,5 +44,14 @@ function resolveDinamicMethodCustomization(instance, dinamicMethodInfo, original
             dinamicMethodInfo.argsCount++;
         }
     }
+    if (!dinamicMethodInfo.ignoreDistinct) {
+        const keySplitedDistinct = dinamicMethodInfo.keyToMapReplaced.split("Distinct");
+        if (keySplitedDistinct[1]) {
+            dinamicMethodCustomization.distinctKeys = keySplitedDistinct[1]
+                .split("And")
+                .map(uncapitalize_util_1.uncapitalize);
+        }
+        dinamicMethodInfo.keyToMapReplaced = keySplitedDistinct[0];
+    }
     return dinamicMethodCustomization;
 }

package/dist/internal/resolvers/dinamic-method-info.resolve.js

@@ -15,6 +15,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         ignoreSkipDuplicates: true,
         whereParams: [],
         otherParams: [],
+        ignoreDistinct: true,
     };
     if (dinamicMethod === "aggregate") {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("aggregate", "");
@@ -45,6 +46,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
     else if (dinamicMethod.startsWith("findFirstOrThrowBy")) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("findFirstOrThrowBy", "");
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirstOrThrow";
     }
     else if (dinamicMethod.startsWith("findFirstOrThrow")) {
@@ -52,11 +54,13 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirstOrThrow";
     }
     else if (dinamicMethod.startsWith("findFirstBy")) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("findFirstBy", "");
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
     }
     else if (dinamicMethod.startsWith("findFirst")) {
@@ -64,6 +68,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
     }
     else if (dinamicMethod.startsWith("countBy")) {
@@ -95,6 +100,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("existsBy", "");
         dinamicMethodInfo.ignoreSelect = true;
         dinamicMethodInfo.existsMode = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
     }
     else if (dinamicMethod.startsWith("existsWhere")) {
@@ -103,6 +109,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.existsMode = true;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
         dinamicMethodInfo.whereIndex = 0;
         dinamicMethodInfo.otherParams.push("where");
@@ -111,6 +118,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
     else if (dinamicMethod.startsWith("findManyBy")) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("findManyBy", "");
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findMany";
     }
     else if (dinamicMethod.startsWith("findMany")) {
@@ -118,6 +126,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findMany";
     }
     else if (dinamicMethod.startsWith("createManyAndReturn")) {
@@ -223,6 +232,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
         dinamicMethodInfo.whereIndex = 0;
         dinamicMethodInfo.otherParams.push("where");
@@ -233,6 +243,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
         dinamicMethodInfo.whereIndex = 0;
         dinamicMethodInfo.otherParams.push("where");
@@ -243,6 +254,7 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
         dinamicMethodInfo.ignoreWhere = true;
         dinamicMethodInfo.onlyBaseWheres = true;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findMany";
         dinamicMethodInfo.whereIndex = 0;
         dinamicMethodInfo.otherParams.push("where");
@@ -251,11 +263,13 @@ function resolveDinamicMethodInfo(instance, dinamicMethod, originalKey) {
     else if (dinamicMethod.startsWith("findOneBy")) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("findOneBy", "");
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = "findFirst";
     }
     else if (dinamicMethod.startsWith("findBy")) {
         dinamicMethodInfo.keyToMapReplaced = dinamicMethod.replace("findBy", "");
         dinamicMethodInfo.ignoreOrderByAndPagination = false;
+        dinamicMethodInfo.ignoreDistinct = false;
         dinamicMethodInfo.method = instance.methods?.[originalKey]?.fbMode === "one" ? "findFirst" : "findMany";
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsrepo",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Uma biblioteca de repository pattern para Prisma",
   "homepage": "https://github.com/jaobrabo123/VSRepository#readme",
   "repository": {