vsrepo 1.1.3 → 1.1.5

package/README.md

@@ -2,6 +2,7 @@
 
 ![npm](https://img.shields.io/npm/v/vsrepo?style=flat-square)
 ![license](https://img.shields.io/github/license/jaobrabo123/vsrepository?style=flat-square)
+![NPM Downloads](https://img.shields.io/npm/d18m/vsrepo.svg)
 
 Biblioteca de repository pattern para projetos que usam **Prisma**, com suporte completo a **TypeScript** e **type inference** automático.
 
@@ -70,21 +71,21 @@ Equivale a:
 
 ```bash
 npx vsrepo generate \
-  --output src/generated/vsrepo \
-  --prisma src/generated/prisma
+  --output generated/vsrepo \
+  --prisma generated/prisma
 ```
 
 **Flags disponíveis:**
 
 | Flag       | Alias | Padrão                 |
 | ---------- | ----- | ---------------------- |
-| `--output` | `-o`  | `src/generated/vsrepo` |
-| `--prisma` | `-p`  | `src/generated/prisma` |
+| `--output` | `-o`  | `generated/vsrepo` |
+| `--prisma` | `-p`  | `generated/prisma` |
 
 **Arquivos gerados:**
 
 ```
-src/generated/vsrepo/
+generated/vsrepo/
 ├── VSRepoError.ts
 ├── VSRepoError.types.d.ts
 ├── VSRepository.ts
@@ -96,7 +97,7 @@ Após gerar, importe sempre a partir da pasta gerada:
 
 ```ts
 // CORRETO ✅
-import { setupVSRepo } from "../generated/vsrepo";
+import { setupVSRepo } from "../../generated/vsrepo";
 
 // ERRADO ❌
 import { setupVSRepo } from "vsrepo";
@@ -110,7 +111,7 @@ import { setupVSRepo } from "vsrepo";
 
 ```ts
 // src/configs/db.ts
-import { PrismaClient } from '../generated/prisma/client';
+import { PrismaClient } from '../../generated/prisma/client';
 import { PrismaPg } from '@prisma/adapter-pg';
 import 'dotenv/config';
 
@@ -125,8 +126,8 @@ export default prisma;
 ```ts
 // src/repositories/usuarioRepository.ts
 import prisma from "../configs/db";
-import { setupVSRepo } from "../generated/vsrepo";
-import type { Usuario } from "../generated/prisma/client";
+import { setupVSRepo } from "../../generated/vsrepo";
+import type { Usuario } from "../../generated/prisma/client";
 
 const usuarioRepository = setupVSRepo<Usuario, "usuario">()({
   tableName: "usuario",
@@ -172,11 +173,11 @@ O VSRepository pode ser facilmente integrado em projetos NestJS através de prov
 ### Configurando o repository como provider
 
 ```ts
-// src/repositories/user.repository.ts
+// src/resources/user/user.repository.ts
 import { Provider } from "@nestjs/common";
 import { PrismaService } from "../../database/prisma.service";
-import { UserGetPayload } from "../../generated/prisma/models";
-import { setupVSRepo } from "../../generated/vsrepo";
+import { UserGetPayload } from "../../../generated/prisma/models";
+import { setupVSRepo } from "../../../generated/vsrepo";
 
 const userVSRepo = setupVSRepo<
     UserGetPayload<{ include: { profile: true } }>,
@@ -242,9 +243,9 @@ export const UserRepositoryProvider: Provider = {
 ### Registrando o provider no módulo
 
 ```ts
-// src/modules/user/user.module.ts
+// src/resources/user/user.module.ts
 import { Module } from "@nestjs/common";
-import { UserRepositoryProvider } from "../../repositories/user.repository";
+import { UserRepositoryProvider } from "./user.repository";
 import { UserService } from "./user.service";
 import { UserController } from "./user.controller";
 
@@ -260,9 +261,9 @@ export class UserModule {}
 ### Utilizando o repository em um serviço
 
 ```ts
-// src/modules/user/user.service.ts
+// src/resources/user/user.service.ts
 import { Injectable, Inject } from "@nestjs/common";
-import { USER_REPOSITORY, UserRepository } from "../../repositories/user.repository";
+import { USER_REPOSITORY, UserRepository } from "./user.repository";
 
 @Injectable()
 export class UserService {
@@ -292,7 +293,7 @@ export class UserService {
 ### Usando em um controller
 
 ```ts
-// src/modules/user/user.controller.ts
+// src/resources/user/user.controller.ts
 import { Controller, Get, Post, Body, Param, Patch, Delete } from "@nestjs/common";
 import { UserService } from "./user.service";
 
@@ -723,7 +724,7 @@ methods: {
 Configure relações para que o `save` as gerencie automaticamente. Para que as relações apareçam no autocomplete, o tipo genérico deve incluir as relações usando `GetPayload`:
 
 ```ts
-import type { Prisma } from "../generated/prisma/client";
+import type { Prisma } from "../../generated/prisma/client";
 
 type Usuario = Prisma.usuarioGetPayload<{
   include: { perfil: true; postagens: true };
@@ -818,7 +819,7 @@ const usuarioRepository = setupVSRepo<Usuario, "usuario">()({
 O VSRepository lança `VSRepoError` e suas subclasses em situações específicas (OBS: Erros do Prisma não são sobrescritos como `VSRepoError`):
 
 ```ts
-import { VSRepoError } from "../generated/vsrepo";
+import { VSRepoError } from "../../generated/vsrepo";
 
 try {
   const usuario = await usuarioRepository.get();
@@ -847,7 +848,7 @@ O VSRepository exporta os seguintes tipos para uso nas suas aplicações:
 ### Tipos de cliente
 
 ```ts
-import type { DbClient, DbTransaction, ClientOrTransaction } from "../generated/vsrepo";
+import type { DbClient, DbTransaction, ClientOrTransaction } from "../../generated/vsrepo";
 
 type DbClient           = PrismaClient;
 type DbTransaction      = Prisma.TransactionClient;
@@ -864,7 +865,7 @@ import type {
   OrdenationModel,
   PaginationModel,
   ModelUpsertInput,
-} from "../generated/vsrepo";
+} from "../../generated/vsrepo";
 
 // Select de um campo específico
 type UsuarioSelect = SelectModel<"usuario">;
@@ -888,7 +889,7 @@ type UsuarioUpsertInput = ModelUpsertInput<"usuario">;
 ### Todos os inputs do modelo
 
 ```ts
-import type { PrismaModelInputs } from "../generated/vsrepo";
+import type { PrismaModelInputs } from "../../generated/vsrepo";
 
 type UsuarioInputs = PrismaModelInputs<"usuario">;
 // Contém:
@@ -899,7 +900,7 @@ type UsuarioInputs = PrismaModelInputs<"usuario">;
 ### Tipos de opções de método
 
 ```ts
-import type { MethodOptions, MethodOptionsModel } from "../generated/vsrepo";
+import type { MethodOptions, MethodOptionsModel } from "../../generated/vsrepo";
 
 // MethodOptions<S> — opções passadas nos métodos do repository
 // S = chave do select model ou false
@@ -919,7 +920,7 @@ import type {
   RepositoryRelations,
   ExtractRelationConfig,
   UpsertWithRelations,
-} from "../generated/vsrepo";
+} from "../../generated/vsrepo";
 
 // Configuração de um método dinâmico
 type MeuMethodConfig = MethodConfig<"usuario", typeof meuSelectModels>;
@@ -943,7 +944,7 @@ type UsuarioComRelacoes = UpsertWithRelations<Usuario, "usuario", typeof relatio
 ### Tipo do repository construído
 
 ```ts
-import type { BuiltRepository, RepositoryOf } from "../generated/vsrepo";
+import type { BuiltRepository, RepositoryOf } from "../../generated/vsrepo";
 
 // Tipo completo de um repository construído
 type MeuRepo = BuiltRepository<Usuario, "usuario", typeof config, typeof buildConfig>;
@@ -970,7 +971,7 @@ type UsuarioRepositoryExtended = RepositoryOf<typeof usuarioVSRepo, undefined, t
 ### Tipo auxiliar
 
 ```ts
-import type { DistributiveOmit } from "../generated/vsrepo";
+import type { DistributiveOmit } from "../../generated/vsrepo";
 
 // Omit distributivo — preserva unions ao omitir propriedades
 type SemEmail = DistributiveOmit<Usuario | Perfil, "email">;

package/VSRepository/VSRepoUtils.js

@@ -1,6 +1,29 @@
 import z from "zod";
 import { VSRepoConfigError, VSRepoBuildError } from "./VSRepoError.js";
 
+export function mergeWheres(currentWhere, restrictWhere) {
+    const restrictWhereKeys = Object.keys(restrictWhere);
+    for (let i = 0; i < restrictWhereKeys.length; i++) {
+        const restrictWhereKey = restrictWhereKeys[i];
+        const restrictWhereField = restrictWhere[restrictWhereKey];
+
+        if (restrictWhereField === null || typeof restrictWhereField !== "object") {
+            currentWhere[restrictWhereKey] = restrictWhereField;
+        } else if (Array.isArray(restrictWhereField)) {
+            currentWhere[restrictWhereKey] = Array.isArray(currentWhere[restrictWhereKey]) ?
+                restrictWhereField.concat(currentWhere[restrictWhereKey]) :
+                restrictWhereField;
+        } else {
+            currentWhere[restrictWhereKey] = 
+                currentWhere[restrictWhereKey] != null &&
+                typeof currentWhere[restrictWhereKey] === "object" &&
+                !Array.isArray(currentWhere[restrictWhereKey]) ?
+                    Object.assign(currentWhere[restrictWhereKey], restrictWhereField) :
+                    restrictWhereField;
+        }
+    }
+}
+
 const stringSchema = z.string().trim().nonempty();
 const objectSchema = z.looseObject({});
 const booleanSchema = z.boolean();

package/VSRepository/VSRepository.js

@@ -9,7 +9,7 @@ export * from "./VSRepoError.js";
 
 // * Importando classes de erro
 import { VSRepoBuildError, VSRepoExtendError, VSRepoRuntimeError } from "./VSRepoError.js";
-import { validateBuildConfig, validateConfig } from "./VSRepoUtils.js";
+import { mergeWheres, validateBuildConfig, validateConfig } from "./VSRepoUtils.js";
 
 // * Essa é a classe pincipal, é a partir dela que serão criados os objetos dos repositories
 export class VSRepository {
@@ -593,15 +593,11 @@ export class VSRepository {
                 const assignWhere = (where) => {
                     if(whereType==='extending' && buildInstance.requiredWhere) {
                         let safeRequiredWhere = structuredClone(buildInstance.requiredWhere);
-                        if(where.OR && safeRequiredWhere.OR) safeRequiredWhere.OR = safeRequiredWhere.OR.concat(where.OR)
-                        if(where.AND && safeRequiredWhere.AND) safeRequiredWhere.AND = safeRequiredWhere.AND.concat(where.AND)
-                        Object.assign(where, safeRequiredWhere);
+                        mergeWheres(where, safeRequiredWhere);
                     }
                     if(pushWhere !== undefined) {
                         let safePushWhere = structuredClone(pushWhere);
-                        if(where.OR && safePushWhere.OR) safePushWhere.OR = safePushWhere.OR.concat(where.OR)
-                        if(where.AND && safePushWhere.AND) safePushWhere.AND = safePushWhere.AND.concat(where.AND)
-                        Object.assign(where, safePushWhere);
+                        mergeWheres(where, safePushWhere);
                     }
                 }
 

package/package.json

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

package/scripts/configure-prisma-import.mjs

@@ -8,8 +8,8 @@ const workspaceRoot = process.cwd();
 const args = process.argv.slice(2);
 const scriptDirectory = path.dirname(fileURLToPath(import.meta.url));
 
-const DEFAULT_OUTPUT = 'src/generated/vsrepo';
-const DEFAULT_PRISMA = 'src/generated/prisma';
+const DEFAULT_OUTPUT = 'generated/vsrepo';
+const DEFAULT_PRISMA = 'generated/prisma';
 const GENERATED_HEADER = `/**
  * ! THIS FILE IS AUTO-GENERATED.
  * ! DO NOT EDIT MANUALLY.
@@ -55,7 +55,7 @@ if (prismaArg.startsWith('-')) {
 const outputDir = path.resolve(workspaceRoot, outputArg);
 
 const prismaTargetPath = stripKnownExtension(
-  path.resolve(workspaceRoot, prismaArg, 'client')
+  path.resolve(workspaceRoot, prismaArg, prismaArg.endsWith('client') ? '' : 'client')
 );
 
 const installedNodeModulesPath = path.join(workspaceRoot, 'node_modules/vsrepo');
@@ -186,7 +186,7 @@ const readmeTarget = path.join(outputDir, 'README.md');
 
 if (fs.existsSync(readmeSource)) {
   fs.copyFileSync(readmeSource, readmeTarget);
-  console.log(`Copiado: ${path.relative(workspaceRoot, readmeTarget)} (origem: ${path.relative(workspaceRoot, readmeSource)})`);
+  console.log(`Gerado: ${path.relative(workspaceRoot, readmeTarget)}`);
 } else {
   console.warn(`README.md do VSRepository nao encontrado em: ${path.relative(workspaceRoot, readmeSource)}. Ignorando a copia.`);
 }