From 7ed765ee2e09a2ecfcdb3eb3fb73ccc01857fd45 Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Thu, 30 Jan 2025 14:30:40 -0600
Subject: [PATCH] Make MarkupTypeToDefinition public

---
 .../Iris/Markup/CompiledMarkupLoader.cs          | 16 ++--------------
 UIX/Microsoft/Iris/Markup/TypeSchema.cs          | 12 ++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/UIX/Microsoft/Iris/Markup/CompiledMarkupLoader.cs b/UIX/Microsoft/Iris/Markup/CompiledMarkupLoader.cs
index 8a90693..90737ed 100644
--- a/UIX/Microsoft/Iris/Markup/CompiledMarkupLoader.cs
+++ b/UIX/Microsoft/Iris/Markup/CompiledMarkupLoader.cs
@@ -213,7 +213,7 @@ internal class CompiledMarkupLoader
             string name = ReadDataTableString();
             MarkupType exportType = (MarkupType)_reader.ReadInt32();
 
-            MarkupTypeSchema markupTypeSchema = MarkupTypeSchema.Build(MarkupTypeToDefinition(exportType), _loadResultTarget, name);
+            MarkupTypeSchema markupTypeSchema = MarkupTypeSchema.Build(TypeSchema.MarkupTypeToDefinition(exportType), _loadResultTarget, name);
             exportTable[exportIndex] = markupTypeSchema;
         }
         _loadResultTarget.SetExportTable(exportTable);
@@ -270,7 +270,7 @@ internal class CompiledMarkupLoader
         foreach (MarkupTypeSchema markupTypeSchema in _loadResultTarget.ExportTable)
         {
             MarkupType markupType = markupTypeSchema.MarkupType;
-            TypeSchema definition = MarkupTypeToDefinition(markupType);
+            TypeSchema definition = TypeSchema.MarkupTypeToDefinition(markupType);
 
             uint typeDepth = _reader.ReadUInt16();
             markupTypeSchema.SetTypeDepth(typeDepth);
@@ -866,18 +866,6 @@ internal class CompiledMarkupLoader
         return methodSchemaArray;
     }
 
-    private TypeSchema MarkupTypeToDefinition(MarkupType markupType)
-    {
-        return markupType switch
-        {
-            MarkupType.UI => UISchema.Type,
-            MarkupType.Effect => EffectSchema.Type,
-            MarkupType.DataType => DataTypeSchema.Type,
-            MarkupType.DataQuery => DataQuerySchema.Type,
-            _ => ClassSchema.Type,
-        };
-    }
-
     private TypeSchema[] GetTempParameterArray(int count)
     {
         _typeSchemaArrays ??= new TypeSchema[5][];
diff --git a/UIX/Microsoft/Iris/Markup/TypeSchema.cs b/UIX/Microsoft/Iris/Markup/TypeSchema.cs
index 136e07e..0360c62 100644
--- a/UIX/Microsoft/Iris/Markup/TypeSchema.cs
+++ b/UIX/Microsoft/Iris/Markup/TypeSchema.cs
@@ -293,5 +293,17 @@ namespace Microsoft.Iris.Markup
         }
 
         public override string ToString() => $"typeof({Name})";
+
+        public static TypeSchema MarkupTypeToDefinition(MarkupType markupType)
+        {
+            return markupType switch
+            {
+                MarkupType.UI => UISchema.Type,
+                MarkupType.Effect => EffectSchema.Type,
+                MarkupType.DataType => DataTypeSchema.Type,
+                MarkupType.DataQuery => DataQuerySchema.Type,
+                _ => ClassSchema.Type,
+            };
+        }
     }
 }