Merge pull request #5146 from apollographql/eliminate-generated-cache…

…-ids Eliminate "generated" cache IDs to avoid normalizing objects without meaningful IDs.
apollographql · Aug 9, 2019 · 18c266d · 18c266d
2 parents 2f1bc81 + 054eb7b
commit 18c266d
Show file tree

Hide file tree

Showing 27 changed files with 799 additions and 1,522 deletions.
diff --git a/package.json b/package.json
@@ -29,17 +29,17 @@
     {
       "name": "apollo-cache-inmemory",
       "path": "./packages/apollo-cache-inmemory/lib/bundle.cjs.min.js",
-      "maxSize": "5.05 kB"
+      "maxSize": "4.3 kB"
     },
     {
       "name": "apollo-client",
       "path": "./packages/apollo-client/lib/bundle.cjs.min.js",
-      "maxSize": "9.95 kB"
+      "maxSize": "9.9 kB"
     },
     {
       "name": "apollo-utilities",
       "path": "./packages/apollo-utilities/lib/bundle.cjs.min.js",
-      "maxSize": "4.2 kB"
+      "maxSize": "4.25 kB"
     }
   ],
   "lint-staged": {

diff --git a/packages/apollo-cache-inmemory/src/__tests__/__snapshots__/cache.ts.snap b/packages/apollo-cache-inmemory/src/__tests__/__snapshots__/cache.ts.snap
@@ -8,10 +8,7 @@ Object {
   "foo": Object {
     "e": 4,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -29,10 +26,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -50,10 +44,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -71,10 +62,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -92,10 +80,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }
@@ -113,10 +98,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }
@@ -130,10 +112,7 @@ Object {
   "foo": Object {
     "e": 4,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -151,10 +130,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -172,10 +148,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -193,10 +166,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -214,10 +184,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }
@@ -235,10 +202,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }
@@ -252,10 +216,7 @@ Object {
   "foo": Object {
     "e": 4,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -273,10 +234,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -294,10 +252,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -315,10 +270,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": undefined,
+      "__ref": "bar",
     },
   },
 }
@@ -336,10 +288,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }
@@ -357,10 +306,7 @@ Object {
     "f": 5,
     "g": 6,
     "h": Object {
-      "generated": false,
-      "id": "bar",
-      "type": "id",
-      "typename": "Bar",
+      "__ref": "bar",
     },
   },
 }