arche-highlight 0.7.0 → 0.8.0

package/ArcheHighlight.es.js

@@ -41,6 +41,7 @@ function parseJavaScript(text) {
 
   let index = 0
   let term = ""
+  let isShebangInterpreterDirective = false
   let isSingleLineComment = false
   let isMultiLineComment = false
   let isNumber = false
@@ -54,7 +55,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 = ""
@@ -120,7 +125,10 @@ function parseJavaScript(text) {
       break
     }
 
-    if (isSingleLineComment) {
+    if (isShebangInterpreterDirective) {
+      term += c
+      index += 1
+    } else if (isSingleLineComment) {
       term += c
       index += 1
     } else if (isMultiLineComment) {
@@ -163,6 +171,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
@@ -320,6 +332,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.js

@@ -2,11 +2,6 @@
  * ArcheHighlight may be freely distributed under the CFOSS license.
  */
 
-(function (root, ArcheHighlight) {
-  if (typeof module == 'object') (module.exports = ArcheHighlight) // CommonJS
-  else (root.ArcheHighlight = ArcheHighlight) // Browser
-}(typeof globalThis == 'object' ? globalThis : this, (function () { 'use strict'
-
 function testOperatorSymbol(c) {
   return c === "+" || c === "-" || c === "*" || c === "/" || c === "=" || c === "&" || c === "|" || c === "<" || c === ">" || c === "~" || c === "^" || c === "!" || c === "?" || c === ":"
 }
@@ -224,7 +219,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" || term == "from") {
+      } else if (term == "import" || term == "new" || term == "async" || term == "await" || term == "if" || term == "for" || term == "while" || term == "of" || term == "from") {
         parsedElements.push(Span({ class: "keyword" }, term))
         parsedElements.push(c)
         term = ""
@@ -359,5 +354,8 @@ const ArcheHighlight = {
   parseJavaScript,
 }
 
-return ArcheHighlight
-}())))
+if (typeof module == "object") {
+  module.exports = ArcheHighlight
+} else {
+  globalThis.ArcheHighlight = ArcheHighlight
+}

package/ArcheHighlight.mjs

@@ -41,6 +41,7 @@ function parseJavaScript(text) {
 
   let index = 0
   let term = ""
+  let isShebangInterpreterDirective = false
   let isSingleLineComment = false
   let isMultiLineComment = false
   let isNumber = false
@@ -54,7 +55,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 = ""
@@ -120,7 +125,10 @@ function parseJavaScript(text) {
       break
     }
 
-    if (isSingleLineComment) {
+    if (isShebangInterpreterDirective) {
+      term += c
+      index += 1
+    } else if (isSingleLineComment) {
       term += c
       index += 1
     } else if (isMultiLineComment) {
@@ -163,6 +171,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
@@ -320,6 +332,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/package.json

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