vsrepo 1.3.4 → 1.3.6

package/dist/VSRepository.js

@@ -23,8 +23,8 @@ const prisma_client_validate_1 = require("./internal/validation/prisma-client.va
 const vs_repo_error_1 = require("./internal/errors/vs-repo.error");
 const base_methods_resolve_1 = require("./internal/resolvers/base-methods.resolve");
 const logger_util_1 = require("./internal/utils/logger.util");
-const dinamic_method_info_resolve_1 = require("./internal/resolvers/dinamic-method-info.resolve");
-const dinamic_method_customization_resolve_1 = require("./internal/resolvers/dinamic-method-customization.resolve");
+const dynamic_method_info_resolve_1 = require("./internal/resolvers/dynamic-method-info.resolve");
+const dynamic_method_customization_resolve_1 = require("./internal/resolvers/dynamic-method-customization.resolve");
 const pretty_wheres_resolve_1 = require("./internal/resolvers/pretty-wheres.resolve");
 const specific_where_resolve_1 = require("./internal/resolvers/specific-where.resolve");
 const dbAndPrismaArgs_resolve_1 = require("./internal/resolvers/dbAndPrismaArgs.resolve");
@@ -41,7 +41,7 @@ class VSRepository {
     requiredWhere;
     relations;
     methods;
-    defaultOrdenation;
+    defaultOrdering;
     constructor(config) {
         const validatedConfig = (0, constructor_config_validate_1.validateConstructorConfig)(config);
         this.vsrepocache = new Map();
@@ -54,7 +54,7 @@ class VSRepository {
         this.relations = validatedConfig.relations;
         this.requiredWhere = validatedConfig.requiredWhere;
         this.methods = validatedConfig.methods;
-        this.defaultOrdenation = validatedConfig.defaultOrdenation;
+        this.defaultOrdering = validatedConfig.defaultOrdering;
     }
     extend(extensionFunc) {
         const extension = (0, extension_validate_1.validateExtension)(extensionFunc, this);
@@ -105,19 +105,19 @@ class VSRepository {
                     continue;
                 }
                 methodToMap = methods[originalKey]?.proxyTo ?? methodToMap;
-                const dinamicMethodInfo = (0, dinamic_method_info_resolve_1.resolveDinamicMethodInfo)(buildInstance, methodToMap, originalKey);
-                const dinamicMethodCustomization = (0, dinamic_method_customization_resolve_1.resolveDinamicMethodCustomization)(buildInstance, dinamicMethodInfo, originalKey);
-                const dinamicMethodWhereOps = {
+                const dynamicMethodInfo = (0, dynamic_method_info_resolve_1.resolveDynamicMethodInfo)(buildInstance, methodToMap, originalKey);
+                const dynamicMethodCustomization = (0, dynamic_method_customization_resolve_1.resolveDynamicMethodCustomization)(buildInstance, dynamicMethodInfo, originalKey);
+                const dynamicMethodWhereOps = {
                     uglyWheres: [],
                     prettyWheres: [],
                     whereType: methods[originalKey]?.whereType ?? "extending",
                     pushWhere: methods[originalKey]?.pushWhere,
                 };
-                if (!dinamicMethodInfo.ignoreWhere) {
-                    (0, pretty_wheres_resolve_1.resolvePrettyWheres)(dinamicMethodInfo, dinamicMethodWhereOps);
+                if (!dynamicMethodInfo.ignoreWhere) {
+                    (0, pretty_wheres_resolve_1.resolvePrettyWheres)(dynamicMethodInfo, dynamicMethodWhereOps);
                     // if (showWorking) {
                     //     const argsSimulation: any[] = [];
-                    //     for (let x = 0; x < dinamicMethodInfo.argsCount; x++) {
+                    //     for (let x = 0; x < dynamicMethodInfo.argsCount; x++) {
                     //         argsSimulation[x] = "00";
                     //     }
                     //     logger(
@@ -126,24 +126,24 @@ class VSRepository {
                     //         buildInstance.tableName,
                     //         resolveSpecificWhere(
                     //             argsSimulation,
-                    //             dinamicMethodWhereOps.prettyWheres,
+                    //             dynamicMethodWhereOps.prettyWheres,
                     //         ),
                     //     );
                     //     // logger(
                     //     //     `Where object resolved to ${methodToMap}:`,
                     //     //     "build",
                     //     //     buildInstance.tableName,
-                    //     //     dinamicMethodWhereOps.prettyWheres,
+                    //     //     dynamicMethodWhereOps.prettyWheres,
                     //     // );
                     // }
                 }
                 let select = undefined;
-                if (dinamicMethodInfo.existsMode) {
+                if (dynamicMethodInfo.existsMode) {
                     select = { [buildInstance.pkName]: true };
                 }
                 buildInstance.vsrepocache.set(originalKey, (args, methodOptions) => {
-                    if (dinamicMethodInfo.prismaArgsIndex !== undefined)
-                        return args.at(dinamicMethodInfo.prismaArgsIndex);
+                    if (dynamicMethodInfo.prismaArgsIndex !== undefined)
+                        return args.at(dynamicMethodInfo.prismaArgsIndex);
                     const resolveDbAndPrismaArgsData = {
                         instance: buildInstance,
                         options: methodOptions,
@@ -151,58 +151,58 @@ class VSRepository {
                         baseConfig: {
                             active: true,
                             defaultSelect: methods[originalKey]?.selectModel,
-                            ignoreRequiredWhere: dinamicMethodWhereOps.whereType === "overwrite",
+                            ignoreRequiredWhere: dynamicMethodWhereOps.whereType === "overwrite",
                         },
-                        withoutWhere: dinamicMethodInfo.ignoreWhere && !dinamicMethodInfo.onlyBaseWheres,
+                        withoutWhere: dynamicMethodInfo.ignoreWhere && !dynamicMethodInfo.onlyBaseWheres,
                         specificSelect: select,
-                        pushWhere: dinamicMethodWhereOps.pushWhere,
-                        withoutSelect: dinamicMethodInfo.ignoreSelect,
-                        skipDuplicates: dinamicMethodCustomization.skipDuplicates,
-                        ordenation: dinamicMethodCustomization.orderPosition !== undefined
-                            ? args.at(dinamicMethodCustomization.orderPosition)
-                            : dinamicMethodCustomization.injectOrdenation,
-                        pagination: dinamicMethodCustomization.paginationPosition !== undefined
-                            ? args.at(dinamicMethodCustomization.paginationPosition)
-                            : dinamicMethodCustomization.injectPagination,
-                        dataPayload: dinamicMethodInfo.dataIndex !== undefined
-                            ? args.at(dinamicMethodInfo.dataIndex)
+                        pushWhere: dynamicMethodWhereOps.pushWhere,
+                        withoutSelect: dynamicMethodInfo.ignoreSelect,
+                        skipDuplicates: dynamicMethodCustomization.skipDuplicates,
+                        ordering: dynamicMethodCustomization.orderPosition !== undefined
+                            ? args.at(dynamicMethodCustomization.orderPosition)
+                            : dynamicMethodCustomization.injectOrdering,
+                        pagination: dynamicMethodCustomization.paginationPosition !== undefined
+                            ? args.at(dynamicMethodCustomization.paginationPosition)
+                            : dynamicMethodCustomization.injectPagination,
+                        dataPayload: dynamicMethodInfo.dataIndex !== undefined
+                            ? args.at(dynamicMethodInfo.dataIndex)
                             : undefined,
-                        createPayload: dinamicMethodInfo.createIndex !== undefined
-                            ? args.at(dinamicMethodInfo.createIndex)
+                        createPayload: dynamicMethodInfo.createIndex !== undefined
+                            ? args.at(dynamicMethodInfo.createIndex)
                             : undefined,
-                        updatePayload: dinamicMethodInfo.updateIndex !== undefined
-                            ? args.at(dinamicMethodInfo.updateIndex)
+                        updatePayload: dynamicMethodInfo.updateIndex !== undefined
+                            ? args.at(dynamicMethodInfo.updateIndex)
                             : undefined,
-                        withOrdenationAndPagination: !dinamicMethodInfo.ignoreOrderByAndPagination,
-                        distinctKeys: dinamicMethodCustomization.distinctKeys,
+                        withOrderingAndPagination: !dynamicMethodInfo.ignoreOrderByAndPagination,
+                        distinctKeys: dynamicMethodCustomization.distinctKeys,
                     };
-                    if (!dinamicMethodInfo.ignoreWhere) {
-                        resolveDbAndPrismaArgsData.specificWhere = (0, specific_where_resolve_1.resolveSpecificWhere)(args, dinamicMethodWhereOps.prettyWheres);
+                    if (!dynamicMethodInfo.ignoreWhere) {
+                        resolveDbAndPrismaArgsData.specificWhere = (0, specific_where_resolve_1.resolveSpecificWhere)(args, dynamicMethodWhereOps.prettyWheres);
                     }
-                    else if (dinamicMethodInfo.onlyBaseWheres) {
+                    else if (dynamicMethodInfo.onlyBaseWheres) {
                         resolveDbAndPrismaArgsData.specificWhere =
-                            dinamicMethodInfo.whereIndex !== undefined
-                                ? args.at(dinamicMethodInfo.whereIndex)
+                            dynamicMethodInfo.whereIndex !== undefined
+                                ? args.at(dynamicMethodInfo.whereIndex)
                                 : {};
                     }
                     const { prismaArgs } = (0, dbAndPrismaArgs_resolve_1.resolveDbAndPrismaArgs)(resolveDbAndPrismaArgsData);
                     return prismaArgs;
                 });
                 if (showWorking) {
-                    const argsSimulation = new Array(dinamicMethodInfo.argsCount).fill("00");
+                    const argsSimulation = new Array(dynamicMethodInfo.argsCount).fill("00");
                     const prismaArgs = buildInstance.vsrepocache.get(originalKey)(argsSimulation);
                     (0, logger_util_1.logger)(`PrismaArgs preview for ${methodToMap}:`, "build", buildInstance.tableName, prismaArgs);
                 }
                 buildInstance[originalKey] = async (...args) => {
                     let db = buildInstance.prisma;
                     let methodOptions = undefined;
-                    if (args.length < dinamicMethodInfo.argsCount) {
-                        const missingParams = dinamicMethodInfo.whereParams
-                            .concat(dinamicMethodInfo.otherParams)
+                    if (args.length < dynamicMethodInfo.argsCount) {
+                        const missingParams = dynamicMethodInfo.whereParams
+                            .concat(dynamicMethodInfo.otherParams)
                             .slice(args.length);
                         throw new vs_repo_error_1.VSRepoRuntimeError(`[VSRepository] (${buildInstance.tableName}: runtime) Missing parameters: ${missingParams.join(", ")}`, "48670");
                     }
-                    else if (args.length > dinamicMethodInfo.argsCount) {
+                    else if (args.length > dynamicMethodInfo.argsCount) {
                         const optionsArg = args[args.length - 1];
                         methodOptions = (0, method_options_validate_1.validateMethodOptions)(optionsArg, buildInstance);
                         db = methodOptions.db ?? db;
@@ -212,20 +212,20 @@ class VSRepository {
                     }
                     const prismaArgs = buildInstance.vsrepocache.get(originalKey)(args, methodOptions);
                     const start = showWorking
-                        ? (0, logger_util_1.performanceLoggerStart)(buildInstance.tableName, dinamicMethodInfo.method, prismaArgs)
+                        ? (0, logger_util_1.performanceLoggerStart)(buildInstance.tableName, dynamicMethodInfo.method, prismaArgs)
                         : undefined;
                     try {
-                        const result = await db[buildInstance.tableName][dinamicMethodInfo.method](prismaArgs);
+                        const result = await db[buildInstance.tableName][dynamicMethodInfo.method](prismaArgs);
                         if (showWorking)
-                            (0, logger_util_1.performanceLoggerEnd)(buildInstance.tableName, dinamicMethodInfo.method, start);
-                        if (dinamicMethodInfo.existsMode) {
+                            (0, logger_util_1.performanceLoggerEnd)(buildInstance.tableName, dynamicMethodInfo.method, start);
+                        if (dynamicMethodInfo.existsMode) {
                             return !!result;
                         }
                         return result;
                     }
                     catch (err) {
                         // logger(
-                        //     `Fatal error when executing ${dinamicMethodInfo.method}:`,
+                        //     `Fatal error when executing ${dynamicMethodInfo.method}:`,
                         //     "runtime",
                         //     buildInstance.tableName,
                         //     { prismaArgs },

package/dist/internal/constants/dynamic-methods-key.constant.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DYNAMIC_METHODS_KEY = void 0;
+exports.DYNAMIC_METHODS_KEY = Symbol("dynamic-methods-key");

package/dist/internal/decorators/dynamic-method.decorator.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicMethod = DynamicMethod;
-const dinamic_methods_key_constant_1 = require("../constants/dinamic-methods-key.constant");
+const dynamic_methods_key_constant_1 = require("../constants/dynamic-methods-key.constant");
 const dynamic_method_metadata_entity_1 = require("../entities/dynamic-method-metadata.entity");
 const dynamic_method_config_validate_1 = require("../validation/dynamic-method-config.validate");
 function DynamicMethod(config) {
     const validatedConfig = config ? (0, dynamic_method_config_validate_1.validateDynamicMethodConfig)(config) : undefined;
     return (target, propertyKey) => {
-        const methods = Reflect.getMetadata(dinamic_methods_key_constant_1.DINAMIC_METHODS_KEY, target) ?? [];
-        methods.push(new dynamic_method_metadata_entity_1.DynamicMethodMetadata(propertyKey, true, validatedConfig?.proxyTo, validatedConfig?.whereType, validatedConfig?.pushWhere, validatedConfig?.fbMode, validatedConfig?.injectOrdenation, validatedConfig?.injectPagination));
-        Reflect.defineMetadata(dinamic_methods_key_constant_1.DINAMIC_METHODS_KEY, methods, target);
+        const methods = Reflect.getMetadata(dynamic_methods_key_constant_1.DYNAMIC_METHODS_KEY, target) ?? [];
+        methods.push(new dynamic_method_metadata_entity_1.DynamicMethodMetadata(propertyKey, true, validatedConfig?.proxyTo, validatedConfig?.whereType, validatedConfig?.pushWhere, validatedConfig?.fbMode, validatedConfig?.injectOrdering, validatedConfig?.injectPagination));
+        Reflect.defineMetadata(dynamic_methods_key_constant_1.DYNAMIC_METHODS_KEY, methods, target);
     };
 }

package/dist/internal/decorators/query-method.decorator.js

@@ -1,16 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryMethod = QueryMethod;
-const dinamic_methods_key_constant_1 = require("../constants/dinamic-methods-key.constant");
+const dynamic_methods_key_constant_1 = require("../constants/dynamic-methods-key.constant");
 const dynamic_method_metadata_entity_1 = require("../entities/dynamic-method-metadata.entity");
+const vs_repo_error_1 = require("../errors/vs-repo.error");
 const query_method_options_validate_1 = require("../validation/query-method-options.validate");
 function QueryMethod(value, options) {
+    if (typeof value !== "string") {
+        throw new vs_repo_error_1.VSRepoDecoratorError(`[VSRepository] (unknown: decorator) 'value' must be a valid string`);
+    }
     const validatedConfig = options
         ? (0, query_method_options_validate_1.validateQueryMethodOptions)(options)
         : { modifying: false };
     return (target, propertyKey) => {
-        const methods = Reflect.getMetadata(dinamic_methods_key_constant_1.DINAMIC_METHODS_KEY, target) ?? [];
+        const methods = Reflect.getMetadata(dynamic_methods_key_constant_1.DYNAMIC_METHODS_KEY, target) ?? [];
         methods.push(new dynamic_method_metadata_entity_1.DynamicMethodMetadata(propertyKey, true, undefined, undefined, undefined, undefined, undefined, undefined, { value, ...validatedConfig }));
-        Reflect.defineMetadata(dinamic_methods_key_constant_1.DINAMIC_METHODS_KEY, methods, target);
+        Reflect.defineMetadata(dynamic_methods_key_constant_1.DYNAMIC_METHODS_KEY, methods, target);
     };
 }

package/dist/internal/entities/dynamic-method-metadata.entity.js

@@ -8,17 +8,17 @@ class DynamicMethodMetadata {
     whereType;
     pushWhere;
     fbMode;
-    injectOrdenation;
+    injectOrdering;
     injectPagination;
     query;
-    constructor(propertyKey, map, proxyTo, whereType, pushWhere, fbMode, injectOrdenation, injectPagination, query) {
+    constructor(propertyKey, map, proxyTo, whereType, pushWhere, fbMode, injectOrdering, injectPagination, query) {
         this.propertyKey = propertyKey;
         this.map = map;
         this.proxyTo = proxyTo;
         this.whereType = whereType;
         this.pushWhere = pushWhere;
         this.fbMode = fbMode;
-        this.injectOrdenation = injectOrdenation;
+        this.injectOrdering = injectOrdering;
         this.injectPagination = injectPagination;
         this.query = query;
     }

package/dist/internal/resolvers/base-methods.resolve.js

@@ -91,8 +91,8 @@ function resolveBaseMethods(instance, config) {
                 baseConfig: baseMethods.getAll,
                 options: restOptions,
                 pagination,
-                ordenation: order,
-                withOrdenationAndPagination: true,
+                ordering: order,
+                withOrderingAndPagination: true,
             });
             const start = showWorking
                 ? (0, logger_util_1.performanceLoggerStart)(tableName, "getAll", prismaArgs)

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, distinctKeys, } = data;
+    const { baseConfig, instance, options, wherePkValue, withoutSelect, withoutWhere, specificSelect, dataPayload, createPayload, updatePayload, alreadyValidatedOptions, specificWhere, pushWhere, ordering, pagination, skipDuplicates, forceSeeMode, withOrderingAndPagination, distinctKeys, } = data;
     const validatedOptions = alreadyValidatedOptions && options
         ? options
         : (0, method_options_validate_1.validateMethodOptions)(options, instance);
@@ -21,6 +21,9 @@ function resolveDbAndPrismaArgs(data) {
         if (specificSelect) {
             prismaArgs.select = specificSelect;
         }
+        else if (validatedOptions.select) {
+            prismaArgs.select = validatedOptions.select;
+        }
         else if (validatedOptions.includeModel) {
             prismaArgs.include = instance.includeModels?.[validatedOptions.includeModel];
         }
@@ -40,9 +43,9 @@ function resolveDbAndPrismaArgs(data) {
     if (updatePayload) {
         prismaArgs.update = updatePayload;
     }
-    if (withOrdenationAndPagination) {
-        if (instance.defaultOrdenation || ordenation) {
-            prismaArgs.orderBy = ordenation ?? instance.defaultOrdenation;
+    if (withOrderingAndPagination) {
+        if (instance.defaultOrdering || ordering) {
+            prismaArgs.orderBy = ordering ?? instance.defaultOrdering;
         }
         if (pagination) {
             prismaArgs.skip = pagination.skip;

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDynamicMethodCustomization = resolveDynamicMethodCustomization;
+const uncapitalize_util_1 = require("../utils/uncapitalize.util");
+function resolveDynamicMethodCustomization(instance, dynamicMethodInfo, originalKey) {
+    const dynamicMethodCustomization = {};
+    if (!dynamicMethodInfo.ignoreSkipDuplicates) {
+        if (dynamicMethodInfo.keyToMapReplaced.endsWith("SkipDuplicates")) {
+            dynamicMethodInfo.keyToMapReplaced = dynamicMethodInfo.keyToMapReplaced.replace("SkipDuplicates", "");
+            dynamicMethodCustomization.skipDuplicates = true;
+        }
+    }
+    if (!dynamicMethodInfo.ignoreOrderByAndPagination) {
+        dynamicMethodCustomization.injectOrdering =
+            instance.methods?.[originalKey]?.injectOrdering;
+        dynamicMethodCustomization.injectPagination =
+            instance.methods?.[originalKey]?.injectPagination;
+        if (dynamicMethodInfo.keyToMapReplaced.endsWith("PaginatedAndOrdered")) {
+            dynamicMethodCustomization.orderPosition = -2;
+            dynamicMethodCustomization.paginationPosition = -3;
+            dynamicMethodInfo.otherParams.push("pagination");
+            dynamicMethodInfo.otherParams.push("order");
+            dynamicMethodInfo.keyToMapReplaced = dynamicMethodInfo.keyToMapReplaced.replace("PaginatedAndOrdered", "");
+            dynamicMethodInfo.argsCount += 2;
+        }
+        else if (dynamicMethodInfo.keyToMapReplaced.endsWith("OrderedAndPaginated")) {
+            dynamicMethodCustomization.orderPosition = -3;
+            dynamicMethodCustomization.paginationPosition = -2;
+            dynamicMethodInfo.otherParams.push("order");
+            dynamicMethodInfo.otherParams.push("pagination");
+            dynamicMethodInfo.keyToMapReplaced = dynamicMethodInfo.keyToMapReplaced.replace("OrderedAndPaginated", "");
+            dynamicMethodInfo.argsCount += 2;
+        }
+        else if (dynamicMethodInfo.keyToMapReplaced.endsWith("Paginated")) {
+            dynamicMethodCustomization.paginationPosition = -2;
+            dynamicMethodInfo.otherParams.push("pagination");
+            dynamicMethodInfo.keyToMapReplaced = dynamicMethodInfo.keyToMapReplaced.replace("Paginated", "");
+            dynamicMethodInfo.argsCount++;
+        }
+        else if (dynamicMethodInfo.keyToMapReplaced.endsWith("Ordered")) {
+            dynamicMethodCustomization.orderPosition = -2;
+            dynamicMethodInfo.otherParams.push("order");
+            dynamicMethodInfo.keyToMapReplaced = dynamicMethodInfo.keyToMapReplaced.replace("Ordered", "");
+            dynamicMethodInfo.argsCount++;
+        }
+    }
+    if (!dynamicMethodInfo.ignoreDistinct) {
+        const keySplitedDistinct = dynamicMethodInfo.keyToMapReplaced.split("Distinct");
+        if (keySplitedDistinct[1]) {
+            dynamicMethodCustomization.distinctKeys = keySplitedDistinct[1]
+                .split("And")
+                .map(uncapitalize_util_1.uncapitalize);
+        }
+        dynamicMethodInfo.keyToMapReplaced = keySplitedDistinct[0];
+    }
+    return dynamicMethodCustomization;
+}