@nkzw/fate 0.1.0 → 0.1.1

package/lib/index.d.mts

@@ -1,4 +1,4 @@
-import { A as ViewSelection, B as RequestOptions, C as TypeConfig, D as ViewEntity, E as ViewData, F as isViewTag, H as Transport, I as FateMutations, L as mutation, M as ViewTag, N as __FateEntityBrand, O as ViewEntityName, P as __FateSelectionBrand, R as FateClient, S as Snapshot, T as View, U as createTRPCTransport, V as createClient, W as getSelectionPlan, _ as Pagination, a as Entity, b as RootDefinition, c as FateThenable, d as MutationDefinition, f as MutationEntity, g as NodesItem, h as MutationResult, i as ConnectionTag, j as ViewSnapshot, k as ViewRef, l as ListItem, m as MutationInput, n as ConnectionMetadata, o as EntityId, p as MutationIdentifier, r as ConnectionRef, s as FateRoots, t as AnyRecord, u as Mask, v as Request, w as TypeName, x as Selection, y as RequestResult, z as RequestMode } from "./types-CNKGKRtz.mjs";
+import { A as ViewSelection, B as RequestOptions, C as TypeConfig, D as ViewEntity, E as ViewData, F as isViewTag, H as Transport, I as FateMutations, L as mutation, M as ViewTag, N as __FateEntityBrand, O as ViewEntityName, P as __FateSelectionBrand, R as FateClient, S as Snapshot, T as View, U as createTRPCTransport, V as createClient, W as getSelectionPlan, _ as Pagination, a as Entity, b as RootDefinition, c as FateThenable, d as MutationDefinition, f as MutationEntity, g as NodesItem, h as MutationResult, i as ConnectionTag, j as ViewSnapshot, k as ViewRef, l as ListItem, m as MutationInput, n as ConnectionMetadata, o as EntityId, p as MutationIdentifier, r as ConnectionRef, s as FateRoots, t as AnyRecord, u as Mask, v as Request, w as TypeName, x as Selection, y as RequestResult, z as RequestMode } from "./types-BiDLhb07.mjs";
 
 //#region src/root.d.ts
 

package/lib/index.mjs

@@ -689,39 +689,45 @@ function wrapMutation(client, identifier) {
 			if (id$1 == null) throw new Error(`fate: Mutation '${identifier.key}' requires an 'id' to delete.`);
 			client.deleteRecord(identifier.entity, id$1, snapshots, listSnapshots);
 		}
-		try {
-			const result = await client.executeMutation(identifier.key, input, selection, {
-				args,
-				plan
-			});
-			if (result && typeof result === "object" && (!deleteRecord || Boolean(view$1))) {
-				const select = collectImplicitSelectedPaths(result);
-				const pendingMask = optimisticEntityId ? client.getPendingOptimisticMask(optimisticEntityId, { excludeToken: optimisticToken }) : null;
-				const filteredSelection = optimisticEntityId ? client.filterSelectionForPendingOptimistics(optimisticEntityId, select, { excludeToken: optimisticToken }) : select;
-				client.write(identifier.entity, result, filteredSelection, void 0, plan, null, pendingMask, insert);
-				if (deleteRecord && id$1 != null) client.deleteRecord(identifier.entity, id$1);
-				const resultId = maybeGetId(config.getId, result);
-				if (optimisticRecordId != null && resultId != null && optimisticRecordId !== resultId) client.deleteRecord(identifier.entity, optimisticRecordId);
-			}
-			return {
-				error: void 0,
-				result
-			};
-		} catch (error) {
-			client.clearOptimisticUpdate(optimisticToken);
-			if (snapshots.size > 0) for (const [id$2, snapshot] of snapshots) client.restore(id$2, snapshot);
-			if (listSnapshots && listSnapshots.size > 0) for (const [name, list] of listSnapshots) client.restoreList(name, list);
-			if (error instanceof Error) {
-				const { data } = error;
-				if ((data ? categorizeTRPCError(getHTTPStatusCodeFromError(data)) : "boundary") === "boundary") throw error;
+		const performMutation = async () => {
+			try {
+				const result = await client.executeMutation(identifier.key, input, selection, {
+					args,
+					plan
+				});
+				if (result && typeof result === "object" && (!deleteRecord || Boolean(view$1))) {
+					const select = collectImplicitSelectedPaths(result);
+					const pendingMask = optimisticEntityId ? client.getPendingOptimisticMask(optimisticEntityId, { excludeToken: optimisticToken }) : null;
+					const filteredSelection = optimisticEntityId ? client.filterSelectionForPendingOptimistics(optimisticEntityId, select, { excludeToken: optimisticToken }) : select;
+					client.write(identifier.entity, result, filteredSelection, void 0, plan, null, pendingMask, insert);
+					if (deleteRecord && id$1 != null) client.deleteRecord(identifier.entity, id$1);
+					const resultId = maybeGetId(config.getId, result);
+					if (optimisticEntityId && resultId != null) client.resolveOptimisticEntity(optimisticEntityId, toEntityId(identifier.entity, resultId));
+					if (optimisticRecordId != null && resultId != null && optimisticRecordId !== resultId) client.deleteRecord(identifier.entity, optimisticRecordId);
+				}
 				return {
-					error,
-					result: void 0
+					error: void 0,
+					result
 				};
-			} else throw new Error(`fate: Mutation '${identifier.key}' failed.`);
-		} finally {
-			client.clearOptimisticUpdate(optimisticToken);
-		}
+			} catch (error) {
+				client.clearOptimisticUpdate(optimisticToken);
+				if (snapshots.size > 0) for (const [id$2, snapshot] of snapshots) client.restore(id$2, snapshot);
+				if (listSnapshots && listSnapshots.size > 0) for (const [name, list] of listSnapshots) client.restoreList(name, list);
+				if (error instanceof Error) {
+					const { data } = error;
+					if ((data ? categorizeTRPCError(getHTTPStatusCodeFromError(data)) : "boundary") === "boundary") throw error;
+					return {
+						error,
+						result: void 0
+					};
+				} else throw new Error(`fate: Mutation '${identifier.key}' failed.`);
+			} finally {
+				client.clearOptimisticUpdate(optimisticToken);
+			}
+		};
+		const mutationPromise = performMutation();
+		if (optimisticEntityId) client.registerPendingOptimisticMutation(optimisticEntityId, mutationPromise);
+		return mutationPromise;
 	};
 }
 function categorizeTRPCError(statusCode) {
@@ -1049,8 +1055,10 @@ var FateClient = class {
 		this.parentLists = /* @__PURE__ */ new Map();
 		this.rootLists = /* @__PURE__ */ new Map();
 		this.pending = /* @__PURE__ */ new Map();
+		this.pendingOptimisticMutations = /* @__PURE__ */ new Map();
 		this.optimisticMasks = /* @__PURE__ */ new Map();
 		this.optimisticByEntity = /* @__PURE__ */ new Map();
+		this.optimisticEntityResolutions = /* @__PURE__ */ new Map();
 		this.optimisticTokenCounter = 0;
 		this.requests = /* @__PURE__ */ new Map();
 		this.rootRequests = /* @__PURE__ */ new Map();
@@ -1177,6 +1185,11 @@ var FateClient = class {
 		}
 		if (type == null) throw new Error(`fate: Invalid view reference. Expected '__typename' to be provided as part of the reference, received '${JSON.stringify(ref)}'.`);
 		const entityId = toEntityId(type, id$1);
+		const resolvedEntityId = this.optimisticEntityResolutions.get(entityId) ?? null;
+		if (resolvedEntityId && resolvedEntityId !== entityId) {
+			const { id: resolvedId, type: resolvedType } = parseEntityId(resolvedEntityId);
+			return this.readView(view$1, createRef(resolvedType, resolvedId, view$1));
+		}
 		const viewNames = getViewNames(view$1);
 		const refViews = ref[ViewsTag];
 		if (!refViews || ![...viewNames].every((name) => refViews.has(name))) {
@@ -1204,6 +1217,14 @@ var FateClient = class {
 		}
 		if (missing.size > 0) {
 			const key = this.pendingKey(entityId, missing);
+			const pendingOptimistic = this.getPendingOptimisticMutations(entityId);
+			if (pendingOptimistic) {
+				const pending = this.pending.get(key);
+				if (pending) return pending;
+				const promise$1 = Promise.all(pendingOptimistic).then(() => this.readView(view$1, ref)).finally(() => this.pending.delete(key));
+				this.pending.set(key, promise$1);
+				return promise$1;
+			}
 			if (this.stalledRequests.has(key)) return resolveSnapshot();
 			const pendingPromise = this.pending.get(key) || null;
 			if (pendingPromise) return pendingPromise;
@@ -1257,6 +1278,24 @@ var FateClient = class {
 			} : void 0
 		};
 	}
+	registerPendingOptimisticMutation(entityId, promise) {
+		let entries = this.pendingOptimisticMutations.get(entityId);
+		if (!entries) {
+			entries = /* @__PURE__ */ new Set();
+			this.pendingOptimisticMutations.set(entityId, entries);
+		}
+		const trackedPromise = promise.catch(() => void 0);
+		entries.add(trackedPromise);
+		trackedPromise.finally(() => {
+			const current = this.pendingOptimisticMutations.get(entityId);
+			if (!current) return;
+			current.delete(trackedPromise);
+			if (current.size === 0) this.pendingOptimisticMutations.delete(entityId);
+		});
+	}
+	resolveOptimisticEntity(optimisticEntityId, resolvedEntityId) {
+		this.optimisticEntityResolutions.set(optimisticEntityId, resolvedEntityId);
+	}
 	registerOptimisticUpdate(entityId, select) {
 		if (!entityId || select.size === 0) return null;
 		const mask = fromPaths(select);
@@ -1298,6 +1337,10 @@ var FateClient = class {
 		}
 		return mask;
 	}
+	getPendingOptimisticMutations(entityId) {
+		const pending = this.pendingOptimisticMutations.get(entityId);
+		return pending && pending.size > 0 ? [...pending] : null;
+	}
 	filterSelectionForPendingOptimistics(entityId, select, options = {}) {
 		if (!entityId || select.size === 0) return select;
 		const pendingMask = this.getPendingOptimisticMask(entityId, options);

package/lib/server.d.mts

@@ -1,4 +1,4 @@
-import { t as AnyRecord } from "./types-CNKGKRtz.mjs";
+import { t as AnyRecord } from "./types-BiDLhb07.mjs";
 import { z } from "zod";
 import { TRPCProcedureBuilder } from "@trpc/server";
 

package/lib/{types-CNKGKRtz.d.mts → types-BiDLhb07.d.mts}

@@ -181,8 +181,10 @@ declare class FateClient<Roots extends FateRoots, Mutations extends FateMutation
   private readonly parentLists;
   private readonly rootLists;
   private readonly pending;
+  private readonly pendingOptimisticMutations;
   private readonly optimisticMasks;
   private readonly optimisticByEntity;
+  private readonly optimisticEntityResolutions;
   private optimisticTokenCounter;
   private readonly requests;
   private readonly rootRequests;
@@ -215,11 +217,14 @@ declare class FateClient<Roots extends FateRoots, Mutations extends FateMutation
   }>;
   readView<T$1 extends Entity, S extends Selection<T$1>, V extends View<T$1, S>>(view: V, ref: ViewRef<T$1['__typename']>): FateThenable<ViewSnapshot<T$1, S>>;
   private mergeListState;
+  registerPendingOptimisticMutation(entityId: EntityId, promise: Promise<unknown>): void;
+  resolveOptimisticEntity(optimisticEntityId: EntityId, resolvedEntityId: EntityId): void;
   registerOptimisticUpdate(entityId: EntityId | null, select: ReadonlySet<string>): number | null;
   clearOptimisticUpdate(token: number | null): void;
   getPendingOptimisticMask(entityId: EntityId | null, options?: {
     excludeToken?: number | null;
   }): FieldMask | null;
+  private getPendingOptimisticMutations;
   filterSelectionForPendingOptimistics(entityId: EntityId | null, select: Set<string>, options?: {
     excludeToken?: number | null;
   }): Set<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/fate",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "fate is a modern data client for React.",
   "homepage": "https://github.com/nkzw-tech/fate",
   "repository": {