From 0af7fe275980a788a7762341e23fe067daaf038e Mon Sep 17 00:00:00 2001
From: Jake <dawkinsjh@gmail.com>
Date: Mon, 11 Feb 2019 17:03:07 -0500
Subject: [PATCH 1/4] Added warning when no files found in fileset

---
 CHANGELOG.md                                  |  1 +
 .../apollo-language-server/src/fileSet.ts     | 25 ++++++++++++++++++-
 .../src/project/client.ts                     |  3 ++-
 .../src/project/service.ts                    |  3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b516d94889..c10ddb8819 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
   - Support validation parameters for service:check [#953](https://github.com/apollographql/apollo-tooling/pull/953)
 - `apollo-language-server`
   - Better error handling in ApolloEngineClient [#953](https://github.com/apollographql/apollo-tooling/pull/953)
+  - Added a warning when there are 0 files found in a project [#1007](https://github.com/apollographql/apollo-tooling/pull/1007)
 - `vscode-apollo`
   - Fix inline graphql highlighting in Vue `<script>` tags [#981](https://github.com/apollographql/apollo-tooling/pull/981)
 
diff --git a/packages/apollo-language-server/src/fileSet.ts b/packages/apollo-language-server/src/fileSet.ts
index b1ec50fd1f..250f2d1185 100644
--- a/packages/apollo-language-server/src/fileSet.ts
+++ b/packages/apollo-language-server/src/fileSet.ts
@@ -12,11 +12,13 @@ export class FileSet {
   constructor({
     rootURI,
     includes,
-    excludes
+    excludes,
+    configURI
   }: {
     rootURI: URI;
     includes: string[];
     excludes: string[];
+    configURI?: URI;
   }) {
     invariant(rootURI, `Must provide "rootURI".`);
     invariant(includes, `Must provide "includes".`);
@@ -25,6 +27,27 @@ export class FileSet {
     this.rootURI = rootURI;
     this.includes = includes;
     this.excludes = excludes;
+
+    /**
+     * This function is used in the Array.filter function below it to remove any .env files and config files.
+     * If there are 0 files remaining after removing those files, we should warn the user that their config
+     * may be wrong. We shouldn't throw an error here, since they could just be initially setting up a project
+     * and there's no way to know for sure that there _should_ be files.
+     */
+    const filterConfigAndEnvFiles = (path: string) =>
+      !(
+        path.includes("apollo.config") ||
+        path.includes(".env") ||
+        (configURI && path === configURI.fsPath)
+      );
+    if (this.allFiles().filter(filterConfigAndEnvFiles).length === 0) {
+      console.warn(
+        "⚠️  It looks like there are 0 files associated with this Apollo Project. " +
+          "This may be because you don't have any files yet, or your includes/excludes " +
+          "fields are configured incorrectly, and Apollo can't find your files. " +
+          "For help configuring Apollo projects, see this guide: https://bit.ly/2ByILPj"
+      );
+    }
   }
 
   includesFile(filePath: string): boolean {
diff --git a/packages/apollo-language-server/src/project/client.ts b/packages/apollo-language-server/src/project/client.ts
index 1b7e01069b..b3644df311 100644
--- a/packages/apollo-language-server/src/project/client.ts
+++ b/packages/apollo-language-server/src/project/client.ts
@@ -95,7 +95,8 @@ export class GraphQLClientProject extends GraphQLProject {
       // 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, ".env", "apollo.config.js"],
-      excludes: config.client.excludes
+      excludes: config.client.excludes,
+      configURI: config.configURI
     });
 
     super({ config, fileSet, loadingHandler, clientIdentity });
diff --git a/packages/apollo-language-server/src/project/service.ts b/packages/apollo-language-server/src/project/service.ts
index cf61b3f4b5..90bb48b729 100644
--- a/packages/apollo-language-server/src/project/service.ts
+++ b/packages/apollo-language-server/src/project/service.ts
@@ -27,7 +27,8 @@ export class GraphQLServiceProject extends GraphQLProject {
     const fileSet = new FileSet({
       rootURI: config.configDirURI || rootURI,
       includes: [...config.service.includes, ".env", "apollo.config.js"],
-      excludes: config.service.excludes
+      excludes: config.service.excludes,
+      configURI: config.configURI
     });
 
     super({ config, fileSet, loadingHandler, clientIdentity });

From 9feb85c2806b8eda10ae6f038f93973579c179a4 Mon Sep 17 00:00:00 2001
From: Jake <dawkinsjh@gmail.com>
Date: Tue, 12 Feb 2019 14:48:11 -0500
Subject: [PATCH 2/4] fix includes/excludes glob matching

---
 CHANGELOG.md                                  |  1 +
 .../apollo-language-server/src/fileSet.ts     | 26 +++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c10ddb8819..3d57541cd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - `apollo-language-server`
   - Better error handling in ApolloEngineClient [#953](https://github.com/apollographql/apollo-tooling/pull/953)
   - Added a warning when there are 0 files found in a project [#1007](https://github.com/apollographql/apollo-tooling/pull/1007)
+  - Allow relative paths in includes/excludes globs [#1007](https://github.com/apollographql/apollo-tooling/pull/1007)
 - `vscode-apollo`
   - Fix inline graphql highlighting in Vue `<script>` tags [#981](https://github.com/apollographql/apollo-tooling/pull/981)
 
diff --git a/packages/apollo-language-server/src/fileSet.ts b/packages/apollo-language-server/src/fileSet.ts
index 250f2d1185..d3f9f22a77 100644
--- a/packages/apollo-language-server/src/fileSet.ts
+++ b/packages/apollo-language-server/src/fileSet.ts
@@ -51,24 +51,18 @@ export class FileSet {
   }
 
   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))
-    );
+    return this.allFiles().includes(relative(this.rootURI.fsPath, filePath));
   }
 
   allFiles(): string[] {
-    return this.includes
-      .flatMap(include =>
-        glob.sync(include, { cwd: this.rootURI.fsPath, absolute: true })
-      )
-      .filter(
-        filePath =>
-          !this.excludes.some(exclude =>
-            minimatch(relative(this.rootURI.fsPath, filePath), exclude)
-          )
-      );
+    // since glob.sync takes a single patttern, but we allow an array of `includes`, we can join all the
+    // `includes` globs into a single pattern and pass to glob.sync The `ignore` option does, however, allow
+    // an array of globs to ignore, so we can pass it in directly
+    const joinedIncludes = `{${this.includes.join(",")}}`;
+    return glob.sync(joinedIncludes, {
+      cwd: this.rootURI.fsPath,
+      absolute: true,
+      ignore: this.excludes
+    });
   }
 }

From bdb8f32243e22a5aa805d28aa7587fb40c1f4f07 Mon Sep 17 00:00:00 2001
From: Trevor Scheer <trevor.scheer@gmail.com>
Date: Fri, 15 Feb 2019 12:12:17 -0500
Subject: [PATCH 3/4] Update packages/apollo-language-server/src/fileSet.ts

Co-Authored-By: JakeDawkins <dawkinsjh@gmail.com>
---
 packages/apollo-language-server/src/fileSet.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apollo-language-server/src/fileSet.ts b/packages/apollo-language-server/src/fileSet.ts
index d3f9f22a77..113d766a6e 100644
--- a/packages/apollo-language-server/src/fileSet.ts
+++ b/packages/apollo-language-server/src/fileSet.ts
@@ -56,7 +56,7 @@ export class FileSet {
 
   allFiles(): string[] {
     // since glob.sync takes a single patttern, but we allow an array of `includes`, we can join all the
-    // `includes` globs into a single pattern and pass to glob.sync The `ignore` option does, however, allow
+    // `includes` globs into a single pattern and pass to glob.sync. The `ignore` option does, however, allow
     // an array of globs to ignore, so we can pass it in directly
     const joinedIncludes = `{${this.includes.join(",")}}`;
     return glob.sync(joinedIncludes, {

From 4fb3d9e547915d16f93e0c349d1d586e163d085f Mon Sep 17 00:00:00 2001
From: Trevor Scheer <trevor.scheer@gmail.com>
Date: Fri, 15 Feb 2019 12:14:24 -0500
Subject: [PATCH 4/4] Update packages/apollo-language-server/src/fileSet.ts

Co-Authored-By: JakeDawkins <dawkinsjh@gmail.com>
---
 packages/apollo-language-server/src/fileSet.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apollo-language-server/src/fileSet.ts b/packages/apollo-language-server/src/fileSet.ts
index 113d766a6e..07d0e72b5b 100644
--- a/packages/apollo-language-server/src/fileSet.ts
+++ b/packages/apollo-language-server/src/fileSet.ts
@@ -55,7 +55,7 @@ export class FileSet {
   }
 
   allFiles(): string[] {
-    // since glob.sync takes a single patttern, but we allow an array of `includes`, we can join all the
+    // since glob.sync takes a single pattern, but we allow an array of `includes`, we can join all the
     // `includes` globs into a single pattern and pass to glob.sync. The `ignore` option does, however, allow
     // an array of globs to ignore, so we can pass it in directly
     const joinedIncludes = `{${this.includes.join(",")}}`;