@vantreeseba/drizzle-graphql 5.0.0 → 5.2.0

package/dist/index.d.cts

@@ -57,12 +57,24 @@ type FilterColumnOperatorsCore<TColumn extends Column, TColType = GetColumnGqlDa
     notIlike: string;
     startsWith: string;
     endsWith: string;
-    contains: string;
+    /**
+     * String columns: safe substring match (`%`, `_` and `\` matched literally).
+     * JSON columns: structural containment (Postgres `@>` / MySQL JSON_CONTAINS).
+     */
+    contains: string | TColType;
     iStartsWith: string;
     iEndsWith: string;
     iContains: string;
     inArray: Array<TColType>;
     notInArray: Array<TColType>;
+    /** Array columns only: the array contains this element. */
+    has: TColType extends Array<infer TElement> ? TElement : never;
+    /** Array columns only: the array overlaps these elements (`&&`). */
+    hasSome: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: the array contains all of these elements (`@>`). */
+    hasEvery: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: when true, matches arrays with no elements. */
+    isEmpty: boolean;
     isNull: boolean;
     isNotNull: boolean;
 }>;

package/dist/index.d.ts

@@ -57,12 +57,24 @@ type FilterColumnOperatorsCore<TColumn extends Column, TColType = GetColumnGqlDa
     notIlike: string;
     startsWith: string;
     endsWith: string;
-    contains: string;
+    /**
+     * String columns: safe substring match (`%`, `_` and `\` matched literally).
+     * JSON columns: structural containment (Postgres `@>` / MySQL JSON_CONTAINS).
+     */
+    contains: string | TColType;
     iStartsWith: string;
     iEndsWith: string;
     iContains: string;
     inArray: Array<TColType>;
     notInArray: Array<TColType>;
+    /** Array columns only: the array contains this element. */
+    has: TColType extends Array<infer TElement> ? TElement : never;
+    /** Array columns only: the array overlaps these elements (`&&`). */
+    hasSome: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: the array contains all of these elements (`@>`). */
+    hasEvery: TColType extends Array<infer TElement> ? Array<TElement> : never;
+    /** Array columns only: when true, matches arrays with no elements. */
+    isEmpty: boolean;
     isNull: boolean;
     isNotNull: boolean;
 }>;

package/dist/index.js

@@ -12,6 +12,8 @@ import {
 import {
   aliasedTable,
   and,
+  arrayContains,
+  arrayOverlaps,
   asc,
   desc,
   eq,
@@ -416,6 +418,21 @@ var geoXyInputType = new GraphQLInputObjectType({
   }
 });
 var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
+  const dimensions = column.dimensions;
+  if (dimensions !== void 0 && dimensions > 0) {
+    const inner = columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+    const innerDesc = inner.description ?? inner.type.name;
+    let type = inner.type;
+    let description = innerDesc;
+    for (let i = 0; i < dimensions; i++) {
+      type = new GraphQLList(new GraphQLNonNull(type));
+      description = `Array<${description}>`;
+    }
+    return { type, description };
+  }
+  return columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+};
+var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
   const { type: baseType, constraint } = extractExtendedColumnType(column);
   switch (baseType) {
     case "boolean":
@@ -447,28 +464,10 @@ var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
       if (column instanceof PgDateString) {
         return isInput ? { type: GraphQLString, description: "Date" } : { type: GraphQLDate, description: "Date" };
       }
-      {
-        const dims = column.dimensions;
-        if (dims !== void 0 && dims > 0) {
-          return {
-            type: new GraphQLList(new GraphQLNonNull(GraphQLString)),
-            description: "Array<String>"
-          };
-        }
-      }
       return { type: GraphQLString, description: "String" };
     case "bigint":
       return { type: GraphQLBigIntString, description: "BigInt" };
     case "number": {
-      const dims = column.dimensions;
-      if (dims !== void 0 && dims > 0) {
-        const baseDesc = is2(column, PgInteger) || is2(column, PgSerial) ? "Integer" : "Float";
-        const baseType2 = baseDesc === "Integer" ? GraphQLInt : GraphQLFloat;
-        return {
-          type: new GraphQLList(new GraphQLNonNull(baseType2)),
-          description: `Array<${baseDesc}>`
-        };
-      }
       return is2(column, PgInteger) || is2(column, PgSerial) || is2(column, MySqlInt) || is2(column, MySqlSerial) || is2(column, SQLiteInteger) ? { type: GraphQLInt, description: "Integer" } : { type: GraphQLFloat, description: "Float" };
     }
     case "array": {
@@ -813,45 +812,95 @@ var innerOrder = new GraphQLInputObjectType2({
     }
   }
 });
-var resolveGenericFilterName = (column, columnName, columnGraphQLType) => {
-  if (columnName === "id" || columnName.endsWith("Id")) {
-    return "Id";
+var columnDialect = (column) => {
+  const ct = column.columnType ?? "";
+  if (ct.startsWith("Pg")) {
+    return "pg";
+  }
+  if (ct.startsWith("MySql")) {
+    return "mysql";
+  }
+  if (ct.startsWith("SQLite")) {
+    return "sqlite";
+  }
+  return void 0;
+};
+var resolveGenericFilterDescriptor = (column, columnGraphQLType) => {
+  if (columnGraphQLType.type === GraphQLJSON) {
+    return { name: "JSON", kind: "json" };
+  }
+  if (columnGraphQLType.type instanceof GraphQLList2) {
+    let element = columnGraphQLType.type.ofType;
+    if (element instanceof GraphQLNonNull2) {
+      element = element.ofType;
+    }
+    return { name: `${element.name}Array`, kind: "array" };
+  }
+  if (columnGraphQLType.type === GraphQLUUID) {
+    return { name: "Id", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLBoolean2) {
-    return "Boolean";
+    return { name: "Boolean", kind: "scalar" };
   }
   if (columnGraphQLType.type instanceof GraphQLEnumType2) {
-    return columnGraphQLType.type.name;
+    return { name: columnGraphQLType.type.name, kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLBigIntString) {
-    return "BigInt";
+    return { name: "BigInt", kind: "scalar" };
   }
   if (columnGraphQLType.type === GraphQLDecimalString) {
-    return "Decimal";
-  }
-  if (columnGraphQLType.type instanceof GraphQLList2) {
-    const desc2 = columnGraphQLType.description ?? "";
-    let inner = columnGraphQLType.type.ofType;
-    if (inner instanceof GraphQLNonNull2) {
-      inner = inner.ofType;
-    }
-    if (desc2.includes("Integer") || inner === GraphQLInt2) {
-      return "IntArray";
-    }
-    if (desc2.includes("Float") || inner === GraphQLFloat2) {
-      return "FloatArray";
-    }
-    return "StringArray";
+    return { name: "Decimal", kind: "scalar" };
   }
   const ct = column.columnType ?? "";
   if (ct === "PgTimestamp" || ct === "PgTimestampString" || ct === "PgDate") {
-    return "DateTime";
+    return { name: "DateTime", kind: "scalar" };
   }
-  return "String";
+  if (columnGraphQLType.type === GraphQLInt2) {
+    return { name: "Int", kind: "scalar" };
+  }
+  if (columnGraphQLType.type === GraphQLFloat2) {
+    return { name: "Float", kind: "scalar" };
+  }
+  return { name: "String", kind: "scalar" };
 };
+var jsonFilterFields = (column, colType) => {
+  const dialect = columnDialect(column);
+  return {
+    eq: { type: colType, description: "JSON equality on the whole value" },
+    ne: { type: colType, description: "JSON inequality on the whole value" },
+    ...dialect === "pg" || dialect === "mysql" ? {
+      contains: {
+        type: colType,
+        description: "Value structurally contains this JSON (Postgres `@>` / MySQL JSON_CONTAINS)"
+      }
+    } : {},
+    isNull: { type: GraphQLBoolean2 },
+    isNotNull: { type: GraphQLBoolean2 }
+  };
+};
+var arrayFilterFields = (colType, colArr, colDesc) => {
+  let element = colType.ofType;
+  if (element instanceof GraphQLNonNull2) {
+    element = element.ofType;
+  }
+  const elementList = new GraphQLList2(new GraphQLNonNull2(element));
+  return {
+    eq: { type: colType, description: colDesc },
+    ne: { type: colType, description: colDesc },
+    has: { type: element, description: "Array contains this element" },
+    hasSome: { type: elementList, description: "Array contains at least one of these elements (overlap, `&&`)" },
+    hasEvery: { type: elementList, description: "Array contains every one of these elements (containment, `@>`)" },
+    isEmpty: { type: GraphQLBoolean2, description: "When true, matches arrays with no elements" },
+    inArray: { type: colArr, description: `Array<${colDesc}>` },
+    notInArray: { type: colArr, description: `Array<${colDesc}>` },
+    isNull: { type: GraphQLBoolean2 },
+    isNotNull: { type: GraphQLBoolean2 }
+  };
+};
+var FILTERS_WITHOUT_STRING_OPS = /* @__PURE__ */ new Set(["Id", "Int", "Float", "BigInt", "Decimal"]);
 var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const columnGraphQLType = drizzleColumnToGraphQLType(column, columnName, tableName, true, false, true);
-  const genericName = resolveGenericFilterName(column, columnName, columnGraphQLType);
+  const { name: genericName, kind } = resolveGenericFilterDescriptor(column, columnGraphQLType);
   const cached = cacheCtx.genericFilterCache.get(genericName);
   if (cached) {
     return cached;
@@ -859,8 +908,8 @@ var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const colType = columnGraphQLType.type;
   const colDesc = columnGraphQLType.description;
   const colArr = new GraphQLList2(new GraphQLNonNull2(colType));
-  const omitStringOps = genericName === "Id" || genericName === "BigInt" || genericName === "Decimal";
-  const baseFields = {
+  const omitStringOps = FILTERS_WITHOUT_STRING_OPS.has(genericName);
+  const baseFields = kind === "json" ? jsonFilterFields(column, colType) : kind === "array" ? arrayFilterFields(colType, colArr, colDesc) : {
     eq: { type: colType, description: colDesc },
     ne: { type: colType, description: colDesc },
     lt: { type: colType, description: colDesc },
@@ -1433,12 +1482,28 @@ var safeLikeCondition = (column, pattern, insensitive) => {
   const isPg = (column.columnType ?? "").startsWith("Pg");
   return isPg ? sql`${column} ilike ${pattern} escape ${LIKE_ESCAPE_CHAR}` : sql`lower(${column}) like ${pattern.toLowerCase()} escape ${LIKE_ESCAPE_CHAR}`;
 };
+var isJsonColumn2 = (column) => (column.columnType ?? "").includes("Json");
+var jsonContains = (column, columnName, value) => {
+  const serialized = JSON.stringify(value);
+  switch (columnDialect(column)) {
+    case "pg":
+      return column.columnType === "PgJson" ? sql`${column}::jsonb @> ${serialized}::jsonb` : sql`${column} @> ${serialized}::jsonb`;
+    case "mysql":
+      return sql`json_contains(${column}, ${serialized})`;
+    default:
+      throw new GraphQLError3(`WHERE ${columnName}: Operator 'contains' is not supported for this dialect!`);
+  }
+};
 var extractFiltersColumn = (column, columnName, operators) => {
   const { OR, AND, NOT, ...restOperators } = operators;
   const entries = Object.entries(restOperators);
   const singleValueOps = { eq, ne, gt, gte, lt, lte };
   const stringValueOps = { like, notLike, ilike, notIlike };
   const arrayValueOps = { inArray, notInArray };
+  const arrayMembershipOps = {
+    hasSome: arrayOverlaps,
+    hasEvery: arrayContains
+  };
   const nullableOps = { isNull, isNotNull };
   const variants = [];
   for (const [operatorName, operatorValue] of entries) {
@@ -1450,6 +1515,8 @@ var extractFiltersColumn = (column, columnName, operators) => {
       variants.push(singleValueOps[operatorName](column, singleValue));
     } else if (operatorName in stringValueOps) {
       variants.push(stringValueOps[operatorName](column, operatorValue));
+    } else if (operatorName === "contains" && isJsonColumn2(column)) {
+      variants.push(jsonContains(column, columnName, operatorValue));
     } else if (operatorName in safeLikeOps) {
       const { buildPattern, insensitive } = safeLikeOps[operatorName];
       variants.push(safeLikeCondition(column, buildPattern(operatorValue), insensitive));
@@ -1459,6 +1526,15 @@ var extractFiltersColumn = (column, columnName, operators) => {
       }
       const arrayValue = operatorValue.map((val) => remapFromGraphQLCore(val, column, columnName));
       variants.push(arrayValueOps[operatorName](column, arrayValue));
+    } else if (operatorName === "has") {
+      variants.push(arrayContains(column, [operatorValue]));
+    } else if (operatorName in arrayMembershipOps) {
+      if (!operatorValue.length) {
+        throw new GraphQLError3(`WHERE ${columnName}: Unable to use operator ${operatorName} with an empty array!`);
+      }
+      variants.push(arrayMembershipOps[operatorName](column, operatorValue));
+    } else if (operatorName === "isEmpty") {
+      variants.push(sql`cardinality(${column}) = 0`);
     } else if (operatorName in nullableOps) {
       variants.push(nullableOps[operatorName](column));
     } else {