@mearie/core 0.2.2 → 0.2.4

package/dist/index.cjs

@@ -91,6 +91,7 @@ const executeFetch = async ({ url, fetchFn, fetchOptions, operation, signal }) =
 				...fetchOptions.headers
 			},
 			body: JSON.stringify({
+				operationName: artifact.name,
 				query: artifact.body,
 				variables
 			}),
@@ -263,16 +264,19 @@ const dedupExchange = () => {
 		name: "dedup",
 		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) => {
 				const dedupKey = makeDedupKey(op);
-				const isInflight = operations.has(dedupKey);
+				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) => {
 				for (const [dedupKey, subs] of operations.entries()) if (subs.delete(teardown.key)) {
 					if (subs.size === 0) {
 						operations.delete(dedupKey);
+						resolved.delete(dedupKey);
 						return true;
 					}
 					return false;
@@ -281,6 +285,7 @@ const dedupExchange = () => {
 			}))), 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);
 				const dedupKey = makeDedupKey(result.operation);
+				resolved.add(dedupKey);
 				return require_make.fromArray([...operations.get(dedupKey) ?? /* @__PURE__ */ new Set()].map((key) => ({
 					...result,
 					operation: {
@@ -633,7 +638,7 @@ var Cache = class {
 			const ss = this.#subscriptions.get(dependency);
 			if (ss) for (const s of ss) subscriptions.add(s);
 		}
-		for (const subscription of subscriptions) subscription.listener();
+		for (const subscription of subscriptions) subscription.listener("write");
 	}
 	/**
 	* Reads a query result from the cache, denormalizing entities if available.
@@ -741,6 +746,7 @@ var Cache = class {
 				delete this.#storage[entityKey];
 				this.#collectSubscriptions(entityKey, void 0, subscriptions);
 			}
+			this.#collectLinkedEntitySubscriptions((linkedEntityKey) => linkedEntityKey === entityKey, subscriptions);
 		} else {
 			const prefix = `${target.__typename}:`;
 			for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
@@ -754,8 +760,18 @@ var Cache = class {
 					this.#collectSubscriptions(entityKey, void 0, subscriptions);
 				}
 			}
+			this.#collectLinkedEntitySubscriptions((linkedEntityKey) => linkedEntityKey.startsWith(prefix), subscriptions);
 		}
-		for (const subscription of subscriptions) subscription.listener();
+		for (const subscription of subscriptions) subscription.listener("invalidate");
+	}
+	#collectLinkedEntitySubscriptions(matcher, out) {
+		for (const [storageKey, fields] of Object.entries(this.#storage)) for (const [fieldKey, value] of Object.entries(fields)) if (this.#containsEntityLink(value, matcher)) this.#collectSubscriptions(storageKey, fieldKey, out);
+	}
+	#containsEntityLink(value, matcher) {
+		if (isEntityLink(value)) return matcher(value[EntityLinkKey]);
+		if (Array.isArray(value)) return value.some((item) => this.#containsEntityLink(item, matcher));
+		if (value && typeof value === "object") return Object.values(value).some((item) => this.#containsEntityLink(item, matcher));
+		return false;
 	}
 	#collectSubscriptions(storageKey, fieldKey, out) {
 		if (fieldKey === void 0) {
@@ -848,15 +864,27 @@ const cacheExchange = (options = {}) => {
 					});
 					if (isFragmentRefArray(fragmentRef)) {
 						const trigger = require_make.makeSubject();
+						let hasData = false;
 						const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_make.tap(() => trigger.complete()));
 						return require_make.pipe(require_make.merge(require_make.fromValue(void 0), trigger.source), require_make.switchMap(() => require_make.fromSubscription(() => cache.readFragments(op.artifact, fragmentRef), () => cache.subscribeFragments(op.artifact, fragmentRef, async () => {
 							await Promise.resolve();
 							trigger.next();
-						}))), require_make.takeUntil(teardown$), require_make.map((data) => ({
-							operation: op,
-							data,
-							errors: []
-						})));
+						}))), require_make.takeUntil(teardown$), require_make.mergeMap((data) => {
+							if (data !== null) {
+								hasData = true;
+								return require_make.fromValue({
+									operation: op,
+									data,
+									errors: []
+								});
+							}
+							if (hasData) return empty();
+							return require_make.fromValue({
+								operation: op,
+								data,
+								errors: []
+							});
+						}));
 					}
 					if (!isFragmentRef(fragmentRef)) return require_make.fromValue({
 						operation: op,
@@ -864,15 +892,27 @@ const cacheExchange = (options = {}) => {
 						errors: []
 					});
 					const trigger = require_make.makeSubject();
+					let hasData = false;
 					const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_make.tap(() => trigger.complete()));
 					return require_make.pipe(require_make.merge(require_make.fromValue(void 0), trigger.source), require_make.switchMap(() => require_make.fromSubscription(() => cache.readFragment(op.artifact, fragmentRef), () => cache.subscribeFragment(op.artifact, fragmentRef, async () => {
 						await Promise.resolve();
 						trigger.next();
-					}))), require_make.takeUntil(teardown$), require_make.map((data) => ({
-						operation: op,
-						data,
-						errors: []
-					})));
+					}))), require_make.takeUntil(teardown$), require_make.mergeMap((data) => {
+						if (data !== null) {
+							hasData = true;
+							return require_make.fromValue({
+								operation: op,
+								data,
+								errors: []
+							});
+						}
+						if (hasData) return empty();
+						return require_make.fromValue({
+							operation: op,
+							data,
+							errors: []
+						});
+					}));
 				}));
 				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")));
 				const query$ = require_make.pipe(ops$, require_make.filter((op) => op.variant === "request" && op.artifact.kind === "query" && fetchPolicy !== "network-only"), require_make.share());
@@ -880,13 +920,21 @@ const cacheExchange = (options = {}) => {
 				return require_make.merge(fragment$, require_make.pipe(query$, require_make.mergeMap((op) => {
 					const trigger = require_make.makeSubject();
 					let hasData = false;
+					let invalidated = false;
 					const teardown$ = require_make.pipe(ops$, require_make.filter((operation) => operation.variant === "teardown" && operation.key === op.key), require_make.tap(() => trigger.complete()));
-					return require_make.pipe(require_make.merge(require_make.fromValue(void 0), trigger.source), require_make.switchMap(() => require_make.fromSubscription(() => cache.readQuery(op.artifact, op.variables), () => cache.subscribeQuery(op.artifact, op.variables, async () => {
+					return require_make.pipe(require_make.merge(require_make.fromValue(void 0), trigger.source), require_make.switchMap(() => require_make.fromSubscription(() => cache.readQuery(op.artifact, op.variables), () => cache.subscribeQuery(op.artifact, op.variables, async (event) => {
+						if (event === "invalidate") invalidated = true;
 						await Promise.resolve();
 						trigger.next();
 					}))), require_make.takeUntil(teardown$), require_make.mergeMap((data) => {
 						if (data !== null) {
+							if (invalidated && hasData && fetchPolicy !== "cache-only") {
+								invalidated = false;
+								refetch$.next(op);
+								return empty();
+							}
 							hasData = true;
+							invalidated = false;
 							return require_make.fromValue({
 								operation: op,
 								data,
@@ -894,7 +942,8 @@ const cacheExchange = (options = {}) => {
 							});
 						}
 						if (hasData) {
-							refetch$.next(op);
+							if (fetchPolicy !== "cache-only") refetch$.next(op);
+							invalidated = false;
 							return empty();
 						}
 						if (fetchPolicy === "cache-only") return require_make.fromValue({
@@ -1108,6 +1157,7 @@ const subscriptionExchange = (options) => {
 					Promise.resolve().then(() => {
 						if (completed) return;
 						unsubscribe = client.subscribe({
+							operationName: op.artifact.name,
 							query: op.artifact.body,
 							variables: op.variables
 						}, {

package/dist/index.d.cts

@@ -279,6 +279,7 @@ declare const requiredExchange: () => Exchange;
 //#region src/exchanges/subscription.d.ts
 interface SubscriptionClient {
   subscribe(payload: {
+    operationName?: string;
     query: string;
     variables?: Record<string, unknown>;
   }, sink: {

package/dist/index.d.mts

@@ -279,6 +279,7 @@ declare const requiredExchange: () => Exchange;
 //#region src/exchanges/subscription.d.ts
 interface SubscriptionClient {
   subscribe(payload: {
+    operationName?: string;
     query: string;
     variables?: Record<string, unknown>;
   }, sink: {

package/dist/index.mjs

@@ -90,6 +90,7 @@ const executeFetch = async ({ url, fetchFn, fetchOptions, operation, signal }) =
 				...fetchOptions.headers
 			},
 			body: JSON.stringify({
+				operationName: artifact.name,
 				query: artifact.body,
 				variables
 			}),
@@ -262,16 +263,19 @@ const dedupExchange = () => {
 		name: "dedup",
 		io: (ops$) => {
 			const operations = /* @__PURE__ */ new Map();
+			const resolved = /* @__PURE__ */ new Set();
 			return pipe(merge(pipe(ops$, filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "fragment"))), pipe(ops$, filter((op) => op.variant === "request" && op.artifact.kind !== "mutation" && op.artifact.kind !== "fragment"), filter((op) => {
 				const dedupKey = makeDedupKey(op);
-				const isInflight = operations.has(dedupKey);
+				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)), 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);
+						resolved.delete(dedupKey);
 						return true;
 					}
 					return false;
@@ -280,6 +284,7 @@ const dedupExchange = () => {
 			}))), forward, mergeMap((result) => {
 				if (result.operation.variant !== "request" || result.operation.artifact.kind === "mutation" || result.operation.artifact.kind === "fragment") return fromValue(result);
 				const dedupKey = makeDedupKey(result.operation);
+				resolved.add(dedupKey);
 				return fromArray([...operations.get(dedupKey) ?? /* @__PURE__ */ new Set()].map((key) => ({
 					...result,
 					operation: {
@@ -632,7 +637,7 @@ var Cache = class {
 			const ss = this.#subscriptions.get(dependency);
 			if (ss) for (const s of ss) subscriptions.add(s);
 		}
-		for (const subscription of subscriptions) subscription.listener();
+		for (const subscription of subscriptions) subscription.listener("write");
 	}
 	/**
 	* Reads a query result from the cache, denormalizing entities if available.
@@ -740,6 +745,7 @@ var Cache = class {
 				delete this.#storage[entityKey];
 				this.#collectSubscriptions(entityKey, void 0, subscriptions);
 			}
+			this.#collectLinkedEntitySubscriptions((linkedEntityKey) => linkedEntityKey === entityKey, subscriptions);
 		} else {
 			const prefix = `${target.__typename}:`;
 			for (const key of Object.keys(this.#storage)) if (key.startsWith(prefix)) {
@@ -753,8 +759,18 @@ var Cache = class {
 					this.#collectSubscriptions(entityKey, void 0, subscriptions);
 				}
 			}
+			this.#collectLinkedEntitySubscriptions((linkedEntityKey) => linkedEntityKey.startsWith(prefix), subscriptions);
 		}
-		for (const subscription of subscriptions) subscription.listener();
+		for (const subscription of subscriptions) subscription.listener("invalidate");
+	}
+	#collectLinkedEntitySubscriptions(matcher, out) {
+		for (const [storageKey, fields] of Object.entries(this.#storage)) for (const [fieldKey, value] of Object.entries(fields)) if (this.#containsEntityLink(value, matcher)) this.#collectSubscriptions(storageKey, fieldKey, out);
+	}
+	#containsEntityLink(value, matcher) {
+		if (isEntityLink(value)) return matcher(value[EntityLinkKey]);
+		if (Array.isArray(value)) return value.some((item) => this.#containsEntityLink(item, matcher));
+		if (value && typeof value === "object") return Object.values(value).some((item) => this.#containsEntityLink(item, matcher));
+		return false;
 	}
 	#collectSubscriptions(storageKey, fieldKey, out) {
 		if (fieldKey === void 0) {
@@ -847,15 +863,27 @@ const cacheExchange = (options = {}) => {
 					});
 					if (isFragmentRefArray(fragmentRef)) {
 						const trigger = makeSubject();
+						let hasData = false;
 						const teardown$ = pipe(ops$, filter((operation) => operation.variant === "teardown" && operation.key === op.key), tap(() => trigger.complete()));
 						return pipe(merge(fromValue(void 0), trigger.source), switchMap(() => fromSubscription(() => cache.readFragments(op.artifact, fragmentRef), () => cache.subscribeFragments(op.artifact, fragmentRef, async () => {
 							await Promise.resolve();
 							trigger.next();
-						}))), takeUntil(teardown$), map((data) => ({
-							operation: op,
-							data,
-							errors: []
-						})));
+						}))), takeUntil(teardown$), mergeMap((data) => {
+							if (data !== null) {
+								hasData = true;
+								return fromValue({
+									operation: op,
+									data,
+									errors: []
+								});
+							}
+							if (hasData) return empty();
+							return fromValue({
+								operation: op,
+								data,
+								errors: []
+							});
+						}));
 					}
 					if (!isFragmentRef(fragmentRef)) return fromValue({
 						operation: op,
@@ -863,15 +891,27 @@ const cacheExchange = (options = {}) => {
 						errors: []
 					});
 					const trigger = makeSubject();
+					let hasData = false;
 					const teardown$ = pipe(ops$, filter((operation) => operation.variant === "teardown" && operation.key === op.key), tap(() => trigger.complete()));
 					return pipe(merge(fromValue(void 0), trigger.source), switchMap(() => fromSubscription(() => cache.readFragment(op.artifact, fragmentRef), () => cache.subscribeFragment(op.artifact, fragmentRef, async () => {
 						await Promise.resolve();
 						trigger.next();
-					}))), takeUntil(teardown$), map((data) => ({
-						operation: op,
-						data,
-						errors: []
-					})));
+					}))), takeUntil(teardown$), mergeMap((data) => {
+						if (data !== null) {
+							hasData = true;
+							return fromValue({
+								operation: op,
+								data,
+								errors: []
+							});
+						}
+						if (hasData) return empty();
+						return fromValue({
+							operation: op,
+							data,
+							errors: []
+						});
+					}));
 				}));
 				const nonCache$ = pipe(ops$, filter((op) => op.variant === "request" && (op.artifact.kind === "mutation" || op.artifact.kind === "subscription" || op.artifact.kind === "query" && fetchPolicy === "network-only")));
 				const query$ = pipe(ops$, filter((op) => op.variant === "request" && op.artifact.kind === "query" && fetchPolicy !== "network-only"), share());
@@ -879,13 +919,21 @@ const cacheExchange = (options = {}) => {
 				return merge(fragment$, pipe(query$, mergeMap((op) => {
 					const trigger = makeSubject();
 					let hasData = false;
+					let invalidated = false;
 					const teardown$ = pipe(ops$, filter((operation) => operation.variant === "teardown" && operation.key === op.key), tap(() => trigger.complete()));
-					return pipe(merge(fromValue(void 0), trigger.source), switchMap(() => fromSubscription(() => cache.readQuery(op.artifact, op.variables), () => cache.subscribeQuery(op.artifact, op.variables, async () => {
+					return pipe(merge(fromValue(void 0), trigger.source), switchMap(() => fromSubscription(() => cache.readQuery(op.artifact, op.variables), () => cache.subscribeQuery(op.artifact, op.variables, async (event) => {
+						if (event === "invalidate") invalidated = true;
 						await Promise.resolve();
 						trigger.next();
 					}))), takeUntil(teardown$), mergeMap((data) => {
 						if (data !== null) {
+							if (invalidated && hasData && fetchPolicy !== "cache-only") {
+								invalidated = false;
+								refetch$.next(op);
+								return empty();
+							}
 							hasData = true;
+							invalidated = false;
 							return fromValue({
 								operation: op,
 								data,
@@ -893,7 +941,8 @@ const cacheExchange = (options = {}) => {
 							});
 						}
 						if (hasData) {
-							refetch$.next(op);
+							if (fetchPolicy !== "cache-only") refetch$.next(op);
+							invalidated = false;
 							return empty();
 						}
 						if (fetchPolicy === "cache-only") return fromValue({
@@ -1107,6 +1156,7 @@ const subscriptionExchange = (options) => {
 					Promise.resolve().then(() => {
 						if (completed) return;
 						unsubscribe = client.subscribe({
+							operationName: op.artifact.name,
 							query: op.artifact.body,
 							variables: op.variables
 						}, {

package/package.json

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