@mearie/core 0.6.4 → 0.6.5

package/dist/index.cjs

@@ -272,7 +272,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)), require_make.pipe(ops$, require_make.filter((op) => op.variant === "teardown"), require_make.filter((teardown) => {
+			}), delay(0), require_make.filter((op) => {
+				const dedupKey = makeDedupKey(op);
+				return operations.get(dedupKey)?.has(op.key) ?? false;
+			})), 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);
@@ -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.

package/dist/index.mjs

@@ -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.

package/package.json

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