drizzle-graphql-plus 0.8.16 → 0.8.18

package/index.d.cts

@@ -379,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$1 as 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

@@ -379,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$1 as 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

@@ -2263,6 +2263,7 @@ import { SQLiteInteger as SQLiteInteger2 } from "drizzle-orm/sqlite-core";
 var allowedNameChars2 = /^[a-zA-Z0-9_]+$/;
 var customScalars = /* @__PURE__ */ new Set();
 var enumDefinitions = /* @__PURE__ */ new Map();
+var requiredFieldFilters = /* @__PURE__ */ new Set();
 var columnToSDL = (column, columnName, tableName, forceNullable = false) => {
   let baseType;
   if (column.customGraphqlType) {
@@ -2398,6 +2399,7 @@ var generateTypeDefs = (tables, relations) => {
   const typeDefs = [];
   customScalars.clear();
   enumDefinitions.clear();
+  requiredFieldFilters.clear();
   for (const [tableName, tableInfo] of Object.entries(tables)) {
     const typeName = capitalize(tableName);
     const fields = [];
@@ -2469,6 +2471,7 @@ ${insertFields.join("\n")}
 ${updateFields.join("\n")}
 }`
     );
+    const whereFields = [];
     for (const [columnName, column] of Object.entries(tableInfo.columns)) {
       const typeStr = columnToSDL(
         column,
@@ -2476,47 +2479,14 @@ ${updateFields.join("\n")}
         tableName,
         true
       );
-      const filterName = `${typeName}${capitalize(columnName)}Filters`;
-      const filterFields = [];
-      filterFields.push(`  eq: ${typeStr}`);
-      filterFields.push(`  ne: ${typeStr}`);
-      filterFields.push(`  lt: ${typeStr}`);
-      filterFields.push(`  lte: ${typeStr}`);
-      filterFields.push(`  gt: ${typeStr}`);
-      filterFields.push(`  gte: ${typeStr}`);
-      filterFields.push(`  like: String`);
-      filterFields.push(`  notLike: String`);
-      filterFields.push(`  ilike: String`);
-      filterFields.push(`  notIlike: String`);
-      filterFields.push(`  inArray: [${typeStr}!]`);
-      filterFields.push(`  notInArray: [${typeStr}!]`);
-      filterFields.push(`  isNull: Boolean`);
-      filterFields.push(`  isNotNull: Boolean`);
-      const orFilterName = `${typeName}${capitalize(columnName)}FiltersOr`;
-      typeDefs.push(`input ${orFilterName} {
-${filterFields.join("\n")}
-}`);
-      filterFields.push(`  OR: [${orFilterName}!]`);
-      typeDefs.push(`input ${filterName} {
-${filterFields.join("\n")}
-}`);
-    }
-    const whereFields = [];
-    for (const columnName of Object.keys(tableInfo.columns)) {
-      const filterName = `${typeName}${capitalize(columnName)}Filters`;
-      whereFields.push(`  ${columnName}: ${filterName}`);
-    }
-    whereFields.push(`  OR: [${typeName}FiltersOr!]`);
-    const filtersOrFields = [];
-    for (const columnName of Object.keys(tableInfo.columns)) {
-      const filterName = `${typeName}${capitalize(columnName)}Filters`;
-      filtersOrFields.push(`  ${columnName}: ${filterName}`);
+      const normalizedType = typeStr.replace(/[^a-zA-Z0-9]/g, "");
+      const filterTypeName = `${normalizedType}FieldFilter`;
+      requiredFieldFilters.add(
+        JSON.stringify({ normalizedType, baseType: typeStr })
+      );
+      whereFields.push(`  ${columnName}: ${filterTypeName}`);
     }
-    typeDefs.push(
-      `input ${typeName}FiltersOr {
-${filtersOrFields.join("\n")}
-}`
-    );
+    whereFields.push(`  OR: [${typeName}Filters!]`);
     typeDefs.push(`input ${typeName}Filters {
 ${whereFields.join("\n")}
 }`);
@@ -2550,6 +2520,33 @@ ${valueStrings.join("\n")}
   direction: OrderByDirection!
   priority: Int!
 }`);
+  const filterTypesAdded = /* @__PURE__ */ new Set();
+  for (const filterInfoJson of requiredFieldFilters) {
+    const { normalizedType, baseType } = JSON.parse(filterInfoJson);
+    const filterTypeName = `${normalizedType}FieldFilter`;
+    if (filterTypesAdded.has(filterTypeName))
+      continue;
+    filterTypesAdded.add(filterTypeName);
+    const filterFields = [];
+    filterFields.push(`  eq: ${baseType}`);
+    filterFields.push(`  ne: ${baseType}`);
+    filterFields.push(`  lt: ${baseType}`);
+    filterFields.push(`  lte: ${baseType}`);
+    filterFields.push(`  gt: ${baseType}`);
+    filterFields.push(`  gte: ${baseType}`);
+    filterFields.push(`  like: String`);
+    filterFields.push(`  notLike: String`);
+    filterFields.push(`  ilike: String`);
+    filterFields.push(`  notIlike: String`);
+    filterFields.push(`  inArray: [${baseType}!]`);
+    filterFields.push(`  notInArray: [${baseType}!]`);
+    filterFields.push(`  isNull: Boolean`);
+    filterFields.push(`  isNotNull: Boolean`);
+    filterFields.push(`  OR: [${filterTypeName}!]`);
+    allDefs.push(`input ${filterTypeName} {
+${filterFields.join("\n")}
+}`);
+  }
   allDefs.push(...typeDefs);
   return allDefs.join("\n\n");
 };