Merge a5dd7d6 into 9f9fbe3

scriptcoded · Oct 24, 2023 · d4970da · d4970da
2 parents 9f9fbe3 + a5dd7d6
commit d4970da
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -59,13 +59,13 @@ document.body.innerHTML += highlighted
 **Output:**
 ```html
 <span class="sql-hl-keyword">SELECT</span>
-<span class="sql-hl-string">`id`</span>
+<span class="sql-hl-identifier">`id`</span>
 <span class="sql-hl-special">,</span>
-<span class="sql-hl-string">`username`</span>
+<span class="sql-hl-identifier">`username`</span>
 <span class="sql-hl-keyword">FROM</span>
-<span class="sql-hl-string">`users`</span>
+<span class="sql-hl-identifier">`users`</span>
 <span class="sql-hl-keyword">WHERE</span>
-<span class="sql-hl-string">`email`</span>
+<span class="sql-hl-identifier">`email`</span>
 <span class="sql-hl-special">=</span>
 <span class="sql-hl-string">'test@example.com'</span>
 ```
@@ -112,22 +112,22 @@ console.log(segments)
 ```js
 [
     { name: 'keyword', content: 'SELECT' },
-    { name: 'default', content: ' ' },
-    { name: 'string', content: '`id`' },
+    { name: 'whitespace', content: ' ' },
+    { name: 'identifier', content: '`id`' },
     { name: 'special', content: ',' },
-    { name: 'default', content: ' ' },
-    { name: 'string', content: '`username`' },
-    { name: 'default', content: ' ' },
+    { name: 'whitespace', content: ' ' },
+    { name: 'identifier', content: '`username`' },
+    { name: 'whitespace', content: ' ' },
     { name: 'keyword', content: 'FROM' },
-    { name: 'default', content: ' ' },
-    { name: 'string', content: '`users`' },
-    { name: 'default', content: ' ' },
+    { name: 'whitespace', content: ' ' },
+    { name: 'identifier', content: '`users`' },
+    { name: 'whitespace', content: ' ' },
     { name: 'keyword', content: 'WHERE' },
-    { name: 'default', content: ' ' },
-    { name: 'string', content: '`email`' },
-    { name: 'default', content: ' ' },
+    { name: 'whitespace', content: ' ' },
+    { name: 'identifier', content: '`email`' },
+    { name: 'whitespace', content: ' ' },
     { name: 'special', content: '=' },
-    { name: 'default', content: ' ' },
+    { name: 'whitespace', content: ' ' },
     { name: 'string', content: "'test@example.com'" }
 ]
 ```

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -8,6 +8,7 @@ declare module 'sql-highlight' {
       function: string;
       number: string;
       string: string;
+      identifier: string;
       special: string;
       bracket: string;
       comment: string;

diff --git a/lib/index.js b/lib/index.js
@@ -12,20 +12,19 @@ const DEFAULT_OPTIONS = {
     function: '\x1b[31m',
     number: '\x1b[32m',
     string: '\x1b[32m',
+    identifier: '\x1b[0m',
     special: '\x1b[33m',
     bracket: '\x1b[33m',
     comment: '\x1b[2m\x1b[90m',
     clear: '\x1b[0m'
   }
 }
 
-const DEFAULT_KEYWORD = 'default'
-
 const highlighters = [
   /\b(?<number>\d+(?:\.\d+)?)\b/,
 
   // Note: Repeating string escapes like 'sql''server' will also work as they are just repeating strings
-  /(?<string>'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*`)/,
+  /(?<string>'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/,
 
   /(?<comment>--[^\n\r]*|#[^\n\r]*|\/\*(?:[^*]|\*(?!\/))*\*\/)/,
 
@@ -34,54 +33,29 @@ const highlighters = [
 
   /(?<bracket>[()])/,
 
-  /(?<special>!=|[=%*/\-+,;:<>])/
-]
+  /(?<special>!=|[=%*/\-+,;:<>.])/,
 
-function getRegexString (regex) {
-  const str = regex.toString()
-  return str.replace(/^\/|\/\w*$/g, '')
-}
+  /(?<identifier>\b\w+\b|`(?:[^`\\]|\\.)*`)/,
+
+  /(?<whitespace>\s+)/,
+
+  /(?<unknown>\.+?)/
+]
 
-// Regex of the shape /(.*?)|((?<token1>...)|(?<token2>...)|...|$)/y
+// Regex of the shape /(?<token1>...)|(?<token2>...)|.../g
 const tokenizer = new RegExp(
-  '(.*?)(' +
-  '\\b(?<keyword>' + keywords.join('|') + ')\\b|' +
-  highlighters.map(getRegexString).join('|') +
-  '|$)', // $ needed to to match "default" till the end of string
-  'isy'
+  [
+    '\\b(?<keyword>' + keywords.join('|') + ')\\b',
+    ...highlighters.map(regex => regex.source)
+  ].join('|'),
+  'gis'
 )
 
 function getSegments (sqlString) {
-  const segments = []
-  let match
-
-  // Reset the starting position
-  tokenizer.lastIndex = 0
-
-  // This is probably the one time when an assignment inside a condition makes sense
-  // eslint-disable-next-line no-cond-assign
-  while (match = tokenizer.exec(sqlString)) {
-    if (match[1]) {
-      segments.push({
-        name: DEFAULT_KEYWORD,
-        content: match[1]
-      })
-    }
-
-    if (match[2]) {
-      const name = Object.keys(match.groups).find(key => match.groups[key])
-      segments.push({
-        name,
-        content: match.groups[name]
-      })
-    }
-
-    // Stop at the end of string
-    if (match.index + match[0].length >= sqlString.length) {
-      break
-    }
-  }
-
+  const segments = Array.from(sqlString.matchAll(tokenizer), match => ({
+    name: Object.keys(match.groups).find(key => match.groups[key]),
+    content: match[0]
+  }))
   return segments
 }
 
@@ -90,14 +64,14 @@ function highlight (sqlString, options) {
 
   return getSegments(sqlString)
     .map(({ name, content }) => {
-      if (name === DEFAULT_KEYWORD) {
-        return content
-      }
       if (options.html) {
         const escapedContent = options.htmlEscaper(content)
-        return `<span class="${options.classPrefix}${name}">${escapedContent}</span>`
+        return name === 'whitespace' ? escapedContent : `<span class="${options.classPrefix}${name}">${escapedContent}</span>`
+      }
+      if (options.colors[name]) {
+        return options.colors[name] + content + options.colors.clear
       }
-      return options.colors[name] + content + options.colors.clear
+      return content
     })
     .join('')
 }