debug: trying to get generics to work

wharfkit · Jul 22, 2023 · 49500df · 49500df
1 parent 4a9d062
commit 49500df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/contract/table-cursor.ts b/src/contract/table-cursor.ts
@@ -1,4 +1,4 @@
-import {API, Serializer} from '@greymass/eosio'
+import {ABISerializableConstructor, API, Serializer} from '@greymass/eosio'
 import {wrapIndexValue} from '../utils'
 import {Query, Table} from './table'
 
@@ -16,7 +16,7 @@ interface TableCursorParams {
  *
  * @typeparam TableRow The type of rows in the table.
  */
-export class TableCursor<TableRow> {
+export class TableCursor<TableRow extends ABISerializableConstructor> {
     private table: Table
     private next_key: API.v1.TableIndexType | string | undefined
     private tableParams: API.v1.GetTableRowsParams
@@ -75,7 +75,7 @@ export class TableCursor<TableRow> {
      *
      * @returns The new rows.
      */
-    async next(rowsPerAPIRequest?: number): Promise<TableRow[]> {
+    async next<Key extends keyof API.v1.TableIndexTypes = 'name'>(rowsPerAPIRequest?: number): Promise<TableRow[]> {
         if (this.endReached) {
             return []
         }
@@ -99,7 +99,7 @@ export class TableCursor<TableRow> {
             indexPosition = fieldToIndexMapping[this.indexPositionField].index_position
         }
 
-        const result = await this.table.contract.client!.v1.chain.get_table_rows({
+        const result = await this.table.contract.client!.v1.chain.get_table_rows<TableRow, Key>({
             ...this.tableParams,
             limit: Math.min(
                 this.maxRows - this.rowsCount,

diff --git a/test/tests/table.ts b/test/tests/table.ts
@@ -81,13 +81,13 @@ suite('Table', () => {
                 @Struct.field(Int64) high_bid!: Int64
                 @Struct.field(TimePoint) last_bid_time!: TimePoint
             }
-            const table = new Table({
+            const table = new Table<NameBid>({
                 contract: eosio,
                 name: 'namebids',
                 rowType: NameBid,
             })
             assert.instanceOf(table, Table)
-            const rows = await table.first(1).next()
+            const rows: NameBid[] = await table.first(1).next()
             assert.instanceOf(rows[0], NameBid)
             // assert.instanceOf(rows[0].newname, Name)
             console.log(JSON.stringify(rows[0].newname))