.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  default:
+    strategy:
+      matrix:
+        node:
+          - 12
+          - 14
+          - 16
+        os: [macOS-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+          cach: yarn
+
+      - name: Install Dependencies
+        run: yarn --frozen-lockfile
+
+      - name: Build, Lint and Test
+        run: yarn run-s build lint test typecov
+        env:
+          EFF_NO_LINK_RULES: true
+          PARSER_NO_WATCH: true

.renovaterc

@@ -1,3 +1,5 @@
 {
-  "extends": "@1stg"
+  "extends": [
+    "@1stg"
+  ]
 }

.simple-git-hooks.js

@@ -0,0 +1 @@
+module.exports = require('@1stg/simple-git-hooks')

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.5.0](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/compare/v2.4.0...v2.5.0) (2021-09-13)
+
+
+### Features
+
+* allow passing through custom options to resolve ([#79](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/issues/79)) ([34c94c8](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/commit/34c94c87066ba42fb2b52727b95f3e34259c227f))
+
+
+### Bug Fixes
+
+* bump (dev)Dependencies, apply stricter rules ([#75](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/issues/75)) ([866f32f](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/commit/866f32f2191dc7fc8df7d973cdacefa48c64a927))
+
 ## [2.4.0](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/compare/v2.3.0...v2.4.0) (2021-02-16)
 
 

LICENSE

@@ -0,0 +1,5 @@
+Copyright 2021 Alex Gorbatchev <alex.gorbatchev@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -1,6 +1,6 @@
 # eslint-import-resolver-typescript
 
-[![GitHub Actions](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/workflows/Node%20CI/badge.svg)](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/actions)
+[![GitHub Actions](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/workflows/CI/badge.svg)](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/actions/workflows/ci.yml)
 [![type-coverage](https://img.shields.io/badge/dynamic/json.svg?label=type-coverage&prefix=%E2%89%A5&suffix=%&query=$.typeCoverage.atLeast&uri=https%3A%2F%2Fraw.githubusercontent.com%2Falexgorbatchev%2Feslint-import-resolver-typescript%2Fmaster%2Fpackage.json)](https://github.com/plantain-00/type-coverage)
 [![npm](https://img.shields.io/npm/v/eslint-import-resolver-typescript.svg)](https://www.npmjs.com/package/eslint-import-resolver-typescript)
 [![GitHub Release](https://img.shields.io/github/release/alexgorbatchev/eslint-import-resolver-typescript)](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/releases)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-import-resolver-typescript",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "TypeScript .ts .tsx module resolver for `eslint-plugin-import`.",
   "repository": "https://github.com/alexgorbatchev/eslint-import-resolver-typescript",
   "author": "Alex Gorbatchev <alex.gorbatchev@gmail.com>",
@@ -17,7 +17,8 @@
   "fesm5": "lib/esm",
   "types": "lib",
   "files": [
-    "lib/*.{js,js.map,d.ts}"
+    "lib",
+    "!*.tsbuildinfo"
   ],
   "keywords": [
     "typescript",
@@ -31,11 +32,10 @@
     "build:r": "r",
     "build:ts": "tsc -b",
     "lint": "run-p lint:*",
-    "lint:es": "cross-env PARSER_NO_WATCH=true eslint src --cache --ext md,js,ts -f friendly",
-    "lint:tsc": "tsc --incremental false --noEmit",
-    "prepare": "yarn-deduplicate || exit 0",
+    "lint:es": "eslint src --cache -f friendly",
+    "lint:tsc": "tsc --noEmit",
+    "prepare": "simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0",
     "prepublishOnly": "yarn build",
-    "pretest": "r",
     "release": "sh scripts/release.sh",
     "test": "run-p test:*",
     "test:multipleEslintrcs": "eslint --ext ts,tsx tests/multipleEslintrcs",
@@ -45,41 +45,48 @@
     "test:withPathsAndNestedBaseUrl": "eslint --ext ts,tsx tests/withPathsAndNestedBaseUrl",
     "test:withQuerystring": "eslint --ext ts,tsx tests/withQuerystring",
     "test:withoutPaths": "eslint --ext ts,tsx tests/withoutPaths",
-    "type-coverage": "type-coverage --cache --detail --ignore-catch --strict --update"
+    "typecov": "type-coverage"
   },
   "peerDependencies": {
     "eslint": "*",
     "eslint-plugin-import": "*"
   },
   "dependencies": {
-    "debug": "^4.1.1",
-    "glob": "^7.1.6",
+    "debug": "^4.3.1",
+    "glob": "^7.1.7",
     "is-glob": "^4.0.1",
-    "resolve": "^1.17.0",
+    "resolve": "^1.20.0",
     "tsconfig-paths": "^3.9.0"
   },
   "devDependencies": {
-    "@1stg/lib-config": "^0.5.5",
+    "@1stg/lib-config": "^2.1.0",
     "@types/debug": "^4.1.5",
     "@types/glob": "^7.1.3",
     "@types/is-glob": "^4.0.1",
-    "@types/node": "^14.6.2",
-    "@types/resolve": "^1.17.1",
+    "@types/node": "^15.6.1",
+    "@types/resolve": "^1.20.0",
     "@types/unist": "^2.0.3",
     "dummy.js": "link:dummy.js",
     "eslint-import-resolver-typescript": "link:.",
-    "npm-run-all": "^4.1.5",
-    "react": "^16.13.1",
-    "standard-version": "^8.0.2",
-    "type-coverage": "^2.9.0",
-    "typescript": "^4.0.2",
-    "yarn-deduplicate": "^3.0.0"
+    "react": "^17.0.2",
+    "standard-version": "^9.3.0",
+    "type-coverage": "^2.17.5",
+    "typescript": "^4.3.2"
   },
   "resolutions": {
     "eslint-import-resolver-typescript": "link:.",
-    "prettier": "^2.1.1"
+    "prettier": "^2.3.0"
   },
   "typeCoverage": {
-    "atLeast": 99.27
+    "atLeast": 99.28,
+    "cache": true,
+    "detail": true,
+    "ignoreAsAssertion": true,
+    "ignoreCatch": true,
+    "ignoreFiles": [
+      "**/*.d.ts"
+    ],
+    "strict": true,
+    "update": true
   }
 }

src/index.ts

@@ -15,21 +15,24 @@ const IMPORTER_NAME = 'eslint-import-resolver-typescript'
 
 const log = debug(IMPORTER_NAME)
 
-const defaultExtensions = ['.ts', '.tsx', '.d.ts'].concat(
-  // eslint-disable-next-line node/no-deprecated-api
-  Object.keys(require.extensions),
+const defaultExtensions = [
+  '.ts',
+  '.tsx',
+  '.d.ts',
+  // eslint-disable-next-line node/no-deprecated-api, sonar/deprecation
+  ...Object.keys(require.extensions),
   '.jsx',
-)
+]
 
 export const interfaceVersion = 2
 
-export interface TsResolverOptions {
+export type TsResolverOptions = SyncOpts & {
   alwaysTryTypes?: boolean
   /**
    * @deprecated use `project` instead
    */
-  directory?: string | string[]
-  project?: string | string[]
+  directory?: string[] | string
+  project?: string[] | string
   extensions?: string[]
   packageFilter?: (pkg: Record<string, string>) => Record<string, string>
 }
@@ -47,7 +50,7 @@ export function resolve(
   found: boolean
   path?: string | null
 } {
-  options = options || {}
+  options = options ?? {}
 
   log('looking for:', source)
 
@@ -72,10 +75,11 @@ export function resolve(
   // note that even if we map the path, we still need to do a final resolve
   let foundNodePath: string | null | undefined
   try {
-    foundNodePath = tsResolve(mappedPath || source, {
-      extensions: options.extensions || defaultExtensions,
+    foundNodePath = tsResolve(mappedPath ?? source, {
+      ...options,
+      extensions: options.extensions ?? defaultExtensions,
       basedir: path.dirname(path.resolve(file)),
-      packageFilter: options.packageFilter || packageFilterDefault,
+      packageFilter: options.packageFilter ?? packageFilterDefault,
     })
   } catch {
     foundNodePath = null
@@ -193,12 +197,14 @@ function initMappers(options: TsResolverOptions) {
     return
   }
 
+  // eslint-disable-next-line sonar/deprecation
   if (options.directory) {
     console.warn(
       `[${IMPORTER_NAME}]: option \`directory\` is deprecated, please use \`project\` instead`,
     )
 
     if (!options.project) {
+      // eslint-disable-next-line sonar/deprecation
       options.project = options.directory
     }
   }
@@ -213,28 +219,25 @@ function initMappers(options: TsResolverOptions) {
   mappers = configPaths
     // turn glob patterns into paths
     .reduce<string[]>(
-      (paths, path) => paths.concat(isGlob(path) ? globSync(path) : path),
+      (paths, path) => [...paths, ...(isGlob(path) ? globSync(path) : [path])],
       [],
     )
-    // eslint-disable-next-line unicorn/no-fn-reference-in-iterator
     .map(loadConfig)
-    // eslint-disable-next-line unicorn/no-fn-reference-in-iterator
     .filter(isConfigLoaderSuccessResult)
     .map(configLoaderResult => {
       const matchPath = createExtendedMatchPath(
         configLoaderResult.absoluteBaseUrl,
         configLoaderResult.paths,
       )
 
-      return (source: string) => {
+      return (source: string) =>
         // look for files based on setup tsconfig "paths"
-        return matchPath(
+        matchPath(
           source,
           undefined,
           undefined,
-          options.extensions || defaultExtensions,
+          options.extensions ?? defaultExtensions,
         )
-      }
     })
 
   mappersBuildForOptions = options

tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "./node_modules/@1stg/tsconfig/lib.json",
   "compilerOptions": {
     "baseUrl": ".",
+    "declarationMap": false,
     "outDir": "lib"
   },
   "include": ["src"]