Adding more test cases, handling default env.

Making sure to check the invalid fragment or variable case in other environments, as well as ensuring that the default env works similar to how Apollo does.

Author: jnwng

src/index.js

@@ -190,7 +190,7 @@ function replaceExpressions(node, context, env) {
 
     chunks.push(chunk);
 
-    if (env === 'apollo') {
+    if (!env || env === 'apollo') {
       // In Apollo, interpolation is only valid outside top-level structures like `query` or `mutation`.
       // We'll check to make sure there's an equivalent set of opening and closing brackets, otherwise
       // we're attempting to do an invalid interpolation.
@@ -223,7 +223,7 @@ function replaceExpressions(node, context, env) {
         // Ellipsis cancels out extra characters
         const placeholder = strWithLen(nameLength);
         chunks.push('...' + placeholder);
-      } else if (env === 'apollo') {
+      } else if (!env || env === 'apollo') {
         // In Apollo, fragment interpolation is only valid outside of brackets
         // Since we don't know what we'd interpolate here (that occurs at runtime),
         // we're not going to do anything with this interpolation.

test/makeRule.js

@@ -30,6 +30,11 @@ const parserOptions = {
         parserOptions,
         code: 'const x = gql`{ number }`',
       },
+      {
+        options,
+        parserOptions,
+        code: 'const x = gql`{ number } ${x}`',
+      },
     ],
 
     invalid: [
@@ -51,6 +56,17 @@ const parserOptions = {
           type: 'TaggedTemplateExpression'
         }]
       },
+      {
+        options,
+        parserOptions,
+        code: 'const x = gql`{ ${x} }`',
+        errors: [{
+          message: 'Invalid interpolation - fragment interpolation must occur outside of the brackets.',
+          type: 'Identifier',
+          line: 1,
+          column: 19
+        }]
+      },
     ]
   });
 }
@@ -94,7 +110,7 @@ const parserOptions = {
         code: 'const x = myGraphQLTag`{ ${x} }`',
         errors: [{
           type: 'Identifier',
-          message: 'Invalid interpolation - not a valid fragment or variable.'
+          message: 'Invalid interpolation - fragment interpolation must occur outside of the brackets.'
         }]
       },
     ]
@@ -111,7 +127,7 @@ const parserOptions = {
       {
         options,
         parserOptions,
-        code: 'const x = gql`{ number } ${SomeFragment}`',
+        code: 'const x = gql`{ number } ${x}`',
       },
     ],
 
@@ -274,6 +290,29 @@ const parserOptions = {
           column: 19
         }]
       },
+      {
+        options,
+        parserOptions,
+        code: `
+          client.query(gql\`
+            {
+              allFilms {
+                films {
+                  \${filmInfo}
+                }
+              }
+            }
+          \`).then(result => {
+            console.log(result.allFilms.films);
+          });
+        `,
+        errors: [{
+          message: 'Invalid interpolation - not a valid fragment or variable.',
+          type: 'Identifier',
+          line: 6,
+          column: 21
+        }]
+      },
     ]
   });
 }