arche-highlight 0.6.0 → 0.6.2

package/ArcheHighlight.es.js

@@ -337,7 +337,11 @@ function parseJavaScript(text) {
   }
 
   if (term.length > 0) {
-    pushWordTerm(parsedElements, term, index, text)
+    if (isSingleLineComment) {
+      parsedElements.push(Span({ class: "comment" }, term))
+    } else {
+      pushWordTerm(parsedElements, term, index, text)
+    }
   }
 
   return parsedElements

package/ArcheHighlight.js

@@ -12,12 +12,6 @@ function testOperatorSymbol(c) {
   return c === "+" || c === "-" || c === "*" || c === "/" || c === "=" || c === "&" || c === "|" || c === "<" || c === ">" || c === "~" || c === "^" || c === "!" || c === "?" || c === ":"
 }
 
-// testComment(term string) -> boolean
-function testComment(term) {
-  return (term[0] === "/" && term[1] === "/")
-    || (term[0] === "/" && term[1] === "*")
-}
-
 // pushWordTerm(parsedElements Array<object|string>, term string, index number, text string) -> ()
 function pushWordTerm(parsedElements, term, index, text) {
   if (term == "process" || term == "require" || term == "console" || term == "window" || term == "global" || term == "globalThis" || term == "isNaN") {
@@ -105,21 +99,21 @@ function parseJavaScript(text) {
         parsedElements.push(Span({ class: "operator" }, term))
       }
       term = ""
-    } else if (isStringSingleQuote && c === "'") {
+    } else if (isStringSingleQuote && c === "'" && term[term.length - 1] !== "\\") {
       isStringSingleQuote = false
       term += c
       index += 1
       c = text[index]
       parsedElements.push(Span({ class: "string" }, term))
       term = ""
-    } else if (isStringDoubleQuote && c === "\"") {
+    } else if (isStringDoubleQuote && c === "\"" && term[term.length - 1] !== "\\") {
       isStringDoubleQuote = false
       term += c
       index += 1
       c = text[index]
       parsedElements.push(Span({ class: "string" }, term))
       term = ""
-    } else if (isTemplateLiteral && c === "`") {
+    } else if (isTemplateLiteral && c === "`" && term[term.length - 1] !== "\\") {
       isTemplateLiteral = false
       term += c
       index += 1
@@ -128,6 +122,10 @@ function parseJavaScript(text) {
       term = ""
     }
 
+    if (index == text.length) {
+      break
+    }
+
     if (isSingleLineComment) {
       term += c
       index += 1
@@ -163,6 +161,7 @@ function parseJavaScript(text) {
           term = ""
           index += 1
         } else {
+          term += templateVariable
           term += c
           index += 1
         }
@@ -193,16 +192,6 @@ function parseJavaScript(text) {
       isOperator = true
       term = c
       index += 1
-    } else if (c === ":") {
-      parsedElements.push(term)
-      if (isTernaryOperator) {
-        parsedElements.push(Span({ class: "operator" }, term))
-        isTernaryOperator = false
-      } else {
-        parsedElements.push(Span({ class: "object-colon" }, c))
-      }
-      term = ""
-      index += 1
     } else if (term.length == 0 && c === "'") {
       isStringSingleQuote = true
       term += c
@@ -235,20 +224,13 @@ function parseJavaScript(text) {
         parsedElements.push(c)
         term = ""
         index += 1
-      } else if (/^\d+$/.test(term)) {
-        parsedElements.push(Span({ class: "number" }, term))
-        parsedElements.push(c)
-        term = ""
-        index += 1
-      }
-      else if (isFunctionDeclaration) {
+      } else if (isFunctionDeclaration) {
         isFunctionDeclaration = false
         parsedElements.push(Span({ class: "function-name" }, term))
         parsedElements.push(c)
         term = ""
         index += 1
-      }
-      else {
+      } else {
         if (term.length > 0) {
           index = pushWordTerm(parsedElements, term, index, text)
           c = text[index]
@@ -279,8 +261,7 @@ function parseJavaScript(text) {
         parsedElements.push(Span({ class: "spread-operator" }, term))
       }
       term = ""
-    }
-    else if (c === "(") {
+    } else if (c === "(") {
       if (term === "") {
         // skip
       } else if (term == "require" || term == "isNaN") {
@@ -343,7 +324,19 @@ function parseJavaScript(text) {
   }
 
   if (term.length > 0) {
-    pushWordTerm(parsedElements, term, index, text)
+    if (isSingleLineComment) {
+      parsedElements.push(Span({ class: "comment" }, term))
+    } else if (isNumber) {
+      if (term[term.length - 1] === "n") {
+        parsedElements.push(Span({ class: "bigint" }, term))
+      } else if (term.includes("n")) {
+        parsedElements.push(term)
+      } else {
+        parsedElements.push(Span({ class: "number" }, term))
+      }
+    } else {
+      pushWordTerm(parsedElements, term, index, text)
+    }
   }
 
   return parsedElements

package/ArcheHighlight.mjs

@@ -337,7 +337,11 @@ function parseJavaScript(text) {
   }
 
   if (term.length > 0) {
-    pushWordTerm(parsedElements, term, index, text)
+    if (isSingleLineComment) {
+      parsedElements.push(Span({ class: "comment" }, term))
+    } else {
+      pushWordTerm(parsedElements, term, index, text)
+    }
   }
 
   return parsedElements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arche-highlight",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Syntax highlighting for vanilla microfrontends",
   "author": "Richard Tong",
   "license": "CFOSS",