Skip to content
Snippets Groups Projects
Commit caa2c413 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

refactor: simplify fetching logic

parent 7d54d7bc
No related branches found
No related tags found
No related merge requests found
...@@ -84,7 +84,7 @@ describe('workers/repository/process/fetch', () => { ...@@ -84,7 +84,7 @@ describe('workers/repository/process/fetch', () => {
}; };
// TODO: fix types // TODO: fix types
npm.getPackageUpdates = jest.fn((_) => ['a', 'b'] as never); npm.getPackageUpdates = jest.fn((_) => ['a', 'b'] as never);
lookupUpdates.mockResolvedValue(['a', 'b'] as never); lookupUpdates.mockResolvedValue({ updates: ['a', 'b'] } as never);
await fetchUpdates(config, packageFiles); await fetchUpdates(config, packageFiles);
expect(packageFiles).toMatchSnapshot(); expect(packageFiles).toMatchSnapshot();
expect(packageFiles.npm[0].deps[0].skipReason).toBeUndefined(); expect(packageFiles.npm[0].deps[0].skipReason).toBeUndefined();
......
import is from '@sindresorhus/is';
import pAll from 'p-all'; import pAll from 'p-all';
import { logger } from '../../../logger'; import { logger } from '../../../logger';
import { getPackageUpdates } from '../../../manager'; import { getPackageUpdates } from '../../../manager';
...@@ -9,12 +8,8 @@ import { ...@@ -9,12 +8,8 @@ import {
ManagerConfig, ManagerConfig,
} from '../../../config'; } from '../../../config';
import { applyPackageRules } from '../../../util/package-rules'; import { applyPackageRules } from '../../../util/package-rules';
import { lookupUpdates, LookupUpdateConfig, UpdateResult } from './lookup'; import { lookupUpdates, LookupUpdateConfig } from './lookup';
import { import { PackageFile, PackageDependency } from '../../../manager/common';
PackageFile,
PackageDependency,
PackageUpdateResult,
} from '../../../manager/common';
import { SkipReason } from '../../../types'; import { SkipReason } from '../../../types';
import { clone } from '../../../util/clone'; import { clone } from '../../../util/clone';
...@@ -48,17 +43,10 @@ async function fetchDepUpdates( ...@@ -48,17 +43,10 @@ async function fetchDepUpdates(
logger.debug({ dependency: dep.depName }, 'Dependency is disabled'); logger.debug({ dependency: dep.depName }, 'Dependency is disabled');
dep.skipReason = SkipReason.Disabled; dep.skipReason = SkipReason.Disabled;
} else { } else {
let lookupResults: UpdateResult | PackageUpdateResult[];
if (depConfig.datasource) { if (depConfig.datasource) {
lookupResults = await lookupUpdates(depConfig as LookupUpdateConfig); Object.assign(dep, await lookupUpdates(depConfig as LookupUpdateConfig));
} else {
lookupResults = await getPackageUpdates(manager, depConfig);
}
// istanbul ignore else
if (is.array(lookupResults)) {
dep.updates = lookupResults;
} else { } else {
Object.assign(dep, lookupResults); dep.updates = await getPackageUpdates(manager, depConfig);
} }
// istanbul ignore if // istanbul ignore if
if (dep.updates.length) { if (dep.updates.length) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment