refactor: refactor static regex out of for loops (#13065)

renovatebot · Dec 29, 2021 · 4f65b57 · 4f65b57
1 parent 05d7c45
commit 4f65b57
Show file tree

Hide file tree

Showing 55 changed files with 149 additions and 159 deletions.
diff --git a/lib/config/decrypt.ts b/lib/config/decrypt.ts
@@ -174,7 +174,7 @@ export async function decryptConfig(
           }
           logger.debug(`Decrypted ${eKey}`);
           if (eKey === 'npmToken') {
-            const token = decryptedStr.replace(regEx(/\n$/), ''); // TODO #12071
+            const token = decryptedStr.replace(regEx(/\n$/), '');
             add(token);
             logger.debug(
               { decryptedToken: maskToken(token) },
@@ -191,7 +191,7 @@ export async function decryptConfig(
               } else {
                 logger.debug('Appending _authToken= to end of existing npmrc');
                 decryptedConfig.npmrc = decryptedConfig.npmrc.replace(
-                  regEx(/\n?$/), // TODO #12071
+                  regEx(/\n?$/),
                   `\n_authToken=${token}\n`
                 );
               }

diff --git a/lib/config/migration.ts b/lib/config/migration.ts
@@ -17,9 +17,11 @@ import type {
 import { mergeChildConfig } from './utils';
 
 const options = getOptions();
+export function fixShortHours(input: string): string {
+  return input.replace(regEx(/( \d?\d)((a|p)m)/g), '$1:00$2');
+}
 
 let optionTypes: Record<string, RenovateOptions['type']>;
-
 // Returns a migrated config
 export function migrateConfig(
   config: RenovateConfig,
@@ -157,12 +159,12 @@ export function migrateConfig(
         }
       } else if (is.string(val) && val.includes('{{baseDir}}')) {
         migratedConfig[key] = val.replace(
-          regEx(/{{baseDir}}/g), // TODO #12071
+          regEx(/{{baseDir}}/g),
           '{{packageFileDir}}'
         );
       } else if (is.string(val) && val.includes('{{depNameShort}}')) {
         migratedConfig[key] = val.replace(
-          regEx(/{{depNameShort}}/g), // TODO #12071
+          regEx(/{{depNameShort}}/g),
           '{{depName}}'
         );
       } else if (key === 'gitFs') {
@@ -340,6 +342,9 @@ export function migrateConfig(
         const schedules = is.string(val) ? [val] : [...(val as string[])];
         // split 'and'
         const schedulesLength = schedules.length;
+        const afterBeforeRe = regEx(
+          /^(.*?)(after|before) (.*?) and (after|before) (.*?)( |$)(.*)/
+        );
         for (let i = 0; i < schedulesLength; i += 1) {
           if (
             schedules[i].includes(' and ') &&
@@ -348,28 +353,16 @@ export function migrateConfig(
           ) {
             const parsedSchedule = later.parse.text(
               // We need to massage short hours first before we can parse it
-              schedules[i].replace(regEx(/( \d?\d)((a|p)m)/g), '$1:00$2') // TODO #12071
+              fixShortHours(schedules[i])
             ).schedules[0];
             // Only migrate if the after time is greater than before, e.g. "after 10pm and before 5am"
             if (parsedSchedule?.t_a?.[0] > parsedSchedule?.t_b?.[0]) {
               const toSplit = schedules[i];
               schedules[i] = toSplit
-                .replace(
-                  regEx(
-                    /^(.*?)(after|before) (.*?) and (after|before) (.*?)( |$)(.*)/
-                  ), // TODO #12071
-                  '$1$2 $3 $7'
-                )
+                .replace(afterBeforeRe, '$1$2 $3 $7')
                 .trim();
               schedules.push(
-                toSplit
-                  .replace(
-                    regEx(
-                      /^(.*?)(after|before) (.*?) and (after|before) (.*?)( |$)(.*)/
-                    ), // TODO #12071
-                    '$1$4 $5 $7'
-                  )
-                  .trim()
+                toSplit.replace(afterBeforeRe, '$1$4 $5 $7').trim()
               );
             }
           }
@@ -393,10 +386,10 @@ export function migrateConfig(
           if (
             regEx(/every (mon|tues|wednes|thurs|fri|satur|sun)day$/).test(
               schedules[i]
-            ) // TODO #12071
+            )
           ) {
             schedules[i] = schedules[i].replace(
-              regEx(/every ([a-z]*day)$/), // TODO #12071
+              regEx(/every ([a-z]*day)$/),
               'on $1'
             );
           }
@@ -514,7 +507,7 @@ export function migrateConfig(
       if (is.string(migratedConfig[key])) {
         for (const [from, to] of Object.entries(migratedTemplates)) {
           migratedConfig[key] = (migratedConfig[key] as string).replace(
-            regEx(from, 'g'), // TODO #12071
+            regEx(from, 'g'),
             to
           );
         }

diff --git a/lib/config/validation.ts b/lib/config/validation.ts
@@ -37,7 +37,8 @@ const ignoredNodes = [
   'prBody', // deprecated
   'minimumConfidence', // undocumented feature flag
 ];
-
+const tzRe = regEx(/^:timezone\((.+)\)$/);
+const rulesRe = regEx(/p.*Rules\[\d+\]$/);
 function isManagerPath(parentPath: string): boolean {
   return (
     regEx(/^regexManagers\[[0-9]+]$/).test(parentPath) ||
@@ -253,7 +254,6 @@ export async function validateConfig(
               }
             }
             if (key === 'extends') {
-              const tzRe = regEx(/^:timezone\((.+)\)$/); // TODO #12071
               for (const subval of val) {
                 if (is.string(subval)) {
                   if (
@@ -488,7 +488,7 @@ export async function validateConfig(
             }
             if (
               (selectors.includes(key) || key === 'matchCurrentVersion') &&
-              !regEx(/p.*Rules\[\d+\]$/).test(parentPath) && // Inside a packageRule  // TODO #12071
+              !rulesRe.test(parentPath) && // Inside a packageRule
               (parentPath || !isPreset) // top level in a preset
             ) {
               errors.push({

diff --git a/lib/datasource/artifactory/index.ts b/lib/datasource/artifactory/index.ts
@@ -109,6 +109,6 @@ export class ArtifactoryDatasource extends Datasource {
   }
 
   private static parseReleaseTimestamp(rawText: string): string {
-    return rawText.trim().replace(regEx(/ ?-$/), '') + 'Z'; // TODO #12071
+    return rawText.trim().replace(regEx(/ ?-$/), '') + 'Z';
   }
 }
diff --git a/lib/datasource/github-releases/digest.ts b/lib/datasource/github-releases/digest.ts
@@ -14,7 +14,7 @@ async function findDigestFile(
   for (const asset of smallAssets) {
     const res = await http.get(asset.browser_download_url);
     for (const line of res.body.split('\n')) {
-      const [lineDigest, lineFn] = line.split(regEx(/\s+/), 2); // TODO #12071
+      const [lineDigest, lineFn] = line.split(regEx(/\s+/), 2);
       if (lineDigest === digest) {
         return {
           assetName: asset.name,

diff --git a/lib/datasource/maven/index.ts b/lib/datasource/maven/index.ts
@@ -5,6 +5,7 @@ import { XmlDocument } from 'xmldoc';
 import { logger } from '../../logger';
 import * as packageCache from '../../util/cache/package';
 import { regEx } from '../../util/regex';
+import { ensureTrailingSlash } from '../../util/url';
 import mavenVersion from '../../versioning/maven';
 import * as mavenVersioning from '../../versioning/maven';
 import { compare } from '../../versioning/maven/compare';
@@ -306,7 +307,7 @@ export async function getReleases({
   registryUrl,
 }: GetReleasesConfig): Promise<ReleaseResult | null> {
   const dependency = getDependencyParts(lookupName);
-  const repoUrl = registryUrl.replace(/\/?$/, '/'); // TODO #12071
+  const repoUrl = ensureTrailingSlash(registryUrl);
 
   logger.debug(`Looking up ${dependency.display} in repository ${repoUrl}`);
 

diff --git a/lib/datasource/pod/index.ts b/lib/datasource/pod/index.ts
@@ -183,7 +183,6 @@ async function getReleasesFromCDN(
       const line = lines[idx];
       const [name, ...versions] = line.split('/');
       if (name === lookupName.replace(regEx(/\/.*$/), '')) {
-        // TODO #12071
         const releases = versions.map((version) => ({ version }));
         return { releases };
       }

diff --git a/lib/datasource/pypi/index.ts b/lib/datasource/pypi/index.ts
@@ -176,7 +176,7 @@ export class PypiDatasource extends Datasource {
     const srcPrefix = `${packageName}-`;
     const srcSuffix = '.tar.gz';
     if (srcText.startsWith(srcPrefix) && srcText.endsWith(srcSuffix)) {
-      return srcText.replace(srcPrefix, '').replace(regEx(/\.tar\.gz$/), ''); // TODO #12071
+      return srcText.replace(srcPrefix, '').replace(regEx(/\.tar\.gz$/), '');
     }
 
     // pep-0427 wheel packages

diff --git a/lib/datasource/sbt-package/index.ts b/lib/datasource/sbt-package/index.ts
@@ -123,10 +123,10 @@ export async function getUrls(
         const sourceUrl = pomXml.valueWithPath('scm.url');
         if (sourceUrl) {
           result.sourceUrl = sourceUrl
-            .replace(regEx(/^scm:/), '') // TODO #12071
-            .replace(regEx(/^git:/), '') // TODO #12071
-            .replace(regEx(/^git@github.com:/), 'https://github.com/') // TODO #12071
-            .replace(regEx(/\.git$/), ''); // TODO #12071
+            .replace(regEx(/^scm:/), '')
+            .replace(regEx(/^git:/), '')
+            .replace(regEx(/^git@github.com:/), 'https://github.com/')
+            .replace(regEx(/\.git$/), '');
         }
 
         return result;

diff --git a/lib/datasource/sbt-plugin/index.ts b/lib/datasource/sbt-plugin/index.ts
@@ -1,5 +1,6 @@
 import { logger } from '../../logger';
 import { regEx } from '../../util/regex';
+import { ensureTrailingSlash } from '../../util/url';
 import * as ivyVersioning from '../../versioning/ivy';
 import { compare } from '../../versioning/maven/compare';
 import { downloadHttpProtocol } from '../maven/util';
@@ -18,8 +19,6 @@ export const defaultRegistryUrls = [SBT_PLUGINS_REPO];
 export const defaultVersioning = ivyVersioning.id;
 export const registryStrategy = 'hunt';
 
-const ensureTrailingSlash = (str: string): string => str.replace(/\/?$/, '/'); // TODO #12071
-
 async function resolvePluginReleases(
   rootUrl: string,
   artifact: string,

diff --git a/lib/manager/ansible-galaxy/extract.ts b/lib/manager/ansible-galaxy/extract.ts
@@ -46,11 +46,9 @@ export default function extractPackageFile(
       // find role and collection block
       lines.forEach((line, index) => {
         if (regEx(/^collections:/).exec(line)) {
-          // TODO #12071
           positions.collections = index;
         }
         if (regEx(/^roles:/).exec(line)) {
-          // TODO #12071
           positions.roles = index;
         }
       });

diff --git a/lib/manager/buildkite/extract.ts b/lib/manager/buildkite/extract.ts
@@ -16,7 +16,7 @@ export function extractPackageFile(content: string): PackageFile | null {
       const line = lines[lineIdx];
       const pluginsSection = regEx(
         /^(?<pluginsIndent>\s*)(-?\s*)plugins:/
-      ).exec(line); // TODO #12071
+      ).exec(line);
       if (pluginsSection) {
         logger.trace(`Matched plugins on line ${lineNumber}`);
         isPluginsSection = true;
@@ -25,10 +25,10 @@ export function extractPackageFile(content: string): PackageFile | null {
         logger.debug(`serviceImageLine: "${line}"`);
         const { currentIndent } = regEx(/^(?<currentIndent>\s*)/).exec(
           line
-        ).groups; // TODO #12071
+        ).groups;
         const depLineMatch = regEx(
           /^\s+(?:-\s+)?(?<depName>[^#]+)#(?<currentValue>[^:]+)/
-        ).exec(line); // TODO #12071
+        ).exec(line);
         if (currentIndent.length <= pluginsIndent.length) {
           isPluginsSection = false;
           pluginsIndent = '';

diff --git a/lib/manager/bundler/extract.ts b/lib/manager/bundler/extract.ts
@@ -5,6 +5,10 @@ import { regEx } from '../../util/regex';
 import type { PackageDependency, PackageFile } from '../types';
 import { extractLockFileEntries } from './locked-version';
 
+function formatContent(input: string): string {
+  return input.replace(regEx(/^ {2}/), '') + '\n'; //remove leading witespace and add a new line at the end
+}
+
 export async function extractPackageFile(
   content: string,
   fileName?: string
@@ -22,7 +26,6 @@ export async function extractPackageFile(
       sourceMatch =
         sourceMatch ||
         regEx(`^source ${delimiter}([^${delimiter}]+)${delimiter}\\s*$`).exec(
-          // TODO #12071
           line
         );
     }
@@ -33,14 +36,14 @@ export async function extractPackageFile(
     for (const delimiter of delimiters) {
       rubyMatch =
         rubyMatch ||
-        regEx(`^ruby ${delimiter}([^${delimiter}]+)${delimiter}`).exec(line); // TODO #12071
+        regEx(`^ruby ${delimiter}([^${delimiter}]+)${delimiter}`).exec(line);
     }
     if (rubyMatch) {
       res.constraints = { ruby: rubyMatch[1] };
     }
     const gemMatchRegex = regEx(
       `^\\s*gem\\s+(['"])(?<depName>[^'"]+)(['"])(\\s*,\\s*(?<currentValue>(['"])[^'"]+['"](\\s*,\\s*['"][^'"]+['"])?))?`
-    ); // TODO #12071
+    );
     const gemMatch = gemMatchRegex.exec(line);
     if (gemMatch) {
       const dep: PackageDependency = {
@@ -49,27 +52,27 @@ export async function extractPackageFile(
       };
       if (gemMatch.groups.currentValue) {
         const currentValue = gemMatch.groups.currentValue;
-        dep.currentValue = regEx(/\s*,\s*/).test(currentValue) // TODO #12071
+        dep.currentValue = regEx(/\s*,\s*/).test(currentValue)
           ? currentValue
           : currentValue.slice(1, -1);
       }
       dep.datasource = RubyGemsDatasource.id;
       res.deps.push(dep);
     }
-    const groupMatch = regEx(/^group\s+(.*?)\s+do/).exec(line); // TODO #12071
+    const groupMatch = regEx(/^group\s+(.*?)\s+do/).exec(line);
     if (groupMatch) {
       const depTypes = groupMatch[1]
         .split(',')
         .map((group) => group.trim())
-        .map((group) => group.replace(regEx(/^:/), '')); // TODO #12071
+        .map((group) => group.replace(regEx(/^:/), ''));
       const groupLineNumber = lineNumber;
       let groupContent = '';
       let groupLine = '';
       while (lineNumber < lines.length && groupLine !== 'end') {
         lineNumber += 1;
         groupLine = lines[lineNumber];
         if (groupLine !== 'end') {
-          groupContent += (groupLine || '').replace(regEx(/^ {2}/), '') + '\n'; // TODO #12071
+          groupContent += formatContent(groupLine || '');
         }
       }
       const groupRes = await extractPackageFile(groupContent);
@@ -88,7 +91,7 @@ export async function extractPackageFile(
     }
     for (const delimiter of delimiters) {
       const sourceBlockMatch = regEx(
-        `^source\\s+${delimiter}(.*?)${delimiter}\\s+do` // TODO #12071
+        `^source\\s+${delimiter}(.*?)${delimiter}\\s+do`
       ).exec(line);
       if (sourceBlockMatch) {
         const repositoryUrl = sourceBlockMatch[1];
@@ -104,7 +107,7 @@ export async function extractPackageFile(
             sourceLine = 'end';
           }
           if (sourceLine !== 'end') {
-            sourceContent += sourceLine.replace(regEx(/^ {2}/), '') + '\n'; // TODO #12071
+            sourceContent += formatContent(sourceLine);
           }
         }
         const sourceRes = await extractPackageFile(sourceContent);
@@ -122,7 +125,7 @@ export async function extractPackageFile(
         }
       }
     }
-    const platformsMatch = regEx(/^platforms\s+(.*?)\s+do/).test(line); // TODO #12071
+    const platformsMatch = regEx(/^platforms\s+(.*?)\s+do/).test(line);
     if (platformsMatch) {
       const platformsLineNumber = lineNumber;
       let platformsContent = '';
@@ -131,7 +134,7 @@ export async function extractPackageFile(
         lineNumber += 1;
         platformsLine = lines[lineNumber];
         if (platformsLine !== 'end') {
-          platformsContent += platformsLine.replace(regEx(/^ {2}/), '') + '\n'; // TODO #12071
+          platformsContent += formatContent(platformsLine);
         }
       }
       const platformsRes = await extractPackageFile(platformsContent);
@@ -147,7 +150,7 @@ export async function extractPackageFile(
         );
       }
     }
-    const ifMatch = regEx(/^if\s+(.*?)/).test(line); // TODO #12071
+    const ifMatch = regEx(/^if\s+(.*?)/).test(line);
     if (ifMatch) {
       const ifLineNumber = lineNumber;
       let ifContent = '';
@@ -156,7 +159,7 @@ export async function extractPackageFile(
         lineNumber += 1;
         ifLine = lines[lineNumber];
         if (ifLine !== 'end') {
-          ifContent += ifLine.replace(regEx(/^ {2}/), '') + '\n'; // TODO #12071
+          ifContent += formatContent(ifLine);
         }
       }
       const ifRes = await extractPackageFile(ifContent);