arche-highlight 0.6.2 → 0.7.0

package/ArcheHighlight.es.js

@@ -6,12 +6,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") {
@@ -99,21 +93,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
@@ -122,6 +116,10 @@ function parseJavaScript(text) {
       term = ""
     }
 
+    if (index == text.length) {
+      break
+    }
+
     if (isSingleLineComment) {
       term += c
       index += 1
@@ -157,6 +155,7 @@ function parseJavaScript(text) {
           term = ""
           index += 1
         } else {
+          term += templateVariable
           term += c
           index += 1
         }
@@ -187,16 +186,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
@@ -218,7 +207,7 @@ function parseJavaScript(text) {
         parsedElements.push(c)
         term = ""
         index += 1
-      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of") {
+      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of" || term == "from") {
         parsedElements.push(Span({ class: "keyword" }, term))
         parsedElements.push(c)
         term = ""
@@ -229,20 +218,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]
@@ -273,8 +255,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") {
@@ -339,6 +320,14 @@ function parseJavaScript(text) {
   if (term.length > 0) {
     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)
     }

package/ArcheHighlight.js

@@ -4,7 +4,6 @@
 
 (function (root, ArcheHighlight) {
   if (typeof module == 'object') (module.exports = ArcheHighlight) // CommonJS
-  else if (typeof define == 'function') define(() => ArcheHighlight) // AMD
   else (root.ArcheHighlight = ArcheHighlight) // Browser
 }(typeof globalThis == 'object' ? globalThis : this, (function () { 'use strict'
 
@@ -47,6 +46,7 @@ function parseJavaScript(text) {
 
   let index = 0
   let term = ""
+  let isShebangInterpreterDirective = false
   let isSingleLineComment = false
   let isMultiLineComment = false
   let isNumber = false
@@ -60,7 +60,11 @@ function parseJavaScript(text) {
   while (index < text.length) {
     let c = text[index]
 
-    if (isSingleLineComment && c === "\n") {
+    if (isShebangInterpreterDirective && c === "\n") {
+      isShebangInterpreterDirective = false
+      parsedElements.push(Span({ class: "shebang-interpreter-directive" }, term))
+      term = ""
+    } else if (isSingleLineComment && c === "\n") {
       isSingleLineComment = false
       parsedElements.push(Span({ class: "comment" }, term))
       term = ""
@@ -126,7 +130,10 @@ function parseJavaScript(text) {
       break
     }
 
-    if (isSingleLineComment) {
+    if (isShebangInterpreterDirective) {
+      term += c
+      index += 1
+    } else if (isSingleLineComment) {
       term += c
       index += 1
     } else if (isMultiLineComment) {
@@ -169,6 +176,10 @@ function parseJavaScript(text) {
         term += c
         index += 1
       }
+    } else if (c === "#" && text[index + 1] === "!") {
+      isShebangInterpreterDirective = true
+      term += c
+      index += 1
     } else if (c === "/" && text[index + 1] === "/") {
       isSingleLineComment = true
       term += c
@@ -213,7 +224,7 @@ function parseJavaScript(text) {
         parsedElements.push(c)
         term = ""
         index += 1
-      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of") {
+      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of" || term == "from") {
         parsedElements.push(Span({ class: "keyword" }, term))
         parsedElements.push(c)
         term = ""
@@ -326,6 +337,8 @@ function parseJavaScript(text) {
   if (term.length > 0) {
     if (isSingleLineComment) {
       parsedElements.push(Span({ class: "comment" }, term))
+    } else if (isShebangInterpreterDirective) {
+      parsedElements.push(Span({ class: "shebang-interpreter-directive" }, term))
     } else if (isNumber) {
       if (term[term.length - 1] === "n") {
         parsedElements.push(Span({ class: "bigint" }, term))

package/ArcheHighlight.mjs

@@ -6,12 +6,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") {
@@ -99,21 +93,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
@@ -122,6 +116,10 @@ function parseJavaScript(text) {
       term = ""
     }
 
+    if (index == text.length) {
+      break
+    }
+
     if (isSingleLineComment) {
       term += c
       index += 1
@@ -157,6 +155,7 @@ function parseJavaScript(text) {
           term = ""
           index += 1
         } else {
+          term += templateVariable
           term += c
           index += 1
         }
@@ -187,16 +186,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
@@ -218,7 +207,7 @@ function parseJavaScript(text) {
         parsedElements.push(c)
         term = ""
         index += 1
-      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of") {
+      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "for" || term == "while" || term == "of" || term == "from") {
         parsedElements.push(Span({ class: "keyword" }, term))
         parsedElements.push(c)
         term = ""
@@ -229,20 +218,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]
@@ -273,8 +255,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") {
@@ -339,6 +320,14 @@ function parseJavaScript(text) {
   if (term.length > 0) {
     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)
     }

package/README.md

@@ -1,6 +1,14 @@
 # ArcheHighlight
 Syntax highlighting for [vanilla microfrontends](https://arche.gallery/). Converts JavaScript code into a React Element or HTML.
 
+Source code: [GitHub](https://github.com/richytong/ArcheHighlight) |
+License: [CFOSS](https://cloutsworld.com/en-us/legal/license/cfoss)
+
+![Node.js CI](https://github.com/richytong/ArcheHighlight/workflows/Node.js%20CI/badge.svg)
+[![codecov](https://codecov.io/gh/richytong/arche-highlight/graph/badge.svg?token=1IMQYQOMDM)](https://codecov.io/gh/richytong/arche-highlight)
+[![npm version](https://img.shields.io/npm/v/arche-highlight.svg?style=flat)](https://www.npmjs.com/package/arche-highlight)
+
+
 ```javascript
 const ReactElement = Arche(React)
 window.Span = ReactElement.Span
@@ -65,6 +73,7 @@ Return:
 
 ### JavaScript Classes
 The following JavaScript classes are added to the code as `span` elements of the parsed React Element or HTML:
+  * `shebang-interpreter-directive` - an interpreter directive at the beginning of a script starting with the shebang (`#!`) that instructs the loader of the script to execute the specified interpreter, for example `#!/usr/bin/env node`.
   * `comment` - single line (`//`) or multi-line comments (`/* */`).
   * `number` - numbers, for example `1`, `0`, `2.5`, `-1`, `100`.
   * `string` - strings, for example `"a"`, `'a'`, `"This is a string."`.

package/package.json

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