fix(valueFromAST): restore variable own-property checks (#4671)

forward port of #4652

Co-authored-by: Abishek Kumar Giri <giriabishekkumar5@gmail.com>

Author: yaacovCR

src/utilities/__tests__/valueFromAST-test.ts

@@ -252,11 +252,19 @@ describe('valueFromAST', () => {
     expectValueFrom('$var', GraphQLBoolean, { var: true }).to.equal(true);
     expectValueFrom('$var', GraphQLBoolean, { var: null }).to.equal(null);
     expectValueFrom('$var', nonNullBool, { var: null }).to.equal(undefined);
+    expectValueFrom('$toString', GraphQLBoolean, {}).to.equal(undefined);
+    expectValueFrom('$var', GraphQLBoolean, { var: undefined }).to.equal(
+      undefined,
+    );
   });
 
   it('asserts variables are provided as items in lists', () => {
     expectValueFrom('[ $foo ]', listOfBool, {}).to.deep.equal([null]);
+    expectValueFrom('[ $foo ]', listOfBool, { foo: undefined }).to.deep.equal([
+      null,
+    ]);
     expectValueFrom('[ $foo ]', listOfNonNullBool, {}).to.equal(undefined);
+    expectValueFrom('[ $toString ]', listOfBool, {}).to.deep.equal([null]);
     expectValueFrom('[ $foo ]', listOfNonNullBool, {
       foo: true,
     }).to.deep.equal([true]);
@@ -285,5 +293,14 @@ describe('valueFromAST', () => {
       int: 42,
       requiredBool: true,
     });
+
+    expectValueFrom(
+      '{ int: $toString, requiredBool: true }',
+      testInputObj,
+      {},
+    ).to.deep.equal({
+      int: 42,
+      requiredBool: true,
+    });
   });
 });

src/utilities/valueFromAST.ts

@@ -48,7 +48,11 @@ export function valueFromAST(
 
   if (valueNode.kind === Kind.VARIABLE) {
     const variableName = valueNode.name.value;
-    const variableValue = variables?.[variableName];
+    if (variables == null || !Object.hasOwn(variables, variableName)) {
+      // No valid return value.
+      return;
+    }
+    const variableValue = variables[variableName];
     if (variableValue === undefined) {
       // No valid return value.
       return;
@@ -172,6 +176,7 @@ function isMissingVariable(
 ): boolean {
   return (
     valueNode.kind === Kind.VARIABLE &&
-    variables?.[valueNode.name.value] === undefined
+    (variables?.[valueNode.name.value] === undefined ||
+      !Object.hasOwn(variables, valueNode.name.value))
   );
 }