Added configDirURI to the ApolloConfig class

Author: JakeDawkins

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

@@ -1,7 +1,7 @@
 import * as cosmiconfig from "cosmiconfig";
 import { LoaderEntry } from "cosmiconfig";
 import TypeScriptLoader from "@endemolshinegroup/cosmiconfig-typescript-loader";
-import { resolve } from "path";
+import { resolve, dirname } from "path";
 import { readFileSync, existsSync } from "fs";
 import { merge } from "lodash/fp";
 
@@ -194,6 +194,7 @@ export class ApolloConfig {
   public name?: string;
   public service?: ServiceConfigFormat;
   public client?: ClientConfigFormat;
+  public configDirURI?: URI; // dir containing the config
   private _tag?: string;
 
   constructor(public rawConfig: ApolloConfigFormat, public configURI?: URI) {
@@ -203,6 +204,10 @@ export class ApolloConfig {
     this.name = getServiceName(rawConfig);
     this.client = rawConfig.client;
     this.service = rawConfig.service;
+    this.configDirURI =
+      configURI && configURI.fsPath.includes(".js")
+        ? URI.parse(dirname(configURI.fsPath))
+        : configURI;
   }
 
   get projects() {

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

@@ -1,22 +1,19 @@
-import { relative, dirname } from "path";
+import { relative } from "path";
 import minimatch = require("minimatch");
 import * as glob from "glob";
 import { invariant } from "@apollographql/apollo-tools";
 import URI from "vscode-uri";
 
 export class FileSet {
-  private configDirURI?: URI;
   private rootURI: URI;
   private includes: string[];
   private excludes: string[];
 
   constructor({
-    configURI,
     rootURI,
     includes,
     excludes
   }: {
-    configURI?: URI;
     rootURI: URI;
     includes: string[];
     excludes: string[];
@@ -25,24 +22,14 @@ export class FileSet {
     invariant(includes, `Must provide "includes".`);
     invariant(excludes, `Must provide "excludes".`);
 
-    // the URI of the folder _containing_ the apollo.config.js
-    this.configDirURI =
-      configURI && configURI.fsPath.includes(".js")
-        ? URI.parse(dirname(configURI.fsPath))
-        : configURI;
     this.rootURI = rootURI;
     this.includes = includes;
     this.excludes = excludes;
   }
 
-  includesFile(filePath: string, configDirURI?: URI): boolean {
-    // if we're given a path to the config file, we should match the
-    // "includes" glob relative to that dir. This allows us to run this command
-    // from a "root" dir above the root of the project, like when at the root of a monorepo
-    filePath = relative(
-      configDirURI ? configDirURI.path : this.rootURI.fsPath,
-      filePath
-    );
+  includesFile(filePath: string): boolean {
+    filePath = relative(this.rootURI.fsPath, filePath);
+
     return (
       this.includes.some(include => minimatch(filePath, include)) &&
       !this.excludes.some(exclude => minimatch(filePath, exclude))
@@ -52,25 +39,12 @@ export class FileSet {
   allFiles(): string[] {
     return this.includes
       .flatMap(include =>
-        glob.sync(include, {
-          cwd: this.configDirURI
-            ? this.configDirURI.fsPath
-            : this.rootURI.fsPath,
-          absolute: true
-        })
+        glob.sync(include, { cwd: this.rootURI.fsPath, absolute: true })
       )
       .filter(
         filePath =>
           !this.excludes.some(exclude =>
-            minimatch(
-              relative(
-                this.configDirURI
-                  ? this.configDirURI.fsPath
-                  : this.rootURI.fsPath,
-                filePath
-              ),
-              exclude
-            )
+            minimatch(relative(this.rootURI.fsPath, filePath), exclude)
           )
       );
   }

packages/apollo-language-server/src/project/base.ts

@@ -158,10 +158,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
   }
 
   includesFile(uri: DocumentUri) {
-    return this.fileSet.includesFile(
-      URI.parse(uri).fsPath,
-      this.config.configURI
-    );
+    return this.fileSet.includesFile(URI.parse(uri).fsPath);
   }
 
   async scanAllIncludedFiles() {

packages/apollo-language-server/src/project/client.ts

@@ -91,8 +91,9 @@ export class GraphQLClientProject extends GraphQLProject {
     clientIdentity
   }: GraphQLClientProjectConfig) {
     const fileSet = new FileSet({
-      configURI: config.configURI,
-      rootURI: rootURI,
+      // the URI of the folder _containing_ the apollo.config.js is the true project's root.
+      // if a config doesn't have a uri associated, we can assume the `rootURI` is the project's root.
+      rootURI: config.configDirURI || rootURI,
       includes: config.client.includes,
       excludes: config.client.excludes
     });

packages/apollo-language-server/src/project/service.ts

@@ -25,7 +25,7 @@ export class GraphQLServiceProject extends GraphQLProject {
     loadingHandler
   }: GraphQLServiceProjectConfig) {
     const fileSet = new FileSet({
-      rootURI: rootURI,
+      rootURI: config.configDirURI || rootURI,
       includes: config.service.includes,
       excludes: config.service.excludes
     });