fix(imports-as-dependencies): check exports; fixes gajus#1114

brettz9 · Jun 25, 2023 · 837efc6 · 837efc6
1 parent 4afc8e6
commit 837efc6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/docs/rules/imports-as-dependencies.md b/docs/rules/imports-as-dependencies.md
@@ -95,5 +95,9 @@ The following patterns are not considered problems:
 /**
  * @type {null|import('node:fs').PathLike}
  */
+
+/**
+ * @type {null|import('eventtargeter').ListenerInfo}
+ */
 ````
 
diff --git a/package.json b/package.json
@@ -51,6 +51,7 @@
     "eslint": "8.41.0",
     "eslint-config-canonical": "~41.0.4",
     "espree": "^9.5.2",
+    "eventtargeter": "^0.9.0",
     "gitdown": "^3.1.5",
     "glob": "^10.2.6",
     "husky": "^8.0.3",
@@ -60,6 +61,7 @@
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "open-editor": "^3.0.0",
+    "resolve.exports": "^2.0.2",
     "rimraf": "^5.0.1",
     "semantic-release": "^21.0.2",
     "typescript": "^5.0.4"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/rules/importsAsDependencies.js b/src/rules/importsAsDependencies.js
@@ -11,6 +11,7 @@ import isBuiltinModule from 'is-builtin-module';
 import {
   join,
 } from 'path';
+import * as resolve from 'resolve.exports';
 
 /**
  * @type {Set<string>|null}
@@ -103,7 +104,11 @@ export default iterateJsdoc(({
             // Ignore
           }
 
-          if (!pkg || (!pkg.types && !pkg.typings)) {
+          if (!pkg || (!pkg.types && !pkg.typings && resolve.exports(pkg, undefined, {
+            conditions: [
+              'types', 'typings',
+            ],
+          }) === undefined)) {
             mod = `@types/${mod}`;
           }
 

diff --git a/test/rules/assertions/importsAsDependencies.js b/test/rules/assertions/importsAsDependencies.js
@@ -137,5 +137,12 @@ export default {
          */
       `,
     },
+    {
+      code: `
+        /**
+         * @type {null|import('eventtargeter').ListenerInfo}
+         */
+      `,
+    },
   ],
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,5 +95,9 @@ The following patterns are not considered problems: @@
     /**
      * @type {null|import('node:fs').PathLike}
      */
+    /**
+     * @type {null|import('eventtargeter').ListenerInfo}
+     */
     ````