nit: final cleanup

raineorshine · Feb 19, 2022 · f71f2ab · f71f2ab
1 parent 13cafc5
commit f71f2ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/filterAndReject.ts b/src/lib/filterAndReject.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { and } from 'fp-and-or'
 import minimatch from 'minimatch'
-import semverutils, { SemVer } from 'semver-utils'
+import { SemVer, parseRange } from 'semver-utils'
 import { FilterRejectPattern, Maybe, VersionSpec } from '../types'
 
 /**
@@ -44,7 +44,7 @@ function composeFilter(filterPattern: FilterRejectPattern): (name: string, versi
   }
   // function
   else if (typeof filterPattern === 'function') {
-    predicate = (dependencyName: string, versionSpec: string) => filterPattern(dependencyName, semverutils.parseRange(versionSpec ?? dependencyName))
+    predicate = (dependencyName: string, versionSpec: string) => filterPattern(dependencyName, parseRange(versionSpec ?? dependencyName))
   }
   else {
     throw new TypeError('Invalid filter. Must be a RegExp, array, or comma-or-space-delimited list.')

diff --git a/src/types.ts b/src/types.ts
@@ -25,7 +25,7 @@ export type Version = string
 export type VersionSpec = string
 export type VersionLevel = 'major' | 'minor' | 'patch'
 
-export type FilterFunction = (packageName: string, version: SemVer[]) => boolean
+type FilterFunction = (packageName: string, version: SemVer[]) => boolean
 export type FilterRejectPattern = string | string[] | RegExp | RegExp[] | FilterFunction
 
 export interface Packument {

diff --git a/test/getCurrentDependencies.test.ts b/test/getCurrentDependencies.test.ts
@@ -154,7 +154,7 @@ describe('getCurrentDependencies', () => {
         mocha: '1.2',
         moment: '^1.0.0',
         chalk: '^1.1.0',
-        bluebird: '^1.0.0',
+        bluebird: '^1.0.0'
       })
     })
   })
@@ -206,7 +206,7 @@ describe('getCurrentDependencies', () => {
         mocha: '1.2',
         moment: '^1.0.0',
         chalk: '^1.1.0',
-        bluebird: '^1.0.0',
+        bluebird: '^1.0.0'
       })
     })
   })
@@ -289,18 +289,18 @@ describe('getCurrentDependencies', () => {
       getCurrentDependencies(deps, { rejectVersion: '^1.0.0' }).should.eql({
         mocha: '1.2',
         lodash: '^3.9.3',
-        chalk: '^1.1.0',
+        chalk: '^1.1.0'
       })
     })
 
     it('reject dependencies by multiple versions (comma-or-space-delimited)', () => {
       getCurrentDependencies(deps, { rejectVersion: '^1.0.0,^1.1.0' }).should.eql({
         mocha: '1.2',
-        lodash: '^3.9.3',
+        lodash: '^3.9.3'
       })
       getCurrentDependencies(deps, { rejectVersion: '^1.0.0 ^1.1.0' }).should.eql({
         mocha: '1.2',
-        lodash: '^3.9.3',
+        lodash: '^3.9.3'
       })
     })
 
@@ -311,7 +311,7 @@ describe('getCurrentDependencies', () => {
       })
       getCurrentDependencies(deps, { rejectVersion: /^\^1/ }).should.eql({
         mocha: '1.2',
-        lodash: '^3.9.3',
+        lodash: '^3.9.3'
       })
     })