Change JavaScript engine to ClearScript and update HighlightJS

Author: tetsurom

.gitmodules

@@ -1,98 +1,67 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Scripting.JavaScript;
 using System.IO;
+using Microsoft.ClearScript.V8;
+using AngleSharp.Dom;
+using Microsoft.ClearScript;
 
 namespace PowerSyntax
 {
     public class HighlightJS : IDisposable
     {
+        class Importer
+        {
+            public Importer(HighlightJS hljs)
+            {
+                this.hljs = hljs;
+            }
+
+            public object EvaluateFile(string filename)
+            {
+                string code = hljs.resource.ReadAllText(Path.Combine($@"\lib\{filename.Substring(2)}.js"));
+                return hljs.engine.Evaluate(new DocumentInfo(filename), code);
+            }
+
+            private HighlightJS hljs;
+        };
+
         public HighlightJS(IResourceProvider resource)
         {
             this.resource = resource;
 
-            runtime = new JavaScriptRuntime();
-            engine = runtime.CreateEngine();
-            context = engine.AcquireContext();
+            engine = new V8ScriptEngine();
 
-            engine.SetGlobalFunction("require", Require);
+            engine.AddHostObject("require", new Func<string, object>(x => {
+                string code = resource.ReadAllText(Path.Combine($@"\lib\{x.Substring(2)}.js"));
+                return engine.Evaluate(new DocumentInfo(x), @"(function(){ var exports = {}; var module = { exports: exports };" + code + @"; return exports === module.exports ? exports : module.exports; })()");
+            }));
 
-            hljs = Require(engine, true, engine.UndefinedValue, Params(engine.Converter.FromString(@".\index"))) as JavaScriptObject;
+            hljs = engine.Script.require(@".\index");
 
-            var listLanguages = hljs.GetPropertyByName("listLanguages") as JavaScriptFunction;
-            languages = (listLanguages.Invoke(Params()) as JavaScriptArray).Select(x => engine.Converter.ToString(x)).OrderBy(x => x).ToArray();
+            var listLanguages = hljs.GetProperty("listLanguages") as ScriptObject;
+            var languagesArray = listLanguages.Invoke(false) as ScriptObject;
+            var length = languagesArray.GetProperty("length") as int? ?? 0;
+            languages = Enumerable.Range(0, length).Select(x => languagesArray.GetProperty(x).ToString()).ToArray();
 
-            highlightJsFunction = engine.EvaluateScriptText(@"((hljs, code, languageSubset) => hljs.highlightAuto(code, languageSubset).value)").Invoke(Params()) as JavaScriptFunction;
+            highlightJsFunction = engine.Evaluate(@"((hljs, code, languageSubset) => hljs.highlightAuto(code, [languageSubset]).value)") as ScriptObject;
         }
 
         public void Dispose()
         {
-            highlightJsFunction.Dispose();
-            hljs.Dispose();
-            context.Dispose();
             engine.Dispose();
-            runtime.Dispose();
         }
 
         public IList<string> ListLanguages() => languages;
 
         public string HighlightAuto(string code, string language)
         {
-            return string.IsNullOrEmpty(code) ? string.Empty : engine.Converter.ToString(HighlightAuto(engine.Converter.FromString(code), engine.Converter.FromString(language)));
-        }
-
-        private JavaScriptValue HighlightAuto(JavaScriptValue code, JavaScriptValue language)
-        {
-            return highlightJsFunction.Invoke(Params(hljs, code, Array(language)));
-        }
-
-        private IEnumerable<JavaScriptValue> Params() => Enumerable.Empty<JavaScriptValue>();
-        private IEnumerable<JavaScriptValue> Params(params JavaScriptValue[] args) => args;
-        private JavaScriptArray Array() => engine.CreateArray(0);
-        private JavaScriptArray Array(params JavaScriptValue[] args)
-        {
-            var array = engine.CreateArray(args.Length);
-            for (int i = 0; i < args.Length; ++i)
-            {
-                array[i] = args[i];
-            }
-            return array;
-        }
-
-        private JavaScriptValue Require(JavaScriptEngine engine, bool construct, JavaScriptValue thisValue, IEnumerable<JavaScriptValue> arguments)
-        {
-            var args = arguments
-                .Select(x => engine.Converter.ToString(x))
-                .Select(x => Path.Combine($@"\lib\{x.Substring(2)}.js"))
-                .ToArray();
-            string code = resource.ReadAllText(args[0]);
-
-            var old_module = engine.GetGlobalVariable("module");
-            var old_export = engine.GetGlobalVariable("exports");
-            try
-            {
-                var module = engine.CreateObject();
-                var exports = engine.CreateObject();
-                module.SetPropertyByName("exports", exports);
-                engine.SetGlobalVariable("exports", exports);
-                engine.SetGlobalVariable("module", module);
-                engine.Execute(new Microsoft.Scripting.ScriptSource(args[0], code));
-                var m_exports = module.GetPropertyByName("exports");
-                return m_exports == exports ? exports : m_exports;
-            }
-            finally
-            {
-                engine.SetGlobalVariable("module", old_export);
-                engine.SetGlobalVariable("exports", old_module);
-            }
+            return highlightJsFunction.Invoke(false, hljs, code, language).ToString();
         }
 
-        private JavaScriptRuntime runtime = null;
-        private JavaScriptEngine engine = null;
-        private JavaScriptExecutionContext context = null;
-        private JavaScriptFunction highlightJsFunction = null;
-        private JavaScriptObject hljs = null;
+        private V8ScriptEngine engine = null;
+        private ScriptObject highlightJsFunction = null;
+        private ScriptObject hljs = null;
 
         private string[] languages = null;
         private IResourceProvider resource = null;

HighlightJS.cs

@@ -79,10 +79,13 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-jsrt-dotnet
+ClearScript
 -----------------------------------------------
 
-Copyright (c) 2015 Rob Paveza
+MIT License
+
+Copyright (c) Microsoft Corporation
+All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -100,4 +103,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.