sugar-high 0.8.0 → 0.8.2

package/README.md

@@ -96,6 +96,12 @@ You can use `.sh__token--<token type>` to customize the output node of each toke
 }
 ```
 
+### Use With Remark.js
+
+[Remark.js](https://remark.js.org/) is a powerful markdown processor, you can use the [sugar-high remark plugin](https://remark-sugar-high.vercel.app/) with remark.js to highlight code blocks in markdown.
+
+Check out the [documentation](https://remark-sugar-high.vercel.app/) for more details.
+
 ### LICENSE
 
 MIT

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 type HighlightOptions = {
   keywords?: Set<string>
-  onCommentStart?: (curr: string, next: string) => boolean
+  onCommentStart?: (curr: string, next: string) => number | boolean
+  onCommentEnd?: (curr: string, prev: string) => number | boolean
 }
 
 export function highlight(code: string, options?: HighlightOptions): string

package/lib/index.js

@@ -79,6 +79,7 @@ const Signs = new Set([
 const DefaultOptions = {
   keywords: Keywords_Js,
   onCommentStart: isCommentStart_Js,
+  onCommentEnd: isCommentEnd_Js,
 }
 
 /**
@@ -179,9 +180,18 @@ function isStringQuotation(chr) {
   return isSingleQuotes(chr) || isStrTemplateChr(chr)
 }
 
+/** @returns {0|1|2}  */
 function isCommentStart_Js(curr, next) {
   const str = curr + next
-  return str === '//' || str === '/*'
+  if (str === '/*') return 2
+  return str === '//' ? 1 : 0
+}
+
+/** @returns {0|1|2}  */
+function isCommentEnd_Js(prev, curr) {
+  return (prev + curr) === '*/'
+    ? 2
+    : curr === '\n' ? 1 : 0
 }
 
 function isRegexStart(str) {
@@ -197,6 +207,7 @@ function tokenize(code, options) {
   const {
     keywords,
     onCommentStart,
+    onCommentEnd,
   } = { ...DefaultOptions, ...options }
   
   let current = ''
@@ -464,9 +475,19 @@ function tokenize(code, options) {
           if (isIdentifier(prop)) {
             current = prop
             append(T_PROPERTY)
+          } else if (prop === ' ') {
+            current = prop
+            append(T_SPACE)
           }
           continue
         }
+
+        // if (curr === ' ' || isSign(curr)) {
+        //   append()
+        //   current = curr
+        //   append()
+        //   continue
+        // }
       }
     }
 
@@ -549,10 +570,16 @@ function tokenize(code, options) {
     } 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 startCommentType = onCommentStart(curr, next)
+
+      // just match the comment, commentType === true
+      // inline comment, commentType === 1
+      // block comment, commentType === 2
+      if (startCommentType) {
+        for (; i < code.length; i++) {
+          const endCommentType = onCommentEnd(code[i - 1], code[i])
+          if (endCommentType == startCommentType) break
+        }
       }
       current = code.slice(start, i + 1)
       append(T_COMMENT)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "type": "module",
   "types": "./lib/index.d.ts",
   "exports": {
@@ -18,12 +18,15 @@
     "build": "next build docs"
   },
   "devDependencies": {
-    "codice": "^0.2.0",
-    "next": "15.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "@types/node": "22.10.7",
+    "@types/react": "19.0.7",
+    "codice": "^0.4.2",
+    "next": "15.1.5",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "sugar-high": "link:./",
-    "vitest": "^2.1.3"
+    "typescript": "5.7.3",
+    "vitest": "^3.0.2"
   },
   "packageManager": "pnpm@8.7.1"
 }