fix(orm): update to kysely 0.28.x and simplify typing (#380)

* fix(orm): update to kysely 0.28.x and simplify typing

* fix deprecation warning

* fix `orderBy` deprecation

* fix tests

Author: ymc9

packages/orm/src/client/client-impl.ts

@@ -11,6 +11,7 @@ import {
     type KyselyProps,
 } from 'kysely';
 import type { GetModels, ProcedureDef, SchemaDef } from '../schema';
+import type { AnyKysely } from '../utils/kysely-utils';
 import type { UnwrapTuplePromises } from '../utils/type-utils';
 import type {
     AuthType,
@@ -53,7 +54,7 @@ export const ZenStackClient = function <Schema extends SchemaDef>(
 
 export class ClientImpl<Schema extends SchemaDef> {
     private kysely: ToKysely<Schema>;
-    private kyselyRaw: ToKysely<any>;
+    private kyselyRaw: AnyKysely;
     public readonly $options: ClientOptions<Schema>;
     public readonly $schema: Schema;
     readonly kyselyProps: KyselyProps;
@@ -192,7 +193,7 @@ export class ClientImpl<Schema extends SchemaDef> {
         arg: ZenStackPromise<Schema, any>[],
         options?: { isolationLevel?: TransactionIsolationLevel },
     ) {
-        const execute = async (tx: Kysely<any>) => {
+        const execute = async (tx: AnyKysely) => {
             const txClient = new ClientImpl<Schema>(this.schema, this.$options, this);
             txClient.kysely = tx;
             const result: any[] = [];
@@ -210,7 +211,7 @@ export class ClientImpl<Schema extends SchemaDef> {
             if (options?.isolationLevel) {
                 txBuilder = txBuilder.setIsolationLevel(options.isolationLevel);
             }
-            return txBuilder.execute((tx) => execute(tx as Kysely<any>));
+            return txBuilder.execute((tx) => execute(tx as AnyKysely));
         }
     }
 

packages/orm/src/client/contract.ts

@@ -1,5 +1,6 @@
 import type Decimal from 'decimal.js';
 import { type GetModels, type IsDelegateModel, type ProcedureDef, type SchemaDef } from '../schema';
+import type { AnyKysely } from '../utils/kysely-utils';
 import type { OrUndefinedIf, Simplify, UnwrapTuplePromises } from '../utils/type-utils';
 import type { TRANSACTION_UNSUPPORTED_METHODS } from './constants';
 import type {
@@ -116,7 +117,7 @@ export type ClientContract<Schema extends SchemaDef> = {
     /**
      * The raw Kysely query builder without any ZenStack enhancements.
      */
-    readonly $qbRaw: ToKysely<any>;
+    readonly $qbRaw: AnyKysely;
 
     /**
      * Starts an interactive transaction.

packages/orm/src/client/crud/dialects/base-dialect.ts

@@ -64,7 +64,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
     }
 
     buildFilterSortTake(
-        model: GetModels<Schema>,
+        model: string,
         args: FindArgs<Schema, GetModels<Schema>, true>,
         query: SelectQueryBuilder<any, any, {}>,
         modelAlias: string,
@@ -767,7 +767,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
                         invariant(v === 'asc' || v === 'desc', `invalid orderBy value for field "${field}"`);
                         result = result.orderBy(
                             (eb) => aggregate(eb, buildFieldRef(model, k, modelAlias), field as AGGREGATE_OPERATORS),
-                            sql.raw(this.negateSort(v, negated)),
+                            this.negateSort(v, negated),
                         );
                     }
                     continue;
@@ -780,7 +780,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
                             invariant(v === 'asc' || v === 'desc', `invalid orderBy value for field "${field}"`);
                             result = result.orderBy(
                                 (eb) => eb.fn.count(buildFieldRef(model, k, modelAlias)),
-                                sql.raw(this.negateSort(v, negated)),
+                                this.negateSort(v, negated),
                             );
                         }
                         continue;
@@ -803,10 +803,12 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
                         (value.sort === 'asc' || value.sort === 'desc') &&
                         (value.nulls === 'first' || value.nulls === 'last')
                     ) {
-                        result = result.orderBy(
-                            fieldRef,
-                            sql.raw(`${this.negateSort(value.sort, negated)} nulls ${value.nulls}`),
-                        );
+                        result = result.orderBy(fieldRef, (ob) => {
+                            const dir = this.negateSort(value.sort, negated);
+                            ob = dir === 'asc' ? ob.asc() : ob.desc();
+                            ob = value.nulls === 'first' ? ob.nullsFirst() : ob.nullsLast();
+                            return ob;
+                        });
                     }
                 } else {
                     // order by relation