convex 1.14.4-alpha.0 → 1.14.4

package/CHANGELOG.md

@@ -2,16 +2,9 @@
 
 ## Unpublished
 
-## 1.14.0
-
-- Updates to ConvexReactClient to work better with authentication and server
-  rendering
-- `npx convex init` and `npx convex reinit` have been deprecated in favor of
-  `npx convex dev --configure`
 - Drop support for Node.js v16, and with it drop the dependency on node-fetch.
   This removes the 'punycode' deprecation warning printed when running the CLI
   in more recent versions of Node.js.
-- Support for custom claims in JWTs
 
 ## 1.13.2
 

package/browser/node_modules/.modules.yaml

@@ -0,0 +1,19 @@
+hoistPattern:
+  - '*'
+hoistedDependencies: {}
+included:
+  dependencies: true
+  devDependencies: true
+  optionalDependencies: true
+layoutVersion: 5
+packageManager: pnpm@7.32.0
+pendingBuilds: []
+prunedAt: Sat, 16 Dec 2023 00:48:00 GMT
+publicHoistPattern:
+  - '*eslint*'
+  - '*prettier*'
+registries:
+  default: https://registry.npmjs.org/
+skipped: []
+storeDir: /Users/tomb/convex/npm-packages/common/temp/pnpm-store/v3
+virtualStoreDir: .pnpm

package/dist/browser.bundle.js

@@ -28,7 +28,7 @@ var convex = (() => {
   });
 
   // src/index.ts
-  var version = "1.14.4-alpha.0";
+  var version = "1.14.4";
 
   // src/values/base64.ts
   var base64_exports = {};
@@ -558,6 +558,7 @@ var convex = (() => {
       this.outstandingQueriesOlderThanRestart = /* @__PURE__ */ new Set();
       this.outstandingAuthOlderThanRestart = false;
       this.paused = false;
+      this.pendingQuerySetModifications = /* @__PURE__ */ new Map();
     }
     hasSyncedPastLastReconnect() {
       return this.outstandingQueriesOlderThanRestart.size === 0 && !this.outstandingAuthOlderThanRestart;
@@ -589,9 +590,6 @@ var convex = (() => {
         this.queryIdToToken.set(queryId, queryToken);
         const baseVersion = this.querySetVersion;
         const newVersion = this.querySetVersion + 1;
-        if (!this.paused) {
-          this.querySetVersion = newVersion;
-        }
         const add = {
           type: "Add",
           queryId,
@@ -600,6 +598,11 @@ var convex = (() => {
           journal,
           componentPath
         };
+        if (this.paused) {
+          this.pendingQuerySetModifications.set(queryId, add);
+        } else {
+          this.querySetVersion = newVersion;
+        }
         const modification = {
           type: "ModifyQuerySet",
           baseVersion,
@@ -723,7 +726,7 @@ var convex = (() => {
       return this.querySet.get(queryToken)?.journal;
     }
     restart(oldRemoteQueryResults) {
-      this.paused = false;
+      this.unpause();
       this.outstandingQueriesOlderThanRestart.clear();
       const modifications = [];
       for (const localQuery of this.querySet.values()) {
@@ -762,45 +765,27 @@ var convex = (() => {
     pause() {
       this.paused = true;
     }
-    resume(remoteQueryResults) {
-      this.paused = false;
-      const localQueryIds = /* @__PURE__ */ new Set();
-      const modifications = [];
-      for (const localQuery of this.querySet.values()) {
-        localQueryIds.add(localQuery.id);
-        if (!remoteQueryResults.has(localQuery.id)) {
-          const add = {
-            type: "Add",
-            queryId: localQuery.id,
-            udfPath: localQuery.canonicalizedUdfPath,
-            args: [convexToJson(localQuery.args)],
-            journal: localQuery.journal
-          };
-          modifications.push(add);
-        }
-      }
-      for (const remoteQueryId of remoteQueryResults) {
-        if (!localQueryIds.has(remoteQueryId)) {
-          const remove = {
-            type: "Remove",
-            queryId: remoteQueryId
-          };
-          modifications.push(remove);
-        }
-      }
-      const querySet = modifications.length > 0 ? {
+    resume() {
+      const querySet = this.pendingQuerySetModifications.size > 0 ? {
         type: "ModifyQuerySet",
         baseVersion: this.querySetVersion,
         newVersion: ++this.querySetVersion,
-        modifications
+        modifications: Array.from(
+          this.pendingQuerySetModifications.values()
+        )
       } : void 0;
       const authenticate = this.auth !== void 0 ? {
         type: "Authenticate",
         baseVersion: this.identityVersion++,
         ...this.auth
       } : void 0;
+      this.unpause();
       return [querySet, authenticate];
     }
+    unpause() {
+      this.paused = false;
+      this.pendingQuerySetModifications.clear();
+    }
     removeSubscriber(queryToken) {
       const localQuery = this.querySet.get(queryToken);
       if (localQuery.numSubscribers > 1) {
@@ -812,13 +797,19 @@ var convex = (() => {
         this.outstandingQueriesOlderThanRestart.delete(localQuery.id);
         const baseVersion = this.querySetVersion;
         const newVersion = this.querySetVersion + 1;
-        if (!this.paused) {
-          this.querySetVersion = newVersion;
-        }
         const remove = {
           type: "Remove",
           queryId: localQuery.id
         };
+        if (this.paused) {
+          if (this.pendingQuerySetModifications.has(localQuery.id)) {
+            this.pendingQuerySetModifications.delete(localQuery.id);
+          } else {
+            this.pendingQuerySetModifications.set(localQuery.id, remove);
+          }
+        } else {
+          this.querySetVersion = newVersion;
+        }
         return {
           type: "ModifyQuerySet",
           baseVersion,
@@ -989,54 +980,9 @@ var convex = (() => {
     }
   };
 
-  // src/server/components/index.ts
-  var toReferencePath = Symbol.for("toReferencePath");
-  function extractReferencePath(reference) {
-    return reference[toReferencePath] ?? null;
-  }
-  function isFunctionHandle(s) {
-    return s.startsWith("function://");
-  }
-
-  // src/server/impl/actions_impl.ts
-  function getFunctionAddress(functionReference) {
-    let functionAddress;
-    if (typeof functionReference === "string") {
-      if (isFunctionHandle(functionReference)) {
-        functionAddress = { functionHandle: functionReference };
-      } else {
-        functionAddress = { name: functionReference };
-      }
-    } else if (functionReference[functionName]) {
-      functionAddress = { name: functionReference[functionName] };
-    } else {
-      const referencePath = extractReferencePath(functionReference);
-      if (!referencePath) {
-        throw new Error(`${functionReference} is not a functionReference`);
-      }
-      functionAddress = { reference: referencePath };
-    }
-    return functionAddress;
-  }
-
   // src/server/api.ts
   var functionName = Symbol.for("functionName");
   function getFunctionName(functionReference) {
-    const address = getFunctionAddress(functionReference);
-    if (address.name === void 0) {
-      if (address.functionHandle !== void 0) {
-        throw new Error(
-          `Expected function reference like "api.file.func" or "internal.file.func", but received function handle ${address.functionHandle}`
-        );
-      } else if (address.reference !== void 0) {
-        throw new Error(
-          `Expected function reference in the current component like "api.file.func" or "internal.file.func", but received reference ${address.reference}`
-        );
-      }
-      throw new Error(
-        `Expected function reference like "api.file.func" or "internal.file.func", but received ${JSON.stringify(address)}`
-      );
-    }
     if (typeof functionReference === "string")
       return functionReference;
     const name = functionReference[functionName];
@@ -2236,10 +2182,7 @@ var convex = (() => {
             }
           },
           onResume: () => {
-            const remoteQueryResults = new Set(
-              this.remoteQuerySet.remoteQueryResults().keys()
-            );
-            const [querySetModification, authModification] = this.state.resume(remoteQueryResults);
+            const [querySetModification, authModification] = this.state.resume();
             if (authModification) {
               this.webSocketManager.sendMessage(authModification);
             }