sugar-high 0.2.1 → 0.2.2

package/lib/index.mjs

@@ -71,6 +71,7 @@ const signs = new Set([
   '[',
   ']',
   '#',
+  '@',
   '\\',
 ])
 
@@ -87,7 +88,7 @@ export const types = [
 ]
 
 /**
- * 
+ *
  * 0 - identifier
  * 1 - keyword
  * 2 - string
@@ -97,7 +98,7 @@ export const types = [
  * 6 - break
  * 7 - space
  * 8 - jsx literals
- * 
+ *
  */
 const [
   T_IDENTIFIER,
@@ -151,8 +152,8 @@ function isRegexStart(str) {
   return str[0] === '/' && !isCommentStart(str[0] + str[1])
 }
 
-/** 
- * @param {string} code 
+/**
+ * @param {string} code
  * @return {Array<[number, string]>}
  */
 export function tokenize(code) {
@@ -181,7 +182,7 @@ export function tokenize(code) {
     } else if (token.split('').every(ch => signs.has(ch))) {
       return T_SIGN
     } else if (
-      !inJsxLiterals() && 
+      !inJsxLiterals() &&
       (
         isWord(chr0) &&
         chr0 === chr0.toUpperCase() ||
@@ -211,11 +212,11 @@ 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 p_c = prev + curr // previous and current
     const isJsxLiterals = inJsxLiterals()
 
     if (jsx.tag) {
-      const isOpenElementEnd = curr === '>' 
+      const isOpenElementEnd = curr === '>'
       const isCloseElementEnd = p_c === '/>'
       jsx.child = !isCloseElementEnd && !isCloseElementEnd
       jsx.tag = !(isOpenElementEnd || isCloseElementEnd)
@@ -235,10 +236,10 @@ export function tokenize(code) {
       // * (expr1) / expr2: `()` before `/` operator is still in expression
       // * <non comment start>/ expr: non comment start before `/` is not regex
       if (
-        isRegexChar && 
-        lastType && 
+        isRegexChar &&
+        lastType &&
         !(
-          (lastType === T_SIGN && !'()'.includes(lastToken)) || 
+          (lastType === T_SIGN && !'()'.includes(lastToken)) ||
           lastType === T_COMMENT
         )
       ) {
@@ -247,14 +248,18 @@ export function tokenize(code) {
         continue
       }
       const start = i++
+      const leftQuote = code[start]
       let foundClose = false
-      
+
       // end of line of end of file
-      const isEol = () => i >= code.length || code[i] === '\n'
+      const isEof = () => i >= code.length
+      const isEol = () => isEof() || code[i] === '\n'
       // string quotation
       if (isQuotationChar) {
-        for (; !isEol(); i++) {
-          if (isStringQuotation(code[i]) && code[i] === code[start]) {
+        for (; !isEof(); i++) {
+          // handle single quotes
+          if ((leftQuote === "'" || leftQuote === '"') && code[i] === '\n') break
+          if (isStringQuotation(code[i]) && code[i] === leftQuote) {
             foundClose = true
             break
           }
@@ -267,7 +272,7 @@ export function tokenize(code) {
             // append regex flags
             while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
               i++
-            };
+            }
             break
           }
         }
@@ -284,6 +289,7 @@ export function tokenize(code) {
         i = start
       }
     } else if (isCommentStart(c_n)) {
+      append()
       const start = i
       if (next === '/') {
         for (; i < code.length && code[i] !== '\n'; i++);
@@ -338,8 +344,8 @@ export function tokenize(code) {
   return tokens
 }
 
-/** 
- * @param {Array<[number, string]>} tokens 
+/**
+ * @param {Array<[number, string]>} tokens
  * @return {Array<string>}
  */
 function generate(tokens) {
@@ -347,7 +353,7 @@ function generate(tokens) {
   for (let i = 0; i < tokens.length; i++) {
     const [type, token] = tokens[i]
     output.push(
-      type === T_BREAK 
+      type === T_BREAK
       ? '<br>'
       : `<span class="sh__${types[type]}">${encode(token)}</span>`
     )
@@ -356,8 +362,8 @@ function generate(tokens) {
 }
 
 /**
- * 
- * @param {string} code 
+ *
+ * @param {string} code
  * @returns {string}
  */
 export function highlight(code) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -16,9 +16,9 @@
     "build": "next build docs"
   },
   "devDependencies": {
-    "next": "12.1.1-canary.15",
-    "react": "18.0.0-rc.2",
-    "react-dom": "18.0.0-rc.2",
+    "next": "12.1.4",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
     "vitest": "~0.6.0"
   }
 }