@mearie/core 0.6.4 → 0.6.6

package/dist/{make-C7I1YIXm.mjs → from-abort-signal-ClRa7iWd.mjs}

@@ -400,9 +400,9 @@ const takeUntil = (notifier) => {
 			const complete = () => {
 				if (completed) return;
 				completed = true;
-				if (sourceSubscription) sourceSubscription.unsubscribe();
 				if (notifierSubscription) notifierSubscription.unsubscribe();
 				sink.complete();
+				if (sourceSubscription) sourceSubscription.unsubscribe();
 			};
 			notifierSubscription = notifier({
 				next() {
@@ -709,4 +709,28 @@ const make = (subscriber) => {
 };
 
 //#endregion
-export { mergeMap as C, filter as S, compose as _, finalize as a, merge as b, share as c, map as d, peek as f, subscribe as g, publish as h, fromValue as i, takeUntil as l, collect as m, fromSubscription as n, initialize as o, collectAll as p, makeSubject as r, switchMap as s, make as t, take as u, fromArray as v, pipe as w, fromPromise as x, tap as y };
+//#region src/stream/sources/from-abort-signal.ts
+/**
+* Creates a source that emits when the given AbortSignal is aborted.
+* If the signal is already aborted, emits immediately.
+* @param signal - The AbortSignal to observe.
+* @returns A Source that emits once when the signal aborts.
+*/
+const fromAbortSignal = (signal) => {
+	return make(({ next, complete }) => {
+		if (signal.aborted) {
+			next(void 0);
+			complete();
+			return () => {};
+		}
+		const handler = () => {
+			next(void 0);
+			complete();
+		};
+		signal.addEventListener("abort", handler);
+		return () => signal.removeEventListener("abort", handler);
+	});
+};
+
+//#endregion
+export { filter as C, fromPromise as S, pipe as T, subscribe as _, fromValue as a, tap as b, switchMap as c, take as d, map as f, publish as g, collect as h, makeSubject as i, share as l, collectAll as m, make as n, finalize as o, peek as p, fromSubscription as r, initialize as s, fromAbortSignal as t, takeUntil as u, compose as v, mergeMap as w, merge as x, fromArray as y };

package/dist/{make-BhxZYW3l.d.cts → from-abort-signal-CsSc5Ee6.d.cts}

@@ -402,4 +402,13 @@ declare const make: <T>(subscriber: (observer: {
   complete: () => void;
 }) => () => void) => Source<T>;
 //#endregion
-export { Subscription as A, Observer as C, Operator as D, pipe as E, Sink as O, publish as S, compose as T, filter as _, makeSubject as a, collectAll as b, finalize as c, switchMap as d, mergeMap as f, take as g, takeUntil as h, Subject as i, Source as k, initialize as l, share as m, fromPromise as n, fromArray as o, merge as p, fromSubscription as r, fromValue as s, make as t, tap as u, map as v, subscribe as w, collect as x, peek as y };
+//#region src/stream/sources/from-abort-signal.d.ts
+/**
+ * Creates a source that emits when the given AbortSignal is aborted.
+ * If the signal is already aborted, emits immediately.
+ * @param signal - The AbortSignal to observe.
+ * @returns A Source that emits once when the signal aborts.
+ */
+declare const fromAbortSignal: (signal: AbortSignal) => Source<void>;
+//#endregion
+export { Source as A, publish as C, pipe as D, compose as E, Operator as O, collect as S, subscribe as T, take as _, Subject as a, peek as b, fromValue as c, tap as d, switchMap as f, takeUntil as g, share as h, fromSubscription as i, Subscription as j, Sink as k, finalize as l, merge as m, make as n, makeSubject as o, mergeMap as p, fromPromise as r, fromArray as s, fromAbortSignal as t, initialize as u, filter as v, Observer as w, collectAll as x, map as y };

package/dist/{make-DxW2Pxe-.cjs → from-abort-signal-CtLzHe8K.cjs}

@@ -401,9 +401,9 @@ const takeUntil = (notifier) => {
 			const complete = () => {
 				if (completed) return;
 				completed = true;
-				if (sourceSubscription) sourceSubscription.unsubscribe();
 				if (notifierSubscription) notifierSubscription.unsubscribe();
 				sink.complete();
+				if (sourceSubscription) sourceSubscription.unsubscribe();
 			};
 			notifierSubscription = notifier({
 				next() {
@@ -709,6 +709,30 @@ const make = (subscriber) => {
 	};
 };
 
+//#endregion
+//#region src/stream/sources/from-abort-signal.ts
+/**
+* Creates a source that emits when the given AbortSignal is aborted.
+* If the signal is already aborted, emits immediately.
+* @param signal - The AbortSignal to observe.
+* @returns A Source that emits once when the signal aborts.
+*/
+const fromAbortSignal = (signal) => {
+	return make(({ next, complete }) => {
+		if (signal.aborted) {
+			next(void 0);
+			complete();
+			return () => {};
+		}
+		const handler = () => {
+			next(void 0);
+			complete();
+		};
+		signal.addEventListener("abort", handler);
+		return () => signal.removeEventListener("abort", handler);
+	});
+};
+
 //#endregion
 Object.defineProperty(exports, 'collect', {
   enumerable: true,
@@ -740,6 +764,12 @@ Object.defineProperty(exports, 'finalize', {
     return finalize;
   }
 });
+Object.defineProperty(exports, 'fromAbortSignal', {
+  enumerable: true,
+  get: function () {
+    return fromAbortSignal;
+  }
+});
 Object.defineProperty(exports, 'fromArray', {
   enumerable: true,
   get: function () {

package/dist/{make-Ve8TkMHJ.d.mts → from-abort-signal-ZiBY-b44.d.mts}

@@ -402,4 +402,13 @@ declare const make: <T>(subscriber: (observer: {
   complete: () => void;
 }) => () => void) => Source<T>;
 //#endregion
-export { Subscription as A, Observer as C, Operator as D, pipe as E, Sink as O, publish as S, compose as T, filter as _, makeSubject as a, collectAll as b, finalize as c, switchMap as d, mergeMap as f, take as g, takeUntil as h, Subject as i, Source as k, initialize as l, share as m, fromPromise as n, fromArray as o, merge as p, fromSubscription as r, fromValue as s, make as t, tap as u, map as v, subscribe as w, collect as x, peek as y };
+//#region src/stream/sources/from-abort-signal.d.ts
+/**
+ * Creates a source that emits when the given AbortSignal is aborted.
+ * If the signal is already aborted, emits immediately.
+ * @param signal - The AbortSignal to observe.
+ * @returns A Source that emits once when the signal aborts.
+ */
+declare const fromAbortSignal: (signal: AbortSignal) => Source<void>;
+//#endregion
+export { Source as A, publish as C, pipe as D, compose as E, Operator as O, collect as S, subscribe as T, take as _, Subject as a, peek as b, fromValue as c, tap as d, switchMap as f, takeUntil as g, share as h, fromSubscription as i, Subscription as j, Sink as k, finalize as l, merge as m, make as n, makeSubject as o, mergeMap as p, fromPromise as r, fromArray as s, fromAbortSignal as t, initialize as u, filter as v, Observer as w, collectAll as x, map as y };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_make = require('./make-DxW2Pxe-.cjs');
+const require_from_abort_signal = require('./from-abort-signal-CtLzHe8K.cjs');
 
 //#region src/errors.ts
 /**
@@ -143,11 +143,11 @@ const httpExchange = (options) => {
 		name: "http",
 		io: (ops$) => {
 			const inflight = /* @__PURE__ */ new Map();
-			return require_make.merge(require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && (op.artifact.kind === "query" || op.artifact.kind === "mutation")), require_make.mergeMap((op) => {
+			return require_from_abort_signal.merge(require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && (op.artifact.kind === "query" || op.artifact.kind === "mutation")), require_from_abort_signal.mergeMap((op) => {
 				inflight.get(op.key)?.abort();
 				const controller = new AbortController();
 				inflight.set(op.key, controller);
-				return require_make.fromPromise(executeFetch({
+				return require_from_abort_signal.fromPromise(executeFetch({
 					url,
 					fetchFn,
 					fetchOptions: {
@@ -161,7 +161,7 @@ const httpExchange = (options) => {
 					inflight.delete(op.key);
 					return result;
 				}));
-			}), require_make.filter((result) => result !== null)), require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown" || op.variant === "request" && (op.artifact.kind === "subscription" || op.artifact.kind === "fragment")), require_make.tap((op) => {
+			}), require_from_abort_signal.filter((result) => result !== null)), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "teardown" || op.variant === "request" && (op.artifact.kind === "subscription" || op.artifact.kind === "fragment")), require_from_abort_signal.tap((op) => {
 				if (op.variant === "teardown") {
 					inflight.get(op.key)?.abort();
 					inflight.delete(op.key);
@@ -265,14 +265,17 @@ const dedupExchange = () => {
 		io: (ops$) => {
 			const operations = /* @__PURE__ */ new Map();
 			const resolved = /* @__PURE__ */ new Set();
-			return require_make.pipe(require_make.merge(require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "fragment"))), require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && op.artifact.kind !== "mutation" && op.artifact.kind !== "fragment"), require_make.filter((op) => {
+			return require_from_abort_signal.pipe(require_from_abort_signal.merge(require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "fragment"))), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && op.artifact.kind !== "mutation" && op.artifact.kind !== "fragment"), require_from_abort_signal.filter((op) => {
 				const dedupKey = makeDedupKey(op);
 				const isInflight = operations.has(dedupKey) && !resolved.has(dedupKey);
 				if (isInflight) operations.get(dedupKey).add(op.key);
 				else operations.set(dedupKey, new Set([op.key]));
 				if (!isInflight) resolved.delete(dedupKey);
 				return (op.metadata.dedup?.skip ?? false) || !isInflight;
-			}), delay(0)), require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown"), require_make.filter((teardown) => {
+			}), delay(0), require_from_abort_signal.filter((op) => {
+				const dedupKey = makeDedupKey(op);
+				return operations.get(dedupKey)?.has(op.key) ?? false;
+			})), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "teardown"), require_from_abort_signal.filter((teardown) => {
 				for (const [dedupKey, subs] of operations.entries()) if (subs.delete(teardown.key)) {
 					if (subs.size === 0) {
 						operations.delete(dedupKey);
@@ -282,11 +285,11 @@ const dedupExchange = () => {
 					return false;
 				}
 				return true;
-			}))), forward, require_make.mergeMap((result) => {
-				if (result.operation.variant !== "request" || result.operation.artifact.kind === "mutation" || result.operation.artifact.kind === "fragment") return require_make.fromValue(result);
+			}))), forward, require_from_abort_signal.mergeMap((result) => {
+				if (result.operation.variant !== "request" || result.operation.artifact.kind === "mutation" || result.operation.artifact.kind === "fragment") return require_from_abort_signal.fromValue(result);
 				const dedupKey = makeDedupKey(result.operation);
 				resolved.add(dedupKey);
-				return require_make.fromArray([...operations.get(dedupKey) ?? /* @__PURE__ */ new Set()].map((key) => ({
+				return require_from_abort_signal.fromArray([...operations.get(dedupKey) ?? /* @__PURE__ */ new Set()].map((key) => ({
 					...result,
 					operation: {
 						...result.operation,
@@ -559,6 +562,13 @@ const resolveTypename = (selections, data) => {
 	return data.__typename;
 };
 const normalize = (schemaMeta, selections, storage, data, variables, accessor) => {
+	const accessorNotified = accessor ? /* @__PURE__ */ new Map() : void 0;
+	const callAccessor = (storageKey, fieldKey, oldValue, newValue) => {
+		const key = `${storageKey}\0${fieldKey}`;
+		if (accessorNotified.has(key) && isEqual(accessorNotified.get(key), newValue)) return;
+		accessorNotified.set(key, newValue);
+		accessor(storageKey, fieldKey, oldValue, newValue);
+	};
 	const resolveEntityKey = (typename, data) => {
 		if (!typename) return null;
 		const entityMeta = schemaMeta.entities[typename];
@@ -585,9 +595,9 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 				if (fieldTypename && schemaMeta.entities[fieldTypename] && !resolveEntityKey(fieldTypename, fieldValue) && isEntityLink(storage[storageKey]?.[fieldKey])) continue;
 			}
 			const oldValue = storageKey === null ? void 0 : storage[storageKey]?.[fieldKey];
-			if (storageKey !== null && (!selection.selections || isNullish(oldValue) || isNullish(fieldValue))) accessor?.(storageKey, fieldKey, oldValue, fieldValue);
+			if (storageKey !== null && (!selection.selections || isNullish(oldValue) || isNullish(fieldValue))) callAccessor?.(storageKey, fieldKey, oldValue, fieldValue);
 			fields[fieldKey] = selection.selections ? normalizeField(null, selection.selections, fieldValue, selection.type) : fieldValue;
-			if (storageKey !== null && selection.selections && !isNullish(oldValue) && !isNullish(fieldValue) && !isEntityLink(fields[fieldKey]) && !isEqual(oldValue, fields[fieldKey])) accessor?.(storageKey, fieldKey, oldValue, fields[fieldKey]);
+			if (storageKey !== null && selection.selections && !isNullish(oldValue) && !isNullish(fieldValue) && !isEntityLink(fields[fieldKey]) && !isEqual(oldValue, fields[fieldKey])) callAccessor?.(storageKey, fieldKey, oldValue, fields[fieldKey]);
 		} else if (selection.kind === "FragmentSpread" || selection.kind === "InlineFragment" && selection.on === typename) {
 			const inner = normalizeField(storageKey, selection.selections, value);
 			if (!isEntityLink(inner)) mergeFields(fields, inner);
@@ -602,10 +612,7 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 		return fields;
 	};
 	const fields = normalizeField(RootFieldKey, selections, data);
-	storage[RootFieldKey] = {
-		...storage[RootFieldKey],
-		...fields
-	};
+	mergeFields(storage[RootFieldKey], fields);
 };
 
 //#endregion
@@ -969,7 +976,7 @@ const diffSnapshots = (oldData, newData, entityArrayChanges) => {
 		patches.push(...arrayPatches);
 		for (const [i, item] of cur.entries()) {
 			const entityKey = newKeys[i];
-			diff(entityKey ? oldByKey.get(entityKey) : void 0, item, [...path, i]);
+			if (entityKey && oldByKey.has(entityKey)) diff(oldByKey.get(entityKey), item, [...path, i]);
 		}
 	};
 	diff(oldData, newData, []);
@@ -1015,7 +1022,7 @@ const processScalarChanges = (changes, registry, subscriptions, storage) => {
 			let patchValue = change.newValue;
 			if (entry.selections && (isNormalizedRecord(change.newValue) || Array.isArray(change.newValue) && change.newValue.some((v) => isNormalizedRecord(v)))) {
 				const mergedValue = storage[change.storageKey]?.[change.fieldKey] ?? change.newValue;
-				const { data } = denormalize(entry.selections, {}, mergedValue, sub.variables);
+				const { data } = denormalize(entry.selections, storage, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1591,10 +1598,11 @@ var Cache = class {
 	*/
 	hydrate(snapshot) {
 		const { storage } = snapshot;
-		for (const [key, fields] of Object.entries(storage)) this.#storage[key] = {
-			...this.#storage[key],
-			...fields
-		};
+		for (const [key, fields] of Object.entries(storage)) {
+			const existing = this.#storage[key];
+			if (existing) mergeFields(existing, fields, true);
+			else this.#storage[key] = fields;
+		}
 	}
 	/**
 	* Clears all cache data.
@@ -1721,15 +1729,15 @@ const cacheExchange = (options = {}) => {
 			},
 			io: (ops$) => {
 				const subscriptionHasData = /* @__PURE__ */ new Map();
-				const refetch$ = require_make.makeSubject();
-				const fragment$ = require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && op.artifact.kind === "fragment"), require_make.mergeMap((op) => {
+				const refetch$ = require_from_abort_signal.makeSubject();
+				const fragment$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && op.artifact.kind === "fragment"), require_from_abort_signal.mergeMap((op) => {
 					const fragmentRef = op.metadata?.fragment?.ref;
-					if (!fragmentRef) return require_make.fromValue({
+					if (!fragmentRef) return require_from_abort_signal.fromValue({
 						operation: op,
 						errors: [new ExchangeError("Fragment operation missing fragment.ref in metadata. This usually happens when the wrong fragment reference was passed.", { exchangeName: "cache" })]
 					});
 					if (isFragmentRefArray(fragmentRef)) {
-						const results = require_make.makeSubject();
+						const results = require_from_abort_signal.makeSubject();
 						const unsubscribes = [];
 						for (const [index, ref] of fragmentRef.entries()) {
 							const listener = (notification) => {
@@ -1757,23 +1765,23 @@ const cacheExchange = (options = {}) => {
 							unsubscribes.push(unsubscribe);
 						}
 						const { data: initialData, stale: initialStale } = cache.readFragments(op.artifact, fragmentRef);
-						const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_make.tap(() => {
+						const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_from_abort_signal.tap(() => {
 							for (const unsub of unsubscribes) unsub();
 							results.complete();
 						}));
-						return require_make.pipe(require_make.merge(require_make.fromValue({
+						return require_from_abort_signal.pipe(require_from_abort_signal.merge(require_from_abort_signal.fromValue({
 							operation: op,
 							data: initialData,
 							...initialStale && { metadata: { cache: { stale: true } } },
 							errors: []
-						}), results.source), require_make.takeUntil(teardown$));
+						}), results.source), require_from_abort_signal.takeUntil(teardown$));
 					}
-					if (!isFragmentRef(fragmentRef)) return require_make.fromValue({
+					if (!isFragmentRef(fragmentRef)) return require_from_abort_signal.fromValue({
 						operation: op,
 						data: fragmentRef,
 						errors: []
 					});
-					const results = require_make.makeSubject();
+					const results = require_from_abort_signal.makeSubject();
 					const listener = (notification) => {
 						if (notification.type === "patch") results.next({
 							operation: op,
@@ -1791,23 +1799,23 @@ const cacheExchange = (options = {}) => {
 						}
 					};
 					const { data, stale, unsubscribe } = cache.subscribeFragment(op.artifact, fragmentRef, listener);
-					const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_make.tap(() => {
+					const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_from_abort_signal.tap(() => {
 						unsubscribe();
 						results.complete();
 					}));
-					return require_make.pipe(require_make.merge(data === null ? empty() : require_make.fromValue({
+					return require_from_abort_signal.pipe(require_from_abort_signal.merge(data === null ? empty() : require_from_abort_signal.fromValue({
 						operation: op,
 						data,
 						...stale && { metadata: { cache: { stale: true } } },
 						errors: []
-					}), results.source), require_make.takeUntil(teardown$));
+					}), results.source), require_from_abort_signal.takeUntil(teardown$));
 				}));
-				const nonCache$ = require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "subscription" || op.artifact.kind === "query" && fetchPolicy === "network-only")), require_make.tap((op) => {
+				const nonCache$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "subscription" || op.artifact.kind === "query" && fetchPolicy === "network-only")), require_from_abort_signal.tap((op) => {
 					if (op.artifact.kind === "mutation" && op.metadata?.cache?.optimisticResponse) cache.writeOptimistic(op.key, op.artifact, op.variables, op.metadata.cache.optimisticResponse);
 				}));
-				const query$ = require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && op.artifact.kind === "query" && fetchPolicy !== "network-only"), require_make.share());
-				return require_make.merge(fragment$, require_make.pipe(query$, require_make.mergeMap((op) => {
-					const results = require_make.makeSubject();
+				const query$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && op.artifact.kind === "query" && fetchPolicy !== "network-only"), require_from_abort_signal.share());
+				return require_from_abort_signal.merge(fragment$, require_from_abort_signal.pipe(query$, require_from_abort_signal.mergeMap((op) => {
+					const results = require_from_abort_signal.makeSubject();
 					const listener = (notification) => {
 						if (notification.type === "patch") {
 							if (!subscriptionHasData.get(op.key)) return;
@@ -1831,34 +1839,34 @@ const cacheExchange = (options = {}) => {
 					};
 					const { data, stale, unsubscribe } = cache.subscribeQuery(op.artifact, op.variables, listener);
 					subscriptionHasData.set(op.key, data !== null);
-					const teardown$ = require_make.pipe(ops$, require_make.filter((o) => o.variant === "teardown" && o.key === op.key), require_make.tap(() => {
+					const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((o) => o.variant === "teardown" && o.key === op.key), require_from_abort_signal.tap(() => {
 						unsubscribe();
 						subscriptionHasData.delete(op.key);
 						results.complete();
 					}));
-					const stream$ = require_make.pipe(require_make.merge(data === null ? fetchPolicy === "cache-only" ? require_make.fromValue({
+					const stream$ = require_from_abort_signal.pipe(require_from_abort_signal.merge(data === null ? fetchPolicy === "cache-only" ? require_from_abort_signal.fromValue({
 						operation: op,
 						data: null,
 						errors: []
-					}) : empty() : require_make.fromValue({
+					}) : empty() : require_from_abort_signal.fromValue({
 						operation: op,
 						data,
 						...stale && { metadata: { cache: { stale: true } } },
 						errors: []
-					}), results.source), require_make.takeUntil(teardown$));
+					}), results.source), require_from_abort_signal.takeUntil(teardown$));
 					if (stale) refetch$.next(op);
 					return stream$;
-				}), require_make.filter(() => fetchPolicy === "cache-only" || fetchPolicy === "cache-and-network" || fetchPolicy === "cache-first")), require_make.pipe(require_make.merge(nonCache$, require_make.pipe(query$, require_make.filter((op) => {
+				}), require_from_abort_signal.filter(() => fetchPolicy === "cache-only" || fetchPolicy === "cache-and-network" || fetchPolicy === "cache-first")), require_from_abort_signal.pipe(require_from_abort_signal.merge(nonCache$, require_from_abort_signal.pipe(query$, require_from_abort_signal.filter((op) => {
 					const { data } = cache.readQuery(op.artifact, op.variables);
 					return fetchPolicy === "cache-and-network" || data === null;
-				})), require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown")), refetch$.source), forward, require_make.mergeMap((result) => {
+				})), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "teardown")), refetch$.source), forward, require_from_abort_signal.mergeMap((result) => {
 					if (result.operation.variant === "request" && result.operation.artifact.kind === "mutation" && result.operation.metadata?.cache?.optimisticResponse) cache.removeOptimistic(result.operation.key);
 					if (result.operation.variant === "request" && result.data) cache.writeQuery(result.operation.artifact, result.operation.variables, result.data);
-					if (result.operation.variant !== "request" || result.operation.artifact.kind !== "query" || fetchPolicy === "network-only" || !!(result.errors && result.errors.length > 0)) return require_make.fromValue(result);
+					if (result.operation.variant !== "request" || result.operation.artifact.kind !== "query" || fetchPolicy === "network-only" || !!(result.errors && result.errors.length > 0)) return require_from_abort_signal.fromValue(result);
 					if (subscriptionHasData.get(result.operation.key)) {
 						const { data } = cache.readQuery(result.operation.artifact, result.operation.variables);
 						if (data !== null) return empty();
-						return require_make.fromValue({
+						return require_from_abort_signal.fromValue({
 							operation: result.operation,
 							data: void 0,
 							errors: [new ExchangeError("Cache failed to denormalize the network response. This is likely a bug in the cache normalizer.", { exchangeName: "cache" })]
@@ -1866,11 +1874,11 @@ const cacheExchange = (options = {}) => {
 					}
 					subscriptionHasData.set(result.operation.key, true);
 					const { data } = cache.readQuery(result.operation.artifact, result.operation.variables);
-					if (data !== null) return require_make.fromValue({
+					if (data !== null) return require_from_abort_signal.fromValue({
 						...result,
 						data
 					});
-					return require_make.fromValue({
+					return require_from_abort_signal.fromValue({
 						operation: result.operation,
 						data: void 0,
 						errors: [new ExchangeError("Cache failed to denormalize the network response. This is likely a bug in the cache normalizer.", { exchangeName: "cache" })]
@@ -1889,15 +1897,15 @@ const retryExchange = (options = {}) => {
 	return ({ forward }) => ({
 		name: "retry",
 		io: (ops$) => {
-			const { source: retries$, next } = require_make.makeSubject();
+			const { source: retries$, next } = require_from_abort_signal.makeSubject();
 			const tornDown = /* @__PURE__ */ new Set();
-			const teardown$ = require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown"), require_make.tap((op) => {
+			const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "teardown"), require_from_abort_signal.tap((op) => {
 				tornDown.add(op.key);
 			}));
-			return require_make.pipe(require_make.merge(require_make.pipe(ops$, require_make.filter((op) => op.variant === "request")), require_make.pipe(retries$, require_make.filter((op) => !tornDown.has(op.key)), require_make.mergeMap((op) => {
-				const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key));
-				return require_make.pipe(require_make.fromValue(op), delay(op.metadata.retry.delay), require_make.takeUntil(teardown$));
-			})), teardown$), forward, require_make.filter((result) => {
+			return require_from_abort_signal.pipe(require_from_abort_signal.merge(require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request")), require_from_abort_signal.pipe(retries$, require_from_abort_signal.filter((op) => !tornDown.has(op.key)), require_from_abort_signal.mergeMap((op) => {
+				const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((operation) => operation.variant === "teardown" && operation.key === op.key));
+				return require_from_abort_signal.pipe(require_from_abort_signal.fromValue(op), delay(op.metadata.retry.delay), require_from_abort_signal.takeUntil(teardown$));
+			})), teardown$), forward, require_from_abort_signal.filter((result) => {
 				if (!result.errors || result.errors.length === 0) return true;
 				if (result.operation.variant === "request" && result.operation.artifact.kind === "mutation") return true;
 				const attempt = result.operation.metadata.retry?.attempt ?? 0;
@@ -1926,7 +1934,7 @@ const fragmentExchange = () => {
 	return ({ forward }) => ({
 		name: "fragment",
 		io: (ops$) => {
-			return require_make.merge(require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && op.artifact.kind === "fragment"), require_make.map((op) => {
+			return require_from_abort_signal.merge(require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "request" && op.artifact.kind === "fragment"), require_from_abort_signal.map((op) => {
 				const fragmentRef = op.metadata.fragment?.ref;
 				if (!fragmentRef) return {
 					operation: op,
@@ -1936,7 +1944,7 @@ const fragmentExchange = () => {
 					operation: op,
 					data: fragmentRef
 				};
-			})), require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown" || op.artifact.kind !== "fragment"), forward));
+			})), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant === "teardown" || op.artifact.kind !== "fragment"), forward));
 		}
 	});
 };
@@ -2013,7 +2021,7 @@ const requiredExchange = () => {
 	return ({ forward }) => ({
 		name: "required",
 		io: (ops$) => {
-			return require_make.pipe(ops$, forward, require_make.map((result) => {
+			return require_from_abort_signal.pipe(ops$, forward, require_from_abort_signal.map((result) => {
 				if (result.operation.variant !== "request" || !result.data) return result;
 				try {
 					return {
@@ -2066,9 +2074,9 @@ const subscriptionExchange = (options) => {
 	return ({ forward }) => ({
 		name: "subscription",
 		io: (ops$) => {
-			return require_make.merge(require_make.pipe(ops$, require_make.filter(shouldHandle), require_make.mergeMap((op) => {
-				const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key));
-				return require_make.pipe(require_make.make((observer) => {
+			return require_from_abort_signal.merge(require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter(shouldHandle), require_from_abort_signal.mergeMap((op) => {
+				const teardown$ = require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((operation) => operation.variant === "teardown" && operation.key === op.key));
+				return require_from_abort_signal.pipe(require_from_abort_signal.make((observer) => {
 					let unsubscribe;
 					let completed = false;
 					const doSubscribe = () => {
@@ -2122,8 +2130,8 @@ const subscriptionExchange = (options) => {
 						completed = true;
 						unsubscribe?.();
 					};
-				}), require_make.takeUntil(teardown$));
-			})), require_make.pipe(ops$, require_make.filter((op) => !shouldHandle(op)), forward));
+				}), require_from_abort_signal.takeUntil(teardown$));
+			})), require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => !shouldHandle(op)), forward));
 		}
 	});
 };
@@ -2143,7 +2151,7 @@ const composeExchanges = (options, input) => {
 			});
 			if ("extension" in result) extensions.set(result.name, result.extension);
 			return (ops$) => {
-				return require_make.pipe(ops$, require_make.share(), result.io, require_make.share());
+				return require_from_abort_signal.pipe(ops$, require_from_abort_signal.share(), result.io, require_from_abort_signal.share());
 			};
 		}, input.forward),
 		extensions
@@ -2219,13 +2227,13 @@ const scalarExchange = () => {
 	return ({ forward, client }) => ({
 		name: "scalar",
 		io: (ops$) => {
-			return require_make.pipe(ops$, require_make.map((op) => {
+			return require_from_abort_signal.pipe(ops$, require_from_abort_signal.map((op) => {
 				if (op.variant !== "request" || !op.artifact.variableDefs || !client.scalars) return op;
 				return {
 					...op,
 					variables: serialize(client.schema, op.artifact.variableDefs, client.scalars, op.variables)
 				};
-			}), forward, require_make.map((result) => {
+			}), forward, require_from_abort_signal.map((result) => {
 				if (result.operation.variant !== "request" || !result.data || !client.scalars) return result;
 				return {
 					...result,
@@ -2242,7 +2250,7 @@ const terminalExchange = () => {
 	return () => ({
 		name: "terminal",
 		io: (ops$) => {
-			return require_make.pipe(ops$, require_make.filter((op) => op.variant !== "teardown"), require_make.mergeMap((op) => require_make.fromValue({
+			return require_from_abort_signal.pipe(ops$, require_from_abort_signal.filter((op) => op.variant !== "teardown"), require_from_abort_signal.mergeMap((op) => require_from_abort_signal.fromValue({
 				operation: op,
 				errors: [new ExchangeError("No terminal exchange found in exchange chain. Did you forget to add httpExchange to your exchanges array?", { exchangeName: "terminal" })]
 			})));
@@ -2284,7 +2292,7 @@ var Client = class {
 			client: this
 		});
 		this.#extensions = extensions;
-		this.operations$ = require_make.makeSubject();
+		this.operations$ = require_from_abort_signal.makeSubject();
 		this.results$ = io(this.operations$.source);
 	}
 	get schema() {
@@ -2305,20 +2313,22 @@ var Client = class {
 			variables: variables ?? {}
 		};
 	}
-	executeOperation(operation) {
-		return require_make.pipe(this.results$, require_make.initialize(() => this.operations$.next(operation)), require_make.filter((result) => result.operation.key === operation.key), require_make.finalize(() => this.operations$.next({
+	executeOperation(operation, options) {
+		let source = require_from_abort_signal.pipe(this.results$, require_from_abort_signal.initialize(() => this.operations$.next(operation)), require_from_abort_signal.filter((result) => result.operation.key === operation.key));
+		if (options?.signal) source = require_from_abort_signal.pipe(source, require_from_abort_signal.takeUntil(require_from_abort_signal.fromAbortSignal(options.signal)));
+		return require_from_abort_signal.pipe(source, require_from_abort_signal.finalize(() => this.operations$.next({
 			variant: "teardown",
 			key: operation.key,
 			metadata: {}
-		})), require_make.share());
+		})), require_from_abort_signal.share());
 	}
 	executeQuery(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		return this.executeOperation(operation);
+		return this.executeOperation(operation, { signal: options?.signal });
 	}
 	executeMutation(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		return this.executeOperation(operation);
+		return this.executeOperation(operation, { signal: options?.signal });
 	}
 	executeSubscription(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
@@ -2338,14 +2348,30 @@ var Client = class {
 		return this.executeOperation(operation);
 	}
 	async query(artifact, ...[variables, options]) {
+		const signal = options?.signal;
+		signal?.throwIfAborted();
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		const result = await require_make.pipe(this.executeOperation(operation), require_make.take(1), require_make.collect);
+		let result;
+		try {
+			result = await require_from_abort_signal.pipe(this.executeOperation(operation, { signal }), require_from_abort_signal.take(1), require_from_abort_signal.collect);
+		} catch (err) {
+			if (signal?.aborted) throw signal.reason;
+			throw err;
+		}
 		if (result.errors && result.errors.length > 0) throw new AggregatedError(result.errors);
 		return result.data;
 	}
 	async mutation(artifact, ...[variables, options]) {
+		const signal = options?.signal;
+		signal?.throwIfAborted();
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		const result = await require_make.pipe(this.executeOperation(operation), require_make.take(1), require_make.collect);
+		let result;
+		try {
+			result = await require_from_abort_signal.pipe(this.executeOperation(operation, { signal }), require_from_abort_signal.take(1), require_from_abort_signal.collect);
+		} catch (err) {
+			if (signal?.aborted) throw signal.reason;
+			throw err;
+		}
 		if (result.errors && result.errors.length > 0) throw new AggregatedError(result.errors);
 		return result.data;
 	}

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { k as Source } from "./make-BhxZYW3l.cjs";
+import { A as Source } from "./from-abort-signal-CsSc5Ee6.cjs";
 import { Artifact, Artifact as Artifact$1, ArtifactKind, ArtifactKind as ArtifactKind$1, DataOf, DataOf as DataOf$1, FragmentRefs, FragmentRefs as FragmentRefs$1, SchemaMeta, SchemaMeta as SchemaMeta$1, VariablesOf, VariablesOf as VariablesOf$1 } from "@mearie/shared";
 
 //#region src/errors.d.ts
@@ -67,9 +67,11 @@ type ScalarsConfig<TMeta extends SchemaMeta$1 = SchemaMeta$1> = { [K in keyof TM
 type QueryOptions<T extends Artifact$1<'query'> = Artifact$1<'query'>> = {
   initialData?: DataOf$1<T>;
   metadata?: OperationMetadata;
+  signal?: AbortSignal;
 };
 type MutationOptions<T extends Artifact$1<'mutation'> = Artifact$1<'mutation'>> = {
   metadata?: OperationMetadata<T>;
+  signal?: AbortSignal;
 };
 type SubscriptionOptions = {
   metadata?: OperationMetadata;
@@ -94,7 +96,9 @@ declare class Client<TMeta extends SchemaMeta$1 = SchemaMeta$1> {
   get scalars(): ScalarsConfig<TMeta> | undefined;
   private createOperationKey;
   createOperation(artifact: Artifact$1, variables?: unknown, metadata?: Record<string, unknown>): Operation;
-  executeOperation(operation: Operation): Source<OperationResult>;
+  executeOperation(operation: Operation, options?: {
+    signal?: AbortSignal;
+  }): Source<OperationResult>;
   executeQuery<T extends Artifact$1<'query'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, QueryOptions<T>?] : [VariablesOf$1<T>, QueryOptions<T>?]): Source<OperationResult>;
   executeMutation<T extends Artifact$1<'mutation'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, MutationOptions<T>?] : [VariablesOf$1<T>, MutationOptions<T>?]): Source<OperationResult>;
   executeSubscription<T extends Artifact$1<'subscription'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, SubscriptionOptions?] : [VariablesOf$1<T>, SubscriptionOptions?]): Source<OperationResult>;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { k as Source } from "./make-Ve8TkMHJ.mjs";
+import { A as Source } from "./from-abort-signal-ZiBY-b44.mjs";
 import { Artifact, Artifact as Artifact$1, ArtifactKind, ArtifactKind as ArtifactKind$1, DataOf, DataOf as DataOf$1, FragmentRefs, FragmentRefs as FragmentRefs$1, SchemaMeta, SchemaMeta as SchemaMeta$1, VariablesOf, VariablesOf as VariablesOf$1 } from "@mearie/shared";
 
 //#region src/errors.d.ts
@@ -67,9 +67,11 @@ type ScalarsConfig<TMeta extends SchemaMeta$1 = SchemaMeta$1> = { [K in keyof TM
 type QueryOptions<T extends Artifact$1<'query'> = Artifact$1<'query'>> = {
   initialData?: DataOf$1<T>;
   metadata?: OperationMetadata;
+  signal?: AbortSignal;
 };
 type MutationOptions<T extends Artifact$1<'mutation'> = Artifact$1<'mutation'>> = {
   metadata?: OperationMetadata<T>;
+  signal?: AbortSignal;
 };
 type SubscriptionOptions = {
   metadata?: OperationMetadata;
@@ -94,7 +96,9 @@ declare class Client<TMeta extends SchemaMeta$1 = SchemaMeta$1> {
   get scalars(): ScalarsConfig<TMeta> | undefined;
   private createOperationKey;
   createOperation(artifact: Artifact$1, variables?: unknown, metadata?: Record<string, unknown>): Operation;
-  executeOperation(operation: Operation): Source<OperationResult>;
+  executeOperation(operation: Operation, options?: {
+    signal?: AbortSignal;
+  }): Source<OperationResult>;
   executeQuery<T extends Artifact$1<'query'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, QueryOptions<T>?] : [VariablesOf$1<T>, QueryOptions<T>?]): Source<OperationResult>;
   executeMutation<T extends Artifact$1<'mutation'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, MutationOptions<T>?] : [VariablesOf$1<T>, MutationOptions<T>?]): Source<OperationResult>;
   executeSubscription<T extends Artifact$1<'subscription'>>(artifact: T, ...[variables, options]: VariablesOf$1<T> extends undefined ? [undefined?, SubscriptionOptions?] : [VariablesOf$1<T>, SubscriptionOptions?]): Source<OperationResult>;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { C as mergeMap, S as filter, a as finalize, b as merge, c as share, d as map, i as fromValue, l as takeUntil, m as collect, o as initialize, r as makeSubject, t as make, u as take, v as fromArray, w as pipe, x as fromPromise, y as tap } from "./make-C7I1YIXm.mjs";
+import { C as filter, S as fromPromise, T as pipe, a as fromValue, b as tap, d as take, f as map, h as collect, i as makeSubject, l as share, n as make, o as finalize, s as initialize, t as fromAbortSignal, u as takeUntil, w as mergeMap, x as merge, y as fromArray } from "./from-abort-signal-ClRa7iWd.mjs";
 
 //#region src/errors.ts
 /**
@@ -271,7 +271,10 @@ const dedupExchange = () => {
 				else operations.set(dedupKey, new Set([op.key]));
 				if (!isInflight) resolved.delete(dedupKey);
 				return (op.metadata.dedup?.skip ?? false) || !isInflight;
-			}), delay(0)), pipe(ops$, filter((op) => op.variant === "teardown"), filter((teardown) => {
+			}), delay(0), filter((op) => {
+				const dedupKey = makeDedupKey(op);
+				return operations.get(dedupKey)?.has(op.key) ?? false;
+			})), pipe(ops$, filter((op) => op.variant === "teardown"), filter((teardown) => {
 				for (const [dedupKey, subs] of operations.entries()) if (subs.delete(teardown.key)) {
 					if (subs.size === 0) {
 						operations.delete(dedupKey);
@@ -558,6 +561,13 @@ const resolveTypename = (selections, data) => {
 	return data.__typename;
 };
 const normalize = (schemaMeta, selections, storage, data, variables, accessor) => {
+	const accessorNotified = accessor ? /* @__PURE__ */ new Map() : void 0;
+	const callAccessor = (storageKey, fieldKey, oldValue, newValue) => {
+		const key = `${storageKey}\0${fieldKey}`;
+		if (accessorNotified.has(key) && isEqual(accessorNotified.get(key), newValue)) return;
+		accessorNotified.set(key, newValue);
+		accessor(storageKey, fieldKey, oldValue, newValue);
+	};
 	const resolveEntityKey = (typename, data) => {
 		if (!typename) return null;
 		const entityMeta = schemaMeta.entities[typename];
@@ -584,9 +594,9 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 				if (fieldTypename && schemaMeta.entities[fieldTypename] && !resolveEntityKey(fieldTypename, fieldValue) && isEntityLink(storage[storageKey]?.[fieldKey])) continue;
 			}
 			const oldValue = storageKey === null ? void 0 : storage[storageKey]?.[fieldKey];
-			if (storageKey !== null && (!selection.selections || isNullish(oldValue) || isNullish(fieldValue))) accessor?.(storageKey, fieldKey, oldValue, fieldValue);
+			if (storageKey !== null && (!selection.selections || isNullish(oldValue) || isNullish(fieldValue))) callAccessor?.(storageKey, fieldKey, oldValue, fieldValue);
 			fields[fieldKey] = selection.selections ? normalizeField(null, selection.selections, fieldValue, selection.type) : fieldValue;
-			if (storageKey !== null && selection.selections && !isNullish(oldValue) && !isNullish(fieldValue) && !isEntityLink(fields[fieldKey]) && !isEqual(oldValue, fields[fieldKey])) accessor?.(storageKey, fieldKey, oldValue, fields[fieldKey]);
+			if (storageKey !== null && selection.selections && !isNullish(oldValue) && !isNullish(fieldValue) && !isEntityLink(fields[fieldKey]) && !isEqual(oldValue, fields[fieldKey])) callAccessor?.(storageKey, fieldKey, oldValue, fields[fieldKey]);
 		} else if (selection.kind === "FragmentSpread" || selection.kind === "InlineFragment" && selection.on === typename) {
 			const inner = normalizeField(storageKey, selection.selections, value);
 			if (!isEntityLink(inner)) mergeFields(fields, inner);
@@ -601,10 +611,7 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 		return fields;
 	};
 	const fields = normalizeField(RootFieldKey, selections, data);
-	storage[RootFieldKey] = {
-		...storage[RootFieldKey],
-		...fields
-	};
+	mergeFields(storage[RootFieldKey], fields);
 };
 
 //#endregion
@@ -968,7 +975,7 @@ const diffSnapshots = (oldData, newData, entityArrayChanges) => {
 		patches.push(...arrayPatches);
 		for (const [i, item] of cur.entries()) {
 			const entityKey = newKeys[i];
-			diff(entityKey ? oldByKey.get(entityKey) : void 0, item, [...path, i]);
+			if (entityKey && oldByKey.has(entityKey)) diff(oldByKey.get(entityKey), item, [...path, i]);
 		}
 	};
 	diff(oldData, newData, []);
@@ -1014,7 +1021,7 @@ const processScalarChanges = (changes, registry, subscriptions, storage) => {
 			let patchValue = change.newValue;
 			if (entry.selections && (isNormalizedRecord(change.newValue) || Array.isArray(change.newValue) && change.newValue.some((v) => isNormalizedRecord(v)))) {
 				const mergedValue = storage[change.storageKey]?.[change.fieldKey] ?? change.newValue;
-				const { data } = denormalize(entry.selections, {}, mergedValue, sub.variables);
+				const { data } = denormalize(entry.selections, storage, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1590,10 +1597,11 @@ var Cache = class {
 	*/
 	hydrate(snapshot) {
 		const { storage } = snapshot;
-		for (const [key, fields] of Object.entries(storage)) this.#storage[key] = {
-			...this.#storage[key],
-			...fields
-		};
+		for (const [key, fields] of Object.entries(storage)) {
+			const existing = this.#storage[key];
+			if (existing) mergeFields(existing, fields, true);
+			else this.#storage[key] = fields;
+		}
 	}
 	/**
 	* Clears all cache data.
@@ -2304,8 +2312,10 @@ var Client = class {
 			variables: variables ?? {}
 		};
 	}
-	executeOperation(operation) {
-		return pipe(this.results$, initialize(() => this.operations$.next(operation)), filter((result) => result.operation.key === operation.key), finalize(() => this.operations$.next({
+	executeOperation(operation, options) {
+		let source = pipe(this.results$, initialize(() => this.operations$.next(operation)), filter((result) => result.operation.key === operation.key));
+		if (options?.signal) source = pipe(source, takeUntil(fromAbortSignal(options.signal)));
+		return pipe(source, finalize(() => this.operations$.next({
 			variant: "teardown",
 			key: operation.key,
 			metadata: {}
@@ -2313,11 +2323,11 @@ var Client = class {
 	}
 	executeQuery(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		return this.executeOperation(operation);
+		return this.executeOperation(operation, { signal: options?.signal });
 	}
 	executeMutation(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		return this.executeOperation(operation);
+		return this.executeOperation(operation, { signal: options?.signal });
 	}
 	executeSubscription(artifact, ...[variables, options]) {
 		const operation = this.createOperation(artifact, variables, options?.metadata);
@@ -2337,14 +2347,30 @@ var Client = class {
 		return this.executeOperation(operation);
 	}
 	async query(artifact, ...[variables, options]) {
+		const signal = options?.signal;
+		signal?.throwIfAborted();
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		const result = await pipe(this.executeOperation(operation), take(1), collect);
+		let result;
+		try {
+			result = await pipe(this.executeOperation(operation, { signal }), take(1), collect);
+		} catch (err) {
+			if (signal?.aborted) throw signal.reason;
+			throw err;
+		}
 		if (result.errors && result.errors.length > 0) throw new AggregatedError(result.errors);
 		return result.data;
 	}
 	async mutation(artifact, ...[variables, options]) {
+		const signal = options?.signal;
+		signal?.throwIfAborted();
 		const operation = this.createOperation(artifact, variables, options?.metadata);
-		const result = await pipe(this.executeOperation(operation), take(1), collect);
+		let result;
+		try {
+			result = await pipe(this.executeOperation(operation, { signal }), take(1), collect);
+		} catch (err) {
+			if (signal?.aborted) throw signal.reason;
+			throw err;
+		}
 		if (result.errors && result.errors.length > 0) throw new AggregatedError(result.errors);
 		return result.data;
 	}

package/dist/stream/index.cjs

@@ -1,27 +1,28 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_make = require('../make-DxW2Pxe-.cjs');
+const require_from_abort_signal = require('../from-abort-signal-CtLzHe8K.cjs');
 
-exports.collect = require_make.collect;
-exports.collectAll = require_make.collectAll;
-exports.compose = require_make.compose;
-exports.filter = require_make.filter;
-exports.finalize = require_make.finalize;
-exports.fromArray = require_make.fromArray;
-exports.fromPromise = require_make.fromPromise;
-exports.fromSubscription = require_make.fromSubscription;
-exports.fromValue = require_make.fromValue;
-exports.initialize = require_make.initialize;
-exports.make = require_make.make;
-exports.makeSubject = require_make.makeSubject;
-exports.map = require_make.map;
-exports.merge = require_make.merge;
-exports.mergeMap = require_make.mergeMap;
-exports.peek = require_make.peek;
-exports.pipe = require_make.pipe;
-exports.publish = require_make.publish;
-exports.share = require_make.share;
-exports.subscribe = require_make.subscribe;
-exports.switchMap = require_make.switchMap;
-exports.take = require_make.take;
-exports.takeUntil = require_make.takeUntil;
-exports.tap = require_make.tap;
+exports.collect = require_from_abort_signal.collect;
+exports.collectAll = require_from_abort_signal.collectAll;
+exports.compose = require_from_abort_signal.compose;
+exports.filter = require_from_abort_signal.filter;
+exports.finalize = require_from_abort_signal.finalize;
+exports.fromAbortSignal = require_from_abort_signal.fromAbortSignal;
+exports.fromArray = require_from_abort_signal.fromArray;
+exports.fromPromise = require_from_abort_signal.fromPromise;
+exports.fromSubscription = require_from_abort_signal.fromSubscription;
+exports.fromValue = require_from_abort_signal.fromValue;
+exports.initialize = require_from_abort_signal.initialize;
+exports.make = require_from_abort_signal.make;
+exports.makeSubject = require_from_abort_signal.makeSubject;
+exports.map = require_from_abort_signal.map;
+exports.merge = require_from_abort_signal.merge;
+exports.mergeMap = require_from_abort_signal.mergeMap;
+exports.peek = require_from_abort_signal.peek;
+exports.pipe = require_from_abort_signal.pipe;
+exports.publish = require_from_abort_signal.publish;
+exports.share = require_from_abort_signal.share;
+exports.subscribe = require_from_abort_signal.subscribe;
+exports.switchMap = require_from_abort_signal.switchMap;
+exports.take = require_from_abort_signal.take;
+exports.takeUntil = require_from_abort_signal.takeUntil;
+exports.tap = require_from_abort_signal.tap;

package/dist/stream/index.d.cts

@@ -1,2 +1,2 @@
-import { A as Subscription, C as Observer, D as Operator, E as pipe, O as Sink, S as publish, T as compose, _ as filter, a as makeSubject, b as collectAll, c as finalize, d as switchMap, f as mergeMap, g as take, h as takeUntil, i as Subject, k as Source, l as initialize, m as share, n as fromPromise, o as fromArray, p as merge, r as fromSubscription, s as fromValue, t as make, u as tap, v as map, w as subscribe, x as collect, y as peek } from "../make-BhxZYW3l.cjs";
-export { type Observer, type Operator, type Sink, type Source, type Subject, type Subscription, collect, collectAll, compose, filter, finalize, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };
+import { A as Source, C as publish, D as pipe, E as compose, O as Operator, S as collect, T as subscribe, _ as take, a as Subject, b as peek, c as fromValue, d as tap, f as switchMap, g as takeUntil, h as share, i as fromSubscription, j as Subscription, k as Sink, l as finalize, m as merge, n as make, o as makeSubject, p as mergeMap, r as fromPromise, s as fromArray, t as fromAbortSignal, u as initialize, v as filter, w as Observer, x as collectAll, y as map } from "../from-abort-signal-CsSc5Ee6.cjs";
+export { type Observer, type Operator, type Sink, type Source, type Subject, type Subscription, collect, collectAll, compose, filter, finalize, fromAbortSignal, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };

package/dist/stream/index.d.mts

@@ -1,2 +1,2 @@
-import { A as Subscription, C as Observer, D as Operator, E as pipe, O as Sink, S as publish, T as compose, _ as filter, a as makeSubject, b as collectAll, c as finalize, d as switchMap, f as mergeMap, g as take, h as takeUntil, i as Subject, k as Source, l as initialize, m as share, n as fromPromise, o as fromArray, p as merge, r as fromSubscription, s as fromValue, t as make, u as tap, v as map, w as subscribe, x as collect, y as peek } from "../make-Ve8TkMHJ.mjs";
-export { type Observer, type Operator, type Sink, type Source, type Subject, type Subscription, collect, collectAll, compose, filter, finalize, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };
+import { A as Source, C as publish, D as pipe, E as compose, O as Operator, S as collect, T as subscribe, _ as take, a as Subject, b as peek, c as fromValue, d as tap, f as switchMap, g as takeUntil, h as share, i as fromSubscription, j as Subscription, k as Sink, l as finalize, m as merge, n as make, o as makeSubject, p as mergeMap, r as fromPromise, s as fromArray, t as fromAbortSignal, u as initialize, v as filter, w as Observer, x as collectAll, y as map } from "../from-abort-signal-ZiBY-b44.mjs";
+export { type Observer, type Operator, type Sink, type Source, type Subject, type Subscription, collect, collectAll, compose, filter, finalize, fromAbortSignal, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };

package/dist/stream/index.mjs

@@ -1,3 +1,3 @@
-import { C as mergeMap, S as filter, _ as compose, a as finalize, b as merge, c as share, d as map, f as peek, g as subscribe, h as publish, i as fromValue, l as takeUntil, m as collect, n as fromSubscription, o as initialize, p as collectAll, r as makeSubject, s as switchMap, t as make, u as take, v as fromArray, w as pipe, x as fromPromise, y as tap } from "../make-C7I1YIXm.mjs";
+import { C as filter, S as fromPromise, T as pipe, _ as subscribe, a as fromValue, b as tap, c as switchMap, d as take, f as map, g as publish, h as collect, i as makeSubject, l as share, m as collectAll, n as make, o as finalize, p as peek, r as fromSubscription, s as initialize, t as fromAbortSignal, u as takeUntil, v as compose, w as mergeMap, x as merge, y as fromArray } from "../from-abort-signal-ClRa7iWd.mjs";
 
-export { collect, collectAll, compose, filter, finalize, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };
+export { collect, collectAll, compose, filter, finalize, fromAbortSignal, fromArray, fromPromise, fromSubscription, fromValue, initialize, make, makeSubject, map, merge, mergeMap, peek, pipe, publish, share, subscribe, switchMap, take, takeUntil, tap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearie/core",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",