Fix configuration loading and schema tag support

.vscode/launch.json

@@ -52,5 +52,11 @@
       "port": 9002,
       "sourceMaps": true
     }
+  ],
+  "compounds": [
+    {
+      "name": "Extension + Server",
+      "configurations": ["Launch VS Code Extension", "Attach to TS Server"]
+    }
   ]
 }

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## Upcoming
 
-<!-- add changes for upcoming versions here -->
+- `apollo`
+  - Fix configuration loading and schema tag support [#925](https://github.com/apollographql/apollo-tooling/pull/925)
 
 ## `[email protected]`
 

apollo.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   client: {
     name: "Apollo CLI",
-    service: "engine-api-prod",
+    service: "engine@master",
     includes: ["./packages/apollo-language-server/**/*.ts"]
   },
   engine: {

packages/apollo-language-server/src/config.ts

@@ -303,16 +303,27 @@ export const loadConfig = async ({
     }
   }
 
-  const resolvedName = name || nameFromKey;
+  let resolvedName = name || nameFromKey;
 
   // The CLI passes in a type when loading config. The editor extension
   // does not. So we determine the type of the config here, and use it if
   // the type wasn't explicitly passed in.
   let resolvedType: "client" | "service";
   if (type) {
     resolvedType = type;
+    if (
+      loadedConfig &&
+      loadedConfig.config.client &&
+      typeof loadedConfig.config.client.service === "string"
+    ) {
+      resolvedName = loadedConfig.config.client.service;
+    }
   } else if (loadedConfig && loadedConfig.config.client) {
     resolvedType = "client";
+    resolvedName =
+      typeof loadedConfig.config.client.service === "string"
+        ? loadedConfig.config.client.service
+        : resolvedName;
   } else if (loadedConfig && loadedConfig.config.service) {
     resolvedType = "service";
   } else {

packages/apollo-language-server/src/workspace.ts

@@ -103,11 +103,18 @@ export class GraphQLWorkspace {
     });
 
     apolloConfigFiles.push(
-      ...fg.sync("**/package.json", {
-        cwd: URI.parse(folder.uri).fsPath,
-        absolute: true,
-        ignore: "**/node_modules/**"
-      })
+      ...fg
+        .sync("**/package.json", {
+          cwd: URI.parse(folder.uri).fsPath,
+          absolute: true,
+          ignore: "**/node_modules/**"
+        })
+        // Every package.json file _potentially_ has an apollo config, but we can filter out
+        // the ones that don't before we even call loadConfig and send cosmiconfig looking.
+        .filter(packageFile => {
+          const { apollo } = require(packageFile);
+          return Boolean(apollo);
+        })
     );
 
     // only have unique possible folders

packages/apollo/src/Command.ts

@@ -126,7 +126,7 @@ export abstract class ProjectCommand extends Command {
       type: this.type
     });
 
-    if (flags.tag) config.tag = flags.tag;
+    config.tag = flags.tag || config.tag || "current";
     //  flag overides
     config.setDefaults({
       engine: {

packages/apollo/src/commands/client/check.ts

@@ -12,8 +12,7 @@ export default class ClientCheck extends ClientCommand {
     ...ClientCommand.flags,
     tag: flags.string({
       char: "t",
-      description: "The published tag to check this client against",
-      default: "current"
+      description: "The published tag to check this client against"
     })
   };
 
@@ -35,7 +34,7 @@ export default class ClientCheck extends ClientCommand {
             const { changes } = await project.engine.checkOperations({
               id: config.name,
               operations: ctx.operations,
-              tag: flags.tag,
+              tag: config.tag,
               gitContext: ctx.gitContext
             });