refactor: separate update generation (#9788)

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Apr 30, 2021 · 6ad1a33 · 6ad1a33
1 parent fa838a5
commit 6ad1a33
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 52 deletions.
diff --git a/lib/workers/repository/process/lookup/generate.ts b/lib/workers/repository/process/lookup/generate.ts
@@ -0,0 +1,65 @@
+import type { Release } from '../../../../datasource';
+import { logger } from '../../../../logger';
+import type { LookupUpdate } from '../../../../manager/types';
+import type { VersioningApi } from '../../../../versioning';
+import type { LookupUpdateConfig } from './types';
+import { getUpdateType } from './update-type';
+
+export function generateUpdate(
+  config: LookupUpdateConfig,
+  versioning: VersioningApi,
+  currentVersion: string,
+  bucket: string,
+  release: Release
+): LookupUpdate {
+  const newVersion = release.version;
+  const update: LookupUpdate = {
+    bucket,
+    newVersion,
+    newValue: null,
+  };
+  const releaseFields = [
+    'checksumUrl',
+    'downloadUrl',
+    'newDigest',
+    'releaseTimestamp',
+  ];
+  for (const field of releaseFields) {
+    if (release[field] !== undefined) {
+      update[field] = release[field];
+    }
+  }
+  const { currentValue, rangeStrategy } = config;
+  try {
+    update.newValue = versioning.getNewValue({
+      currentValue,
+      rangeStrategy,
+      currentVersion,
+      newVersion,
+    });
+  } catch (err) /* istanbul ignore next */ {
+    logger.warn(
+      { err, currentValue, rangeStrategy, currentVersion, newVersion },
+      'getNewValue error'
+    );
+    update.newValue = currentValue;
+  }
+  update.newMajor = versioning.getMajor(newVersion);
+  update.newMinor = versioning.getMinor(newVersion);
+  update.updateType =
+    update.updateType ||
+    getUpdateType(config, versioning, currentVersion, newVersion);
+  if (!versioning.isVersion(update.newValue)) {
+    update.isRange = true;
+  }
+  if (rangeStrategy === 'update-lockfile' && currentValue === update.newValue) {
+    update.isLockfileUpdate = true;
+  }
+  if (
+    rangeStrategy === 'bump' &&
+    versioning.matches(newVersion, currentValue)
+  ) {
+    update.isBump = true;
+  }
+  return update;
+}
diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts
@@ -10,17 +10,16 @@ import {
 } from '../../../../datasource';
 import { logger } from '../../../../logger';
 import { getRangeStrategy } from '../../../../manager';
-import type { LookupUpdate } from '../../../../manager/types';
 import { SkipReason } from '../../../../types';
 import { clone } from '../../../../util/clone';
 import { applyPackageRules } from '../../../../util/package-rules';
 import * as allVersioning from '../../../../versioning';
 import { getBucket } from './bucket';
 import { getCurrentVersion } from './current';
 import { filterVersions } from './filter';
+import { generateUpdate } from './generate';
 import { getRollbackUpdate } from './rollback';
 import type { LookupUpdateConfig, UpdateResult } from './types';
-import { getUpdateType } from './update-type';
 
 export async function lookupUpdates(
   inconfig: LookupUpdateConfig
@@ -208,25 +207,13 @@ export async function lookupUpdates(
       );
       const release = sortedReleases.pop();
       const newVersion = release.version;
-      const update: LookupUpdate = {
-        newVersion,
-        newValue: null,
-      };
-      update.bucket = bucket;
-      try {
-        update.newValue = versioning.getNewValue({
-          currentValue,
-          rangeStrategy,
-          currentVersion,
-          newVersion,
-        });
-      } catch (err) /* istanbul ignore next */ {
-        logger.warn(
-          { err, currentValue, rangeStrategy, currentVersion, newVersion },
-          'getNewValue error'
-        );
-        update.newValue = currentValue;
-      }
+      const update = generateUpdate(
+        config,
+        versioning,
+        currentVersion,
+        bucket,
+        release
+      );
       if (!update.newValue || update.newValue === currentValue) {
         if (!lockedVersion) {
           continue; // eslint-disable-line no-continue
@@ -241,39 +228,9 @@ export async function lookupUpdates(
         }
         res.isSingleVersion = true;
       }
-      update.newMajor = versioning.getMajor(newVersion);
-      update.newMinor = versioning.getMinor(newVersion);
-      update.updateType =
-        update.updateType ||
-        getUpdateType(config, versioning, currentVersion, newVersion);
       res.isSingleVersion =
         res.isSingleVersion || !!versioning.isSingleVersion(update.newValue);
-      if (!versioning.isVersion(update.newValue)) {
-        update.isRange = true;
-      }
-      const releaseFields = [
-        'checksumUrl',
-        'downloadUrl',
-        'newDigest',
-        'releaseTimestamp',
-      ];
-      releaseFields.forEach((field) => {
-        if (release[field] !== undefined) {
-          update[field] = release[field];
-        }
-      });
-      if (
-        rangeStrategy === 'update-lockfile' &&
-        currentValue === update.newValue
-      ) {
-        update.isLockfileUpdate = true;
-      }
-      if (
-        rangeStrategy === 'bump' &&
-        versioning.matches(newVersion, currentValue)
-      ) {
-        update.isBump = true;
-      }
+
       res.updates.push(update);
     }
   } else if (currentValue) {