Merge pull request #4 from BastianBlokland/feature/generator-3.5

Update to EnumGenerator.Core 3.5.1217

.ci/update-dependencies.sh

@@ -23,7 +23,7 @@ rm -rf "$LIBRARY_DIR"
 ensureDir "$LIBRARY_DIR"
 
 info "Fetching nuget packages"
-withRetry nuget install "$NUGET_PACKAGE" -OutputDirectory "$NUGET_DIR"
+withRetry nuget install "$NUGET_PACKAGE" -OutputDirectory "$NUGET_DIR" -NoCache
 
 saveDll ()
 {

.example/Assets/Scripts/Units.g.cs

@@ -1,51 +1,32 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Generated by: EnumGenerator.Core - 3.2.1196.0
+//     Generated by: EnumGenerator.Core - 3.5.1217.0
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 using System.CodeDom.Compiler;
 
-[GeneratedCode("EnumGenerator.Core", "3.2.1196.0")]
+[GeneratedCode("EnumGenerator.Core", "3.5.1217.0")]
 public enum Units
 {
     HesthargTheEpic = 10,
-
     HalranTheSweet = 20,
-
     NewaruTheCool = 30,
-
     FledtheTheDude = 40,
-
     RistanTheStuff = 50,
-
     NkeleTheWarrior = 60,
-
     RaktrargTheMage = 70,
-
     HukrolmTheElf = 80,
-
     ConnchopTheOrk = 90,
-
     OrdhesTheWizard = 100,
-
     OdrudTheHandmaiden = 110,
-
     NeeaTheMagnificent = 120,
-
     CuthodTheEpic = 130,
-
     ChopneonTheRock = 140,
-
     TycromTheUberLord = 150,
-
     KahvortheonTheThinker = 160,
-
     LeofunTheDwarf = 170,
-
     HildahildaTheFool = 180,
-
     CynranTheBrains = 190,
-
     ThebeorthTheMechanic = 200,
 }

.lib/manifest.txt

@@ -1,4 +1,4 @@
-EnumGenerator.Core.3.3.1203
+EnumGenerator.Core.3.5.1217
 Microsoft.Extensions.Configuration.2.2.0
 Microsoft.Extensions.Configuration.Abstractions.2.2.0
 Microsoft.Extensions.Configuration.Binder.2.2.0

README.md

@@ -1,6 +1,6 @@
 # EnumGenerator-Unity
 
-Unity package tool for generating c# enums based on json input files.
+Unity package tool for generating c# / f# / vb / cil enums based on json input files.
 
 ## Description
 If you have config in json files it can be nice to have a enum to reference in the code instead of
@@ -11,13 +11,13 @@ having to hard code values, this tool allows you to generate that enum.
 
     ```
     "dependencies": {
-        "com.bastianblokland.enumgenerator": "https://github.com/BastianBlokland/enum-generator-unity.git#v1.3",
+        "com.bastianblokland.enumgenerator": "https://github.com/BastianBlokland/enum-generator-unity.git#v1.4",
         ...
     }
     ```
 2. Add the NuGet dependency to your project.
 
-    If your project uses a NuGet package manager you can simply add a dependency to [**EnumGenerator.Core**](https://www.nuget.org/packages/EnumGenerator.Core/) version `3.3.*`.
+    If your project uses a NuGet package manager you can simply add a dependency to [**EnumGenerator.Core**](https://www.nuget.org/packages/EnumGenerator.Core/) version `3.5.*`.
 
     If you are not using a NuGet package manager you can simply copy the dll's from the [`.lib`](https://github.com/BastianBlokland/enum-generator-unity/tree/master/.lib) directory to your project.
 

package.json

@@ -2,7 +2,7 @@
   "name": "com.bastianblokland.enumgenerator",
   "displayName": "Enum Generator",
   "author": "Bastian Blokland",
-  "version": "1.0.0",
+  "version": "1.4.0",
   "unity": "2018.4",
   "description": "Tool for generating c# enums based on json input files. Repository: https://github.com/bastianblokland/enum-generator-unity",
   "keywords": [

src/GeneratorApi.cs

@@ -156,6 +156,43 @@ public static void GenerateEnumToFile(
 
                     break;
 
+                case OutputType.FSharp:
+                    try
+                    {
+                        output = Utf8NoBom.GetBytes(enumDefinition.ExportFSharp(
+                            string.IsNullOrEmpty(enumNamespace) ? "Generated" : enumNamespace,
+                            headerMode,
+                            indentSize,
+                            newlineMode,
+                            storageType));
+                    }
+                    catch (Exception e)
+                    {
+                        logger?.LogCritical($"Failed to generate fsharp: {e.Message}");
+                        return;
+                    }
+
+                    break;
+
+                case OutputType.VisualBasic:
+                    try
+                    {
+                        output = Utf8NoBom.GetBytes(enumDefinition.ExportVisualBasic(
+                            enumNamespace,
+                            headerMode,
+                            indentMode,
+                            indentSize,
+                            newlineMode,
+                            storageType));
+                    }
+                    catch (Exception e)
+                    {
+                        logger?.LogCritical($"Failed to generate visual-basic: {e.Message}");
+                        return;
+                    }
+
+                    break;
+
                 case OutputType.Cil:
                     try
                     {
@@ -248,6 +285,10 @@ private static string GetRequiredExtension(OutputType outputType)
             {
                 case OutputType.CSharp:
                     return ".cs";
+                case OutputType.FSharp:
+                    return ".fs";
+                case OutputType.VisualBasic:
+                    return ".vb";
                 case OutputType.Cil:
                     return ".il";
                 case OutputType.ClassLibrary:
@@ -263,6 +304,10 @@ private static string GetDesiredExtension(OutputType outputType)
             {
                 case OutputType.CSharp:
                     return ".g.cs";
+                case OutputType.FSharp:
+                    return ".g.fs";
+                case OutputType.VisualBasic:
+                    return ".g.vb";
                 case OutputType.Cil:
                     return ".g.il";
                 case OutputType.ClassLibrary:

src/OutputType.cs

@@ -18,6 +18,16 @@ public enum OutputType
         /// <summary>
         /// Produce a class-library (.dll) file.
         /// </summary>
-        ClassLibrary = 2
+        ClassLibrary = 2,
+
+        /// <summary>
+        /// Produce a FSharp (.fs) source file.
+        /// </summary>
+        FSharp = 3,
+
+        /// <summary>
+        /// Produce a VisualBasic (.vb) source file.
+        /// </summary>
+        VisualBasic = 4,
     }
 }