Add option for handling internals

src/CodeGenerator/CodeGenerator.csproj

@@ -24,6 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
 </Project>

src/CodeGenerator/ImguiDefinitions.cs

@@ -22,7 +22,7 @@ static int GetInt(JToken token, string key)
             if (v == null) return 0;
             return v.ToObject<int>();
         }
-        public void LoadFrom(string directory)
+        public void LoadFrom(string directory, bool useInternals = false)
         {
 
             JObject typesJson;
@@ -66,23 +66,27 @@ public void LoadFrom(string directory)
             {
                 JProperty jp = (JProperty)jt;
                 string name = jp.Name;
-                if (typeLocations?[jp.Name]?.Value<string>().Contains("internal") ?? false) {
+                bool isInternal = typeLocations?[jp.Name]?.Value<string>().Contains("internal") ?? false;
+
+                if (!useInternals && isInternal)
                     return null;
-                }
+
                 EnumMember[] elements = jp.Values().Select(v =>
                 {
                     return new EnumMember(v["name"].ToString(), v["calc_value"].ToString());
                 }).ToArray();
-                return new EnumDefinition(name, elements);
+                return new EnumDefinition(name, elements, isInternal);
             }).Where(x => x != null).ToArray();
 
             Types = typesJson["structs"].Select(jt =>
             {
                 JProperty jp = (JProperty)jt;
                 string name = jp.Name;
-                if (typeLocations?[jp.Name]?.Value<string>().Contains("internal") ?? false) {
+                bool isInternal = typeLocations?[jp.Name]?.Value<string>().Contains("internal") ?? false;
+
+                if (!useInternals && isInternal)
                     return null;
-                }
+
                 TypeReference[] fields = jp.Values().Select(v =>
                 {
                     if (v["type"].ToString().Contains("static")) { return null; }
@@ -95,7 +99,7 @@ public void LoadFrom(string directory)
                         v["template_type"]?.ToString(),
                         Enums);
                 }).Where(tr => tr != null).ToArray();
-                return new TypeDefinition(name, fields);
+                return new TypeDefinition(name, fields, isInternal);
             }).Where(x => x != null).ToArray();
 
             Functions = functionsJson.Children().Select(jt =>
@@ -112,16 +116,22 @@ public void LoadFrom(string directory)
                     {
                         friendlyName = "Destroy";
                     }
-                    //skip internal functions
+                    // Hunt for internal and react
+                    bool isInternal = val["location"]?.ToString().Contains("internal") ?? false;
                     var typename = val["stname"]?.ToString();
                     if (!string.IsNullOrEmpty(typename))
                     {
-                        if (!Types.Any(x => x.Name == val["stname"]?.ToString())) {
+                        TypeDefinition foundType = Types.FirstOrDefault(x => x.Name == val["stname"]?.ToString());
+
+                        if (foundType != null)
+                            isInternal = foundType.IsInternal;
+                        else
                             return null;
-                        }
                     }
                     if (friendlyName == null) { return null; }
-                    if (val["location"]?.ToString().Contains("internal") ?? false) return null;
+
+                    if (!useInternals && isInternal)
+                        return null;
 
                     string exportedName = ov_cimguiname;
                     if (exportedName == null)
@@ -185,7 +195,8 @@ public void LoadFrom(string directory)
                         structName,
                         comment,
                         isConstructor,
-                        isDestructor);
+                        isDestructor,
+                        isInternal);
                 }).Where(od => od != null).ToArray();
                 if(overloads.Length == 0) return null;
                 return new FunctionDefinition(name, overloads, Enums);
@@ -232,8 +243,9 @@ class EnumDefinition
         public string[] Names { get; }
         public string[] FriendlyNames { get; }
         public EnumMember[] Members { get; }
+        public bool IsInternal { get; }
 
-        public EnumDefinition(string name, EnumMember[] elements)
+        public EnumDefinition(string name, EnumMember[] elements, bool isInternal)
         {
             if (TypeInfo.AlternateEnumPrefixes.TryGetValue(name, out string altName))
             {
@@ -265,6 +277,7 @@ public EnumDefinition(string name, EnumMember[] elements)
             {
                 _sanitizedNames.Add(el.Name, SanitizeMemberName(el.Name));
             }
+            IsInternal = isInternal;
         }
 
         public string SanitizeNames(string text)
@@ -336,11 +349,13 @@ class TypeDefinition
     {
         public string Name { get; }
         public TypeReference[] Fields { get; }
+        public bool IsInternal { get; }
 
-        public TypeDefinition(string name, TypeReference[] fields)
+        public TypeDefinition(string name, TypeReference[] fields, bool isInternal)
         {
             Name = name;
             Fields = fields;
+            IsInternal = isInternal;
         }
     }
 
@@ -530,6 +545,7 @@ class OverloadDefinition
         public string Comment { get; }
         public bool IsConstructor { get; }
         public bool IsDestructor { get; }
+        public bool IsInternal { get; }
 
         public OverloadDefinition(
             string exportedName,
@@ -540,7 +556,8 @@ public OverloadDefinition(
             string structName,
             string comment,
             bool isConstructor,
-            bool isDestructor)
+            bool isDestructor,
+            bool isInternal)
         {
             ExportedName = exportedName;
             FriendlyName = friendlyName;
@@ -552,11 +569,12 @@ public OverloadDefinition(
             Comment = comment;
             IsConstructor = isConstructor;
             IsDestructor = isDestructor;
+            IsInternal = isInternal;
         }
 
         public OverloadDefinition WithParameters(TypeReference[] parameters)
         {
-            return new OverloadDefinition(ExportedName, FriendlyName, parameters, DefaultValues, ReturnType, StructName, Comment, IsConstructor, IsDestructor);
+            return new OverloadDefinition(ExportedName, FriendlyName, parameters, DefaultValues, ReturnType, StructName, Comment, IsConstructor, IsDestructor, IsInternal);
         }
     }
 }