@drizzle-graphql-suite/schema 0.7.0 → 0.8.0

package/index.js

@@ -1191,16 +1191,22 @@ class SchemaBuilder {
       delete operators.OR;
     const entries = Object.entries(operators);
     if (operators.OR) {
-      if (entries.length > 1) {
-        throw new GraphQLError2(`WHERE ${columnName}: Cannot specify both fields and 'OR' in column operators!`);
-      }
-      const variants2 = [];
+      const orVariants = [];
       for (const variant of operators.OR) {
         const extracted = this.extractColumnFilters(column, columnName, variant);
         if (extracted)
-          variants2.push(extracted);
+          orVariants.push(extracted);
       }
-      return variants2.length ? variants2.length > 1 ? or(...variants2) : variants2[0] : undefined;
+      const orClause = orVariants.length > 1 ? or(...orVariants) : orVariants.length === 1 ? orVariants[0] : undefined;
+      if (entries.length <= 1)
+        return orClause;
+      const { OR: _, ...rest } = operators;
+      const fieldClause = this.extractColumnFilters(column, columnName, rest);
+      if (!fieldClause)
+        return orClause;
+      if (!orClause)
+        return fieldClause;
+      return and(fieldClause, orClause);
     }
     const comparisonOps = { eq, ne, gt, gte, lt, lte };
     const stringOps = { like, notLike, ilike, notIlike };
@@ -1258,16 +1264,22 @@ class SchemaBuilder {
       }
     }
     if (filters.OR) {
-      if (columnEntries.length > 0 || relationEntries.length > 0) {
-        throw new GraphQLError2(`WHERE ${tableName}: Cannot specify both fields and 'OR' in table filters!`);
-      }
-      const variants2 = [];
+      const orVariants = [];
       for (const variant of filters.OR) {
         const extracted = this.extractAllFilters(table, tableName, variant);
         if (extracted)
-          variants2.push(extracted);
+          orVariants.push(extracted);
       }
-      return variants2.length ? variants2.length > 1 ? or(...variants2) : variants2[0] : undefined;
+      const orClause = orVariants.length > 1 ? or(...orVariants) : orVariants.length === 1 ? orVariants[0] : undefined;
+      if (columnEntries.length === 0 && relationEntries.length === 0)
+        return orClause;
+      const { OR: _, ...rest } = filters;
+      const fieldClause = this.extractAllFilters(table, tableName, rest);
+      if (!fieldClause)
+        return orClause;
+      if (!orClause)
+        return fieldClause;
+      return and(fieldClause, orClause);
     }
     const variants = [];
     for (const [columnName, operators] of columnEntries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drizzle-graphql-suite/schema",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "GraphQL schema builder with CRUD operations, relation filtering, and hooks from Drizzle ORM",
   "license": "MIT",
   "author": "https://github.com/dmythro",

package/schema-builder.d.ts

@@ -1,12 +1,16 @@
-import { type PgDatabase } from 'drizzle-orm/pg-core';
+import type { Column, Relation, Table, TablesRelationalConfig } from 'drizzle-orm';
+import { type SQL } from 'drizzle-orm';
+import { type PgDatabase, PgTable } from 'drizzle-orm/pg-core';
 import { GraphQLSchema } from 'graphql';
+import type { ResolveTree } from 'graphql-parse-resolve-info';
+import { type TableNamedRelations } from './data-mappers';
 import type { BuildSchemaConfig, GeneratedEntities, PermissionConfig } from './types';
 export declare class SchemaBuilder {
-    private db;
-    private tables;
-    private relationMap;
-    private relationalSchema;
-    private tableNamesMap;
+    protected db: PgDatabase<any, any, any>;
+    protected tables: Record<string, PgTable>;
+    protected relationMap: Record<string, Record<string, TableNamedRelations>>;
+    protected relationalSchema: TablesRelationalConfig;
+    protected tableNamesMap: Record<string, string>;
     private config;
     private hooks;
     private adapter;
@@ -50,15 +54,15 @@ export declare class SchemaBuilder {
     private createInsertSingleResolver;
     private createUpdateResolver;
     private createDeleteResolver;
-    private extractColumnFilters;
-    private extractTableColumnFilters;
+    protected extractColumnFilters(column: Column, columnName: string, operators: any): SQL | undefined;
+    protected extractTableColumnFilters(table: Table, tableName: string, filters: any): SQL | undefined;
     /** Combined filter extraction: column filters + relation filters */
     private extractAllFilters;
-    private extractRelationFilters;
-    private buildExistsSubquery;
-    private buildJoinCondition;
-    private extractOrderBy;
-    private extractColumns;
+    protected extractRelationFilters(table: Table, tableName: string, relationName: string, filterValue: any): SQL | undefined;
+    protected buildExistsSubquery(parentTable: Table, targetTable: Table, relation: Relation, targetTableName: string, filterValue: any, quantifier: 'some' | 'every' | 'none'): SQL | undefined;
+    protected buildJoinCondition(parentTable: Table, _targetTable: Table, relation: Relation): SQL | undefined;
+    protected extractOrderBy(table: Table, orderArgs: any): SQL[];
+    protected extractColumns(tree: Record<string, ResolveTree>, table: Table): Record<string, true>;
     private extractColumnsSQLFormat;
     private getFieldsByTypeName;
     private extractRelationsParams;