@verdant-web/store 4.1.6 → 4.3.0

package/src/entities/EntityStore.ts

@@ -1,4 +1,5 @@
 import {
+	AuthorizationKey,
 	DocumentBaseline,
 	ObjectIdentifier,
 	Operation,
@@ -12,16 +13,15 @@ import {
 	groupPatchesByRootOid,
 	isRootOid,
 	removeOidsFromAllSubObjects,
-	AuthorizationKey,
 } from '@verdant-web/common';
+import { WeakEvent } from 'weak-event';
 import { Context } from '../context/context.js';
-import { Entity } from './Entity.js';
+import { FileManager } from '../files/FileManager.js';
+import { processValueFiles } from '../files/utils.js';
 import { Disposable } from '../utils/Disposable.js';
+import { Entity } from './Entity.js';
 import { EntityFamilyMetadata } from './EntityMetadata.js';
-import { FileManager } from '../files/FileManager.js';
 import { OperationBatcher } from './OperationBatcher.js';
-import { WeakEvent } from 'weak-event';
-import { processValueFiles } from '../files/utils.js';
 
 enum AbortReason {
 	Reset,
@@ -347,12 +347,11 @@ export class EntityStore extends Disposable {
 			);
 		}
 
-		const operations = this.ctx.patchCreator.createInitialize(processed, oid);
-		if (access) {
-			operations.forEach((op) => {
-				op.authz = access;
-			});
-		}
+		const operations = this.ctx.patchCreator.createInitialize(
+			processed,
+			oid,
+			access,
+		);
 		await this.batcher.commitOperations(operations, {
 			undoable: !!undoable,
 			source: entity,

package/src/entities/OperationBatcher.ts

@@ -11,8 +11,8 @@ import {
 	operationSupersedes,
 } from '@verdant-web/common';
 import { Context } from '../context/context.js';
-import type { EntityStore } from './EntityStore.js';
 import { Entity } from './Entity.js';
+import type { EntityStore } from './EntityStore.js';
 
 const DEFAULT_BATCH_KEY = '@@default';
 
@@ -257,7 +257,11 @@ export class OperationBatcher {
 		return Promise.all(this.batcher.flushAll());
 	};
 
-	private createUndo = async (data: { ops: Operation[]; source?: Entity }) => {
+	private createUndo = async (data: {
+		ops: Operation[];
+		source?: Entity;
+		isRedo?: boolean;
+	}) => {
 		// this can't be done on-demand because we rely on the current
 		// state of the entities to calculate the inverse operations.
 		const inverseOps = await this.getInverseOperations(data);
@@ -268,11 +272,21 @@ export class OperationBatcher {
 			const redo = await this.createUndo({
 				ops: inverseOps,
 				source: data.source,
+				isRedo: true,
 			});
 			// set time to now for all undo operations, they're happening now.
 			for (const op of inverseOps) {
 				op.timestamp = this.ctx.time.now;
 			}
+
+			this.ctx.log(
+				'debug',
+				data.isRedo ? 'Redo' : 'Undo',
+				inverseOps,
+				'\n was \n',
+				data.ops,
+			);
+
 			await this.commitOperations(
 				inverseOps,
 				// undos should not generate their own undo operations

package/src/index.ts

@@ -1,60 +1,60 @@
+import { Client } from './client/Client.js';
 import {
 	ClientDescriptor,
 	ClientDescriptorOptions,
 } from './client/ClientDescriptor.js';
-import { Client } from './client/Client.js';
 export type { ClientWithCollections } from './client/Client.js';
-export { ClientDescriptor };
-export { Client };
+export { Client, ClientDescriptor };
 // backward compat
-export { ClientDescriptor as StorageDescriptor };
-export { Client as Storage };
-export type { ClientDescriptorOptions };
-export type { ClientDescriptorOptions as StorageInitOptions };
-export { Entity } from './entities/Entity.js';
-export type {
-	ObjectEntity,
-	ListEntity,
-	EntityShape,
-	AccessibleEntityProperty,
-	AnyEntity,
-	EntityDestructured,
-	EntityInit,
-} from './entities/types.js';
-export { ServerSync } from './sync/Sync.js';
-export type { SyncTransportMode } from './sync/Sync.js';
-export { EntityFile, type EntityFileSnapshot } from './files/EntityFile.js';
-export { schema, createMigration } from '@verdant-web/common';
+export { createMigration, schema } from '@verdant-web/common';
 export type {
-	StorageDocument,
-	StorageSchema,
-	StorageCollectionSchema,
+	CollectionFilter,
+	DocumentBaseline,
+	FileData,
+	IndexValueTag,
+	Migration,
+	ObjectIdentifier,
 	StorageAnyFieldSchema,
 	StorageArrayFieldSchema,
-	StorageObjectFieldSchema,
 	StorageBooleanFieldSchema,
+	StorageCollectionSchema,
+	StorageDocument,
 	StorageFieldSchema,
+	StorageFieldsSchema,
 	StorageFileFieldSchema,
 	StorageMapFieldSchema,
 	StorageNumberFieldSchema,
+	StorageObjectFieldSchema,
+	StorageSchema,
 	StorageStringFieldSchema,
-	StorageFieldsSchema,
-	IndexValueTag,
-	Migration,
+	UserInfo,
 	VerdantError,
 	VerdantErrorCode,
-	ObjectIdentifier,
-	CollectionFilter,
-	FileData,
-	DocumentBaseline,
-	UserInfo,
 } from '@verdant-web/common';
-export type { Query } from './queries/types.js';
+export * from './authorization.js';
+export { Entity, getEntityClient } from './entities/Entity.js';
+export type {
+	AccessibleEntityProperty,
+	AnyEntity,
+	EntityDestructured,
+	EntityInit,
+	EntityShape,
+	ListEntity,
+	ObjectEntity,
+} from './entities/types.js';
+export { EntityFile, type EntityFileSnapshot } from './files/EntityFile.js';
+export { IdbPersistence } from './persistence/idb/idbPersistence.js';
+export type * from './persistence/interfaces.js';
 export type { QueryStatus } from './queries/BaseQuery.js';
 export type { CollectionQueries } from './queries/CollectionQueries.js';
-export * from './utils/id.js';
-export { UndoHistory } from './UndoHistory.js';
-export * from './authorization.js';
+export type { Query } from './queries/types.js';
 export * from './sync/cliSync.js';
-export type * from './persistence/interfaces.js';
-export { IdbPersistence } from './persistence/idb/idbPersistence.js';
+export { ServerSync } from './sync/Sync.js';
+export type { SyncTransportMode } from './sync/Sync.js';
+export { UndoHistory } from './UndoHistory.js';
+export * from './utils/id.js';
+export { Client as Storage, ClientDescriptor as StorageDescriptor };
+export type {
+	ClientDescriptorOptions,
+	ClientDescriptorOptions as StorageInitOptions,
+};

package/src/persistence/migration/engine.ts

@@ -1,4 +1,5 @@
 import {
+	AuthorizationKey,
 	CollectionFilter,
 	Migration,
 	MigrationEngine,
@@ -11,10 +12,9 @@ import {
 	diffToPatches,
 	getOid,
 	removeOidPropertiesFromAllSubObjects,
-	AuthorizationKey,
 } from '@verdant-web/common';
-import { OpenDocumentDbContext } from './types.js';
 import { PersistenceDocumentDb, PersistenceNamespace } from '../interfaces.js';
+import { OpenDocumentDbContext } from './types.js';
 
 function getMigrationMutations({
 	migration,
@@ -184,7 +184,14 @@ export async function getMigrationEngine({
 							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,
 							},
 						);