sugar-high 0.2.0 → 0.2.1

package/README.md

@@ -3,7 +3,7 @@
 
 Super lightweight JSX syntax highlighter, around 1KB after minified and gzipped
 
-![img](https://repository-images.githubusercontent.com/453236442/9416c941-9c40-4dbe-a73e-0e0d21993802)
+![img](https://repository-images.githubusercontent.com/453236442/82cf2807-78f0-4009-bbdf-d7e753f73cf4)
 
 ### Usage
 

package/lib/index.mjs

@@ -126,12 +126,16 @@ function encode(str) {
     .replace(/[^\S\r\n]/g, ' ')
 }
 
+function isWord(chr) {
+  return /^[\w_]+$/.test(chr)
+}
+
 function isIdentifierChar(chr) {
-  return /^[\w_$]$/.test(chr)
+  return /^[a-zA-Z_$]$/.test(chr)
 }
 
 function isIdentifier(str) {
-  return /[a-zA-Z_$]/.test(str[0]) && (str.length === 1 || /^[\w_$]+$/.test(str.slice(1)))
+  return isIdentifierChar(str[0]) && (str.length === 1 || isWord(str.slice(1)))
 }
 
 function isStringQuotation(chr) {
@@ -179,7 +183,7 @@ export function tokenize(code) {
     } else if (
       !inJsxLiterals() && 
       (
-        isIdentifierChar(chr0) &&
+        isWord(chr0) &&
         chr0 === chr0.toUpperCase() ||
         token === 'null'
       )
@@ -228,13 +232,13 @@ export function tokenize(code) {
       append()
       const [lastType, lastToken] = last
       // Special cases that are not considered as regex:
-      // * (expr) / expr: `()[]` before `/` 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 && !'()'.includes(lastToken)) || 
           lastType === T_COMMENT
         )
       ) {
@@ -243,33 +247,41 @@ export function tokenize(code) {
         continue
       }
       const start = i++
+      let foundClose = false
       
-      const isInline = () => i < code.length && code[i] !== '\n'
+      // end of line of end of file
+      const isEol = () => i >= code.length || code[i] === '\n'
       // string quotation
       if (isQuotationChar) {
-        for (; isInline(); i++) {
-          if (isStringQuotation(code[i])) {
+        for (; !isEol(); i++) {
+          if (isStringQuotation(code[i]) && code[i] === code[start]) {
+            foundClose = true
             break
           }
         }
       } else {
         // regex
-        for (; isInline(); i++) {
+        for (; !isEol(); i++) {
           if (code[i] === '/' && code[i - 1] !== '\\') {
+            foundClose = true
             // append regex flags
-            while (start !== i && /^[a-z]$/.test(code[i + 1]) && isInline()) {
+            while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
               i++
             };
             break
           }
         }
       }
-      if (start !== i) {
+      if (start !== i && foundClose) {
+        // If current line is fully closed with string quotes or regex slashes,
+        // add them to tokens
         current = code.slice(start, i + 1)
         append(T_STRING)
       } else {
+        // If it doesn't match any of the above, just leave it as operator and move on
         current = curr
         append()
+        i = start
       }
     } else if (isCommentStart(c_n)) {
       const start = i
@@ -297,7 +309,7 @@ export function tokenize(code) {
     } else {
       if (
         (isJsxLiterals && !jsxBrackets.has(curr)) ||
-        isIdentifierChar(curr) === isIdentifierChar(current[current.length - 1]) &&
+        isWord(curr) === isWord(current[current.length - 1]) &&
         !signs.has(curr)
       ) {
         current += curr

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "exports": "./lib/index.mjs",
   "description": "Super lightweight JSX syntax highlighter",
@@ -12,11 +12,13 @@
   "license": "MIT",
   "scripts": {
     "test": "vitest run",
-    "dev": "vite docs",
-    "build": "vite build docs"
+    "dev": "next dev docs",
+    "build": "next build docs"
   },
   "devDependencies": {
-    "vite": "^2.8.6",
-    "vitest": "^0.5.9"
+    "next": "12.1.1-canary.15",
+    "react": "18.0.0-rc.2",
+    "react-dom": "18.0.0-rc.2",
+    "vitest": "~0.6.0"
   }
 }