Remove Mutation PII while still updating the Cache correctly

packages/graphql-cli-validate-magento-pwa-queries/lib/__tests__/index.spec.js

@@ -148,8 +148,11 @@ describe('handler', () => {
     });
 
     test('it creates a validator with the correct configuration', async () => {
-        const expectedRule = [
-            'error',
+        // Act.
+        await plugin.handler(mockContext, mockArgs);
+
+        // Assert.
+        const ruleTargets = [
             // These objects are derived from mockArgs.
             {
                 env: 'apollo',
@@ -162,8 +165,7 @@ describe('handler', () => {
                 schemaJsonFilepath: 'unit test'
             }
         ];
-
-        await plugin.handler(mockContext, mockArgs);
+        const warnRule = ['warn', ...ruleTargets];
 
         const lintConfiguration = eslintCLIEngineSpy.mock.calls[0][0];
 
@@ -186,24 +188,20 @@ describe('handler', () => {
 
         const templateStringsRule =
             lintConfiguration.rules['graphql/template-strings'];
-        expect(templateStringsRule).toEqual(expectedRule);
+        expect(templateStringsRule).toBeInstanceOf(Array);
+        expect(templateStringsRule[0]).toBe('error');
+        expect(templateStringsRule[1]).toEqual(
+            expect.objectContaining({
+                env: expect.any(String),
+                projectName: expect.any(String),
+                schemaJsonFilepath: expect.any(String),
+                validators: expect.any(Array)
+            })
+        );
 
         const deprecatedFieldsRule =
             lintConfiguration.rules['graphql/no-deprecated-fields'];
-        expect(deprecatedFieldsRule).toEqual([
-            'warn',
-            // These objects are derived from mockArgs.
-            {
-                env: 'apollo',
-                projectName: 'myApp',
-                schemaJsonFilepath: 'unit test'
-            },
-            {
-                env: 'literal',
-                projectName: 'myApp',
-                schemaJsonFilepath: 'unit test'
-            }
-        ]);
+        expect(deprecatedFieldsRule).toEqual(warnRule);
 
         expect(lintConfiguration.useEslintrc).toBe(false);
     });

packages/graphql-cli-validate-magento-pwa-queries/lib/index.js

@@ -106,8 +106,6 @@ async function validateQueries(context, argv) {
                 process.exit(exitCodes.SUCCESS);
             }
         }
-
-        process.exit(0);
     } catch (e) {
         const message = e.message ? e.message : e;
         context.spinner.fail(`An error occurred:\n${message}`);
@@ -134,24 +132,82 @@ function getValidator({ clients, project, schemaPath }) {
         schemaJsonFilepath: schemaPath
     }));
 
-    const ruleDefinition = ['error', ...clientRules];
+    const error = ['error', ...clientRules];
+    const warn = ['warn', ...clientRules];
+
+    /*
+     * Here we explicitly list the validators for the graphql/template-strings rule to use.
+     *
+     * We'd like to use the special value 'all' but we have to disable some validators due
+     * to how PWA Studio uses GraphQL.
+     *
+     * @see https://github.com/apollographql/eslint-plugin-graphql#selecting-validation-rules
+     */
+    const validators = [
+        'ExecutableDefinitions',
+        'FieldsOnCorrectType',
+        'FragmentsOnCompositeTypes',
+        'KnownArgumentNames',
+        /*
+         * PWA Studio queries sometimes use the @connection directive, which is Apollo-specific.
+         */
+        // 'KnownDirectives',
+        /*
+         * PWA Studio sometimes uses fragments imported from other JS files.
+         * The parser does not recognize these.
+         */
+        // 'KnownFragmentNames',
+        'KnownTypeNames',
+        'LoneAnonymousOperation',
+        'NoFragmentCycles',
+        'NoUndefinedVariables',
+        /*
+         * PWA Studio sometimes defines fragments for use by other JS files.
+         */
+        // 'NoUnusedFragments',
+        'NoUnusedVariables',
+        'OverlappingFieldsCanBeMerged',
+        'PossibleFragmentSpreads',
+        'ProvidedRequiredArguments',
+        'ScalarLeafs',
+        'SingleFieldSubscriptions',
+        'UniqueArgumentNames',
+        'UniqueDirectivesPerLocation',
+        'UniqueFragmentNames',
+        'UniqueInputFieldNames',
+        'UniqueOperationNames',
+        'UniqueVariableNames',
+        'ValuesOfCorrectType',
+        'VariablesAreInputTypes',
+        /*
+         * The eslint-plugin-graphql docs may be out of date,
+         * this doesn't appear to be a legitimate validator anymore.
+         */
+        // 'VariablesDefaultValueAllowed',
+        'VariablesInAllowedPosition'
+    ];
 
     const linterConfiguration = {
         parser: 'babel-eslint',
         plugins: ['graphql'],
         rules: {
-            'graphql/capitalized-type-name': ruleDefinition,
-            'graphql/named-operations': ruleDefinition,
-            'graphql/no-deprecated-fields': ['warn', ...clientRules],
+            'graphql/capitalized-type-name': error,
+            'graphql/named-operations': error,
+            'graphql/no-deprecated-fields': warn,
             'graphql/required-fields': [
                 'error',
-                ...clients.map(clientName => ({
-                    env: clientName,
-                    schemaJsonFilepath: schemaPath,
+                ...clientRules.map(rule => ({
+                    ...rule,
                     requiredFields: ['id']
                 }))
             ],
-            'graphql/template-strings': ruleDefinition
+            'graphql/template-strings': [
+                'error',
+                ...clientRules.map(rule => ({
+                    ...rule,
+                    validators
+                }))
+            ]
         },
         useEslintrc: false
     };

packages/peregrine/lib/talons/Checkout/useAddressForm.js

@@ -37,9 +37,9 @@ export const useAddressForm = props => {
         fetchPolicy: 'no-cache'
     });
     const [setShippingAddressOnCart] = useMutation(
-        setShippingAddressOnCartMutation,
-        { fetchPolicy: 'no-cache' }
+        setShippingAddressOnCartMutation
     );
+
     const values = useMemo(
         () =>
             fields.reduce((acc, key) => {

packages/peregrine/lib/talons/CreateAccount/useCreateAccount.js

@@ -45,7 +45,9 @@ export const useCreateAccount = props => {
     // personally identifiable information (PII). So we set fetchPolicy to 'no-cache'.
     const [createAccount, { error: createAccountError }] = useMutation(
         createAccountQuery,
-        { fetchPolicy: 'no-cache' }
+        {
+            fetchPolicy: 'no-cache'
+        }
     );
     const [signIn, { error: signInError }] = useMutation(signInMutation, {
         fetchPolicy: 'no-cache'

packages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingForm.js

@@ -151,7 +151,7 @@ export const SET_SHIPPING_ADDRESS_MUTATION = gql`
                 cart_id: $cartId
                 shipping_addresses: [{ address: $address }]
             }
-        ) {
+        ) @connection(key: "setShippingAddressesOnCart") {
             cart {
                 id
                 ...CartPageFragment

packages/venia-ui/lib/queries/createAccount.graphql

@@ -16,7 +16,6 @@ mutation createAccount(
         # which requires that at least one of the sub fields be returned.
         customer {
             id
-            email
         }
     }
 }

packages/venia-ui/lib/queries/setGuestEmailOnCart.graphql

@@ -2,7 +2,6 @@ mutation setGuestEmailOnCart($cartId: String!, $email: String!) {
     setGuestEmailOnCart(input: { cart_id: $cartId, email: $email }) {
         cart {
             id
-            email
         }
     }
 }

packages/venia-ui/lib/queries/setShippingAddress.graphql

@@ -28,7 +28,7 @@ mutation setShippingAddress(
                 }
             ]
         }
-    ) {
+    ) @connection(key: "setShippingAddressesOnCart") {
         cart {
             id
             shipping_addresses {