supabase-typed-query 0.11.0 → 0.13.0

package/dist/index.mjs

@@ -68,7 +68,7 @@ const QueryBuilder = (client, config) => {
     return finalQuery;
   };
   const applyCondition = (query2, condition) => {
-    const { where, is, wherein, gt, gte, lt, lte, neq, like, ilike } = condition;
+    const { where, is, wherein, gt, gte, lt, lte, neq, like, ilike, not } = condition;
     const processedWhere = {};
     const extractedOperators = {};
     if (where) {
@@ -182,10 +182,18 @@ const QueryBuilder = (client, config) => {
     const queryWithGte = Object.keys(mergedGte).length > 0 ? Object.entries(mergedGte).reduce((q, [key, value]) => q.gte(key, value), queryWithGt) : queryWithGt;
     const queryWithLt = Object.keys(mergedLt).length > 0 ? Object.entries(mergedLt).reduce((q, [key, value]) => q.lt(key, value), queryWithGte) : queryWithGte;
     const queryWithLte = Object.keys(mergedLte).length > 0 ? Object.entries(mergedLte).reduce((q, [key, value]) => q.lte(key, value), queryWithLt) : queryWithLt;
-    const queryWithNeq = Object.keys(mergedNeq).length > 0 ? Object.entries(mergedNeq).reduce((q, [key, value]) => q.neq(key, value), queryWithLte) : queryWithLte;
+    const queryWithNeq = Object.keys(mergedNeq).length > 0 ? Object.entries(mergedNeq).reduce((q, [key, value]) => {
+      if (value === null) {
+        log.warn(`neq: null is deprecated. Use not: { is: { ${key}: null } } for IS NOT NULL`);
+        return q.not(key, "is", null);
+      }
+      return q.neq(key, value);
+    }, queryWithLte) : queryWithLte;
     const queryWithLike = Object.keys(mergedLike).length > 0 ? Object.entries(mergedLike).reduce((q, [key, pattern]) => q.like(key, pattern), queryWithNeq) : queryWithNeq;
     const queryWithIlike = Object.keys(mergedIlike).length > 0 ? Object.entries(mergedIlike).reduce((q, [key, pattern]) => q.ilike(key, pattern), queryWithLike) : queryWithLike;
-    return queryWithIlike;
+    const queryWithNotIs = not?.is ? Object.entries(not.is).reduce((q, [key, value]) => q.not(key, "is", value), queryWithIlike) : queryWithIlike;
+    const queryWithNot = not?.in ? Object.entries(not.in).reduce((q, [key, values]) => q.not(key, "in", values), queryWithNotIs) : queryWithNotIs;
+    return queryWithNot;
   };
   const applyOrConditions = (query2, conditions) => {
     const selectQuery = query2.select("*");
@@ -222,7 +230,8 @@ const QueryBuilder = (client, config) => {
           return {
             where: newWhere,
             is: condition.is,
-            wherein: condition.wherein
+            wherein: condition.wherein,
+            not: condition.not
           };
         })
       );
@@ -286,6 +295,7 @@ const QueryBuilder = (client, config) => {
       if (condition.neq) {
         Object.entries(condition.neq).forEach(([key, value]) => {
           if (value === null) {
+            log.warn(`neq: null is deprecated. Use not: { is: { ${key}: null } } for IS NOT NULL`);
             parts.push(`${key}.not.is.null`);
           } else {
             parts.push(`${key}.neq."${value}"`);
@@ -302,6 +312,25 @@ const QueryBuilder = (client, config) => {
           parts.push(`${key}.ilike."${pattern}"`);
         });
       }
+      if (condition.not) {
+        if (condition.not.is) {
+          Object.entries(condition.not.is).forEach(([key, value]) => {
+            if (value === null) {
+              parts.push(`${key}.not.is.null`);
+            } else {
+              parts.push(`${key}.not.is.${value}`);
+            }
+          });
+        }
+        if (condition.not.in) {
+          Object.entries(condition.not.in).forEach(([key, values]) => {
+            if (values && Array.isArray(values) && values.length > 0) {
+              const valueList = values.map((v) => `"${v}"`).join(",");
+              parts.push(`${key}.not.in.(${valueList})`);
+            }
+          });
+        }
+      }
       return parts.join(",");
     }).filter((condition) => condition.length > 0);
     const finalQuery = orConditions.length > 0 ? queryWithCommon.or(orConditions.join(",")) : queryWithCommon;
@@ -554,10 +583,10 @@ const createMappedQuery = (sourceQuery, mapFn) => {
     }
   };
 };
-const createQuery = (client, table, where = {}, is, wherein, order, softDeleteConfig, schema) => {
+const createQuery = (client, table, where = {}, is, wherein, order, softDeleteConfig, schema, comparison, not) => {
   const config = {
     table,
-    conditions: [{ where, is, wherein }],
+    conditions: [{ where, is, wherein, ...comparison, not }],
     order,
     softDeleteMode: softDeleteConfig?.mode,
     softDeleteAppliedByDefault: softDeleteConfig?.appliedByDefault,
@@ -867,7 +896,7 @@ function createGetItemQuery(client, name, whereConditions, is, softDeleteMode, s
     schema
   );
 }
-function createGetItemsQuery(client, name, whereConditions, is, wherein, order, softDeleteMode, schema) {
+function createGetItemsQuery(client, name, whereConditions, is, wherein, order, softDeleteMode, schema, comparison, not) {
   return createQuery(
     client,
     name,
@@ -879,7 +908,9 @@ function createGetItemsQuery(client, name, whereConditions, is, wherein, order,
       mode: softDeleteMode,
       appliedByDefault: true
     },
-    schema
+    schema,
+    comparison,
+    not
   );
 }
 function createAddItemsMutation(client, name, items, schema) {
@@ -935,7 +966,20 @@ function makeGetItem(client, name, softDeleteMode, schema) {
   };
 }
 function makeGetItems(client, name, softDeleteMode, schema) {
-  return function getItems({ where, is, wherein, order } = {}) {
+  return function getItems({
+    where,
+    is,
+    wherein,
+    order,
+    gte,
+    gt,
+    lte,
+    lt,
+    neq,
+    like,
+    ilike,
+    not
+  } = {}) {
     return createGetItemsQuery(
       client,
       name,
@@ -944,7 +988,9 @@ function makeGetItems(client, name, softDeleteMode, schema) {
       wherein,
       order,
       softDeleteMode,
-      schema
+      schema,
+      { gte, gt, lte, lt, neq, like, ilike },
+      not
     );
   };
 }
@@ -962,7 +1008,7 @@ function makePartitionedGetItem(client, name, partitionField, softDeleteMode, sc
   };
 }
 function makePartitionedGetItems(client, name, partitionField, softDeleteMode, schema) {
-  return function getItems(partitionKey, { where, is, wherein, order } = {}) {
+  return function getItems(partitionKey, { where, is, wherein, order, gte, gt, lte, lt, neq, like, ilike, not } = {}) {
     const whereConditions = buildWhereWithPartition(partitionField, partitionKey, where);
     return createGetItemsQuery(
       client,
@@ -972,7 +1018,9 @@ function makePartitionedGetItems(client, name, partitionField, softDeleteMode, s
       wherein,
       order,
       softDeleteMode,
-      schema
+      schema,
+      { gte, gt, lte, lt, neq, like, ilike },
+      not
     );
   };
 }