Skip to content

Minor improvements #13299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jerelmiller merged 2 commits into from
Jun 30, 2026
+20 −16
Merged

Minor improvements #13299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a591e4
Don't coerce if scalars aren't configured
jerelmiller Jun 30, 2026
0021dd9
Reuse existing typename variable
jerelmiller Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/cache/inmemory/entityStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,17 +402,21 @@ export abstract class EntityStore implements NormalizedCache {
}

public extract(): NormalizedCacheObject {
const obj = Object.fromEntries(
Object.entries(this.toObject()).map(([dataId, storeObject]) => [
dataId,
storeObject &&
this.coerceStoreObject(
storeObject,
(scalar, value) => scalar.coerceToSerialized(value),
storeObject?.__typename || this.policies.rootTypenamesById[dataId]
),
])
);
let obj = this.toObject();

if (this.hasScalarConfig()) {
obj = Object.fromEntries(
Object.entries(obj).map(([dataId, storeObject]) => [
dataId,
storeObject &&
this.coerceStoreObject(
storeObject,
(scalar, value) => scalar.coerceToSerialized(value),
storeObject?.__typename || this.policies.rootTypenamesById[dataId]
),
])
);
}

const extraRootIds: string[] = [];
this.getRootIdSet().forEach((id) => {
Expand All @@ -426,12 +430,16 @@ export abstract class EntityStore implements NormalizedCache {
return obj;
}

private hasScalarConfig() {
return !!this.policies.cache["config"].scalars;
}

private coerceStoreObject(
obj: StoreObject,
coerce: (scalar: Scalar<any, any>, value: unknown) => unknown,
typename = obj.__typename
): StoreObject {
if (!typename || !this.policies.cache["config"].scalars) {
if (!typename || !this.hasScalarConfig()) {
return obj;
}

Expand Down
4 changes: 0 additions & 4 deletions src/cache/inmemory/readFromStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,6 @@ export class StoreReader {
// do nothing
} else if (fieldValue != null) {
if (__DEV__) {
const typename = context.store.getFieldValue<string>(
objectOrReference,
"__typename"
);
const fieldName = selection.name.value;

if (typename) {
Expand Down
Loading