sugar-high 0.4.2 → 0.4.3

package/lib/index.mjs

@@ -144,8 +144,16 @@ function isIdentifier(str) {
   return isIdentifierChar(str[0]) && (str.length === 1 || isWord(str.slice(1)))
 }
 
+function isStrTemplateChr(chr) {
+  return chr === '`'
+}
+
+function isSingleQuotes(chr) {
+  return chr === '"' || chr === "'"
+}
+
 function isStringQuotation(chr) {
-  return chr === '"' || chr === "'" || chr === '`'
+  return isSingleQuotes(chr) || isStrTemplateChr(chr)
 }
 
 function isCommentStart(str) {
@@ -184,6 +192,13 @@ export function tokenize(code) {
   const inJsxTag = () => __jsxTag && !__jsxChild()
   const inJsxLiterals = () => !__jsxTag && __jsxChild() && !__jsxExpr && __jsxStack > 0
 
+  /** @type {string | 0} */
+  let __strQuote = 0
+  let __strTemplateExprStack = 0
+  let __strTemplateQuoteStack = 0
+  const inStrTemplateLiterals = () => (__strTemplateQuoteStack > __strTemplateExprStack)
+  const inStrTemplateExpr = () => __strTemplateQuoteStack > 0 && (__strTemplateQuoteStack === __strTemplateExprStack)
+
   /**
    *
    * @param {string} token
@@ -204,11 +219,14 @@ export function tokenize(code) {
     } else if (isCls(token)) {
       return inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER
     } else {
-      return isIdentifier(token) ? T_IDENTIFIER : T_STRING
+      return isIdentifier(token) && !inStrTemplateLiterals() && (__strQuote !== `"` && __strQuote !== `'`) ? T_IDENTIFIER : T_STRING
     }
   }
 
-  const append = (_type) => {
+  const append = (_type, _token) => {
+    if (_token) {
+      current = _token
+    }
     if (current) {
       type = _type || classify(current)
       /** @type [number, string]  */
@@ -227,12 +245,61 @@ export function tokenize(code) {
     const p_c = prev + curr // previous and current
     const c_n = curr + next // current and next
 
+    if (isSingleQuotes(curr)) {
+      append()
+      if (prev !== `\\`) {
+        if (__strQuote && curr === __strQuote) {
+          __strQuote = 0
+        } else if (!__strQuote) {
+          __strQuote = curr
+        }
+      }
+
+      append(T_STRING, curr)
+      continue
+    }
+
+
+    if (!inStrTemplateLiterals()) {
+      if (prev !== '\\n' && curr === '`') {
+        append()
+        append(T_SIGN, curr)
+        __strTemplateQuoteStack++
+        continue
+      }
+    }
+
+    if (inStrTemplateLiterals()) {
+      if (prev !== '\\n' && curr === '`') {
+        if (__strTemplateQuoteStack > 0) {
+          append()
+          __strTemplateQuoteStack--
+          append(T_SIGN, curr)
+          continue
+        }
+      }
+
+
+      if (c_n === '${') {
+        __strTemplateExprStack++
+        append(T_STRING)
+        append(T_SIGN, c_n)
+        i++
+        continue
+      }
+    }
+
+    if (inStrTemplateExpr() && curr === '}') {
+      append()
+      __strTemplateExprStack--
+      append(T_SIGN, curr)
+      continue
+    }
 
     if (__jsxChild()) {
       if (curr === '{') {
         append()
-        current = curr
-        append(T_SIGN)
+        append(T_SIGN, curr)
         __jsxExpr = true
         continue
       }
@@ -263,8 +330,7 @@ export function tokenize(code) {
             __jsxTag = 0
             __jsxEnter = false
           }
-          current = curr
-          append(T_SIGN)
+          append(T_SIGN, curr)
           continue
         }
 
@@ -303,9 +369,14 @@ export function tokenize(code) {
     }
 
     const isQuotationChar = isStringQuotation(curr)
+    const isStringTemplateLiterals = inStrTemplateLiterals()
     const isRegexChar = !__jsxEnter && isRegexStart(c_n)
     const isJsxLiterals = inJsxLiterals()
-    if (isQuotationChar || isRegexChar) {
+
+    // string quotation
+    if (isQuotationChar || isStringTemplateLiterals || isSingleQuotes(__strQuote)) {
+      current += curr
+    } else if (isRegexChar) {
       append()
       const [lastType, lastToken] = last
       // Special cases that are not considered as regex:
@@ -323,34 +394,23 @@ export function tokenize(code) {
         append()
         continue
       }
+
       const start = i++
-      const leftQuote = code[start]
-      let foundClose = false
 
       // end of line of end of file
       const isEof = () => i >= code.length
       const isEol = () => isEof() || code[i] === '\n'
-      // string quotation
-      if (isQuotationChar) {
-        for (; !isEof(); i++) {
-          // handle single quotes
-          if ((leftQuote === "'" || leftQuote === '"') && code[i] === '\n') break
-          if (isStringQuotation(code[i]) && code[i] === leftQuote) {
-            foundClose = true
-            break
-          }
-        }
-      } else {
-        // regex
-        for (; !isEol(); i++) {
-          if (code[i] === '/' && code[i - 1] !== '\\') {
-            foundClose = true
-            // append regex flags
-            while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
-              i++
-            }
-            break
+
+      let foundClose = false
+      // regex
+      for (; !isEol(); i++) {
+        if (code[i] === '/' && code[i - 1] !== '\\') {
+          foundClose = true
+          // append regex flags
+          while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
+            i++
           }
+          break
         }
       }
       if (start !== i && foundClose) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -16,7 +16,7 @@
     "build": "next build docs"
   },
   "devDependencies": {
-    "codice": "^0.0.9",
+    "codice": "^0.0.10",
     "next": "12.1.6-canary.6",
     "react": "18.0.0",
     "react-dom": "18.0.0",