Refactor EntityInfo to carry LogicalName; replace tuple targetEntitySets with EntityInfo[]

RawState now stores entities as an array; the nameMap is built later in
interpretCrmData. XrmAttribute.targetEntitySets drops the option wrapper
in favor of an empty array, and InterpretEntityMetadata uses Map.find
instead of silently dropping unmapped lookup targets.

Author: Mosh-K

src/CreateTypeScript/CreateWebEntities.fs

@@ -60,7 +60,7 @@ let getAttributeComment (attr: XrmAttribute) (options: OptionSet list option) =
   Comment.Attribute(
     attr.displayName,
     colType = attr.colType,
-    ?tes = attr.targetEntitySets,
+    tes = attr.targetEntitySets,
     link = link,
     logicalName = logicalName
   )
@@ -223,25 +223,20 @@ let getFormattedVars (entity: XrmEntity) =
 
 let getLookupNameVars (attrs: XrmAttribute list) =
   attrs
-  |> List.choose (fun a ->
-    match a.targetEntitySets with
-    | None
-    | Some [||] -> None
-    | Some tes ->
-      let unionType =
-        tes
-        |> Array.map (fun (n, _, _) -> TsType.Custom $"\"{n}\"")
-        |> Array.toList
-        |> TsType.Union
-
-      Some(
-        Variable.Create(
-          $"\"{valueInfix a.logicalName}@Microsoft.Dynamics.CRM.lookuplogicalname\"",
-          unionType,
-          Comment.Attribute(a.displayName, ?tes = a.targetEntitySets),
-          optional = true
-        )
-      ))
+  |> List.filter (fun a -> a.specialType = SpecialType.EntityReference)
+  |> List.map (fun a ->
+    let unionType =
+      a.targetEntitySets
+      |> Array.map (fun e -> TsType.Custom $"\"{e.LogicalName}\"")
+      |> Array.toList
+      |> TsType.Union
+
+    Variable.Create(
+      $"\"{valueInfix a.logicalName}@Microsoft.Dynamics.CRM.lookuplogicalname\"",
+      unionType,
+      Comment.Attribute(a.displayName, tes = a.targetEntitySets),
+      optional = true
+    ))
   |> sortByName
 
 let getScalarVars (filter: XrmAttribute -> bool) (entity: XrmEntity) =
@@ -294,9 +289,7 @@ let getIntersectEntities (nameMap: Map<string, EntityInfo>) (entity: XrmEntity)
     | [] -> []
     | rel :: _ ->
       [ rel.Entity1LogicalName; rel.Entity2LogicalName ]
-      |> List.map (fun ln ->
-        let eInfo = Map.find ln nameMap
-        ln, eInfo.DisplayName)
+      |> List.map (fun ln -> Map.find ln nameMap)
 
 let getBlankEntityInterfaces (nameMap: Map<string, EntityInfo>) (entity: XrmEntity) =
   let comment =

src/Domain.fs

@@ -109,6 +109,9 @@ type XdtRetrievalSettings = {
 
 [<DataContract>]
 type EntityInfo = {
+  [<field : DataMember(Name = "LogicalName")>]
+  LogicalName: string
+
   [<field : DataMember(Name = "SchemaName")>]
   SchemaName: string
 
@@ -130,7 +133,7 @@ type RawState = {
   metadata: EntityMetadata[]
 
   [<field : DataMember>]
-  nameMap: Map<string, EntityInfo>
+  info: EntityInfo[]
 
   [<field : DataMember>]
   bpfData: Entity[]

src/Generation/DataRetrieval.fs

@@ -16,20 +16,19 @@ let connectToCrm xrmAuth =
   proxy
 
 // Retrieve CRM entity name map
-let retrieveEntityNameMap mainProxy =
+let retrieveEntitiesInfo mainProxy =
   printf "Fetching entity names from CRM..."
 
-  let map =
+  let arr =
     getAllEntityMetadataLight mainProxy
     |> Array.Parallel.map (fun m ->
-      m.LogicalName,
-      { SchemaName = m.SchemaName
+      { LogicalName = m.LogicalName
+        SchemaName = m.SchemaName
         EntitySetName = m.EntitySetName
         DisplayName = getLabel m.DisplayName })
-    |> Map.ofArray
 
   printfn "Done!"
-  map
+  arr
 
 // Retrieve CRM entity metadata
 let retrieveEntityMetadata entities (mainProxy:IOrganizationService) =
@@ -57,8 +56,8 @@ let retrieveCrmVersion mainProxy =
 
 /// Retrieve all the necessary CRM data
 let retrieveCrmData crmVersion entities (mainProxy:IOrganizationService) skipInactiveForms =
-  let nameMap = 
-    retrieveEntityNameMap mainProxy
+  let entitiesInfo =
+    retrieveEntitiesInfo mainProxy
 
   let rawEntityMetadata = 
     retrieveEntityMetadata entities mainProxy
@@ -84,7 +83,7 @@ let retrieveCrmData crmVersion entities (mainProxy:IOrganizationService) skipIna
 
   { 
     RawState.metadata = rawEntityMetadata
-    nameMap = nameMap
+    info = entitiesInfo
     bpfData = bpfData
     formData = formData 
     crmVersion = crmVersion

src/Generation/Setup.fs

@@ -71,8 +71,10 @@ let intersectForms formDict formsToIntersect =
 let interpretCrmData (gSettings: XdtGenerationSettings) (rawState: RawState) =
   printf "Interpreting data..."
 
+  let nameMap = rawState.info |> Array.map (fun e -> e.LogicalName, e) |> Map.ofArray
+
   let entityMetadata =
-    rawState.metadata |> Array.Parallel.map (interpretEntity rawState.nameMap gSettings.labelMapping)
+    rawState.metadata |> Array.Parallel.map (interpretEntity nameMap gSettings.labelMapping)
 
   let bpfControls = interpretBpfs rawState.bpfData
 
@@ -84,5 +86,5 @@ let interpretCrmData (gSettings: XdtGenerationSettings) (rawState: RawState) =
     bpfControls = bpfControls
     forms = forms
     outputDir = gSettings.out
-    nameMap = rawState.nameMap
+    nameMap = nameMap
   }

src/IntermediateRepresentation.fs

@@ -26,7 +26,7 @@ type XrmAttribute = {
   logicalName: string
   varType: TsType
   specialType: SpecialType
-  targetEntitySets: (string * string * string)[] option
+  targetEntitySets: EntityInfo[]
   colType: XrmAttributeType
   readable: bool
   createable: bool

src/Interpretation/InterpretEntityMetadata.fs

@@ -57,16 +57,9 @@ let interpretAttribute (nameMap: Map<string, EntityInfo>) labelMapping (a: Attri
 
   let targetEntitySets =
     match a with
-    | :? LookupAttributeMetadata as lam -> 
-      lam.Targets
-      |> Array.choose 
-        (fun k -> 
-          match Map.tryFind k nameMap with
-          | None -> None
-          | Some tes -> Some (k, tes.EntitySetName, tes.DisplayName)
-        )
-      |> Some
-    | _ -> None
+    | :? LookupAttributeMetadata as lam ->
+      lam.Targets |> Array.map (fun k -> Map.find k nameMap)
+    | _ -> [||]
 
   let vType, sType = interpretNormalAttribute aType options
 

src/Interpretation/InterpretFormXml.fs

@@ -51,12 +51,10 @@ let getTargetEntities (tes: string option) (a: XrmAttribute option) =
   | None, None -> "\"NoAttribute\""
   | None, Some a' ->
     match a'.targetEntitySets with
-    | None -> if a.Value.specialType = Guid then "string" else "\"NoAttributeTargets\""
-    | Some tes' ->
-      let el = tes' |> Array.map (fun (l, _, _) -> l) |> Array.toList
-      match el.IsEmpty with
-      | true -> "\"NoTargets\""
-      | false -> List.fold(fun acc e -> $"{acc} | \"{e}\"") ($"\"{el.Head}\"") el.Tail
+    | [||] -> if a.Value.specialType = Guid then "string" else "\"NoAttributeTargets\""
+    | tes' ->
+      let el = tes' |> Array.map (fun e -> e.LogicalName) |> Array.toList
+      List.fold(fun acc e -> $"{acc} | \"{e}\"") ($"\"{el.Head}\"") el.Tail
 
 let getAttributeType = function
   | None -> TsType.Undefined
@@ -72,7 +70,7 @@ let getAttribute (enums:Map<string,TsType>) (entity: XrmEntity) (cField: Control
   let comment = 
     match attribute with
     | None -> Comment.Basic cField.displayName
-    | Some attr -> Comment.Attribute(attr.displayName, colType = attr.colType, ?tes = attr.targetEntitySets, link = getEnumLink entity.optionSets attr)
+    | Some attr -> Comment.Attribute(attr.displayName, colType = attr.colType, tes = attr.targetEntitySets, link = getEnumLink entity.optionSets attr)
 
   let attrType = getAttributeType attribute
 
@@ -136,7 +134,7 @@ let getControl  (enums:Map<string,TsType>) (entity: XrmEntity) (cField:ControlFi
     | None -> Comment.Basic cField.displayName
     | Some attr ->
       let label = if cField.displayName.Trim() <> attr.displayName.Trim() then cField.displayName else ""
-      Comment.Attribute(attr.displayName, label = label, colType = attr.colType, ?tes = attr.targetEntitySets, link = getEnumLink entity.optionSets attr)
+      Comment.Attribute(attr.displayName, label = label, colType = attr.colType, tes = attr.targetEntitySets, link = getEnumLink entity.optionSets attr)
 
   let cType = 
     match cField.controlClass with

src/TypeScript/Comment.fs

@@ -20,7 +20,7 @@ type Comment =
       if not (IsNullOrWhiteSpace setName) then yield $"Set Name: `{setName.Trim()}`"
       if defaultArg isIntersect false then yield "Intersect Table"
       match intersectEntities with
-      | (ln1, dn1) :: (ln2, dn2) :: _ -> yield $"Intersects: {dn1} (`{ln1}`) ⟷ {dn2} (`{ln2}`)"
+      | e1 :: e2 :: _ -> yield $"Intersects: {e1.DisplayName} (`{e1.LogicalName}`) ⟷ {e2.DisplayName} (`{e2.LogicalName}`)"
       | _ -> () ]
     |> Comment.Wrap
 
@@ -36,7 +36,7 @@ type Comment =
       if not (IsNullOrWhiteSpace logicalName) then yield $"Lookup Field: `{logicalName.Trim()}`"
       if tes.Length > 0 then
         let maxDisplay = 5
-        let shown = tes |> Array.truncate maxDisplay |> Array.map (fun (ln, _, dn) -> $"{dn} (`{ln}`)") |> String.concat " | "
+        let shown = tes |> Array.truncate maxDisplay |> Array.map (fun e -> $"{e.DisplayName} (`{e.LogicalName}`)") |> String.concat " | "
         let formatted = if tes.Length <= maxDisplay then shown else $"{shown} | +{tes.Length - maxDisplay} more"
         yield $"Table: {formatted}"
       if not (IsNullOrWhiteSpace label) then yield $"Label: {label.Trim()}"