@verdant-web/store 4.1.6 → 4.3.0

package/dist/esm/index.js

@@ -1,17 +1,15 @@
-import { ClientDescriptor, } from './client/ClientDescriptor.js';
 import { Client } from './client/Client.js';
-export { ClientDescriptor };
-export { Client };
+import { ClientDescriptor, } from './client/ClientDescriptor.js';
+export { Client, ClientDescriptor };
 // backward compat
-export { ClientDescriptor as StorageDescriptor };
-export { Client as Storage };
-export { Entity } from './entities/Entity.js';
-export { ServerSync } from './sync/Sync.js';
-export { EntityFile } from './files/EntityFile.js';
-export { schema, createMigration } from '@verdant-web/common';
-export * from './utils/id.js';
-export { UndoHistory } from './UndoHistory.js';
+export { createMigration, schema } from '@verdant-web/common';
 export * from './authorization.js';
-export * from './sync/cliSync.js';
+export { Entity, getEntityClient } from './entities/Entity.js';
+export { EntityFile } from './files/EntityFile.js';
 export { IdbPersistence } from './persistence/idb/idbPersistence.js';
+export * from './sync/cliSync.js';
+export { ServerSync } from './sync/Sync.js';
+export { UndoHistory } from './UndoHistory.js';
+export * from './utils/id.js';
+export { Client as Storage, ClientDescriptor as StorageDescriptor };
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,kBAAkB;AAClB,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,CAAC;AAG7B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAA2B,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AA4B9D,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;AACpC,kBAAkB;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAyB9D,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAU/D,OAAO,EAAE,UAAU,EAA2B,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAKrE,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC"}

package/dist/esm/persistence/migration/engine.d.ts

@@ -1,6 +1,6 @@
 import { Migration, MigrationEngine } from '@verdant-web/common';
-import { OpenDocumentDbContext } from './types.js';
 import { PersistenceNamespace } from '../interfaces.js';
+import { OpenDocumentDbContext } from './types.js';
 export declare function getMigrationEngine({ migration, context, ns, }: {
     log?: (...args: any[]) => void;
     migration: Migration;

package/dist/esm/persistence/migration/engine.js

@@ -108,7 +108,14 @@ export async function getMigrationEngine({ migration, context, ns, }) {
                     removeOidPropertiesFromAllSubObjects(newValue);
                     assignOidsToAllSubObjects(newValue);
                     const patches = diffToPatches(original, newValue, () => context.time.zeroWithVersion(migration.version), undefined, [], {
+                        // incoming unknown objects are assumed to be the same
+                        // as any pre-existing object.
                         mergeUnknownObjects: true,
+                        // if a field is undefined in the new value, it should be
+                        // erased. this is the only way to allow users to remove
+                        // entries in maps during migrations. it is a little
+                        // dangerous for other types, though.
+                        defaultUndefined: false,
                         authz,
                     });
                     if (patches.length > 0) {

package/dist/esm/persistence/migration/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/persistence/migration/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/persistence/migration/engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAMN,gBAAgB,EAChB,MAAM,EACN,yBAAyB,EACzB,SAAS,EACT,SAAS,EACT,aAAa,EACb,MAAM,EACN,oCAAoC,GACpC,MAAM,qBAAqB,CAAC;AAI7B,SAAS,qBAAqB,CAAC,EAC9B,SAAS,EACT,OAAO,EACP,GAAG,GAKH;IACA,OAAO,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE;QAC9D,GAAG,CAAC,cAAc,CAAC,GAAG;YACrB,GAAG,EAAE,KAAK,EAAE,GAAQ,EAAE,OAAuC,EAAE,EAAE;gBAChE,eAAe;gBACf,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;gBACvE,MAAM,UAAU,GACf,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC;gBACjE,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAElB,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,CACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;oBACnB,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAC5C,GAAG,EACH,GAAG,EACH,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CACf;oBACD,OAAO,EAAE,IAAI;iBACb,CAAC,CACF,CAAC;gBACF,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,MAAM,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;gBAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC9C,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,CACxD,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAChC,CAAC;YACH,CAAC;SACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAS,CAAC,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC5B,SAAS,EACT,OAAO,EACP,SAAS,GAKT;IACA,OAAO,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE;QAC9D,GAAG,CAAC,cAAc,CAAC,GAAG;YACrB,GAAG,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;gBACzB,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC1C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;oBACvD,sFAAsF;oBACtF,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC5D,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAwB,EAAE,EAAE;gBAC3C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC;oBACtC,UAAU,EAAE,cAAc;oBAC1B,KAAK,EAAE,MAAM;iBACb,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG;oBAAE,OAAO,IAAI,CAAC;gBACtB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;oBACvD,sFAAsF;oBACtF,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC5D,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAwB,EAAE,EAAE;gBAC3C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC;oBACpD,UAAU,EAAE,cAAc;oBAC1B,KAAK,EAAE,MAAM;iBACb,CAAC,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAChB,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;oBACrC,sFAAsF;oBACtF,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC;iBAC5D,CAAC,CACF,CACD,CAAC;gBACF,OAAO,IAAI,CAAC;YACb,CAAC;SACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAS,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACxC,SAAS,EACT,OAAO,EACP,EAAE,GAMF;IACA,MAAM,gBAAgB,mCAClB,OAAO,KACV,MAAM,EAAE,SAAS,CAAC,SAAS,GAC3B,CAAC;IACF,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,yBAAyB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoB,CAAC;IAE9C,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,mBAAmB,CAAC;QACnC,SAAS;QACT,OAAO,EAAE,gBAAgB;QACzB,SAAS;KACT,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACvC,SAAS;QACT,OAAO;QACP,GAAG,EAAE,gBAAgB;KACrB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,KAAK,EAAE,UAAkB,EAAE,EAAE;QACrD,MAAM,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,KAAK,EAAgB,CAAC;IAC7C,MAAM,MAAM,GAAoB;QAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO;QACP,gBAAgB;QAChB,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YACvC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO,CAAC,GAAG,CACV,OAAO,EACP,aAAa,IAAI,CAAC,MAAM,iBAAiB,UAAU,EAAE,CACrD,CAAC;YAEF,MAAM,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAQ,EAAE,EAAE;gBAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC5B,MAAM,CACL,CAAC,CAAC,OAAO,EACT,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CACpD,CAAC;gBACF,6DAA6D;gBAC7D,mEAAmE;gBACnE,4DAA4D;gBAC5D,mDAAmD;gBACnD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;gBAC3D,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAChC,yCAAyC;gBACzC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACrC,IAAI,QAAQ,EAAE,CAAC;oBACd,+DAA+D;oBAC/D,gEAAgE;oBAChE,oBAAoB;oBACpB,oCAAoC,CAAC,QAAQ,CAAC,CAAC;oBAC/C,oCAAoC,CAAC,QAAQ,CAAC,CAAC;oBAC/C,yBAAyB,CAAC,QAAQ,CAAC,CAAC;oBACpC,MAAM,OAAO,GAAG,aAAa,CAC5B,QAAQ,EACR,QAAQ,EACR,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,EACrD,SAAS,EACT,EAAE,EACF;wBACC,sDAAsD;wBACtD,8BAA8B;wBAC9B,mBAAmB,EAAE,IAAI;wBACzB,yDAAyD;wBACzD,wDAAwD;wBACxD,oDAAoD;wBACpD,qCAAqC;wBACrC,gBAAgB,EAAE,KAAK;wBACvB,KAAK;qBACL,CACD,CAAC;oBACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACxB,MAAM,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;4BAC7B,UAAU,EAAE,OAAO;4BACnB,OAAO,EAAE,IAAI;yBACb,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;YACF,CAAC,CAAC,CACF,CAAC;QACH,CAAC;QACD,OAAO;QACP,SAAS;QACT,UAAU;QACV,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;KACD,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAAC,EAClC,SAAS,EACT,OAAO,GAIP;IACA,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoB,CAAC;IAE9C,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,EAAS,EAAE;QACpC,GAAG;YACF,MAAM,IAAI,KAAK,CACd,4EAA4E,CAC5E,CAAC;QACH,CAAC;KACD,CAAQ,CAAC;IAEV,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACvC,SAAS;QACT,OAAO;QACP,GAAG,EAAE,OAAO;KACZ,CAAC,CAAC;IACH,MAAM,MAAM,GAAoB;QAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO;QACP,gBAAgB,EAAE,GAAG,EAAE;YACtB,MAAM,IAAI,KAAK,CACd,iIAAiI,CACjI,CAAC;QACH,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACb,MAAM,IAAI,KAAK,CACd,wHAAwH,CACxH,CAAC;QACH,CAAC;QACD,OAAO;QACP,SAAS;QACT,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KAC9B,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/store",
-  "version": "4.1.6",
+  "version": "4.3.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.7.3"
+    "@verdant-web/common": "2.9.0"
   },
   "devDependencies": {
     "@types/node": "20.10.5",

package/src/UndoHistory.ts

@@ -13,6 +13,13 @@ export class UndoHistory extends EventSubscriber<{ change: () => void }> {
 		return this._undone.length > 0;
 	}
 
+	get undoLength() {
+		return this._undoable.length;
+	}
+	get redoLength() {
+		return this._undone.length;
+	}
+
 	undo = async () => {
 		const next = this._undoable.pop();
 		if (next) {

package/src/__tests__/entities.test.ts

@@ -1,7 +1,17 @@
-import { assert } from '@verdant-web/common';
-import { describe, it, expect, vi, MockedFunction, vitest } from 'vitest';
+import {
+	assert,
+	createRef,
+	EventSubscriber,
+	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 { 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 +649,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 +660,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 +715,149 @@ 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(),
+			},
+		} 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);
+	});
 });

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

@@ -85,6 +85,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 
 	constructor(private context: Context) {
 		super();
+		context.getClient = () => this;
 		this.collectionNames = Object.keys(context.schema.collections);
 		this._sync =
 			this.context.config.sync && !context.schema.wip

package/src/client/ClientDescriptor.ts

@@ -4,6 +4,7 @@ import {
 	Migration,
 	PatchCreator,
 	StorageSchema,
+	VerdantError,
 	noop,
 } from '@verdant-web/common';
 import { FileConfig, InitialContext, QueryConfig } from '../context/context.js';
@@ -167,6 +168,13 @@ export class ClientDescriptor<
 				environment,
 				persistenceShutdownHandler: new ShutdownHandler(init.log),
 				pauseRebasing: false,
+				getClient() {
+					throw new VerdantError(
+						VerdantError.Code.Unexpected,
+						undefined,
+						'Client not yet initialized. This is a Verdant bug, please report it.',
+					);
+				},
 			};
 			ctx.log('info', 'Initializing client', {
 				namespace: ctx.namespace,

package/src/context/context.ts

@@ -10,6 +10,7 @@ import {
 	StorageSchema,
 } from '@verdant-web/common';
 import { UndoHistory } from '../UndoHistory.js';
+import type { Client } from '../client/Client.js';
 import { PersistenceFiles } from '../persistence/PersistenceFiles.js';
 import type { PersistenceMetadata } from '../persistence/PersistenceMetadata.js';
 import type { PersistenceDocuments } from '../persistence/PersistenceQueries.js';
@@ -110,6 +111,12 @@ export interface Context {
 	};
 
 	persistence: PersistenceImplementation;
+
+	/**
+	 * Must be defined by the Client once it exists. Attempts to use this before
+	 * it's ready will rightfully throw an error.
+	 */
+	getClient: () => Client;
 }
 
 export interface FileConfig {

package/src/entities/Entity.ts

@@ -17,6 +17,7 @@ import {
 	isFileRef,
 	isNullable,
 	isObject,
+	isObjectRef,
 	isRef,
 	maybeGetOid,
 	memoByKeys,
@@ -26,12 +27,13 @@ import {
 import { Context } from '../context/context.js';
 import { FileManager } from '../files/FileManager.js';
 import { processValueFiles } from '../files/utils.js';
-import { EntityFile } from '../index.js';
+import { ClientWithCollections, EntityFile } from '../index.js';
 import { EntityCache } from './EntityCache.js';
 import { EntityFamilyMetadata, EntityMetadataView } from './EntityMetadata.js';
 import { EntityStoreEventData, EntityStoreEvents } from './EntityStore.js';
 import { entityFieldSubscriber } from './entityFieldSubscriber.js';
 import {
+	AnyEntity,
 	BaseEntityValue,
 	DataFromInit,
 	EntityChange,
@@ -56,6 +58,8 @@ export interface EntityInit {
 	deleteSelf: () => void;
 }
 
+const PRIVATE_ENTITY_CONTEXT_KEY = Symbol('private entity context key');
+
 export class Entity<
 		Init = any,
 		KeyValue extends BaseEntityValue = any,
@@ -79,6 +83,10 @@ export class Entity<
 	private files;
 	private storeEvents;
 
+	get [PRIVATE_ENTITY_CONTEXT_KEY]() {
+		return this.ctx;
+	}
+
 	// an internal representation of this Entity.
 	// if present, this is the cached, known value. If null,
 	// the entity is deleted. If undefined, we need to recompute
@@ -290,7 +298,12 @@ export class Entity<
 						break;
 					}
 				} else {
-					this.cachedView[key] = child;
+					// special case - rewrite undefined fields to null
+					if (isNullable(schema) && child === undefined) {
+						this.cachedView[key] = null;
+					} else {
+						this.cachedView[key] = child;
+					}
 				}
 			}
 		}
@@ -318,6 +331,33 @@ export class Entity<
 		return !!this.validate();
 	}
 
+	/**
+	 * Returns true if this or any child is invalid (pruned)
+	 */
+	get deepInvalid(): boolean {
+		if (this.invalid) return true;
+		if (Array.isArray(this.rawView)) {
+			for (let i = 0; i < this.rawView.length; i++) {
+				if (isObjectRef(this.rawView[i])) {
+					const child = this.getChild(i, this.rawView[i].id);
+					if (child.deepInvalid) {
+						return true;
+					}
+				}
+			}
+		} else if (isObject(this.rawView)) {
+			for (const key in this.rawView) {
+				if (isObjectRef(this.rawView[key])) {
+					const child = this.getChild(key, this.rawView[key].id);
+					if (child.deepInvalid) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
 	get isList() {
 		// have to turn TS off here as our two interfaces both implement
 		// const values for this boolean.
@@ -411,7 +451,7 @@ export class Entity<
 					field: this.schema,
 					value: this.rawView,
 					fieldPath: this.fieldPath,
-					depth: 1,
+					expectRefs: true,
 				}) ?? undefined;
 			return this.validationError;
 		},
@@ -449,6 +489,37 @@ export class Entity<
 		}
 	};
 
+	private rawViewWithMappedChildren = (
+		mapper: (child: Entity | EntityFile) => any,
+	) => {
+		const view = this.rawView;
+		if (!view) {
+			return null;
+		}
+		if (Array.isArray(view)) {
+			const mapped = view.map((value, i) => {
+				if (isRef(value)) {
+					return mapper(this.getChild(i, value.id));
+				} else {
+					return value;
+				}
+			});
+			assignOid(mapped, this.oid);
+			return mapped;
+		} else {
+			const mapped = Object.entries(view).reduce((acc, [key, value]) => {
+				if (isRef(value)) {
+					acc[key as any] = mapper(this.getChild(key, value.id));
+				} else {
+					acc[key as any] = value;
+				}
+				return acc;
+			}, {} as any);
+			assignOid(mapped, this.oid);
+			return mapped;
+		}
+	};
+
 	/**
 	 * A current snapshot of this Entity's data, including nested
 	 * Entities.
@@ -457,10 +528,62 @@ export class Entity<
 		return this.viewWithMappedChildren((child) => child.getSnapshot());
 	};
 
+	/**
+	 * A snapshot of this Entity with unpruned (invalid) data. This will
+	 * not conform to the entity schema and should be used carefully.
+	 *
+	 * Can be used to inspect or recover invalid, pruned data not
+	 * otherwise accessible.
+	 */
+	getUnprunedSnapshot = (): any => {
+		return this.rawViewWithMappedChildren((child) => {
+			if (child instanceof EntityFile) return child.getSnapshot();
+			return child.getUnprunedSnapshot();
+		});
+	};
+
 	// change management methods (internal use only)
 	private addPendingOperations = (operations: Operation[]) => {
-		this.ctx.log('debug', 'Entity: adding pending operations', this.oid);
+		this.ctx.log(
+			'debug',
+			'Entity: adding pending operations',
+			this.oid,
+			operations,
+		);
+
+		// special case -- if this entity is pruned, any changes we apply to it
+		// will be in relation to 'exposed' pruned data, not the 'real world'
+		// data that's backing it. That means those changes will produce unexpected
+		// or further invalid results. To avoid this, we basically stamp in the
+		// pruned version of this entity before proceeding.
+		//
+		// as an example of a failure mode without this check, consider a list:
+		// [1, 2, <pruned>, 4, 5]
+		// the user sees: [1, 2, 4, 5]
+		// when they try to replace the item at index 2 with "0" (they see "4"), they
+		// actually replace the invisible pruned item, resulting in [1, 2, 0, 4, 5]
+		// being the result when they expected [1, 2, 0, 5].
+		//
+		// To "stamp" the data before applying user changes, we diff the snapshot
+		// (which is the pruned version) with the current state of the entity.
+		if (this.deepInvalid) {
+			this.ctx.log(
+				'warn',
+				'Changes are being applied to a pruned entity. This means that the pruned version is being treated as the new baseline and any pruned invalid data is lost.',
+				this.oid,
+			);
+			this.canonizePrunedVersion();
+		}
+
+		this.applyPendingOperations(operations);
+	};
 
+	// naming is fuzzy here, but this method was split out from
+	// addPendingOperations since that method also conditionally canonizes
+	// the pruned snapshot, and I wanted to keep the actual insertion of
+	// the ops in one place, so leaving it as part of addPendingOperations
+	// would introduce infinite recursion when canonizing.
+	private applyPendingOperations = (operations: Operation[]) => {
 		// apply authz to all operations
 		if (this.access) {
 			for (const op of operations) {
@@ -474,6 +597,21 @@ export class Entity<
 		}
 	};
 
+	private canonizePrunedVersion = () => {
+		const snapshot = this.getSnapshot();
+		const unprunedSnapshot = this.getUnprunedSnapshot();
+		const operations = this.patchCreator.createDiff(
+			unprunedSnapshot,
+			snapshot,
+			{
+				authz: this.access,
+				merge: false,
+			},
+		);
+
+		this.applyPendingOperations(operations);
+	};
+
 	private addConfirmedData = (data: EntityStoreEventData) => {
 		this.ctx.log('debug', 'Entity: adding confirmed data', this.oid);
 		const changes = this.metadataFamily.addConfirmedData(data);
@@ -920,7 +1058,7 @@ export class Entity<
 		this.addPendingOperations(
 			this.patchCreator.createDiff(this.getSnapshot(), changes, {
 				mergeUnknownObjects: !replaceSubObjects,
-				defaultUndefined: merge,
+				merge,
 			}),
 		);
 	};
@@ -1126,3 +1264,11 @@ function assertNumber(key: unknown): asserts key is number {
 	if (typeof key !== 'number')
 		throw new Error('Only number keys are supported in list entities');
 }
+
+export function getEntityClient(
+	entity: AnyEntity<any, any, any>,
+): ClientWithCollections {
+	return (entity as Entity)[
+		PRIVATE_ENTITY_CONTEXT_KEY
+	].getClient() as ClientWithCollections;
+}

package/src/entities/EntityMetadata.ts

@@ -1,4 +1,5 @@
 import {
+	AuthorizationKey,
 	DocumentBaseline,
 	ObjectIdentifier,
 	Operation,
@@ -20,7 +21,7 @@ export type EntityMetadataView = {
 	empty: boolean;
 	updatedAt: number;
 	latestTimestamp: string | null;
-	authz?: string;
+	authz?: AuthorizationKey;
 };
 
 export class EntityMetadata {
@@ -101,7 +102,7 @@ export class EntityMetadata {
 					// we don't use after for pending ops, they're all
 					// logically in the future
 					null,
-			  );
+				);
 		if (pendingResult.authz) {
 			authz = pendingResult.authz;
 		}
@@ -221,10 +222,10 @@ export class EntityMetadata {
 		latestTimestamp: string | null;
 		deleted: boolean;
 		futureSeen: string | undefined;
-		authz?: string;
+		authz?: AuthorizationKey;
 	} => {
 		let futureSeen: string | undefined = undefined;
-		let authz: string | undefined = undefined;
+		let authz: AuthorizationKey | undefined = undefined;
 
 		const now = this.ctx.time.now;
 		for (const op of operations) {