- fix a ton of formatting issues automatically

- fix many javascript issues
2020-10-16 16:29:13 +02:00
parent 8d59911332
commit db70432deb
10 changed files with 636 additions and 557 deletions
@@ -1,114 +1,126 @@
-import { PullRequestInfo, sortPullRequests } from './pullRequests';
-import * as core from '@actions/core';
+import {PullRequestInfo, sortPullRequests} from './pullRequests'
+import * as core from '@actions/core'
+import {Category, Configuration, Transformer} from './configuration'

-export function buildChangelog(prs: PullRequestInfo[], config: Configuration): string {
-    // sort to target order
-    prs = sortPullRequests(prs, config.sort.toUpperCase() === "ASC")
+export function buildChangelog(
+  prs: PullRequestInfo[],
+  config: Configuration
+): string {
+  // sort to target order
+  prs = sortPullRequests(prs, config.sort.toUpperCase() === 'ASC')

-    const validatedTransformers = validateTransfomers(config.transformers)
-    let transformedMap = new Map<PullRequestInfo, string>();
-    // convert PRs to their text representation
-    prs.forEach(pr => {
-        transformedMap.set(pr, transform(fillTemplate(pr, config.pr_template), validatedTransformers))
+  const validatedTransformers = validateTransfomers(config.transformers)
+  const transformedMap = new Map<PullRequestInfo, string>()
+  // convert PRs to their text representation
+  prs.forEach(pr => {
+    transformedMap.set(
+      pr,
+      transform(fillTemplate(pr, config.pr_template), validatedTransformers)
+    )
+  })
+
+  // bring PRs into the order of categories
+  const categorized = new Map<Category, string[]>()
+  config.categories.forEach(category => {
+    categorized.set(category, [])
+  })
+  const uncategorized: string[] = []
+
+  // bring elements in order
+  transformedMap.forEach((body, pr) => {
+    let matched = false
+
+    categorized.forEach((pullRequests, category) => {
+      if (haveCommonElements(category.labels, pr.labels)) {
+        pullRequests.push(body)
+        matched = true
+      }
    })

-    // bring PRs into the order of categories
-    let categorized = new Map<Category, string[]>();
-    config.categories.forEach(category => {
-        categorized.set(category, [])
-    })
-    let uncategorized: Array<string> = [];
+    if (!matched) {
+      uncategorized.push(body)
+    }
+  })

-    // bring elements in order
-    transformedMap.forEach((body, pr) => {
-        let matched = false
+  // construct final changelog
+  let changelog = ''
+  categorized.forEach((pullRequests, category) => {
+    if (pullRequests.length > 0) {
+      changelog = `${changelog + category.title}\n\n`

-        categorized.forEach((prs, category) => {
-            if (findCommonElements3(category.labels, pr.labels)) {
-                prs.push(body)
-                matched = true
-            }
-        })
+      pullRequests.forEach(pr => {
+        changelog = `${changelog + pr}\n`
+      })

-        if (!matched) {
-            uncategorized.push(body)
-        }
-    })
+      // add space between
+      changelog = `${changelog}\n`
+    }
+  })

-    // construct final changelog
-    let changelog = ""
-    categorized.forEach((prs, category) => {
-        if (prs.length > 0) {
-            changelog = changelog + category.title + "\n\n"
+  let changelogUncategorized = ''
+  uncategorized.forEach(pr => {
+    changelogUncategorized = `${changelogUncategorized + pr}\n`
+  })

-            prs.forEach(pr => {
-                changelog = changelog + pr + "\n"
-            })
-
-            // add space between
-            changelog = changelog + "\n"
-        }
-    })
-
-    let changelogUncategorized = ""
-    uncategorized.forEach(pr => {
-        changelogUncategorized = changelogUncategorized + pr + "\n"
-    })
-
-    // fill template
-    let transformedChangelog = config.template
-    transformedChangelog = transformedChangelog.replace("${{CHANGELOG}}", changelog)
-    transformedChangelog = transformedChangelog.replace("${{UNCATEGORIZED}}", changelogUncategorized)
-    return transformedChangelog;
+  // fill template
+  let transformedChangelog = config.template
+  transformedChangelog = transformedChangelog.replace(
+    '${{CHANGELOG}}',
+    changelog
+  )
+  transformedChangelog = transformedChangelog.replace(
+    '${{UNCATEGORIZED}}',
+    changelogUncategorized
+  )
+  return transformedChangelog
 }

-function findCommonElements3(arr1: string[], arr2: string[]) {
-    return arr1.some(item => arr2.includes(item))
+function haveCommonElements(arr1: string[], arr2: string[]): Boolean {
+  return arr1.some(item => arr2.includes(item))
 }

 function fillTemplate(pr: PullRequestInfo, template: string): string {
-    let transformed = template
-    transformed = transformed.replace("${{NUMBER}}", pr.number.toString())
-    transformed = transformed.replace("${{TITLE}}", pr.title)
-    transformed = transformed.replace("${{URL}}", pr.htmlURL)
-    transformed = transformed.replace("${{MERGED_AT}}", pr.mergedAt.toString)
-    transformed = transformed.replace("${{AUTHOR}}", pr.author)
-    transformed = transformed.replace("${{BODY}}", pr.body)
-    return transformed
+  let transformed = template
+  transformed = transformed.replace('${{NUMBER}}', pr.number.toString())
+  transformed = transformed.replace('${{TITLE}}', pr.title)
+  transformed = transformed.replace('${{URL}}', pr.htmlURL)
+  transformed = transformed.replace('${{MERGED_AT}}', pr.mergedAt.toString())
+  transformed = transformed.replace('${{AUTHOR}}', pr.author)
+  transformed = transformed.replace('${{BODY}}', pr.body)
+  return transformed
 }

 function transform(filled: string, transformers: RegexTransformer[]): string {
-    if (transformers.length == 0) {
-        return filled
-    }
-    let transformed = filled
-    transformers.forEach(({ pattern, target }) => {
-        transformed = transformed.replace(pattern!!, target)
-    })
-    return transformed
+  if (transformers.length === 0) {
+    return filled
+  }
+  let transformed = filled
+  transformers.forEach(({pattern, target}) => {
+    transformed = transformed.replace(pattern!!, target)
+  })
+  return transformed
 }

 function validateTransfomers(transformers: Transformer[]): RegexTransformer[] {
-    return transformers
-        .map((transformer) => {
-            try {
-                return {
-                    pattern: new RegExp(transformer.pattern.replace("\\\\", '\\'), "g"),
-                    target: transformer.target
-                }
-            } catch (e) {
-                core.warning(`Bad replacer regex: ${transformer.pattern}`)
-                return {
-                    pattern: null,
-                    target: ""
-                }
-            }
-        })
-        .filter(transformer => transformer.pattern != null)
+  return transformers
+    .map(transformer => {
+      try {
+        return {
+          pattern: new RegExp(transformer.pattern.replace('\\\\', '\\'), 'g'),
+          target: transformer.target
+        }
+      } catch (e) {
+        core.warning(`Bad replacer regex: ${transformer.pattern}`)
+        return {
+          pattern: null,
+          target: ''
+        }
+      }
+    })
+    .filter(transformer => transformer.pattern != null)
 }

-
 interface RegexTransformer {
-    pattern: RegExp | null;
-    target: string;
-}
+  pattern: RegExp | null
+  target: string
+}