drizzle-graphql-plus 0.8.15 → 0.8.17

package/index.d.cts

@@ -1,4 +1,4 @@
-import { Table, Column, TablesRelationalConfig, TableRelationalConfig, Relations, Relation, One, Many, getTableColumns } from 'drizzle-orm';
+import { Table, Column, TablesRelationalConfig, TableRelationalConfig, Relations, Relation, One, Many, InferSelectModel, getTableColumns } from 'drizzle-orm';
 import { MySqlDatabase } from 'drizzle-orm/mysql-core';
 import { RelationalQueryBuilder as RelationalQueryBuilder$1 } from 'drizzle-orm/mysql-core/query-builders/query';
 import { PgDatabase } from 'drizzle-orm/pg-core';
@@ -82,7 +82,7 @@ type ExtractTableByName<TTableSchema extends Record<string, Table>, TName extend
 type MutationReturnlessResult = {
     isSuccess: boolean;
 };
-type QueryArgs<TTable extends Table, isSingle extends boolean> = Partial<(isSingle extends true ? {
+type QueryArgs$1<TTable extends Table, isSingle extends boolean> = Partial<(isSingle extends true ? {
     offset: number;
 } : {
     offset: number;
@@ -103,10 +103,10 @@ type UpdateArgs<TTable extends Table> = Partial<{
 type DeleteArgs<TTable extends Table> = {
     where?: Filters<TTable>;
 };
-type SelectResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<keyof TRelations extends infer RelKey ? RelKey extends string ? Array<GetRemappedTableDataType<TTable> & {
+type SelectResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs$1<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<keyof TRelations extends infer RelKey ? RelKey extends string ? Array<GetRemappedTableDataType<TTable> & {
     [K in RelKey]: TRelations[K] extends One<string> ? GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never> | null : TRelations[K] extends Many<string> ? Array<GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never>> : never;
 }> : Array<GetRemappedTableDataType<TTable>> : Array<GetRemappedTableDataType<TTable>>>;
-type SelectSingleResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs<TTable, true>>, context: any, info: GraphQLResolveInfo) => Promise<(keyof TRelations extends infer RelKey ? RelKey extends string ? GetRemappedTableDataType<TTable> & {
+type SelectSingleResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs$1<TTable, true>>, context: any, info: GraphQLResolveInfo) => Promise<(keyof TRelations extends infer RelKey ? RelKey extends string ? GetRemappedTableDataType<TTable> & {
     [K in RelKey]: TRelations[K] extends One<string> ? GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never> | null : TRelations[K] extends Many<string> ? Array<GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never>> : never;
 } : GetRemappedTableDataType<TTable> : GetRemappedTableDataType<TTable>) | null>;
 type InsertResolver<TTable extends Table, IsReturnless extends boolean> = (source: any, args: Partial<InsertArgs<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<IsReturnless extends false ? Array<GetRemappedTableDataType<TTable>> : MutationReturnlessResult>;
@@ -248,11 +248,87 @@ type BuildSchemaConfig = {
 
 declare const buildSchema: <TDbClient extends AnyDrizzleDB<any>>(db: TDbClient, config?: BuildSchemaConfig) => GeneratedData<TDbClient>;
 
-type BuildSchemaSDLResult = {
+type Capitalize$1<S extends string> = S extends `${infer F}${infer R}` ? `${Uppercase<F>}${R}` : S;
+type ColumnFilter<T = any> = {
+    eq?: T;
+    ne?: T;
+    gt?: T;
+    gte?: T;
+    lt?: T;
+    lte?: T;
+    like?: string;
+    notLike?: string;
+    ilike?: string;
+    notIlike?: string;
+    inArray?: T[];
+    notInArray?: T[];
+    isNull?: boolean;
+    isNotNull?: boolean;
+    OR?: ColumnFilter<T>[];
+};
+type WhereInput<TTable> = TTable extends {
+    $inferSelect: infer S;
+} ? {
+    [K in keyof S]?: ColumnFilter<S[K]>;
+} & {
+    OR?: WhereInput<TTable>[];
+} : never;
+type OrderByInput<TTable> = TTable extends {
+    $inferSelect: infer S;
+} ? {
+    [K in keyof S]?: {
+        direction: "asc" | "desc";
+        priority: number;
+    };
+} : never;
+type QueryArgs<TTable> = {
+    where?: WhereInput<TTable>;
+    orderBy?: OrderByInput<TTable>;
+    limit?: number;
+    offset?: number;
+};
+type InsertInput<TTable> = TTable extends {
+    $inferInsert: infer I;
+} ? I : never;
+type UpdateInput<TTable> = TTable extends {
+    $inferInsert: infer I;
+} ? Partial<I> : never;
+type BuildSchemaSDLResult<TSchema extends Record<string, any> = Record<string, any>> = {
     typeDefs: string;
-    resolvers: Record<string, any>;
+    resolvers: {
+        Query: {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? K : never]: (parent: any, args: QueryArgs<TSchema[K]>, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        };
+        Mutation: {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `insert${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                data: InsertInput<TSchema[K]> | InsertInput<TSchema[K]>[];
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        } & {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `update${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                data: UpdateInput<TSchema[K]>;
+                where: WhereInput<TSchema[K]>;
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        } & {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `delete${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                where: WhereInput<TSchema[K]>;
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        };
+        [key: string]: any;
+    };
 };
-declare const buildSchemaSDL: <TDbClient extends AnyDrizzleDB<any>>(db: TDbClient, config?: BuildSchemaConfig) => BuildSchemaSDLResult;
+declare const buildSchemaSDL: <TDbClient extends AnyDrizzleDB<any>, TSchema extends Record<string, any> = TDbClient extends {
+    _: {
+        fullSchema: infer S;
+    };
+} ? S : Record<string, any>>(db: TDbClient, config?: BuildSchemaConfig) => BuildSchemaSDLResult<TSchema>;
 
 interface GraphQLFieldConfig {
     type: string;
@@ -303,4 +379,4 @@ declare function setCustomGraphQL<T extends Table, TColumns = ReturnType<typeof
  */
 declare function setCustomGraphQLTypes<T extends Table, TColumns = ReturnType<typeof getTableColumns<T>>>(table: T, columnTypes: Partial<Record<keyof TColumns, string>>): void;
 
-export { type AnyDrizzleDB, type AnyQueryBuiler, type BuildSchemaConfig, type BuildSchemaSDLResult, type DeleteArgs, type DeleteResolver, type ExtractRelations, type ExtractTableByName, type ExtractTableRelations, type ExtractTables, type GeneratedData, type GeneratedEntities, type GeneratedInputs, type GeneratedInterfaces, type GeneratedOutputs, type GraphQLFieldConfig, type InsertArgs, type InsertArrResolver, type InsertResolver, type MutationReturnlessResult, type MutationsCore, type QueriesCore, type QueryArgs, type SelectResolver, type SelectSingleResolver, type UpdateArgs, type UpdateResolver, buildSchema, buildSchemaSDL, setCustomGraphQL, setCustomGraphQLTypes };
+export { type AnyDrizzleDB, type AnyQueryBuiler, type BuildSchemaConfig, type BuildSchemaSDLResult, type Capitalize$1 as Capitalize, type ColumnFilter, type DeleteArgs, type DeleteResolver, type ExtractRelations, type ExtractTableByName, type ExtractTableRelations, type ExtractTables, type GeneratedData, type GeneratedEntities, type GeneratedInputs, type GeneratedInterfaces, type GeneratedOutputs, type GraphQLFieldConfig, type InsertArgs, type InsertArrResolver, type InsertInput, type InsertResolver, type MutationReturnlessResult, type MutationsCore, type OrderByInput, type QueriesCore, type QueryArgs, type SelectResolver, type SelectSingleResolver, type UpdateArgs, type UpdateInput, type UpdateResolver, type WhereInput, buildSchema, buildSchemaSDL, setCustomGraphQL, setCustomGraphQLTypes };

package/index.d.ts

@@ -1,4 +1,4 @@
-import { Table, Column, TablesRelationalConfig, TableRelationalConfig, Relations, Relation, One, Many, getTableColumns } from 'drizzle-orm';
+import { Table, Column, TablesRelationalConfig, TableRelationalConfig, Relations, Relation, One, Many, InferSelectModel, getTableColumns } from 'drizzle-orm';
 import { MySqlDatabase } from 'drizzle-orm/mysql-core';
 import { RelationalQueryBuilder as RelationalQueryBuilder$1 } from 'drizzle-orm/mysql-core/query-builders/query';
 import { PgDatabase } from 'drizzle-orm/pg-core';
@@ -82,7 +82,7 @@ type ExtractTableByName<TTableSchema extends Record<string, Table>, TName extend
 type MutationReturnlessResult = {
     isSuccess: boolean;
 };
-type QueryArgs<TTable extends Table, isSingle extends boolean> = Partial<(isSingle extends true ? {
+type QueryArgs$1<TTable extends Table, isSingle extends boolean> = Partial<(isSingle extends true ? {
     offset: number;
 } : {
     offset: number;
@@ -103,10 +103,10 @@ type UpdateArgs<TTable extends Table> = Partial<{
 type DeleteArgs<TTable extends Table> = {
     where?: Filters<TTable>;
 };
-type SelectResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<keyof TRelations extends infer RelKey ? RelKey extends string ? Array<GetRemappedTableDataType<TTable> & {
+type SelectResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs$1<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<keyof TRelations extends infer RelKey ? RelKey extends string ? Array<GetRemappedTableDataType<TTable> & {
     [K in RelKey]: TRelations[K] extends One<string> ? GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never> | null : TRelations[K] extends Many<string> ? Array<GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never>> : never;
 }> : Array<GetRemappedTableDataType<TTable>> : Array<GetRemappedTableDataType<TTable>>>;
-type SelectSingleResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs<TTable, true>>, context: any, info: GraphQLResolveInfo) => Promise<(keyof TRelations extends infer RelKey ? RelKey extends string ? GetRemappedTableDataType<TTable> & {
+type SelectSingleResolver<TTable extends Table, TTables extends Record<string, Table>, TRelations extends Record<string, Relation>> = (source: any, args: Partial<QueryArgs$1<TTable, true>>, context: any, info: GraphQLResolveInfo) => Promise<(keyof TRelations extends infer RelKey ? RelKey extends string ? GetRemappedTableDataType<TTable> & {
     [K in RelKey]: TRelations[K] extends One<string> ? GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never> | null : TRelations[K] extends Many<string> ? Array<GetRemappedTableDataType<ExtractTableByName<TTables, TRelations[K]["referencedTableName"]> extends infer T ? T[keyof T] : never>> : never;
 } : GetRemappedTableDataType<TTable> : GetRemappedTableDataType<TTable>) | null>;
 type InsertResolver<TTable extends Table, IsReturnless extends boolean> = (source: any, args: Partial<InsertArgs<TTable, false>>, context: any, info: GraphQLResolveInfo) => Promise<IsReturnless extends false ? Array<GetRemappedTableDataType<TTable>> : MutationReturnlessResult>;
@@ -248,11 +248,87 @@ type BuildSchemaConfig = {
 
 declare const buildSchema: <TDbClient extends AnyDrizzleDB<any>>(db: TDbClient, config?: BuildSchemaConfig) => GeneratedData<TDbClient>;
 
-type BuildSchemaSDLResult = {
+type Capitalize$1<S extends string> = S extends `${infer F}${infer R}` ? `${Uppercase<F>}${R}` : S;
+type ColumnFilter<T = any> = {
+    eq?: T;
+    ne?: T;
+    gt?: T;
+    gte?: T;
+    lt?: T;
+    lte?: T;
+    like?: string;
+    notLike?: string;
+    ilike?: string;
+    notIlike?: string;
+    inArray?: T[];
+    notInArray?: T[];
+    isNull?: boolean;
+    isNotNull?: boolean;
+    OR?: ColumnFilter<T>[];
+};
+type WhereInput<TTable> = TTable extends {
+    $inferSelect: infer S;
+} ? {
+    [K in keyof S]?: ColumnFilter<S[K]>;
+} & {
+    OR?: WhereInput<TTable>[];
+} : never;
+type OrderByInput<TTable> = TTable extends {
+    $inferSelect: infer S;
+} ? {
+    [K in keyof S]?: {
+        direction: "asc" | "desc";
+        priority: number;
+    };
+} : never;
+type QueryArgs<TTable> = {
+    where?: WhereInput<TTable>;
+    orderBy?: OrderByInput<TTable>;
+    limit?: number;
+    offset?: number;
+};
+type InsertInput<TTable> = TTable extends {
+    $inferInsert: infer I;
+} ? I : never;
+type UpdateInput<TTable> = TTable extends {
+    $inferInsert: infer I;
+} ? Partial<I> : never;
+type BuildSchemaSDLResult<TSchema extends Record<string, any> = Record<string, any>> = {
     typeDefs: string;
-    resolvers: Record<string, any>;
+    resolvers: {
+        Query: {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? K : never]: (parent: any, args: QueryArgs<TSchema[K]>, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        };
+        Mutation: {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `insert${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                data: InsertInput<TSchema[K]> | InsertInput<TSchema[K]>[];
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        } & {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `update${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                data: UpdateInput<TSchema[K]>;
+                where: WhereInput<TSchema[K]>;
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        } & {
+            [K in keyof TSchema as TSchema[K] extends {
+                $inferSelect: any;
+            } ? `delete${Capitalize$1<K & string>}` : never]: (parent: any, args: {
+                where: WhereInput<TSchema[K]>;
+            }, context: any, info: any) => Promise<InferSelectModel<TSchema[K]>[]>;
+        };
+        [key: string]: any;
+    };
 };
-declare const buildSchemaSDL: <TDbClient extends AnyDrizzleDB<any>>(db: TDbClient, config?: BuildSchemaConfig) => BuildSchemaSDLResult;
+declare const buildSchemaSDL: <TDbClient extends AnyDrizzleDB<any>, TSchema extends Record<string, any> = TDbClient extends {
+    _: {
+        fullSchema: infer S;
+    };
+} ? S : Record<string, any>>(db: TDbClient, config?: BuildSchemaConfig) => BuildSchemaSDLResult<TSchema>;
 
 interface GraphQLFieldConfig {
     type: string;
@@ -303,4 +379,4 @@ declare function setCustomGraphQL<T extends Table, TColumns = ReturnType<typeof
  */
 declare function setCustomGraphQLTypes<T extends Table, TColumns = ReturnType<typeof getTableColumns<T>>>(table: T, columnTypes: Partial<Record<keyof TColumns, string>>): void;
 
-export { type AnyDrizzleDB, type AnyQueryBuiler, type BuildSchemaConfig, type BuildSchemaSDLResult, type DeleteArgs, type DeleteResolver, type ExtractRelations, type ExtractTableByName, type ExtractTableRelations, type ExtractTables, type GeneratedData, type GeneratedEntities, type GeneratedInputs, type GeneratedInterfaces, type GeneratedOutputs, type GraphQLFieldConfig, type InsertArgs, type InsertArrResolver, type InsertResolver, type MutationReturnlessResult, type MutationsCore, type QueriesCore, type QueryArgs, type SelectResolver, type SelectSingleResolver, type UpdateArgs, type UpdateResolver, buildSchema, buildSchemaSDL, setCustomGraphQL, setCustomGraphQLTypes };
+export { type AnyDrizzleDB, type AnyQueryBuiler, type BuildSchemaConfig, type BuildSchemaSDLResult, type Capitalize$1 as Capitalize, type ColumnFilter, type DeleteArgs, type DeleteResolver, type ExtractRelations, type ExtractTableByName, type ExtractTableRelations, type ExtractTables, type GeneratedData, type GeneratedEntities, type GeneratedInputs, type GeneratedInterfaces, type GeneratedOutputs, type GraphQLFieldConfig, type InsertArgs, type InsertArrResolver, type InsertInput, type InsertResolver, type MutationReturnlessResult, type MutationsCore, type OrderByInput, type QueriesCore, type QueryArgs, type SelectResolver, type SelectSingleResolver, type UpdateArgs, type UpdateInput, type UpdateResolver, type WhereInput, buildSchema, buildSchemaSDL, setCustomGraphQL, setCustomGraphQLTypes };

package/index.js

@@ -2438,9 +2438,6 @@ ${fields.join("\n")}
 }`);
     const insertFields = [];
     for (const [columnName, column] of Object.entries(tableInfo.columns)) {
-      if (column.hasDefault || column.columnType === "SQLiteSerial") {
-        continue;
-      }
       const typeStr = columnToSDL(
         column,
         columnName,
@@ -2973,21 +2970,16 @@ var buildSchemaSDL = (db, config) => {
   const typeDefsArray = [];
   typeDefsArray.push(generateTypeDefs(tables, relations));
   typeDefsArray.push(generateQueryTypeDefs(tables));
-  if (config?.mutations !== false) {
-    typeDefsArray.push(generateMutationTypeDefs(tables));
-  }
+  typeDefsArray.push(generateMutationTypeDefs(tables));
   const typeDefs = typeDefsArray.join("\n\n");
   const queries = generateQueries(db, tables, relations);
-  const resolvers = {
-    Query: queries
-  };
-  if (config?.mutations !== false) {
-    const mutations = generateMutations(db, tables);
-    resolvers["Mutation"] = mutations;
-  }
+  const mutations = generateMutations(db, tables);
   return {
     typeDefs,
-    resolvers
+    resolvers: {
+      Query: queries,
+      Mutation: mutations
+    }
   };
 };