convex 1.42.2 → 1.43.0-alpha.0

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## 1.41.2
+## 1.42.3
+
+- Fixed a bug where the codegen would not sort module paths in
+  an order consistent with other platforms when running
+  on Windows. This completes a fix that was only partially
+  applied in 1.42.2.
+
+## 1.42.2
 - Mutations and actions can now read the raw authentication
   token used in the request by accessing `authToken` in
   `ctx.meta.getRequestMetadata()`.

package/bin/main-dev

@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
-# Run the Convex CLI directly from source code.
+# Run the Convex CLI directly from source code, or from the prebuilt bundle in
+# environments without dev tooling (e.g. `pnpm deploy`ed artifacts, where
+# devDependencies like tsx are not installed).
 
 if [ "$(uname)" == "Darwin" ] || [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
   SCRIPTDIR="$(echo "$0" | python3 -c 'import os; print(os.path.dirname(os.path.realpath(input())))')"
+  if [ ! -e "$SCRIPTDIR/../node_modules/.bin/tsx" ]; then
+    "exec" "$SCRIPTDIR/main.js" "$@"
+  fi
   CONVEX_RUNNING_LIVE_IN_MONOREPO=1 "exec" "$SCRIPTDIR/../node_modules/.bin/tsx" "$SCRIPTDIR/../src/cli/index.ts" "$@"
 else # it's probably Windows
   # This doesn't follow symlinks quite as correctly as the Mac/Linux solution above

package/dist/browser.bundle.js

@@ -29,7 +29,7 @@ var convex = (() => {
   });
 
   // src/index.ts
-  var version = "1.42.2";
+  var version = "1.43.0-alpha.0";
 
   // src/values/base64.ts
   var base64_exports = {};
@@ -195,6 +195,25 @@ var convex = (() => {
   var ZERO = BigInt("0");
   var EIGHT = BigInt("8");
   var TWOFIFTYSIX = BigInt("256");
+  var COMMIT_TS_UNRESOLVED = "This commit timestamp is unresolved: its value is assigned when the mutation commits. Read the document after the mutation completes to get its value.";
+  var CommitTsPlaceholder = class {
+    [Symbol.toPrimitive](hint) {
+      if (hint === "string") {
+        return this.toString();
+      }
+      throw new Error(COMMIT_TS_UNRESOLVED);
+    }
+    valueOf() {
+      throw new Error(COMMIT_TS_UNRESOLVED);
+    }
+    toJSON() {
+      throw new Error(COMMIT_TS_UNRESOLVED);
+    }
+    toString() {
+      return "[unresolved commit timestamp]";
+    }
+  };
+  var commitTsPlaceholder = new CommitTsPlaceholder();
   function isSpecial(n) {
     return Number.isNaN(n) || !Number.isFinite(n) || Object.is(n, -0);
   }
@@ -322,6 +341,12 @@ var convex = (() => {
         }
         return float;
       }
+      if (key === "$commitTs") {
+        if (value.$commitTs !== null) {
+          throw new Error(`Malformed $commitTs field on ${value}`);
+        }
+        return commitTsPlaceholder;
+      }
       if (key === "$set") {
         throw new Error(
           `Received a Set which is no longer supported as a Convex type.`
@@ -400,6 +425,9 @@ var convex = (() => {
     if (value instanceof ArrayBuffer) {
       return { $bytes: fromByteArray(new Uint8Array(value)) };
     }
+    if (value instanceof CommitTsPlaceholder) {
+      return { $commitTs: null };
+    }
     if (Array.isArray(value)) {
       return value.map(
         (value2, i) => convexToJsonInternal(value2, originalValue, context + `[${i}]`, false)
@@ -3643,8 +3671,11 @@ var convex = (() => {
           if (ongoingSplits.has(pageKey)) {
             continue;
           }
-          const pageToken = pageKeyToQuery.get(pageKey).queryToken;
-          const pageResult = getResult(pageToken);
+          const pageEntry = pageKeyToQuery.get(pageKey);
+          if (!pageEntry) {
+            throw new Error(`No page query for active pageKey ${pageKey}`);
+          }
+          const pageResult = getResult(pageEntry.queryToken);
           if (!pageResult) {
             continue;
           }
@@ -3655,6 +3686,7 @@ var convex = (() => {
             this.splitPaginatedQueryPage(
               paginatedQuery,
               pageKey,
+              pageEntry.cursor,
               result.splitCursor,
               // we just checked
               result.continueCursor
@@ -3663,11 +3695,10 @@ var convex = (() => {
         }
       }
     }
-    splitPaginatedQueryPage(paginatedQuery, pageKey, splitCursor, continueCursor) {
+    splitPaginatedQueryPage(paginatedQuery, pageKey, startCursor, splitCursor, continueCursor) {
       const splitKey1 = paginatedQuery.nextPageKey++;
       const splitKey2 = paginatedQuery.nextPageKey++;
       const paginationOpts = {
-        cursor: continueCursor,
         numItems: paginatedQuery.options.initialNumItems,
         id: paginatedQuery.id
       };
@@ -3677,13 +3708,15 @@ var convex = (() => {
           ...paginatedQuery.args,
           paginationOpts: {
             ...paginationOpts,
-            cursor: null,
-            // Start from beginning for first split
+            cursor: startCursor,
             endCursor: splitCursor
           }
         }
       );
-      paginatedQuery.pageKeyToQuery.set(splitKey1, firstSubscription);
+      paginatedQuery.pageKeyToQuery.set(splitKey1, {
+        ...firstSubscription,
+        cursor: startCursor
+      });
       const secondSubscription = this.client.subscribe(
         paginatedQuery.canonicalizedUdfPath,
         {
@@ -3695,7 +3728,10 @@ var convex = (() => {
           }
         }
       );
-      paginatedQuery.pageKeyToQuery.set(splitKey2, secondSubscription);
+      paginatedQuery.pageKeyToQuery.set(splitKey2, {
+        ...secondSubscription,
+        cursor: splitCursor
+      });
       paginatedQuery.ongoingSplits.set(pageKey, [splitKey1, splitKey2]);
     }
     /**
@@ -3718,7 +3754,10 @@ var convex = (() => {
         pageArgs
       );
       paginatedQuery.pageKeys.push(pageKey);
-      paginatedQuery.pageKeyToQuery.set(pageKey, subscription);
+      paginatedQuery.pageKeyToQuery.set(pageKey, {
+        ...subscription,
+        cursor: continueCursor
+      });
       return subscription;
     }
     removePaginatedQuerySubscriber(token) {