Merge pull request #4 from williamtroup/0.4.0

0.4.0
williamtroup · Oct 30, 2023 · f125164 · f125164
2 parents ac2185f + e3056d4
commit f125164
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,14 @@
 Syntax.js
 
 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Syntax.js%2C%20a%20free%20JavaScript%20syntax%20highlighter&url=https://github.com/williamtroup/Syntax.js&hashtags=javascript,syntax,highlighter)
+[![npm](https://img.shields.io/badge/npmjs-v0.4.0-blue)](https://www.npmjs.com/package/jsyntax.js)
+[![license](https://img.shields.io/badge/license-MIT-green)](https://github.com/williamtroup/Syntax.js/blob/main/LICENSE.txt)
+[![discussions Welcome](https://img.shields.io/badge/discussions-Welcome-red)](https://github.com/williamtroup/Syntax.js/discussions)
+[![coded by William Troup](https://img.shields.io/badge/coded_by-William_Troup-yellow)](https://github.com/williamtroup)
 </h1>
-<p align="center">An easy to use JavaScript syntax highlighter!</p>
-<p align="center">v0.3.0</p>
+
+> <p align="center">An easy to use JavaScript syntax highlighter!</p>
+> <p align="center">v0.4.0</p>
 <br />
 
 ![Syntax.js](docs/images/main.png)

diff --git a/dist/languages/syntax.c-sharp.js b/dist/languages/syntax.c-sharp.js
@@ -1,4 +1,4 @@
-/*! Syntax.js v0.3.0 | (c) Bunoon | MIT License */
+/*! Syntax.js v0.4.0 | (c) Bunoon | MIT License */
 $syntax.addLanguage( "c-sharp", {
     keywords: [
         "abstract",

diff --git a/dist/languages/syntax.go.js b/dist/languages/syntax.go.js
@@ -0,0 +1,32 @@
+/*! Syntax.js v0.4.0 | (c) Bunoon | MIT License */
+$syntax.addLanguage( "go", {
+    keywords: [
+        "break",
+        "default",
+        "func",
+        "interface",
+        "select",
+        "case",
+        "defer",
+        "go",
+        "map",
+        "struct",
+        "chan",
+        "else",
+        "goto",
+        "package",
+        "switch",
+        "const",
+        "fallthrough",
+        "if",
+        "range",
+        "type",
+        "continue",
+        "for",
+        "import",
+        "return",
+        "var"     
+    ],
+    comment: "//",
+    multiLineComment: [ "/*", "*/" ]
+} );
diff --git a/dist/languages/syntax.python.js b/dist/languages/syntax.python.js
@@ -0,0 +1,41 @@
+/*! Syntax.js v0.4.0 | (c) Bunoon | MIT License */
+$syntax.addLanguage( "python", {
+    keywords: [
+        "False",
+        "await",
+        "else",
+        "import",
+        "pass",
+        "None",
+        "break",
+        "except",
+        "in",
+        "raise",
+        "True",
+        "class",
+        "finally",
+        "is",
+        "return",
+        "and",
+        "continue",
+        "for",
+        "lambda",
+        "try",
+        "as",
+        "def",
+        "from",
+        "nonlocal",
+        "while",
+        "assert",
+        "del",
+        "global",
+        "not",
+        "with",
+        "async",
+        "elif",
+        "if",
+        "or",
+        "yield"      
+    ],
+    comment: "#"
+} );
diff --git a/dist/languages/syntax.ruby.js b/dist/languages/syntax.ruby.js
@@ -0,0 +1,43 @@
+/*! Syntax.js v0.4.0 | (c) Bunoon | MIT License */
+$syntax.addLanguage( "ruby", {
+    keywords: [
+        "BEGIN",
+        "END",
+        "alias",
+        "and",
+        "begin",
+        "break",
+        "case",
+        "class",
+        "def",
+        "module",
+        "next",
+        "nil",
+        "not",
+        "or",
+        "redo",
+        "rescue",
+        "retry",
+        "return",
+        "elsif",
+        "end",
+        "false",
+        "ensure",
+        "for",
+        "if",
+        "true",
+        "undef",
+        "unless",
+        "do",
+        "else",
+        "super",
+        "then",
+        "until",
+        "when",
+        "while",
+        "defined?",
+        "self"   
+    ],
+    comment: "#",
+    multiLineComment: [ "=begin", "=end" ]
+} );
diff --git a/dist/syntax.js b/dist/syntax.js
@@ -1,4 +1,4 @@
-/*! Syntax.js v0.3.0 | (c) Bunoon | MIT License */
+/*! Syntax.js v0.4.0 | (c) Bunoon | MIT License */
 (function() {
   function render() {
     var domElements = _parameter_Document.getElementsByTagName("*");
@@ -15,7 +15,7 @@
       if (isDefined(syntaxLanguage) && _languages.hasOwnProperty(syntaxLanguage)) {
         var innerHTML = element.innerHTML;
         var syntaxOptions = getObjectFromString(element.getAttribute("data-syntax-options"));
-        syntaxOptions = buildDefaultOptions(syntaxOptions);
+        syntaxOptions = buildAttributeOptions(syntaxOptions);
         if (element.children.length > 0) {
           innerHTML = element.children[0].innerHTML;
         }
@@ -37,7 +37,7 @@
           syntax.appendChild(copyButton);
           copyButton.onclick = function() {
             _parameter_Navigator.clipboard.writeText(innerHTMLCopy);
-            fireCustomTrigger("onCopy", innerHTMLCopy);
+            fireCustomTrigger(syntaxOptions, "onCopy", innerHTMLCopy);
           };
         }
         innerHTML = renderElementCommentVariables(innerHTML, syntaxLanguage);
@@ -48,7 +48,7 @@
         innerHTML = renderElementCommentsFromVariables(innerHTML);
         innerHTML = renderElementStringQuotesFromVariables(innerHTML);
         renderElementCompletedHTML(number, syntax, innerHTML);
-        fireCustomTrigger("onRender", element);
+        fireCustomTrigger(syntaxOptions, "onRender", element);
       }
     }
   }
@@ -70,23 +70,25 @@
   }
   function renderElementMultiLineCommentVariables(innerHTML, syntaxLanguage) {
     var lookup = _languages[syntaxLanguage].multiLineComment;
-    var startIndex = 0;
-    var endIndex = 0;
-    for (; startIndex >= 0 && endIndex >= 0;) {
-      startIndex = innerHTML.indexOf(lookup[0], endIndex);
-      if (startIndex > -1) {
-        endIndex = innerHTML.indexOf(lookup[1], startIndex + lookup[0].length);
-        if (endIndex > -1) {
-          var comment = innerHTML.substring(startIndex, endIndex + lookup[1].length);
-          var commentLines = comment.split(_string.newLine);
-          var commentLinesLength = commentLines.length;
-          var commentLineIndex = 0;
-          for (; commentLineIndex < commentLinesLength; commentLineIndex++) {
-            var commentVariable = "$C{" + _comments_Cached_Count.toString() + "}";
-            var commentLine = commentLines[commentLineIndex];
-            _comments_Cached[commentVariable] = '<span class="comment">' + commentLine + "</span>";
-            _comments_Cached_Count++;
-            innerHTML = innerHTML.replace(commentLine, commentVariable);
+    if (isDefinedArray(lookup) && lookup.length === 2) {
+      var startIndex = 0;
+      var endIndex = 0;
+      for (; startIndex >= 0 && endIndex >= 0;) {
+        startIndex = innerHTML.indexOf(lookup[0], endIndex);
+        if (startIndex > -1) {
+          endIndex = innerHTML.indexOf(lookup[1], startIndex + lookup[0].length);
+          if (endIndex > -1) {
+            var comment = innerHTML.substring(startIndex, endIndex + lookup[1].length);
+            var commentLines = comment.split(_string.newLine);
+            var commentLinesLength = commentLines.length;
+            var commentLineIndex = 0;
+            for (; commentLineIndex < commentLinesLength; commentLineIndex++) {
+              var commentVariable = "$C{" + _comments_Cached_Count.toString() + "}";
+              var commentLine = commentLines[commentLineIndex];
+              _comments_Cached[commentVariable] = '<span class="comment">' + commentLine + "</span>";
+              _comments_Cached_Count++;
+              innerHTML = innerHTML.replace(commentLine, commentVariable);
+            }
           }
         }
       }
@@ -151,6 +153,12 @@
       syntax.appendChild(syntaxCode);
     }
   }
+  function buildAttributeOptions(newOptions) {
+    var options = !isDefinedObject(newOptions) ? {} : newOptions;
+    options.showCopyButton = getDefaultBoolean(options.showCopyButton, true);
+    options.copyButtonText = getDefaultString(options.copyButtonText, "Copy");
+    return options;
+  }
   function isDefined(value) {
     return value !== null && value !== undefined && value !== _string.empty;
   }
@@ -166,6 +174,9 @@
   function isDefinedFunction(object) {
     return isDefined(object) && isFunction(object);
   }
+  function isDefinedArray(object) {
+    return isDefinedObject(object) && object instanceof Array;
+  }
   function isFunction(object) {
     return typeof object === "function";
   }
@@ -182,17 +193,14 @@
     }
     return result;
   }
-  function isCustomTriggerSet(name) {
-    return isDefinedFunction(_options[name]);
-  }
-  function fireCustomTrigger(name) {
+  function fireCustomTrigger(options, name) {
     var result = null;
-    var newArguments = [].slice.call(arguments, 1);
+    var newArguments = [].slice.call(arguments, 2);
     if (newArguments.length > 0) {
       result = false;
     }
-    if (_options !== null && isCustomTriggerSet(name)) {
-      result = _options[name].apply(null, newArguments);
+    if (options !== null && isDefinedFunction(options[name])) {
+      result = options[name].apply(null, newArguments);
     }
     return result;
   }
@@ -218,19 +226,9 @@
     }
     return result;
   }
-  function buildDefaultOptions(newOptions) {
-    var options = !isDefinedObject(newOptions) ? {} : newOptions;
-    options.showCopyButton = getDefaultBoolean(options.showCopyButton, true);
-    return setTranslationStringOptions(options);
-  }
-  function setTranslationStringOptions(newOptions) {
-    newOptions.copyButtonText = getDefaultString(newOptions.copyButtonText, "Copy");
-    return newOptions;
-  }
   var _parameter_Document = null;
   var _parameter_Navigator = null;
   var _string = {empty:"", space:" ", newLine:"\n"};
-  var _options = {};
   var _elements_Type = {};
   var _strings_Cached = {};
   var _strings_Cached_Count = 0;
@@ -254,27 +252,12 @@
     }
     return added;
   };
-  this.setOptions = function(newOptions, triggerEvent) {
-    _options = !isDefinedObject(newOptions) ? {} : newOptions;
-    triggerEvent = !isDefinedBoolean(triggerEvent) ? true : triggerEvent;
-    var propertyName;
-    for (propertyName in newOptions) {
-      if (newOptions.hasOwnProperty(propertyName)) {
-        _options[propertyName] = newOptions[propertyName];
-      }
-    }
-    if (triggerEvent) {
-      fireCustomTrigger("onOptionsUpdated", _options);
-    }
-    return this;
-  };
   this.getVersion = function() {
-    return "0.3.0";
+    return "0.4.0";
   };
   (function(documentObject, navigatorObject, windowObject) {
     _parameter_Document = documentObject;
     _parameter_Navigator = navigatorObject;
-    _options = buildDefaultOptions();
     _parameter_Document.addEventListener("DOMContentLoaded", function() {
       render();
     });

diff --git a/dist/syntax.js.css b/dist/syntax.js.css
@@ -1,5 +1,5 @@
 /*
- * Syntax.js Library v0.3.0
+ * Syntax.js Library v0.4.0
  *
  * Copyright 2023 Bunoon
  * Released under the MIT License

diff --git a/dist/syntax.js.min.css b/dist/syntax.js.min.css