Added parser option to tool.

Removed fallback namespace of BabylonJS, is now Generated.

Author: canhorn

Source/EventHorizon.Blazor.TypeScript.Interop.Generator/GenerateClassStatementString.cs

@@ -49,10 +49,10 @@ TextFormatter textFormatter
             var classGenerationTemplates = ReadTemplates.Read();
 
             // Generate Tokens
-            var namespaceReplaced = classStatement.Namespace.Replace("BABYLON", "BabylonJS");
+            var namespaceReplaced = classStatement.Namespace;
             if (string.IsNullOrWhiteSpace(namespaceReplaced))
             {
-                namespaceReplaced = "BabylonJS";
+                namespaceReplaced = "Generated";
             }
             classTokenMap["[[NAMESPACE]]"] = namespaceReplaced;
             classTokenMap["[[CLASS_NAME]]"] = classStatement.Name;

Source/EventHorizon.Blazor.TypeScript.Interop.Generator/GenerateSource.cs

@@ -45,7 +45,7 @@ public bool Run(
             GlobalLogger.Info($"=== Consolidated Source Files | ElapsedTime: {stopwatch.ElapsedMilliseconds}ms");
 
             stopwatch.Restart();
-            GlobalLogger.Info($"=== Generated AST");
+            GlobalLogger.Info($"=== Generated AST - {parserType}");
             var ast = ASTParser.ParseText(
                 sourceFilesAsText,
                 new ASTParserOptions

Tests/EventHorizon.Blazor.TypeScript.Interop.Generator.Tests/ExpectedResults/interface.Expected.txt

@@ -1,5 +1,5 @@
 /// Generated - Do Not Edit
-namespace BabylonJS
+namespace Generated
 {
     using System;
     using System.Collections.Generic;

Tests/EventHorizon.Blazor.TypeScript.Interop.Generator.Tests/Formatter/ExpectedResults/CSharpTextFormatter.Expected.txt

@@ -1,5 +1,5 @@
 /// Generated - Do Not Edit
-namespace BabylonJS
+namespace Generated
 {
     using System;
     using System.Collections.Generic;

Tool/EventHorizon.Blazor.TypeScript.Interop.Tool/EventHorizon.Blazor.TypeScript.Interop.Tool.csproj

@@ -18,7 +18,7 @@
     <PropertyGroup>
         <DefaultItemExcludes>$(DefaultItemExcludes);_generated\**\*;_sourceFiles\**\*</DefaultItemExcludes>
     </PropertyGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
     </ItemGroup>

Tool/EventHorizon.Blazor.TypeScript.Interop.Tool/Program.cs

@@ -1,18 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using EventHorizon.Blazor.TypeScript.Interop.Generator;
-using EventHorizon.Blazor.TypeScript.Interop.Generator.Formatter;
-using EventHorizon.Blazor.TypeScript.Interop.Generator.Logging;
-using EventHorizon.Blazor.TypeScript.Interop.Generator.Writers.Project;
-using EventHorizon.Blazor.TypeScript.Interop.Tool.ToolException;
-
 namespace EventHorizon.Blazor.TypeScript.Interop.Tool
 {
+    using System;
+    using System.Collections.Generic;
+    using System.CommandLine;
+    using System.CommandLine.Invocation;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Net;
+    using EventHorizon.Blazor.TypeScript.Interop.Generator;
+    using EventHorizon.Blazor.TypeScript.Interop.Generator.AstParser.Model;
+    using EventHorizon.Blazor.TypeScript.Interop.Generator.Formatter;
+    using EventHorizon.Blazor.TypeScript.Interop.Generator.Logging;
+    using EventHorizon.Blazor.TypeScript.Interop.Generator.Writers.Project;
+    using EventHorizon.Blazor.TypeScript.Interop.Tool.ToolException;
+
     class Program
     {
         private static readonly string SOURCE_FILES_DIRECTORY_NAME = "_sourceFiles";
@@ -50,13 +51,18 @@ static int Main(string[] args)
                     new string[] { "--force", "-f" },
                     getDefaultValue: () => false,
                     description: "This will force generation, by deleting --project-generation-location"
-                )
+                ),
+                new Option<string>(
+                    new string[] { "--parser", "-p" },
+                    getDefaultValue: () => "dotnet",
+                    description: "The type of TypeScript parser to use, 'dotnet' will use the embedded .NET parser. 'nodejs' will use the TypeScript compiler through NodeJS (requires NodeJS installed)."
+                ),
             };
 
-            rootCommand.Description = "Generate a Blazor WASM project from a TypeScript definition file.";
+            rootCommand.Description = "Generate a Blazor Wasm project from a TypeScript definition file.";
 
             // Note that the parameters of the handler method are matched according to the names of the options
-            rootCommand.Handler = CommandHandler.Create<IList<string>, IList<string>, string, string, bool>(
+            rootCommand.Handler = CommandHandler.Create<IList<string>, IList<string>, string, string, bool, string>(
                 GenerateSources
             );
 
@@ -67,9 +73,10 @@ static int Main(string[] args)
         private static int GenerateSources(
             IList<string> source,
             IList<string> classToGenerate,
-            string projectAssembly = "Generated.WASM",
+            string projectAssembly = "Generated.Wasm",
             string projectGenerationLocation = "_generated",
-            bool force = false
+            bool force = false,
+            string parser = "dotnet"
         )
         {
             try
@@ -79,10 +86,12 @@ private static int GenerateSources(
                     source,
                     classToGenerate,
                     projectAssembly,
-                    projectGenerationLocation
+                    projectGenerationLocation,
+                    parser
                 );
                 GlobalLogger.Info($"projectAssembly: {projectAssembly}");
                 GlobalLogger.Info($"projectGenerationLocation: {projectGenerationLocation}");
+                GlobalLogger.Info($"parser: {parser}");
 
                 GlobalLogger.Info($"classToGenerate.Length: {classToGenerate.Count}");
                 foreach (var classToGenerateItem in classToGenerate)
@@ -154,8 +163,8 @@ private static int GenerateSources(
                     textFormatter,
                     new Dictionary<string, string>
                     {
-                    { "BABYLON.PointerInfoBase | type", "int" }
-                    }
+                    },
+                    GetParserType(parser)
                 );
                 stopwatch.Stop();
                 GlobalLogger.Success($"Took {stopwatch.ElapsedMilliseconds}ms to Generate Source Project.");
@@ -182,7 +191,8 @@ private static void ValidateArguments(
             IList<string> sources,
             IList<string> classToGenerate,
             string projectAssembly,
-            string projectGenerationLocation
+            string projectGenerationLocation,
+            string parser
         )
         {
             if (sources == null || sources.Count == 0)
@@ -217,6 +227,15 @@ string projectGenerationLocation
                     "Project Generation Location was null or empty."
                 );
             }
+            if (string.IsNullOrWhiteSpace(
+                parser
+            ) || (parser.ToLower() != "dotnet" && parser.ToLower() != "nodejs"))
+            {
+                throw new ToolArgumentException(
+                    "--parser",
+                    "Invalid parser found. Valid Parsers: [dotnet, nodejs]"
+                );
+            }
         }
 
         /// <summary>
@@ -305,5 +324,13 @@ private static bool IsUrl(
             string sourceFile
         ) => sourceFile.StartsWith("http://")
             || sourceFile.StartsWith("https://");
+
+        private static ASTParserType GetParserType(
+            string parserType
+        ) => parserType switch
+        {
+            "nodejs" => ASTParserType.NodeJS,
+            _ => ASTParserType.Sdcb,
+        };
     }
 }