@mearie/core 0.6.3 → 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);
@@ -347,6 +350,26 @@ const makeEntityKey = (typename, keyValues) => {
 const resolveArguments = (args, variables) => {
 	return Object.fromEntries(Object.entries(args).map(([key, value]) => [key, value.kind === "literal" ? value.value : variables[value.name]]));
 };
+const resolveDirectiveValue = (value, variables) => {
+	if (value !== null && typeof value === "object" && "kind" in value) {
+		const v = value;
+		if (v.kind === "variable" && v.name) return variables[v.name];
+		if (v.kind === "literal") return v.value;
+	}
+	return value;
+};
+/**
+* Determines whether a field should be included based on @skip/@include directives.
+* @internal
+*/
+const shouldIncludeField = (directives, variables) => {
+	if (!directives) return true;
+	for (const d of directives) {
+		if (d.name === "skip" && resolveDirectiveValue(d.args?.if, variables) === true) return false;
+		if (d.name === "include" && resolveDirectiveValue(d.args?.if, variables) === false) return false;
+	}
+	return true;
+};
 /**
 * Generates a cache key for a GraphQL field selection.
 * Always uses the actual field name (not alias) with a stringified representation of the arguments.
@@ -539,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];
@@ -556,6 +586,7 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 		if (entityKey) storageKey = entityKey;
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			let fieldValue = data[selection.alias ?? selection.name];
 			if (selection.name === "__typename" && fieldValue === void 0 && typename) fieldValue = typename;
@@ -564,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);
@@ -581,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
@@ -612,6 +640,7 @@ const denormalize = (selections, storage, value, variables, accessor, options) =
 		}
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			const fieldValue = data[fieldKey];
 			const fieldPath = [...path, selection.alias ?? selection.name];
@@ -755,6 +784,7 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 		}
 		const fields = {};
 		for (const selection of sels) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			const fieldValue = data[fieldKey];
 			const fieldPath = [...path, selection.alias ?? selection.name];
@@ -946,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, []);
@@ -980,7 +1010,7 @@ const classifyChanges = (changes) => {
 /**
 * @internal
 */
-const processScalarChanges = (changes, registry, subscriptions) => {
+const processScalarChanges = (changes, registry, subscriptions, storage) => {
 	const result = /* @__PURE__ */ new Map();
 	for (const change of changes) {
 		const entries = registry.get(change.depKey);
@@ -990,8 +1020,9 @@ const processScalarChanges = (changes, registry, subscriptions) => {
 			const sub = subscriptions.get(entry.subscriptionId);
 			if (!sub) continue;
 			let patchValue = change.newValue;
-			if (entry.selections && isNormalizedRecord(change.newValue)) {
-				const { data } = denormalize(entry.selections, {}, change.newValue, sub.variables);
+			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, storage, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1567,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.
@@ -1586,7 +1618,7 @@ var Cache = class {
 		if (changes.length === 0) return;
 		const unstalledPatches = this.#checkStalled(changes);
 		const { scalar, structural } = classifyChanges(changes);
-		const scalarPatches = processScalarChanges(scalar, this.#registry, this.#subscriptions);
+		const scalarPatches = processScalarChanges(scalar, this.#registry, this.#subscriptions, this.#storage);
 		const structuralPatches = processStructuralChanges(structural, this.#registry, this.#subscriptions, this.#storage, this.#stalled);
 		const allPatches = /* @__PURE__ */ new Map();
 		for (const [subId, patches] of unstalledPatches) allPatches.set(subId, patches);

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);
@@ -346,6 +349,26 @@ const makeEntityKey = (typename, keyValues) => {
 const resolveArguments = (args, variables) => {
 	return Object.fromEntries(Object.entries(args).map(([key, value]) => [key, value.kind === "literal" ? value.value : variables[value.name]]));
 };
+const resolveDirectiveValue = (value, variables) => {
+	if (value !== null && typeof value === "object" && "kind" in value) {
+		const v = value;
+		if (v.kind === "variable" && v.name) return variables[v.name];
+		if (v.kind === "literal") return v.value;
+	}
+	return value;
+};
+/**
+* Determines whether a field should be included based on @skip/@include directives.
+* @internal
+*/
+const shouldIncludeField = (directives, variables) => {
+	if (!directives) return true;
+	for (const d of directives) {
+		if (d.name === "skip" && resolveDirectiveValue(d.args?.if, variables) === true) return false;
+		if (d.name === "include" && resolveDirectiveValue(d.args?.if, variables) === false) return false;
+	}
+	return true;
+};
 /**
 * Generates a cache key for a GraphQL field selection.
 * Always uses the actual field name (not alias) with a stringified representation of the arguments.
@@ -538,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];
@@ -555,6 +585,7 @@ const normalize = (schemaMeta, selections, storage, data, variables, accessor) =
 		if (entityKey) storageKey = entityKey;
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			let fieldValue = data[selection.alias ?? selection.name];
 			if (selection.name === "__typename" && fieldValue === void 0 && typename) fieldValue = typename;
@@ -563,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);
@@ -580,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
@@ -611,6 +639,7 @@ const denormalize = (selections, storage, value, variables, accessor, options) =
 		}
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			const fieldValue = data[fieldKey];
 			const fieldPath = [...path, selection.alias ?? selection.name];
@@ -754,6 +783,7 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 		}
 		const fields = {};
 		for (const selection of sels) if (selection.kind === "Field") {
+			if (!shouldIncludeField(selection.directives, variables)) continue;
 			const fieldKey = makeFieldKey(selection, variables);
 			const fieldValue = data[fieldKey];
 			const fieldPath = [...path, selection.alias ?? selection.name];
@@ -945,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, []);
@@ -979,7 +1009,7 @@ const classifyChanges = (changes) => {
 /**
 * @internal
 */
-const processScalarChanges = (changes, registry, subscriptions) => {
+const processScalarChanges = (changes, registry, subscriptions, storage) => {
 	const result = /* @__PURE__ */ new Map();
 	for (const change of changes) {
 		const entries = registry.get(change.depKey);
@@ -989,8 +1019,9 @@ const processScalarChanges = (changes, registry, subscriptions) => {
 			const sub = subscriptions.get(entry.subscriptionId);
 			if (!sub) continue;
 			let patchValue = change.newValue;
-			if (entry.selections && isNormalizedRecord(change.newValue)) {
-				const { data } = denormalize(entry.selections, {}, change.newValue, sub.variables);
+			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, storage, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1566,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.
@@ -1585,7 +1617,7 @@ var Cache = class {
 		if (changes.length === 0) return;
 		const unstalledPatches = this.#checkStalled(changes);
 		const { scalar, structural } = classifyChanges(changes);
-		const scalarPatches = processScalarChanges(scalar, this.#registry, this.#subscriptions);
+		const scalarPatches = processScalarChanges(scalar, this.#registry, this.#subscriptions, this.#storage);
 		const structuralPatches = processStructuralChanges(structural, this.#registry, this.#subscriptions, this.#storage, this.#stalled);
 		const allPatches = /* @__PURE__ */ new Map();
 		for (const [subId, patches] of unstalledPatches) allPatches.set(subId, patches);

package/package.json

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