@vantreeseba/drizzle-graphql 8.2.0 → 8.2.1

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { Column, Table, Relation, SQL, TablesRelationalConfig, One, Many } from 'drizzle-orm';
-import { MySqlDatabase } from 'drizzle-orm/mysql-core';
+import { MySqlAsyncDatabase } from 'drizzle-orm/mysql-core';
 import { PgAsyncDatabase } from 'drizzle-orm/pg-core';
-import { BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core';
+import { SQLiteAsyncDatabase } from 'drizzle-orm/sqlite-core';
 import { ASTNode, GraphQLError, GraphQLScalarType, GraphQLOutputType, GraphQLInputType, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLSchema, GraphQLInputObjectType, GraphQLObjectType, GraphQLNonNull, GraphQLList, GraphQLEnumType } from 'graphql';
 import { ResolveTree } from 'graphql-parse-resolve-info';
 export { GraphQLDate, GraphQLDateTime, GraphQLJSON, GraphQLUUID } from 'graphql-scalars';
@@ -698,16 +698,16 @@ type Relations<TTable extends string = string, TConfig extends Record<string, Re
     config: (helpers: unknown) => TConfig;
 };
 
-type AnyDrizzleDB<TSchema extends Record<string, any>> = PgAsyncDatabase<any, TSchema> | BaseSQLiteDatabase<any, any, TSchema> | MySqlDatabase<any, any, TSchema>;
+type AnyDrizzleDB<TSchema extends Record<string, any>> = PgAsyncDatabase<any, TSchema> | SQLiteAsyncDatabase<any, any, TSchema> | MySqlAsyncDatabase<any, TSchema>;
 /**
  * The tables a database handle knows about, keyed by their schema key.
  *
- * Two shapes reach this type, because drizzle-orm v1 changed what a database's generic slot
- * holds. SQLite and MySQL handles still carry the schema module itself, so the tables are
- * picked out of it directly. PostgreSQL handles carry only the relations config built by
- * `buildRelations` — a `Record<string, { table; name; relations }>` — so the tables are read
- * off its `table` members instead. Without the second branch every PG-derived type collapses
- * to `never`.
+ * Two shapes reach this type. Every dialect's handle now carries the relations config built
+ * by `buildRelations` — a `Record<string, { table; name; relations }>` — so the tables are
+ * read off its `table` members. The second branch keeps working for a plain schema module
+ * passed in directly, which is what a caller writing `ExtractTables<typeof schema>` hands it.
+ * The two branches differ in one detail: a module's members are `readonly`, a
+ * relations config's are not, so the derived entity types are `readonly` only on that path.
  */
 type ExtractTables<TSchema extends Record<string, Table | unknown>> = TSchema extends TablesRelationalConfig ? {
     [K in keyof TSchema]: TSchema[K]['table'] extends infer TTable extends Table ? TTable : never;
@@ -1013,9 +1013,9 @@ type GeneratedOutputs<TSchema extends Record<string, Table>, IsReturnless extend
 } : {
     [TName in keyof TSchema as TName extends string ? Capitalize<TName> : never]: GraphQLObjectType;
 });
-type GeneratedEntities<TDatabase extends AnyDrizzleDB<TSchema>, TSchema extends Record<string, unknown> = TDatabase extends AnyDrizzleDB<infer ISchema> ? ISchema : never, TSchemaTables extends ExtractTables<TSchema> = ExtractTables<TSchema>, TSchemaRelations extends ExtractRelations<TSchema> = ExtractRelations<TSchema>, TInputs extends GeneratedInputs<TSchemaTables> = GeneratedInputs<TSchemaTables>, TOutputs extends GeneratedOutputs<TSchemaTables, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false> = GeneratedOutputs<TSchemaTables, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false>> = {
+type GeneratedEntities<TDatabase extends AnyDrizzleDB<TSchema>, TSchema extends Record<string, unknown> = TDatabase extends AnyDrizzleDB<infer ISchema> ? ISchema : never, TSchemaTables extends ExtractTables<TSchema> = ExtractTables<TSchema>, TSchemaRelations extends ExtractRelations<TSchema> = ExtractRelations<TSchema>, TInputs extends GeneratedInputs<TSchemaTables> = GeneratedInputs<TSchemaTables>, TOutputs extends GeneratedOutputs<TSchemaTables, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false> = GeneratedOutputs<TSchemaTables, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false>> = {
     queries: QueriesCore<TSchemaTables, TSchemaRelations, TInputs, TOutputs>;
-    mutations: MutationsCore<TSchemaTables, TInputs, TOutputs, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false>;
+    mutations: MutationsCore<TSchemaTables, TInputs, TOutputs, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false>;
     inputs: TInputs;
     types: TOutputs;
     /**

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Column, Table, Relation, SQL, TablesRelationalConfig, One, Many } from 'drizzle-orm';
-import { MySqlDatabase } from 'drizzle-orm/mysql-core';
+import { MySqlAsyncDatabase } from 'drizzle-orm/mysql-core';
 import { PgAsyncDatabase } from 'drizzle-orm/pg-core';
-import { BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core';
+import { SQLiteAsyncDatabase } from 'drizzle-orm/sqlite-core';
 import { ASTNode, GraphQLError, GraphQLScalarType, GraphQLOutputType, GraphQLInputType, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLSchema, GraphQLInputObjectType, GraphQLObjectType, GraphQLNonNull, GraphQLList, GraphQLEnumType } from 'graphql';
 import { ResolveTree } from 'graphql-parse-resolve-info';
 export { GraphQLDate, GraphQLDateTime, GraphQLJSON, GraphQLUUID } from 'graphql-scalars';
@@ -698,16 +698,16 @@ type Relations<TTable extends string = string, TConfig extends Record<string, Re
     config: (helpers: unknown) => TConfig;
 };
 
-type AnyDrizzleDB<TSchema extends Record<string, any>> = PgAsyncDatabase<any, TSchema> | BaseSQLiteDatabase<any, any, TSchema> | MySqlDatabase<any, any, TSchema>;
+type AnyDrizzleDB<TSchema extends Record<string, any>> = PgAsyncDatabase<any, TSchema> | SQLiteAsyncDatabase<any, any, TSchema> | MySqlAsyncDatabase<any, TSchema>;
 /**
  * The tables a database handle knows about, keyed by their schema key.
  *
- * Two shapes reach this type, because drizzle-orm v1 changed what a database's generic slot
- * holds. SQLite and MySQL handles still carry the schema module itself, so the tables are
- * picked out of it directly. PostgreSQL handles carry only the relations config built by
- * `buildRelations` — a `Record<string, { table; name; relations }>` — so the tables are read
- * off its `table` members instead. Without the second branch every PG-derived type collapses
- * to `never`.
+ * Two shapes reach this type. Every dialect's handle now carries the relations config built
+ * by `buildRelations` — a `Record<string, { table; name; relations }>` — so the tables are
+ * read off its `table` members. The second branch keeps working for a plain schema module
+ * passed in directly, which is what a caller writing `ExtractTables<typeof schema>` hands it.
+ * The two branches differ in one detail: a module's members are `readonly`, a
+ * relations config's are not, so the derived entity types are `readonly` only on that path.
  */
 type ExtractTables<TSchema extends Record<string, Table | unknown>> = TSchema extends TablesRelationalConfig ? {
     [K in keyof TSchema]: TSchema[K]['table'] extends infer TTable extends Table ? TTable : never;
@@ -1013,9 +1013,9 @@ type GeneratedOutputs<TSchema extends Record<string, Table>, IsReturnless extend
 } : {
     [TName in keyof TSchema as TName extends string ? Capitalize<TName> : never]: GraphQLObjectType;
 });
-type GeneratedEntities<TDatabase extends AnyDrizzleDB<TSchema>, TSchema extends Record<string, unknown> = TDatabase extends AnyDrizzleDB<infer ISchema> ? ISchema : never, TSchemaTables extends ExtractTables<TSchema> = ExtractTables<TSchema>, TSchemaRelations extends ExtractRelations<TSchema> = ExtractRelations<TSchema>, TInputs extends GeneratedInputs<TSchemaTables> = GeneratedInputs<TSchemaTables>, TOutputs extends GeneratedOutputs<TSchemaTables, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false> = GeneratedOutputs<TSchemaTables, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false>> = {
+type GeneratedEntities<TDatabase extends AnyDrizzleDB<TSchema>, TSchema extends Record<string, unknown> = TDatabase extends AnyDrizzleDB<infer ISchema> ? ISchema : never, TSchemaTables extends ExtractTables<TSchema> = ExtractTables<TSchema>, TSchemaRelations extends ExtractRelations<TSchema> = ExtractRelations<TSchema>, TInputs extends GeneratedInputs<TSchemaTables> = GeneratedInputs<TSchemaTables>, TOutputs extends GeneratedOutputs<TSchemaTables, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false> = GeneratedOutputs<TSchemaTables, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false>> = {
     queries: QueriesCore<TSchemaTables, TSchemaRelations, TInputs, TOutputs>;
-    mutations: MutationsCore<TSchemaTables, TInputs, TOutputs, TDatabase extends MySqlDatabase<any, any, any, any> ? true : false>;
+    mutations: MutationsCore<TSchemaTables, TInputs, TOutputs, TDatabase extends MySqlAsyncDatabase<any, any> ? true : false>;
     inputs: TInputs;
     types: TOutputs;
     /**

package/dist/index.js

@@ -1,8 +1,8 @@
 // src/index.ts
 import { is as is13 } from "drizzle-orm";
-import { MySqlDatabase as MySqlDatabase2 } from "drizzle-orm/mysql-core";
+import { MySqlAsyncDatabase as MySqlAsyncDatabase2 } from "drizzle-orm/mysql-core";
 import { PgAsyncDatabase as PgAsyncDatabase2 } from "drizzle-orm/pg-core";
-import { BaseSQLiteDatabase as BaseSQLiteDatabase2 } from "drizzle-orm/sqlite-core";
+import { SQLiteAsyncDatabase as SQLiteAsyncDatabase2 } from "drizzle-orm/sqlite-core";
 import {
   GraphQLObjectType as GraphQLObjectType5,
   GraphQLSchema
@@ -3118,6 +3118,7 @@ var BatchLoader = class {
   constructor(batchFn) {
     this.batchFn = batchFn;
   }
+  batchFn;
   batch = [];
   scheduled = false;
   load(key) {
@@ -5615,7 +5616,7 @@ var createNestedWriteRuntime = (params) => {
       const scope = resolveScope(policies, context, filterCtx);
       for (const [relationName, op] of Object.entries(ops)) {
         const plan = tablePlans[relationName];
-        if (!plan || plan.fkSide !== "parent") {
+        if (plan?.fkSide !== "parent") {
           continue;
         }
         assertSingleOperation(plan, op);
@@ -5657,7 +5658,7 @@ var createNestedWriteRuntime = (params) => {
       const scope = resolveScope(policies, context, filterCtx);
       for (const [relationName, op] of Object.entries(ops)) {
         const plan = tablePlans[relationName];
-        if (!plan || plan.fkSide !== "child") {
+        if (plan?.fkSide !== "child") {
           continue;
         }
         if (plan.isOne) {
@@ -5747,7 +5748,7 @@ import { parseResolveInfo as parseResolveInfo2 } from "graphql-parse-resolve-inf
 
 // src/util/builders/errors.ts
 var missingQueryBuilderError = (tableName) => new Error(
-  `Drizzle-GraphQL Error: Table '${tableName}' was passed to the drizzle constructor's schema but is missing from its relations config, so drizzle-orm exposes no query builder for it. Include it in the relations you pass to buildRelations/defineRelations, or drop it from the generated schema with config.exclude.tables.`
+  `Drizzle-GraphQL Error: Table '${tableName}' has no query builder on the drizzle instance, so there is nothing for its resolvers to read through. Include it in the relations you pass to buildRelations/defineRelations, or drop it from the generated schema with config.exclude.tables.`
 );
 
 // src/util/builders/select.ts
@@ -7758,19 +7759,19 @@ var generateSchemaData3 = (db, schema, relations, options) => sqliteSchemaData(d
 
 // src/util/selection.ts
 import { is as is12, Table as Table2 } from "drizzle-orm";
-import { getTableConfig as getMySqlTableConfig, MySqlDatabase } from "drizzle-orm/mysql-core";
+import { getTableConfig as getMySqlTableConfig, MySqlAsyncDatabase } from "drizzle-orm/mysql-core";
 import { getTableConfig as getPgTableConfig, PgAsyncDatabase } from "drizzle-orm/pg-core";
-import { BaseSQLiteDatabase, getTableConfig as getSQLiteTableConfig } from "drizzle-orm/sqlite-core";
+import { getTableConfig as getSQLiteTableConfig, SQLiteAsyncDatabase } from "drizzle-orm/sqlite-core";
 import { parseResolveInfo as parseResolveInfo5 } from "graphql-parse-resolve-info";
 var contextCache = /* @__PURE__ */ new WeakMap();
 var tableConfigFor = (db) => {
-  if (is12(db, MySqlDatabase)) {
+  if (is12(db, MySqlAsyncDatabase)) {
     return getMySqlTableConfig;
   }
   if (is12(db, PgAsyncDatabase)) {
     return getPgTableConfig;
   }
-  if (is12(db, BaseSQLiteDatabase)) {
+  if (is12(db, SQLiteAsyncDatabase)) {
     return getSQLiteTableConfig;
   }
   throw new Error("Drizzle-GraphQL Error: unsupported database instance \u2014 expected a PostgreSQL, MySQL or SQLite one.");
@@ -7781,7 +7782,7 @@ var contextFor = (db) => {
     return cached;
   }
   const relations = db._.relations ?? {};
-  const schema = db._.fullSchema ?? Object.fromEntries(
+  const schema = Object.fromEntries(
     Object.entries(relations).filter(([, config]) => config?.table != null).map(([key, config]) => [key, config.table])
   );
   const tableEntries = Object.entries(schema).filter(([, value]) => is12(value, Table2));
@@ -7906,21 +7907,21 @@ var resolveSelection = async (info, options) => {
 // src/index.ts
 var buildSchema = (db, config) => {
   const relations = db._.relations;
-  const schema = db._.fullSchema ?? Object.fromEntries(
+  const schema = Object.fromEntries(
     Object.entries(relations).filter(([, config2]) => config2?.table != null).map(([key, config2]) => [key, config2.table])
   );
-  if (!schema || !Object.keys(schema).length) {
+  if (!Object.keys(schema).length) {
     throw new Error(
       "Drizzle-GraphQL Error: Schema not found in drizzle instance. Pass relations (from buildRelations/defineRelations) to the drizzle constructor so drizzle-graphql can detect your tables."
     );
   }
   const generatorOptions = resolveBuildConfig(config, schema);
   let generatorOutput;
-  if (is13(db, MySqlDatabase2)) {
+  if (is13(db, MySqlAsyncDatabase2)) {
     generatorOutput = generateSchemaData(db, schema, relations, generatorOptions);
   } else if (is13(db, PgAsyncDatabase2)) {
     generatorOutput = generateSchemaData2(db, schema, relations, generatorOptions);
-  } else if (is13(db, BaseSQLiteDatabase2)) {
+  } else if (is13(db, SQLiteAsyncDatabase2)) {
     generatorOutput = generateSchemaData3(db, schema, relations, generatorOptions);
   } else {
     throw new Error("Drizzle-GraphQL Error: Unknown database instance type");