@pothos/plugin-drizzle 0.17.1 → 0.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-drizzle",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "description": "A Pothos plugin for drizzle",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -41,26 +41,26 @@
   "devDependencies": {
     "@libsql/client": "^0.17.2",
     "drizzle-graphql": "^0.8.5",
-    "drizzle-kit": "1.0.0-beta.10-42c284e",
-    "drizzle-orm": "1.0.0-beta.10-42c284e",
+    "drizzle-kit": "1.0.0-beta.23",
+    "drizzle-orm": "1.0.0-beta.23",
     "graphql-scalars": "^1.25.0",
     "graphql-tag": "^2.12.6",
     "postgres": "^3.4.9",
     "@pothos/core": "4.12.0",
-    "@pothos/plugin-add-graphql": "4.3.0",
     "@pothos/plugin-errors": "4.9.0",
-    "@pothos/plugin-relay": "4.7.0",
     "@pothos/plugin-scope-auth": "4.1.6",
+    "@pothos/plugin-relay": "4.7.0",
+    "@pothos/plugin-add-graphql": "4.3.0",
     "@pothos/plugin-with-input": "4.1.4",
     "@pothos/test-utils": "2.1.3"
   },
   "scripts": {
-    "type": "tsc --project tsconfig.type.json",
+    "type": "tsgo --project tsconfig.type.json",
     "build": "pnpm build:clean && pnpm build:cjs && pnpm build:dts && pnpm build:esm",
     "build:clean": "git clean -dfX esm lib",
     "build:cjs": "swc src -d lib --config-file ../../.swcrc -C module.type=commonjs --strip-leading-paths",
     "build:esm": "cp -r dts/* esm/ && swc src -d esm --config-file ../../.swcrc -C module.type=es6 --strip-leading-paths && pnpm esm:extensions",
-    "build:dts": "tsc",
+    "build:dts": "tsgo",
     "esm:extensions": "TS_NODE_PROJECT=../../tsconfig.json node -r @swc-node/register ../../scripts/esm-transformer.ts",
     "test": "pnpm vitest --run"
   }

package/src/types.ts

@@ -236,8 +236,8 @@ export type DrizzleFieldOptions<
 > & {
   type: Param;
   resolve: (
-    query: <T extends QueryForDrizzleField<Types, Param, Table> = {}>(
-      selection?: T,
+    query: <T = {}>(
+      selection?: T & QueryForDrizzleField<Types, Param, Table>,
     ) => Omit<T, 'columns' | 'extra'> & {
       columns: T extends { columns: infer C extends {} } ? C : {};
       extras: {
@@ -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);