From 40b5647e20408ad0084ef23dc66eec6d5fd85ef4 Mon Sep 17 00:00:00 2001
From: Shigma <shigma10826@gmail.com>
Date: Mon, 15 Apr 2024 15:22:53 +0800
Subject: [PATCH] fix(core): fix typing issues, support database generics

---
 packages/core/src/database.ts | 17 ++++++-----------
 packages/core/src/driver.ts   |  2 +-
 packages/core/src/index.ts    |  4 ++--
 packages/core/src/model.ts    |  9 ++-------
 packages/mysql/package.json   |  2 +-
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/packages/core/src/database.ts b/packages/core/src/database.ts
index ba8bf6d9..a8ea0f90 100644
--- a/packages/core/src/database.ts
+++ b/packages/core/src/database.ts
@@ -54,11 +54,7 @@ export namespace Database {
   export interface Types {}
 }
 
-export class Database<
-  C extends Context = Context,
-  S extends C[typeof Database.Tables] = C[typeof Database.Tables],
-  N extends C[typeof Database.Types] = C[typeof Database.Types],
-> extends Service<undefined, C> {
+export class Database<S = {}, N = {}, C extends Context = Context> extends Service<undefined, C> {
   static [Service.provide] = 'model'
   static [Service.immediate] = true
   static readonly Tables = Symbol('minato.tables')
@@ -202,13 +198,12 @@ export class Database<
     return type
   }
 
-  // FIXME
-  // define<K extends Exclude<Keys<N>, Field.Type | 'object' | 'array'>>(
-  //   name: K,
-  //   field: Field.Definition<N[K], N> | Field.Transform<N[K], any, N>,
-  // ): K
+  define<K extends Exclude<Keys<N>, Field.Type | 'object' | 'array'>>(
+    name: K,
+    field: Field.Definition<N[K], N> | Field.Transform<N[K], any, N>,
+  ): K
 
-  // define<T>(field: Field.Definition<T, N> | Field.Transform<T, any, N>): Field.NewType<T>
+  define<T>(field: Field.Definition<T, N> | Field.Transform<T, any, N>): Field.NewType<T>
   define(name: any, field?: any) {
     if (typeof name === 'object') {
       field = name
diff --git a/packages/core/src/driver.ts b/packages/core/src/driver.ts
index 508e0cdb..6e1ab6a4 100644
--- a/packages/core/src/driver.ts
+++ b/packages/core/src/driver.ts
@@ -61,7 +61,7 @@ export abstract class Driver<T = any, C extends Context = Context> {
   abstract upsert(sel: Selection.Mutable, data: any[], keys: string[]): Promise<Driver.WriteResult>
   abstract withTransaction(callback: (driver: this) => Promise<void>): Promise<void>
 
-  public database: Database<C>
+  public database: Database<any, any, C>
   public logger: Logger
   public types: Dict<Driver.Transformer> = Object.create(null)
 
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 51804c06..21c06b82 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -18,8 +18,8 @@ declare module 'cordis' {
   interface Context {
     [Database.Tables]: Database.Tables
     [Database.Types]: Database.Types
-    database: Database<this>
-    model: Database<this>
+    database: Database<this[typeof Database.Tables], this[typeof Database.Types], this>
+    model: Database<this[typeof Database.Tables], this[typeof Database.Types], this>
   }
 }
 
diff --git a/packages/core/src/model.ts b/packages/core/src/model.ts
index f5950a10..e5d72ad6 100644
--- a/packages/core/src/model.ts
+++ b/packages/core/src/model.ts
@@ -3,14 +3,12 @@ import { Eval, isEvalExpr } from './eval.ts'
 import { Flatten, Keys, unravel } from './utils.ts'
 import { Type } from './type.ts'
 import { Driver } from './driver.ts'
-import { Selection } from './selection.ts'
 
 export const Primary = Symbol('Primary')
 export type Primary = (string | number) & { [Primary]: true }
 
 export interface Field<T = any> {
-  // FIXME Type<T>
-  type: Field.Type<T> | Type<T>
+  type: Type<T>
   deftype?: Field.Type<T>
   length?: number
   nullable?: boolean
@@ -77,11 +75,8 @@ export namespace Field {
     type: Type<T> | Field<T>['type']
   } & Omit<Field<T>, 'type'>
 
-  // FIXME
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type MapField<O = any, N = any> = {
-    // [K in keyof O]?: Literal<O[K], N> | Definition<O[K], N> | Transform<O[K], any, N>
-    [K in keyof O]?: Field<O[K]> | Shorthand<Type<O[K]>> | Selection.Callback<O, O[K]>
+    [K in keyof O]?: Literal<O[K], N> | Definition<O[K], N> | Transform<O[K], any, N>
   }
 
   export type Extension<O = any, N = any> = MapField<Flatten<O>, N>
diff --git a/packages/mysql/package.json b/packages/mysql/package.json
index 4d74d896..263dfe97 100644
--- a/packages/mysql/package.json
+++ b/packages/mysql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@minatojs/driver-mysql",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "MySQL Driver for Minato",
   "type": "module",
   "main": "lib/index.cjs",