@izumisy-tailor/tailor-data-viewer 0.2.9 → 0.2.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@izumisy-tailor/tailor-data-viewer",
   "private": false,
-  "version": "0.2.9",
+  "version": "0.2.10",
   "type": "module",
   "description": "Flexible data viewer component for Tailor Platform",
   "files": [

package/src/component/collection/use-collection.test.ts

@@ -73,7 +73,7 @@ describe("useCollection", () => {
       const { result } = renderHook(() => useCollection({ query: FAKE_QUERY }));
 
       act(() => {
-        result.current.addFilter("status", "ACTIVE", "eq");
+        result.current.addFilter("status", "eq", "ACTIVE");
       });
 
       expect(result.current.filters).toHaveLength(1);
@@ -91,10 +91,10 @@ describe("useCollection", () => {
       const { result } = renderHook(() => useCollection({ query: FAKE_QUERY }));
 
       act(() => {
-        result.current.addFilter("status", "ACTIVE", "eq");
+        result.current.addFilter("status", "eq", "ACTIVE");
       });
       act(() => {
-        result.current.addFilter("status", "INACTIVE", "eq");
+        result.current.addFilter("status", "eq", "INACTIVE");
       });
 
       expect(result.current.filters).toHaveLength(1);
@@ -130,8 +130,8 @@ describe("useCollection", () => {
       const { result } = renderHook(() => useCollection({ query: FAKE_QUERY }));
 
       act(() => {
-        result.current.addFilter("status", "ACTIVE", "eq");
-        result.current.addFilter("amount", 1000, "gte");
+        result.current.addFilter("status", "eq", "ACTIVE");
+        result.current.addFilter("amount", "gte", 1000);
       });
       act(() => {
         result.current.removeFilter("status");
@@ -145,8 +145,8 @@ describe("useCollection", () => {
       const { result } = renderHook(() => useCollection({ query: FAKE_QUERY }));
 
       act(() => {
-        result.current.addFilter("status", "ACTIVE", "eq");
-        result.current.addFilter("amount", 1000, "gte");
+        result.current.addFilter("status", "eq", "ACTIVE");
+        result.current.addFilter("amount", "gte", 1000);
       });
       act(() => {
         result.current.clearFilters();
@@ -167,7 +167,7 @@ describe("useCollection", () => {
 
       // Adding filter should reset pagination
       act(() => {
-        result.current.addFilter("status", "ACTIVE", "eq");
+        result.current.addFilter("status", "eq", "ACTIVE");
       });
       expect(result.current.cursor).toBeNull();
       expect(result.current.hasPrevPage).toBe(false);

package/src/component/collection/use-collection.ts

@@ -65,7 +65,8 @@ export function useCollection<
   {
     query: TQuery;
     variables: ResolveVariables<TQuery, FieldName<TMetadata, TTableName>>;
-  }
+  },
+  MetadataFilter<TMetadata, TTableName>
 >;
 
 /**
@@ -129,7 +130,7 @@ export function useCollection(
   // Filter operations
   // ---------------------------------------------------------------------------
   const addFilter = useCallback(
-    (field: string, value: unknown, operator: FilterOperator = "eq") => {
+    (field: string, operator: FilterOperator, value: unknown) => {
       setFiltersState((prev) => {
         const existing = prev.findIndex((f) => f.field === field);
         const newFilter: Filter = {
@@ -273,7 +274,9 @@ export function useCollection(
   return {
     toQueryArgs,
     filters,
-    addFilter,
+    // Cast needed: implementation accepts FilterOperator (widest),
+    // but overload signatures narrow via OperatorForField<TFilter, F>.
+    addFilter: addFilter as UseCollectionReturn["addFilter"],
     setFilters,
     removeFilter,
     clearFilters,

package/src/component/search-filter-form.tsx

@@ -133,7 +133,7 @@ export function SearchFilterForm<TRow extends Record<string, unknown>>({
 
     if (!isBooleanType && !filterValue.trim()) return;
 
-    addFilter(selectedField, value, selectedOperator);
+    addFilter(selectedField, selectedOperator, value);
     setSelectedField("");
     setSelectedOperator("eq");
     setFilterValue("");

package/src/component/types.ts

@@ -72,6 +72,21 @@ export type OperatorForFilterType = {
  */
 export type FilterOperator = OperatorForFilterType[FilterConfig["type"]];
 
+/**
+ * Resolve the operator union for a specific field within a filter type.
+ *
+ * When `TFilter` is a metadata-aware discriminated union (e.g. `MetadataFilter`),
+ * this narrows operators to only those valid for the given field's type.
+ * When the field cannot be resolved (e.g. non-metadata usage), falls back to `FilterOperator`.
+ */
+export type OperatorForField<TFilter, F extends string> = [
+  Extract<TFilter, { field: F }>,
+] extends [never]
+  ? FilterOperator
+  : Extract<TFilter, { field: F }> extends { operator: infer O }
+    ? O
+    : FilterOperator;
+
 // =============================================================================
 // Filter Type → FieldType Mapping (type-level)
 // =============================================================================
@@ -364,6 +379,7 @@ export interface UseCollectionReturn<
   TFieldName extends string = string,
   TVariables = QueryVariables<TFieldName>,
   TQueryArgs = { query: unknown; variables: TVariables },
+  TFilter = Filter<TFieldName>,
 > {
   /**
    * Returns query arguments (`{ query, variables }`) that can be spread
@@ -381,7 +397,11 @@ export interface UseCollectionReturn<
   /** Current active filters */
   filters: Filter[];
   /** Add or update a filter for a field */
-  addFilter(field: TFieldName, value: unknown, operator?: FilterOperator): void;
+  addFilter<F extends TFieldName>(
+    field: F,
+    operator: OperatorForField<TFilter, F>,
+    value: unknown,
+  ): void;
   /** Replace all filters at once */
   setFilters(filters: Filter[]): void;
   /** Remove filter for a specific field */
@@ -762,7 +782,7 @@ export interface SearchFilterFormProps<TRow extends Record<string, unknown>> {
   /** Current active filters */
   filters: Filter[];
   /** Add or update a filter */
-  addFilter: (field: string, value: unknown, operator?: FilterOperator) => void;
+  addFilter: (field: string, operator: FilterOperator, value: unknown) => void;
   /** Remove a filter */
   removeFilter: (field: string) => void;
   /** Clear all filters */