av6-core 1.5.0 → 1.5.2

package/dist/index.d.mts

@@ -328,6 +328,7 @@ interface ColValue {
 interface NewFixedSearchRequest extends NewSearchRequest {
     fixedSearch?: Record<string, ColValue>;
     fixedNotSearch?: Record<string, ColValue>;
+    logic?: LogicNode;
 }
 interface NewFixedSearchRequestService<T extends DynamicShortCode> extends NewFixedSearchRequest {
     shortCodeData: T;
@@ -355,8 +356,9 @@ interface DropdownRequest {
     shortCode: string;
     searchColumns: string[];
     searchText?: string;
-    fixedSearch?: Record<string, ColValue>;
-    fixedNotSearch?: Record<string, ColValue>;
+    fixedSearch?: FixedMap;
+    fixedNotSearch?: FixedMap;
+    logic: LogicNode;
     sortBy?: string;
     sortDir?: "ASC" | "DESC";
     selectColumns?: Record<string, string>;

package/dist/index.d.ts

@@ -328,6 +328,7 @@ interface ColValue {
 interface NewFixedSearchRequest extends NewSearchRequest {
     fixedSearch?: Record<string, ColValue>;
     fixedNotSearch?: Record<string, ColValue>;
+    logic?: LogicNode;
 }
 interface NewFixedSearchRequestService<T extends DynamicShortCode> extends NewFixedSearchRequest {
     shortCodeData: T;
@@ -355,8 +356,9 @@ interface DropdownRequest {
     shortCode: string;
     searchColumns: string[];
     searchText?: string;
-    fixedSearch?: Record<string, ColValue>;
-    fixedNotSearch?: Record<string, ColValue>;
+    fixedSearch?: FixedMap;
+    fixedNotSearch?: FixedMap;
+    logic: LogicNode;
     sortBy?: string;
     sortDir?: "ASC" | "DESC";
     selectColumns?: Record<string, string>;

package/dist/index.js

@@ -299,28 +299,17 @@ function toDynamicDropdownDto(mapping, row) {
 function toDynamicDropdownDtoList(mapping, rows) {
   return rows.map((r) => toDynamicDropdownDto(mapping, r));
 }
-function andMerge(a, b) {
-  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
-  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
-  if (isPlainObject(a) && Array.isArray(a.AND)) return { ...a, AND: [...a.AND, b] };
-  if (isPlainObject(b) && Array.isArray(b.AND)) return { ...b, AND: [...b.AND, a] };
-  return { AND: [a, b] };
-}
 async function generateFixedMapsCondition(args) {
   let out = {};
-  if (args.fixedSearch) {
-    for (const [field, defObj] of Object.entries(args.fixedSearch)) {
-      if (!defObj?.value?.length) continue;
-      const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, false);
-      out = andMerge(out, cond);
-    }
+  for (const [field, defObj] of Object.entries(args.fixedSearch ?? {})) {
+    if (!defObj?.value?.length) continue;
+    const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, false);
+    out = smartAndMerge(out, cond);
   }
-  if (args.fixedNotSearch) {
-    for (const [field, defObj] of Object.entries(args.fixedNotSearch)) {
-      if (!defObj?.value?.length) continue;
-      const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, true);
-      out = andMerge(out, cond);
-    }
+  for (const [field, defObj] of Object.entries(args.fixedNotSearch ?? {})) {
+    if (!defObj?.value?.length) continue;
+    const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, true);
+    out = smartAndMerge(out, cond);
   }
   return out;
 }
@@ -333,7 +322,7 @@ async function buildLogicCondition(node) {
   if (node.AND?.length) {
     for (const child of node.AND) {
       const childCond = await buildLogicCondition(child);
-      self = andMerge(self, childCond);
+      self = smartAndMerge(self, childCond);
     }
   }
   if (node.OR?.length) {
@@ -344,13 +333,48 @@ async function buildLogicCondition(node) {
       orList.push(childCond);
     }
     if (orList.length === 1) {
-      self = andMerge(self, orList[0]);
+      self = smartAndMerge(self, orList[0]);
     } else if (orList.length > 1) {
-      self = andMerge(self, { OR: orList });
+      self = smartAndMerge(self, { OR: orList });
     }
   }
   return self;
 }
+function tryDeepMergeObjects(a, b) {
+  if (!isPlainObject(a) || !isPlainObject(b)) return void 0;
+  const out = { ...a };
+  for (const k of Object.keys(b)) {
+    if (out[k] === void 0) {
+      out[k] = b[k];
+      continue;
+    }
+    const av = out[k];
+    const bv = b[k];
+    if (isPlainObject(av) && isPlainObject(bv)) {
+      const merged = tryDeepMergeObjects(av, bv);
+      if (merged !== void 0) {
+        out[k] = merged;
+        continue;
+      }
+    }
+    return void 0;
+  }
+  return out;
+}
+function andWrap(a, b) {
+  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
+  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
+  if (isPlainObject(a) && Array.isArray(a.AND)) return { ...a, AND: [...a.AND, b] };
+  if (isPlainObject(b) && Array.isArray(b.AND)) return { ...b, AND: [...b.AND, a] };
+  return { AND: [a, b] };
+}
+function smartAndMerge(a, b) {
+  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
+  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
+  const merged = tryDeepMergeObjects(a, b);
+  if (merged !== void 0) return merged;
+  return andWrap(a, b);
+}
 
 // src/repository/common.repository.ts
 var import_util2 = require("util");
@@ -438,15 +462,17 @@ var commonRepository = (serviceDeps) => {
       shortCodeData,
       fixedSearch,
       fixedNotSearch,
+      logic,
       sortBy,
       sortDir,
       selectColumns
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
-      const rootCondition = await this.generateRootCondition({
+      const rootCondition = await this.generateRootConditionV2({
         fixedSearch,
-        fixedNotSearch
+        fixedNotSearch,
+        logic
       });
       const customWhereClause = { ...rootCondition };
       const whereClause = {};
@@ -622,7 +648,7 @@ var commonRepository = (serviceDeps) => {
         fixedNotSearch: args.fixedNotSearch
       });
       const logicCond = await buildLogicCondition(args.logic);
-      root = andMerge(root, logicCond);
+      root = smartAndMerge(root, logicCond);
       if (isPlainObject(root) && Object.keys(root).length === 0) return {};
       return root;
     },
@@ -634,13 +660,15 @@ var commonRepository = (serviceDeps) => {
       // now [{ col: string, type: string }, ...]
       fixedSearch,
       // now { [fieldName]: { type: string, value: any[] } }
-      fixedNotSearch
+      fixedNotSearch,
       // same structure
+      logic
     }) {
       logger.info("entering::fixedSearch::repository");
       const rootCondition = await this.generateRootConditionV2({
         fixedSearch,
-        fixedNotSearch
+        fixedNotSearch,
+        logic
       });
       let searchOR;
       if (searchText && searchColumns && searchColumns.length > 0) {

package/dist/index.mjs

@@ -249,28 +249,17 @@ function toDynamicDropdownDto(mapping, row) {
 function toDynamicDropdownDtoList(mapping, rows) {
   return rows.map((r) => toDynamicDropdownDto(mapping, r));
 }
-function andMerge(a, b) {
-  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
-  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
-  if (isPlainObject(a) && Array.isArray(a.AND)) return { ...a, AND: [...a.AND, b] };
-  if (isPlainObject(b) && Array.isArray(b.AND)) return { ...b, AND: [...b.AND, a] };
-  return { AND: [a, b] };
-}
 async function generateFixedMapsCondition(args) {
   let out = {};
-  if (args.fixedSearch) {
-    for (const [field, defObj] of Object.entries(args.fixedSearch)) {
-      if (!defObj?.value?.length) continue;
-      const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, false);
-      out = andMerge(out, cond);
-    }
+  for (const [field, defObj] of Object.entries(args.fixedSearch ?? {})) {
+    if (!defObj?.value?.length) continue;
+    const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, false);
+    out = smartAndMerge(out, cond);
   }
-  if (args.fixedNotSearch) {
-    for (const [field, defObj] of Object.entries(args.fixedNotSearch)) {
-      if (!defObj?.value?.length) continue;
-      const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, true);
-      out = andMerge(out, cond);
-    }
+  for (const [field, defObj] of Object.entries(args.fixedNotSearch ?? {})) {
+    if (!defObj?.value?.length) continue;
+    const cond = buildFieldCondition(field.split("."), defObj.type, defObj.value, true);
+    out = smartAndMerge(out, cond);
   }
   return out;
 }
@@ -283,7 +272,7 @@ async function buildLogicCondition(node) {
   if (node.AND?.length) {
     for (const child of node.AND) {
       const childCond = await buildLogicCondition(child);
-      self = andMerge(self, childCond);
+      self = smartAndMerge(self, childCond);
     }
   }
   if (node.OR?.length) {
@@ -294,13 +283,48 @@ async function buildLogicCondition(node) {
       orList.push(childCond);
     }
     if (orList.length === 1) {
-      self = andMerge(self, orList[0]);
+      self = smartAndMerge(self, orList[0]);
     } else if (orList.length > 1) {
-      self = andMerge(self, { OR: orList });
+      self = smartAndMerge(self, { OR: orList });
     }
   }
   return self;
 }
+function tryDeepMergeObjects(a, b) {
+  if (!isPlainObject(a) || !isPlainObject(b)) return void 0;
+  const out = { ...a };
+  for (const k of Object.keys(b)) {
+    if (out[k] === void 0) {
+      out[k] = b[k];
+      continue;
+    }
+    const av = out[k];
+    const bv = b[k];
+    if (isPlainObject(av) && isPlainObject(bv)) {
+      const merged = tryDeepMergeObjects(av, bv);
+      if (merged !== void 0) {
+        out[k] = merged;
+        continue;
+      }
+    }
+    return void 0;
+  }
+  return out;
+}
+function andWrap(a, b) {
+  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
+  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
+  if (isPlainObject(a) && Array.isArray(a.AND)) return { ...a, AND: [...a.AND, b] };
+  if (isPlainObject(b) && Array.isArray(b.AND)) return { ...b, AND: [...b.AND, a] };
+  return { AND: [a, b] };
+}
+function smartAndMerge(a, b) {
+  if (!a || isPlainObject(a) && Object.keys(a).length === 0) return b;
+  if (!b || isPlainObject(b) && Object.keys(b).length === 0) return a;
+  const merged = tryDeepMergeObjects(a, b);
+  if (merged !== void 0) return merged;
+  return andWrap(a, b);
+}
 
 // src/repository/common.repository.ts
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
@@ -388,15 +412,17 @@ var commonRepository = (serviceDeps) => {
       shortCodeData,
       fixedSearch,
       fixedNotSearch,
+      logic,
       sortBy,
       sortDir,
       selectColumns
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
-      const rootCondition = await this.generateRootCondition({
+      const rootCondition = await this.generateRootConditionV2({
         fixedSearch,
-        fixedNotSearch
+        fixedNotSearch,
+        logic
       });
       const customWhereClause = { ...rootCondition };
       const whereClause = {};
@@ -572,7 +598,7 @@ var commonRepository = (serviceDeps) => {
         fixedNotSearch: args.fixedNotSearch
       });
       const logicCond = await buildLogicCondition(args.logic);
-      root = andMerge(root, logicCond);
+      root = smartAndMerge(root, logicCond);
       if (isPlainObject(root) && Object.keys(root).length === 0) return {};
       return root;
     },
@@ -584,13 +610,15 @@ var commonRepository = (serviceDeps) => {
       // now [{ col: string, type: string }, ...]
       fixedSearch,
       // now { [fieldName]: { type: string, value: any[] } }
-      fixedNotSearch
+      fixedNotSearch,
       // same structure
+      logic
     }) {
       logger.info("entering::fixedSearch::repository");
       const rootCondition = await this.generateRootConditionV2({
         fixedSearch,
-        fixedNotSearch
+        fixedNotSearch,
+        logic
       });
       let searchOR;
       if (searchText && searchColumns && searchColumns.length > 0) {

package/package.json

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