vsrepo 1.3.1 → 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.

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.1",
+  "version": "1.3.2",
   "description": "Uma biblioteca de repository pattern para Prisma",
   "homepage": "https://github.com/jaobrabo123/VSRepository#readme",
   "repository": {