Merge pull request #1182 from mikepenz/feature/optimize_transformers

Improve transformer performance
mikepenz · Sep 13, 2024 · 6818a87 · 6818a87
2 parents 85cfd64 + 77c5dd8
commit 6818a87
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/__tests__/testParser.test.ts b/__tests__/testParser.test.ts
@@ -1074,11 +1074,13 @@ action.surefire.report.email.InvalidEmailAddressException: Invalid email address
     const transformer: Transformer[] = [
       {
         searchValue: '\\.',
-        replaceValue: '/'
+        replaceValue: '/',
+        regex: new RegExp('\\.'.replace('\\\\', '\\'), 'gu')
       },
       {
         searchValue: '(.+?)_t',
-        replaceValue: '$1.t'
+        replaceValue: '$1.t',
+        regex: new RegExp('(.+?)_t'.replace('\\\\', '\\'), 'gu')
       }
     ]
     const {totalCount, skippedCount, annotations} = await parseFile(

diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts
@@ -11,6 +11,7 @@ describe('readTransformers', () => {
     const transformer = readTransformers('[{"searchValue":"::","replaceValue":"/"}]')
     expect(transformer).toStrictEqual([
       {
+        regex: /::/gu,
         searchValue: '::',
         replaceValue: '/'
       }
@@ -23,6 +24,7 @@ describe('readTransformers', () => {
     )
     expect(transformer).toStrictEqual([
       {
+        regex: /\./gu,
         searchValue: '\\.',
         replaceValue: '/'
       },

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/testParser.ts b/src/testParser.ts
@@ -52,6 +52,7 @@ export interface Position {
 export interface Transformer {
   searchValue: string
   replaceValue: string
+  regex?: RegExp
 }
 
 /**

diff --git a/src/utils.ts b/src/utils.ts
@@ -34,6 +34,13 @@ export function readTransformers(raw: string | undefined): Transformer[] {
   }
   try {
     const transformers: Transformer[] = JSON.parse(raw)
+    for (const transformer of transformers) {
+      try {
+        transformer.regex = new RegExp(transformer.searchValue.replace('\\\\', '\\'), 'gu')
+      } catch (error) {
+        core.warning(`⚠️ Bad replacer regex: ${transformer.searchValue}`)
+      }
+    }
     return transformers
   } catch (error) {
     core.info(`⚠️ Transformers provided, but they couldn't be parsed. Fallback to Defaults.`)
@@ -43,11 +50,10 @@ export function readTransformers(raw: string | undefined): Transformer[] {
 }
 
 export function applyTransformer(transformer: Transformer, string: string): string {
-  try {
-    const regExp = new RegExp(transformer.searchValue.replace('\\\\', '\\'), 'gu')
+  const regExp = transformer.regex
+  if (regExp) {
     return string.replace(regExp, transformer.replaceValue)
-  } catch (e) {
-    core.warning(`⚠️ Bad replacer regex: ${transformer.searchValue}`)
+  } else {
     return string.replace(transformer.searchValue, transformer.replaceValue)
   }
 }