sugar-high 0.4.5 → 0.4.7

package/README.md

@@ -1,9 +1,14 @@
 # Sugar High
+
+[![Build][build-badge]][build]
+[![Coverage][coverage-badge]][coverage]
+[![Downloads][downloads-badge]][downloads]
+
 ### Introduction
 
 Super lightweight JSX syntax highlighter, around 1KB after minified and gzipped
 
-![img](https://repository-images.githubusercontent.com/453236442/1d63a6ff-aa11-422c-a36c-ca16fc102f18)
+![img](https://repository-images.githubusercontent.com/453236442/aa0db684-bad3-4cd3-a420-f4e53b8c6757)
 
 ### Usage
 
@@ -70,3 +75,16 @@ pre code {
 
 MIT
 
+<!-- Definitions -->
+
+[build-badge]: https://github.com/huozhi/sugar-high/workflows/Test/badge.svg
+
+[build]: https://github.com/huozhi/sugar-high/actions
+
+[coverage-badge]: https://badge.fury.io/js/sugar-high.svg
+
+[coverage]: https://codecov.io/github/huozhi/sugar-high
+
+[downloads-badge]: https://img.shields.io/npm/dm/sugar-high.svg
+
+[downloads]: https://www.npmjs.com/package/sugar-high

package/lib/index.mjs

@@ -3,6 +3,7 @@
 const jsxBrackets = new Set(['<', '>', '{', '}', '[', ']'])
 const keywords = new Set([
   'for',
+  'do',
   'while',
   'if',
   'else',
@@ -52,7 +53,6 @@ const signs = new Set([
   '%',
   '=',
   '!',
-  ...jsxBrackets,
   '&',
   '|',
   '^',
@@ -73,6 +73,7 @@ const signs = new Set([
   '#',
   '@',
   '\\',
+  ...jsxBrackets,
 ])
 
 export const types = [
@@ -126,7 +127,7 @@ function encode(str) {
 }
 
 function isWord(chr) {
-  return /^[\w_]+$/.test(chr)
+  return /^[\w_]+$/.test(chr) || hasUnicode(chr)
 }
 
 function isCls(str) {
@@ -136,8 +137,12 @@ function isCls(str) {
     str === 'null'
 }
 
+function hasUnicode(s) {
+  return /[^\u0000-\u007f]/.test(s);
+}
+
 function isIdentifierChar(chr) {
-  return /^[a-zA-Z_$]$/.test(chr)
+  return /^[a-zA-Z_$]$/.test(chr) || hasUnicode(chr)
 }
 
 function isIdentifier(str) {
@@ -172,6 +177,7 @@ function isRegexStart(str) {
 export function tokenize(code) {
   let current = ''
   let type = -1
+  /** @type {[number | null, string | null]} */
   let last = [null, null]
   /** @type {Array<[number, string]>} */
   const tokens = []
@@ -192,10 +198,11 @@ export function tokenize(code) {
   const inJsxTag = () => __jsxTag && !__jsxChild()
   const inJsxLiterals = () => !__jsxTag && __jsxChild() && !__jsxExpr && __jsxStack > 0
 
-  /** @type {string | 0} */
-  let __strQuote = 0
+  /** @type {string | null} */
+  let __strQuote = null
   let __strTemplateExprStack = 0
   let __strTemplateQuoteStack = 0
+  const inStringQuotes = () => __strQuote !== null
   const inStrTemplateLiterals = () => (__strTemplateQuoteStack > __strTemplateExprStack)
   const inStrTemplateExpr = () => __strTemplateQuoteStack > 0 && (__strTemplateQuoteStack === __strTemplateExprStack)
 
@@ -205,6 +212,9 @@ export function tokenize(code) {
    * @returns {number}
    */
   function classify(token) {
+    if (inJsxTag() && inStringQuotes()) {
+      return T_STRING
+    }
     const isJsxLiterals = inJsxLiterals()
     if (isJsxLiterals) {
       return T_JSX_LITERALS
@@ -219,7 +229,10 @@ export function tokenize(code) {
     } else if (isCls(token)) {
       return inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER
     } else {
-      return isIdentifier(token) && !inStrTemplateLiterals() && (__strQuote !== `"` && __strQuote !== `'`) ? T_IDENTIFIER : T_STRING
+
+      return isIdentifier(token) &&
+        !inStrTemplateLiterals() &&
+        (!isSingleQuotes(__strQuote)) ? T_IDENTIFIER : T_STRING
     }
   }
 
@@ -245,11 +258,13 @@ export function tokenize(code) {
     const p_c = prev + curr // previous and current
     const c_n = curr + next // current and next
 
-    if (isSingleQuotes(curr)) {
+    // Determine string quotation outside of jsx literals.
+    // Inside jsx literals, string quotation is still part of it.
+    if (isSingleQuotes(curr) && !inJsxLiterals()) {
       append()
       if (prev !== `\\`) {
         if (__strQuote && curr === __strQuote) {
-          __strQuote = 0
+          __strQuote = null
         } else if (!__strQuote) {
           __strQuote = curr
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -17,10 +17,11 @@
   },
   "devDependencies": {
     "codice": "^0.0.10",
-    "next": "12.1.6-canary.6",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
+    "next": "13.4.20-canary.23",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "sugar-high": "link:./",
-    "vitest": "~0.6.0"
-  }
+    "vitest": "^0.34.4"
+  },
+  "packageManager": "pnpm@8.7.1"
 }