@drizzle-graphql-suite/client 0.8.1 → 0.8.2

package/client.d.ts

@@ -1,6 +1,6 @@
+import type { BuildSchemaConfig } from '@drizzle-graphql-suite/schema';
 import { type EntityClient } from './entity';
 import type { InferEntityDefs } from './infer';
-import { type ClientSchemaConfig } from './schema-builder';
 import type { AnyEntityDefs, ClientConfig, SchemaDescriptor } from './types';
 export declare class GraphQLClient<TSchema extends SchemaDescriptor, TDefs extends AnyEntityDefs = AnyEntityDefs> {
     private url;
@@ -10,10 +10,10 @@ export declare class GraphQLClient<TSchema extends SchemaDescriptor, TDefs exten
     entity<TEntityName extends string & keyof TSchema & keyof TDefs>(entityName: TEntityName): EntityClient<TDefs, TDefs[TEntityName]>;
     execute(query: string, variables?: Record<string, unknown>): Promise<Record<string, unknown>>;
 }
-export type DrizzleClientConfig<TSchema extends Record<string, unknown>, TConfig extends ClientSchemaConfig> = {
+export type DrizzleClientConfig<TSchema extends Record<string, unknown>, TConfig extends BuildSchemaConfig> = {
     schema: TSchema;
     config: TConfig;
     url: string | (() => string);
     headers?: HeadersInit | (() => HeadersInit | Promise<HeadersInit>);
 };
-export declare function createDrizzleClient<TSchema extends Record<string, unknown>, const TConfig extends ClientSchemaConfig>(options: DrizzleClientConfig<TSchema, TConfig>): GraphQLClient<SchemaDescriptor, InferEntityDefs<TSchema, TConfig>>;
+export declare function createDrizzleClient<TSchema extends Record<string, unknown>, const TConfig extends BuildSchemaConfig>(options: DrizzleClientConfig<TSchema, TConfig>): GraphQLClient<SchemaDescriptor, InferEntityDefs<TSchema, TConfig>>;

package/index.d.ts

@@ -1,11 +1,11 @@
 import { GraphQLClient } from './client';
 import type { AnyEntityDefs, ClientConfig, SchemaDescriptor } from './types';
 export declare function createClient<TSchema extends SchemaDescriptor, TDefs extends AnyEntityDefs = AnyEntityDefs>(config: ClientConfig<TSchema>): GraphQLClient<TSchema, TDefs>;
+export type { BuildSchemaConfig } from '@drizzle-graphql-suite/schema';
 export type { DrizzleClientConfig } from './client';
 export { createDrizzleClient, GraphQLClient } from './client';
 export type { EntityClient } from './entity';
 export { GraphQLClientError, NetworkError } from './errors';
 export type { InferEntityDefs } from './infer';
-export type { ClientSchemaConfig } from './schema-builder';
 export { buildSchemaDescriptor } from './schema-builder';
 export type { AnyEntityDefs, ClientConfig, EntityDef, EntityDescriptor, InferResult, SchemaDescriptor, SelectInput, } from './types';

package/index.js

@@ -9,7 +9,7 @@ ${U}
   }
 }`,variables:{},operationName:Z}}function b(E,x,$){let Y=x.countName;if(!Y)throw Error(`Entity '${E}' has no count query`);let J=L(E),C=`${j(Y)}Query`,H=[],R=[];if($)H.push(`$where: ${J}`),R.push("where: $where");let X=H.length?`(${H.join(", ")})`:"",A=R.length?`(${R.join(", ")})`:"";return{query:`query ${C}${X} {
   ${Y}${A}
-}`,variables:{},operationName:C}}function w(E,x,$,Y,J){let C=J?x.insertSingleName:x.insertName;if(!C)throw Error(`Entity '${E}' has no ${J?"insertSingle":"insert"} mutation`);let H=p(E),R=`${j(C)}Mutation`,A=`($values: ${J?`${H}!`:`[${H}!]!`})`,Z="(values: $values)",_="";if(Y)_=` {
+}`,variables:{},operationName:C}}function Q(E,x,$,Y,J){let C=J?x.insertSingleName:x.insertName;if(!C)throw Error(`Entity '${E}' has no ${J?"insertSingle":"insert"} mutation`);let H=p(E),R=`${j(C)}Mutation`,A=`($values: ${J?`${H}!`:`[${H}!]!`})`,Z="(values: $values)",_="";if(Y)_=` {
 ${G(Y,$,x)}
   }`;return{query:`mutation ${R}${A} {
   ${C}${Z}${_}
@@ -21,4 +21,4 @@ ${G(Y,$,x)}
 ${G(Y,$,x)}
   }`;return{query:`mutation ${R}${Z} {
   ${C}${_}${V}
-}`,variables:{},operationName:R}}function D(E,x,$,Y){return{async query(J){let{select:C,where:H,limit:R,offset:X,orderBy:A}=J,Z=T(E,x,$,C,H!=null,A!=null,R!=null,X!=null),_={};if(H!=null)_.where=H;if(A!=null)_.orderBy=A;if(R!=null)_.limit=R;if(X!=null)_.offset=X;return(await Y(Z.query,_))[x.queryListName]},async querySingle(J){let{select:C,where:H,offset:R,orderBy:X}=J,A=d(E,x,$,C,H!=null,X!=null,R!=null),Z={};if(H!=null)Z.where=H;if(X!=null)Z.orderBy=X;if(R!=null)Z.offset=R;return(await Y(A.query,Z))[x.queryName]??null},async count(J){let C=J?.where,H=b(E,x,C!=null),R={};if(C!=null)R.where=C;return(await Y(H.query,R))[x.countName]},async insert(J){let{values:C,returning:H}=J,R=w(E,x,$,H,!1),X={values:C};return(await Y(R.query,X))[x.insertName]},async insertSingle(J){let{values:C,returning:H}=J,R=w(E,x,$,H,!0),X={values:C};return(await Y(R.query,X))[x.insertSingleName]??null},async update(J){let{set:C,where:H,returning:R}=J,X=v(E,x,$,R,H!=null),A={set:C};if(H!=null)A.where=H;return(await Y(X.query,A))[x.updateName]},async delete(J){let{where:C,returning:H}=J,R=g(E,x,$,H,C!=null),X={};if(C!=null)X.where=C;return(await Y(R.query,X))[x.deleteName]}}}class K extends Error{errors;status;constructor(E,x=200){let $=E.map((Y)=>Y.message).join("; ");super($);this.name="GraphQLClientError",this.errors=E,this.status=x}}class W extends Error{status;constructor(E,x){super(E);this.name="NetworkError",this.status=x}}import{getTableColumns as f,getTableName as h,is as z,Many as N,One as u,Relations as m,Table as l}from"drizzle-orm";var O=(E)=>E.charAt(0).toUpperCase()+E.slice(1);function k(E,x={}){let $=new Set(x.tables?.exclude??[]),Y=x.suffixes?.list??"s",J=new Map,C=new Map;for(let[A,Z]of Object.entries(E))if(z(Z,l)){if($.has(A))continue;let _=h(Z),V=Object.keys(f(Z));J.set(A,{table:Z,dbName:_,columns:V}),C.set(_,A)}let H=new Map;for(let A of Object.values(E)){if(!z(A,m))continue;let Z=h(A.table),_=C.get(Z);if(!_||!J.has(_))continue;let V={one:(U,F)=>{return new u(A.table,U,F,!1)},many:(U,F)=>{return new N(A.table,U,F)}},I=A.config(V),q={};for(let[U,F]of Object.entries(I)){let Q=F,P=Q.referencedTableName;if(!P)continue;let B=C.get(P);if(!B)continue;let o=z(Q,u)?"one":"many";q[U]={entity:B,type:o}}H.set(_,q)}let R=x.pruneRelations??{};for(let[A,Z]of H)for(let _ of Object.keys(Z)){let V=`${A}.${_}`;if(R[V]===!1)delete Z[_]}let X={};for(let[A,{columns:Z}]of J){let _=H.get(A)??{};X[A]={queryName:A,queryListName:`${A}${Y}`,countName:`${A}Count`,insertName:`insertInto${O(A)}`,insertSingleName:`insertInto${O(A)}Single`,updateName:`update${O(A)}`,deleteName:`deleteFrom${O(A)}`,fields:Z,relations:_}}return X}class M{url;schema;headers;constructor(E){this.url=E.url,this.schema=E.schema,this.headers=E.headers}entity(E){let x=this.schema[E];if(!x)throw Error(`Entity '${E}' not found in schema`);return D(E,x,this.schema,($,Y)=>this.execute($,Y))}async execute(E,x={}){let $=typeof this.url==="function"?this.url():this.url,Y={"Content-Type":"application/json",...typeof this.headers==="function"?await this.headers():this.headers??{}},J;try{J=await fetch($,{method:"POST",headers:Y,body:JSON.stringify({query:E,variables:x})})}catch(H){throw new W(H instanceof Error?H.message:"Network request failed",0)}if(!J.ok)throw new W(`HTTP ${J.status}: ${J.statusText}`,J.status);let C=await J.json();if(C.errors?.length)throw new K(C.errors,J.status);if(!C.data)throw new K([{message:"No data in response"}],J.status);return C.data}}function y(E){let x=k(E.schema,E.config);return new M({url:E.url,schema:x,headers:E.headers})}function HE(E){return new M(E)}export{y as createDrizzleClient,HE as createClient,k as buildSchemaDescriptor,W as NetworkError,K as GraphQLClientError,M as GraphQLClient};
+}`,variables:{},operationName:R}}function h(E,x,$,Y){return{async query(J){let{select:C,where:H,limit:R,offset:X,orderBy:A}=J,Z=T(E,x,$,C,H!=null,A!=null,R!=null,X!=null),_={};if(H!=null)_.where=H;if(A!=null)_.orderBy=A;if(R!=null)_.limit=R;if(X!=null)_.offset=X;return(await Y(Z.query,_))[x.queryListName]},async querySingle(J){let{select:C,where:H,offset:R,orderBy:X}=J,A=d(E,x,$,C,H!=null,X!=null,R!=null),Z={};if(H!=null)Z.where=H;if(X!=null)Z.orderBy=X;if(R!=null)Z.offset=R;return(await Y(A.query,Z))[x.queryName]??null},async count(J){let C=J?.where,H=b(E,x,C!=null),R={};if(C!=null)R.where=C;return(await Y(H.query,R))[x.countName]},async insert(J){let{values:C,returning:H}=J,R=Q(E,x,$,H,!1),X={values:C};return(await Y(R.query,X))[x.insertName]},async insertSingle(J){let{values:C,returning:H}=J,R=Q(E,x,$,H,!0),X={values:C};return(await Y(R.query,X))[x.insertSingleName]??null},async update(J){let{set:C,where:H,returning:R}=J,X=v(E,x,$,R,H!=null),A={set:C};if(H!=null)A.where=H;return(await Y(X.query,A))[x.updateName]},async delete(J){let{where:C,returning:H}=J,R=g(E,x,$,H,C!=null),X={};if(C!=null)X.where=C;return(await Y(R.query,X))[x.deleteName]}}}class K extends Error{errors;status;constructor(E,x=200){let $=E.map((Y)=>Y.message).join("; ");super($);this.name="GraphQLClientError",this.errors=E,this.status=x}}class W extends Error{status;constructor(E,x){super(E);this.name="NetworkError",this.status=x}}import{getTableColumns as f,getTableName as D,is as w,Many as N,One as u,Relations as m,Table as l}from"drizzle-orm";var z=(E)=>E.charAt(0).toUpperCase()+E.slice(1);function k(E,x={}){let $=new Set(x.tables?.exclude??[]),Y=x.suffixes?.list??"s",J=new Map,C=new Map;for(let[A,Z]of Object.entries(E))if(w(Z,l)){if($.has(A))continue;let _=D(Z),V=Object.keys(f(Z));J.set(A,{table:Z,dbName:_,columns:V}),C.set(_,A)}let H=new Map;for(let A of Object.values(E)){if(!w(A,m))continue;let Z=D(A.table),_=C.get(Z);if(!_||!J.has(_))continue;let V={one:(U,F)=>{return new u(A.table,U,F,!1)},many:(U,F)=>{return new N(A.table,U,F)}},I=A.config(V),q={};for(let[U,F]of Object.entries(I)){let O=F,P=O.referencedTableName;if(!P)continue;let B=C.get(P);if(!B)continue;let o=w(O,u)?"one":"many";q[U]={entity:B,type:o}}H.set(_,q)}let R=x.pruneRelations??{};for(let[A,Z]of H)for(let _ of Object.keys(Z)){let V=`${A}.${_}`;if(R[V]===!1)delete Z[_]}let X={};for(let[A,{columns:Z}]of J){let _=H.get(A)??{};X[A]={queryName:A,queryListName:`${A}${Y}`,countName:`${A}Count`,insertName:`insertInto${z(A)}`,insertSingleName:`insertInto${z(A)}Single`,updateName:`update${z(A)}`,deleteName:`deleteFrom${z(A)}`,fields:Z,relations:_}}return X}class M{url;schema;headers;constructor(E){this.url=E.url,this.schema=E.schema,this.headers=E.headers}entity(E){let x=this.schema[E];if(!x)throw Error(`Entity '${E}' not found in schema`);return h(E,x,this.schema,($,Y)=>this.execute($,Y))}async execute(E,x={}){let $=typeof this.url==="function"?this.url():this.url,Y={"Content-Type":"application/json",...typeof this.headers==="function"?await this.headers():this.headers??{}},J;try{J=await fetch($,{method:"POST",headers:Y,body:JSON.stringify({query:E,variables:x})})}catch(H){throw new W(H instanceof Error?H.message:"Network request failed",0)}if(!J.ok)throw new W(`HTTP ${J.status}: ${J.statusText}`,J.status);let C=await J.json();if(C.errors?.length)throw new K(C.errors,J.status);if(!C.data)throw new K([{message:"No data in response"}],J.status);return C.data}}function y(E){let x=k(E.schema,E.config);return new M({url:E.url,schema:x,headers:E.headers})}function HE(E){return new M(E)}export{y as createDrizzleClient,HE as createClient,k as buildSchemaDescriptor,W as NetworkError,K as GraphQLClientError,M as GraphQLClient};

package/infer.d.ts

@@ -47,14 +47,15 @@ type ManyRelationFilter<TFilter> = {
 type IsResolvableRelation<TSchema, TRel> = TRel extends {
     entity: infer E;
 } ? E extends string ? KeyForDbName<TSchema, E> extends keyof ExtractTables<TSchema> ? true : false : false : false;
-type InferRelationFilterFields<TSchema, TRels> = {
+type Prev<T extends unknown[]> = T extends [unknown, ...infer Rest] ? Rest : [];
+type InferRelationFilterFields<TSchema, TRels, TDepth extends unknown[]> = {
     [K in keyof TRels as IsResolvableRelation<TSchema, TRels[K]> extends true ? K : never]?: TRels[K] extends {
         entity: infer E;
         type: infer TRelType;
-    } ? E extends string ? KeyForDbName<TSchema, E> extends infer RK ? RK extends keyof ExtractTables<TSchema> ? ExtractTables<TSchema>[RK] extends infer TTarget ? TTarget extends Table ? TRelType extends 'many' ? ManyRelationFilter<InferEntityFilters<TSchema, TTarget>> : InferEntityFilters<TSchema, TTarget> : never : never : never : never : never : never;
+    } ? E extends string ? KeyForDbName<TSchema, E> extends infer RK ? RK extends keyof ExtractTables<TSchema> ? ExtractTables<TSchema>[RK] extends infer TTarget ? TTarget extends Table ? TRelType extends 'many' ? ManyRelationFilter<InferEntityFilters<TSchema, TTarget, Prev<TDepth>>> : InferEntityFilters<TSchema, TTarget, Prev<TDepth>> : never : never : never : never : never : never;
 };
-type InferEntityFilters<TSchema, T extends Table> = ScalarColumnFilters<WireFormat<T['$inferSelect']>> & InferRelationFilterFields<TSchema, InferRelationDefs<TSchema, TableDbName<T>>> & {
-    OR?: InferEntityFilters<TSchema, T>[];
+type InferEntityFilters<TSchema, T extends Table, TDepth extends unknown[] = [0]> = ScalarColumnFilters<WireFormat<T['$inferSelect']>> & (TDepth extends [] ? {} : InferRelationFilterFields<TSchema, InferRelationDefs<TSchema, TableDbName<T>>, TDepth>) & {
+    OR?: InferEntityFilters<TSchema, T, TDepth>[];
 };
 type InferInsertInput<T> = T extends Table ? WireFormat<T['$inferInsert']> : never;
 type InferUpdateInput<T> = T extends Table ? {
@@ -71,6 +72,10 @@ type ExcludedNames<TConfig> = TConfig extends {
         exclude: readonly (infer T)[];
     };
 } ? T : never;
+type NumberToTuple<N extends number, T extends unknown[] = []> = T['length'] extends N ? T : T['length'] extends 5 ? T : NumberToTuple<N, [...T, 0]>;
+type ExtractFilterDepth<TConfig> = TConfig extends {
+    limitRelationDepth: infer D;
+} ? D extends number ? number extends D ? [0] : NumberToTuple<D> : [0] : [0];
 type TableDbName<T> = T extends Table<infer TConfig> ? TConfig['name'] extends string ? TConfig['name'] : string : string;
 type DbNameToKey<TSchema> = {
     [K in keyof ExtractTables<TSchema>]: TableDbName<ExtractTables<TSchema>[K]>;
@@ -88,15 +93,15 @@ type ResolveRelationDefs<TSchema, TRels> = {
         type: T;
     } : TRels[K] : TRels[K];
 };
-type BuildEntityDef<TSchema, T> = T extends Table ? {
+type BuildEntityDef<TSchema, T, TDepth extends unknown[]> = T extends Table ? {
     fields: WireFormat<T['$inferSelect']>;
     relations: ResolveRelationDefs<TSchema, InferRelationDefs<TSchema, TableDbName<T>>>;
-    filters: InferEntityFilters<TSchema, T>;
+    filters: InferEntityFilters<TSchema, T, TDepth>;
     insertInput: InferInsertInput<T>;
     updateInput: InferUpdateInput<T>;
     orderBy: InferOrderBy<T>;
 } : never;
 export type InferEntityDefs<TSchema, TConfig = Record<string, never>> = {
-    [K in keyof ExtractTables<TSchema> as K extends ExcludedNames<TConfig> ? never : K extends string ? K : never]: BuildEntityDef<TSchema, ExtractTables<TSchema>[K]>;
+    [K in keyof ExtractTables<TSchema> as K extends ExcludedNames<TConfig> ? never : K extends string ? K : never]: BuildEntityDef<TSchema, ExtractTables<TSchema>[K], ExtractFilterDepth<TConfig>>;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drizzle-graphql-suite/client",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Type-safe GraphQL client with entity-based API and full Drizzle type inference",
   "license": "MIT",
   "author": "https://github.com/dmythro",
@@ -32,6 +32,7 @@
     }
   },
   "peerDependencies": {
+    "@drizzle-graphql-suite/schema": ">=0.8.0",
     "drizzle-orm": ">=0.44.0"
   }
 }

package/schema-builder.d.ts

@@ -1,15 +1,3 @@
+import type { BuildSchemaConfig } from '@drizzle-graphql-suite/schema';
 import type { SchemaDescriptor } from './types';
-export type ClientSchemaConfig = {
-    mutations?: boolean;
-    suffixes?: {
-        list?: string;
-        single?: string;
-    };
-    tables?: {
-        exclude?: readonly string[];
-    };
-    pruneRelations?: Record<string, false | 'leaf' | {
-        only: string[];
-    }>;
-};
-export declare function buildSchemaDescriptor(schema: Record<string, unknown>, config?: ClientSchemaConfig): SchemaDescriptor;
+export declare function buildSchemaDescriptor(schema: Record<string, unknown>, config?: BuildSchemaConfig): SchemaDescriptor;