some integration tests pass

a-type · Oct 18, 2024 · 1b101a1 · 1b101a1
1 parent 27fad38
commit 1b101a1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 118 deletions.
diff --git a/packages/store/src/entities/Entity.ts b/packages/store/src/entities/Entity.ts
@@ -628,6 +628,7 @@ export class Entity<
 				}
 				const file = this.files.get(child.id, {
 					downloadRemote: !!fieldSchema.downloadRemote,
+					ctx: this.ctx,
 				});
 
 				// FIXME: this seems bad and inconsistent

diff --git a/packages/store/src/entities/EntityCache.ts b/packages/store/src/entities/EntityCache.ts
@@ -26,15 +26,6 @@ export class EntityCache {
 		return this.cache.has(oid);
 	};
 
-	getFile = (id: string, options: { downloadRemote: boolean }): EntityFile => {
-		if (this.cache.has(id)) {
-			return this.cache.get(id)! as EntityFile;
-		}
-		const file = new EntityFile(id, options);
-		this.cache.set(id, file);
-		return file;
-	};
-
 	getCached = (oid: string) => {
 		return this.cache.get(oid);
 	};

diff --git a/packages/store/src/persistence/idb/metadata/IdbMetadataDb.ts b/packages/store/src/persistence/idb/metadata/IdbMetadataDb.ts
@@ -122,7 +122,7 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 
 	updateLocalReplica = async (
 		data: Partial<LocalReplicaInfo>,
-		opts?: CommonQueryOptions,
+		opts: CommonQueryOptions = writeOpts,
 	): Promise<void> => {
 		const localReplicaInfo = await this.getLocalReplica(opts);
 		Object.assign(localReplicaInfo, data);
@@ -199,7 +199,7 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 
 	setBaselines = async (
 		baselines: DocumentBaseline[],
-		opts?: CommonQueryOptions,
+		opts: CommonQueryOptions = writeOpts,
 	): Promise<void> => {
 		await this.runAll<any>(
 			'baselines',
@@ -210,7 +210,7 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 
 	deleteBaseline = async (
 		oid: string,
-		opts?: CommonQueryOptions,
+		opts: CommonQueryOptions = writeOpts,
 	): Promise<void> => {
 		await this.run(
 			'baselines',
@@ -269,7 +269,7 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 	consumeEntityOperations = (
 		oid: string,
 		iterator: Iterator<ClientOperation>,
-		opts?: CommonQueryOptions & { to?: string | null },
+		opts: CommonQueryOptions & { to?: string | null } = writeOpts,
 	): Promise<void> => {
 		return this.iterate<StoredClientOperation>(
 			'operations',
@@ -363,7 +363,7 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 
 	addOperations = async (
 		ops: StoredClientOperation[],
-		opts?: CommonQueryOptions,
+		opts: CommonQueryOptions = writeOpts,
 	): Promise<ObjectIdentifier[]> => {
 		let affected = new Set<ObjectIdentifier>();
 		await this.runAll(
@@ -454,3 +454,5 @@ export class IdbMetadataDb extends IdbService implements PersistenceMetadataDb {
 		};
 	};
 }
+
+const writeOpts = { mode: 'readwrite' } as const;
diff --git a/packages/store/src/persistence/idb/queries/migration/openWIPDatabase.ts b/packages/store/src/persistence/idb/queries/migration/openWIPDatabase.ts
diff --git a/packages/store/src/sync/Sync.ts b/packages/store/src/sync/Sync.ts
@@ -438,7 +438,9 @@ export class ServerSync<Presence = any, Profile = any>
 				this.ctx.log(
 					'error',
 					'Failed to upload unsynced files',
-					results.filter((r) => r.status === 'rejected').map((r) => r.reason),
+					results
+						.filter((r): r is PromiseRejectedResult => r.status === 'rejected')
+						.map((r) => r.reason),
 				);
 			}
 		}

diff --git a/test/client/schemaVersions/index.d.ts b/test/client/schemaVersions/index.d.ts
@@ -1,3 +1,5 @@
-import { StorageSchema } from '@verdant-web/common';
-declare const versions: StorageSchema[];
-export default versions;
+
+	import { StorageSchema } from '@verdant-web/common';
+	declare const versions: StorageSchema[];
+	export default versions;
+
diff --git a/test/tests/fuzz.test.ts b/test/tests/fuzz.test.ts
@@ -1,10 +1,8 @@
 import { ReplicaType, Server } from '@verdant-web/server';
 import {
 	ClientWithCollections,
-	collection,
 	createMigration,
 	Entity,
-	migrate,
 	schema,
 	StorageDescriptor,
 } from '@verdant-web/store';
@@ -222,7 +220,6 @@ async function waitForConsistency(
 			const fuzz2 = await getFuzz(client2);
 			const fuzz1Pending = fuzz1.metadata.pendingOperations;
 			const fuzz2Pending = fuzz2.metadata.pendingOperations;
-			debugger;
 			return `[${debugTag}] consistency (${attempts} attempts):
 
 				${snap1}