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

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