@verdant-web/store 4.2.0 → 4.4.0

package/dist/esm/files/FileManager.js

@@ -4,11 +4,11 @@ export class FileManager extends Disposable {
     constructor({ sync, context }) {
         super();
         this.cache = new Map();
-        this.add = async (file) => {
+        this.add = async (file, parent) => {
             // immediately cache the file
             let entityFile = this.cache.get(file.id);
             if (!entityFile) {
-                entityFile = new EntityFile(file.id, { ctx: this.context });
+                entityFile = new EntityFile(file.id, { ctx: this.context, parent });
                 this.cache.set(file.id, entityFile);
             }
             if (!file.remote) {

package/dist/esm/files/FileManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/files/FileManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/files/FileManager.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/versions.js

@@ -10,7 +10,7 @@ export function getLatestVersion(data) {
             return tsVersion;
         }
         return v;
-    }, 0);
+    }, 1);
     return latestVersion;
 }
 //# sourceMappingURL=versions.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/store",
-  "version": "4.2.0",
+  "version": "4.4.0",
   "access": "public",
   "type": "module",
   "main": "dist/esm/index.js",
@@ -34,7 +34,7 @@
     "jszip": "^3.10.1",
     "jwt-decode": "^3.1.2",
     "weak-event": "^2.0.5",
-    "@verdant-web/common": "2.8.0"
+    "@verdant-web/common": "2.9.1"
   },
   "devDependencies": {
     "@types/node": "20.10.5",

package/src/__tests__/entities.test.ts

@@ -1,7 +1,19 @@
-import { assert } from '@verdant-web/common';
-import { describe, it, expect, vi, MockedFunction, vitest } from 'vitest';
+import {
+	assert,
+	createRef,
+	EventSubscriber,
+	FixedTimestampProvider,
+	NaiveTimestampProvider,
+	PatchCreator,
+	schema,
+} from '@verdant-web/common';
+import { describe, expect, it, MockedFunction, vi, vitest } from 'vitest';
+import { WeakEvent } from 'weak-event';
+import { Time } from '../context/Time.js';
+import { EntityFamilyMetadata } from '../entities/EntityMetadata.js';
+import { MARK_FAILED } from '../files/EntityFile.js';
+import { Entity, EntityFile } from '../index.js';
 import { createTestStorage } from './fixtures/testStorage.js';
-import { EntityFile } from '../index.js';
 
 async function waitForStoragePropagation(mock: MockedFunction<any>) {
 	await new Promise<void>((resolve, reject) => {
@@ -639,7 +651,7 @@ describe('entities', () => {
 				content: { invalid: 'value' },
 			});
 		}).rejects.toThrowErrorMatchingInlineSnapshot(
-			`[Error: Validation error: Expected string for field content, got [object Object]]`,
+			`[Error: Validation error: Expected string for field content, got {"invalid":"value"}]`,
 		);
 	});
 
@@ -650,7 +662,7 @@ describe('entities', () => {
 		expect(() => {
 			weird.set('file', { invalid: 'value' });
 		}).toThrowErrorMatchingInlineSnapshot(
-			`[Error: Validation error: Expected file or null for field file, got [object Object]]`,
+			`[Error: Validation error: Expected file or null for field file, got {"invalid":"value"}]`,
 		);
 
 		// valid options
@@ -705,4 +717,458 @@ describe('entities', () => {
 
 		expect(item.deleted).toBe(true);
 	});
+
+	it('should apply contextual changes to a pruned entity in a way consistent with the pruned view of the data', async () => {
+		// manually constructing an entity for this test is easiest,
+		// kind of hard to force invalid data otherwise
+		const onPendingOperations = vi.fn();
+		const time = new Time(new NaiveTimestampProvider(), 1);
+		// too much junk in here, have to manually pick and choose
+		let subId = 0;
+		const testCtx = {
+			globalEvents: new EventSubscriber(),
+			time,
+			log: vi.fn(),
+			patchCreator: new PatchCreator(
+				() => time.now,
+				() => `${subId++}`,
+			),
+			files: {
+				add: vi.fn(),
+			},
+			weakRef: (v: any) => new WeakRef(v),
+		} as any;
+		const metadataFamily = new EntityFamilyMetadata({
+			ctx: testCtx,
+			onPendingOperations,
+			rootOid: 'foos/a',
+		});
+		const entity = new Entity({
+			oid: 'foos/a',
+			schema: {
+				type: 'object',
+				properties: {
+					id: schema.fields.id(),
+					content: schema.fields.string(),
+					items: schema.fields.array({
+						items: schema.fields.object({
+							properties: {
+								content: schema.fields.string(),
+							},
+						}),
+					}),
+				},
+			},
+			ctx: testCtx,
+			deleteSelf: vi.fn(),
+			files: {
+				add: vi.fn(),
+			} as any,
+			metadataFamily,
+			storeEvents: {
+				add: new WeakEvent(),
+				replace: new WeakEvent(),
+				resetAll: new WeakEvent(),
+			},
+			readonlyKeys: ['id'],
+		});
+		metadataFamily.addConfirmedData({
+			baselines: [
+				{
+					oid: 'foos/a:1',
+					snapshot: { content: 'item 1' },
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:2',
+					snapshot: { content: 'item 2' },
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:3',
+					snapshot: {}, // INVALID!
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:4',
+					snapshot: { content: 'item 4' },
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:5',
+					snapshot: [
+						createRef('foos/a:1'),
+						createRef('foos/a:2'),
+						createRef('foos/a:3'),
+						createRef('foos/a:4'),
+					],
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a',
+					snapshot: {
+						id: 'a',
+						content: 'the main foo',
+						items: createRef('foos/a:5'),
+					},
+					timestamp: time.now,
+				},
+			],
+		});
+
+		expect(entity.deepInvalid).toBe(true);
+
+		// check all that worked, lol. and that it's
+		// pruned item 3
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			content: 'the main foo',
+			items: [
+				{ content: 'item 1' },
+				{ content: 'item 2' },
+				{ content: 'item 4' },
+			],
+		});
+
+		// also check that unpruned snapshot is correct
+		expect(entity.getUnprunedSnapshot()).toEqual({
+			id: 'a',
+			content: 'the main foo',
+			items: [
+				{ content: 'item 1' },
+				{ content: 'item 2' },
+				{},
+				{ content: 'item 4' },
+			],
+		});
+
+		// now, let's set the content of index 2.
+		// if this works as expected, we should replace
+		// item 4 (even though technically it's at index 3)
+		// because we are respecting the user's intention.
+		const items = entity.get('items');
+		items.set(2, { content: 'new item' });
+
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			content: 'the main foo',
+			items: [
+				{ content: 'item 1' },
+				{ content: 'item 2' },
+				{ content: 'new item' },
+			],
+		});
+
+		// now, the entity has been 'fixed' and is valid again
+		expect(entity.getSnapshot()).toEqual(entity.getUnprunedSnapshot());
+		expect(entity.deepInvalid).toBe(false);
+	});
+
+	it('should only fire deep change once for a file change even if you get it multiple times', async () => {
+		// addressing a specific bug / lazy thing I did that caused a listener leak
+		const storage = await createTestStorage();
+		const weird = await storage.weirds.put({});
+		const fileList = weird.get('fileList');
+		const file = new window.File(['d(⌐□_□)b'], 'test.txt', {
+			type: 'text/plain',
+		});
+		fileList.push(file);
+		const deepListener = vi.fn();
+		fileList.subscribe('changeDeep', deepListener);
+		fileList.get(0);
+		fileList.get(0);
+		fileList.get(0);
+		// easy way to trigger change
+		fileList.get(0)[MARK_FAILED]();
+		expect(deepListener).toHaveBeenCalledTimes(1);
+	});
+
+	it('should correctly prune deep nested objects', () => {
+		// manually constructing an entity for this test is easiest,
+		// kind of hard to force invalid data otherwise
+		const onPendingOperations = vi.fn();
+		const time = new Time(new FixedTimestampProvider(), 1);
+		// too much junk in here, have to manually pick and choose
+		let subId = 100; // avoid false-flag matching of other ids by choosing an arbitrary start point
+		const testCtx = {
+			globalEvents: new EventSubscriber(),
+			time,
+			log: console.log,
+			patchCreator: new PatchCreator(
+				() => time.now,
+				() => `${subId++}`,
+			),
+			files: {
+				add: vi.fn(),
+			},
+			weakRef: (v: any) => new WeakRef(v),
+		} as any;
+		const metadataFamily = new EntityFamilyMetadata({
+			ctx: testCtx,
+			onPendingOperations,
+			rootOid: 'foos/a',
+		});
+		const entity = new Entity({
+			oid: 'foos/a',
+			schema: {
+				type: 'object',
+				properties: {
+					id: schema.fields.id(),
+					// should prune to an empty list entity
+					listTest: schema.fields.array({
+						items: schema.fields.object({
+							fields: {
+								required: schema.fields.string(),
+							},
+						}),
+					}),
+					objectTest: schema.fields.object({
+						default: () => ({
+							// @ts-ignore - excessive nesting
+							nested: {
+								required: 'foo',
+							},
+						}),
+						fields: {
+							nested: schema.fields.object({
+								fields: {
+									required: schema.fields.string(),
+								},
+							}),
+						},
+					}),
+					// this one will not be present at all.
+					missingTest: schema.fields.object({
+						default: () => ({
+							value: 1,
+						}),
+						fields: {
+							value: schema.fields.number(),
+						},
+					}),
+				},
+			},
+			ctx: testCtx,
+			deleteSelf: vi.fn(),
+			files: {
+				add: vi.fn(),
+			} as any,
+			metadataFamily,
+			storeEvents: {
+				add: new WeakEvent(),
+				replace: new WeakEvent(),
+				resetAll: new WeakEvent(),
+			},
+			readonlyKeys: ['id'],
+		});
+		metadataFamily.addConfirmedData({
+			baselines: [
+				{
+					// an invalid list item
+					oid: 'foos/a:1',
+					snapshot: {},
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:2',
+					snapshot: [createRef('foos/a:1')],
+					timestamp: time.now,
+				},
+				{
+					// an invalid nested object
+					oid: 'foos/a:3',
+					snapshot: {},
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a:4',
+					snapshot: { nested: createRef('foos/a:3') },
+					timestamp: time.now,
+				},
+				{
+					oid: 'foos/a',
+					snapshot: {
+						id: 'a',
+						listTest: createRef('foos/a:2'),
+						objectTest: createRef('foos/a:4'),
+					},
+					timestamp: time.now,
+				},
+			],
+		});
+
+		expect(entity.deepInvalid).toBe(true);
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			listTest: [],
+			// gets the default, pruned
+			objectTest: {
+				nested: {
+					required: 'foo',
+				},
+			},
+			missingTest: {
+				value: 1,
+			},
+		});
+
+		// the kicker...
+		const list = entity.get('listTest');
+		expect(list).toBeInstanceOf(Entity);
+		const obj = entity.get('objectTest');
+		expect(obj).toBeInstanceOf(Entity);
+		const missing = entity.get('missingTest');
+		expect(missing).toBeInstanceOf(Entity);
+
+		// we should be able to make edits to the pruned versions
+		// and they get committed.
+		list.push({ required: 'foo' });
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			listTest: [{ required: 'foo' }],
+			objectTest: {
+				nested: {
+					required: 'foo',
+				},
+			},
+			missingTest: {
+				value: 1,
+			},
+		});
+		obj.get('nested').set('required', 'bar');
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			listTest: [{ required: 'foo' }],
+			objectTest: {
+				nested: {
+					required: 'bar',
+				},
+			},
+			missingTest: {
+				value: 1,
+			},
+		});
+		missing.set('value', 2);
+		expect(entity.getSnapshot()).toEqual({
+			id: 'a',
+			listTest: [{ required: 'foo' }],
+			objectTest: {
+				nested: {
+					required: 'bar',
+				},
+				// gets the default, pruned
+			},
+			missingTest: {
+				value: 2,
+			},
+		});
+
+		expect(onPendingOperations).toHaveBeenCalledTimes(5);
+		// when doing those changes above, we see pending operations
+		// added to construct the pruned versions with applied changes
+		function removeExtra(obj: any) {
+			delete obj.timestamp;
+			delete obj.authz;
+			return obj;
+		}
+		// being kind of precious about assertions here since
+		// ordering is not quite as important and some ops create new
+		// oids.
+		const firstCall = onPendingOperations.mock.calls[0][0].map(removeExtra);
+
+		// the required field was set to the default
+		expect(firstCall).toContainEqual({
+			data: {
+				name: 'required',
+				op: 'set',
+				value: 'foo',
+			},
+			oid: 'foos/a:3',
+		});
+
+		// missingTest is created wholesale
+		expect(firstCall).toContainEqual({
+			data: {
+				op: 'set',
+				name: 'missingTest',
+				value: {
+					'@@type': 'ref',
+					id: expect.stringMatching(/^foos\/a:/),
+				},
+			},
+			oid: 'foos/a',
+		});
+		expect(firstCall).toContainEqual({
+			data: {
+				op: 'initialize',
+				value: {
+					value: 1,
+				},
+			},
+			oid: expect.stringMatching(/^foos\/a:/),
+		});
+
+		// we asserted all the contents, now also assert the length
+		expect(firstCall).toHaveLength(3);
+
+		const secondCall = onPendingOperations.mock.calls[1][0].map(removeExtra);
+		// the invalid item was removed from the array
+		expect(secondCall).toContainEqual({
+			data: {
+				op: 'delete',
+			},
+			oid: 'foos/a:1',
+		});
+		expect(secondCall).toContainEqual({
+			data: {
+				op: 'list-remove',
+				only: 'last',
+				value: {
+					'@@type': 'ref',
+					id: 'foos/a:1',
+				},
+			},
+			oid: 'foos/a:2',
+		});
+
+		const thirdCall = onPendingOperations.mock.calls[2][0].map(removeExtra);
+		// we can be more lax here
+		expect(thirdCall).toMatchInlineSnapshot(`
+			[
+			  {
+			    "data": {
+			      "op": "initialize",
+			      "value": {
+			        "required": "foo",
+			      },
+			    },
+			    "oid": "foos/a:100",
+			  },
+			  {
+			    "data": {
+			      "op": "list-push",
+			      "value": {
+			        "@@type": "ref",
+			        "id": "foos/a:100",
+			      },
+			    },
+			    "oid": "foos/a:2",
+			  },
+			]
+		`);
+
+		const fourthCall = onPendingOperations.mock.calls[3][0].map(removeExtra);
+		expect(fourthCall).toMatchInlineSnapshot(`
+			[
+			  {
+			    "data": {
+			      "name": "required",
+			      "op": "set",
+			      "value": "bar",
+			    },
+			    "oid": "foos/a:3",
+			  },
+			]
+		`);
+	});
 });

package/src/__tests__/fixtures/testStorage.ts

@@ -92,7 +92,7 @@ export const weirdCollection = schema.collection({
 	},
 });
 
-const testSchema = schema({
+export const testSchema = schema({
 	version: 1,
 	collections: {
 		todos: todoCollection,

package/src/client/Client.ts

@@ -205,13 +205,18 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 				return await this._entities.addData(data);
 			}
 		} catch (err) {
-			this.context.log('critical', 'Sync failed', err);
+			this.context.log(
+				'critical',
+				'Sync failed. To avoid data corruption, the client will now shut down.',
+				err,
+			);
 			this.emit(
 				'developerError',
 				new Error('Sync failed, see logs or cause', {
 					cause: err,
 				}),
 			);
+			await this.close();
 			throw err;
 		}
 	};

package/src/entities/Entity.test.ts

@@ -1,16 +1,16 @@
-import { describe, expect, it, vi } from 'vitest';
-import { Entity } from './Entity.js';
-import { EntityFamilyMetadata } from './EntityMetadata.js';
-import { Context } from '../context/context.js';
-import { EntityStoreEvents } from './EntityStore.js';
-import { WeakEvent } from 'weak-event';
-import { FileManager } from '../files/FileManager.js';
 import {
 	NaiveTimestampProvider,
 	PatchCreator,
 	groupPatchesByOid,
 } from '@verdant-web/common';
+import { describe, expect, it, vi } from 'vitest';
+import { WeakEvent } from 'weak-event';
+import { Context } from '../context/context.js';
 import { Time } from '../context/Time.js';
+import { FileManager } from '../files/FileManager.js';
+import { Entity } from './Entity.js';
+import { EntityFamilyMetadata } from './EntityMetadata.js';
+import { EntityStoreEvents } from './EntityStore.js';
 
 describe('Entity', () => {
 	const schema = {
@@ -65,6 +65,7 @@ describe('Entity', () => {
 			log: vi.fn(),
 			time: new Time(time, 1),
 			patchCreator,
+			weakRef: (v: any) => new WeakRef(v),
 		};
 		const entity = new Entity({
 			oid: 'test/1',