registerRowClass types

narthur · Apr 11, 2024 · 17fd14a · 17fd14a
1 parent 77cd94d
commit 17fd14a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/factory.ts b/src/factory.ts
@@ -2,30 +2,30 @@ import { BaserowConfig, getConfig } from "./getConfig.js";
 import { BaserowSdk } from "./index.js";
 import { Row, RowOptions, RowType } from "./row.js";
 
-interface RowClass<T extends RowType> {
-  new (options: RowOptions<T>): Row<T>;
+interface RowClass<T extends RowType, R extends Factory> {
+  new (options: RowOptions<T, R>): Row<T, R>;
 }
 
 export abstract class Factory {
   protected sdk: BaserowSdk;
   protected config: BaserowConfig;
-  protected classes: Map<number, RowClass<RowType>> = new Map();
+  protected classes: Map<number, RowClass<RowType, Factory>> = new Map();
 
   constructor() {
     this.config = getConfig();
     this.sdk = new BaserowSdk(this.config.databaseToken);
   }
 
-  protected registerRowClass<T extends RowType>(
+  protected registerRowClass<T extends RowType, R extends Factory>(
     tableId: number,
-    rowClass: RowClass<T>,
+    rowClass: RowClass<T, R>,
   ): void {
-    this.classes.set(tableId, rowClass as RowClass<RowType>);
+    this.classes.set(tableId, rowClass as RowClass<RowType, Factory>);
   }
 
-  protected getRowClass<T extends RowType>(
+  protected getRowClass<T extends RowType, R extends Factory>(
     tableId: number,
-  ): RowClass<T> | undefined {
-    return this.classes.get(tableId) as RowClass<T> | undefined;
+  ): RowClass<T, R> | undefined {
+    return this.classes.get(tableId) as RowClass<T, R> | undefined;
   }
 }
diff --git a/src/row.ts b/src/row.ts
@@ -2,21 +2,21 @@ import { Factory } from "./factory.js";
 import { BaserowSdk } from "./index.js";
 
 export type RowType = Record<string, unknown> & { id: number; order: string };
-export type RowOptions<T> = {
+export type RowOptions<T extends RowType, R extends Factory> = {
   tableId: number;
   rowId: number;
   row: T;
   sdk: BaserowSdk;
-  repository: Factory;
+  repository: R;
 };
-export abstract class Row<T extends RowType> {
+export abstract class Row<T extends RowType, R extends Factory> {
   protected tableId: number;
   protected rowId: number;
   protected row: T;
   protected sdk: BaserowSdk;
   protected repository: Factory;
 
-  constructor({ tableId, rowId, row, sdk, repository }: RowOptions<T>) {
+  constructor({ tableId, rowId, row, sdk, repository }: RowOptions<T, R>) {
     this.tableId = tableId;
     this.rowId = rowId;
     this.row = row;