@concavejs/docstore-cf-d1 0.0.1-alpha.8 → 0.0.1-alpha.9

package/dist/index.js

@@ -4679,6 +4679,7 @@ class AccessLog {
     return this.ranges.getRanges().map(serializeKeyRange);
   }
 }
+
 // ../core/dist/tables/memory-table-registry.js
 init_interface();
 
@@ -4811,7 +4812,6 @@ class KernelContext {
   }
   recordTableRead(tableName) {
     if (this.mutationTransaction) {
-      this.mutationTransaction.recordTableScan(stringToHex(tableName), []);
       return;
     }
     this.readLog.addTableScan(tableName);
@@ -4824,8 +4824,6 @@ class KernelContext {
   }
   recordIndexRange(tableName, indexDescriptor, startKey, endKey) {
     if (this.mutationTransaction) {
-      const indexId = indexKeyspaceId(tableName, indexDescriptor);
-      this.mutationTransaction.recordIndexRangeScan(indexId, startKey, endKey, []);
       return;
     }
     this.readLog.addIndexRange(tableName, indexDescriptor, startKey, endKey);
@@ -4984,11 +4982,12 @@ class BlobStoreGateway {
     if (!latest || latest.ts > this.context.snapshotTimestamp) {
       return;
     }
-    await storage2.delete(docId.internalId);
+    const canonicalDocId = latest.value.id;
+    await storage2.delete(canonicalDocId.internalId);
     const timestamp2 = this.docStore.allocateTimestamp();
-    const entry = { ts: timestamp2, id: docId, value: null, prev_ts: latest.ts };
+    const entry = { ts: timestamp2, id: canonicalDocId, value: null, prev_ts: latest.ts };
     await this.docStore.applyWrites([entry], new Set, "Error");
-    this.context.recordLocalWrite(storageId, "_storage", null, docId);
+    this.context.recordLocalWrite(storageId, "_storage", null, canonicalDocId);
   }
   requireStorage() {
     if (!this.storage) {
@@ -5195,16 +5194,17 @@ class SchedulerGateway {
     if (!latest) {
       throw new Error(`Scheduled job with id ${id} not found.`);
     }
+    const canonicalDocId = latest.value.id;
     const newValue = {
       ...latest.value.value,
       state: state ?? { kind: "canceled" }
     };
-    const resolvedDocument = { id: docId, value: newValue };
+    const resolvedDocument = { id: canonicalDocId, value: newValue };
     const timestamp2 = this.docStore.allocateTimestamp();
-    const entry = { ts: timestamp2, id: docId, value: resolvedDocument, prev_ts: latest.ts };
+    const entry = { ts: timestamp2, id: canonicalDocId, value: resolvedDocument, prev_ts: latest.ts };
     await this.docStore.applyWrites([entry], new Set, "Error");
-    const tableName = await resolveTableName(docId, this.context.tableRegistry);
-    this.context.recordLocalWrite(id, tableName, resolvedDocument.value, docId);
+    const tableName = await resolveTableName(canonicalDocId, this.context.tableRegistry);
+    this.context.recordLocalWrite(id, tableName, resolvedDocument.value, canonicalDocId);
   }
 }
 
@@ -5422,13 +5422,14 @@ class DatabaseSyscalls {
     if (!latest) {
       throw new Error(`Document with id ${id} not found.`);
     }
+    const canonicalDocId = latest.value.id;
     const timestamp2 = this.docStore.allocateTimestamp();
-    const entry = { ts: timestamp2, id: docId, value: null, prev_ts: latest.ts };
+    const entry = { ts: timestamp2, id: canonicalDocId, value: null, prev_ts: latest.ts };
     const indexes = await this.schemaService.getAllIndexesForTable(bareTableName);
-    const indexUpdates = generateIndexUpdates(fullTableName, docId, null, latest.value.value, indexes);
+    const indexUpdates = generateIndexUpdates(fullTableName, canonicalDocId, null, latest.value.value, indexes);
     const indexEntries = new Set(indexUpdates.map((update) => ({ ts: timestamp2, update })));
     await this.docStore.applyWrites([entry], indexEntries, "Error");
-    this.context.recordLocalWrite(id, fullTableName, null, docId);
+    this.context.recordLocalWrite(id, fullTableName, null, canonicalDocId);
     return {};
   }
   async handleShallowMerge(args) {
@@ -5454,6 +5455,7 @@ class DatabaseSyscalls {
     if (!latest) {
       throw new Error(`Document with id ${id} not found.`);
     }
+    const canonicalDocId = latest.value.id;
     const existingValue = latest.value.value;
     const newValue = { ...existingValue };
     if (typeof value === "object" && value !== null && "$undefined" in value) {
@@ -5480,14 +5482,14 @@ class DatabaseSyscalls {
       }
     }
     await this.schemaService.validate(bareTableName, newValue);
-    const resolvedDocument = { id: docId, value: newValue };
+    const resolvedDocument = { id: canonicalDocId, value: newValue };
     const timestamp2 = this.docStore.allocateTimestamp();
-    const entry = { ts: timestamp2, id: docId, value: resolvedDocument, prev_ts: latest.ts };
+    const entry = { ts: timestamp2, id: canonicalDocId, value: resolvedDocument, prev_ts: latest.ts };
     const indexes = await this.schemaService.getAllIndexesForTable(bareTableName);
-    const indexUpdates = generateIndexUpdates(fullTableName, docId, resolvedDocument.value, existingValue, indexes);
+    const indexUpdates = generateIndexUpdates(fullTableName, canonicalDocId, resolvedDocument.value, existingValue, indexes);
     const indexEntries = new Set(indexUpdates.map((update) => ({ ts: timestamp2, update })));
     await this.docStore.applyWrites([entry], indexEntries, "Error");
-    this.context.recordLocalWrite(id, fullTableName, resolvedDocument.value, docId);
+    this.context.recordLocalWrite(id, fullTableName, resolvedDocument.value, canonicalDocId);
     return {};
   }
   async handleReplace(args) {
@@ -5509,17 +5511,18 @@ class DatabaseSyscalls {
     if (!latest) {
       throw new Error(`Document with id ${id} not found.`);
     }
+    const canonicalDocId = latest.value.id;
     const { _id, _creationTime } = latest.value.value;
     const newValue = { ...replaceValue, _id, _creationTime };
     await this.schemaService.validate(bareTableName, newValue);
-    const resolvedDocument = { id: docId, value: newValue };
+    const resolvedDocument = { id: canonicalDocId, value: newValue };
     const timestamp2 = this.docStore.allocateTimestamp();
-    const entry = { ts: timestamp2, id: docId, value: resolvedDocument, prev_ts: latest.ts };
+    const entry = { ts: timestamp2, id: canonicalDocId, value: resolvedDocument, prev_ts: latest.ts };
     const indexes = await this.schemaService.getAllIndexesForTable(bareTableName);
-    const indexUpdates = generateIndexUpdates(fullTableName, docId, resolvedDocument.value, latest.value.value, indexes);
+    const indexUpdates = generateIndexUpdates(fullTableName, canonicalDocId, resolvedDocument.value, latest.value.value, indexes);
     const indexEntries = new Set(indexUpdates.map((update) => ({ ts: timestamp2, update })));
     await this.docStore.applyWrites([entry], indexEntries, "Error");
-    this.context.recordLocalWrite(id, fullTableName, newValue, docId);
+    this.context.recordLocalWrite(id, fullTableName, newValue, canonicalDocId);
     return {};
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concavejs/docstore-cf-d1",
-  "version": "0.0.1-alpha.8",
+  "version": "0.0.1-alpha.9",
   "license": "FSL-1.1-Apache-2.0",
   "publishConfig": {
     "access": "public"