🤖 Merge PR DefinitelyTyped#72181 Allow MultiSelect Attribute to use enum in XRM by @aquacash5

Author: aquacash5

types/xrm/index.d.ts

@@ -2923,7 +2923,7 @@ declare namespace Xrm {
          * Interface an OptionSet attribute.
          * @see {@link EnumAttribute}
          */
-        interface MultiSelectOptionSetAttribute extends EnumAttribute<number[]> {
+        interface MultiSelectOptionSetAttribute<T extends number = number> extends EnumAttribute<T[]> {
             /**
              * Gets the attribute format.
              * @returns The format of the attribute.

types/xrm/xrm-tests.ts

@@ -153,7 +153,7 @@ alert(`The current form type is: ${formContext.ui.getFormType()}`);
 
 alert(`The current entity type is: ${formContext.data.entity.getEntityName()}`);
 
-/// Demonstrate Optionset Value as int in Turbo Forms
+/// Demonstrate OptionSet Value as int
 
 const optionSetAttribute = formContext.getAttribute<Xrm.Attributes.OptionSetAttribute>("statuscode");
 if (optionSetAttribute !== null) {
@@ -170,6 +170,41 @@ if (optionSetAttribute !== null) {
     }
 }
 
+/// Demonstrate OptionSet Value as enum
+
+enum TestOptionSet {
+    Option1 = 56666000,
+    Option2 = 56666001,
+}
+
+const optionSetAttributeEnum = formContext.getAttribute<Xrm.Attributes.OptionSetAttribute<TestOptionSet>>("statuscode");
+if (optionSetAttributeEnum !== null) {
+    const optionEnumValue: TestOptionSet | null = optionSetAttributeEnum.getValue();
+}
+
+/// Demonstrate MultiSelectOptionSet Value as int
+
+const multiSelectOptionSetAttribute = formContext.getAttribute<Xrm.Attributes.MultiSelectOptionSetAttribute>(
+    "statuscode",
+);
+if (multiSelectOptionSetAttribute !== null) {
+    const multiSelectOptionValue: number = multiSelectOptionSetAttribute.getOptions()[0].value;
+}
+
+/// Demonstrate MultiSelectOptionSet Value as enum
+
+enum TestMultiSelectOptionSet {
+    Option1 = 56666000,
+    Option2 = 56666001,
+}
+
+const multiSelectOptionSetAttributeEnum = formContext.getAttribute<
+    Xrm.Attributes.MultiSelectOptionSetAttribute<TestMultiSelectOptionSet>
+>("statuscode");
+if (multiSelectOptionSetAttributeEnum !== null) {
+    const multiSelectOptionEnumValue: TestMultiSelectOptionSet[] | null = multiSelectOptionSetAttributeEnum.getValue();
+}
+
 /// Demonstrate setFormNotification
 
 let level: Xrm.FormNotificationLevel;
@@ -634,7 +669,7 @@ const multiSelectOptionSetControl = formContext.getControl<Xrm.Controls.MultiSel
 if (multiSelectOptionSetControl === null) {
     throw new Error("Control does not exist!");
 }
-// $ExpectType MultiSelectOptionSetAttribute
+// $ExpectType MultiSelectOptionSetAttribute<number>
 multiSelectOptionSetControl.getAttribute();
 
 // Demonstrates getWebResourceUrl