Fix resolve return types

Author: baristikir

packages/plugin-edgedb/src/global-types.ts

@@ -102,7 +102,19 @@ declare global {
         Type extends TypeParam extends [unknown]
           ? [ObjectRef<Model['Shape']>]
           : ObjectRef<Model['Shape']>,
-        Model extends EdgeDBModelTypes = EdgeDBModelTypes &
+        Model extends EdgeDBModelTypes = EdgeDBModelShape<
+          Types,
+          // @ts-expect-error -> string | number | symbol not assignable to ..
+          TypeParam extends [keyof Types['EdgeDBTypes']['default']]
+            ? keyof Types['EdgeDBTypes']['default'][TypeParam[0]]
+            : TypeParam extends [EdgeDBObjectRef<EdgeDBModelTypes>]
+            ? TypeParam[0][typeof edgeDBModelKey]
+            : TypeParam extends EdgeDBObjectRef<EdgeDBModelTypes>
+            ? TypeParam[typeof edgeDBModelKey]
+            : TypeParam extends keyof Types['EdgeDBTypes']['default']
+            ? TypeParam
+            : never
+        > &
           (TypeParam extends [keyof Types['EdgeDBTypes']['default']]
             ? Types['EdgeDBTypes']['default'][TypeParam[0]]
             : TypeParam extends [EdgeDBObjectRef<EdgeDBModelTypes>]

packages/plugin-edgedb/src/types.ts

@@ -42,7 +42,7 @@ export type EdgeDBDefaultExportKeyTypes<DefaultExports> = {
     : never;
 }[keyof DefaultExports];
 
-type EdgeDBDefaultExportKey<
+type EdgeDBModelKeyAsString<
   DefaultExports,
   KeyType extends string | number | symbol = EdgeDBDefaultExportKeyTypes<DefaultExports>,
 > = Extract<keyof DefaultExports, KeyType>;
@@ -394,17 +394,17 @@ export type EdgeDBFieldResolver<
   info: GraphQLResolveInfo,
 ) => ShapeFromTypeParam<Types, Param, Nullable> extends infer Shape
   ? [Shape] extends [[readonly (infer Item)[] | null | undefined]]
-    ? ListResolveValue<Shape, Item, ResolveReturnShape>
-    : MaybePromise<Shape>
+    ? ListResolveValue<Partial<Shape>, Item, ResolveReturnShape>
+    : MaybePromise<Partial<Shape>>
   : never;
 
 export type EdgeDBFieldOptions<
   Types extends SchemaTypes,
   ParentShape,
   Type extends
     | EdgeDBObjectRef<EdgeDBModelTypes>
-    | keyof Types['EdgeDBTypes']
-    | [keyof Types['EdgeDBTypes']]
+    | keyof Types['EdgeDBTypes']['default']
+    | [keyof Types['EdgeDBTypes']['default']]
     | [EdgeDBObjectRef<EdgeDBModelTypes>],
   Model extends EdgeDBModelTypes,
   Param extends TypeParam<Types>,

packages/plugin-edgedb/tests/example/schema/index.ts

@@ -1,7 +1,6 @@
 import e, { Post, User } from '../../client';
 import { db } from '../db';
 import builder from '../builder';
-import { getNamedType } from 'graphql';
 
 const PostPreview = builder.objectRef<Post>('PostPreview');
 PostPreview.implement({
@@ -51,9 +50,6 @@ builder.queryType({
       // Temporarily since `User` doesnt have the links defined yet.
       // @ts-ignore
       resolve: async (root, args, ctx, info) => {
-        console.log(info.returnType);
-        console.log(getNamedType(info.returnType));
-
         const user = await e
           .select(e.User, (user) => ({
             id: true,
@@ -67,13 +63,15 @@ builder.queryType({
       },
     }),
     users: t.edgeDBField({
-      type: ['User'],
+      type: 'User',
       nullable: true,
-      resolve: async (_query, _, __, ctx) => {
+      resolve: async (_query, _parent, _args, ctx) => {
         const user = await e
-          .select(e.User, () => ({
+          .select(e.User, (user) => ({
+            id: true,
             email: true,
-            title: true,
+            name: true,
+            filter: e.op(user.id, '=', e.uuid(ctx.user.id)),
           }))
           .run(db);