@nocobase/utils 2.0.0-alpha.36 → 2.0.0-alpha.38

package/lib/assign.js

@@ -45,7 +45,10 @@ var import_deepmerge = __toESM(require("deepmerge"));
 var import_lodash = __toESM(require("lodash"));
 var import_common = require("./common");
 function getEnumerableOwnPropertySymbols(target) {
-  return Object.getOwnPropertySymbols ? Object.getOwnPropertySymbols(target).filter((symbol) => target.propertyIsEnumerable(symbol)) : [];
+  return Object.getOwnPropertySymbols ? (
+    // eslint-disable-next-line no-prototype-builtins
+    Object.getOwnPropertySymbols(target).filter((symbol) => target.propertyIsEnumerable(symbol))
+  ) : [];
 }
 __name(getEnumerableOwnPropertySymbols, "getEnumerableOwnPropertySymbols");
 function getKeys(target) {
@@ -113,12 +116,22 @@ mergeStrategies.set("union", (x, y) => {
 mergeStrategies.set(
   "intersect",
   (x, y) => (() => {
+    console.log("intersect inputs:", x, y);
     if (typeof x === "string") {
       x = x.split(",");
     }
     if (typeof y === "string") {
       y = y.split(",");
     }
+    if (typeof x === "object" && !Array.isArray(x)) {
+      x = Object.values(x || {});
+    }
+    if (typeof y === "object" && !Array.isArray(y)) {
+      y = Object.values(y || {});
+    }
+    if (!Array.isArray(x) || x.length === 0) {
+      return y || [];
+    }
     if (!Array.isArray(x) || x.length === 0) {
       return y || [];
     }

package/lib/common.js

@@ -67,7 +67,7 @@ const isEmpty = /* @__PURE__ */ __name((value) => {
   if (Array.isArray(value)) {
     return value.length === 0;
   }
-  return !value;
+  return false;
 }, "isEmpty");
 const isPlainObject = /* @__PURE__ */ __name((value) => {
   if (Object.prototype.toString.call(value) !== "[object Object]") {
@@ -154,6 +154,11 @@ const removeNullCondition = /* @__PURE__ */ __name((filter, customFlat = import_
     }
   }
   const result = customFlat.unflatten(values);
+  for (const key in result) {
+    if (Array.isArray(result[key])) {
+      result[key] = result[key].filter((item) => item != null);
+    }
+  }
   return import_lodash.default.isEmpty(result) ? void 0 : result;
 }, "removeNullCondition");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/transformFilter.d.ts

@@ -99,6 +99,7 @@ export type QueryObject = {
  * ```
  */
 export declare function transformFilter(filter: FilterGroupType): QueryObject;
+export declare function removeInvalidFilterItems(filter: FilterGroupType): FilterGroupType;
 /**
  * 条件评估器函数类型
  *

package/lib/transformFilter.js

@@ -28,11 +28,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var transformFilter_exports = {};
 __export(transformFilter_exports, {
   evaluateConditions: () => evaluateConditions,
+  removeInvalidFilterItems: () => removeInvalidFilterItems,
   transformFilter: () => transformFilter
 });
 module.exports = __toCommonJS(transformFilter_exports);
+var import_common = require("./common");
 function isFilterCondition(item) {
-  return "path" in item && "operator" in item && "value" in item;
+  return "path" in item && "operator" in item;
 }
 __name(isFilterCondition, "isFilterCondition");
 function isFilterGroup(item) {
@@ -74,9 +76,30 @@ function transformFilter(filter) {
   if (!Array.isArray(filter.items)) {
     throw new Error("Invalid filter: items must be an array");
   }
-  return transformGroup(filter);
+  return (0, import_common.removeNullCondition)(transformGroup(filter));
 }
 __name(transformFilter, "transformFilter");
+function removeInvalidFilterItems(filter) {
+  if (!filter || typeof filter !== "object") {
+    throw new Error("Invalid filter: filter must be an object");
+  }
+  if (!isFilterGroup(filter)) {
+    throw new Error("Invalid filter: filter must have logic and items properties");
+  }
+  if (!Array.isArray(filter.items)) {
+    throw new Error("Invalid filter: items must be an array");
+  }
+  filter.items = filter.items.filter((item) => {
+    if (isFilterCondition(item)) {
+      return item.path && item.operator;
+    } else if (isFilterGroup(item)) {
+      return removeInvalidFilterItems(item);
+    }
+    return false;
+  });
+  return { ...filter };
+}
+__name(removeInvalidFilterItems, "removeInvalidFilterItems");
 function evaluateCondition(condition, evaluator) {
   const { path, operator, value } = condition;
   return evaluator(path, operator, value);
@@ -124,5 +147,6 @@ __name(evaluateConditions, "evaluateConditions");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   evaluateConditions,
+  removeInvalidFilterItems,
   transformFilter
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "2.0.0-alpha.36",
+  "version": "2.0.0-alpha.38",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -17,5 +17,5 @@
     "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "c1170bac3ba2325b7420ce65e732c1ba8bbb7767"
+  "gitHead": "30b1723601099007f7641c6ffa4111c880cb44e4"
 }