sugar-high 0.4.0 → 0.4.1

package/lib/index.mjs

@@ -172,8 +172,9 @@ export function tokenize(code) {
   // jsx.close for is the closing sign of open or close tags
   // jsx.child for entering children
   // jsx.expr for entering {expression}
-  /** @type {{ tag: boolean; close: boolean; child: boolean; expr: boolean }} */
-  const jsx = { tag: false, close: false, child: false, expr: false }
+  // jsx.end for entering close tag
+  /** @type {{ tag: boolean; close: boolean; child: boolean; expr: boolean; end: boolean }} */
+  const jsx = { tag: false, close: false, child: false, expr: false, end: false }
 
   const inJsxTag = () => jsx.tag || jsx.close
   const inJsxLiterals = () => !inJsxTag() && jsx.child && !jsx.expr
@@ -185,19 +186,19 @@ export function tokenize(code) {
    */
   function classify(token) {
     if (keywords.has(token)) {
-      return T_KEYWORD
+      return last[1] === '.' ? T_IDENTIFIER : T_KEYWORD
     } else if (token === '\n') {
       return T_BREAK
     } else if (isSpaces(token)) {
       return T_SPACE
     } else if (token.split('').every(ch => signs.has(ch))) {
       return T_SIGN
+    } else if (inJsxLiterals()) {
+      return T_JSX_LITERALS
     } else if (isCls(token)) {
-      return inJsxLiterals() ? T_JSX_LITERALS : inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER
+      return inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER
     } else {
-      return inJsxLiterals()
-        ? T_JSX_LITERALS
-        : isIdentifier(token) ? T_IDENTIFIER : T_STRING
+      return isIdentifier(token) ? T_IDENTIFIER : T_STRING
     }
   }
 
@@ -224,12 +225,21 @@ export function tokenize(code) {
     if (jsx.close && (last[1] === '>' || last[1] === '/>')) {
       jsx.close = false
     }
+
+    if (!jsx.tag && (c_n === '</' || c_n === '/>')) {
+      jsx.end = true
+    }
+
     if (jsx.tag) {
       const isOpenElementEnd = curr === '>'
       const isCloseElementEnd = p_c === '/>'
-      jsx.child = !isCloseElementEnd
+      jsx.child = !jsx.end && (isOpenElementEnd && !isCloseElementEnd)
+
       jsx.tag = !(isOpenElementEnd || isCloseElementEnd)
       jsx.close = isOpenElementEnd || isCloseElementEnd
+      if (jsx.end && (isCloseElementEnd || isOpenElementEnd)) {
+        jsx.end = false
+      }
     }
     // if it's not in a jsx tag declaration or a string, close child if next is jsx close tag
     if (!jsx.tag && (curr === '<' && isIdentifierChar(next) || c_n === '</')) {
@@ -243,13 +253,13 @@ export function tokenize(code) {
       append()
       const [lastType, lastToken] = last
       // Special cases that are not considered as regex:
-      // * (expr1) / expr2: `()` before `/` operator is still in expression
+      // * (expr1) / expr2: `)` before `/` operator is still in expression
       // * <non comment start>/ expr: non comment start before `/` is not regex
       if (
         isRegexChar &&
         lastType &&
         !(
-          (lastType === T_SIGN && !'()'.includes(lastToken)) ||
+          (lastType === T_SIGN && ')' !== lastToken) ||
           lastType === T_COMMENT
         )
       ) {
@@ -324,16 +334,18 @@ export function tokenize(code) {
       }
     } else {
       if (
+        // it's jsx literals and is not a jsx bracket
         (isJsxLiterals && !jsxBrackets.has(curr)) ||
+        // same type char as previous one in current token
         isWord(curr) === isWord(current[current.length - 1]) &&
         !signs.has(curr)
       ) {
         current += curr
         if (next === '<') {
-          append();
+          append(T_JSX_LITERALS);
         }
       } else {
-        append()
+        append(c_n === '</' ? T_JSX_LITERALS : undefined)
         current = curr
         if (c_n === '</' || c_n === '/>') {
           current = c_n

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -16,9 +16,11 @@
     "build": "next build docs"
   },
   "devDependencies": {
-    "next": "12.1.4",
+    "codice": "^0.0.3",
+    "next": "12.1.6-canary.6",
     "react": "18.0.0",
     "react-dom": "18.0.0",
+    "sugar-high": "link:./",
     "vitest": "~0.6.0"
   }
 }