@concavejs/docstore-cf-d1 0.0.1-alpha.5 → 0.0.1-alpha.7

package/dist/d1-adapter.d.ts

@@ -8,7 +8,7 @@ import type { SqliteAdapter, PreparedStatement, SqlParam, TransactionFn } from "
  */
 export declare class D1SqliteAdapter implements SqliteAdapter {
     private db;
-    private batchStatements;
+    private statementCollector;
     constructor(db: D1Database);
     exec(sql: string): Promise<void>;
     prepare(sql: string): PreparedStatement;

package/dist/index.js

@@ -50,7 +50,7 @@ function deserializeDeveloperId(developerId) {
 }
 var DOC_ID_SEPARATOR = ":", LEGACY_DOC_ID_SEPARATOR = ";";
 
-// ../core/node_modules/convex/dist/esm/values/base64.js
+// ../../node_modules/convex/dist/esm/values/base64.js
 function getLens(b64) {
   var len2 = b64.length;
   if (len2 % 4 > 0) {
@@ -134,7 +134,7 @@ var init_base64 = __esm(() => {
   revLookup[95] = 63;
 });
 
-// ../core/node_modules/convex/dist/esm/common/index.js
+// ../../node_modules/convex/dist/esm/common/index.js
 function parseArgs(args) {
   if (args === undefined) {
     return {};
@@ -151,7 +151,7 @@ function isSimpleObject(value) {
   return isObject && isSimple;
 }
 
-// ../core/node_modules/convex/dist/esm/values/value.js
+// ../../node_modules/convex/dist/esm/values/value.js
 function isSpecial(n) {
   return Number.isNaN(n) || !Number.isFinite(n) || Object.is(n, -0);
 }
@@ -398,7 +398,7 @@ var init_value = __esm(() => {
   base64ToBigInt = DataView.prototype.getBigInt64 ? modernBase64ToBigInt : slowBase64ToBigInt;
 });
 
-// ../core/node_modules/convex/dist/esm/values/validators.js
+// ../../node_modules/convex/dist/esm/values/validators.js
 function throwUndefinedValidatorError(context, fieldName) {
   const fieldInfo = fieldName !== undefined ? ` for field "${fieldName}"` : "";
   throw new Error(`A validator is undefined${fieldInfo} in ${context}. This is often caused by circular imports. See ${UNDEFINED_VALIDATOR_ERROR_URL} for details.`);
@@ -733,7 +733,7 @@ var init_validators = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/values/validator.js
+// ../../node_modules/convex/dist/esm/values/validator.js
 function isValidator(v2) {
   return !!v2.isConvexValidator;
 }
@@ -812,7 +812,7 @@ var init_validator = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/values/errors.js
+// ../../node_modules/convex/dist/esm/values/errors.js
 var __defProp3, __defNormalProp2 = (obj, key, value) => (key in obj) ? __defProp3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value, __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value), _a, _b, IDENTIFYING_FIELD, ConvexError;
 var init_errors = __esm(() => {
   init_value();
@@ -829,7 +829,7 @@ var init_errors = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/values/index.js
+// ../../node_modules/convex/dist/esm/values/index.js
 var init_values = __esm(() => {
   init_value();
   init_validator();
@@ -1097,10 +1097,10 @@ var init_interface = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/index.js
+// ../../node_modules/convex/dist/esm/index.js
 var version = "1.31.7";
 
-// ../core/node_modules/convex/dist/esm/server/impl/syscall.js
+// ../../node_modules/convex/dist/esm/server/impl/syscall.js
 function performSyscall(op, arg) {
   if (typeof Convex === "undefined" || Convex.syscall === undefined) {
     throw new Error("The Convex database and auth objects are being used outside of a Convex backend. Did you mean to use `useQuery` or `useMutation` to call a Convex function?");
@@ -1130,13 +1130,13 @@ var init_syscall = __esm(() => {
   init_value();
 });
 
-// ../core/node_modules/convex/dist/esm/server/functionName.js
+// ../../node_modules/convex/dist/esm/server/functionName.js
 var functionName;
 var init_functionName = __esm(() => {
   functionName = Symbol.for("functionName");
 });
 
-// ../core/node_modules/convex/dist/esm/server/components/paths.js
+// ../../node_modules/convex/dist/esm/server/components/paths.js
 function extractReferencePath(reference) {
   return reference[toReferencePath] ?? null;
 }
@@ -1168,7 +1168,7 @@ var init_paths = __esm(() => {
   toReferencePath = Symbol.for("toReferencePath");
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/validate.js
+// ../../node_modules/convex/dist/esm/server/impl/validate.js
 function validateArg(arg, idx, method, argName) {
   if (arg === undefined) {
     throw new TypeError(`Must provide arg ${idx} \`${argName}\` to \`${method}\``);
@@ -1180,7 +1180,7 @@ function validateArgIsNonNegativeInteger(arg, idx, method, argName) {
   }
 }
 
-// ../core/node_modules/convex/dist/esm/server/impl/authentication_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/authentication_impl.js
 function setupAuth(requestId) {
   return {
     getUserIdentity: async () => {
@@ -1194,7 +1194,7 @@ var init_authentication_impl = __esm(() => {
   init_syscall();
 });
 
-// ../core/node_modules/convex/dist/esm/server/filter_builder.js
+// ../../node_modules/convex/dist/esm/server/filter_builder.js
 class Expression {
   constructor() {
     __publicField3(this, "_isExpression");
@@ -1206,7 +1206,7 @@ var init_filter_builder = __esm(() => {
   __defProp4 = Object.defineProperty;
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/filter_builder_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/filter_builder_impl.js
 function serializeExpression(expr) {
   if (expr instanceof ExpressionImpl) {
     return expr.serialize();
@@ -1303,7 +1303,7 @@ var init_filter_builder_impl = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/server/index_range_builder.js
+// ../../node_modules/convex/dist/esm/server/index_range_builder.js
 class IndexRange {
   constructor() {
     __publicField5(this, "_isIndexRange");
@@ -1314,7 +1314,7 @@ var init_index_range_builder = __esm(() => {
   __defProp6 = Object.defineProperty;
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/index_range_builder_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/index_range_builder_impl.js
 var __defProp7, __defNormalProp6 = (obj, key, value) => (key in obj) ? __defProp7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value, __publicField6 = (obj, key, value) => __defNormalProp6(obj, typeof key !== "symbol" ? key + "" : key, value), IndexRangeBuilderImpl;
 var init_index_range_builder_impl = __esm(() => {
   init_value();
@@ -1384,7 +1384,7 @@ var init_index_range_builder_impl = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/server/search_filter_builder.js
+// ../../node_modules/convex/dist/esm/server/search_filter_builder.js
 class SearchFilter {
   constructor() {
     __publicField7(this, "_isSearchFilter");
@@ -1395,7 +1395,7 @@ var init_search_filter_builder = __esm(() => {
   __defProp8 = Object.defineProperty;
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/search_filter_builder_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/search_filter_builder_impl.js
 var __defProp9, __defNormalProp8 = (obj, key, value) => (key in obj) ? __defProp9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value, __publicField8 = (obj, key, value) => __defNormalProp8(obj, typeof key !== "symbol" ? key + "" : key, value), SearchFilterBuilderImpl;
 var init_search_filter_builder_impl = __esm(() => {
   init_value();
@@ -1447,7 +1447,7 @@ var init_search_filter_builder_impl = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/query_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/query_impl.js
 function throwClosedError(type) {
   throw new Error(type === "consumed" ? "This query is closed and can't emit any more values." : "This query has been chained with another operator and can't be reused.");
 }
@@ -1684,7 +1684,7 @@ var init_query_impl = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/database_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/database_impl.js
 async function get(table, id, isSystem) {
   validateArg(id, 1, "get", "id");
   if (typeof id !== "string") {
@@ -1834,7 +1834,7 @@ var init_database_impl = __esm(() => {
   };
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/scheduler_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/scheduler_impl.js
 function setupMutationScheduler() {
   return {
     runAfter: async (delayMs, functionReference, args) => {
@@ -1896,7 +1896,7 @@ var init_scheduler_impl = __esm(() => {
   init_paths();
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/storage_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/storage_impl.js
 function setupStorageReader(requestId) {
   return {
     getUrl: async (storageId) => {
@@ -1940,7 +1940,7 @@ var init_storage_impl = __esm(() => {
   init_syscall();
 });
 
-// ../core/node_modules/convex/dist/esm/server/impl/registration_impl.js
+// ../../node_modules/convex/dist/esm/server/impl/registration_impl.js
 async function invokeMutation(func, argsStr) {
   const requestId = "";
   const args = jsonToConvex(JSON.parse(argsStr));
@@ -2077,7 +2077,7 @@ var init_registration_impl = __esm(() => {
   init_paths();
 });
 
-// ../core/node_modules/convex/dist/esm/server/pagination.js
+// ../../node_modules/convex/dist/esm/server/pagination.js
 var paginationOptsValidator;
 var init_pagination = __esm(() => {
   init_validator();
@@ -2091,7 +2091,7 @@ var init_pagination = __esm(() => {
   });
 });
 
-// ../core/node_modules/convex/dist/esm/server/index.js
+// ../../node_modules/convex/dist/esm/server/index.js
 var init_server = __esm(() => {
   init_registration_impl();
   init_pagination();
@@ -4434,6 +4434,19 @@ function parseDeveloperId(developerId) {
   }
   return { table: parts.table, internalId: parts.internalId };
 }
+function parseStorageId(storageId) {
+  const parsed = parseDeveloperId(storageId);
+  if (parsed) {
+    return parsed;
+  }
+  if (storageId.length === INTERNAL_ID_LENGTH * 2 && /^[0-9a-fA-F]+$/.test(storageId)) {
+    return {
+      table: stringToHex("_storage"),
+      internalId: storageId.toLowerCase()
+    };
+  }
+  return null;
+}
 function isTablePlaceholder(table) {
   return table.startsWith("#");
 }
@@ -4887,19 +4900,19 @@ class BlobStoreGateway {
     if (!this.storage) {
       return null;
     }
-    const docId = parseDeveloperId(storageId);
+    const docId = parseStorageId(storageId);
     if (!docId) {
-      console.error(`[BlobStoreGateway] Failed to parse storage ID: ${storageId}`);
+      console.debug(`[BlobStoreGateway] Failed to parse storage ID: ${storageId}`);
       return null;
     }
     const docValue = await this.queryRuntime.getVisibleDocumentById(storageId, docId);
     if (!docValue) {
-      console.error(`[BlobStoreGateway] Document not found for storage ID: ${storageId} (table: ${docId.table}, internalId: ${docId.internalId})`);
+      console.debug(`[BlobStoreGateway] Document not found for storage ID: ${storageId} (table: ${docId.table}, internalId: ${docId.internalId}, ts: ${this.context.snapshotTimestamp})`);
       return null;
     }
     const storedBlob = await this.storage.get(docId.internalId);
     if (!storedBlob) {
-      console.error(`[BlobStoreGateway] Blob not found in storage: ${docId.internalId}`);
+      console.debug(`[BlobStoreGateway] Blob not found in storage: ${docId.internalId}`);
       return null;
     }
     return storedBlob instanceof Blob ? storedBlob : new Blob([storedBlob]);
@@ -4908,7 +4921,7 @@ class BlobStoreGateway {
     if (!this.storage) {
       return null;
     }
-    const docId = parseDeveloperId(storageId);
+    const docId = parseStorageId(storageId);
     if (!docId) {
       return null;
     }
@@ -4921,7 +4934,7 @@ class BlobStoreGateway {
   }
   async delete(storageId) {
     const storage2 = this.requireStorage();
-    const docId = parseDeveloperId(storageId);
+    const docId = parseStorageId(storageId);
     if (!docId) {
       return;
     }
@@ -4983,8 +4996,9 @@ function resolveFunctionTarget(callArgs, currentComponentPath) {
     return parseFunctionHandleTarget(callArgs.functionHandle);
   }
   if (callArgs && typeof callArgs.functionHandle === "object" && callArgs.functionHandle !== null) {
-    if (typeof callArgs.functionHandle.handle === "string") {
-      return parseFunctionHandleTarget(callArgs.functionHandle.handle);
+    const handle = callArgs.functionHandle;
+    if (typeof handle.handle === "string") {
+      return parseFunctionHandleTarget(handle.handle);
     }
   }
   if (callArgs && typeof callArgs.reference === "string") {
@@ -5230,17 +5244,15 @@ class ActionSyscalls {
     const type = args.udfType ?? args.type ?? "mutation";
     return await this.invocationManager.execute(target.udfPath, udfArguments, type, target.componentPath);
   }
-  handleCreateFunctionHandle(args) {
+  async handleCreateFunctionHandle(args) {
     const target = resolveFunctionTarget(args, this.context.componentPath);
     return formatFunctionHandle(target.componentPath ?? "", target.udfPath);
   }
   async handleVectorSearch(args) {
-    const { query: vectorQuery } = args;
-    return this.queryRuntime.runVectorSearchAction(vectorQuery);
+    return this.queryRuntime.runVectorSearchAction(args.query);
   }
   async handleSearchAction(args) {
-    const { query: searchQuery } = args;
-    return this.queryRuntime.runSearchAction(searchQuery);
+    return this.queryRuntime.runSearchAction(args.query);
   }
 }
 
@@ -5552,6 +5564,8 @@ function decodeJwtClaimsToken(token) {
     return null;
   }
 }
+var DEFAULT_JWKS_CACHE_TTL_MS = 5 * 60 * 1000;
+var MAX_JWKS_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
 var JWKS_CACHE = new Map;
 function decodeJwtUnsafe(token) {
   if (!token)
@@ -5635,13 +5649,13 @@ class QuerySyscalls {
     return { queryId };
   }
   handleQueryCleanup(args) {
-    const { queryId } = args;
+    const queryId = args.queryId;
     delete this.pendingQueries[queryId];
     delete this.queryResults[queryId];
     return {};
   }
   async handleQueryStreamNext(args) {
-    const { queryId } = args;
+    const queryId = args.queryId;
     if (this.pendingQueries[queryId]) {
       const query = this.pendingQueries[queryId];
       delete this.pendingQueries[queryId];
@@ -5912,53 +5926,15 @@ var __export2 = (target, all) => {
     });
 };
 var __esm2 = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-function hexToArrayBuffer3(hex) {
-  if (hex === "") {
-    return new Uint8Array(0).buffer;
-  }
-  const matches = hex.match(/.{1,2}/g);
-  if (!matches) {
-    throw new Error(`Invalid hex string: ${hex}`);
-  }
-  return new Uint8Array(matches.map((byte) => parseInt(byte, 16))).buffer;
-}
-function arrayBufferToHex3(buffer) {
-  return Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join("");
-}
-function stringToHex2(s) {
-  const buffer = new TextEncoder().encode(s);
-  return arrayBufferToHex3(buffer.buffer);
-}
-function hexToString2(hex) {
-  const buffer = hexToArrayBuffer3(hex);
-  return new TextDecoder().decode(buffer);
-}
-function serializeDeveloperId2(tableHex, internalIdHex) {
-  return `${tableHex}${DOC_ID_SEPARATOR2}${internalIdHex}`;
-}
-function deserializeDeveloperId2(developerId) {
-  if (!developerId) {
-    return null;
-  }
-  for (const separator of [DOC_ID_SEPARATOR2, LEGACY_DOC_ID_SEPARATOR2]) {
-    const parts = developerId.split(separator);
-    if (parts.length === 2 && parts[0] && parts[1]) {
-      return { table: parts[0], internalId: parts[1] };
-    }
-  }
-  return null;
-}
-var DOC_ID_SEPARATOR2 = ":";
-var LEGACY_DOC_ID_SEPARATOR2 = ";";
 function getLens2(b64) {
-  var len3 = b64.length;
-  if (len3 % 4 > 0) {
+  var len2 = b64.length;
+  if (len2 % 4 > 0) {
     throw new Error("Invalid string. Length must be a multiple of 4");
   }
   var validLen = b64.indexOf("=");
   if (validLen === -1)
-    validLen = len3;
-  var placeHoldersLen = validLen === len3 ? 0 : 4 - validLen % 4;
+    validLen = len2;
+  var placeHoldersLen = validLen === len2 ? 0 : 4 - validLen % 4;
   return [validLen, placeHoldersLen];
 }
 function _byteLength2(_b64, validLen, placeHoldersLen) {
@@ -5971,20 +5947,20 @@ function toByteArray2(b64) {
   var placeHoldersLen = lens[1];
   var arr = new Arr2(_byteLength2(b64, validLen, placeHoldersLen));
   var curByte = 0;
-  var len3 = placeHoldersLen > 0 ? validLen - 4 : validLen;
-  var i3;
-  for (i3 = 0;i3 < len3; i3 += 4) {
-    tmp = revLookup2[b64.charCodeAt(i3)] << 18 | revLookup2[b64.charCodeAt(i3 + 1)] << 12 | revLookup2[b64.charCodeAt(i3 + 2)] << 6 | revLookup2[b64.charCodeAt(i3 + 3)];
+  var len2 = placeHoldersLen > 0 ? validLen - 4 : validLen;
+  var i2;
+  for (i2 = 0;i2 < len2; i2 += 4) {
+    tmp = revLookup2[b64.charCodeAt(i2)] << 18 | revLookup2[b64.charCodeAt(i2 + 1)] << 12 | revLookup2[b64.charCodeAt(i2 + 2)] << 6 | revLookup2[b64.charCodeAt(i2 + 3)];
     arr[curByte++] = tmp >> 16 & 255;
     arr[curByte++] = tmp >> 8 & 255;
     arr[curByte++] = tmp & 255;
   }
   if (placeHoldersLen === 2) {
-    tmp = revLookup2[b64.charCodeAt(i3)] << 2 | revLookup2[b64.charCodeAt(i3 + 1)] >> 4;
+    tmp = revLookup2[b64.charCodeAt(i2)] << 2 | revLookup2[b64.charCodeAt(i2 + 1)] >> 4;
     arr[curByte++] = tmp & 255;
   }
   if (placeHoldersLen === 1) {
-    tmp = revLookup2[b64.charCodeAt(i3)] << 10 | revLookup2[b64.charCodeAt(i3 + 1)] << 4 | revLookup2[b64.charCodeAt(i3 + 2)] >> 2;
+    tmp = revLookup2[b64.charCodeAt(i2)] << 10 | revLookup2[b64.charCodeAt(i2 + 1)] << 4 | revLookup2[b64.charCodeAt(i2 + 2)] >> 2;
     arr[curByte++] = tmp >> 8 & 255;
     arr[curByte++] = tmp & 255;
   }
@@ -5996,26 +5972,26 @@ function tripletToBase642(num) {
 function encodeChunk2(uint8, start, end) {
   var tmp;
   var output = [];
-  for (var i3 = start;i3 < end; i3 += 3) {
-    tmp = (uint8[i3] << 16 & 16711680) + (uint8[i3 + 1] << 8 & 65280) + (uint8[i3 + 2] & 255);
+  for (var i2 = start;i2 < end; i2 += 3) {
+    tmp = (uint8[i2] << 16 & 16711680) + (uint8[i2 + 1] << 8 & 65280) + (uint8[i2 + 2] & 255);
     output.push(tripletToBase642(tmp));
   }
   return output.join("");
 }
 function fromByteArray2(uint8) {
   var tmp;
-  var len3 = uint8.length;
-  var extraBytes = len3 % 3;
+  var len2 = uint8.length;
+  var extraBytes = len2 % 3;
   var parts = [];
   var maxChunkLength = 16383;
-  for (var i3 = 0, len22 = len3 - extraBytes;i3 < len22; i3 += maxChunkLength) {
-    parts.push(encodeChunk2(uint8, i3, i3 + maxChunkLength > len22 ? len22 : i3 + maxChunkLength));
+  for (var i2 = 0, len22 = len2 - extraBytes;i2 < len22; i2 += maxChunkLength) {
+    parts.push(encodeChunk2(uint8, i2, i2 + maxChunkLength > len22 ? len22 : i2 + maxChunkLength));
   }
   if (extraBytes === 1) {
-    tmp = uint8[len3 - 1];
+    tmp = uint8[len2 - 1];
     parts.push(lookup2[tmp >> 2] + lookup2[tmp << 4 & 63] + "==");
   } else if (extraBytes === 2) {
-    tmp = (uint8[len3 - 2] << 8) + uint8[len3 - 1];
+    tmp = (uint8[len2 - 2] << 8) + uint8[len2 - 1];
     parts.push(lookup2[tmp >> 10] + lookup2[tmp >> 4 & 63] + lookup2[tmp << 2 & 63] + "=");
   }
   return parts.join("");
@@ -6041,12 +6017,12 @@ function parseArgs2(args) {
   if (args === undefined) {
     return {};
   }
-  if (!isSimpleObject22(args)) {
+  if (!isSimpleObject4(args)) {
     throw new Error(`The arguments to a Convex function must be an object. Received: ${args}`);
   }
   return args;
 }
-function isSimpleObject22(value) {
+function isSimpleObject4(value) {
   const isObject = typeof value === "object";
   const prototype = Object.getPrototypeOf(value);
   const isSimple = prototype === null || prototype === Object.prototype || prototype?.constructor?.name === "Object";
@@ -6063,9 +6039,9 @@ function slowBigIntToBase642(value) {
   if (hex.length % 2 === 1)
     hex = "0" + hex;
   const bytes = new Uint8Array(new ArrayBuffer(8));
-  let i3 = 0;
+  let i22 = 0;
   for (const hexByte of hex.match(/.{2}/g).reverse()) {
-    bytes.set([parseInt(hexByte, 16)], i3++);
+    bytes.set([parseInt(hexByte, 16)], i22++);
     value >>= EIGHT2;
   }
   return fromByteArray2(bytes);
@@ -6109,10 +6085,10 @@ function validateObjectField2(k) {
   if (k.startsWith("$")) {
     throw new Error(`Field name ${k} starts with a '$', which is reserved.`);
   }
-  for (let i3 = 0;i3 < k.length; i3 += 1) {
-    const charCode = k.charCodeAt(i3);
+  for (let i22 = 0;i22 < k.length; i22 += 1) {
+    const charCode = k.charCodeAt(i22);
     if (charCode < 32 || charCode >= 127) {
-      throw new Error(`Field name ${k} has invalid character '${k[i3]}': Field names can only contain non-control ASCII characters`);
+      throw new Error(`Field name ${k} has invalid character '${k[i22]}': Field names can only contain non-control ASCII characters`);
     }
   }
 }
@@ -6233,7 +6209,7 @@ function convexToJsonInternal2(value, originalValue, context, includeTopLevelUnd
     return { $bytes: fromByteArray2(new Uint8Array(value)) };
   }
   if (Array.isArray(value)) {
-    return value.map((value2, i3) => convexToJsonInternal2(value2, originalValue, context + `[${i3}]`, false));
+    return value.map((value2, i22) => convexToJsonInternal2(value2, originalValue, context + `[${i22}]`, false));
   }
   if (value instanceof Set) {
     throw new Error(errorMessageForUnsupportedType2(context, "Set", [...value], originalValue));
@@ -6241,7 +6217,7 @@ function convexToJsonInternal2(value, originalValue, context, includeTopLevelUnd
   if (value instanceof Map) {
     throw new Error(errorMessageForUnsupportedType2(context, "Map", [...value], originalValue));
   }
-  if (!isSimpleObject22(value)) {
+  if (!isSimpleObject4(value)) {
     const theType = value?.constructor?.name;
     const typeName = theType ? `${theType} ` : "";
     throw new Error(errorMessageForUnsupportedType2(context, typeName, value, originalValue));
@@ -6758,6 +6734,44 @@ var init_values2 = __esm2(() => {
   init_validator3();
   init_errors2();
 });
+function hexToArrayBuffer3(hex) {
+  if (hex === "") {
+    return new Uint8Array(0).buffer;
+  }
+  const matches = hex.match(/.{1,2}/g);
+  if (!matches) {
+    throw new Error(`Invalid hex string: ${hex}`);
+  }
+  return new Uint8Array(matches.map((byte) => parseInt(byte, 16))).buffer;
+}
+function arrayBufferToHex3(buffer) {
+  return Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join("");
+}
+function stringToHex2(s) {
+  const buffer = new TextEncoder().encode(s);
+  return arrayBufferToHex3(buffer.buffer);
+}
+function hexToString2(hex) {
+  const buffer = hexToArrayBuffer3(hex);
+  return new TextDecoder().decode(buffer);
+}
+function serializeDeveloperId2(tableHex, internalIdHex) {
+  return `${tableHex}${DOC_ID_SEPARATOR2}${internalIdHex}`;
+}
+function deserializeDeveloperId2(developerId) {
+  if (!developerId) {
+    return null;
+  }
+  for (const separator of [DOC_ID_SEPARATOR2, LEGACY_DOC_ID_SEPARATOR2]) {
+    const parts = developerId.split(separator);
+    if (parts.length === 2 && parts[0] && parts[1]) {
+      return { table: parts[0], internalId: parts[1] };
+    }
+  }
+  return null;
+}
+var DOC_ID_SEPARATOR2 = ":";
+var LEGACY_DOC_ID_SEPARATOR2 = ";";
 function encodeNumber2(n) {
   const buffer = new ArrayBuffer(8);
   const view = new DataView(buffer);
@@ -6766,8 +6780,8 @@ function encodeNumber2(n) {
   if (n >= 0) {
     bytes[0] ^= 128;
   } else {
-    for (let i3 = 0;i3 < 8; i3++) {
-      bytes[i3] ^= 255;
+    for (let i22 = 0;i22 < 8; i22++) {
+      bytes[i22] ^= 255;
     }
   }
   return bytes;
@@ -6880,10 +6894,10 @@ function compareIndexKeys2(a, b) {
   const viewA = new Uint8Array(a);
   const viewB = new Uint8Array(b);
   const minLen = Math.min(viewA.length, viewB.length);
-  for (let i3 = 0;i3 < minLen; i3++) {
-    if (viewA[i3] < viewB[i3])
+  for (let i22 = 0;i22 < minLen; i22++) {
+    if (viewA[i22] < viewB[i22])
       return -1;
-    if (viewA[i3] > viewB[i3])
+    if (viewA[i22] > viewB[i22])
       return 1;
   }
   if (viewA.length < viewB.length)
@@ -8222,9 +8236,9 @@ async function listSystemFunctions2(options = {}) {
   });
   const analysisResults = await pooledMap2(filteredListings, (listing) => analyzeModule2(listing, componentPath), 20);
   const results = [];
-  for (let i3 = 0;i3 < filteredListings.length; i3++) {
-    const listing = filteredListings[i3];
-    const result = analysisResults[i3];
+  for (let i22 = 0;i22 < filteredListings.length; i22++) {
+    const listing = filteredListings[i22];
+    const result = analysisResults[i22];
     if (result.status === "rejected") {
       if (!isNpmPackageError2(result.reason)) {
         console.warn(`Failed to analyze module "${listing.path}":`, result.reason);
@@ -9093,7 +9107,7 @@ class ModuleRegistry2 {
   }
   async load(request) {
     const scopes = expandComponentScopes2(request.componentPath);
-    const errors3 = [];
+    const errors2 = [];
     let attempted = false;
     for (const scope of scopes) {
       const loaders = this.scopedLoaders.get(scope);
@@ -9108,7 +9122,7 @@ class ModuleRegistry2 {
             return result;
           }
         } catch (error2) {
-          errors3.push(error2);
+          errors2.push(error2);
         }
       }
     }
@@ -9117,8 +9131,8 @@ class ModuleRegistry2 {
       throw new Error(`Unable to resolve ${description}. No module loaders are registered${request.componentPath ? ` for component "${request.componentPath}"` : ""}. Register a loader with runtime worker options (\`moduleLoader\`, \`moduleLoaders\`, or \`configureModuleLoaders\`).`);
     }
     const error = new Error(`Unable to resolve ${description}`);
-    if (errors3.length > 0) {
-      error.causes = errors3;
+    if (errors2.length > 0) {
+      error.causes = errors2;
     }
     throw error;
   }
@@ -9342,8 +9356,8 @@ function expandComponentScopes2(componentPath) {
   if (componentPath) {
     const normalized = normalizeComponentPath2(componentPath);
     const segments = normalized.split("/").filter(Boolean);
-    for (let i3 = segments.length;i3 > 0; i3--) {
-      scopes.push(segments.slice(0, i3).join("/"));
+    for (let i22 = segments.length;i22 > 0; i22--) {
+      scopes.push(segments.slice(0, i22).join("/"));
     }
   }
   scopes.push("");
@@ -9618,8 +9632,8 @@ Path: ${formatPath(path)}
 Value: ${formatValue(value)}
 Validator: v.array(...)`);
       }
-      for (let i3 = 0;i3 < value.length; i3++) {
-        validateValidator2(validator2.value, value[i3], `${path}[${i3}]`, options);
+      for (let i22 = 0;i22 < value.length; i22++) {
+        validateValidator2(validator2.value, value[i22], `${path}[${i22}]`, options);
       }
       return;
     }
@@ -9647,7 +9661,7 @@ Path: ${formatPath(path)}
 Value: ${formatValue(value)}
 Validator: v.object({...})`);
       }
-      if (!isSimpleObject32(value)) {
+      if (!isSimpleObject22(value)) {
         throw new Error(`Value does not match validator.
 Path: ${formatPath(path)}
 Value: ${formatValue(value)}
@@ -9697,7 +9711,7 @@ function isMatchingValidatorTable2(idTableName, validatorTableName, componentPat
   }
   return idBareName === validatorBareName;
 }
-function isSimpleObject32(value) {
+function isSimpleObject22(value) {
   const isObject = typeof value === "object";
   const prototype = Object.getPrototypeOf(value);
   const isSimple = prototype === null || prototype === Object.prototype || prototype?.constructor?.name === "Object";
@@ -9927,9 +9941,9 @@ var ALPHABET2 = "0123456789abcdefghjkmnpqrstvwxyz";
 var ALPHABET_MAP2;
 var init_base322 = __esm2(() => {
   ALPHABET_MAP2 = new Map;
-  for (let i3 = 0;i3 < ALPHABET2.length; i3++) {
-    ALPHABET_MAP2.set(ALPHABET2[i3], i3);
-    ALPHABET_MAP2.set(ALPHABET2[i3].toUpperCase(), i3);
+  for (let i22 = 0;i22 < ALPHABET2.length; i22++) {
+    ALPHABET_MAP2.set(ALPHABET2[i22], i22);
+    ALPHABET_MAP2.set(ALPHABET2[i22].toUpperCase(), i22);
   }
   ALPHABET_MAP2.set("i", 1);
   ALPHABET_MAP2.set("I", 1);
@@ -10080,8 +10094,8 @@ function isValidDocumentId2(encoded) {
 }
 function internalIdToHex2(internalId) {
   let hex = "";
-  for (let i3 = 0;i3 < internalId.length; i3++) {
-    hex += internalId[i3].toString(16).padStart(2, "0");
+  for (let i22 = 0;i22 < internalId.length; i22++) {
+    hex += internalId[i22].toString(16).padStart(2, "0");
   }
   return hex;
 }
@@ -10093,332 +10107,7 @@ var init_document_id2 = __esm2(() => {
   init_base322();
   cryptoGetRandomValues2 = crypto.getRandomValues.bind(crypto);
 });
-var lookup3 = [];
-var revLookup3 = [];
-var Arr3 = Uint8Array;
-var code3 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-for (i3 = 0, len3 = code3.length;i3 < len3; ++i3) {
-  lookup3[i3] = code3[i3];
-  revLookup3[code3.charCodeAt(i3)] = i3;
-}
-var i3;
-var len3;
-revLookup3[45] = 62;
-revLookup3[95] = 63;
-function getLens3(b64) {
-  var len22 = b64.length;
-  if (len22 % 4 > 0) {
-    throw new Error("Invalid string. Length must be a multiple of 4");
-  }
-  var validLen = b64.indexOf("=");
-  if (validLen === -1)
-    validLen = len22;
-  var placeHoldersLen = validLen === len22 ? 0 : 4 - validLen % 4;
-  return [validLen, placeHoldersLen];
-}
-function _byteLength3(_b64, validLen, placeHoldersLen) {
-  return (validLen + placeHoldersLen) * 3 / 4 - placeHoldersLen;
-}
-function toByteArray3(b64) {
-  var tmp;
-  var lens = getLens3(b64);
-  var validLen = lens[0];
-  var placeHoldersLen = lens[1];
-  var arr = new Arr3(_byteLength3(b64, validLen, placeHoldersLen));
-  var curByte = 0;
-  var len22 = placeHoldersLen > 0 ? validLen - 4 : validLen;
-  var i22;
-  for (i22 = 0;i22 < len22; i22 += 4) {
-    tmp = revLookup3[b64.charCodeAt(i22)] << 18 | revLookup3[b64.charCodeAt(i22 + 1)] << 12 | revLookup3[b64.charCodeAt(i22 + 2)] << 6 | revLookup3[b64.charCodeAt(i22 + 3)];
-    arr[curByte++] = tmp >> 16 & 255;
-    arr[curByte++] = tmp >> 8 & 255;
-    arr[curByte++] = tmp & 255;
-  }
-  if (placeHoldersLen === 2) {
-    tmp = revLookup3[b64.charCodeAt(i22)] << 2 | revLookup3[b64.charCodeAt(i22 + 1)] >> 4;
-    arr[curByte++] = tmp & 255;
-  }
-  if (placeHoldersLen === 1) {
-    tmp = revLookup3[b64.charCodeAt(i22)] << 10 | revLookup3[b64.charCodeAt(i22 + 1)] << 4 | revLookup3[b64.charCodeAt(i22 + 2)] >> 2;
-    arr[curByte++] = tmp >> 8 & 255;
-    arr[curByte++] = tmp & 255;
-  }
-  return arr;
-}
-function tripletToBase643(num) {
-  return lookup3[num >> 18 & 63] + lookup3[num >> 12 & 63] + lookup3[num >> 6 & 63] + lookup3[num & 63];
-}
-function encodeChunk3(uint8, start, end) {
-  var tmp;
-  var output = [];
-  for (var i22 = start;i22 < end; i22 += 3) {
-    tmp = (uint8[i22] << 16 & 16711680) + (uint8[i22 + 1] << 8 & 65280) + (uint8[i22 + 2] & 255);
-    output.push(tripletToBase643(tmp));
-  }
-  return output.join("");
-}
-function fromByteArray3(uint8) {
-  var tmp;
-  var len22 = uint8.length;
-  var extraBytes = len22 % 3;
-  var parts = [];
-  var maxChunkLength = 16383;
-  for (var i22 = 0, len222 = len22 - extraBytes;i22 < len222; i22 += maxChunkLength) {
-    parts.push(encodeChunk3(uint8, i22, i22 + maxChunkLength > len222 ? len222 : i22 + maxChunkLength));
-  }
-  if (extraBytes === 1) {
-    tmp = uint8[len22 - 1];
-    parts.push(lookup3[tmp >> 2] + lookup3[tmp << 4 & 63] + "==");
-  } else if (extraBytes === 2) {
-    tmp = (uint8[len22 - 2] << 8) + uint8[len22 - 1];
-    parts.push(lookup3[tmp >> 10] + lookup3[tmp >> 4 & 63] + lookup3[tmp << 2 & 63] + "=");
-  }
-  return parts.join("");
-}
-function isSimpleObject4(value) {
-  const isObject = typeof value === "object";
-  const prototype = Object.getPrototypeOf(value);
-  const isSimple = prototype === null || prototype === Object.prototype || prototype?.constructor?.name === "Object";
-  return isObject && isSimple;
-}
-var LITTLE_ENDIAN3 = true;
-var MIN_INT643 = BigInt("-9223372036854775808");
-var MAX_INT643 = BigInt("9223372036854775807");
-var ZERO3 = BigInt("0");
-var EIGHT3 = BigInt("8");
-var TWOFIFTYSIX3 = BigInt("256");
-function isSpecial3(n) {
-  return Number.isNaN(n) || !Number.isFinite(n) || Object.is(n, -0);
-}
-function slowBigIntToBase643(value) {
-  if (value < ZERO3) {
-    value -= MIN_INT643 + MIN_INT643;
-  }
-  let hex = value.toString(16);
-  if (hex.length % 2 === 1)
-    hex = "0" + hex;
-  const bytes = new Uint8Array(new ArrayBuffer(8));
-  let i22 = 0;
-  for (const hexByte of hex.match(/.{2}/g).reverse()) {
-    bytes.set([parseInt(hexByte, 16)], i22++);
-    value >>= EIGHT3;
-  }
-  return fromByteArray3(bytes);
-}
-function slowBase64ToBigInt3(encoded) {
-  const integerBytes = toByteArray3(encoded);
-  if (integerBytes.byteLength !== 8) {
-    throw new Error(`Received ${integerBytes.byteLength} bytes, expected 8 for $integer`);
-  }
-  let value = ZERO3;
-  let power = ZERO3;
-  for (const byte of integerBytes) {
-    value += BigInt(byte) * TWOFIFTYSIX3 ** power;
-    power++;
-  }
-  if (value > MAX_INT643) {
-    value += MIN_INT643 + MIN_INT643;
-  }
-  return value;
-}
-function modernBigIntToBase643(value) {
-  if (value < MIN_INT643 || MAX_INT643 < value) {
-    throw new Error(`BigInt ${value} does not fit into a 64-bit signed integer.`);
-  }
-  const buffer = new ArrayBuffer(8);
-  new DataView(buffer).setBigInt64(0, value, true);
-  return fromByteArray3(new Uint8Array(buffer));
-}
-function modernBase64ToBigInt3(encoded) {
-  const integerBytes = toByteArray3(encoded);
-  if (integerBytes.byteLength !== 8) {
-    throw new Error(`Received ${integerBytes.byteLength} bytes, expected 8 for $integer`);
-  }
-  const intBytesView = new DataView(integerBytes.buffer);
-  return intBytesView.getBigInt64(0, true);
-}
-var bigIntToBase643 = DataView.prototype.setBigInt64 ? modernBigIntToBase643 : slowBigIntToBase643;
-var base64ToBigInt3 = DataView.prototype.getBigInt64 ? modernBase64ToBigInt3 : slowBase64ToBigInt3;
-var MAX_IDENTIFIER_LEN3 = 1024;
-function validateObjectField3(k) {
-  if (k.length > MAX_IDENTIFIER_LEN3) {
-    throw new Error(`Field name ${k} exceeds maximum field name length ${MAX_IDENTIFIER_LEN3}.`);
-  }
-  if (k.startsWith("$")) {
-    throw new Error(`Field name ${k} starts with a '$', which is reserved.`);
-  }
-  for (let i22 = 0;i22 < k.length; i22 += 1) {
-    const charCode = k.charCodeAt(i22);
-    if (charCode < 32 || charCode >= 127) {
-      throw new Error(`Field name ${k} has invalid character '${k[i22]}': Field names can only contain non-control ASCII characters`);
-    }
-  }
-}
-function jsonToConvex3(value) {
-  if (value === null) {
-    return value;
-  }
-  if (typeof value === "boolean") {
-    return value;
-  }
-  if (typeof value === "number") {
-    return value;
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((value2) => jsonToConvex3(value2));
-  }
-  if (typeof value !== "object") {
-    throw new Error(`Unexpected type of ${value}`);
-  }
-  const entries = Object.entries(value);
-  if (entries.length === 1) {
-    const key = entries[0][0];
-    if (key === "$bytes") {
-      if (typeof value.$bytes !== "string") {
-        throw new Error(`Malformed $bytes field on ${value}`);
-      }
-      return toByteArray3(value.$bytes).buffer;
-    }
-    if (key === "$integer") {
-      if (typeof value.$integer !== "string") {
-        throw new Error(`Malformed $integer field on ${value}`);
-      }
-      return base64ToBigInt3(value.$integer);
-    }
-    if (key === "$float") {
-      if (typeof value.$float !== "string") {
-        throw new Error(`Malformed $float field on ${value}`);
-      }
-      const floatBytes = toByteArray3(value.$float);
-      if (floatBytes.byteLength !== 8) {
-        throw new Error(`Received ${floatBytes.byteLength} bytes, expected 8 for $float`);
-      }
-      const floatBytesView = new DataView(floatBytes.buffer);
-      const float = floatBytesView.getFloat64(0, LITTLE_ENDIAN3);
-      if (!isSpecial3(float)) {
-        throw new Error(`Float ${float} should be encoded as a number`);
-      }
-      return float;
-    }
-    if (key === "$set") {
-      throw new Error(`Received a Set which is no longer supported as a Convex type.`);
-    }
-    if (key === "$map") {
-      throw new Error(`Received a Map which is no longer supported as a Convex type.`);
-    }
-  }
-  const out = {};
-  for (const [k, v3] of Object.entries(value)) {
-    validateObjectField3(k);
-    out[k] = jsonToConvex3(v3);
-  }
-  return out;
-}
-var MAX_VALUE_FOR_ERROR_LEN3 = 16384;
-function stringifyValueForError3(value) {
-  const str = JSON.stringify(value, (_key, value2) => {
-    if (value2 === undefined) {
-      return "undefined";
-    }
-    if (typeof value2 === "bigint") {
-      return `${value2.toString()}n`;
-    }
-    return value2;
-  });
-  if (str.length > MAX_VALUE_FOR_ERROR_LEN3) {
-    const rest = "[...truncated]";
-    let truncateAt = MAX_VALUE_FOR_ERROR_LEN3 - rest.length;
-    const codePoint = str.codePointAt(truncateAt - 1);
-    if (codePoint !== undefined && codePoint > 65535) {
-      truncateAt -= 1;
-    }
-    return str.substring(0, truncateAt) + rest;
-  }
-  return str;
-}
-function convexToJsonInternal3(value, originalValue, context, includeTopLevelUndefined) {
-  if (value === undefined) {
-    const contextText = context && ` (present at path ${context} in original object ${stringifyValueForError3(originalValue)})`;
-    throw new Error(`undefined is not a valid Convex value${contextText}. To learn about Convex's supported types, see https://docs.convex.dev/using/types.`);
-  }
-  if (value === null) {
-    return value;
-  }
-  if (typeof value === "bigint") {
-    if (value < MIN_INT643 || MAX_INT643 < value) {
-      throw new Error(`BigInt ${value} does not fit into a 64-bit signed integer.`);
-    }
-    return { $integer: bigIntToBase643(value) };
-  }
-  if (typeof value === "number") {
-    if (isSpecial3(value)) {
-      const buffer = new ArrayBuffer(8);
-      new DataView(buffer).setFloat64(0, value, LITTLE_ENDIAN3);
-      return { $float: fromByteArray3(new Uint8Array(buffer)) };
-    } else {
-      return value;
-    }
-  }
-  if (typeof value === "boolean") {
-    return value;
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  if (value instanceof ArrayBuffer) {
-    return { $bytes: fromByteArray3(new Uint8Array(value)) };
-  }
-  if (Array.isArray(value)) {
-    return value.map((value2, i22) => convexToJsonInternal3(value2, originalValue, context + `[${i22}]`, false));
-  }
-  if (value instanceof Set) {
-    throw new Error(errorMessageForUnsupportedType3(context, "Set", [...value], originalValue));
-  }
-  if (value instanceof Map) {
-    throw new Error(errorMessageForUnsupportedType3(context, "Map", [...value], originalValue));
-  }
-  if (!isSimpleObject4(value)) {
-    const theType = value?.constructor?.name;
-    const typeName = theType ? `${theType} ` : "";
-    throw new Error(errorMessageForUnsupportedType3(context, typeName, value, originalValue));
-  }
-  const out = {};
-  const entries = Object.entries(value);
-  entries.sort(([k1, _v1], [k2, _v2]) => k1 === k2 ? 0 : k1 < k2 ? -1 : 1);
-  for (const [k, v3] of entries) {
-    if (v3 !== undefined) {
-      validateObjectField3(k);
-      out[k] = convexToJsonInternal3(v3, originalValue, context + `.${k}`, false);
-    } else if (includeTopLevelUndefined) {
-      validateObjectField3(k);
-      out[k] = convexOrUndefinedToJsonInternal3(v3, originalValue, context + `.${k}`);
-    }
-  }
-  return out;
-}
-function errorMessageForUnsupportedType3(context, typeName, value, originalValue) {
-  if (context) {
-    return `${typeName}${stringifyValueForError3(value)} is not a supported Convex type (present at path ${context} in original object ${stringifyValueForError3(originalValue)}). To learn about Convex's supported types, see https://docs.convex.dev/using/types.`;
-  } else {
-    return `${typeName}${stringifyValueForError3(value)} is not a supported Convex type.`;
-  }
-}
-function convexOrUndefinedToJsonInternal3(value, originalValue, context) {
-  if (value === undefined) {
-    return { $undefined: null };
-  } else {
-    if (originalValue === undefined) {
-      throw new Error(`Programming error. Current value is ${stringifyValueForError3(value)} but original value is undefined`);
-    }
-    return convexToJsonInternal3(value, originalValue, context, false);
-  }
-}
-function convexToJson3(value) {
-  return convexToJsonInternal3(value, value, "", false);
-}
+init_values2();
 function documentIdKey(id) {
   return `${id.table}:${id.internalId}`;
 }
@@ -10664,7 +10353,7 @@ function decodeIndexId2(indexId) {
 }
 init_schema_service2();
 init_index_key_codec2();
-function isSimpleObject42(value) {
+function isSimpleObject32(value) {
   const isObject = typeof value === "object" && value !== null;
   if (!isObject)
     return false;
@@ -10678,7 +10367,7 @@ function evaluateFieldPath2(fieldPath, document) {
   for (const part of parts) {
     if (current == null)
       return;
-    if (!isSimpleObject42(current))
+    if (!isSimpleObject32(current))
       return;
     current = current[part];
   }
@@ -10704,6 +10393,19 @@ function parseDeveloperId2(developerId) {
   }
   return { table: parts.table, internalId: parts.internalId };
 }
+function parseStorageId2(storageId) {
+  const parsed = parseDeveloperId2(storageId);
+  if (parsed) {
+    return parsed;
+  }
+  if (storageId.length === INTERNAL_ID_LENGTH2 * 2 && /^[0-9a-fA-F]+$/.test(storageId)) {
+    return {
+      table: stringToHex2("_storage"),
+      internalId: storageId.toLowerCase()
+    };
+  }
+  return null;
+}
 function isTablePlaceholder2(table) {
   return table.startsWith("#");
 }
@@ -11146,19 +10848,19 @@ class BlobStoreGateway2 {
     if (!this.storage) {
       return null;
     }
-    const docId = parseDeveloperId2(storageId);
+    const docId = parseStorageId2(storageId);
     if (!docId) {
-      console.error(`[BlobStoreGateway] Failed to parse storage ID: ${storageId}`);
+      console.debug(`[BlobStoreGateway] Failed to parse storage ID: ${storageId}`);
       return null;
     }
     const docValue = await this.queryRuntime.getVisibleDocumentById(storageId, docId);
     if (!docValue) {
-      console.error(`[BlobStoreGateway] Document not found for storage ID: ${storageId} (table: ${docId.table}, internalId: ${docId.internalId})`);
+      console.debug(`[BlobStoreGateway] Document not found for storage ID: ${storageId} (table: ${docId.table}, internalId: ${docId.internalId}, ts: ${this.context.snapshotTimestamp})`);
       return null;
     }
     const storedBlob = await this.storage.get(docId.internalId);
     if (!storedBlob) {
-      console.error(`[BlobStoreGateway] Blob not found in storage: ${docId.internalId}`);
+      console.debug(`[BlobStoreGateway] Blob not found in storage: ${docId.internalId}`);
       return null;
     }
     return storedBlob instanceof Blob ? storedBlob : new Blob([storedBlob]);
@@ -11167,7 +10869,7 @@ class BlobStoreGateway2 {
     if (!this.storage) {
       return null;
     }
-    const docId = parseDeveloperId2(storageId);
+    const docId = parseStorageId2(storageId);
     if (!docId) {
       return null;
     }
@@ -11180,7 +10882,7 @@ class BlobStoreGateway2 {
   }
   async delete(storageId) {
     const storage2 = this.requireStorage();
-    const docId = parseDeveloperId2(storageId);
+    const docId = parseStorageId2(storageId);
     if (!docId) {
       return;
     }
@@ -11239,8 +10941,9 @@ function resolveFunctionTarget2(callArgs, currentComponentPath) {
     return parseFunctionHandleTarget2(callArgs.functionHandle);
   }
   if (callArgs && typeof callArgs.functionHandle === "object" && callArgs.functionHandle !== null) {
-    if (typeof callArgs.functionHandle.handle === "string") {
-      return parseFunctionHandleTarget2(callArgs.functionHandle.handle);
+    const handle = callArgs.functionHandle;
+    if (typeof handle.handle === "string") {
+      return parseFunctionHandleTarget2(handle.handle);
     }
   }
   if (callArgs && typeof callArgs.reference === "string") {
@@ -11480,17 +11183,15 @@ class ActionSyscalls2 {
     const type = args.udfType ?? args.type ?? "mutation";
     return await this.invocationManager.execute(target.udfPath, udfArguments, type, target.componentPath);
   }
-  handleCreateFunctionHandle(args) {
+  async handleCreateFunctionHandle(args) {
     const target = resolveFunctionTarget2(args, this.context.componentPath);
     return formatFunctionHandle2(target.componentPath ?? "", target.udfPath);
   }
   async handleVectorSearch(args) {
-    const { query: vectorQuery } = args;
-    return this.queryRuntime.runVectorSearchAction(vectorQuery);
+    return this.queryRuntime.runVectorSearchAction(args.query);
   }
   async handleSearchAction(args) {
-    const { query: searchQuery } = args;
-    return this.queryRuntime.runSearchAction(searchQuery);
+    return this.queryRuntime.runSearchAction(args.query);
   }
 }
 init_values2();
@@ -11798,6 +11499,8 @@ function decodeJwtClaimsToken2(token) {
     return null;
   }
 }
+var DEFAULT_JWKS_CACHE_TTL_MS2 = 5 * 60 * 1000;
+var MAX_JWKS_CACHE_TTL_MS2 = 24 * 60 * 60 * 1000;
 var JWKS_CACHE2 = new Map;
 function decodeJwtUnsafe2(token) {
   if (!token)
@@ -11878,13 +11581,13 @@ class QuerySyscalls2 {
     return { queryId };
   }
   handleQueryCleanup(args) {
-    const { queryId } = args;
+    const queryId = args.queryId;
     delete this.pendingQueries[queryId];
     delete this.queryResults[queryId];
     return {};
   }
   async handleQueryStreamNext(args) {
-    const { queryId } = args;
+    const queryId = args.queryId;
     if (this.pendingQueries[queryId]) {
       const query = this.pendingQueries[queryId];
       delete this.pendingQueries[queryId];
@@ -12203,7 +11906,7 @@ class BaseSqliteDocStore {
     const insertDocStmt = this.adapter.prepare(documentQuery);
     const insertSearchFts = this.fts5Available && this.searchIndexesByTable.size > 0 ? this.adapter.prepare(`INSERT INTO search_indexes (index_id, document_id, ts, deleted, search_body) VALUES (?, ?, ?, ?, ?)`) : null;
     for (const doc of documents) {
-      const { value, deleted } = doc.value ? { value: JSON.stringify(convexToJson3(doc.value.value)), deleted: 0 } : { value: null, deleted: 1 };
+      const { value, deleted } = doc.value ? { value: JSON.stringify(convexToJson2(doc.value.value)), deleted: 0 } : { value: null, deleted: 1 };
       await insertDocStmt.run(this.adapter.hexToBuffer(doc.id.internalId), Number(doc.ts), this.adapter.hexToBuffer(doc.id.table), value, deleted, doc.prev_ts ? Number(doc.prev_ts) : null);
       this.timestampOracle.observeTimestamp(doc.ts);
       if (insertSearchFts) {
@@ -12301,7 +12004,7 @@ class BaseSqliteDocStore {
         ts: BigInt(row.ts),
         value: {
           id: { table: tableId, internalId: docId },
-          value: jsonToConvex3(JSON.parse(row.json_value))
+          value: jsonToConvex2(JSON.parse(row.json_value))
         },
         prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
       };
@@ -12325,7 +12028,7 @@ class BaseSqliteDocStore {
       yield {
         id: { table: tableId, internalId: docId },
         ts: BigInt(row.ts),
-        value: row.deleted === 0 && row.json_value ? { id: { table: tableId, internalId: docId }, value: jsonToConvex3(JSON.parse(row.json_value)) } : null,
+        value: row.deleted === 0 && row.json_value ? { id: { table: tableId, internalId: docId }, value: jsonToConvex2(JSON.parse(row.json_value)) } : null,
         prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
       };
     }
@@ -12354,7 +12057,7 @@ class BaseSqliteDocStore {
         const entry = {
           id: query.id,
           ts: BigInt(row.ts),
-          value: row.deleted === 0 && row.json_value ? { id: query.id, value: jsonToConvex3(JSON.parse(row.json_value)) } : null,
+          value: row.deleted === 0 && row.json_value ? { id: query.id, value: jsonToConvex2(JSON.parse(row.json_value)) } : null,
           prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
         };
         results.set(getPrevRevQueryKey(query), entry);
@@ -12378,7 +12081,7 @@ class BaseSqliteDocStore {
         const entry = {
           id: query.id,
           ts: BigInt(row.ts),
-          value: row.deleted === 0 && row.json_value ? { id: query.id, value: jsonToConvex3(JSON.parse(row.json_value)) } : null,
+          value: row.deleted === 0 && row.json_value ? { id: query.id, value: jsonToConvex2(JSON.parse(row.json_value)) } : null,
           prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
         };
         results.set(getExactRevQueryKey(query), entry);
@@ -12412,7 +12115,7 @@ class BaseSqliteDocStore {
       ts,
       value: {
         id,
-        value: jsonToConvex3(JSON.parse(row.json_value))
+        value: jsonToConvex2(JSON.parse(row.json_value))
       },
       prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
     };
@@ -12458,7 +12161,7 @@ class BaseSqliteDocStore {
           ts,
           value: {
             id: { table, internalId: docIdHex },
-            value: jsonToConvex3(JSON.parse(row.json_value))
+            value: jsonToConvex2(JSON.parse(row.json_value))
           },
           prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
         });
@@ -12506,7 +12209,7 @@ class BaseSqliteDocStore {
         ts,
         value: {
           id: { table, internalId: docIdHex },
-          value: jsonToConvex3(JSON.parse(row.json_value))
+          value: jsonToConvex2(JSON.parse(row.json_value))
         },
         prev_ts: row.prev_ts ? BigInt(row.prev_ts) : null
       };
@@ -12610,9 +12313,9 @@ class BaseSqliteDocStore {
       let dot = 0;
       let queryMagnitude = 0;
       let docMagnitude = 0;
-      for (let i32 = 0;i32 < vector.length; i32++) {
-        const q = vector[i32];
-        const d = embedding[i32];
+      for (let i22 = 0;i22 < vector.length; i22++) {
+        const q = vector[i22];
+        const d = embedding[i22];
         dot += q * d;
         queryMagnitude += q * q;
         docMagnitude += d * d;
@@ -12639,11 +12342,11 @@ class BaseSqliteDocStore {
 class D1StatementWrapper {
   db;
   sql;
-  batchStatements;
-  constructor(db, sql, batchStatements) {
+  getCollector;
+  constructor(db, sql, getCollector) {
     this.db = db;
     this.sql = sql;
-    this.batchStatements = batchStatements;
+    this.getCollector = getCollector;
   }
   async get(...params) {
     const stmt = this.db.prepare(this.sql).bind(...params);
@@ -12657,13 +12360,18 @@ class D1StatementWrapper {
   }
   async run(...params) {
     const stmt = this.db.prepare(this.sql).bind(...params);
-    this.batchStatements.push(stmt);
+    const collector = this.getCollector();
+    if (!collector) {
+      await stmt.run();
+      return;
+    }
+    collector.push(stmt);
   }
 }
 
 class D1SqliteAdapter {
   db;
-  batchStatements = [];
+  statementCollector = null;
   constructor(db) {
     this.db = db;
   }
@@ -12671,16 +12379,23 @@ class D1SqliteAdapter {
     await this.db.prepare(sql).run();
   }
   prepare(sql) {
-    return new D1StatementWrapper(this.db, sql, this.batchStatements);
+    return new D1StatementWrapper(this.db, sql, () => this.statementCollector);
   }
   async transaction(fn) {
-    this.batchStatements = [];
-    const result = await fn();
-    if (this.batchStatements.length > 0) {
-      await this.db.batch(this.batchStatements);
-      this.batchStatements = [];
+    if (this.statementCollector) {
+      return await fn();
+    }
+    const collector = [];
+    this.statementCollector = collector;
+    try {
+      const result = await fn();
+      if (collector.length > 0) {
+        await this.db.batch(collector);
+      }
+      return result;
+    } finally {
+      this.statementCollector = null;
     }
-    return result;
   }
   hexToBuffer(hex) {
     return hexToArrayBuffer(hex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concavejs/docstore-cf-d1",
-  "version": "0.0.1-alpha.5",
+  "version": "0.0.1-alpha.7",
   "license": "FSL-1.1-Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -21,8 +21,8 @@
     "test": "vitest --run --passWithNoTests"
   },
   "dependencies": {
-    "@concavejs/core": "0.0.1-alpha.5",
-    "@concavejs/docstore-sqlite-base": "0.0.1-alpha.5",
+    "@concavejs/core": "0.0.1-alpha.6",
+    "@concavejs/docstore-sqlite-base": "0.0.1-alpha.6",
     "convex": "^1.27.3"
   },
   "devDependencies": {