diff --git a/services/github/github-package-json.service.js b/services/github/github-package-json.service.js index bb582edddf5d9..d9ddbd28f743a 100644 --- a/services/github/github-package-json.service.js +++ b/services/github/github-package-json.service.js @@ -175,7 +175,7 @@ class GithubPackageJsonDependencyVersion extends ConditionalGithubAuthV3Service }) const wantedDependency = scope ? `${scope}/${packageName}` : packageName - const { range } = getDependencyVersion({ + const range = getDependencyVersion({ kind, wantedDependency, dependencies, diff --git a/services/npm/npm-dependency-version.service.js b/services/npm/npm-dependency-version.service.js index 916a5d7e0a0a9..115b5cc5be352 100644 --- a/services/npm/npm-dependency-version.service.js +++ b/services/npm/npm-dependency-version.service.js @@ -127,7 +127,7 @@ export default class NpmDependencyVersion extends NpmBase { registryUrl, }) - const { range } = getDependencyVersion({ + const range = getDependencyVersion({ kind, wantedDependency, dependencies, diff --git a/services/package-json-helpers.js b/services/package-json-helpers.js index 3106d61f85af1..d6423de4827ad 100644 --- a/services/package-json-helpers.js +++ b/services/package-json-helpers.js @@ -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', @@ -72,7 +72,7 @@ function getDependencyVersion({ }) } - return { range } + return range } export { isDependencyMap, isPackageJsonWithDependencies, getDependencyVersion } diff --git a/services/package-json-helpers.spec.js b/services/package-json-helpers.spec.js index f14f46148749d..6180eff24c989 100644 --- a/services/package-json-helpers.spec.js +++ b/services/package-json-helpers.spec.js @@ -8,9 +8,8 @@ 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', @@ -18,24 +17,23 @@ describe('Package json helpers', function () { 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',