Update repositories for new DB type mapping and their side effects

The Biggest one being, I couldn't figure out a way to default the hydrate method to the splat type.
I think it will be rare that we don't need to customize this anyway.

Author: CarsonF

src/components/funding-account/funding-account.edgedb.repository.ts

@@ -6,5 +6,7 @@ import { FundingAccountRepository } from './funding-account.repository';
 
 @Injectable()
 export class FundingAccountEdgeDBRepository
-  extends RepoFor(FundingAccount).withDefaults()
+  extends RepoFor(FundingAccount, {
+    hydrate: (fa) => fa['*'],
+  }).withDefaults()
   implements PublicOf<FundingAccountRepository> {}

src/components/user/user.edgedb.repository.ts

@@ -11,7 +11,9 @@ import type { UserRepository } from './user.repository';
 
 @Injectable()
 export class UserEdgeDBRepository
-  extends RepoFor(User).withDefaults()
+  extends RepoFor(User, {
+    hydrate: (user) => user['*'],
+  }).withDefaults()
   implements PublicOf<UserRepository>
 {
   async doesEmailAddressExist(email: string) {

src/core/edgedb/common.repository.ts

@@ -41,7 +41,7 @@ export class CommonRepository implements PublicOf<Neo4jCommonRepository> {
         : EnhancedResource.of(fqn)
       : undefined;
     const query = e.params({ ids: e.array(e.uuid) }, ({ ids }) =>
-      e.select((res?.db ?? e.Object) as typeof e.Object, (obj) => ({
+      e.select(res?.db ?? e.Object, (obj) => ({
         id: true,
         // eslint-disable-next-line @typescript-eslint/naming-convention
         _typeFQN_: obj.__type__.name,

src/core/edgedb/dto.repository.ts

@@ -12,6 +12,7 @@ import { lowerCase } from 'lodash';
 import { AbstractClass } from 'type-fest';
 import {
   EnhancedResource,
+  DBType as GetDBType,
   ID,
   isSortablePaginationInput,
   NotFoundException,
@@ -41,22 +42,21 @@ import { $, e } from './reexports';
  */
 export const RepoFor = <
   TResourceStatic extends ResourceShape<any>,
-  DBType extends (TResourceStatic['DB'] & {})['__element__'],
-  HydratedShape extends objectTypeToSelectShape<DBType> = (TResourceStatic['DB'] & {})['*'],
+  DBPathNode extends GetDBType<TResourceStatic>,
+  DBType extends DBPathNode['__element__'],
+  HydratedShape extends objectTypeToSelectShape<DBType>,
 >(
   resourceIn: TResourceStatic,
-  options: {
-    hydrate?: ShapeFn<$.TypeSet<DBType>, HydratedShape>;
-  } = {},
+  {
+    hydrate,
+  }: {
+    hydrate: ShapeFn<$.TypeSet<DBType>, HydratedShape>;
+  },
 ) => {
   type Dto = $.computeObjectShape<DBType['__pointers__'], HydratedShape>;
 
   const resource = EnhancedResource.of(resourceIn);
-
-  const hydrate = e.shape(
-    resource.db,
-    (options.hydrate ?? ((obj: any) => obj['*'])) as any,
-  ) as (scope: unknown) => HydratedShape;
+  const dbType = resource.db as any as $.$expr_PathNode;
 
   @Injectable()
   abstract class Repository extends CommonRepository {
@@ -125,7 +125,7 @@ export const RepoFor = <
         offset: (input.page - 1) * input.count,
         limit: input.count + 1,
       }));
-      const items = e.select(thisPage, (obj) => ({
+      const items = e.select(thisPage, (obj: any) => ({
         ...this.hydrate(obj),
         limit: input.count,
       }));
@@ -179,8 +179,8 @@ export const RepoFor = <
 
     async readMany(ids: readonly ID[]): Promise<readonly Dto[]> {
       const query = e.params({ ids: e.array(e.uuid) }, ({ ids }) =>
-        e.select(this.resource.db, (obj: any) => ({
-          ...(this.hydrate(obj) as any),
+        e.select(dbType, (obj: any) => ({
+          ...this.hydrate(obj),
           filter: e.op(obj.id, 'in', e.array_unpack(ids)),
         })),
       );
@@ -189,7 +189,7 @@ export const RepoFor = <
     }
 
     async list(input: PaginationInput) {
-      const all = e.select(this.resource.db, (obj: any) => {
+      const all = e.select(dbType, (obj: any) => {
         const filters = many(this.listFilters(obj, input)).filter(isNotFalsy);
         const filter =
           filters.length === 0
@@ -209,15 +209,15 @@ export const RepoFor = <
 
     async create(input: Omit<InsertShape<DBType>, `@${string}`>): Promise<Dto> {
       const query = e.select(
-        e.insert(this.resource.db, input as any),
+        (e.insert as any)(dbType, input),
         this.hydrate as any,
       );
       return (await this.db.run(query)) as Dto;
     }
 
     async update(
       existing: Pick<Dto, 'id'>,
-      input: UpdateShape<TResourceStatic['DB'] & {}>,
+      input: UpdateShape<DBPathNode>,
     ): Promise<Dto> {
       const object = e.cast(
         this.resource.db,

src/core/resources/resources.host.ts

@@ -92,7 +92,7 @@ export class ResourcesHost {
       map as Record<string, EnhancedResource<any>>,
       (_, r, { SKIP }) => {
         try {
-          return r.dbFQN;
+          return r.dbFQN as string;
         } catch (e) {
           return SKIP;
         }