fix types

TanStack · Nov 24, 2024 · 6cebaa7 · 6cebaa7
1 parent ad4d96f
commit 6cebaa7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/examples/angular/grouping/src/app/app.component.ts b/examples/angular/grouping/src/app/app.component.ts
@@ -56,13 +56,9 @@ export class AppComponent {
       rowExpandingFeature,
     },
     _rowModels: {
-      // @ts-expect-error Fix type
       groupedRowModel: createGroupedRowModel(),
-      // @ts-expect-error Fix type
       expandedRowModel: createExpandedRowModel(),
-      // @ts-expect-error Fix type
       paginatedRowModel: createPaginatedRowModel(),
-      // @ts-expect-error Fix type
       filteredRowModel: createFilteredRowModel(),
     },
     onGroupingChange: (updaterOrValue: Updater<GroupingState>) => {

diff --git a/examples/angular/row-selection-signal/src/app/app.component.ts b/examples/angular/row-selection-signal/src/app/app.component.ts
@@ -108,9 +108,7 @@ export class AppComponent {
       columnVisibilityFeature,
     },
     _rowModels: {
-      // @ts-expect-error Fix type
       filteredRowModel: createFilteredRowModel(),
-      // @ts-expect-error Fix type
       paginatedRowModel: createPaginatedRowModel(),
     },
     columns: this.columns,

diff --git a/...ngular-table/src/createTableHelperCore.ts → ...angular-table/src/constructTableHelper.ts b/...ngular-table/src/createTableHelperCore.ts → ...angular-table/src/constructTableHelper.ts
diff --git a/packages/angular-table/src/createTableHelper.ts b/packages/angular-table/src/createTableHelper.ts
@@ -1,4 +1,5 @@
-import { constructTableHelper } from './createTableHelperCore'
+import { Signal } from '@angular/core'
+import { constructTableHelper } from './constructTableHelper'
 import { injectTable } from './injectTable'
 import type {
   RowData,
@@ -27,7 +28,12 @@ export function createTableHelper<
 >(
   tableHelperOptions: TableHelperOptions<TFeatures, TData>,
 ): TableHelper<TFeatures, TData> {
-  const tableHelper = constructTableHelper(injectTable, tableHelperOptions)
+  const tableHelper = constructTableHelper(
+    injectTable as unknown as (
+      tableOptions: () => TableOptions<TFeatures, TData>,
+    ) => Table<TFeatures, TData> & Signal<Table<TFeatures, TData>>,
+    tableHelperOptions,
+  )
   return {
     ...tableHelper,
     injectTable: tableHelper.tableCreator,

diff --git a/packages/angular-table/src/injectTable.ts b/packages/angular-table/src/injectTable.ts
@@ -9,6 +9,7 @@ import { lazyInit } from './lazy-signal-initializer'
 import { proxifyTable } from './proxy'
 import { reactivityFeature } from './reactivity'
 import type {
+  CreateRowModels_All,
   RowData,
   Table,
   TableFeatures,
@@ -17,11 +18,20 @@ import type {
 } from '@tanstack/table-core'
 import type { Signal } from '@angular/core'
 
+export type AngularTableOptions<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> = Omit<TableOptions<TFeatures, TData>, '_rowModels'> & {
+  _rowModels: CreateRowModels_All<TFeatures, TData>
+  // TODO: no exported
+  // _rowModelsFns: RowModelFns<TFeatures, TData>
+}
+
 export function injectTable<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  options: () => TableOptions<TFeatures, TData>,
+  options: () => AngularTableOptions<TFeatures, TData>,
 ): Table<TFeatures, TData> & Signal<Table<TFeatures, TData>> {
   return lazyInit(() => {
     const features = () => {
@@ -41,7 +51,7 @@ export function injectTable<
       ...options(),
       _features: features(),
       state: { ...state(), ...options().state },
-    }
+    } as TableOptions<TFeatures, TData>
 
     const table = constructTable(resolvedOptions)