convex 1.36.1 → 1.37.0

package/dist/react.bundle.js

@@ -66,6 +66,7 @@ var convex = (() => {
     usePreloadedQuery: () => usePreloadedQuery,
     useQueries: () => useQueries,
     useQuery: () => useQuery,
+    useQuery_experimental: () => useQuery_experimental,
     useSubscription: () => useSubscription
   });
 
@@ -725,7 +726,7 @@ var convex = (() => {
   var import_react3 = __toESM(require_react(), 1);
 
   // src/index.ts
-  var version = "1.36.1";
+  var version = "1.37.0";
 
   // src/browser/logging.ts
   var INFO_COLOR = "color:rgb(0, 145, 255)";
@@ -4454,26 +4455,33 @@ var convex = (() => {
       children
     );
   };
-  function useQuery(queryOrOptions, ...args) {
-    const isObjectOptions = typeof queryOrOptions === "object" && queryOrOptions !== null && "query" in queryOrOptions;
-    const throwOnError = isObjectOptions ? queryOrOptions.throwOnError ?? false : true;
-    let queryReference;
-    let argsObject = {};
-    if (isObjectOptions) {
-      const query = queryOrOptions.query;
-      queryReference = typeof query === "string" ? makeFunctionReference(query) : query;
-      if (queryOrOptions.args !== "skip") {
-        argsObject = parseArgs(queryOrOptions.args);
-      }
-    } else {
-      const query = queryOrOptions;
-      queryReference = typeof query === "string" ? makeFunctionReference(query) : query;
-      argsObject = args[0] === "skip" ? {} : parseArgs(args[0]);
+  function useQuery(query, ...args) {
+    const skip = args[0] === "skip";
+    const argsObject = args[0] === "skip" ? {} : parseArgs(args[0]);
+    const queryReference = typeof query === "string" ? makeFunctionReference(query) : query;
+    const queryName = getFunctionName(queryReference);
+    const queries = (0, import_react2.useMemo)(
+      () => skip ? {} : { query: { query: queryReference, args: argsObject } },
+      // Stringify args so args that are semantically the same don't trigger a
+      // rerender. Saves developers from adding `useMemo` on every args usage.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      [JSON.stringify(convexToJson(argsObject)), queryName, skip]
+    );
+    const results = useQueries(queries);
+    const result = results["query"];
+    if (result instanceof Error) {
+      throw result;
     }
-    const queryName = queryReference ? getFunctionName(queryReference) : void 0;
-    const skip = isObjectOptions && queryOrOptions.args === "skip" || !isObjectOptions && args[0] === "skip";
+    return result;
+  }
+  function useQuery_experimental(options) {
+    const throwOnError = options.throwOnError ?? false;
+    const queryReference = typeof options.query === "string" ? makeFunctionReference(options.query) : options.query;
+    const skip = options.args === "skip";
+    const argsObject = !skip ? parseArgs(options.args) : {};
+    const queryName = getFunctionName(queryReference);
     const queries = (0, import_react2.useMemo)(
-      () => skip || !queryReference ? {} : { query: { query: queryReference, args: argsObject } },
+      () => skip ? {} : { query: { query: queryReference, args: argsObject } },
       // Stringify args so args that are semantically the same don't trigger a
       // rerender. Saves developers from adding `useMemo` on every args usage.
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -4481,34 +4489,24 @@ var convex = (() => {
     );
     const results = useQueries(queries);
     const result = results["query"];
-    if (isObjectOptions) {
-      if (result instanceof Error) {
-        if (throwOnError) {
-          throw result;
-        }
-        return {
-          data: void 0,
-          error: result,
-          status: "error"
-        };
-      }
-      if (result === void 0) {
-        return {
-          data: void 0,
-          error: void 0,
-          status: "pending"
-        };
+    if (result instanceof Error) {
+      if (throwOnError) {
+        throw result;
       }
       return {
-        data: result,
-        error: void 0,
-        status: "success"
+        error: result,
+        status: "error"
       };
     }
-    if (result instanceof Error) {
-      throw result;
+    if (result === void 0) {
+      return {
+        status: "pending"
+      };
     }
-    return result;
+    return {
+      data: result,
+      status: "success"
+    };
   }
   function useMutation(mutation) {
     const mutationReference = typeof mutation === "string" ? makeFunctionReference(mutation) : mutation;
@@ -4796,24 +4794,14 @@ var convex = (() => {
       ongoingSplits
     };
   };
-  function usePaginatedQuery(queryOrOptions, args, options) {
-    const isObjectOptions = typeof queryOrOptions === "object" && queryOrOptions !== null && "query" in queryOrOptions;
-    const query = isObjectOptions ? queryOrOptions.query : queryOrOptions;
-    const queryArgs = isObjectOptions ? queryOrOptions.args : args;
-    const throwOnError = isObjectOptions ? queryOrOptions.throwOnError ?? false : true;
-    const initialOptions = isObjectOptions ? { initialNumItems: queryOrOptions.initialNumItems } : options;
+  function usePaginatedQuery(query, args, options) {
     const { user: positionalResult } = usePaginatedQueryInternal(
       query,
-      queryArgs,
-      initialOptions,
-      throwOnError
-    );
-    if (!isObjectOptions) {
-      return positionalResult;
-    }
-    return reshapeToObjectForm(
-      positionalResult
+      args,
+      options,
+      true
     );
+    return positionalResult;
   }
   var includePage = Symbol("includePageKeys");
   var page = Symbol("page");
@@ -5002,37 +4990,6 @@ var convex = (() => {
       internal: { state: currState }
     };
   }
-  function reshapeToObjectForm(internal) {
-    const { results, loadMore } = internal;
-    if (internal.status === "Error" && "error" in internal) {
-      return {
-        data: results,
-        status: "error",
-        canLoadMore: false,
-        isLoading: false,
-        error: internal.error,
-        loadMore
-      };
-    }
-    if (internal.status === "LoadingFirstPage" || internal.status === "LoadingMore") {
-      return {
-        data: internal.status === "LoadingFirstPage" ? void 0 : results,
-        status: "pending",
-        canLoadMore: false,
-        isLoading: true,
-        error: void 0,
-        loadMore
-      };
-    }
-    return {
-      data: results,
-      status: "success",
-      canLoadMore: internal.status === "CanLoadMore",
-      isLoading: false,
-      error: void 0,
-      loadMore
-    };
-  }
   var paginationId = 0;
   function nextPaginationId() {
     paginationId++;