nuxt-ui-tools 1.6.1 → 1.6.2

package/dist/module.json

@@ -5,7 +5,7 @@
   "configKey": "nuxtUiTools",
   "docs": "https://ui.nuxt.com/docs/getting-started/installation/nuxt",
   "name": "nuxt-ui-tools",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

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

@@ -1,7 +1,7 @@
 import type { GenericObject, TableColumnBuilder, TableColumnCollection, TableFilterBuilder, TableSortKey, TableUiFilterCollection, TableUiFilterDefinition } from '../types/index.js';
 export { type TableSortKey } from '../types/index.js';
-export declare function createTableColumnBuilder<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject, TSortKey extends string = TableSortKey<TRow>>(): TableColumnBuilder<TRow, TContext, TPageContext, TSortKey>;
+export declare function createTableColumnBuilder<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject, TSortKey extends string = TableSortKey<TRow>, TData = unknown>(): TableColumnBuilder<TRow, TContext, TPageContext, TSortKey, TData>;
 export declare function createTableFilterBuilder<TRow extends GenericObject, TContext extends GenericObject = GenericObject>(): TableFilterBuilder<TRow, TContext>;
 export declare function resolveCollection<TBuilder, TResult>(collection: TResult | ((builder: TBuilder) => TResult) | undefined, builder: TBuilder): TResult | undefined;
-export declare function resolveColumns<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject, TSortKey extends string = TableSortKey<TRow>, TColumns extends TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey> | undefined = TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey> | undefined>(columns: TColumns): TColumns extends (...args: never[]) => infer TResult ? TResult : TColumns;
+export declare function resolveColumns<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject, TSortKey extends string = TableSortKey<TRow>, TData = unknown, TColumns extends TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey, TData> | undefined = TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey, TData> | undefined>(columns: TColumns): TColumns extends (...args: never[]) => infer TResult ? TResult : TColumns;
 export declare function resolveUiFilters<TRow extends GenericObject, TContext extends GenericObject, TKey extends string>(filters: TableUiFilterCollection<TRow, TContext, TKey> | undefined): TableUiFilterDefinition<TRow, TContext, TKey>[] | undefined;

package/dist/runtime/table/components/table/table-renderer.d.vue.ts

@@ -8,7 +8,7 @@ type __VLS_Props = {
     ui?: DataListTableUi;
 };
 declare function refresh(): void;
-declare var __VLS_28: {
+declare var __VLS_33: {
     columnSlots: TableColumnSlot[];
     leafColumns: import("@tanstack/table-core").Column<{
         columnPinningFeature: import("@tanstack/table-core").TableFeature;
@@ -18,16 +18,16 @@ declare var __VLS_28: {
         coreRowModel: (table: import("@tanstack/table-core").Table<any, any>) => () => import("@tanstack/table-core").RowModel<any, any>;
         columnMeta: import("../../utils/index.js").DataListColumnMeta;
     }, object, unknown>[];
-}, __VLS_30: {
+}, __VLS_35: {
     error: {};
     retry: typeof refresh;
-}, __VLS_39: {};
+}, __VLS_44: {};
 type __VLS_Slots = {} & {
-    footer?: (props: typeof __VLS_28) => any;
+    footer?: (props: typeof __VLS_33) => any;
 } & {
-    error?: (props: typeof __VLS_30) => any;
+    error?: (props: typeof __VLS_35) => any;
 } & {
-    empty?: (props: typeof __VLS_39) => any;
+    empty?: (props: typeof __VLS_44) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
     resetColumnSizing: () => void;

package/dist/runtime/table/components/table/table-renderer.vue

@@ -191,7 +191,9 @@ const tableCols = computed(() => {
     width: `${leaf.getSize()}px`
   }));
   if (filled.value) {
-    cols.splice(cols.length - table.getEndVisibleLeafColumns().length, 0, { key: "fill" });
+    cols.splice(cols.length - table.getEndVisibleLeafColumns().length, 0, {
+      key: "fill"
+    });
   }
   return cols;
 });
@@ -250,7 +252,9 @@ const headerCellProps = computed(
           resizable: column.getCanResize(),
           resize: header.getResizeHandler(),
           resizing: column.getIsResizing(),
-          sortState: internals.tableColumns.getSortState({ columnId: column.id }),
+          sortState: internals.tableColumns.getSortState({
+            columnId: column.id
+          }),
           sortable: meta?.sortable
         }
       ];
@@ -267,7 +271,10 @@ const virtualPaddingBottom = computed(() => {
 });
 const renderedRows = computed(() => {
   if (!virtualized.value) {
-    return tableRows.value.map((row, index) => ({ row, virtual: { index, key: String(row.id) } }));
+    return tableRows.value.map((row, index) => ({
+      row,
+      virtual: { index, key: String(row.id) }
+    }));
   }
   return virtualRows.value.flatMap((item) => {
     const row = tableRows.value[item.index];
@@ -358,6 +365,58 @@ function isFirstEnd(column) {
   return table.getEndVisibleLeafColumns()[0]?.id === column.id;
 }
 const { summaries } = internals;
+function isDeclarativeSummary(summary) {
+  return Array.isArray(summary);
+}
+const declarativeSummaryColumns = computed(
+  () => new Map(
+    internals.tableColumns.runtimeColumns.value.flatMap(
+      (column) => isDeclarativeSummary(column.summary) ? [[column.id, column.summary]] : []
+    )
+  )
+);
+const hasDeclarativeSummaries = computed(() => declarativeSummaryColumns.value.size > 0);
+const summaryCellContext = computed(() => ({
+  data: internals.queryContent.sourceData.value,
+  rows: internals.queryContent.data.value.rows,
+  allRows: internals.queryContent.allRows.value,
+  filteredRows: internals.queryContent.filteredRows.value,
+  selectedRows: internals.selection.selectedRows.value,
+  request: {
+    ...internals.queryContent.requestContext.value,
+    context: internals.queryContent.contextData.value
+  },
+  context: internals.queryContent.contextData.value,
+  pageContext: internals.queryContent.pageContextData.value
+}));
+function declarativeSummaryCell(columnId, rowIndex) {
+  const summary = declarativeSummaryColumns.value.get(columnId);
+  const cell = summary?.[rowIndex];
+  return cell && (!cell.condition || cell.condition(summaryCellContext.value)) ? cell : void 0;
+}
+const declarativeSummaryRows = computed(() => {
+  const columns = leafColumns.value.filter((column) => !column.columnDef.meta?.internal);
+  const length = Math.max(
+    0,
+    ...columns.map((column) => {
+      const summary = declarativeSummaryColumns.value.get(column.id);
+      return summary?.length ?? 0;
+    })
+  );
+  return Array.from({ length }, (_, index) => index).filter(
+    (index) => columns.some((column) => declarativeSummaryCell(column.id, index))
+  );
+});
+const footerRows = computed(() => {
+  if (!hasDeclarativeSummaries.value) return summaries.enabled.value ? [0] : [];
+  return [
+    .../* @__PURE__ */ new Set([...declarativeSummaryRows.value, ...summaries.enabled.value ? [0] : []])
+  ].sort((left, right) => left - right);
+});
+function renderDeclarativeSummary(columnId, rowIndex) {
+  const cell = declarativeSummaryCell(columnId, rowIndex);
+  return cell ? () => cell.render(summaryCellContext.value) : () => null;
+}
 const summaryColumnIds = computed(() => new Set(summaries.columns.value.map((column) => column.id)));
 const summaryLabelColumnId = computed(
   () => leafColumns.value.find(
@@ -386,7 +445,11 @@ function renderSummary(columnId) {
   const summary = column?.summary;
   const render = isSummaryConfig(summary) ? summary.render : void 0;
   if (render) {
-    return () => render({ loading: cell.loading, scope: summaries.scope.value, value: cell.value });
+    return () => render({
+      loading: cell.loading,
+      scope: summaries.scope.value,
+      value: cell.value
+    });
   }
   const value = summaries.format(columnId);
   return () => h("span", formatNumber(value));
@@ -656,10 +719,10 @@ defineExpose({ resetColumnSizing });
         </tbody>
 
         <tfoot
-          v-if="summaries.enabled.value && !isFirstLoad && !empty"
+          v-if="footerRows.length > 0 && !isFirstLoad && (hasDeclarativeSummaries || !empty)"
           :class="mergeDataListUiClass('nut-dl-table__foot', void 0, ui?.tfoot)"
         >
-          <tr class="nut-dl-table__foot-row">
+          <tr v-for="summaryRow in footerRows" :key="summaryRow" class="nut-dl-table__foot-row">
             <template v-for="slot in columnSlots" :key="`foot-${slot.key}`">
               <td
                 v-if="slot.kind === 'fill'"
@@ -686,8 +749,16 @@ defineExpose({ resetColumnSizing });
                 :data-col="slot.columnId"
                 :style="pinnedOffset(headerByColumnId.get(slot.columnId).column)"
               >
+                <span
+                  v-if="declarativeSummaryCell(slot.columnId, summaryRow)"
+                  class="nut-dl-tf__value"
+                >
+                  <component :is="renderDeclarativeSummary(slot.columnId, summaryRow)" />
+                </span>
                 <div
-                  v-if="slot.columnId === summaryLabelColumnId"
+                  v-else-if="
+  summaryRow === 0 && !empty && summaries.enabled.value && slot.columnId === summaryLabelColumnId
+"
                   class="nut-dl-tf__label flex items-center gap-2 whitespace-nowrap"
                 >
                   <span
@@ -702,7 +773,11 @@ defineExpose({ resetColumnSizing });
                     summaryUnit
                   }}</span>
                 </div>
-                <template v-else-if="summaryColumnIds.has(slot.columnId)">
+                <template
+                  v-else-if="
+  summaryRow === 0 && !empty && summaries.enabled.value && summaryColumnIds.has(slot.columnId)
+"
+                >
                   <span
                     v-if="summaries.cell(slot.columnId).loading"
                     class="nut-dl-skeleton nut-dl-tf__skeleton inline-block h-3 w-12 rounded-full align-middle"

package/dist/runtime/table/components/table/table-renderer.vue.d.ts

@@ -8,7 +8,7 @@ type __VLS_Props = {
     ui?: DataListTableUi;
 };
 declare function refresh(): void;
-declare var __VLS_28: {
+declare var __VLS_33: {
     columnSlots: TableColumnSlot[];
     leafColumns: import("@tanstack/table-core").Column<{
         columnPinningFeature: import("@tanstack/table-core").TableFeature;
@@ -18,16 +18,16 @@ declare var __VLS_28: {
         coreRowModel: (table: import("@tanstack/table-core").Table<any, any>) => () => import("@tanstack/table-core").RowModel<any, any>;
         columnMeta: import("../../utils/index.js").DataListColumnMeta;
     }, object, unknown>[];
-}, __VLS_30: {
+}, __VLS_35: {
     error: {};
     retry: typeof refresh;
-}, __VLS_39: {};
+}, __VLS_44: {};
 type __VLS_Slots = {} & {
-    footer?: (props: typeof __VLS_28) => any;
+    footer?: (props: typeof __VLS_33) => any;
 } & {
-    error?: (props: typeof __VLS_30) => any;
+    error?: (props: typeof __VLS_35) => any;
 } & {
-    empty?: (props: typeof __VLS_39) => any;
+    empty?: (props: typeof __VLS_44) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
     resetColumnSizing: () => void;

package/dist/runtime/table/composables/use-table-data.d.ts

@@ -25,6 +25,9 @@ export interface UseTableDataReturn {
     infiniteQuery: ReturnType<typeof useInfiniteQuery>;
     rawData: ComputedRef<TableExternalState>;
     data: ComputedRef<TableExternalState>;
+    sourceData: ComputedRef<unknown>;
+    allRows: ComputedRef<GenericObject[] | undefined>;
+    filteredRows: ComputedRef<GenericObject[] | undefined>;
     selectableRows: ComputedRef<GenericObject[]>;
     facets: ComputedRef<TableFacetExecutionResult<string>>;
     error: ComputedRef<unknown>;

package/dist/runtime/table/composables/use-table-data.js

@@ -184,6 +184,9 @@ export function useTableData(params) {
   const rawData = computed(
     () => isCursorPagination.value ? cursorRawData.value : rawDataState.value
   );
+  const sourceData = computed(
+    () => isCursorPagination.value ? infiniteQuery.data.value?.pages.at(-1) : query.data.value
+  );
   const clientFilteredRows = computed(() => {
     if (!params.startup.isActive.value) {
       return [];
@@ -227,6 +230,12 @@ export function useTableData(params) {
   const selectableRows = computed(
     () => params.startup.isActive.value ? params.schema.value.source.mode === "client" ? clientSortedRows.value : data.value.rows : []
   );
+  const allRows = computed(
+    () => params.schema.value.source.mode === "client" ? rawData.value.rows : void 0
+  );
+  const filteredRows = computed(
+    () => params.schema.value.source.mode === "client" ? clientSortedRows.value : void 0
+  );
   const clientFacetDescriptors = computed(
     () => globalFacetDescriptors.value.map((facet) => ({
       key: facet.key,
@@ -460,6 +469,9 @@ export function useTableData(params) {
     context,
     contextData,
     data,
+    sourceData,
+    allRows,
+    filteredRows,
     error,
     facets,
     facetsBaseContext,

package/dist/runtime/table/composables/use-table-summaries.js

@@ -2,7 +2,11 @@ import { computed, ref, shallowRef, watch } from "vue";
 import { isDate, isFunction, isObject } from "../../shared/utils/predicate.js";
 export function useTableSummaries(params) {
   const config = computed(() => params.schema.value.table?.summaries);
-  const columns = computed(() => params.runtimeColumns.value.filter((column) => column.summary));
+  const columns = computed(
+    () => params.runtimeColumns.value.filter(
+      (column) => column.summary && !Array.isArray(column.summary)
+    )
+  );
   const enabled = computed(() => columns.value.length > 0 || Boolean(config.value?.resolve));
   const scopes = computed(
     () => config.value?.scopes ?? (params.selection.selectionEnabled.value ? ["filtered", "page", "selection"] : ["filtered", "page"])
@@ -69,7 +73,7 @@ export function useTableSummaries(params) {
     const remoteFiltered = scope.value === "filtered" && params.schema.value.source.mode !== "client";
     for (const column of columns.value) {
       const { summary } = column;
-      if (!summary) {
+      if (!summary || Array.isArray(summary)) {
         continue;
       }
       const context = createContext(column.id);

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

@@ -39,12 +39,26 @@ export interface TableColumnSummaryConfig<TRow extends GenericObject = GenericOb
         scope: TableSummaryScope;
     }) => RenderableType;
 }
-export type TableColumnSummary<TRow extends GenericObject = GenericObject> = TableSummaryKind | TableColumnSummaryConfig<TRow> | ((context: TableSummaryContext<TRow>) => TableSummaryValue | Promise<TableSummaryValue>);
+export type TableColumnSummary<TRow extends GenericObject = GenericObject, TContext extends GenericObject = TableRuntimeRecord, TPageContext extends GenericObject = TableRuntimeRecord, TData = unknown> = TableSummaryKind | TableColumnSummaryConfig<TRow> | ((context: TableSummaryContext<TRow>) => TableSummaryValue | Promise<TableSummaryValue>) | TableSummaryCellDefinition<TRow, TContext, TPageContext, TData>[];
+export interface TableSummaryCellContext<TRow extends GenericObject = GenericObject, TContext extends GenericObject = TableRuntimeRecord, TPageContext extends GenericObject = TableRuntimeRecord, TData = unknown> {
+    data: TData | undefined;
+    rows: TRow[];
+    allRows: TRow[] | undefined;
+    filteredRows: TRow[] | undefined;
+    selectedRows: TRow[];
+    request: TableSourceRequestContext<TRow, TContext>;
+    context: TContext;
+    pageContext: TPageContext;
+}
+export interface TableSummaryCellDefinition<TRow extends GenericObject = GenericObject, TContext extends GenericObject = TableRuntimeRecord, TPageContext extends GenericObject = TableRuntimeRecord, TData = unknown> {
+    condition?: (context: TableSummaryCellContext<TRow, TContext, TPageContext, TData>) => boolean;
+    render: (context: TableSummaryCellContext<TRow, TContext, TPageContext, TData>) => RenderableType;
+}
 export interface TableColumnCellDataAttributes {
     [key: `data-${string}`]: string | number | boolean | undefined;
 }
 export type TableColumnCellProps = TableRuntimeRecord & TableColumnCellDataAttributes;
-interface TableColumnBase<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TParams extends TableRowRenderParams<TRow, TContext, TPageContext> = TableRowRenderParams<TRow, TContext, TPageContext>> {
+interface TableColumnBase<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TParams extends TableRowRenderParams<TRow, TContext, TPageContext> = TableRowRenderParams<TRow, TContext, TPageContext>, TData = unknown> {
     key: TKey;
     label?: TableTextValue | (() => RenderableType);
     icon?: string;
@@ -61,7 +75,7 @@ interface TableColumnBase<TRow extends GenericObject = GenericObject, TContext e
     enabled?: boolean;
     required?: boolean;
     /** Footer aggregate for this column. */
-    summary?: TableColumnSummary<TRow>;
+    summary?: TableColumnSummary<TRow, TContext, TPageContext, TData>;
     /** Placeholder shape rendered while the first page loads. */
     skeleton?: TableColumnSkeleton;
     /** Maximum wrapped lines before clamping; defaults to 3, `ellipsis: true` forces one line. */
@@ -78,32 +92,32 @@ interface TableColumnBase<TRow extends GenericObject = GenericObject, TContext e
 export type TableFieldRenderParams<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>> = TableRowRenderParams<TRow, TContext, TPageContext> & {
     value: TableFieldValue<TRow, TField>;
 };
-interface TableFieldColumnBase<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>> extends TableColumnBase<TRow, TContext, TPageContext, TField, TableFieldRenderParams<TRow, TContext, TPageContext, TField>> {
+interface TableFieldColumnBase<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>, TData = unknown> extends TableColumnBase<TRow, TContext, TPageContext, TField, TableFieldRenderParams<TRow, TContext, TPageContext, TField>, TData> {
     kind: 'field';
     field: TField;
     render?: (params: TableFieldRenderParams<TRow, TContext, TPageContext, TField>) => RenderableType;
 }
-export type TableFieldColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>> = TableFieldColumnBase<TRow, TContext, TPageContext, TField>;
-type TableAnyFieldColumn<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject> = {
-    [TField in TableKnownFieldPath<TRow>]: TableFieldColumn<TRow, TContext, TPageContext, TField>;
+export type TableFieldColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>, TData = unknown> = TableFieldColumnBase<TRow, TContext, TPageContext, TField, TData>;
+type TableAnyFieldColumn<TRow extends GenericObject, TContext extends GenericObject, TPageContext extends GenericObject, TData> = {
+    [TField in TableKnownFieldPath<TRow>]: TableFieldColumn<TRow, TContext, TPageContext, TField, TData>;
 }[TableKnownFieldPath<TRow>];
-export interface TableCompositeColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>> extends TableColumnBase<TRow, TContext, TPageContext, TKey> {
+export interface TableCompositeColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>, TData = unknown> extends TableColumnBase<TRow, TContext, TPageContext, TKey, TableRowRenderParams<TRow, TContext, TPageContext>, TData> {
     kind: 'composite';
     sortableKey?: TSortKey;
     render: (params: TableRowRenderParams<TRow, TContext, TPageContext>) => RenderableType;
 }
-export interface TableDisplayColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string> extends TableColumnBase<TRow, TContext, TPageContext, TKey> {
+export interface TableDisplayColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TData = unknown> extends TableColumnBase<TRow, TContext, TPageContext, TKey, TableRowRenderParams<TRow, TContext, TPageContext>, TData> {
     kind: 'display';
     render: (params: TableRowRenderParams<TRow, TContext, TPageContext>) => RenderableType;
 }
-export type TableColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>> = TableAnyFieldColumn<TRow, TContext, TPageContext> | TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey> | TableDisplayColumn<TRow, TContext, TPageContext, TKey>;
-export type TableFieldColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>> = Omit<TableFieldColumn<TRow, TContext, TPageContext, TField>, 'field' | 'key' | 'kind'>;
-export type TableCompositeColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>> = Omit<TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey>, 'key' | 'kind'>;
-export type TableDisplayColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string> = Omit<TableDisplayColumn<TRow, TContext, TPageContext, TKey>, 'key' | 'kind'>;
-export interface TableColumnBuilder<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TSortKey extends string = TableSortKey<TRow>> {
-    field<TField extends TableKnownFieldPath<TRow> & string>(field: TField, options?: TableFieldColumnOptions<TRow, TContext, TPageContext, TField>): TableFieldColumn<TRow, TContext, TPageContext, TField>;
-    composite<TKey extends string>(key: TKey, options: TableCompositeColumnOptions<TRow, TContext, TPageContext, TKey, TSortKey>): TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey>;
-    display<TKey extends string>(key: TKey, options: TableDisplayColumnOptions<TRow, TContext, TPageContext, TKey>): TableDisplayColumn<TRow, TContext, TPageContext, TKey>;
+export type TableColumn<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>, TData = unknown> = TableAnyFieldColumn<TRow, TContext, TPageContext, TData> | TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey, TData> | TableDisplayColumn<TRow, TContext, TPageContext, TKey, TData>;
+export type TableFieldColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TField extends TableKnownFieldPath<TRow> = TableKnownFieldPath<TRow>, TData = unknown> = Omit<TableFieldColumn<TRow, TContext, TPageContext, TField, TData>, 'field' | 'key' | 'kind'>;
+export type TableCompositeColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>, TData = unknown> = Omit<TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey, TData>, 'key' | 'kind'>;
+export type TableDisplayColumnOptions<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TData = unknown> = Omit<TableDisplayColumn<TRow, TContext, TPageContext, TKey, TData>, 'key' | 'kind'>;
+export interface TableColumnBuilder<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TSortKey extends string = TableSortKey<TRow>, TData = unknown> {
+    field<TField extends TableKnownFieldPath<TRow> & string>(field: TField, options?: TableFieldColumnOptions<TRow, TContext, TPageContext, TField, TData>): TableFieldColumn<TRow, TContext, TPageContext, TField, TData>;
+    composite<TKey extends string>(key: TKey, options: TableCompositeColumnOptions<TRow, TContext, TPageContext, TKey, TSortKey, TData>): TableCompositeColumn<TRow, TContext, TPageContext, TKey, TSortKey, TData>;
+    display<TKey extends string>(key: TKey, options: TableDisplayColumnOptions<TRow, TContext, TPageContext, TKey, TData>): TableDisplayColumn<TRow, TContext, TPageContext, TKey, TData>;
 }
-export type TableColumnCollection<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>> = TableColumn<TRow, TContext, TPageContext, TKey, TSortKey>[] | ((column: TableColumnBuilder<TRow, TContext, TPageContext, TSortKey>) => TableColumn<TRow, TContext, TPageContext, TKey, TSortKey>[]);
+export type TableColumnCollection<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TKey extends string = string, TSortKey extends string = TableSortKey<TRow>, TData = unknown> = TableColumn<TRow, TContext, TPageContext, TKey, TSortKey, TData>[] | ((column: TableColumnBuilder<TRow, TContext, TPageContext, TSortKey, TData>) => TableColumn<TRow, TContext, TPageContext, TKey, TSortKey, TData>[]);
 export {};

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

@@ -50,9 +50,9 @@ export interface TableGridSchema<TRow extends GenericObject = GenericObject, TCo
     sortOptions?: TableGridSortOption<TSortKey>[];
     defaultSorting?: TableDefaultSort<TSortKey>;
 }
-export interface TableTableSchema<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TSortKey extends string = TableSortKey<TRow>> {
+export interface TableTableSchema<TRow extends GenericObject = GenericObject, TContext extends GenericObject = GenericObject, TPageContext extends GenericObject = GenericObject, TSortKey extends string = TableSortKey<TRow>, TData = unknown> {
     enabled?: boolean | string | (() => boolean | string);
-    columns?: TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey>;
+    columns?: TableColumnCollection<TRow, TContext, TPageContext, string, TSortKey, TData>;
     treeMode?: boolean;
     childrenKey?: TableSortKey<TRow>;
     defaultSorting?: TableDefaultSort<TSortKey>;

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

@@ -2,7 +2,7 @@ import type { TableBulkAction, TableRowAction, TableToolbarAction } from './acti
 import type { TableContextDataFromItems, TableContextItem, TablePageContextItem } from './context.js';
 import type { TableFiltersSchema } from './filters.js';
 import type { TableControlsSchema, TableGridSchema, TablePaginationSchema, TablePersistenceOptions, TableSelectionSchema, TableTableSchema } from './layout.js';
-import type { InferTableSourceRow, NormalizeTableSource, TableCursorPageResult, TableSource, TableSourceExecutionResult } from './source.js';
+import type { InferTableSourceRow, ExtractTableSourceResult, NormalizeTableSource, TableCursorPageResult, TableSource, TableSourceExecutionResult } from './source.js';
 import type { TableKnownFieldPath, TableLayout, TableRowKey, TableSortKey, GenericObject } from './utils.js';
 export interface TableSchema<TRow extends GenericObject = GenericObject, TContextItems extends TableContextItem[] = TableContextItem[], TPageContextItems extends TablePageContextItem<TRow, TableContextDataFromItems<TContextItems>>[] = TablePageContextItem<TRow, TableContextDataFromItems<TContextItems>>[], TFilterKey extends string = TableKnownFieldPath<TRow>, TSortKey extends string = TableSortKey<TRow>> {
     tableKey: string;
@@ -28,8 +28,9 @@ export interface TableSchema<TRow extends GenericObject = GenericObject, TContex
     controls?: TableControlsSchema;
     persistence?: TablePersistenceOptions;
 }
-export type BuildTableSchema<TSource extends TableSource<any, any, any> = TableSource<any, any, any>, TContextItems extends TableContextItem[] = TableContextItem[], TPageContextItems extends TablePageContextItem<InferTableSourceRow<TSource>, TableContextDataFromItems<TContextItems>>[] = TablePageContextItem<InferTableSourceRow<TSource>, TableContextDataFromItems<TContextItems>>[], TFilterKey extends string = TableKnownFieldPath<InferTableSourceRow<TSource>>, TSortKey extends string = TableKnownFieldPath<InferTableSourceRow<TSource>>> = Omit<TableSchema<InferTableSourceRow<TSource>, TContextItems, TPageContextItems, TFilterKey, TSortKey>, 'source'> & {
+export type BuildTableSchema<TSource extends TableSource<any, any, any> = TableSource<any, any, any>, TContextItems extends TableContextItem[] = TableContextItem[], TPageContextItems extends TablePageContextItem<InferTableSourceRow<TSource>, TableContextDataFromItems<TContextItems>>[] = TablePageContextItem<InferTableSourceRow<TSource>, TableContextDataFromItems<TContextItems>>[], TFilterKey extends string = TableKnownFieldPath<InferTableSourceRow<TSource>>, TSortKey extends string = TableKnownFieldPath<InferTableSourceRow<TSource>>> = Omit<TableSchema<InferTableSourceRow<TSource>, TContextItems, TPageContextItems, TFilterKey, TSortKey>, 'source' | 'table'> & {
     source: ValidateTableSource<TSource, TableContextDataFromItems<TContextItems>>;
+    table?: TableTableSchema<InferTableSourceRow<TSource>, TableContextDataFromItems<TContextItems>, TableContextDataFromItems<TPageContextItems>, TSortKey, ExtractTableSourceResult<TSource>>;
 };
 type ValidateTableSource<TSource, TContext extends GenericObject> = TSource extends NormalizeTableSource<TSource, TContext> ? TSource : NormalizeTableSource<TSource, TContext>;
 type ResolveCollection<TCollection> = TCollection extends (...args: never[]) => infer TResult ? TResult : TCollection;

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

@@ -5,11 +5,20 @@ type RemoteTableSourceResult<TResult> = TResult extends {
     pageInfo: {
         nextCursor: string | null;
     };
-} ? TableCursorPageResult<TableSourceRow<TResult>> : TResult extends {
+} ? TableCursorPageResult<TableSourceRow<TResult>> & SummaryFromResult<TResult> : TResult extends {
     pageInfo: {
         pageIndex: number;
     };
-} ? TableOffsetPageResult<TableSourceRow<TResult>> : TableSourceExecutionResult<TableSourceRow<TResult>>;
+} ? TableOffsetPageResult<TableSourceRow<TResult>> & SummaryFromResult<TResult> : TableSourceExecutionResult<TableSourceRow<TResult>> & SummaryFromResult<TResult>;
+type SummaryFromResult<TResult> = TResult extends {
+    summary: infer TSummary;
+} ? {
+    summary: TSummary;
+} : TResult extends {
+    summary?: infer TSummary;
+} ? {
+    summary?: TSummary;
+} : object;
 interface TableSourceInferenceContext {
     pagination: TablePaginationState;
     sorting: TableSortingRule<never>[];

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

@@ -1,7 +1,7 @@
 import type { ComputedRef, ShallowRef } from 'vue';
 import type { UseTableDataReturn } from '../../composables/use-table-data.js';
 import type { useTableState } from '../../composables/use-table-state.js';
-import type { TableApi, TableColumnAlign, TableColumnPinned, GenericObject, TableLayout, TableSchemaView, TableRuntimeRecord, TableColumnSkeleton, TableColumnSummary } from '../../types/index.js';
+import type { TableApi, TableColumnAlign, TableColumnPinned, GenericObject, TableLayout, TableSchemaView, TableRuntimeRecord, TableColumnSkeleton } from '../../types/index.js';
 export declare const SELECT_COLUMN_ID = "__select";
 export declare const SELECT_COLUMN_WIDTH = 44;
 export declare const ROW_ACTIONS_COLUMN_ID = "__row-actions";
@@ -20,7 +20,7 @@ export interface TableRuntimeColumn {
     defaultVisible: boolean;
     configurable?: boolean;
     pinned?: TableColumnPinned;
-    summary?: TableColumnSummary;
+    summary?: SchemaTableColumn['summary'];
     ellipsis?: boolean;
     skeleton?: TableColumnSkeleton;
     lines?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-ui-tools",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "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",