@verdant-web/store 4.2.0 → 4.4.0

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/files/EntityFile.ts

@@ -1,5 +1,6 @@
 import { EventSubscriber, FileData } from '@verdant-web/common';
 import { Context } from '../context/context.js';
+import { Entity } from '../entities/Entity.js';
 
 export type EntityFileEvents = {
 	change: () => void;
@@ -8,6 +9,9 @@ export type EntityFileEvents = {
 export const UPDATE = Symbol('entity-file-update');
 export const MARK_FAILED = Symbol('entity-file-mark-failed');
 
+// this one goes on Entity
+export const CHILD_FILE_CHANGED = Symbol('child-file-changed');
+
 export type EntityFileSnapshot = {
 	id: string;
 	url?: string | null;
@@ -27,19 +31,23 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 	private _uploaded = false;
 	private ctx: Context;
 	private unsubscribes: (() => void)[] = [];
+	private parent: Entity;
 
 	constructor(
 		public readonly id: string,
 		{
 			downloadRemote = false,
 			ctx,
+			parent,
 		}: {
 			downloadRemote?: boolean;
 			ctx: Context;
+			parent: Entity;
 		},
 	) {
 		super();
 		this.ctx = ctx;
+		this.parent = parent;
 		this._downloadRemote = downloadRemote;
 
 		this.unsubscribes.push(
@@ -57,6 +65,11 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 		return this._uploaded || this._fileData?.remote || false;
 	}
 
+	private emitChange() {
+		this.parent[CHILD_FILE_CHANGED](this);
+		this.emit('change');
+	}
+
 	[UPDATE] = (fileData: FileData) => {
 		this.ctx.log('debug', 'EntityFile updated', this.id, fileData);
 		this._loading = false;
@@ -69,13 +82,13 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 			this.ctx.log('debug', 'Creating object URL for file', this.id);
 			this._objectUrl = URL.createObjectURL(fileData.file);
 		}
-		this.emit('change');
+		this.emitChange();
 	};
 
 	[MARK_FAILED] = () => {
 		this._failed = true;
 		this._loading = false;
-		this.emit('change');
+		this.emitChange();
 	};
 
 	private onUploaded = (data: FileData) => {
@@ -83,7 +96,7 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 		this._fileData ??= data;
 		this._uploaded = true;
 		this.ctx.log('debug', 'File marked uploaded', this.id, this._fileData);
-		this.emit('change');
+		this.emitChange();
 	};
 
 	get url(): string | null {

package/src/files/FileManager.ts

@@ -1,5 +1,6 @@
 import { FileData } from '@verdant-web/common';
 import { Context } from '../context/context.js';
+import { Entity } from '../entities/Entity.js';
 import { Disposable } from '../internal.js';
 import { Sync } from '../sync/Sync.js';
 import { EntityFile, MARK_FAILED, UPDATE } from './EntityFile.js';
@@ -22,11 +23,11 @@ export class FileManager extends Disposable {
 		);
 	}
 
-	add = async (file: FileData) => {
+	add = async (file: FileData, parent: Entity) => {
 		// 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);
 		}
 
@@ -44,7 +45,10 @@ export class FileManager extends Disposable {
 	 * Immediately returns an EntityFile to use, then either loads
 	 * the file from cache, local database, or the server.
 	 */
-	get = (id: string, options: { downloadRemote?: boolean; ctx: Context }) => {
+	get = (
+		id: string,
+		options: { downloadRemote?: boolean; ctx: Context; parent: Entity },
+	) => {
 		if (this.cache.has(id)) {
 			return this.cache.get(id)!;
 		}

package/src/utils/versions.ts

@@ -17,7 +17,7 @@ export function getLatestVersion(data: {
 			return tsVersion;
 		}
 		return v;
-	}, 0);
+	}, 1);
 
 	return latestVersion;
 }