av6-core 1.5.15 → 1.5.16

package/dist/index.js

@@ -375,6 +375,73 @@ function smartAndMerge(a, b) {
   if (merged !== void 0) return merged;
   return andWrap(a, b);
 }
+var SCALAR_OPS = /* @__PURE__ */ new Set([
+  "equals",
+  "in",
+  "notIn",
+  "lt",
+  "lte",
+  "gt",
+  "gte",
+  "contains",
+  "startsWith",
+  "endsWith",
+  "mode",
+  "search",
+  "not"
+]);
+var RELATION_OPS = /* @__PURE__ */ new Set(["some", "every", "none", "is", "isNot"]);
+function isScalarFilterObject(obj) {
+  if (!isPlainObject(obj)) return false;
+  return Object.keys(obj).some((k) => SCALAR_OPS.has(k));
+}
+function isRelationFilterObject(obj) {
+  if (!isPlainObject(obj)) return false;
+  return Object.keys(obj).some((k) => RELATION_OPS.has(k));
+}
+function normalizeWhere(where) {
+  if (Array.isArray(where)) return where.map(normalizeWhere);
+  if (!isPlainObject(where)) return where;
+  for (const k of Object.keys(where)) {
+    where[k] = normalizeWhere(where[k]);
+  }
+  if (Array.isArray(where.OR) && where.OR.length > 0) {
+    const orItems = where.OR;
+    const keysArr = orItems.map((it) => isPlainObject(it) ? Object.keys(it) : []);
+    const allSingleKey = keysArr.every((ks) => ks.length === 1);
+    if (allSingleKey) {
+      const commonKey = keysArr[0][0];
+      const allSameKey = keysArr.every((ks) => ks[0] === commonKey);
+      const isLogicalKey = commonKey === "AND" || commonKey === "OR" || commonKey === "NOT";
+      if (allSameKey && !isLogicalKey) {
+        const innerList = orItems.map((it) => it[commonKey]).filter((v) => isPlainObject(v));
+        const anyScalar = innerList.some(isScalarFilterObject);
+        if (!anyScalar) {
+          const shouldFold = innerList.some(isRelationFilterObject) || innerList.some(
+            (o) => Object.keys(o).some((k) => !SCALAR_OPS.has(k) && k !== "AND" && k !== "OR" && k !== "NOT")
+          );
+          if (shouldFold) {
+            const foldedRel = { OR: innerList };
+            if (isPlainObject(where[commonKey])) {
+              if (Array.isArray(where[commonKey].OR)) {
+                where[commonKey].OR = [...where[commonKey].OR, ...innerList];
+              } else {
+                where[commonKey] = { ...where[commonKey], ...foldedRel };
+              }
+            } else {
+              where[commonKey] = foldedRel;
+            }
+            delete where.OR;
+          }
+        }
+      }
+    }
+  }
+  if (Array.isArray(where.AND)) {
+    where.AND = where.AND.map(normalizeWhere);
+  }
+  return where;
+}
 
 // src/repository/common.repository.ts
 var import_util2 = require("util");
@@ -702,6 +769,7 @@ var commonRepository = (serviceDeps) => {
       if (searchOR?.length) {
         whereClause = smartAndMerge(whereClause, { OR: searchOR });
       }
+      whereClause = normalizeWhere(whereClause);
       const orderByClause = {};
       if (sortBy && sortDir) {
         orderByClause[sortBy] = sortDir.toLowerCase();

package/dist/index.mjs

@@ -325,6 +325,73 @@ function smartAndMerge(a, b) {
   if (merged !== void 0) return merged;
   return andWrap(a, b);
 }
+var SCALAR_OPS = /* @__PURE__ */ new Set([
+  "equals",
+  "in",
+  "notIn",
+  "lt",
+  "lte",
+  "gt",
+  "gte",
+  "contains",
+  "startsWith",
+  "endsWith",
+  "mode",
+  "search",
+  "not"
+]);
+var RELATION_OPS = /* @__PURE__ */ new Set(["some", "every", "none", "is", "isNot"]);
+function isScalarFilterObject(obj) {
+  if (!isPlainObject(obj)) return false;
+  return Object.keys(obj).some((k) => SCALAR_OPS.has(k));
+}
+function isRelationFilterObject(obj) {
+  if (!isPlainObject(obj)) return false;
+  return Object.keys(obj).some((k) => RELATION_OPS.has(k));
+}
+function normalizeWhere(where) {
+  if (Array.isArray(where)) return where.map(normalizeWhere);
+  if (!isPlainObject(where)) return where;
+  for (const k of Object.keys(where)) {
+    where[k] = normalizeWhere(where[k]);
+  }
+  if (Array.isArray(where.OR) && where.OR.length > 0) {
+    const orItems = where.OR;
+    const keysArr = orItems.map((it) => isPlainObject(it) ? Object.keys(it) : []);
+    const allSingleKey = keysArr.every((ks) => ks.length === 1);
+    if (allSingleKey) {
+      const commonKey = keysArr[0][0];
+      const allSameKey = keysArr.every((ks) => ks[0] === commonKey);
+      const isLogicalKey = commonKey === "AND" || commonKey === "OR" || commonKey === "NOT";
+      if (allSameKey && !isLogicalKey) {
+        const innerList = orItems.map((it) => it[commonKey]).filter((v) => isPlainObject(v));
+        const anyScalar = innerList.some(isScalarFilterObject);
+        if (!anyScalar) {
+          const shouldFold = innerList.some(isRelationFilterObject) || innerList.some(
+            (o) => Object.keys(o).some((k) => !SCALAR_OPS.has(k) && k !== "AND" && k !== "OR" && k !== "NOT")
+          );
+          if (shouldFold) {
+            const foldedRel = { OR: innerList };
+            if (isPlainObject(where[commonKey])) {
+              if (Array.isArray(where[commonKey].OR)) {
+                where[commonKey].OR = [...where[commonKey].OR, ...innerList];
+              } else {
+                where[commonKey] = { ...where[commonKey], ...foldedRel };
+              }
+            } else {
+              where[commonKey] = foldedRel;
+            }
+            delete where.OR;
+          }
+        }
+      }
+    }
+  }
+  if (Array.isArray(where.AND)) {
+    where.AND = where.AND.map(normalizeWhere);
+  }
+  return where;
+}
 
 // src/repository/common.repository.ts
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
@@ -652,6 +719,7 @@ var commonRepository = (serviceDeps) => {
       if (searchOR?.length) {
         whereClause = smartAndMerge(whereClause, { OR: searchOR });
       }
+      whereClause = normalizeWhere(whereClause);
       const orderByClause = {};
       if (sortBy && sortDir) {
         orderByClause[sortBy] = sortDir.toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",