refactor: regular expressions

Signed-off-by: Pedro Lamas <[email protected]>

src/components/widgets/console/ConsoleItem.vue

@@ -31,7 +31,7 @@ export default class ConsoleItem extends Vue {
   get itemMessage () {
     let message = this.value.message
     if (this.value.type === 'response') {
-      message = this.value.message.replace(/([A-Z0-9_]{2,})/gm, (match, command) => {
+      message = this.value.message.replace(/([A-Z0-9_]{2,})/g, (match, command) => {
         if (command in this.knownCommands) return `<a class="primary--text text--lighten-1">${command.toUpperCase()}</a>`
         return match
       })

src/components/widgets/diagnostics/StateExplorer.vue

@@ -31,7 +31,7 @@ export default class StateExplorer extends Mixins(StateMixin) {
   handleClick (path: string) {
     const sanitizedPath = path
       .replace('$.', '')
-      .replace(/\.(\w*[^\w\S.]+\w*)/g, (_, match) => {
+      .replace(/\.(\w*\s+\w*)/g, (_, match) => {
         if (isNaN(match)) return `['${match}']`
         return `[${match}]`
       })

src/components/widgets/filesystem/setupMonaco.ts

@@ -172,7 +172,7 @@ async function setupMonaco () {
 
       const sectionBlocks = linesContent
         .reduce((state, lineContent, index) => {
-          const isSection = /^\[([^\]]+)\]/.test(lineContent)
+          const isSection = /^\[[^\]]+\]/.test(lineContent)
 
           if (isSection) {
             state.result.push(state.current = {

src/store/console/actions.ts

@@ -43,7 +43,7 @@ export const actions: ActionTree<ConsoleState, RootState> = {
    * Add a console entry
    */
   async onAddConsoleEntry ({ commit, dispatch }, payload: ConsoleEntry) {
-    payload.message = DOMPurify.sanitize(payload.message).replace(/(?:\r\n|\r|\n)/g, '<br />')
+    payload.message = DOMPurify.sanitize(payload.message).replace(/\r\n|\r|\n/g, '<br />')
     if (!payload.time || payload.time <= 0) {
       payload.time = Date.now() / 1000 | 0
     }
@@ -68,7 +68,7 @@ export const actions: ActionTree<ConsoleState, RootState> = {
         .map((entry, index: number) => {
           entry.message = Globals.CONSOLE_RECEIVE_PREFIX + entry.message
 
-          entry.message = DOMPurify.sanitize(entry.message).replace(/(?:\r\n|\r|\n)/g, '<br />')
+          entry.message = DOMPurify.sanitize(entry.message).replace(/\r\n|\r|\n/g, '<br />')
 
           entry.id = index
 

src/store/console/getters.ts

@@ -2,7 +2,7 @@ import type { GetterTree } from 'vuex'
 import type { ConsoleState, GcodeHelp } from './types'
 import type { RootState } from '../types'
 
-const _tempWaitExpr = /^(?:ok\s+)?(b|t\d+):\d+\.\d+ \/\d+\.+\d+/i
+const _tempWaitExpr = /^(?:ok\s+)?(?:b|t\d+):\d+\.\d+ \/\d+\.+\d+/i
 
 export const getters: GetterTree<ConsoleState, RootState> = {
   /**

src/store/helpers.ts

@@ -9,7 +9,7 @@ export const handleTrinamicDriversChange = (payload: any, state: RootState, disp
     const [type, nameFromSplit] = item.split(' ', 2)
 
     if (
-      /^tmc\d{4}$/.exec(type) &&
+      /^tmc\d{4}$/.test(type) &&
       payload[item]?.drv_status?.otpw != null &&
       state.printer.printer?.[item]?.drv_status?.otpw == null
     ) {

src/store/printer/getters.ts

@@ -39,7 +39,6 @@ export const getters: GetterTree<PrinterState, RootState> = {
   },
 
   getKlippyStateMessage: (state, getters, rootState, rootGetters): string => {
-    const regex = /(?:\r\n|\r|\n)/g
     // If there's absolutely no connection to klipper, then
     // say so.
     const serverInfo = rootGetters['server/getInfo'] as ServerInfo
@@ -54,13 +53,13 @@ export const getters: GetterTree<PrinterState, RootState> = {
       state.printer.info.state_message &&
       state.printer.info.state_message !== ''
     ) {
-      return state.printer.info.state_message.trim().replace(regex, '<br />')
+      return state.printer.info.state_message.trim().replace(/\r\n|\r|\n/g, '<br />')
     }
     if (
       state.printer.webhooks.state_message &&
       state.printer.webhooks.state_message !== ''
     ) {
-      return state.printer.webhooks.state_message.trim().replace(regex, '<br />')
+      return state.printer.webhooks.state_message.trim().replace(/\r\n|\r|\n/g, '<br />')
     }
     return 'Unknown'
   },

src/util/link-external-urls.ts

@@ -1,4 +1,4 @@
-const externalUrlRegExp = /(https?:\/\/[^\s]+)/gi
+const externalUrlRegExp = /(https?:\/\/\S+)/gi
 
 const linkExternalUrls = (text: string) => text.replace(externalUrlRegExp, '<a target="_blank" href="$1">$1</a>')
 

src/workers/parseGcode.ts

@@ -7,7 +7,7 @@ import shlex from 'shlex'
 const getArgsFromGcodeCommandArgs = (gcodeCommandArgs: string) => {
   const args: Record<string, number> = {}
 
-  for (const [, key, value] of gcodeCommandArgs.matchAll(/([a-z])[ \t]*(-?(?:\d+(?:\.\d+)?|\.\d+))/ig)) {
+  for (const [, key, value] of gcodeCommandArgs.matchAll(/([a-z])[ \t]*(-?(?:\d+(?:\.\d+)?|\.\d+))/gi)) {
     args[key.toLowerCase()] = +value
   }
 
@@ -33,7 +33,7 @@ const parseLine = (line: string) => {
     .split(';', 2)[0]
 
   const [, gcodeCommand, gcodeCommandArgs = ''] = clearedLine
-    .split(/^([gm][0-9]+)\s*/i)
+    .split(/^([gm]\d+)\s*/i)
 
   if (gcodeCommand) {
     return {