drizzle-graphql-plus 0.8.17 → 0.8.19

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) {
@@ -2345,7 +2346,7 @@ var columnToSDL = (column, columnName, tableName, forceNullable = false) => {
         break;
     }
   }
-  if (!forceNullable && column.notNull && !column.hasDefault && !column.defaultFn) {
+  if (!forceNullable && column.notNull) {
     return `${baseType}!`;
   }
   return baseType;
@@ -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");
 };