Default to base interface if the object is not defined

Shopify · Mar 5, 2019 · f93a7d2 · f93a7d2
1 parent 4b88b6b
commit f93a7d2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/src/decode.js b/src/decode.js
@@ -116,11 +116,13 @@ function transformScalars(context, value) {
 }
 
 function recordTypeInformation(context, value) {
+  const selectionSet = context.selection.selectionSet;
+
   if (isValue(value)) {
     if (value.__typename) {
-      value.type = schemaForType(context.selection.selectionSet.typeBundle, value.__typename);
+      value.type = schemaForType(selectionSet.typeBundle, value.__typename, selectionSet.typeSchema);
     } else {
-      value.type = context.selection.selectionSet.typeSchema;
+      value.type = selectionSet.typeSchema;
     }
   }
 

diff --git a/src/schema-for-type.js b/src/schema-for-type.js
@@ -1,10 +1,11 @@
-export default function schemaForType(typeBundle, typeName) {
+export default function schemaForType(typeBundle, typeName, typeSchema = null) {
   const type = typeBundle.types[typeName];
 
   if (type) {
     return type;
+  } else if (typeSchema && typeSchema.kind === 'INTERFACE') {
+    return typeSchema;
   }
 
   throw new Error(`No type of ${typeName} found in schema`);
 }
-
diff --git a/test/decode-unknown-type-test.js b/test/decode-unknown-type-test.js
@@ -17,24 +17,24 @@ const checkoutQuery = new Query(typeBundle, (root) => {
   });
 });
 
-suite.only('decode-unknown-type-test', () => {
+suite('decode-unknown-type-test', () => {
   test('it decodes an interface into a type', () => {
     const data = {
       node: {
         __typename: 'Checkout',
         discountApplication: {
-          __typename: "DiscountCodeApplication",
-          targetSelection: "ALL",
-          targetType: "SHIPPING_LINE",
-          code: "SHIPPINGFREE",
-        },
-      },
+          __typename: 'DiscountCodeApplication',
+          targetSelection: 'ALL',
+          targetType: 'SHIPPING_LINE',
+          code: 'SHIPPINGFREE'
+        }
+      }
     };
 
     const decoded = decode(checkoutQuery, data);
 
     assert.ok(decoded);
-    assert.equal(decoded.node.discountApplication.type.name, "DiscountCodeApplication");
+    assert.equal(decoded.node.discountApplication.type.name, 'DiscountCodeApplication');
     assert.equal(decoded.node.discountApplication.targetSelection, data.node.discountApplication.targetSelection);
     assert.equal(decoded.node.discountApplication.targetType, data.node.discountApplication.targetType);
     assert.equal(decoded.node.discountApplication.code, data.node.discountApplication.code);
@@ -45,19 +45,19 @@ suite.only('decode-unknown-type-test', () => {
       node: {
         __typename: 'Checkout',
         discountApplication: {
-          __typename: "AutomaticDiscountApplication",
-          targetSelection: "ALL",
-          targetType: "SHIPPING_LINE",
-        },
-      },
+          __typename: 'AutomaticDiscountApplication',
+          targetSelection: 'ALL',
+          targetType: 'SHIPPING_LINE'
+        }
+      }
     };
 
     const decoded = decode(checkoutQuery, data);
 
     assert.ok(decoded);
-    assert.equal(decoded.node.discountApplication.type.name, "DiscountApplication");
+    assert.equal(decoded.node.discountApplication.type.name, 'DiscountApplication');
     assert.equal(decoded.node.discountApplication.targetSelection, data.node.discountApplication.targetSelection);
     assert.equal(decoded.node.discountApplication.targetType, data.node.discountApplication.targetType);
-    assert.equal(decoded.node.discountApplication.code, data.node.discountApplication.code);
+    assert.equal(decoded.node.discountApplication.code, null);
   });
 });
diff --git a/test/schema-type-test.js b/test/schema-type-test.js
@@ -27,7 +27,8 @@ suite('schema-type-test', () => {
   });
 
   test('returns the correct type for an enum', () => {
-    let currencyCodeType = realTypeBundle.types.CurrencyCode;
+    const currencyCodeType = realTypeBundle.types.CurrencyCode;
+
     assert.deepEqual(schemaForType(realTypeBundle, 'CurrencyCode'), currencyCodeType);
   });
 });