Improved keyword matching

scriptcoded · scriptcoded · commit 7cae738585ab · 2020-04-23T15:59:01.000+02:00
Updated keyword regex to support repeated keywords
diff --git a/index.js b/index.js
@@ -16,12 +16,12 @@ const DEFAULT_OPTIONS = {
 }
 const clearStyle = '\x1b[0m'
 
-const SPLIT_CHARS = '(^|[^a-zA-Z_])'
+const SPLIT_CHARS = '[^a-zA-Z_]'
 
 const highlighters = [
   {
     name: 'keyword',
-    regex: new RegExp(`${SPLIT_CHARS}(?:${keywords.join('|')})${SPLIT_CHARS}`, 'g')
+    regex: new RegExp(`(?:^|${SPLIT_CHARS})(?:${keywords.join('|')})(?=${SPLIT_CHARS})`, 'g')
   },
   {
     name: 'special',
diff --git a/test/index.js b/test/index.js
@@ -7,3 +7,4 @@ const { highlight } = require('../index')
 
 console.log(highlight("SELECT COUNT(id), COUNT(id), `id`, `username` FROM `users` WHERE `email` = 'test@example.com' AND `something` = 'oke' AND 1=1"))
 console.log(highlight('SELECT "users".* FROM "users"'))
+console.log(highlight(`select "users".* from "users" where ("username" = 'test' or "email" = 'test') and "is_admin" = true and "is_banned" = false limit 1`))

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ const DEFAULT_OPTIONS = {`
`16`	`16`	`}`
`17`	`17`	`const clearStyle = '\x1b[0m'`
`18`	`18`
`19`		`-const SPLIT_CHARS = '(^\|[^a-zA-Z_])'`
	`19`	`+const SPLIT_CHARS = '[^a-zA-Z_]'`
`20`	`20`
`21`	`21`	`const highlighters = [`
`22`	`22`	`{`
`23`	`23`	`name: 'keyword',`
`24`		- regex: new RegExp(`${SPLIT_CHARS}(?:${keywords.join('\|')})${SPLIT_CHARS}`, 'g')
	`24`	+ regex: new RegExp(`(?:^\|${SPLIT_CHARS})(?:${keywords.join('\|')})(?=${SPLIT_CHARS})`, 'g')
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`name: 'special',`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,4 @@ const { highlight } = require('../index')`
`7`	`7`
`8`	`8`	console.log(highlight("SELECT COUNT(id), COUNT(id), `id`, `username` FROM `users` WHERE `email` = '[email protected]' AND `something` = 'oke' AND 1=1"))
`9`	`9`	`console.log(highlight('SELECT "users".* FROM "users"'))`
	`10`	+console.log(highlight(`select "users".* from "users" where ("username" = 'test' or "email" = 'test') and "is_admin" = true and "is_banned" = false limit 1`))