fix: loadFiles path resolving issue (#1542)

* fix: loadFiles path resolving issue * chore: renaming tests * fix: bring back async
ardatan · May 27, 2020 · 10252a1 · 10252a1
1 parent 981e49a
commit 10252a1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/load-files/src/index.ts b/packages/load-files/src/index.ts
@@ -194,10 +194,12 @@ export async function loadFiles(
 ): Promise<any[]> {
   const execOptions = { ...LoadFilesDefaultOptions, ...options };
   const relevantPaths = await scanForFiles(
-    asArray(pattern).map(path =>
-      isDirectory(path)
-        ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
-        : unixify(path)
+    await Promise.all(
+      asArray(pattern).map(async path =>
+        (await isDirectory(path))
+          ? buildGlob(unixify(path), execOptions.extensions, execOptions.ignoredExtensions, execOptions.recursive)
+          : unixify(path)
+      )
     ),
     options.globOptions
   );

diff --git a/packages/load-files/tests/file-scanner.spec.ts b/packages/load-files/tests/file-scanner.spec.ts
@@ -140,6 +140,11 @@ describe('file scanner', function() {
       note: 'should include index by default',
       extensions: ['graphql'],
     });
+    testSchemaDir({
+      path: './test-assets/1/*.graphql',
+      expected: [schemaContent],
+      note: 'non-directory pattern',
+    });
   });
 
   describe('resolvers', () => {
@@ -205,5 +210,10 @@ describe('file scanner', function() {
       compareValue: true,
       ignoreIndex: true,
     });
+    testResolversDir({
+      path: './test-assets/6/*.resolvers.js',
+      expected: [{ MyType: { f: 1 } }],
+      note: 'non-directory pattern',
+    });
   });
 });