Add TsType.EnumRef DU case for option set enum references

Author: Mosh-K

src/Interpretation/InterpretCommon.fs

@@ -10,7 +10,7 @@ let getLink (e: XrmEntity) (a: XrmAttribute) =
   | XrmAttributeType.MultiSelectPicklist
   | XrmAttributeType.State
   | XrmAttributeType.Status ->
-    let enumName = TsStringUtil.typeToString(a.varType).Split '.' |> Array.last
+    let enumName = match a.varType with TsType.EnumRef name -> name | _ -> ""
     let enum = e.optionSets |> List.tryFind (fun o -> o.name = enumName)
 
     match enum with

src/Interpretation/InterpretEntityMetadata.fs

@@ -1,8 +1,6 @@
 module internal DG.XrmTypeScript.InterpretEntityMetadata
 
 open Utility
-open Constants
-
 open IntermediateRepresentation
 open InterpretOptionSetMetadata
 open Microsoft.Xrm.Sdk.Metadata
@@ -30,10 +28,10 @@ let interpretNormalAttribute aType (options:OptionSet option)  =
   match aType with
   | XrmAttributeType.Money -> TsType.Number, SpecialType.Money
 
-  | XrmAttributeType.MultiSelectPicklist  -> TsType.Custom $"{ENUM_NS}.{options.Value.name}", SpecialType.MultiSelectOptionSet
+  | XrmAttributeType.MultiSelectPicklist  -> TsType.EnumRef options.Value.name, SpecialType.MultiSelectOptionSet
   | XrmAttributeType.Picklist
   | XrmAttributeType.State
-  | XrmAttributeType.Status               -> TsType.Custom $"{ENUM_NS}.{options.Value.name}", SpecialType.OptionSet
+  | XrmAttributeType.Status               -> TsType.EnumRef options.Value.name, SpecialType.OptionSet
 
   | XrmAttributeType.Lookup
   | XrmAttributeType.PartyList

src/TypeScript/TsStringUtil.fs

@@ -1,5 +1,7 @@
 module internal DG.XrmTypeScript.TsStringUtil
 
+open Constants
+
 let getConstantType (name:string) = name.Replace("\\", "\\\\").Replace("\"", "\\\"") |> sprintf "\"%s\"" |> TsType.Custom
 
 let rec wrapIfRecursive ty =
@@ -24,6 +26,7 @@ and typeToString = function
       (String.concat ", " (List.collect varToIString v)) 
       (typeToString r)
   | TsType.Custom s       -> s
+  | TsType.EnumRef name   -> $"{ENUM_NS}.{name}"
   | TsType.Generic(n, t)  -> sprintf "%s<%s>" n t
   | TsType.SpecificGeneric(n,ts) 
                           -> sprintf "%s<%s>" n (ts |> Seq.map typeToString |> String.concat ", ")

src/TypeScript/TypeScript.fs

@@ -27,6 +27,7 @@ type TsType =
   | SpecificGeneric of string * TsType list
   | Function of Variable list * TsType
   | Custom of string
+  | EnumRef of string
   | Union of TsType list
   | Intersection of TsType list