@pothos/plugin-drizzle 0.17.0 → 0.17.2

package/src/types.ts

@@ -392,7 +392,7 @@ export type RelatedFieldOptions<
 > & {
   description?: string | false;
   // biome-ignore lint/suspicious/noExplicitAny: this is fine
-  type?: DrizzleRef<any, Table['relations'][Field]['targetTable']['_']['name']>;
+  type?: DrizzleRef<any, Table['relations'][Field]['targetTableName']>;
   query?: QueryForField<Types, Args, Table['relations'][Field]>;
 };
 
@@ -446,7 +446,7 @@ export type VariantFieldOptions<
 };
 
 export type RefForRelation<Types extends SchemaTypes, Rel extends Relation> = Rel extends {
-  $relationBrand: 'One';
+  relationType: 'one';
 }
   ? ObjectRef<Types, TypesForRelation<Types, Rel>>
   : [ObjectRef<Types, TypesForRelation<Types, Rel>>];
@@ -465,7 +465,7 @@ export type RelatedCountOptions<
 
 export type TypesForRelation<Types extends SchemaTypes, Rel extends Relation> = BuildQueryResult<
   Types['DrizzleRelations'],
-  Types['DrizzleRelations'][Rel['targetTable']['_']['name']],
+  Types['DrizzleRelations'][Rel['targetTableName']],
   true
 >;
 
@@ -475,13 +475,13 @@ export type QueryForField<
   Rel extends Relation,
 > = (
   Rel extends {
-    $relationBrand: 'One';
+    relationType: 'one';
   }
     ? Omit<
         DBQueryConfig<
           'one',
           Types['DrizzleRelations'],
-          Types['DrizzleRelations'][Rel['targetTable']['_']['name']]
+          Types['DrizzleRelations'][Rel['targetTableName']]
         >,
         'columns' | 'extra' | 'with'
       >
@@ -489,7 +489,7 @@ export type QueryForField<
         DBQueryConfig<
           'many',
           Types['DrizzleRelations'],
-          Types['DrizzleRelations'][Rel['targetTable']['_']['name']]
+          Types['DrizzleRelations'][Rel['targetTableName']]
         >,
         'columns' | 'extra' | 'with'
       >
@@ -626,7 +626,7 @@ export type RelatedConnectionOptions<
   Args extends InputFieldMap,
   Type = unknown,
   NodeTable extends
-    TableRelationalConfig = Types['DrizzleRelations'][Table['relations'][Field]['targetTable']['_']['name']],
+    TableRelationalConfig = Types['DrizzleRelations'][Table['relations'][Field]['targetTableName']],
 > = Omit<
   PothosSchemaTypes.ObjectFieldOptions<
     Types,
@@ -669,7 +669,7 @@ export type RelatedConnectionOptions<
         >;
         query?: QueryForRelatedConnection<Types, NodeTable, ConnectionArgs>;
         // biome-ignore lint/suspicious/noExplicitAny: this is fine
-        type?: Type & DrizzleRef<any, Table['relations'][Field]['targetTable']['_']['name']>;
+        type?: Type & DrizzleRef<any, Table['relations'][Field]['targetTableName']>;
 
         defaultSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
         maxSize?: number | ((args: ConnectionArgs, ctx: Types['Context']) => number);
@@ -694,28 +694,31 @@ export type DrizzleConnectionShape<
   T,
   Parent,
   Args extends InputFieldMap,
-> = Merge<
-  ShapeFromConnection<PothosSchemaTypes.ConnectionShapeHelper<Types, T, false>> extends infer Shape
-    ? Shape & {
-        parent: Parent;
-        args: InputShapeFromFields<Args> & PothosSchemaTypes.DefaultConnectionArguments;
-      }
-    : never
-> extends infer C
-  ? [C] extends [
-      {
-        edges: infer Edges;
-      },
-    ]
-    ? Merge<
-        Omit<C, 'edges'> & {
-          edges: Edges extends Iterable<MaybePromise<infer Edge> | null | undefined>
-            ? Merge<Edge & { connection: C }>[]
-            : never;
+> =
+  Merge<
+    ShapeFromConnection<
+      PothosSchemaTypes.ConnectionShapeHelper<Types, T, false>
+    > extends infer Shape
+      ? Shape & {
+          parent: Parent;
+          args: InputShapeFromFields<Args> & PothosSchemaTypes.DefaultConnectionArguments;
         }
-      >
-    : C
-  : never;
+      : never
+  > extends infer C
+    ? [C] extends [
+        {
+          edges: infer Edges;
+        },
+      ]
+      ? Merge<
+          Omit<C, 'edges'> & {
+            edges: Edges extends Iterable<MaybePromise<infer Edge> | null | undefined>
+              ? Merge<Edge & { connection: C }>[]
+              : never;
+          }
+        >
+      : C
+    : never;
 
 export type WithBrand<T> = T & { [typeBrandKey]: string };
 

package/src/utils/selections.ts

@@ -149,8 +149,10 @@ export function mergeSelection(
   }
 
   if (columns && !state.allColumns) {
-    for (const key of Object.keys(columns)) {
-      state.columns.add(key);
+    for (const [key, value] of Object.entries(columns)) {
+      if (value) {
+        state.columns.add(key);
+      }
     }
   } else {
     state.allColumns = true;