Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor a little
  • Loading branch information
bahmutov committed Apr 21, 2020
commit e233b3493c1de001baccdbeb938e410a75cfc9ef
37 changes: 37 additions & 0 deletions common-utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// @ts-check
function combineNycOptions({
pkgNycOptions,
nycrc,
nycrcJson,
defaultNycOptions
}) {
// last option wins
const nycOptions = Object.assign(
{},
defaultNycOptions,
nycrc,
nycrcJson,
pkgNycOptions
)

if (typeof nycOptions.reporter === 'string') {
nycOptions.reporter = [nycOptions.reporter]
}
if (typeof nycOptions.extension === 'string') {
nycOptions.extension = [nycOptions.extension]
}

return nycOptions
}

const defaultNycOptions = {
'report-dir': './coverage',
reporter: ['lcov', 'clover', 'json'],
extension: ['.js', '.cjs', '.mjs', '.ts', '.tsx', '.jsx'],
excludeAfterRemap: true
}

module.exports = {
combineNycOptions,
defaultNycOptions
}
2 changes: 1 addition & 1 deletion cypress/integration/combine-spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { combineNycOptions, defaultNycOptions } = require('../../task-utils')
const { combineNycOptions, defaultNycOptions } = require('../../common-utils')
describe('Combine NYC options', () => {
it('overrides defaults', () => {
const pkgNycOptions = {
Expand Down
35 changes: 1 addition & 34 deletions task-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,7 @@ const { isAbsolute, resolve, join } = require('path')
const debug = require('debug')('code-coverage')
const chalk = require('chalk')
const globby = require('globby')

function combineNycOptions({
pkgNycOptions,
nycrc,
nycrcJson,
defaultNycOptions
}) {
// last option wins
const nycOptions = Object.assign(
{},
defaultNycOptions,
nycrc,
nycrcJson,
pkgNycOptions
)

if (typeof nycOptions.reporter === 'string') {
nycOptions.reporter = [nycOptions.reporter]
}
if (typeof nycOptions.extension === 'string') {
nycOptions.extension = [nycOptions.extension]
}

return nycOptions
}

const defaultNycOptions = {
'report-dir': './coverage',
reporter: ['lcov', 'clover', 'json'],
extension: ['.js', '.cjs', '.mjs', '.ts', '.tsx', '.jsx'],
excludeAfterRemap: true
}
const { combineNycOptions, defaultNycOptions } = require('./common-utils')

function readNycOptions(workingDirectory) {
const pkgFilename = join(workingDirectory, 'package.json')
Expand Down Expand Up @@ -342,7 +311,5 @@ module.exports = {
checkAllPathsNotFound,
tryFindingLocalFiles,
readNycOptions,
combineNycOptions,
defaultNycOptions,
includeAllFiles
}