@mearie/core 0.5.0 → 0.5.2

package/dist/index.cjs

@@ -482,28 +482,48 @@ const replaceEqualDeep = (prev, next) => {
 	}
 	return allSame ? prev : result;
 };
+const NormalizedKey = Symbol("mearie.normalized");
 /**
-* Deeply merges two values. Objects are recursively merged, arrays are element-wise merged,
-* entity links and primitives use last-write-wins.
+* Marks a record as a normalized cache object so that {@link mergeFields}
+* can distinguish it from opaque scalar values (e.g. JSON scalars).
+* Only normalized records are deep-merged; unmarked objects are treated as
+* atomic values and replaced entirely on write.
 * @internal
 */
-const mergeFieldValue = (existing, incoming) => {
+const markNormalized = (obj) => {
+	Object.defineProperty(obj, NormalizedKey, { value: true });
+};
+const isNormalizedRecord = (value) => {
+	return typeof value === "object" && value !== null && NormalizedKey in value;
+};
+/**
+* Deeply merges two values. When {@link deep} is false (default), only
+* {@link markNormalized normalized} cache objects are recursively merged;
+* unmarked plain objects (e.g. JSON scalars) are atomically replaced.
+* When {@link deep} is true, all objects are recursively merged unconditionally.
+* Arrays are element-wise merged, entity links and primitives use last-write-wins.
+* @internal
+*/
+const mergeFieldValue = (existing, incoming, deep) => {
 	if (isNullish(existing) || isNullish(incoming)) return incoming;
 	if (typeof existing !== "object" || typeof incoming !== "object") return incoming;
 	if (isEntityLink(existing) || isEntityLink(incoming)) return incoming;
-	if (Array.isArray(existing) && Array.isArray(incoming)) return incoming.map((item, i) => i < existing.length ? mergeFieldValue(existing[i], item) : item);
+	if (Array.isArray(existing) && Array.isArray(incoming)) return incoming.map((item, i) => i < existing.length ? mergeFieldValue(existing[i], item, deep) : item);
 	if (Array.isArray(existing) || Array.isArray(incoming)) return incoming;
-	mergeFields(existing, incoming);
+	if (!deep && !isNormalizedRecord(incoming)) return incoming;
+	mergeFields(existing, incoming, deep);
 	return existing;
 };
 /**
-* Deeply merges source fields into target. Objects are recursively merged,
-* arrays are element-wise merged, entity links and primitives use last-write-wins.
+* Deeply merges source fields into target.
+* When {@link deep} is false (default), only {@link markNormalized normalized}
+* objects are recursively merged; unmarked objects are atomically replaced.
+* When {@link deep} is true, all objects are recursively merged unconditionally.
 * @internal
 */
-const mergeFields = (target, source) => {
+const mergeFields = (target, source, deep) => {
 	if (isNullish(source) || typeof source !== "object" || Array.isArray(source)) return;
-	for (const key of Object.keys(source)) target[key] = mergeFieldValue(target[key], source[key]);
+	for (const key of Object.keys(source)) target[key] = mergeFieldValue(target[key], source[key], deep ?? false);
 };
 /**
 * Creates a FieldKey from a raw field name and optional arguments.
@@ -518,35 +538,49 @@ const makeFieldKeyFromArgs = (field, args) => {
 
 //#endregion
 //#region src/cache/normalize.ts
+const resolveTypename = (selections, data) => {
+	for (const s of selections) if (s.kind === "Field" && s.name === "__typename") return data[s.alias ?? "__typename"];
+	return data.__typename;
+};
 const normalize = (schemaMeta, selections, storage, data, variables, accessor) => {
-	const normalizeField = (storageKey, selections, value) => {
+	const resolveEntityKey = (typename, data) => {
+		if (!typename) return null;
+		const entityMeta = schemaMeta.entities[typename];
+		if (!entityMeta) return null;
+		const keys = entityMeta.keyFields.map((field) => data[field]);
+		if (keys.every((k) => k !== void 0 && k !== null)) return makeEntityKey(typename, keys);
+		return null;
+	};
+	const normalizeField = (storageKey, selections, value, parentType) => {
 		if (isNullish(value)) return value;
-		if (Array.isArray(value)) return value.map((item) => normalizeField(storageKey, selections, item));
+		if (Array.isArray(value)) return value.map((item) => normalizeField(storageKey, selections, item, parentType));
 		const data = value;
-		const typename = data.__typename;
-		let entityMeta = schemaMeta.entities[typename];
-		if (entityMeta) {
-			const keys = entityMeta.keyFields.map((field) => data[field]);
-			if (keys.every((k) => k !== void 0 && k !== null)) storageKey = makeEntityKey(typename, keys);
-			else entityMeta = void 0;
-		}
+		const typename = resolveTypename(selections, data) ?? (parentType && schemaMeta.entities[parentType] ? parentType : void 0);
+		const entityKey = resolveEntityKey(typename, data);
+		if (entityKey) storageKey = entityKey;
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
 			const fieldKey = makeFieldKey(selection, variables);
-			const fieldValue = data[selection.alias ?? selection.name];
+			let fieldValue = data[selection.alias ?? selection.name];
+			if (selection.name === "__typename" && fieldValue === void 0 && typename) fieldValue = typename;
+			if (storageKey !== null && selection.selections && typeof fieldValue === "object" && fieldValue !== null && !Array.isArray(fieldValue)) {
+				const fieldTypename = resolveTypename(selection.selections, fieldValue) ?? (selection.type && schemaMeta.entities[selection.type] ? selection.type : void 0);
+				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);
-			fields[fieldKey] = selection.selections ? normalizeField(null, selection.selections, fieldValue) : 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]);
 		} else if (selection.kind === "FragmentSpread" || selection.kind === "InlineFragment" && selection.on === typename) {
 			const inner = normalizeField(storageKey, selection.selections, value);
 			if (!isEntityLink(inner)) mergeFields(fields, inner);
 		}
-		if (entityMeta && storageKey !== null) {
-			const existing = storage[storageKey];
+		markNormalized(fields);
+		if (entityKey) {
+			const existing = storage[entityKey];
 			if (existing) mergeFields(existing, fields);
-			else storage[storageKey] = fields;
-			return { [EntityLinkKey]: storageKey };
+			else storage[entityKey] = fields;
+			return { [EntityLinkKey]: entityKey };
 		}
 		return fields;
 	};
@@ -591,7 +625,7 @@ const denormalize = (selections, storage, value, variables, accessor) => {
 			}
 			const name = selection.alias ?? selection.name;
 			const value = selection.selections ? denormalizeField(null, selection.selections, fieldValue) : fieldValue;
-			if (name in fields) mergeFields(fields, { [name]: value });
+			if (name in fields) mergeFields(fields, { [name]: value }, true);
 			else fields[name] = value;
 		} else if (selection.kind === "FragmentSpread") if (storageKey !== null && storageKey !== RootFieldKey) {
 			fields[FragmentRefKey] = storageKey;
@@ -607,8 +641,8 @@ const denormalize = (selections, storage, value, variables, accessor) => {
 				};
 			}
 			if (accessor) denormalize(selection.selections, storage, { [EntityLinkKey]: storageKey }, variables, accessor);
-		} else mergeFields(fields, denormalizeField(storageKey, selection.selections, value));
-		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, denormalizeField(storageKey, selection.selections, value));
+		} else mergeFields(fields, denormalizeField(storageKey, selection.selections, value), true);
+		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, denormalizeField(storageKey, selection.selections, value), true);
 		return fields;
 	};
 	return {

package/dist/index.mjs

@@ -481,28 +481,48 @@ const replaceEqualDeep = (prev, next) => {
 	}
 	return allSame ? prev : result;
 };
+const NormalizedKey = Symbol("mearie.normalized");
 /**
-* Deeply merges two values. Objects are recursively merged, arrays are element-wise merged,
-* entity links and primitives use last-write-wins.
+* Marks a record as a normalized cache object so that {@link mergeFields}
+* can distinguish it from opaque scalar values (e.g. JSON scalars).
+* Only normalized records are deep-merged; unmarked objects are treated as
+* atomic values and replaced entirely on write.
 * @internal
 */
-const mergeFieldValue = (existing, incoming) => {
+const markNormalized = (obj) => {
+	Object.defineProperty(obj, NormalizedKey, { value: true });
+};
+const isNormalizedRecord = (value) => {
+	return typeof value === "object" && value !== null && NormalizedKey in value;
+};
+/**
+* Deeply merges two values. When {@link deep} is false (default), only
+* {@link markNormalized normalized} cache objects are recursively merged;
+* unmarked plain objects (e.g. JSON scalars) are atomically replaced.
+* When {@link deep} is true, all objects are recursively merged unconditionally.
+* Arrays are element-wise merged, entity links and primitives use last-write-wins.
+* @internal
+*/
+const mergeFieldValue = (existing, incoming, deep) => {
 	if (isNullish(existing) || isNullish(incoming)) return incoming;
 	if (typeof existing !== "object" || typeof incoming !== "object") return incoming;
 	if (isEntityLink(existing) || isEntityLink(incoming)) return incoming;
-	if (Array.isArray(existing) && Array.isArray(incoming)) return incoming.map((item, i) => i < existing.length ? mergeFieldValue(existing[i], item) : item);
+	if (Array.isArray(existing) && Array.isArray(incoming)) return incoming.map((item, i) => i < existing.length ? mergeFieldValue(existing[i], item, deep) : item);
 	if (Array.isArray(existing) || Array.isArray(incoming)) return incoming;
-	mergeFields(existing, incoming);
+	if (!deep && !isNormalizedRecord(incoming)) return incoming;
+	mergeFields(existing, incoming, deep);
 	return existing;
 };
 /**
-* Deeply merges source fields into target. Objects are recursively merged,
-* arrays are element-wise merged, entity links and primitives use last-write-wins.
+* Deeply merges source fields into target.
+* When {@link deep} is false (default), only {@link markNormalized normalized}
+* objects are recursively merged; unmarked objects are atomically replaced.
+* When {@link deep} is true, all objects are recursively merged unconditionally.
 * @internal
 */
-const mergeFields = (target, source) => {
+const mergeFields = (target, source, deep) => {
 	if (isNullish(source) || typeof source !== "object" || Array.isArray(source)) return;
-	for (const key of Object.keys(source)) target[key] = mergeFieldValue(target[key], source[key]);
+	for (const key of Object.keys(source)) target[key] = mergeFieldValue(target[key], source[key], deep ?? false);
 };
 /**
 * Creates a FieldKey from a raw field name and optional arguments.
@@ -517,35 +537,49 @@ const makeFieldKeyFromArgs = (field, args) => {
 
 //#endregion
 //#region src/cache/normalize.ts
+const resolveTypename = (selections, data) => {
+	for (const s of selections) if (s.kind === "Field" && s.name === "__typename") return data[s.alias ?? "__typename"];
+	return data.__typename;
+};
 const normalize = (schemaMeta, selections, storage, data, variables, accessor) => {
-	const normalizeField = (storageKey, selections, value) => {
+	const resolveEntityKey = (typename, data) => {
+		if (!typename) return null;
+		const entityMeta = schemaMeta.entities[typename];
+		if (!entityMeta) return null;
+		const keys = entityMeta.keyFields.map((field) => data[field]);
+		if (keys.every((k) => k !== void 0 && k !== null)) return makeEntityKey(typename, keys);
+		return null;
+	};
+	const normalizeField = (storageKey, selections, value, parentType) => {
 		if (isNullish(value)) return value;
-		if (Array.isArray(value)) return value.map((item) => normalizeField(storageKey, selections, item));
+		if (Array.isArray(value)) return value.map((item) => normalizeField(storageKey, selections, item, parentType));
 		const data = value;
-		const typename = data.__typename;
-		let entityMeta = schemaMeta.entities[typename];
-		if (entityMeta) {
-			const keys = entityMeta.keyFields.map((field) => data[field]);
-			if (keys.every((k) => k !== void 0 && k !== null)) storageKey = makeEntityKey(typename, keys);
-			else entityMeta = void 0;
-		}
+		const typename = resolveTypename(selections, data) ?? (parentType && schemaMeta.entities[parentType] ? parentType : void 0);
+		const entityKey = resolveEntityKey(typename, data);
+		if (entityKey) storageKey = entityKey;
 		const fields = {};
 		for (const selection of selections) if (selection.kind === "Field") {
 			const fieldKey = makeFieldKey(selection, variables);
-			const fieldValue = data[selection.alias ?? selection.name];
+			let fieldValue = data[selection.alias ?? selection.name];
+			if (selection.name === "__typename" && fieldValue === void 0 && typename) fieldValue = typename;
+			if (storageKey !== null && selection.selections && typeof fieldValue === "object" && fieldValue !== null && !Array.isArray(fieldValue)) {
+				const fieldTypename = resolveTypename(selection.selections, fieldValue) ?? (selection.type && schemaMeta.entities[selection.type] ? selection.type : void 0);
+				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);
-			fields[fieldKey] = selection.selections ? normalizeField(null, selection.selections, fieldValue) : 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]);
 		} else if (selection.kind === "FragmentSpread" || selection.kind === "InlineFragment" && selection.on === typename) {
 			const inner = normalizeField(storageKey, selection.selections, value);
 			if (!isEntityLink(inner)) mergeFields(fields, inner);
 		}
-		if (entityMeta && storageKey !== null) {
-			const existing = storage[storageKey];
+		markNormalized(fields);
+		if (entityKey) {
+			const existing = storage[entityKey];
 			if (existing) mergeFields(existing, fields);
-			else storage[storageKey] = fields;
-			return { [EntityLinkKey]: storageKey };
+			else storage[entityKey] = fields;
+			return { [EntityLinkKey]: entityKey };
 		}
 		return fields;
 	};
@@ -590,7 +624,7 @@ const denormalize = (selections, storage, value, variables, accessor) => {
 			}
 			const name = selection.alias ?? selection.name;
 			const value = selection.selections ? denormalizeField(null, selection.selections, fieldValue) : fieldValue;
-			if (name in fields) mergeFields(fields, { [name]: value });
+			if (name in fields) mergeFields(fields, { [name]: value }, true);
 			else fields[name] = value;
 		} else if (selection.kind === "FragmentSpread") if (storageKey !== null && storageKey !== RootFieldKey) {
 			fields[FragmentRefKey] = storageKey;
@@ -606,8 +640,8 @@ const denormalize = (selections, storage, value, variables, accessor) => {
 				};
 			}
 			if (accessor) denormalize(selection.selections, storage, { [EntityLinkKey]: storageKey }, variables, accessor);
-		} else mergeFields(fields, denormalizeField(storageKey, selection.selections, value));
-		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, denormalizeField(storageKey, selection.selections, value));
+		} else mergeFields(fields, denormalizeField(storageKey, selection.selections, value), true);
+		else if (selection.kind === "InlineFragment" && selection.on === data[typenameFieldKey]) mergeFields(fields, denormalizeField(storageKey, selection.selections, value), true);
 		return fields;
 	};
 	return {

package/package.json

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