sugar-high 2.4.0 → 2.4.1

package/lib/core.js

@@ -83,7 +83,9 @@ function tokenize(code, options) {
       const quote = curr
       const start = i++
       while (i < code.length) {
-        if (code[i] === quote && code[i - 1] !== '\\') {
+        if (code[i] === '\\') {
+          i++
+        } else if (code[i] === quote) {
           i++
           break
         }

package/lib/presets/javascript-runtime.js

@@ -168,18 +168,11 @@ function isSign(ch) {
 }
 
 function isWord(chr) {
-  return /^[\w_]+$/.test(chr) || hasUnicode(chr)
+  return /^[\w$\u0080-\uffff]+$/.test(chr || '')
 }
 
 function isCls(str) {
-  const chr0 = str[0]
-  return isWord(chr0) &&
-    chr0 === chr0.toUpperCase() ||
-    str === 'null'
-}
-
-function hasUnicode(s) {
-  return /[^\u0000-\u007f]/.test(s);
+  return /^[0-9A-Z\p{Lu}]/u.test(str) || str === 'null'
 }
 
 function isAlpha(chr) {
@@ -187,11 +180,11 @@ function isAlpha(chr) {
 }
 
 function isIdentifierChar(chr) {
-  return isAlpha(chr) || hasUnicode(chr)
+  return /^[$_A-Za-z\u0080-\uffff]$/.test(chr || '')
 }
 
 function isIdentifier(str) {
-  return isIdentifierChar(str[0]) && (str.length === 1 || isWord(str.slice(1)))
+  return isIdentifierChar(str[0]) && isWord(str)
 }
 
 function isStrTemplateChr(chr) {
@@ -282,17 +275,17 @@ function tokenize(code, options) {
   let __jsxEnter = false
   /** @type {0 | 1 | 2} 0 = none; 1 = inside `<open`; 2 = inside `</close` */
   let __jsxTag = 0
-  let __jsxExpr = false
+  let __jsxExprDepth = 0
   let __jsxTagExpr = 0
 
   /** Nested `<open>…</open>` depth (content between tags, including nested elements). */
   let __jsxStack = 0
 
-  const __jsxChild = () => __jsxEnter && !__jsxExpr && !__jsxTag
+  const __jsxChild = () => __jsxEnter && !__jsxExprDepth && !__jsxTag
   // < __content__ >
-  const inJsxTag = () => __jsxTag && !__jsxChild()
+  const inJsxTag = () => __jsxTag
   // {'__content__'}
-  const inJsxLiterals = () => !__jsxTag && __jsxChild() && !__jsxExpr && __jsxStack > 0
+  const inJsxLiterals = () => __jsxChild() && __jsxStack
 
   /** @type {string | null} */
   let __strQuote = null
@@ -419,14 +412,12 @@ function tokenize(code, options) {
     if (isSingleQuotes(curr) && !inJsxLiterals() && !inStrTemplateLiterals()) {
       append()
       let isStringClose = false
-      if (prev !== `\\`) {
-        if (__strQuote && curr === __strQuote) {
-          __strQuote = null
-          isStringClose = true
-        } else if (!__strQuote) {
-          __strQuote = curr
-          __strTokenStart = tokens.length
-        }
+      if (__strQuote && curr === __strQuote) {
+        __strQuote = null
+        isStringClose = true
+      } else if (!__strQuote) {
+        __strQuote = curr
+        __strTokenStart = tokens.length
       }
 
       append(T_STRING, curr)
@@ -438,25 +429,14 @@ function tokenize(code, options) {
       continue
     }
 
-    if (!inStrTemplateLiterals()) {
-      if (prev !== '\\n' && isTemplateQuote(curr)) {
-        append()
-        append(T_STRING, curr)
-        __strTemplateQuoteStack++
-        continue
-      }
+    if (isTemplateQuote(curr)) {
+      append()
+      __strTemplateQuoteStack += inStrTemplateLiterals() ? -1 : 1
+      append(T_STRING, curr)
+      continue
     }
 
     if (inStrTemplateLiterals()) {
-      if (prev !== '\\n' && isTemplateQuote(curr)) {
-        if (__strTemplateQuoteStack > 0) {
-          append()
-          __strTemplateQuoteStack--
-          append(T_STRING, curr)
-          continue
-        }
-      }
-
       if (c_n === '${') {
         __strTemplateExprStack++
         append(T_STRING)
@@ -477,7 +457,7 @@ function tokenize(code, options) {
       if (curr === '{') {
         append()
         append(T_SIGN, curr)
-        __jsxExpr = true
+        __jsxExprDepth = 1
         continue
       }
     }
@@ -634,6 +614,8 @@ function tokenize(code, options) {
     // string quotation
     if (isQuotationChar || isStringTemplateLiterals || isSingleQuotes(__strQuote)) {
       current += curr
+      // Consume the escaped character before the next delimiter check.
+      if (curr === '\\') current += code[++i] || ''
     } else if (isRegexChar) {
       append()
       const [lastType, lastToken] = last
@@ -656,25 +638,25 @@ function tokenize(code, options) {
       __regexQuoteStart = true
       const start = i++
 
-      // end of line of end of file
-      const isEof = () => i >= code.length
-      const isEol = () => isEof() || code[i] === '\n'
-
       let foundClose = false
 
       // `/` is literal inside regex character classes, e.g. `[/]`.
       let inCharClass = false
 
       // traverse to find closing regex slash
-      for (; !isEol(); i++) {
+      for (; i < code.length && code[i] !== '\n'; i++) {
         const ch = code[i]
-        const escaped = code[i - 1] === '\\'
-        if (!escaped && ch === '[') inCharClass = true
-        if (!escaped && ch === ']') inCharClass = false
-        if (ch === '/' && !inCharClass && !escaped) {
+        if (ch === '\\') {
+          if (code[i + 1] === '\n') break
+          i++
+          continue
+        }
+        if (ch === '[') inCharClass = true
+        if (ch === ']') inCharClass = false
+        if (ch === '/' && !inCharClass) {
           foundClose = true
           // end of regex, append regex flags
-          while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
+          while (/^[a-z]$/.test(code[i + 1])) {
             i++
           }
           break
@@ -730,11 +712,11 @@ function tokenize(code, options) {
         append()
       }
     } else {
-      if (__jsxExpr && curr === '}') {
+      if (__jsxExprDepth && curr === '}') {
         append()
         current = curr
         append()
-        __jsxExpr = false
+        __jsxExprDepth--
       } else if (
         // it's jsx literals and is not a jsx bracket
         (isJsxLiterals && !JSXBrackets.has(curr)) ||
@@ -761,6 +743,7 @@ function tokenize(code, options) {
         }
         else if (JSXBrackets.has(curr)) append()
       }
+      if (__jsxExprDepth && curr === '{') __jsxExprDepth++
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/huozhi/sugar-high.git",