sugar-high 0.7.5 → 0.8.1

package/lib/index.d.ts

@@ -1,3 +1,15 @@
-export function highlight(code: string): string
-export function tokenize(code: string): Array<[number, string]>
+type HighlightOptions = {
+  keywords?: Set<string>
+  onCommentStart?: (curr: string, next: string) => number | boolean
+  onCommentEnd?: (curr: string, prev: string) => number | boolean
+}
+
+export function highlight(code: string, options?: HighlightOptions): string
+export function tokenize(code: string, options?: HighlightOptions): Array<[number, string]>
 export function generate(tokens: Array<[number, string]>): Array<any>
+export const SugarHigh: {
+  TokenTypes: {
+    [key: number]: string
+  }
+  TokenMap: Map<string, number>
+}

package/lib/index.js

@@ -1,7 +1,7 @@
 // @ts-check
 
-const jsxBrackets = new Set(['<', '>', '{', '}', '[', ']'])
-const keywords = new Set([
+const JSXBrackets = new Set(['<', '>', '{', '}', '[', ']'])
+const Keywords_Js = new Set([
   'for',
   'do',
   'while',
@@ -45,7 +45,7 @@ const keywords = new Set([
   'static',
 ])
 
-const signs = new Set([
+const Signs = new Set([
   '+',
   '-',
   '*',
@@ -73,9 +73,14 @@ const signs = new Set([
   '#',
   '@',
   '\\',
-  ...jsxBrackets,
+  ...JSXBrackets,
 ])
 
+const DefaultOptions = {
+  keywords: Keywords_Js,
+  onCommentStart: isCommentStart_Js,
+  onCommentEnd: isCommentEnd_Js,
+}
 
 /**
  *
@@ -92,7 +97,7 @@ const signs = new Set([
  * 10 - space
  *
  */
-const types = /** @type {const} */ ([
+const TokenTypes = /** @type {const} */ ([
   'identifier',
   'keyword',
   'string',
@@ -117,14 +122,14 @@ const [
   T_COMMENT,
   T_BREAK,
   T_SPACE,
-] = /** @types {const} */ types.map((_, i) => i)
+] = /** @types {const} */ TokenTypes.map((_, i) => i)
 
 function isSpaces(str) {
   return /^[^\S\r\n]+$/g.test(str)
 }
 
 function isSign(ch) {
-  return signs.has(ch)
+  return Signs.has(ch)
 }
 
 function encode(str) {
@@ -175,20 +180,31 @@ function isStringQuotation(chr) {
   return isSingleQuotes(chr) || isStrTemplateChr(chr)
 }
 
-function isCommentStart(str) {
-  str = str.slice(0, 2)
+function isCommentStart_Js(curr, next) {
+  const str = curr + next
   return str === '//' || str === '/*'
 }
 
+function isCommentEnd_Js(prev, curr) {
+  return curr === '\n' || (prev + curr) === '*/'
+}
+
 function isRegexStart(str) {
-  return str[0] === '/' && !isCommentStart(str[0] + str[1])
+  return str[0] === '/' && !isCommentStart_Js(str[0], str[1])
 }
 
 /**
  * @param {string} code
+ * @param {{ keywords: Set<string> }} options
  * @return {Array<[number, string]>}
  */
-function tokenize(code) {
+function tokenize(code, options) {
+  const {
+    keywords,
+    onCommentStart,
+    onCommentEnd,
+  } = { ...DefaultOptions, ...options }
+  
   let current = ''
   let type = -1
   /** @type {[number, string]} */
@@ -284,7 +300,7 @@ function tokenize(code) {
    */
   const append = (type_, token_) => {
     if (type_ || token_) {
-      const nType = types[type_]
+      const nType = TokenTypes[type_]
     }
     if (token_) {
       current = token_
@@ -536,13 +552,16 @@ function tokenize(code) {
         append()
         i = start
       }
-    } else if (isCommentStart(c_n)) {
+    } else if (onCommentStart(curr, next)) {
       append()
       const start = i
-      if (next === '/') {
-        for (; i < code.length && code[i] !== '\n'; i++);
-      } else {
-        for (; i < code.length && code[i - 1] + code[i] !== '*/'; i++);
+      const commentType = onCommentStart(curr, next)
+
+      // just match the comment, commentType === true
+      // inline comment, commentType === 1
+      // block comment, commentType === 2
+      if (commentType) {
+        for (; i < code.length && !onCommentEnd(code[i - 1], code[i]); i++);
       }
       current = code.slice(start, i + 1)
       append(T_COMMENT)
@@ -571,9 +590,9 @@ function tokenize(code) {
         __jsxExpr = false
       } else if (
         // it's jsx literals and is not a jsx bracket
-        (isJsxLiterals && !jsxBrackets.has(curr)) ||
+        (isJsxLiterals && !JSXBrackets.has(curr)) ||
         // same type char as previous one in current token
-        ((isWord(curr) === isWord(current[current.length - 1]) || __jsxChild()) && !signs.has(curr))
+        ((isWord(curr) === isWord(current[current.length - 1]) || __jsxChild()) && !Signs.has(curr))
       ) {
         current += curr
       } else {
@@ -591,7 +610,7 @@ function tokenize(code) {
           append()
           i++
         }
-        else if (jsxBrackets.has(curr)) append()
+        else if (JSXBrackets.has(curr)) append()
       }
     }
   }
@@ -638,8 +657,8 @@ function generate(tokens) {
               value: value, // to encode
             }],
             properties: {
-              className: `sh__token--${types[type]}`,
-              style: `color: var(--sh-${types[type]})`,
+              className: `sh__token--${TokenTypes[type]}`,
+              style: `color: var(--sh-${TokenTypes[type]})`,
             },
           }
         ))
@@ -700,10 +719,11 @@ function toHtml(lines) {
 /**
  *
  * @param {string} code
+ * @param {{ keywords: Set<string> } | undefined} options
  * @returns {string}
  */
-function highlight(code) {
-  const tokens = tokenize(code)
+function highlight(code, options) {
+  const tokens = tokenize(code, options)
   const lines = generate(tokens)
   const output = toHtml(lines)
   return output
@@ -711,8 +731,8 @@ function highlight(code) {
 
 // namespace
 const SugarHigh = /** @type {const} */ {
-  TokenTypes: types,
-  TokenMap: new Map(types.map((type, i) => [type, i])),
+  TokenTypes,
+  TokenMap: new Map(TokenTypes.map((type, i) => [type, i])),
 }
 
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.7.5",
+  "version": "0.8.1",
   "type": "module",
   "types": "./lib/index.d.ts",
   "exports": {
@@ -19,9 +19,9 @@
   },
   "devDependencies": {
     "codice": "^0.2.0",
-    "next": "15.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "next": "15.1.3",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "sugar-high": "link:./",
     "vitest": "^2.1.3"
   },