sugar-high 0.7.3 → 0.7.5

package/lib/index.d.ts

@@ -1,3 +1,3 @@
 export function highlight(code: string): string
 export function tokenize(code: string): Array<[number, string]>
-export function generate(tokens: Array<[number, string]>): Array<[number, string]>
+export function generate(tokens: Array<[number, string]>): Array<any>

package/lib/index.js

@@ -220,9 +220,11 @@ function tokenize(code) {
 
   /** @type {string | null} */
   let __strQuote = null
+  let __regexQuoteStart = false
   let __strTemplateExprStack = 0
   let __strTemplateQuoteStack = 0
   const inStringQuotes = () => __strQuote !== null
+  const inRegexQuotes = () => __regexQuoteStart
   const inStrTemplateLiterals = () => (__strTemplateQuoteStack > __strTemplateExprStack)
   const inStrTemplateExpr = () => __strTemplateQuoteStack > 0 && (__strTemplateQuoteStack === __strTemplateExprStack)
   const inStringContent = () => inStringQuotes() || inStrTemplateLiterals()
@@ -275,12 +277,20 @@ function tokenize(code) {
     }
   }
 
-  const append = (_type, _token) => {
-    if (_token) {
-      current = _token
+  /**
+   * 
+   * @param {number} type_ 
+   * @param {string} token_ 
+   */
+  const append = (type_, token_) => {
+    if (type_ || token_) {
+      const nType = types[type_]
+    }
+    if (token_) {
+      current = token_
     }
     if (current) {
-      type = _type || classify(current)
+      type = type_ || classify(current)
       /** @type [number, string]  */
       const pair = [type, current]
       if (type !== T_SPACE && type !== T_BREAK) {
@@ -456,7 +466,13 @@ function tokenize(code) {
 
       // current and next char can form a jsx open or close tag
       if (curr === '<' && (next === '/' || isAlpha(next))) {
-        __jsxEnter = true
+        if (
+          !inStringContent() && 
+          !inJsxLiterals() &&
+          !inRegexQuotes()
+        ) {
+          __jsxEnter = true
+        }
       }
     }
 
@@ -487,6 +503,7 @@ function tokenize(code) {
         continue
       }
 
+      __regexQuoteStart = true
       const start = i++
 
       // end of line of end of file
@@ -494,17 +511,20 @@ function tokenize(code) {
       const isEol = () => isEof() || code[i] === '\n'
 
       let foundClose = false
-      // regex
+      
+      // traverse to find closing regex slash
       for (; !isEol(); i++) {
         if (code[i] === '/' && code[i - 1] !== '\\') {
           foundClose = true
-          // append regex flags
+          // end of regex, append regex flags
           while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
             i++
           }
           break
         }
       }
+      __regexQuoteStart = false
+
       if (start !== i && foundClose) {
         // If current line is fully closed with string quotes or regex slashes,
         // add them to tokens
@@ -583,13 +603,13 @@ function tokenize(code) {
 
 /**
  * @param {Array<[number, string]>} tokens
- * @return {Array<[number, string]>}
+ * @return {Array<any>}
  */
 function generate(tokens) {
   const lines = []
   /**
    * @param {any} children
-   * 
+   * @return {{type: string, tagName: string, children: any[], properties: Record<string, string>}}
    */
   const createLine = (children) => 
       ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-high",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "type": "module",
   "types": "./lib/index.d.ts",
   "exports": {