@mearie/core 0.6.2 → 0.6.4

package/dist/index.cjs

@@ -347,6 +347,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.
@@ -556,6 +576,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;
@@ -612,6 +633,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];
@@ -713,6 +735,29 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 	const cursors = [];
 	const missingDeps = /* @__PURE__ */ new Set();
 	let complete = true;
+	const traceFragmentSpread = (selection, refKey, value, traceKey, fields, path) => {
+		fields[FragmentRefKey] = refKey;
+		const merged = selection.args ? {
+			...variables,
+			...resolveArguments(selection.args, variables)
+		} : { ...variables };
+		fields[FragmentVarsKey] = {
+			...fields[FragmentVarsKey],
+			[selection.name]: merged
+		};
+		const inner = traceSelections(selection.selections, storage, value, variables, traceKey, path, subscriptionId);
+		for (const cursor of inner.cursors) cursors.push({
+			depKey: cursor.depKey,
+			entry: cursor.entry.dependency === "transitive" ? cursor.entry : {
+				...cursor.entry,
+				dependency: "transitive"
+			}
+		});
+		if (!inner.complete) {
+			complete = false;
+			for (const dep of inner.missingDeps) missingDeps.add(dep);
+		}
+	};
 	const traceField = (sk, sels, val, path, trackCursors) => {
 		if (isNullish(val)) return val;
 		if (Array.isArray(val)) return val.map((item, i) => traceField(sk, sels, item, [...path, i], trackCursors));
@@ -732,6 +777,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];
@@ -740,6 +786,7 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 				const entry = {
 					subscriptionId,
 					path: fieldPath,
+					dependency: "direct",
 					...selection.selections && { selections: selection.selections }
 				};
 				cursors.push({
@@ -759,37 +806,9 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 			const resolvedValue = selection.selections ? traceField(null, selection.selections, fieldValue, fieldPath, trackCursors) : fieldValue;
 			if (name in fields) mergeFields(fields, { [name]: resolvedValue }, true);
 			else fields[name] = resolvedValue;
-		} else if (selection.kind === "FragmentSpread") if (sk !== null && sk !== RootFieldKey) {
-			fields[FragmentRefKey] = sk;
-			const merged = selection.args ? {
-				...variables,
-				...resolveArguments(selection.args, variables)
-			} : { ...variables };
-			fields[FragmentVarsKey] = {
-				...fields[FragmentVarsKey],
-				[selection.name]: merged
-			};
-			const inner = traceSelections(selection.selections, storage, storage[sk], variables, sk, path, subscriptionId);
-			if (!inner.complete) {
-				complete = false;
-				for (const dep of inner.missingDeps) missingDeps.add(dep);
-			}
-		} else if (sk === RootFieldKey) {
-			fields[FragmentRefKey] = RootFieldKey;
-			const merged = selection.args ? {
-				...variables,
-				...resolveArguments(selection.args, variables)
-			} : { ...variables };
-			fields[FragmentVarsKey] = {
-				...fields[FragmentVarsKey],
-				[selection.name]: merged
-			};
-			const inner = traceSelections(selection.selections, storage, storage[RootFieldKey], variables, RootFieldKey, path, subscriptionId);
-			if (!inner.complete) {
-				complete = false;
-				for (const dep of inner.missingDeps) missingDeps.add(dep);
-			}
-		} else mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
+		} else if (selection.kind === "FragmentSpread") if (sk !== null && sk !== RootFieldKey) traceFragmentSpread(selection, sk, storage[sk], sk, fields, path);
+		else if (sk === RootFieldKey) traceFragmentSpread(selection, RootFieldKey, storage[RootFieldKey], RootFieldKey, fields, path);
+		else mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
 		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
 		return fields;
 	};
@@ -984,17 +1003,19 @@ 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);
 		if (!entries) continue;
 		for (const entry of entries) {
+			if (entry.dependency === "transitive") continue;
 			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, {}, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1589,7 +1610,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

@@ -346,6 +346,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.
@@ -555,6 +575,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;
@@ -611,6 +632,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];
@@ -712,6 +734,29 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 	const cursors = [];
 	const missingDeps = /* @__PURE__ */ new Set();
 	let complete = true;
+	const traceFragmentSpread = (selection, refKey, value, traceKey, fields, path) => {
+		fields[FragmentRefKey] = refKey;
+		const merged = selection.args ? {
+			...variables,
+			...resolveArguments(selection.args, variables)
+		} : { ...variables };
+		fields[FragmentVarsKey] = {
+			...fields[FragmentVarsKey],
+			[selection.name]: merged
+		};
+		const inner = traceSelections(selection.selections, storage, value, variables, traceKey, path, subscriptionId);
+		for (const cursor of inner.cursors) cursors.push({
+			depKey: cursor.depKey,
+			entry: cursor.entry.dependency === "transitive" ? cursor.entry : {
+				...cursor.entry,
+				dependency: "transitive"
+			}
+		});
+		if (!inner.complete) {
+			complete = false;
+			for (const dep of inner.missingDeps) missingDeps.add(dep);
+		}
+	};
 	const traceField = (sk, sels, val, path, trackCursors) => {
 		if (isNullish(val)) return val;
 		if (Array.isArray(val)) return val.map((item, i) => traceField(sk, sels, item, [...path, i], trackCursors));
@@ -731,6 +776,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];
@@ -739,6 +785,7 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 				const entry = {
 					subscriptionId,
 					path: fieldPath,
+					dependency: "direct",
 					...selection.selections && { selections: selection.selections }
 				};
 				cursors.push({
@@ -758,37 +805,9 @@ const traceSelections = (selections, storage, value, variables, storageKey, base
 			const resolvedValue = selection.selections ? traceField(null, selection.selections, fieldValue, fieldPath, trackCursors) : fieldValue;
 			if (name in fields) mergeFields(fields, { [name]: resolvedValue }, true);
 			else fields[name] = resolvedValue;
-		} else if (selection.kind === "FragmentSpread") if (sk !== null && sk !== RootFieldKey) {
-			fields[FragmentRefKey] = sk;
-			const merged = selection.args ? {
-				...variables,
-				...resolveArguments(selection.args, variables)
-			} : { ...variables };
-			fields[FragmentVarsKey] = {
-				...fields[FragmentVarsKey],
-				[selection.name]: merged
-			};
-			const inner = traceSelections(selection.selections, storage, storage[sk], variables, sk, path, subscriptionId);
-			if (!inner.complete) {
-				complete = false;
-				for (const dep of inner.missingDeps) missingDeps.add(dep);
-			}
-		} else if (sk === RootFieldKey) {
-			fields[FragmentRefKey] = RootFieldKey;
-			const merged = selection.args ? {
-				...variables,
-				...resolveArguments(selection.args, variables)
-			} : { ...variables };
-			fields[FragmentVarsKey] = {
-				...fields[FragmentVarsKey],
-				[selection.name]: merged
-			};
-			const inner = traceSelections(selection.selections, storage, storage[RootFieldKey], variables, RootFieldKey, path, subscriptionId);
-			if (!inner.complete) {
-				complete = false;
-				for (const dep of inner.missingDeps) missingDeps.add(dep);
-			}
-		} else mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
+		} else if (selection.kind === "FragmentSpread") if (sk !== null && sk !== RootFieldKey) traceFragmentSpread(selection, sk, storage[sk], sk, fields, path);
+		else if (sk === RootFieldKey) traceFragmentSpread(selection, RootFieldKey, storage[RootFieldKey], RootFieldKey, fields, path);
+		else mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
 		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, traceField(sk, selection.selections, val, path, trackCursors), true);
 		return fields;
 	};
@@ -983,17 +1002,19 @@ 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);
 		if (!entries) continue;
 		for (const entry of entries) {
+			if (entry.dependency === "transitive") continue;
 			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, {}, mergedValue, sub.variables);
 				patchValue = data;
 			}
 			const patches = result.get(entry.subscriptionId) ?? [];
@@ -1588,7 +1609,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.2",
+  "version": "0.6.4",
   "description": "Type-safe, zero-overhead GraphQL client",
   "keywords": [
     "graphql",