fix(replaceVariables): handle missing individual variable source (#4236)

extracted from #4206

Author: yaacovCR

src/utilities/__tests__/replaceVariables-test.ts

@@ -65,19 +65,32 @@ describe('replaceVariables', () => {
       );
     });
 
+    it('replaces missing variable declaration with null', () => {
+      const ast = parseValue('$var');
+      const vars = testVariables('', {});
+      expect(replaceVariables(ast, vars)).to.deep.equal(parseValue('null'));
+    });
+
+    it('replaces misspelled variable declaration with null', () => {
+      const ast = parseValue('$var1');
+      const vars = testVariables('($var2: Int)', { var2: 123 });
+      expect(replaceVariables(ast, vars)).to.deep.equal(parseValue('null'));
+    });
+
     it('replaces missing Variables in lists with null', () => {
       const ast = parseValue('[1, $var]');
       expect(replaceVariables(ast, undefined)).to.deep.equal(
         parseValue('[1, null]'),
       );
     });
-  });
 
-  it('omits missing Variables from objects', () => {
-    const ast = parseValue('{ foo: 1, bar: $var }');
-    expect(replaceVariables(ast, undefined)).to.deep.equal(
-      parseValue('{ foo: 1 }'),
-    );
+    it('omits missing Variables from objects', () => {
+      const ast = parseValue('{ foo: 1, bar: $var }');
+      const vars = testVariables('($wrongVar: Int)', { var: 123 });
+      expect(replaceVariables(ast, vars)).to.deep.equal(
+        parseValue('{ foo: 1 }'),
+      );
+    });
   });
 
   describe('Fragment Variables', () => {

src/utilities/replaceVariables.ts

@@ -31,11 +31,11 @@ export function replaceVariables(
         ? fragmentVariableValues
         : variableValues;
 
-      if (scopedVariableValues == null) {
+      const scopedVariableSource = scopedVariableValues?.sources[varName];
+      if (scopedVariableSource == null) {
         return { kind: Kind.NULL };
       }
 
-      const scopedVariableSource = scopedVariableValues.sources[varName];
       if (scopedVariableSource.value === undefined) {
         const defaultValue = scopedVariableSource.signature.defaultValue;
         if (defaultValue !== undefined) {