supabase-typed-query 0.13.0 → 1.0.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { Ok, Option, Err, List } from "functype";
-import { Err as Err2, List as List2, Ok as Ok2, Option as Option2 } from "functype";
+import { Option, IO, List } from "functype";
+import { IO as IO2, List as List2, Option as Option2 } from "functype";
 class SupabaseError extends Error {
   code;
   details;
@@ -46,9 +46,6 @@ const log = {
   info: (msg) => process.env.NODE_ENV !== "test" && console.info(`[supabase-typed-query] ${msg}`)
 };
 const TABLES_WITHOUT_DELETED = /* @__PURE__ */ new Set([]);
-const wrapAsync$2 = (fn) => {
-  return fn();
-};
 const QueryBuilder = (client, config) => {
   const buildSupabaseQuery = () => {
     const { table, conditions, order, limit, offset, schema } = config;
@@ -443,81 +440,52 @@ const QueryBuilder = (client, config) => {
      * Execute query expecting exactly one result
      */
     one: () => {
-      return wrapAsync$2(async () => {
-        try {
-          const query2 = buildSupabaseQuery();
-          const { data, error } = await query2.single();
-          if (error) {
-            log.error(`Error getting ${config.table} item: ${toError(error).toString()}`);
-            return Err(toError(error));
-          }
-          const result = data;
-          const filteredResult = config.filterFn ? config.filterFn(result) : true;
-          if (!filteredResult) {
-            return Ok(Option.none());
-          }
-          return Ok(Option(result));
-        } catch (error) {
-          log.error(`Error executing single query on ${config.table}: ${toError(error).toString()}`);
-          return Err(toError(error));
-        }
-      });
+      return IO.tryAsync(async () => {
+        const query2 = buildSupabaseQuery();
+        const { data, error } = await query2.single();
+        if (error) throw toError(error);
+        const result = data;
+        const passes = config.filterFn ? config.filterFn(result) : true;
+        return passes ? Option(result) : Option.none();
+      }, toError).tapError((err) => log.error(`Error getting ${config.table} item: ${err}`));
     },
     /**
      * Execute query expecting zero or more results
      */
     many: () => {
-      return wrapAsync$2(async () => {
-        try {
-          const query2 = buildSupabaseQuery();
-          const { data, error } = await query2;
-          if (error) {
-            log.error(`Error getting ${config.table} items: ${toError(error).toString()}`);
-            return Err(toError(error));
-          }
-          const rawResults = data;
-          const results = config.filterFn ? rawResults.filter(config.filterFn) : rawResults;
-          return Ok(List(results));
-        } catch (error) {
-          log.error(`Error executing multi query on ${config.table}: ${toError(error).toString()}`);
-          return Err(toError(error));
-        }
-      });
+      return IO.tryAsync(async () => {
+        const query2 = buildSupabaseQuery();
+        const { data, error } = await query2;
+        if (error) throw toError(error);
+        const rawResults = data;
+        const results = config.filterFn ? rawResults.filter(config.filterFn) : rawResults;
+        return List(results);
+      }, toError).tapError((err) => log.error(`Error getting ${config.table} items: ${err}`));
     },
     /**
      * Execute query expecting first result from potentially multiple
      */
     first: () => {
-      return wrapAsync$2(async () => {
-        const manyResult = await QueryBuilder(client, config).many();
-        const list = manyResult.orThrow();
-        if (list.isEmpty) {
-          return Ok(Option.none());
-        }
-        return Ok(Option(list.head));
-      });
+      return QueryBuilder(client, config).many().map((list) => list.isEmpty ? Option.none() : Option(list.head));
     },
     /**
      * Execute query expecting exactly one result, throw if error or not found
      */
     oneOrThrow: async () => {
-      const result = await QueryBuilder(client, config).one();
-      const option = result.orThrow();
+      const option = await QueryBuilder(client, config).one().runOrThrow();
       return option.orThrow(new Error(`No record found in ${config.table}`));
     },
     /**
      * Execute query expecting zero or more results, throw if error
      */
     manyOrThrow: async () => {
-      const result = await QueryBuilder(client, config).many();
-      return result.orThrow();
+      return QueryBuilder(client, config).many().runOrThrow();
     },
     /**
      * Execute query expecting first result, throw if error or empty
      */
     firstOrThrow: async () => {
-      const result = await QueryBuilder(client, config).first();
-      const option = result.orThrow();
+      const option = await QueryBuilder(client, config).first().runOrThrow();
       return option.orThrow(new Error(`No records found in ${config.table}`));
     }
   };
@@ -532,53 +500,42 @@ const createMappedQuery = (sourceQuery, mapFn) => {
       return createMappedQuery(filteredQuery, mapFn);
     },
     one: () => {
-      return wrapAsync$2(async () => {
-        const maybeItemResult = await sourceQuery.one();
-        const maybeItem = maybeItemResult.orThrow();
-        return maybeItem.fold(
-          () => Ok(Option.none()),
-          (item) => Ok(Option(mapFn(item)))
-        );
-      });
+      return sourceQuery.one().map(
+        (maybeItem) => maybeItem.fold(
+          () => Option.none(),
+          (item) => Option(mapFn(item))
+        )
+      );
     },
     many: () => {
-      return wrapAsync$2(async () => {
-        const itemsResult = await sourceQuery.many();
-        const items = itemsResult.orThrow();
-        return Ok(items.map(mapFn));
-      });
+      return sourceQuery.many().map((items) => items.map(mapFn));
     },
     first: () => {
-      return wrapAsync$2(async () => {
-        const maybeItemResult = await sourceQuery.first();
-        const maybeItem = maybeItemResult.orThrow();
-        return maybeItem.fold(
-          () => Ok(Option.none()),
-          (item) => Ok(Option(mapFn(item)))
-        );
-      });
+      return sourceQuery.first().map(
+        (maybeItem) => maybeItem.fold(
+          () => Option.none(),
+          (item) => Option(mapFn(item))
+        )
+      );
     },
     /**
      * Execute mapped query expecting exactly one result, throw if error or not found
      */
     oneOrThrow: async () => {
-      const result = await createMappedQuery(sourceQuery, mapFn).one();
-      const option = result.orThrow();
+      const option = await createMappedQuery(sourceQuery, mapFn).one().runOrThrow();
       return option.orThrow(new Error(`No record found`));
     },
     /**
      * Execute mapped query expecting zero or more results, throw if error
      */
     manyOrThrow: async () => {
-      const result = await createMappedQuery(sourceQuery, mapFn).many();
-      return result.orThrow();
+      return createMappedQuery(sourceQuery, mapFn).many().runOrThrow();
     },
     /**
      * Execute mapped query expecting first result, throw if error or empty
      */
     firstOrThrow: async () => {
-      const result = await createMappedQuery(sourceQuery, mapFn).first();
-      const option = result.orThrow();
+      const option = await createMappedQuery(sourceQuery, mapFn).first().runOrThrow();
       return option.orThrow(new Error(`No records found`));
     }
   };
@@ -600,38 +557,28 @@ const isQuery = (obj) => {
 const isMappedQuery = (obj) => {
   return typeof obj === "object" && obj !== null && "one" in obj && "many" in obj && "first" in obj && "map" in obj && "filter" in obj;
 };
-const wrapAsync$1 = (fn) => {
-  return fn();
-};
 const rpc = (client, functionName, args, options) => {
   const executeRpc = () => {
     return client.rpc(functionName, args ?? {}, {
       count: options?.count
     });
   };
-  const one = () => wrapAsync$1(async () => {
-    try {
-      const { data, error } = await executeRpc();
-      if (error) {
-        return Err(toError(error));
-      }
-      if (data === null || data === void 0) {
-        return Ok(Option.none());
-      }
-      if (Array.isArray(data)) {
-        if (data.length === 0) {
-          return Ok(Option.none());
-        }
-        return Ok(Option(data[0]));
+  const one = () => IO.tryAsync(async () => {
+    const { data, error } = await executeRpc();
+    if (error) throw toError(error);
+    if (data === null || data === void 0) {
+      return Option.none();
+    }
+    if (Array.isArray(data)) {
+      if (data.length === 0) {
+        return Option.none();
       }
-      return Ok(Option(data));
-    } catch (error) {
-      return Err(toError(error));
+      return Option(data[0]);
     }
-  });
+    return Option(data);
+  }, toError);
   const oneOrThrow = async () => {
-    const result = await one();
-    const option = result.orThrow();
+    const option = await one().runOrThrow();
     return option.fold(
       () => {
         throw new Error("RPC call returned no result");
@@ -639,26 +586,19 @@ const rpc = (client, functionName, args, options) => {
       (value) => value
     );
   };
-  const many = () => wrapAsync$1(async () => {
-    try {
-      const { data, error } = await executeRpc();
-      if (error) {
-        return Err(toError(error));
-      }
-      if (data === null || data === void 0) {
-        return Ok(List([]));
-      }
-      if (Array.isArray(data)) {
-        return Ok(List(data));
-      }
-      return Ok(List([data]));
-    } catch (error) {
-      return Err(toError(error));
+  const many = () => IO.tryAsync(async () => {
+    const { data, error } = await executeRpc();
+    if (error) throw toError(error);
+    if (data === null || data === void 0) {
+      return List([]);
     }
-  });
+    if (Array.isArray(data)) {
+      return List(data);
+    }
+    return List([data]);
+  }, toError);
   const manyOrThrow = async () => {
-    const result = await many();
-    return result.orThrow();
+    return many().runOrThrow();
   };
   return {
     one,
@@ -667,208 +607,145 @@ const rpc = (client, functionName, args, options) => {
     manyOrThrow
   };
 };
-const wrapAsync = (fn) => {
-  return fn();
-};
-const getEntity = (client, table, where, is, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.select("*").match(where);
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(baseQuery)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : baseQuery;
-    const { data, error } = await queryWithIs.single();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(data);
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
+const getEntity = (client, table, where, is, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.select("*").match(where);
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(baseQuery)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : baseQuery;
+  const { data, error } = await queryWithIs.single();
+  if (error) throw toError(error);
+  return data;
+}, toError);
 const getEntities = (client, table, where = {}, is, wherein, order = [
   "id",
   { ascending: true }
-], schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.select("*").match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const queryOrderBy = queryWithIs.order(order[0], order[1]);
-    const { data, error } = await queryOrderBy;
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(List(data));
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const addEntities = (client, table, entities, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const { data, error } = await tableQuery.insert(entities).select();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(List(data));
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const updateEntity = (client, table, entities, where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.update(entities).match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select().single();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(data);
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const upsertEntities = (client, table, entities, identity = "id", where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const onConflict = Array.isArray(identity) ? identity.join(",") : identity;
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.upsert(entities, { onConflict }).match(where ?? {});
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(List(data));
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const deleteEntity = (client, table, where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.delete().match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select().single();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(data);
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const deleteEntities = (client, table, where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.delete().match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(List(data));
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const softDeleteEntity = (client, table, where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.update({ deleted: (/* @__PURE__ */ new Date()).toISOString() }).match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select().single();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(data);
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
-const softDeleteEntities = (client, table, where, is, wherein, schema) => wrapAsync(async () => {
-  try {
-    const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
-    const baseQuery = tableQuery.update({ deleted: (/* @__PURE__ */ new Date()).toISOString() }).match(where);
-    const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
-      (query2, [column, values]) => query2.in(column, values)
-    ) : baseQuery;
-    const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
-      (query2, [column, value]) => query2.is(column, value)
-    ) : queryWithIn;
-    const { data, error } = await queryWithIs.select();
-    if (error) {
-      return Err(toError(error));
-    }
-    return Ok(List(data));
-  } catch (error) {
-    return Err(toError(error));
-  }
-});
+], schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.select("*").match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const queryOrderBy = queryWithIs.order(order[0], order[1]);
+  const { data, error } = await queryOrderBy;
+  if (error) throw toError(error);
+  return List(data);
+}, toError);
+const addEntities = (client, table, entities, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const { data, error } = await tableQuery.insert(entities).select();
+  if (error) throw toError(error);
+  return List(data);
+}, toError);
+const updateEntity = (client, table, entities, where, is, wherein, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.update(entities).match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select().single();
+  if (error) throw toError(error);
+  return data;
+}, toError);
+const upsertEntities = (client, table, entities, identity = "id", where, is, wherein, schema) => IO.tryAsync(async () => {
+  const onConflict = Array.isArray(identity) ? identity.join(",") : identity;
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.upsert(entities, { onConflict }).match(where ?? {});
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select();
+  if (error) throw toError(error);
+  return List(data);
+}, toError);
+const deleteEntity = (client, table, where, is, wherein, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.delete().match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select().single();
+  if (error) throw toError(error);
+  return data;
+}, toError);
+const deleteEntities = (client, table, where, is, wherein, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.delete().match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select();
+  if (error) throw toError(error);
+  return List(data);
+}, toError);
+const softDeleteEntity = (client, table, where, is, wherein, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.update({ deleted: (/* @__PURE__ */ new Date()).toISOString() }).match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select().single();
+  if (error) throw toError(error);
+  return data;
+}, toError);
+const softDeleteEntities = (client, table, where, is, wherein, schema) => IO.tryAsync(async () => {
+  const tableQuery = schema ? client.schema(schema).from(table) : client.from(table);
+  const baseQuery = tableQuery.update({ deleted: (/* @__PURE__ */ new Date()).toISOString() }).match(where);
+  const queryWithIn = wherein ? List(Object.entries(wherein)).foldLeft(baseQuery)(
+    (query2, [column, values]) => query2.in(column, values)
+  ) : baseQuery;
+  const queryWithIs = is ? List(Object.entries(is)).foldLeft(queryWithIn)(
+    (query2, [column, value]) => query2.is(column, value)
+  ) : queryWithIn;
+  const { data, error } = await queryWithIs.select();
+  if (error) throw toError(error);
+  return List(data);
+}, toError);
 const query = (client, table, where = {}, is, wherein, order, schema) => {
   return createQuery(client, table, where, is, wherein, order, void 0, schema);
 };
-function MultiMutationQuery(promise) {
-  const result = Object.assign(promise, {
-    many: () => promise,
+function MultiMutationQuery(task) {
+  return {
+    many: () => task,
     manyOrThrow: async () => {
-      const taskResult = await promise;
-      return taskResult.orThrow();
+      return task.runOrThrow();
     },
-    execute: () => promise,
+    execute: () => task,
     executeOrThrow: async () => {
-      const taskResult = await promise;
-      return taskResult.orThrow();
+      return task.runOrThrow();
     }
-  });
-  return result;
+  };
 }
-function SingleMutationQuery(promise) {
-  const result = Object.assign(promise, {
-    one: () => promise.then((outcome) => outcome.map((value) => Option(value))),
+function SingleMutationQuery(task) {
+  return {
+    one: () => task.map((value) => Option(value)),
     oneOrThrow: async () => {
-      const taskResult = await promise;
-      return taskResult.orThrow();
+      return task.runOrThrow();
     },
-    execute: () => promise.then((outcome) => outcome.map((value) => Option(value))),
+    execute: () => task.map((value) => Option(value)),
     executeOrThrow: async () => {
-      const taskResult = await promise;
-      const value = taskResult.orThrow();
+      const value = await task.runOrThrow();
       return Option(value);
     }
-  });
-  return result;
+  };
 }
 function getSoftDeleteMode(softDelete) {
   return softDelete ? "exclude" : "include";
@@ -1309,10 +1186,9 @@ const PartitionedEntity = (client, name, config) => {
 };
 export {
   Entity,
-  Err2 as Err,
+  IO2 as IO,
   List2 as List,
   MultiMutationQuery,
-  Ok2 as Ok,
   Option2 as Option,
   PartitionedEntity,
   SingleMutationQuery,