vsrepo 1.3.2 → 1.3.3

package/dist/VSRepository.js

@@ -63,9 +63,9 @@ class VSRepository {
         }
         return extended;
     }
-    build(prisma, config) {
+    build(prisma, config, useInstance) {
         (0, prisma_client_validate_1.validatePrismaClient)(prisma, this);
-        const buildInstance = Object.create(this);
+        const buildInstance = useInstance ?? Object.create(this);
         buildInstance.prisma = prisma;
         if (buildInstance.softRemovekName &&
             prisma[buildInstance.tableName]["fields"][buildInstance.softRemovekName]["typeName"] !==
@@ -93,19 +93,27 @@ class VSRepository {
                 };
                 if (!dinamicMethodInfo.ignoreWhere) {
                     (0, pretty_wheres_resolve_1.resolvePrettyWheres)(dinamicMethodInfo, dinamicMethodWhereOps);
-                    if (showWorking) {
-                        const argsSimulation = [];
-                        for (let x = 0; x < dinamicMethodInfo.argsCount; x++) {
-                            argsSimulation[x] = "00";
-                        }
-                        (0, logger_util_1.logger)(`Where object resolved to ${methodToMap}:`, "build", buildInstance.tableName, (0, specific_where_resolve_1.resolveSpecificWhere)(argsSimulation, dinamicMethodWhereOps.prettyWheres));
-                        // logger(
-                        //     `Where object resolved to ${methodToMap}:`,
-                        //     "build",
-                        //     buildInstance.tableName,
-                        //     dinamicMethodWhereOps.prettyWheres,
-                        // );
-                    }
+                    // if (showWorking) {
+                    //     const argsSimulation: any[] = [];
+                    //     for (let x = 0; x < dinamicMethodInfo.argsCount; x++) {
+                    //         argsSimulation[x] = "00";
+                    //     }
+                    //     logger(
+                    //         `Where object resolved to ${methodToMap}:`,
+                    //         "build",
+                    //         buildInstance.tableName,
+                    //         resolveSpecificWhere(
+                    //             argsSimulation,
+                    //             dinamicMethodWhereOps.prettyWheres,
+                    //         ),
+                    //     );
+                    //     // logger(
+                    //     //     `Where object resolved to ${methodToMap}:`,
+                    //     //     "build",
+                    //     //     buildInstance.tableName,
+                    //     //     dinamicMethodWhereOps.prettyWheres,
+                    //     // );
+                    // }
                 }
                 let select = undefined;
                 if (dinamicMethodInfo.existsMode) {
@@ -123,7 +131,7 @@ class VSRepository {
                             defaultSelect: methods[originalKey]?.selectModel,
                             ignoreRequiredWhere: dinamicMethodWhereOps.whereType === "overwrite",
                         },
-                        withoutWhere: dinamicMethodInfo.ignoreWhere,
+                        withoutWhere: dinamicMethodInfo.ignoreWhere && !dinamicMethodInfo.onlyBaseWheres,
                         specificSelect: select,
                         pushWhere: dinamicMethodWhereOps.pushWhere,
                         withoutSelect: dinamicMethodInfo.ignoreSelect,
@@ -158,6 +166,11 @@ class VSRepository {
                     const { prismaArgs } = (0, dbAndPrismaArgs_resolve_1.resolveDbAndPrismaArgs)(resolveDbAndPrismaArgsData);
                     return prismaArgs;
                 });
+                if (showWorking) {
+                    const argsSimulation = new Array(dinamicMethodInfo.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;

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

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

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

@@ -0,0 +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_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, validatedConfig?.map ?? 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);
+    };
+}

package/dist/internal/decorators/types/dynamic-method-config.type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DynamicMethodMetadata = void 0;
+class DynamicMethodMetadata {
+    propertyKey;
+    map;
+    proxyTo;
+    whereType;
+    pushWhere;
+    fbMode;
+    injectOrdenation;
+    injectPagination;
+    constructor(propertyKey, map, proxyTo, whereType, pushWhere, fbMode, injectOrdenation, injectPagination) {
+        this.propertyKey = propertyKey;
+        this.map = map;
+        this.proxyTo = proxyTo;
+        this.whereType = whereType;
+        this.pushWhere = pushWhere;
+        this.fbMode = fbMode;
+        this.injectOrdenation = injectOrdenation;
+        this.injectPagination = injectPagination;
+    }
+}
+exports.DynamicMethodMetadata = DynamicMethodMetadata;

package/dist/internal/errors/vs-repo.error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VSRepoRuntimeError = exports.VSRepoExtendError = exports.VSRepoBuildError = exports.VSRepoConfigError = exports.VSRepoError = void 0;
+exports.VSRepoRuntimeError = exports.VSRepoDecoratorError = exports.VSRepoExtendError = exports.VSRepoBuildError = exports.VSRepoConfigError = exports.VSRepoError = void 0;
 class VSRepoError extends Error {
 }
 exports.VSRepoError = VSRepoError;
@@ -16,6 +16,10 @@ class VSRepoExtendError extends VSRepoError {
     type = "VSREPO_EXTEND";
 }
 exports.VSRepoExtendError = VSRepoExtendError;
+class VSRepoDecoratorError extends VSRepoError {
+    type = "VSREPO_DECORATOR";
+}
+exports.VSRepoDecoratorError = VSRepoDecoratorError;
 class VSRepoRuntimeError extends VSRepoError {
     type = "VSREPO_RUNTIME";
     code;

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

@@ -24,6 +24,9 @@ function resolveDbAndPrismaArgs(data) {
         else if (validatedOptions.includeModel) {
             prismaArgs.include = instance.includeModels?.[validatedOptions.includeModel];
         }
+        else if (validatedOptions.include) {
+            prismaArgs.include = validatedOptions.include;
+        }
         else {
             prismaArgs.select = (0, select_resolve_1.resolveSelect)(instance, validatedOptions.selectModel, baseConfig.defaultSelect);
         }

package/dist/internal/resolvers/dynamic-methods-metadata.resolve.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveDynamicMethodsMetadata = resolveDynamicMethodsMetadata;
+const dinamic_methods_key_constant_1 = require("../constants/dinamic-methods-key.constant");
+function resolveDynamicMethodsMetadata(prototype) {
+    const methods = Reflect.getMetadata(dinamic_methods_key_constant_1.DINAMIC_METHODS_KEY, prototype);
+    const methodsRecord = {};
+    if (!methods)
+        return methodsRecord;
+    for (const method of methods) {
+        const { propertyKey, ...rest } = method;
+        methodsRecord[propertyKey] = rest;
+    }
+    return methodsRecord;
+}

package/dist/internal/utils/logger.util.js

@@ -4,7 +4,7 @@ exports.logger = logger;
 exports.performanceLoggerStart = performanceLoggerStart;
 exports.performanceLoggerEnd = performanceLoggerEnd;
 function logger(message, moment, tableName, obj) {
-    console.log(`[VSRepository] (${tableName ?? "unknown"}: ${moment}) ${message}`);
+    console.log(`\n[VSRepository] (${tableName ?? "unknown"}: ${moment}) ${message}`);
     if (obj)
         console.log(JSON.stringify(obj, null, 2));
 }

package/dist/internal/utils/schemas.util.js

@@ -3,8 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.booleanSchema = exports.objectSchema = exports.stringSchema = void 0;
+exports.methodSchema = exports.booleanSchema = exports.objectSchema = exports.stringSchema = void 0;
 const zod_1 = __importDefault(require("zod"));
 exports.stringSchema = zod_1.default.string().trim().nonempty();
 exports.objectSchema = zod_1.default.looseObject({});
 exports.booleanSchema = zod_1.default.boolean();
+exports.methodSchema = zod_1.default.strictObject({
+    map: exports.booleanSchema,
+    selectModel: exports.stringSchema.or(zod_1.default.literal(false)).optional(),
+    whereType: zod_1.default.enum(["overwrite", "extending"]).optional(),
+    proxyTo: exports.stringSchema.optional(),
+    pushWhere: exports.objectSchema.optional(),
+    fbMode: zod_1.default.enum(["one", "list"]).optional(),
+    injectOrdenation: exports.objectSchema.or(zod_1.default.array(exports.objectSchema)).optional(),
+    injectPagination: exports.objectSchema.optional(),
+});

package/dist/internal/validation/constructor-config.validate.js

@@ -27,16 +27,7 @@ function validateConstructorConfig(config) {
         }))
             .optional(),
         methods: zod_1.default
-            .record(schemas_util_1.stringSchema, zod_1.default.strictObject({
-            map: schemas_util_1.booleanSchema,
-            selectModel: schemas_util_1.stringSchema.or(zod_1.default.literal(false)).optional(),
-            whereType: zod_1.default.enum(["overwrite", "extending"]).optional(),
-            proxyTo: schemas_util_1.stringSchema.optional(),
-            pushWhere: schemas_util_1.objectSchema.optional(),
-            fbMode: zod_1.default.enum(["one", "list"]).optional(),
-            injectOrdenation: schemas_util_1.objectSchema.or(zod_1.default.array(schemas_util_1.objectSchema)).optional(),
-            injectPagination: schemas_util_1.objectSchema.optional(),
-        }))
+            .record(schemas_util_1.stringSchema, schemas_util_1.methodSchema)
             .optional(),
         defaultOrdenation: schemas_util_1.objectSchema.or(zod_1.default.array(schemas_util_1.objectSchema)).optional(),
     })

package/dist/internal/validation/dynamic-method-config.validate.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateDynamicMethodConfig = validateDynamicMethodConfig;
+const vs_repo_error_1 = require("../errors/vs-repo.error");
+const schemas_util_1 = require("../utils/schemas.util");
+const is_object_validate_1 = require("./is-object.validate");
+function validateDynamicMethodConfig(config) {
+    if (!(0, is_object_validate_1.isObject)(config)) {
+        throw new vs_repo_error_1.VSRepoDecoratorError(`[VSRepository] (unknown: decorator) 'config' must be a valid object`);
+    }
+    config["map"] = true;
+    const configParsed = schemas_util_1.methodSchema.safeParse(config);
+    if (!configParsed.success) {
+        const firstIssue = configParsed.error.issues[0];
+        const path = firstIssue?.path.length ? firstIssue.path.join(".") : "config";
+        throw new vs_repo_error_1.VSRepoDecoratorError(`[VSRepository] (unknown: decorator) ${path}: ${firstIssue?.message}`);
+    }
+    return configParsed.data;
+}

package/dist/internal/validation/method-options.validate.js

@@ -17,6 +17,7 @@ function validateMethodOptions(options, instance) {
             .optional(),
         includeModel: zod_1.default.enum(Object.keys(instance.includeModels ?? {})).optional(),
         see: zod_1.default.enum(["active", "removed", "all"]).default("active"),
+        include: schemas_util_1.objectSchema.optional(),
     })
         .refine(data => {
         return !(data.selectModel !== undefined && data.includeModel !== undefined);

package/package.json

@@ -1,72 +1,78 @@
-{
-  "name": "vsrepo",
-  "version": "1.3.2",
-  "description": "Uma biblioteca de repository pattern para Prisma",
-  "homepage": "https://github.com/jaobrabo123/VSRepository#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jaobrabo123/VSRepository.git"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
-    },
-    "./VSRepository": {
-      "types": "./dist/VSRepository.d.ts",
-      "import": "./dist/VSRepository.js",
-      "require": "./dist/VSRepository.js"
-    },
-    "./VSRepoError": {
-      "types": "./dist/VSRepoError.d.ts",
-      "import": "./dist/VSRepoError.js",
-      "require": "./dist/VSRepoError.js"
-    }
-  },
-  "type": "commonjs",
-  "files": [
-    "dist",
-    "scripts"
-  ],
-  "bin": {
-    "vsrepo": "scripts/configure-prisma-import.mjs"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "vsrepo": "node ./scripts/configure-prisma-import.mjs",
-    "build": "tsc -p tsconfig.build.json && node ./scripts/copy-types.mjs",
-    "prepack": "pnpm build"
-  },
-  "keywords": [
-    "prisma",
-    "repository",
-    "orm",
-    "typescript",
-    "vsrepo",
-    "vsrepository",
-    "jparepository"
-  ],
-  "author": "João Pedro Azevedo Freire Mecenas",
-  "license": "MIT",
-  "peerDependencies": {
-    "@prisma/client": "^7.8.0"
-  },
-  "devDependencies": {
-    "@prisma/adapter-pg": "^7.8.0",
-    "@prisma/client": "^7.8.0",
-    "@types/node": "^25.6.0",
-    "dotenv": "^17.4.2",
-    "prisma": "^7.8.0",
-    "tsx": "^4.22.3",
-    "typescript": "^6.0.3"
-  },
-  "dependencies": {
-    "deepmerge": "^4.3.1",
-    "zod": "^4.4.3"
-  }
-}
+{
+  "name": "vsrepo",
+  "version": "1.3.3",
+  "description": "A repository pattern library for Prisma",
+  "homepage": "https://github.com/jaobrabo123/VSRepository#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jaobrabo123/VSRepository.git"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.js"
+    },
+    "./VSRepository": {
+      "types": "./dist/VSRepository.d.ts",
+      "import": "./dist/VSRepository.js",
+      "require": "./dist/VSRepository.js"
+    },
+    "./DynamicRepository": {
+      "types": "./dist/DynamicRepository.d.ts",
+      "import": "./dist/DynamicRepository.js",
+      "require": "./dist/DynamicRepository.js"
+    },
+    "./VSRepoError": {
+      "types": "./dist/VSRepoError.d.ts",
+      "import": "./dist/VSRepoError.js",
+      "require": "./dist/VSRepoError.js"
+    }
+  },
+  "type": "commonjs",
+  "files": [
+    "dist",
+    "scripts"
+  ],
+  "bin": {
+    "vsrepo": "scripts/configure-prisma-import.mjs"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "scripts": {
+    "vsrepo": "node ./scripts/configure-prisma-import.mjs",
+    "build": "tsc -p tsconfig.build.json && node ./scripts/copy-types.mjs",
+    "prepack": "pnpm build"
+  },
+  "keywords": [
+    "prisma",
+    "repository",
+    "orm",
+    "typescript",
+    "vsrepo",
+    "vsrepository",
+    "jparepository"
+  ],
+  "author": "João Pedro Azevedo Freire Mecenas",
+  "license": "MIT",
+  "peerDependencies": {
+    "@prisma/client": "^7.8.0"
+  },
+  "devDependencies": {
+    "@prisma/adapter-pg": "^7.8.0",
+    "@prisma/client": "^7.8.0",
+    "@types/node": "^25.6.0",
+    "dotenv": "^17.4.2",
+    "prisma": "^7.8.0",
+    "tsx": "^4.22.3",
+    "typescript": "^6.0.3"
+  },
+  "dependencies": {
+    "deepmerge": "^4.3.1",
+    "reflect-metadata": "^0.2.2",
+    "zod": "^4.4.3"
+  }
+}

package/scripts/configure-prisma-import.mjs

@@ -81,8 +81,25 @@ fs.mkdirSync(outputDir, { recursive: true });
 const typeFiles = [
   'VSRepoError.d.ts',
   'VSRepository.d.ts',
+  'DynamicRepository.d.ts'
 ];
 
+// Mapa de basename original (com e sem extensao) -> basename final `.types`,
+// usado para corrigir os imports relativos entre os proprios arquivos gerados
+// (ex: DynamicRepository.d.ts importando de "./VSRepository.d" ou
+// VSRepository.d.ts importando de "./VSRepoError").
+const crossFileReplacements = typeFiles.flatMap((fileName) => {
+  const originalBase = fileName.replace(/\.d\.ts$/, '');
+  const finalBase = `${originalBase}.types`;
+
+  return [
+    // from "./VSRepository.d" -> from "./VSRepository.types"
+    { pattern: new RegExp(`from(\\s+)(['"])\\./${originalBase}\\.d\\2`, 'g'), replacement: `from$1$2./${finalBase}$2` },
+    // from "./VSRepoError" -> from "./VSRepoError.types"
+    { pattern: new RegExp(`from(\\s+)(['"])\\./${originalBase}\\2`, 'g'), replacement: `from$1$2./${finalBase}$2` },
+  ];
+});
+
 for (const fileName of typeFiles) {
   const sourceFile = path.join(sourceDir, fileName);
 
@@ -103,6 +120,10 @@ for (const fileName of typeFiles) {
     `from '${prismaTargetPath === CLASSIC_PRISMA_GENERATED_PATH ? prismaTargetPath : relativeImportPath(path.dirname(targetFile), prismaTargetPath)}'`
   );
 
+  for (const { pattern, replacement } of crossFileReplacements) {
+    contents = contents.replace(pattern, replacement);
+  }
+
   fs.writeFileSync(targetFile, GENERATED_HEADER + contents, 'utf8');
 
   console.log(`Gerado: ${path.relative(workspaceRoot, targetFile)}`);
@@ -152,6 +173,24 @@ export const VSRepository = VSRepositoryRuntime as typeof VSRepositoryType;
 export const setupVSRepo = setupVSRepoRuntime as typeof setupVSRepoType;
 
 export type * from './VSRepository.types';
+`,
+  },
+  {
+    fileName: 'DynamicRepository.ts',
+    content: `import {
+  DynamicRepository as DynamicRepositoryRuntime,
+  DynamicMethod as DynamicMethodRuntime
+} from 'vsrepo/DynamicRepository';
+
+import type {
+  DynamicRepository as DynamicRepositoryType,
+  DynamicMethod as DynamicMethodType
+} from './DynamicRepository.types';
+
+export const DynamicRepository = DynamicRepositoryRuntime as typeof DynamicRepositoryType;
+export const DynamicMethod = DynamicMethodRuntime as typeof DynamicMethodType;
+
+export type * from './DynamicRepository.types';
 `,
   },
   {
@@ -169,8 +208,14 @@ export {
   setupVSRepo
 } from './VSRepository.js';
 
+export {
+  DynamicRepository,
+  DynamicMethod
+} from './DynamicRepository.js';
+
 export type * from './VSRepoError.types';
 export type * from './VSRepository.types';
+export type * from './DynamicRepository.types';
 `,
   },
 ];