sugar-high 0.0.7 → 0.0.8

package/lib/index.mjs

@@ -163,8 +163,11 @@ export function tokenize(code) {
   /** @type {{ tag: boolean; child: boolean; expr: boolean }} */
   const jsx = { tag: false, child: false, expr: false }
 
+  const inJsxLiterals = () => !jsx.tag && jsx.child && !jsx.expr
+
   function classify(token) {
-    if (isCommentStart(token[0] + token[1])) {
+    const [chr0, chr1] = [token[0], token[1]]
+    if (isCommentStart(chr0 + chr1)) {
       return T_COMMENT
     } else if (keywords.has(token)) {
       return T_KEYWORD
@@ -173,19 +176,23 @@ export function tokenize(code) {
     } else if (
        (
         // is quoted string
-        (isStringQuotation(token[0]) && !isStringQuotation(token[1])) ||
+        (isStringQuotation(chr0) && !isStringQuotation(chr1)) ||
         // is regex
-        (!jsx.tag && isRegexStart(token[0] + token[1]) && token[token.length - 1] === '/')
+        (!jsx.tag && isRegexStart(chr0 + chr1) && token[token.length - 1] === '/')
       )
     ) {
       return T_STRING
     } else if (token === ' ') {
       return T_SPACE
-    } else if (signs.has(token[0])) {
+    } else if (signs.has(chr0)) {
       return T_SIGN
     } else if (
-      token[0] === token[0].toUpperCase() ||
-      token === 'null'
+      !inJsxLiterals() && 
+      (
+        isIdentifierChar(chr0) &&
+        chr0 === chr0.toUpperCase() ||
+        token === 'null'
+      )
     ) {
       return T_CLS_NUMBER
     } else {
@@ -205,8 +212,8 @@ export function tokenize(code) {
     const prev = code[i - 1]
     const next = code[i + 1]
     const c_n = curr + next // current and next
-    const p_c = prev + curr // previous and current
-    const isJsxLiterals = !jsx.tag && jsx.child && !jsx.expr
+    const p_c = prev + curr // previous and current    
+    const isJsxLiterals = inJsxLiterals()
 
     if (jsx.tag) {
       const isOpenElementEnd = curr === '>' 
@@ -219,13 +226,6 @@ export function tokenize(code) {
       jsx.tag = true
       jsx.child = false
     }
-    
-    if (jsx.child && curr === '{') {
-      jsx.expr = true
-    }
-    if (jsx.child && jsx.expr && curr === '}') {
-      jsx.expr = false
-    }
 
     if (
       !string.entered && 
@@ -296,6 +296,13 @@ export function tokenize(code) {
         else if (jsxBrackets.has(curr)) append()
       }
     }
+
+    if (jsx.child && curr === '{') {
+      jsx.expr = true
+    }
+    if (jsx.child && jsx.expr && curr === '}') {
+      jsx.expr = false
+    }
   }
 
   append()

package/package.json

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