Merge pull request #3 from TheDragonCode/1.x

Prepare to big update

Author: andrey-helldar

src/node/plugins/helpers.ts

@@ -0,0 +1,7 @@
+export const replace = (text: string, match: Array<string>, to: string) => {
+    return text.replace(match[0], to)
+    // const index: number = match['index']
+    // const from: string = match[0]
+    //
+    // return text.slice(0, index) + to + text.slice(index + from.length)
+}

src/node/plugins/transformers/commit.ts

@@ -1,11 +1,12 @@
 import type { GitHubLinkifyTransformer } from '../../types/transformer.js'
 import { regex } from '../regex.js'
+import { replace } from '../helpers.js'
 import { template } from '../template.js'
 import { url } from '../url.js'
 
 export const commitCompact: GitHubLinkifyTransformer = (text: string, repo: string) => {
-    const replacerFull = (value, item) => value.replace(item[0], template('commit', `${ item[1] }/${ item[2] }`, item[3]))
-    const replacerShort = (value, item) => value.replace(item[0], template('commit', repo, item[1]))
+    const replacerFull = (value, item) => replace(value, item, template('commit', `${ item[1] }/${ item[2] }`, item[3]))
+    const replacerShort = (value, item) => replace(value, item, template('commit', repo, item[1]))
 
     text = regex(text, /<a.*href\s?=\s?"?https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})"?.*>.*<\/a>/g, replacerFull)
     text = regex(text, /\[[\w\d\s`]+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})\)/g, replacerFull)

src/node/plugins/transformers/compare.ts

@@ -1,11 +1,12 @@
 import type { GitHubLinkifyTransformer } from '../../types/transformer.js'
 import { regex } from '../regex.js'
+import { replace } from '../helpers.js'
 import { template } from '../template.js'
 import { url } from '../url.js'
 
 export const compareCompact: GitHubLinkifyTransformer = (text: string, repo: string) => {
-    const replacerFull = (value, item) => value.replace(item[0], template('compare', `${ item[1] }/${ item[2] }`, item[3], item[4]))
-    const replacerShort = (value, item) => value.replace(item[0], template('compare', repo, item[1], item[2]))
+    const replacerFull = (value, item) => replace(value, item, template('compare', `${ item[1] }/${ item[2] }`, item[3], item[4]))
+    const replacerShort = (value, item) => replace(value, item, template('compare', repo, item[1], item[2]))
 
     text = regex(text, /\[[\s\w\d`.\-]+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/compare\/([\w\d.\-]+)\.{3}([\w\d.\-]+)\)/g, replacerFull)
     text = regex(text, /https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/compare\/([\w\d.\-]+)\.{3}([\w\d.\-]+)/g, replacerFull)

src/node/plugins/transformers/mention.ts

@@ -1,10 +1,11 @@
 import type { GitHubLinkifyTransformer } from '../../types/transformer.js'
 import { regex } from '../regex.js'
+import { replace } from '../helpers.js'
 import { template } from '../template.js'
 import { url } from '../url.js'
 
 export const mentionCompact: GitHubLinkifyTransformer = (text: string, repo: string) => {
-    const replacer = (value, item) => value.replace(item[0], template('mention', item[1]))
+    const replacer = (value, item) => replace(value, item, template('mention', item[1]))
 
     text = regex(text, /<\s*a.+@([a-zA-Z][\w\d\-_]*).+<\/\s*a\s*>/g, replacer)
     text = regex(text, /\[[\s`@]*[\w\d\-]+[\s`]*]\(https:\/\/github\.com\/([\w\d\-]+)\/?\)/g, replacer)

src/node/plugins/transformers/pull-request.ts

@@ -1,11 +1,12 @@
 import type { GitHubLinkifyTransformer } from '../../types/transformer.js'
 import { regex } from '../regex.js'
+import { replace } from '../helpers.js'
 import { template } from '../template.js'
 import { url } from '../url.js'
 
 export const pullRequestCompact: GitHubLinkifyTransformer = (text: string, repo: string) => {
-    const replacerFull = (value, item) => value.replace(item[0], template('pull_request', `${ item[1] }/${ item[2] }`, item[3]))
-    const replacerShort = (value, item) => value.replace(item[0], template('pull_request', repo, item[1]))
+    const replacerFull = (value, item) => replace(value, item, template('pull_request', `${ item[1] }/${ item[2] }`, item[3]))
+    const replacerShort = (value, item) => replace(value, item, template('pull_request', repo, item[1]))
 
     text = regex(text, /\[[\s`#@]*\d+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/pull\/(\d+)\)/g, replacerFull)
     text = regex(text, /https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/pull\/(\d+)/g, replacerFull)

src/node/plugins/transformers/tags.ts

@@ -1,14 +1,15 @@
 import { regex } from '../regex.js'
+import { replace } from '../helpers.js'
 import { template } from '../template.js'
 import { url } from '../url.js'
 
 export const tagsCompact = (text: string, repo: string) => {
-    const replacerFull = (value, item) => value.replace(item[0], template('tag', `${ item[1] }/${ item[2] }`, item[3]))
-    const replacerShort = (value, item) => value.replace(item[0], template('tag', repo, item[1]))
+    const replacerFull = (value, item) => replace(value, item, template('tag', `${ item[1] }/${ item[2] }`, item[3]))
+    const replacerShort = (value, item) => replace(value, item, template('tag', repo, item[1]))
 
     text = regex(text, /\[[\s\w\d`.\-]+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/releases\/tag\/(v?\d+\.\d+\.\d+-?\w*\.?\d*)\)/g, replacerFull)
     text = regex(text, /https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/releases\/tag\/(v?\d+\.\d+\.\d+-?\w*\.?\d*)/g, replacerFull)
-    // text = regex(text, /(?<!:)(?<=>|\s)(v?\d+\.\d+\.\d+-?\w*\.?\d*)(?<!:)/g, replacerShort)
+    // text = regex(text, /(?<!:)(?<=^|\s)(v?\d+\.\d+\.\d+-?\w*\.?\d*)(?<!:)/g, replacerShort)
 
     return text
 }

src/node/plugins/url.ts

@@ -1,6 +1,6 @@
 export const url = (repo: string, value: string, link?: string) => {
     link = (link || value).replace('https://github.com/', '')
-    value = value.replace(repo + '/', '').replace(repo, '')
+    value = value.replace(repo + '/', '').replace(repo, '').trim()
 
-    return `<a href="https://github.com/${ link }" target="_blank" rel="noopener noreferrer">${ value } <ExternalLinkIcon /></a>`
+    return `<a href="https://github.com/${ link }" target="_blank" rel="noopener noreferrer">${ value }<ExternalLinkIcon /></a>`
 }