From 186bcbdd56f1ba3b40ea4773619a515bcc02119d Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 26 Aug 2020 02:35:11 +0300 Subject: [PATCH] style: no unnecessary boolean literal compare --- packages/default-reporter/src/mergeOutputs.ts | 2 +- packages/dependencies-hierarchy/src/index.ts | 4 ++-- .../src/filterLockfileByImportersAndEngine.ts | 2 +- packages/get-context/src/readLockfiles.ts | 2 +- packages/headless/src/index.ts | 2 +- packages/list/src/renderTree.ts | 2 +- packages/lockfile-file/src/write.ts | 2 +- packages/package-requester/src/packageRequester.ts | 2 +- packages/package-requester/test/index.ts | 10 +++++----- packages/supi/src/install/extendInstallOptions.ts | 2 +- packages/supi/src/install/index.ts | 4 ++-- packages/supi/src/install/link.ts | 4 ++-- utils/eslint-config/eslint.json | 1 - 13 files changed, 19 insertions(+), 20 deletions(-) diff --git a/packages/default-reporter/src/mergeOutputs.ts b/packages/default-reporter/src/mergeOutputs.ts index ca4710382c..a42b34c548 100644 --- a/packages/default-reporter/src/mergeOutputs.ts +++ b/packages/default-reporter/src/mergeOutputs.ts @@ -35,7 +35,7 @@ export default function mergeOutputs (outputs: Array { - if (log.fixed === true) { + if (log.fixed) { acc.fixedBlocks[log.blockNo] = log.msg } else { delete acc.fixedBlocks[log['prevFixedBlockNo'] as number] diff --git a/packages/dependencies-hierarchy/src/index.ts b/packages/dependencies-hierarchy/src/index.ts index 4bd169f8b3..d219e0b4dc 100644 --- a/packages/dependencies-hierarchy/src/index.ts +++ b/packages/dependencies-hierarchy/src/index.ts @@ -129,7 +129,7 @@ async function dependenciesHierarchyForPackage ( const getChildrenTree = getTree.bind(null, { currentDepth: 1, currentPackages: currentLockfile.packages ?? {}, - includeOptionalDependencies: opts.include.optionalDependencies === true, + includeOptionalDependencies: opts.include.optionalDependencies, lockfileDir: opts.lockfileDir, maxDepth: opts.depth, modulesDir, @@ -258,7 +258,7 @@ function getTreeHelper ( const result: DependencyInfo = { dependencies: [] } if (opts.currentDepth > opts.maxDepth || !opts.currentPackages || !opts.currentPackages[parentId]) return result - const deps = opts.includeOptionalDependencies === false + const deps = !opts.includeOptionalDependencies ? opts.currentPackages[parentId].dependencies : { ...opts.currentPackages[parentId].dependencies, diff --git a/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts index 36d23d95a4..88073cec9d 100644 --- a/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts +++ b/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts @@ -138,7 +138,7 @@ function pkgAllDeps ( os: pkgSnapshot.os, } // TODO: depPath is not the package ID. Should be fixed - installable = opts.includeIncompatiblePackages === true || packageIsInstallable(pkgSnapshot.id ?? depPath, pkg, { + installable = opts.includeIncompatiblePackages || packageIsInstallable(pkgSnapshot.id ?? depPath, pkg, { engineStrict: opts.engineStrict, lockfileDir: opts.lockfileDir, nodeVersion: opts.currentEngine.nodeVersion, diff --git a/packages/get-context/src/readLockfiles.ts b/packages/get-context/src/readLockfiles.ts index 81a461eed8..840159a6ad 100644 --- a/packages/get-context/src/readLockfiles.ts +++ b/packages/get-context/src/readLockfiles.ts @@ -48,7 +48,7 @@ export default async function ( } // eslint-disable-next-line @typescript-eslint/no-invalid-void-type const files = await Promise.all([ - (opts.useLockfile === true && readWantedLockfile(opts.lockfileDir, lockfileOpts)) || + (opts.useLockfile && readWantedLockfile(opts.lockfileDir, lockfileOpts)) || (await existsWantedLockfile(opts.lockfileDir) && logger.warn({ message: `A ${WANTED_LOCKFILE} file exists. The current configuration prohibits to read or write a lockfile`, diff --git a/packages/headless/src/index.ts b/packages/headless/src/index.ts index ff5c5ca4eb..77decd7e05 100644 --- a/packages/headless/src/index.ts +++ b/packages/headless/src/index.ts @@ -196,7 +196,7 @@ export default async (opts: HeadlessOptions) => { currentEngine: opts.currentEngine, engineStrict: opts.engineStrict, failOnMissingDependencies: true, - includeIncompatiblePackages: opts.force === true, + includeIncompatiblePackages: opts.force, lockfileDir, }) const { directDependenciesByImporterId, graph } = await lockfileToDepGraph( diff --git a/packages/list/src/renderTree.ts b/packages/list/src/renderTree.ts index 368b8ca7c1..00bec5498b 100644 --- a/packages/list/src/renderTree.ts +++ b/packages/list/src/renderTree.ts @@ -61,7 +61,7 @@ async function renderTreeForPackage ( } label += pkg.path let output = `${label}\n` - const useColumns = opts.depth === 0 && opts.long === false && !opts.search + const useColumns = opts.depth === 0 && !opts.long && !opts.search for (const dependenciesField of [...DEPENDENCIES_FIELDS.sort(), 'unsavedDependencies']) { if (pkg[dependenciesField]?.length) { const depsLabel = chalk.cyanBright( diff --git a/packages/lockfile-file/src/write.ts b/packages/lockfile-file/src/write.ts index 2300c4a34b..f6f74ca140 100644 --- a/packages/lockfile-file/src/write.ts +++ b/packages/lockfile-file/src/write.ts @@ -68,7 +68,7 @@ function isEmptyLockfile (lockfile: Lockfile) { type LockfileFile = Omit & Partial & Partial> function normalizeLockfile (lockfile: Lockfile, forceSharedFormat: boolean) { - if (forceSharedFormat === false && R.equals(R.keys(lockfile.importers), ['.'])) { + if (!forceSharedFormat && R.equals(R.keys(lockfile.importers), ['.'])) { const lockfileToSave: LockfileFile = { ...lockfile, ...lockfile.importers['.'], diff --git a/packages/package-requester/src/packageRequester.ts b/packages/package-requester/src/packageRequester.ts index d82759991d..500a301e3d 100644 --- a/packages/package-requester/src/packageRequester.ts +++ b/packages/package-requester/src/packageRequester.ts @@ -372,7 +372,7 @@ function fetchToStore ( if ( !opts.force && ( - isLocalTarballDep === false || + !isLocalTarballDep || await tarballIsUpToDate(opts.resolution as any, target, opts.lockfileDir) // eslint-disable-line ) ) { diff --git a/packages/package-requester/test/index.ts b/packages/package-requester/test/index.ts index 7580345b88..a625135780 100644 --- a/packages/package-requester/test/index.ts +++ b/packages/package-requester/test/index.ts @@ -200,7 +200,7 @@ test('refetch local tarball if its integrity has changed', async t => { await response.files() await response.finishing() - t.ok(response.body.updated === false, 'resolution not updated') + t.notOk(response.body.updated, 'resolution not updated') t.notOk((await response.files()).fromStore, 'unpack tarball if it is not in store yet') t.ok(await response.bundledManifest!()) } @@ -224,7 +224,7 @@ test('refetch local tarball if its integrity has changed', async t => { await response.files!() await response.finishing!() - t.ok(response.body.updated === true, 'resolution updated') + t.ok(response.body.updated, 'resolution updated') t.notOk((await response.files!()).fromStore, 'reunpack tarball if its integrity is not up-to-date') t.ok(await response.bundledManifest!()) } @@ -248,7 +248,7 @@ test('refetch local tarball if its integrity has changed', async t => { await response.files() await response.finishing() - t.ok(response.body.updated === false, 'resolution not updated') + t.notOk(response.body.updated, 'resolution not updated') t.ok((await response.files()).fromStore, 'do not reunpack tarball if its integrity is up-to-date') t.ok(await response.bundledManifest!()) } @@ -285,7 +285,7 @@ test('refetch local tarball if its integrity has changed. The requester does not await response.files() await response.finishing() - t.ok(response.body.updated === true, 'resolution updated') + t.ok(response.body.updated, 'resolution updated') t.notOk((await response.files()).fromStore, 'unpack tarball if it is not in store yet') t.ok(await response.bundledManifest!()) } @@ -306,7 +306,7 @@ test('refetch local tarball if its integrity has changed. The requester does not await response.files() await response.finishing() - t.ok(response.body.updated === true, 'resolution updated') + t.ok(response.body.updated, 'resolution updated') t.notOk((await response.files()).fromStore, 'reunpack tarball if its integrity is not up-to-date') t.ok(await response.bundledManifest!()) } diff --git a/packages/supi/src/install/extendInstallOptions.ts b/packages/supi/src/install/extendInstallOptions.ts index 3700f838c4..1097773f80 100644 --- a/packages/supi/src/install/extendInstallOptions.ts +++ b/packages/supi/src/install/extendInstallOptions.ts @@ -29,7 +29,7 @@ export interface StrictInstallOptions { force: boolean update: boolean updateMatching?: (pkgName: string) => boolean - updatePackageManifest: boolean + updatePackageManifest?: boolean depth: number lockfileDir: string modulesDir: string diff --git a/packages/supi/src/install/index.ts b/packages/supi/src/install/index.ts index 4fd5ced271..2c360b2182 100644 --- a/packages/supi/src/install/index.ts +++ b/packages/supi/src/install/index.ts @@ -271,7 +271,7 @@ export async function mutateModules ( case 'install': { await installCase({ ...project, - updatePackageManifest: opts.updatePackageManifest ?? opts.update === true, + updatePackageManifest: opts.updatePackageManifest ?? opts.update, }) break } @@ -454,7 +454,7 @@ async function partitionLinkedPackages ( continue } const isInnerLink = await safeIsInnerLink(opts.modulesDir, dependency.alias, { - hideAlienModules: opts.lockfileOnly === false, + hideAlienModules: !opts.lockfileOnly, projectDir: opts.projectDir, storeDir: opts.storeDir, virtualStoreDir: opts.virtualStoreDir, diff --git a/packages/supi/src/install/link.ts b/packages/supi/src/install/link.ts index 33ae99c8c6..c346f16cd3 100644 --- a/packages/supi/src/install/link.ts +++ b/packages/supi/src/install/link.ts @@ -142,10 +142,10 @@ export default async function linkPackages ( return true }) if (!opts.include.dependencies) { - depNodes = depNodes.filter(({ dev, optional }) => dev !== false || optional) + depNodes = depNodes.filter(({ dev, optional }) => dev || optional) } if (!opts.include.devDependencies) { - depNodes = depNodes.filter(({ dev }) => dev !== true) + depNodes = depNodes.filter(({ dev }) => !dev) } if (!opts.include.optionalDependencies) { depNodes = depNodes.filter(({ optional }) => !optional) diff --git a/utils/eslint-config/eslint.json b/utils/eslint-config/eslint.json index 46ab625a7d..a74ff00a94 100644 --- a/utils/eslint-config/eslint.json +++ b/utils/eslint-config/eslint.json @@ -46,7 +46,6 @@ "no-multi-str": "off", "no-mixed-operators": "warn", "@typescript-eslint/dot-notation": "off", - "@typescript-eslint/no-unnecessary-boolean-literal-compare": "off", "@typescript-eslint/no-unnecessary-type-assertion": "warn", "@typescript-eslint/type-annotation-spacing": "error", "brace-style": [