@drizzle-graphql-suite/client 0.7.0 → 0.8.0

package/infer.d.ts

@@ -9,9 +9,10 @@ type ExtractTables<TSchema> = {
 type FindRelationConfig<TSchema, TTableName extends string> = {
     [K in keyof TSchema]: TSchema[K] extends Relations<TTableName, infer TConfig> ? TConfig : never;
 }[keyof TSchema];
-type MapRelation<T> = T extends One<infer N, infer _TNullable> ? {
+type MapRelation<T> = T extends One<infer N, infer TIsNullable> ? {
     entity: N;
     type: 'one';
+    required: TIsNullable;
 } : T extends Many<infer N> ? {
     entity: N;
     type: 'many';
@@ -35,10 +36,25 @@ type ScalarFilterOps<T> = {
     isNull?: boolean | null;
     isNotNull?: boolean | null;
 };
-type InferFilters<TFields> = {
+type ScalarColumnFilters<TFields> = {
     [K in keyof TFields]?: ScalarFilterOps<NonNullable<TFields[K]>>;
-} & {
-    OR?: InferFilters<TFields>[];
+};
+type ManyRelationFilter<TFilter> = {
+    some?: TFilter;
+    every?: TFilter;
+    none?: 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> = {
+    [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;
+};
+type InferEntityFilters<TSchema, T extends Table> = ScalarColumnFilters<WireFormat<T['$inferSelect']>> & InferRelationFilterFields<TSchema, InferRelationDefs<TSchema, TableDbName<T>>> & {
+    OR?: InferEntityFilters<TSchema, T>[];
 };
 type InferInsertInput<T> = T extends Table ? WireFormat<T['$inferInsert']> : never;
 type InferUpdateInput<T> = T extends Table ? {
@@ -67,7 +83,7 @@ type ResolveRelationDefs<TSchema, TRels> = {
     [K in keyof TRels]: TRels[K] extends {
         entity: infer E;
         type: infer T;
-    } ? E extends string ? {
+    } ? E extends string ? Omit<TRels[K], 'entity'> & {
         entity: ResolveRelationEntity<TSchema, E>;
         type: T;
     } : TRels[K] : TRels[K];
@@ -75,7 +91,7 @@ type ResolveRelationDefs<TSchema, TRels> = {
 type BuildEntityDef<TSchema, T> = T extends Table ? {
     fields: WireFormat<T['$inferSelect']>;
     relations: ResolveRelationDefs<TSchema, InferRelationDefs<TSchema, TableDbName<T>>>;
-    filters: InferFilters<WireFormat<T['$inferSelect']>>;
+    filters: InferEntityFilters<TSchema, T>;
     insertInput: InferInsertInput<T>;
     updateInput: InferUpdateInput<T>;
     orderBy: InferOrderBy<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drizzle-graphql-suite/client",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Type-safe GraphQL client with entity-based API and full Drizzle type inference",
   "license": "MIT",
   "author": "https://github.com/dmythro",

package/types.d.ts

@@ -1,6 +1,7 @@
 export type RelationDef = {
     entity: string;
     type: 'one' | 'many';
+    required?: boolean;
 };
 export type EntityDef = {
     fields: Record<string, unknown>;
@@ -35,7 +36,7 @@ type Simplify<T> = {
 export type InferResult<TDefs extends AnyEntityDefs, TEntity extends EntityDef, TSelect> = Simplify<InferScalars<TEntity, TSelect> & InferRelations<TDefs, TEntity, TSelect>>;
 type InferScalars<TEntity extends EntityDef, TSelect> = Pick<TEntity['fields'], keyof TSelect & keyof TEntity['fields']>;
 type InferRelations<TDefs extends AnyEntityDefs, TEntity extends EntityDef, TSelect> = {
-    [K in keyof TSelect & keyof TEntity['relations'] as TSelect[K] extends Record<string, unknown> ? K : never]: TEntity['relations'][K] extends RelationDef ? TEntity['relations'][K]['entity'] extends keyof TDefs ? TEntity['relations'][K]['type'] extends 'many' ? InferResult<TDefs, TDefs[TEntity['relations'][K]['entity']], TSelect[K]>[] : InferResult<TDefs, TDefs[TEntity['relations'][K]['entity']], TSelect[K]> | null : never : never;
+    [K in keyof TSelect & keyof TEntity['relations'] as TSelect[K] extends Record<string, unknown> ? K : never]: TEntity['relations'][K] extends RelationDef ? TEntity['relations'][K]['entity'] extends keyof TDefs ? TEntity['relations'][K]['type'] extends 'many' ? InferResult<TDefs, TDefs[TEntity['relations'][K]['entity']], TSelect[K]>[] : TEntity['relations'][K]['required'] extends true ? InferResult<TDefs, TDefs[TEntity['relations'][K]['entity']], TSelect[K]> : InferResult<TDefs, TDefs[TEntity['relations'][K]['entity']], TSelect[K]> | null : never : never;
 };
 export type ClientConfig<TSchema extends SchemaDescriptor = SchemaDescriptor> = {
     url: string | (() => string);