Skip to content

Commit

Permalink
return string instead of object from getDependencyVersion function (#…
Browse files Browse the repository at this point in the history
…8396)

Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
  • Loading branch information
pr7prashant and repo-ranger[bot] committed Sep 13, 2022
1 parent ae018cd commit e3c938b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion services/github/github-package-json.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class GithubPackageJsonDependencyVersion extends ConditionalGithubAuthV3Service
})

const wantedDependency = scope ? `${scope}/${packageName}` : packageName
const { range } = getDependencyVersion({
const range = getDependencyVersion({
kind,
wantedDependency,
dependencies,
Expand Down
2 changes: 1 addition & 1 deletion services/npm/npm-dependency-version.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default class NpmDependencyVersion extends NpmBase {
registryUrl,
})

const { range } = getDependencyVersion({
const range = getDependencyVersion({
kind,
wantedDependency,
dependencies,
Expand Down
4 changes: 2 additions & 2 deletions services/package-json-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const isPackageJsonWithDependencies = Joi.object({
* @param {object} attrs.optionalDependencies - Map of optional dependencies
* @throws {string} - Error message if unknown dependency type provided
* @throws {InvalidParameter} - Error if wanted dependency is not present
* @returns {object} Object containing semver range of the wanted dependency (eg. ~2.1.6 or >=3.0.0 or <4.0.0)
* @returns {string} Semver range of the wanted dependency (eg. ~2.1.6 or >=3.0.0 or <4.0.0)
*/
function getDependencyVersion({
kind = 'prod',
Expand All @@ -72,7 +72,7 @@ function getDependencyVersion({
})
}

return { range }
return range
}

export { isDependencyMap, isPackageJsonWithDependencies, getDependencyVersion }
16 changes: 7 additions & 9 deletions services/package-json-helpers.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,32 @@ describe('Package json helpers', function () {
dependencies: { 'left-pad': '~1.2.3' },
devDependencies: {},
peerDependencies: {},
}).expect({
range: '~1.2.3',
})
}).expect('~1.2.3')

given({
kind: 'dev',
wantedDependency: 'left-pad',
dependencies: { 'left-pad': '~1.2.3' },
devDependencies: {},
peerDependencies: {},
}).expectError('Invalid Parameter')

given({
kind: 'dev',
wantedDependency: 'left-pad',
dependencies: {},
devDependencies: { 'left-pad': '~1.2.3' },
peerDependencies: {},
}).expect({
range: '~1.2.3',
})
}).expect('~1.2.3')

given({
kind: 'peer',
wantedDependency: 'left-pad',
dependencies: {},
devDependencies: {},
peerDependencies: { 'left-pad': '~1.2.3' },
}).expect({
range: '~1.2.3',
})
}).expect('~1.2.3')

given({
kind: 'notreal',
wantedDependency: 'left-pad',
Expand Down

0 comments on commit e3c938b

Please sign in to comment.