nuxt-ui-tools 1.0.0 → 1.0.1

package/dist/runtime/table/types/source.d.ts

@@ -89,6 +89,15 @@ export interface TableSourceRequestContext<TRow extends GenericObject = GenericO
     context: TContext;
     facets?: TableGlobalFacetDescriptor<TableKnownFieldPath<TRow> | string>[];
 }
+export interface TableRemoteSourceRequest<TRow extends GenericObject = GenericObject, TSortKey extends string = TableSortKey<TRow>> {
+    pagination?: Exclude<TablePaginationState, {
+        mode: 'none';
+    }>;
+    sorting: TableSortingRule<TSortKey>[];
+    filters: TableResolvedFilterGroup<TableKnownFieldPath<TRow> | string>[];
+    search: TableSourceSearchRequest<TRow>;
+    facets?: TableGlobalFacetDescriptor<TableKnownFieldPath<TRow> | string>[];
+}
 export interface TableFacetsContext<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TKey extends string = TableKnownFieldPath<TRow> | string> {
     filters: TableResolvedFilterGroup<TKey>;
     search: TableSourceSearchRequest<TRow>;
@@ -102,7 +111,7 @@ export interface TableClientSource<TRow extends GenericObject = GenericObject, T
 export type TableRemoteFacetSource<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TKey extends string = TableKnownFieldPath<TRow> | string> = true | ((ctx: TableFacetsContext<TRow, TContext, TKey>) => TableQueryDefinition<TableFacetExecutionResult<TKey>>);
 export interface TableRemoteSource<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TResult = TableSourceExecutionResult<TRow, TableKnownFieldPath<TRow> | string> | TableOffsetPageResult<TRow, TableKnownFieldPath<TRow> | string> | TableCursorPageResult<TRow, TableKnownFieldPath<TRow> | string>> {
     mode: 'remote';
-    query: (ctx: TableSourceRequestContext<TRow, TContext>) => TableQueryDefinition<TResult>;
+    query: (request: TableRemoteSourceRequest<TRow>, context: TContext) => TableQueryDefinition<TResult>;
     facets?: TableRemoteFacetSource<TRow, TContext>;
 }
 export type TableSource<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TResult = TableSourceExecutionResult<TRow> | TRow[]> = TableClientSource<TRow, TContext, Extract<TResult, TableSourceExecutionResult<TRow> | TRow[]> extends never ? TableSourceExecutionResult<TRow> | TRow[] : Extract<TResult, TableSourceExecutionResult<TRow> | TRow[]>> | TableRemoteSource<TRow, TContext, Extract<TResult, TableSourceExecutionResult<TRow, TableKnownFieldPath<TRow> | string> | TableOffsetPageResult<TRow, TableKnownFieldPath<TRow> | string> | TableCursorPageResult<TRow, TableKnownFieldPath<TRow> | string>> extends never ? TableSourceExecutionResult<TRow, TableKnownFieldPath<TRow> | string> | TableOffsetPageResult<TRow, TableKnownFieldPath<TRow> | string> | TableCursorPageResult<TRow, TableKnownFieldPath<TRow> | string> : Extract<TResult, TableSourceExecutionResult<TRow, TableKnownFieldPath<TRow> | string> | TableOffsetPageResult<TRow, TableKnownFieldPath<TRow> | string> | TableCursorPageResult<TRow, TableKnownFieldPath<TRow> | string>>>;

package/dist/runtime/table/utils/builders/table-source.d.ts

@@ -1,9 +1,5 @@
-import type { QueryFunctionContext, QueryKey } from '@tanstack/vue-query';
-import type { GenericObject, TableClientSource, TableCursorPageResult, TableGlobalFacetDescriptor, TableOffsetPageResult, TablePaginationState, TableQueryDefinition, TableRemoteSource, TableResolvedFilterGroup, TableRowsFromSourceResult, TableSourceExecutionResult, TableSortingRule } from '../../types/index.js';
-interface TableSourceRowsResult {
-    rows: readonly GenericObject[];
-}
-type TableSourceResult = readonly GenericObject[] | TableSourceRowsResult;
+import type { QueryKey, UseQueryOptions } from '@tanstack/vue-query';
+import type { GenericObject, TableClientSource, TableCursorPageResult, TableGlobalFacetDescriptor, TableOffsetPageResult, TablePaginationState, TableRemoteSource, TableRemoteSourceRequest, TableResolvedFilterGroup, TableRowsFromSourceResult, TableSourceExecutionResult, TableSortingRule } from '../../types/index.js';
 type TableSourceRow<TResult> = TableRowsFromSourceResult<Awaited<TResult>> extends infer TRow ? TRow extends GenericObject ? TRow : GenericObject : GenericObject;
 type ClientTableSourceResult<TResult> = TResult extends readonly GenericObject[] ? TableSourceRow<TResult>[] : TableSourceExecutionResult<TableSourceRow<TResult>>;
 type RemoteTableSourceResult<TResult> = TResult extends {
@@ -26,16 +22,19 @@ interface TableSourceInferenceContext {
     context: GenericObject;
     facets?: TableGlobalFacetDescriptor<never>[];
 }
-type TableSourceQueryDefinition<TResult> = Omit<TableQueryDefinition<unknown>, 'queryFn'> & {
-    queryFn: (context: QueryFunctionContext<QueryKey, string | null>) => TResult | Promise<TResult>;
-};
-interface ClientTableSourceInput<TResult extends TableSourceResult> {
+interface TableSourceQueryDefinition {
+    queryKey: QueryKey;
+}
+type TableSourceQueryResult<TQuery> = TQuery extends {
+    queryFn: (...args: never[]) => infer TResult;
+} ? Awaited<TResult> : TQuery extends UseQueryOptions<infer _TQueryFnData, infer _TError, infer TResult, infer _TQueryData, infer _TQueryKey> ? Awaited<TResult> : never;
+interface ClientTableSourceInput<TQuery extends TableSourceQueryDefinition> {
     mode?: 'client';
-    query: (context: TableSourceInferenceContext) => TableSourceQueryDefinition<TResult>;
+    query: (context: TableSourceInferenceContext) => TQuery;
 }
-interface RemoteTableSourceInput<TResult extends TableSourceRowsResult> {
+interface RemoteTableSourceInput<TQuery extends TableSourceQueryDefinition> {
     mode: 'remote';
-    query: (context: TableSourceInferenceContext) => TableSourceQueryDefinition<TResult>;
+    query: (request: TableRemoteSourceRequest<GenericObject, string>, context: GenericObject) => TQuery;
     facets?: TableRemoteSource['facets'];
 }
 /**
@@ -55,6 +54,6 @@ interface RemoteTableSourceInput<TResult extends TableSourceRowsResult> {
  * })
  * ```
  */
-export declare function tableSource<TResult extends TableSourceRowsResult>(source: RemoteTableSourceInput<TResult>): TableRemoteSource<TableSourceRow<TResult>, GenericObject, RemoteTableSourceResult<TResult>>;
-export declare function tableSource<TResult extends TableSourceResult>(source: ClientTableSourceInput<TResult>): TableClientSource<TableSourceRow<TResult>, GenericObject, ClientTableSourceResult<TResult>>;
+export declare function tableSource<TQuery extends TableSourceQueryDefinition>(source: RemoteTableSourceInput<TQuery>): TableRemoteSource<TableSourceRow<TableSourceQueryResult<TQuery>>, GenericObject, RemoteTableSourceResult<TableSourceQueryResult<TQuery>>>;
+export declare function tableSource<TQuery extends TableSourceQueryDefinition>(source: ClientTableSourceInput<TQuery>): TableClientSource<TableSourceRow<TableSourceQueryResult<TQuery>>, GenericObject, ClientTableSourceResult<TableSourceQueryResult<TQuery>>>;
 export {};

package/dist/runtime/table/utils/client-query.d.ts

@@ -13,7 +13,7 @@ export declare function executeClientFacets<TRow extends GenericObject = Generic
 export declare function filterClientRows<TRow extends GenericObject>(params: {
     rows: Iterable<TRow>;
     filters: TableResolvedFilterGroup<string>;
-    search: TableSourceRequestContext<TRow>['search'];
+    search: TableSourceRequestContext['search'];
 }): TRow[];
 export declare function sortClientRows<TRow extends GenericObject>(params: {
     rows: Iterable<TRow>;

package/dist/runtime/table/utils/columns/render.d.ts

@@ -1,6 +1,6 @@
 /** @jsxImportSource vue */
 import type { DropdownMenuItem } from '@nuxt/ui/components/DropdownMenu.vue';
-import type { VNodeChild } from 'vue';
+import { type VNodeChild } from 'vue';
 import type { GenericObject } from '../../types/index.js';
 import type { SchemaTableColumn, TableColumnRenderParams, TableRuntimeColumn, UseTableColumnsParams } from './types.js';
 export declare function createSelectionColumn(options: {
@@ -55,7 +55,9 @@ export declare function createDataColumns(options: {
             original: GenericObject;
             index: number;
         };
-    }) => import("vue/jsx-runtime").JSX.Element;
+    }) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>;
     enableHiding: boolean;
     enablePinning: boolean;
     enableResizing: boolean;
@@ -88,7 +90,9 @@ export declare function createDataColumns(options: {
             original: GenericObject;
             index: number;
         };
-    }) => import("vue/jsx-runtime").JSX.Element;
+    }) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>;
     enableHiding: boolean;
     enablePinning: boolean;
     enableResizing: boolean;
@@ -134,7 +138,9 @@ export declare function createDataColumns(options: {
     minSize: number;
     size: number | undefined;
 })[];
-export declare function renderColumnCell(options: TableColumnRenderParams): import("vue/jsx-runtime").JSX.Element;
+export declare function renderColumnCell(options: TableColumnRenderParams): import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>;
 export declare function wrapEllipsisContent(options: {
     column: SchemaTableColumn;
     content: VNodeChild;
@@ -157,7 +163,9 @@ export declare function createRowActionsColumn(options: {
             original: GenericObject;
             index: number;
         };
-    }) => import("vue/jsx-runtime").JSX.Element;
+    }) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>;
     enableHiding: boolean;
     enablePinning: boolean;
     enableResizing: boolean;

package/dist/runtime/table/utils/columns/render.js

@@ -1,4 +1,5 @@
 import { jsx } from "vue/jsx-runtime";
+import { h } from "vue";
 import {
   isArray,
   isFunction,
@@ -258,7 +259,7 @@ export function createRowActionsColumn(options) {
         row: row.original,
         rowIndex: row.index
       });
-      return /* @__PURE__ */ jsx(TableRowScopeProvider, { scope, children: /* @__PURE__ */ jsx(TableRowActionsControl, {}) });
+      return h(TableRowScopeProvider, { scope }, { default: () => /* @__PURE__ */ jsx(TableRowActionsControl, {}) });
     },
     enableHiding: false,
     enablePinning: true,
@@ -288,7 +289,7 @@ export function createRowActionsColumn(options) {
   };
 }
 function wrapRowScope(options) {
-  return /* @__PURE__ */ jsx(TableRowScopeProvider, { scope: options.scope, children: options.content });
+  return h(TableRowScopeProvider, { scope: options.scope }, { default: () => options.content });
 }
 function resolvePlainRenderContext(params) {
   const contextSource = params.data.contextData.value;

package/dist/runtime/table/utils/filters/editor-size.js

@@ -1,58 +1,58 @@
 const filterEditorSizeClasses = {
   lg: {
-    editor: "w-[min(17rem,calc(100vw-1rem))] min-w-52 max-w-68",
+    editor: "w-[min(22rem,calc(100vw-1rem))] min-w-52 max-w-[calc(100vw-1rem)]",
     empty: "px-3 py-8 text-sm",
     footer: "p-2",
     option: "gap-3 px-3 py-2 text-sm",
     optionIcon: "size-4",
     optionLabel: "text-sm",
     scrollArea: "p-2",
-    searchHeader: "p-2",
+    searchHeader: "p-1.5",
     skeletonCount: "h-3.5 w-6",
     skeletonLine: "h-3.5",
     wideEditor: "w-[min(42rem,calc(100vw-1rem))] min-w-[min(21rem,calc(100vw-1rem))] max-w-[calc(100vw-1rem)]"
   },
   md: {
-    editor: "w-[min(15rem,calc(100vw-1rem))] min-w-48 max-w-60",
+    editor: "w-[min(20rem,calc(100vw-1rem))] min-w-48 max-w-[calc(100vw-1rem)]",
     empty: "px-2.5 py-6 text-[13px]",
     footer: "p-1.5",
     option: "gap-2.5 px-2.5 py-1.5 text-[13px]",
     optionIcon: "size-3.5",
     optionLabel: "text-[13px]",
     scrollArea: "p-1.5",
-    searchHeader: "p-1.5",
+    searchHeader: "p-1",
     skeletonCount: "h-3 w-5",
     skeletonLine: "h-3",
     wideEditor: "w-[min(38rem,calc(100vw-1rem))] min-w-[min(20rem,calc(100vw-1rem))] max-w-[calc(100vw-1rem)]"
   },
   sm: {
-    editor: "w-[min(14rem,calc(100vw-1rem))] min-w-44 max-w-56",
+    editor: "w-[min(18rem,calc(100vw-1rem))] min-w-44 max-w-[calc(100vw-1rem)]",
     empty: "px-2.5 py-5 text-xs",
     footer: "p-1.5",
     option: "gap-2 px-2 py-1 text-xs",
     optionIcon: "size-3.5",
     optionLabel: "text-xs",
     scrollArea: "p-1",
-    searchHeader: "p-1.5",
+    searchHeader: "p-1",
     skeletonCount: "h-3 w-5",
     skeletonLine: "h-3",
     wideEditor: "w-[min(34rem,calc(100vw-1rem))] min-w-[min(19rem,calc(100vw-1rem))] max-w-[calc(100vw-1rem)]"
   },
   xl: {
-    editor: "w-[min(21rem,calc(100vw-1rem))] min-w-60 max-w-84",
+    editor: "w-[min(24rem,calc(100vw-1rem))] min-w-60 max-w-[calc(100vw-1rem)]",
     empty: "px-4 py-10 text-base",
     footer: "p-3",
     option: "gap-3.5 px-4 py-3 text-base",
     optionIcon: "size-5",
     optionLabel: "text-base",
     scrollArea: "p-3",
-    searchHeader: "p-3",
+    searchHeader: "p-2",
     skeletonCount: "h-4 w-7",
     skeletonLine: "h-4",
     wideEditor: "w-[min(46rem,calc(100vw-1rem))] min-w-[min(22rem,calc(100vw-1rem))] max-w-[calc(100vw-1rem)]"
   },
   xs: {
-    editor: "w-[min(13rem,calc(100vw-1rem))] min-w-44 max-w-52",
+    editor: "w-[min(16rem,calc(100vw-1rem))] min-w-44 max-w-[calc(100vw-1rem)]",
     empty: "px-2 py-4 text-xs",
     footer: "p-1",
     option: "gap-1.5 px-1.5 py-1 text-xs",

package/dist/runtime/table/utils/filters/options.js

@@ -20,7 +20,12 @@ export function resolveFilterOptionEntries(options) {
   if (options.definition.kind !== "option") {
     return [];
   }
-  const sourceOptions = options.options ?? options.definition.source?.options ?? [];
+  const configuredOptions = options.options ?? options.definition.source?.options ?? [];
+  const sourceOptions = configuredOptions.length ? configuredOptions : (options.facetCounts ?? []).map((entry) => ({
+    count: entry.count,
+    label: String(entry.value),
+    value: entry.value
+  }));
   const countByValue = new Map(
     (options.facetCounts ?? []).map((entry) => [String(entry.value), entry.count])
   );

package/dist/runtime/table/utils/index.d.ts

@@ -11,4 +11,5 @@ export * from './query-state.js';
 export * from './resolved-filters.js';
 export * from './rows.js';
 export * from './schema.js';
+export * from './source-request.js';
 export { tableSource } from './builders/table-source.js';

package/dist/runtime/table/utils/index.js

@@ -11,4 +11,5 @@ export * from "./query-state.js";
 export * from "./resolved-filters.js";
 export * from "./rows.js";
 export * from "./schema.js";
+export * from "./source-request.js";
 export { tableSource } from "./builders/table-source.js";

package/dist/runtime/table/utils/prefetch.js

@@ -26,6 +26,7 @@ import {
   resolveFilterSupportedOperators
 } from "./query-state.js";
 import { createResolvedFilterState } from "./resolved-filters.js";
+import { toTableRemoteSourceRequest } from "./source-request.js";
 export function prefetchTable(params) {
   if (!isTableSchemaView(params.schema)) {
     throw new Error("Invalid table schema: expected a source query definition");
@@ -130,7 +131,10 @@ function resolveTableQueries(options) {
   return Object.fromEntries(entries);
 }
 function resolveSourcePrefetchQuery(options) {
-  const definition = options.schema.source.query(options.request);
+  const definition = options.schema.source.mode === "remote" ? options.schema.source.query(
+    toTableRemoteSourceRequest(options.request),
+    options.request.context
+  ) : options.schema.source.query(options.request);
   if (options.request.pagination.mode !== "cursor" || !definition.queryFn) return definition;
   const queryFn = definition.queryFn;
   return {

package/dist/runtime/table/utils/source-request.d.ts

@@ -0,0 +1,2 @@
+import type { GenericObject, TableRemoteSourceRequest, TableSourceRequestContext } from '../types/index.js';
+export declare function toTableRemoteSourceRequest<TRow extends GenericObject>(request: TableSourceRequestContext<TRow>): TableRemoteSourceRequest<TRow>;

package/dist/runtime/table/utils/source-request.js

@@ -0,0 +1,9 @@
+export function toTableRemoteSourceRequest(request) {
+  return {
+    facets: request.facets,
+    filters: request.filters.children.length > 0 ? [request.filters] : [],
+    pagination: request.pagination.mode === "none" ? void 0 : request.pagination,
+    search: request.search,
+    sorting: request.sorting
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-ui-tools",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Nuxt module and runtime toolkit for UI-heavy Nuxt applications",
   "homepage": "https://github.com/ChronicStone/nuxt-ui-tools#readme",
   "bugs": "https://github.com/ChronicStone/nuxt-ui-tools/issues",