@apollo/client 4.3.0-rc.0 → 4.3.0-rc.2

package/__cjs/cache/inmemory/entityStore.cjs

@@ -82,7 +82,7 @@ class EntityStore {
         // then there are no fields to be merged, so we're done.
         if (!incoming)
             return;
-        (0, invariant_1.invariant)(typeof dataId === "string", 107);
+        (0, invariant_1.invariant)(typeof dataId === "string", 108);
         // Parse all scalars before merging so that the storeObjectReconciler can
         // deep compare the parsed value with the existing value
         incoming = this.coerceStoreObject(incoming, (scalar, value) => scalar.coerceToParsed(value), incoming.__typename ||
@@ -189,7 +189,7 @@ class EntityStore {
                             if (environment_1.__DEV__) {
                                 const checkReference = (ref) => {
                                     if (this.lookup(ref.__ref) === undefined) {
-                                        __DEV__ && invariant_1.invariant.warn(108, ref);
+                                        __DEV__ && invariant_1.invariant.warn(109, ref);
                                         return true;
                                     }
                                 };
@@ -218,7 +218,7 @@ class EntityStore {
                                             }
                                         }
                                         if (seenReference && someNonReference !== undefined) {
-                                            __DEV__ && invariant_1.invariant.warn(109, someNonReference);
+                                            __DEV__ && invariant_1.invariant.warn(110, someNonReference);
                                             break;
                                         }
                                     }
@@ -319,22 +319,37 @@ class EntityStore {
         }
         let changed = false;
         const entries = Object.entries(obj).map(([storeFieldName, value]) => {
-            const scalar = this.policies.getScalarForField(typename, (0, helpers_js_1.fieldNameFromStoreName)(storeFieldName));
-            const newValue = this.coerceValue(value, coerce, scalar);
+            const fieldName = (0, helpers_js_1.fieldNameFromStoreName)(storeFieldName);
+            const scalarType = this.policies.getScalarTypeForField(typename, fieldName);
+            const newValue = this.coerceValue(value, coerce, scalarType, `${typename}.${fieldName}`);
             changed ||= newValue !== value;
             return [storeFieldName, newValue];
         });
         return changed ? Object.fromEntries(entries) : obj;
     }
-    coerceValue(value, coerce, scalar) {
+    coerceValue(value, coerce, scalarType, coordinate) {
         if (value == null) {
             return value;
         }
-        if (Array.isArray(value)) {
-            return value.map((item) => this.coerceValue(item, coerce, scalar));
+        if (scalarType) {
+            const match = (0, internal_1.matchScalarList)(scalarType);
+            if (match) {
+                if (Array.isArray(value)) {
+                    return value.map((item) => this.coerceValue(item, coerce, match[1], coordinate));
+                }
+                else {
+                    if (environment_1.__DEV__) {
+                        __DEV__ && invariant_1.invariant.warn(111, coordinate, scalarType, (0, internal_1.unwrapScalarType)(scalarType));
+                    }
+                }
+            }
+            const scalar = this.policies.cache.getScalar((0, internal_1.unwrapScalarType)(scalarType));
+            if (scalar) {
+                return coerce(scalar, value);
+            }
         }
-        if (scalar) {
-            return coerce(scalar, value);
+        if (Array.isArray(value)) {
+            return value.map((item) => this.coerceValue(item, coerce, scalarType, coordinate));
         }
         if ((0, internal_1.isPlainObject)(value) && "__typename" in value) {
             return this.coerceStoreObject(value, coerce);