sugar-high 0.4.3 → 0.4.6

package/README.md

@@ -1,9 +1,14 @@
 # Sugar High
+
+[![Build][build-badge]][build]
+[![Coverage][coverage-badge]][coverage]
+[![Downloads][downloads-badge]][downloads]
+
 ### Introduction
 
 Super lightweight JSX syntax highlighter, around 1KB after minified and gzipped
 
-![img](https://repository-images.githubusercontent.com/453236442/94994be5-72fa-479f-8b87-2dc14fe40329)
+![img](https://repository-images.githubusercontent.com/453236442/1d63a6ff-aa11-422c-a36c-ca16fc102f18)
 
 ### Usage
 
@@ -70,3 +75,16 @@ pre code {
 
 MIT
 
+<!-- Definitions -->
+
+[build-badge]: https://github.com/huozhi/sugar-high/workflows/Test/badge.svg
+
+[build]: https://github.com/huozhi/sugar-high/actions
+
+[coverage-badge]: https://badge.fury.io/js/sugar-high.svg
+
+[coverage]: https://codecov.io/github/huozhi/sugar-high
+
+[downloads-badge]: https://img.shields.io/npm/dm/sugar-high.svg
+
+[downloads]: https://www.npmjs.com/package/sugar-high

package/lib/index.mjs

@@ -3,6 +3,7 @@
 const jsxBrackets = new Set(['<', '>', '{', '}', '[', ']'])
 const keywords = new Set([
   'for',
+  'do',
   'while',
   'if',
   'else',
@@ -52,7 +53,6 @@ const signs = new Set([
   '%',
   '=',
   '!',
-  ...jsxBrackets,
   '&',
   '|',
   '^',
@@ -73,6 +73,7 @@ const signs = new Set([
   '#',
   '@',
   '\\',
+  ...jsxBrackets,
 ])
 
 export const types = [
@@ -126,7 +127,7 @@ function encode(str) {
 }
 
 function isWord(chr) {
-  return /^[\w_]+$/.test(chr)
+  return /^[\w_]+$/.test(chr) || hasUnicode(chr)
 }
 
 function isCls(str) {
@@ -136,8 +137,12 @@ function isCls(str) {
     str === 'null'
 }
 
+function hasUnicode(s) {
+  return /[^\u0000-\u007f]/.test(s);
+}
+
 function isIdentifierChar(chr) {
-  return /^[a-zA-Z_$]$/.test(chr)
+  return /^[a-zA-Z_$]$/.test(chr) || hasUnicode(chr)
 }
 
 function isIdentifier(str) {
@@ -259,27 +264,25 @@ export function tokenize(code) {
       continue
     }
 
-
     if (!inStrTemplateLiterals()) {
-      if (prev !== '\\n' && curr === '`') {
+      if (prev !== '\\n' && isStrTemplateChr(curr)) {
         append()
-        append(T_SIGN, curr)
+        append(T_STRING, curr)
         __strTemplateQuoteStack++
         continue
       }
     }
 
     if (inStrTemplateLiterals()) {
-      if (prev !== '\\n' && curr === '`') {
+      if (prev !== '\\n' && isStrTemplateChr(curr)) {
         if (__strTemplateQuoteStack > 0) {
           append()
           __strTemplateQuoteStack--
-          append(T_SIGN, curr)
+          append(T_STRING, curr)
           continue
         }
       }
 
-
       if (c_n === '${') {
         __strTemplateExprStack++
         append(T_STRING)
@@ -321,7 +324,8 @@ export function tokenize(code) {
       }
       if (__jsxTag) {
         // >: open tag close sign or closing tag closing sign
-        if (curr === '>' && prev !== '/') {
+        // and it's not `=>` or `/>`
+        if (curr === '>' && !'/='.includes(prev)) {
           append()
           if (__jsxTag === 1) {
             __jsxTag = 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.4.3",
+  "version": "0.4.6",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -17,10 +17,10 @@
   },
   "devDependencies": {
     "codice": "^0.0.10",
-    "next": "12.1.6-canary.6",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "next": "canary",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "sugar-high": "link:./",
-    "vitest": "~0.6.0"
+    "vitest": "^0.13.1"
   }
 }