chore: clean code

lawvs · Jul 18, 2024 · d2f8431 · d2f8431
1 parent 896cc2b
commit d2f8431
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/packages/filter/src/use-advanced-filter.ts → ...s/filter/src/hooks/use-advanced-filter.ts b/packages/filter/src/use-advanced-filter.ts → ...s/filter/src/hooks/use-advanced-filter.ts
@@ -4,8 +4,8 @@ import {
   defaultOptions,
   openFlattenFilterDialog,
   type CreateAdvancedFilterProps,
-} from "./create-advanced-filter.js";
-import { EMPTY_ROOT_FILTER, defaultStorage } from "./utils.js";
+} from "../create-advanced-filter.js";
+import { EMPTY_ROOT_FILTER, defaultStorage } from "../utils.js";
 
 export type UseAdvancedFilterProps<Data = unknown> =
   CreateAdvancedFilterProps<Data>;

diff --git a/packages/filter/src/index.ts b/packages/filter/src/index.ts
@@ -2,7 +2,7 @@ export { createTheme } from "@mui/material/styles";
 export { createAdvancedFilter } from "./create-advanced-filter.js";
 export { FlattenFilterBuilder } from "./flatten-filter-builder.js";
 export { FlattenFilterDialog } from "./flatten-filter-dialog.js";
-export { useAdvancedFilter } from "./use-advanced-filter.js";
+export { useAdvancedFilter } from "./hooks/use-advanced-filter.js";
 
 export {
   ThemeProvider as FilterThemeProvider,

diff --git a/packages/filter/src/types.ts b/packages/filter/src/types.ts
@@ -1,6 +1,6 @@
 import type {
   FilterField,
-  FilterGroup,
+  FilterId,
   FnSchema,
   LooseFilterRule,
   StandardFnSchema,
@@ -12,11 +12,11 @@ import type { ZodType } from "zod";
  * @deprecated
  */
 export type FlattenFilterGroup = {
-  id: FilterGroup["id"];
+  id: FilterId;
   type: "FilterGroup";
   op: "or";
   conditions: {
-    id: FilterGroup["id"];
+    id: FilterId;
     type: "FilterGroup";
     op: "and";
     conditions: LooseFilterRule[];
@@ -26,6 +26,12 @@ export type FlattenFilterGroup = {
 export type BasicFilterProps<Data = unknown> = {
   schema: ZodType<Data>;
   filterList: FnSchema[];
+  /**
+   * The maximum nesting depth limit of the filter rule.
+   *
+   * @default 2
+   */
+  // maxNestedDepth?: number;
   /**
    * The maximum depth of searching for filter fields.
    *

diff --git a/packages/filter/src/ui.tsx b/packages/filter/src/ui.tsx
@@ -12,6 +12,7 @@ export const FilterGroupContainer = ({
   // if (isRoot) {
   //   return children;
   // }
+  const text = filterGroup.op === "or" ? "Or" : "And";
   return (
     <div
       className="filter-builder-group-container"
@@ -27,7 +28,7 @@ export const FilterGroupContainer = ({
           marginRight: 12,
         }}
       >
-        {filterGroup.op === "or" ? "Or" : "And"}
+        {text}
       </div>
       <div
         style={{

diff --git a/packages/filter/src/utils.ts b/packages/filter/src/utils.ts
@@ -206,6 +206,7 @@ export const fromFilterMap = (
   result.conditions = root.conditionIds.map((id) => {
     const item = map[id];
     if (!item) {
+      console.error("Invalid condition ID", id, map, rootKey);
       throw new Error("Invalid condition ID");
     }
     if (item.type === "Filter") {