sugar-high 0.9.3 → 0.9.5

package/README.md

@@ -97,9 +97,9 @@ 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.
+[Remark.js](https://remark.js.org/) is a powerful markdown processor, you can use the [sugar-high remark plugin](https://sugar-high.vercel.app/remark) with remark.js to highlight code blocks in markdown.
 
-Check out the [documentation](https://remark-sugar-high.vercel.app/) for more details.
+Check out the [readme](https://github.com/huozhi/sugar-high/tree/main/packages/remark-sugar-high) for more details.
 
 ### LICENSE
 

package/lib/index.js

@@ -275,7 +275,7 @@ function tokenize(code, options) {
     if (isJsxLiterals) return T_JSX_LITERALS
 
     // Determine strings first before other types
-    if (inStringQuotes()) {
+    if (inStringQuotes() || inStrTemplateLiterals()) {
       return T_STRING
     } else if (keywords.has(token)) {
       return last[1] === '.' ? T_IDENTIFIER : T_KEYWORD
@@ -326,9 +326,9 @@ function tokenize(code, options) {
     const p_c = prev + curr // previous and current
     const c_n = curr + next // current and next
 
-    // Determine string quotation outside of jsx literals.
-    // Inside jsx literals, string quotation is still part of it.
-    if (isSingleQuotes(curr) && !inJsxLiterals()) {
+    // Determine string quotation outside of jsx literals and template literals.
+    // Inside jsx literals or template literals, string quotation is still part of it.
+    if (isSingleQuotes(curr) && !inJsxLiterals() && !inStrTemplateLiterals()) {
       append()
       if (prev !== `\\`) {
         if (__strQuote && curr === __strQuote) {
@@ -599,6 +599,8 @@ function tokenize(code, options) {
       } else if (
         // it's jsx literals and is not a jsx bracket
         (isJsxLiterals && !JSXBrackets.has(curr)) ||
+        // it's template literal content (including quotes)
+        inStrTemplateLiterals() ||
         // same type char as previous one in current token
         ((isWord(curr) === isWord(current[current.length - 1]) || __jsxChild()) && !Signs.has(curr))
       ) {
@@ -676,9 +678,13 @@ function generate(tokens) {
   }
   /** @type {Array<[number, string]>} */
   const lineTokens = []
+  let lastWasBreak = false
+  
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i]
     const [type, value] = token
+    const isLastToken = i === tokens.length - 1
+    
     if (type !== T_BREAK) {
       // Divide multi-line token into multi-line code
       if (value.includes('\n')) {
@@ -693,15 +699,30 @@ function generate(tokens) {
       } else {
         lineTokens.push(token)
       }
+      lastWasBreak = false
     } else {
-      lineTokens.push([type, ''])
-      flushLine(lineTokens)
-      lineTokens.length = 0
+      if (lastWasBreak) {
+        // Consecutive break - create empty line
+        flushLine([])
+      } else {
+        // First break after content - flush current line
+        flushLine(lineTokens)
+        lineTokens.length = 0
+      }
+      
+      // If this is the last token and it's a break, create an empty line
+      if (isLastToken) {
+        flushLine([])
+      }
+      
+      lastWasBreak = true
     }
   }
 
-  if (lineTokens.length)
+  // Flush remaining tokens if any
+  if (lineTokens.length) {
     flushLine(lineTokens)
+  }
 
   return lines
 }
@@ -737,7 +758,12 @@ function toHtml(lines) {
 /**
  *
  * @param {string} code
- * @param {{ keywords: Set<string> } | undefined} options
+ * @param {
+ * {
+ *   keywords: Set<string>
+ *   onCommentStart?: (curr: string, next: string) => number | boolean
+ *   onCommentEnd?: (curr: string, prev: string) => number | boolean
+ * } | undefined} options
  * @returns {string}
  */
 function highlight(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "type": "module",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
@@ -19,25 +19,14 @@
     "lib"
   ],
   "license": "MIT",
-  "scripts": {
-    "test": "vitest",
-    "dev": "next dev docs",
-    "build": "next build docs"
-  },
   "devDependencies": {
-    "@types/node": "22.10.7",
-    "@types/react": "19.0.7",
-    "codice": "^1.3.1",
-    "dom-to-image": "^2.6.0",
-    "next": "15.1.5",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "sugar-high": "link:./",
+    "@types/node": "22.12.0",
     "typescript": "5.7.3",
     "vitest": "^3.0.2"
   },
-  "resolutions": {
-    "sugar-high": "link:./"
-  },
-  "packageManager": "pnpm@8.7.1"
-}
+  "packageManager": "pnpm@8.7.1",
+  "scripts": {
+    "test": "vitest",
+    "build": "echo 'package requires no build'"
+  }
+}