sugar-high 0.5.0 → 0.5.2

package/lib/index.mjs

@@ -141,8 +141,12 @@ function hasUnicode(s) {
   return /[^\u0000-\u007f]/.test(s);
 }
 
+function isAlpha(chr) {
+  return /^[a-zA-Z]$/.test(chr)
+}
+
 function isIdentifierChar(chr) {
-  return /^[a-zA-Z_$]$/.test(chr) || hasUnicode(chr)
+  return isAlpha(chr) || hasUnicode(chr)
 }
 
 function isIdentifier(str) {
@@ -182,12 +186,13 @@ function tokenize(code) {
   /** @type {Array<[number, string]>} */
   const tokens = []
 
+  /** @type boolean if entered jsx tag, inside <open tag> or </close tag> */
   let __jsxEnter = false
   /**
    * @type {0 | 1 | 2}
-   * 0 for not in jsx
-   * 1 for open jsx tag
-   * 2 for closing jsx tag
+   * 0 for not in jsx;
+   * 1 for open jsx tag;
+   * 2 for closing jsx tag;
    **/
   let __jsxTag = 0
   let __jsxExpr = false
@@ -212,15 +217,23 @@ function tokenize(code) {
    * @returns {number}
    */
   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 (token === '\n') {
+    } else if (isLineBreak) {
       return T_BREAK
     } else if (isSpaces(token)) {
       return T_SPACE
@@ -320,14 +333,18 @@ function tokenize(code) {
 
     if (__jsxEnter) {
       // <: open tag sign
+      // new '<' not inside jsx
       if (!__jsxTag && curr === '<') {
         append()
-        __jsxTag = 1
-        current = curr
         if (next === '/') {
+          // close tag
           __jsxTag = 2
           current = c_n
           i++
+        } else {
+          // open tag
+          __jsxTag = 1
+          current = curr
         }
         append(T_SIGN)
         continue
@@ -350,11 +367,14 @@ function tokenize(code) {
 
         // >: tag self close sign or close tag sign
         if (c_n === '/>' || c_n === '</') {
-          append()
+          // if current token is not part of close tag sign, push it first
+          if (current !== '<' || current !== '<') {
+            append()
+          }
           if (c_n === '/>') {
             __jsxTag = 0
-          }
-          if (c_n === '</') {
+          } else {
+            // is '</'
             __jsxStack--
           }
           current = c_n
@@ -377,7 +397,8 @@ function tokenize(code) {
     if (!__jsxTag && (curr === '<' && isIdentifierChar(next) || c_n === '</')) {
       __jsxTag = next === '/' ? 2 : 1
 
-      if (curr === '<' && next !== '/') {
+      // current and next char can form a jsx open or close tag
+      if (curr === '<' && (next === '/' || isAlpha(next))) {
         __jsxEnter = true
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",