@izumisy-tailor/tailor-data-viewer 0.2.11 → 0.2.12

package/package.json

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

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

@@ -11,7 +11,7 @@ import type {
   ExtractQueryVariables,
   ValidateCollectionQuery,
 } from "../types";
-import type { FieldName } from "../types";
+import type { FieldName, OrderableFieldName } from "../types";
 
 /**
  * Resolves query variables type: uses `ExtractQueryVariables<TQuery>` when
@@ -58,7 +58,11 @@ export function useCollection<
   > & {
     metadata: TMetadata;
     tableName: TTableName;
-    query: ValidateCollectionQuery<TQuery, FieldName<TMetadata, TTableName>>;
+    query: ValidateCollectionQuery<
+      TQuery,
+      FieldName<TMetadata, TTableName>,
+      OrderableFieldName<TMetadata, TTableName>
+    >;
   },
 ): UseCollectionReturn<
   FieldName<TMetadata, TTableName>,

package/src/component/index.ts

@@ -28,6 +28,7 @@ export type {
   DataTableRowProps,
   DataTableCellProps,
   FieldName,
+  OrderableFieldName,
   ExtractOrderField,
   ExtractQueryVariables,
   ExtractQueryInputKeys,

package/src/component/types.ts

@@ -582,6 +582,41 @@ export type FieldName<
     : never
   : never;
 
+/**
+ * Field types that support ordering.
+ * Mirrors the runtime `fieldTypeToSortConfig` logic — types that return
+ * a `SortConfig` (not `undefined`) are considered orderable.
+ */
+type OrderableFieldType =
+  | "string"
+  | "number"
+  | "boolean"
+  | "datetime"
+  | "date"
+  | "time"
+  | "enum";
+
+/**
+ * Extract only orderable field names from table metadata.
+ *
+ * Fields whose `type` is not in `OrderableFieldType` (e.g. `uuid`, `array`,
+ * `nested`, `file`) are excluded.  This allows `CheckOrderField` to compare
+ * only the fields that Tailor Platform actually exposes in the
+ * `OrderFieldEnum`, avoiding false positives for fields like `id`.
+ */
+export type OrderableFieldName<
+  TMetadata extends TableMetadataMap,
+  TTableName extends keyof TMetadata,
+> =
+  Extract<
+    TMetadata[TTableName]["fields"][number],
+    { readonly type: OrderableFieldType }
+  > extends { readonly name: infer N }
+    ? N extends string
+      ? N
+      : never
+    : never;
+
 /**
  * Extract the `order[].field` union type from a GraphQL variables type.
  *
@@ -726,6 +761,7 @@ type CheckQueryInput<
 export type ValidateCollectionQuery<
   TQuery,
   TFieldName extends string = string,
+  TOrderableFieldName extends string = TFieldName,
 > =
   ExtractQueryVariables<TQuery> extends never
     ? TQuery // No gql-tada type info → skip validation
@@ -733,7 +769,7 @@ export type ValidateCollectionQuery<
       ? TQuery & CheckFirstVariable<TQuery> // No metadata → only check $first
       : TQuery &
           CheckFirstVariable<TQuery> &
-          CheckOrderField<TQuery, TFieldName> &
+          CheckOrderField<TQuery, TOrderableFieldName> &
           CheckQueryInput<TQuery, TFieldName>;
 
 /**