sugar-high 0.5.1 → 0.5.3

package/README.md

@@ -2,7 +2,6 @@
 
 [![Build][build-badge]][build]
 [![Coverage][coverage-badge]][coverage]
-[![Downloads][downloads-badge]][downloads]
 
 ### Introduction
 

package/lib/index.mjs

@@ -117,6 +117,10 @@ function isSpaces(str) {
   return /^[^\S\r\n]+$/g.test(str)
 }
 
+function isSign(ch) {
+  return signs.has(ch)
+}
+
 function encode(str) {
   return str
     .replace(/&/g, '&')
@@ -190,6 +194,7 @@ function tokenize(code) {
   let __jsxEnter = false
   /**
    * @type {0 | 1 | 2}
+   * @example
    * 0 for not in jsx;
    * 1 for open jsx tag;
    * 2 for closing jsx tag;
@@ -218,19 +223,26 @@ function tokenize(code) {
    */
   function classify(token) {
     const isLineBreak = token === '\n'
+    // First checking if they're attributes values
     if (inJsxTag() && inStringQuotes()) {
       return T_STRING
     }
+    // Then determine if they're jsx literals
     const isJsxLiterals = inJsxLiterals()
     if (isJsxLiterals) {
       return T_JSX_LITERALS
+
+    }
+    // Determine strings first before other types
+    if (inStringQuotes()) {
+      return T_STRING
     } else if (keywords.has(token)) {
       return last[1] === '.' ? T_IDENTIFIER : T_KEYWORD
     } else if (isLineBreak) {
       return T_BREAK
     } else if (isSpaces(token)) {
       return T_SPACE
-    } else if (token.split('').every(ch => signs.has(ch))) {
+    } else if (token.split('').every(isSign)) {
       return T_SIGN
     } else if (isCls(token)) {
       return inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER
@@ -345,7 +357,8 @@ function tokenize(code) {
       if (__jsxTag) {
         // >: open tag close sign or closing tag closing sign
         // and it's not `=>` or `/>`
-        if (curr === '>' && !'/='.includes(prev)) {
+        // `curr` could be `>` or `/`
+        if ((curr === '>' && !'/='.includes(prev))) {
           append()
           if (__jsxTag === 1) {
             __jsxTag = 0
@@ -361,15 +374,20 @@ function tokenize(code) {
         // >: tag self close sign or close tag sign
         if (c_n === '/>' || c_n === '</') {
           // if current token is not part of close tag sign, push it first
-          if (current !== '<' || current !== '<') {
+          if (current !== '<' && current !== '/') {
             append()
           }
+
           if (c_n === '/>') {
             __jsxTag = 0
           } else {
             // is '</'
             __jsxStack--
           }
+
+          if (!__jsxStack)
+            __jsxEnter = false
+
           current = c_n
           i++
           append(T_SIGN)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -16,8 +16,8 @@
     "build": "next build docs"
   },
   "devDependencies": {
-    "codice": "^0.0.10",
-    "next": "13.4.20-canary.23",
+    "codice": "^0.2.0",
+    "next": "13.4.20-canary.31",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sugar-high": "link:./",