From 266bd60511b4441074a7ad09d6aed1fb3b164d46 Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Sun, 15 Nov 2020 02:24:06 +0100
Subject: [PATCH] fix: include index files when traversing `files` field (#17)

* feat: consider files field from package.json

* chore: added empty folder to fix the tests

* fix: eslint

* fix: index files are included, non-existent packages not throwing error

Co-authored-by: blam <benjaminl@spotify.com>
---
 src/rules/no-internal-import.js                | 14 +++++++++-----
 test/fixture/yarn/packages/bar/nested/index.js |  0
 test/rules/no-internal-import.test.js          |  8 ++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 test/fixture/yarn/packages/bar/nested/index.js

diff --git a/src/rules/no-internal-import.js b/src/rules/no-internal-import.js
index 90f2152..165bea3 100644
--- a/src/rules/no-internal-import.js
+++ b/src/rules/no-internal-import.js
@@ -42,18 +42,22 @@ export const create = context => {
     // supposed to be part of the public API of the package
     const absolutePathsForFiles =
       matchedPackage.package.files &&
-      matchedPackage.package.files.map(file => {
+      matchedPackage.package.files.reduce((acc, file) => {
         const fileOrDirOrGlob = path.join(packageRoot, file);
+        acc.push(fileOrDirOrGlob);
 
         try {
           if (fs.lstatSync(fileOrDirOrGlob).isDirectory()) {
-            return path.join(fileOrDirOrGlob, '**', '*');
+            // Need to also include
+            // all of the files inside the folder
+            acc.push(path.join(fileOrDirOrGlob, '**', '*'));
           }
-          return fileOrDirOrGlob;
         } catch (e) {
-          return fileOrDirOrGlob;
+          // do nothing
         }
-      });
+
+        return acc;
+      }, []);
     const absoluteInternalPath = path.join(packageRoot, internalPath);
 
     if (absolutePathsForFiles) {
diff --git a/test/fixture/yarn/packages/bar/nested/index.js b/test/fixture/yarn/packages/bar/nested/index.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/rules/no-internal-import.test.js b/test/rules/no-internal-import.test.js
index 4a8bdab..5620661 100644
--- a/test/rules/no-internal-import.test.js
+++ b/test/rules/no-internal-import.test.js
@@ -29,6 +29,14 @@ ruleTester.run(RULE, monorepo.rules[RULE], {
       code: `import { pkg } from 'bar/nested/allowedToo'`,
       filename: path.join(fixtures, 'packages/bar/index.js'),
     },
+    {
+      code: `import { pkg } from 'bar/nested'`,
+      filename: path.join(fixtures, 'packages/bar/index.js'),
+    },
+    {
+      code: `import { pkg } from 'non-existent-package/nested'`,
+      filename: path.join(fixtures, 'packages/bar/index.js'),
+    },
     {
       code: `import { pkg } from 'bar/nested/this/is/also/allowed'`,
       filename: path.join(fixtures, 'packages/bar/index.js'),