Patch: Handle enum values in type extensions

Author: mingyaulee

src/WebExtensions.Net.Generator/EntitiesRegistration/AnonymousTypeProcessor.cs

@@ -121,7 +121,7 @@ private void Process(IEnumerable<string> nameHierarchy, TypeReference? typeRefer
                 var typeEntity = registrarFactory.TypeEntityRegistrar.GetTypeEntity(typeReference.Ref, namespaceEntity);
                 if (typeReferencesProcessed.Add(typeEntity.NamespaceQualifiedId))
                 {
-                    ProcessTypeDefinition(typeEntity.FormattedName, typeEntity.Definition, typeEntity.NamespaceEntity);
+                    ProcessTypeDefinitionWithExtensions(typeEntity.FormattedName, typeEntity.Definition, typeEntity.Extensions, typeEntity.NamespaceEntity);
                 }
                 return;
             }
@@ -189,14 +189,20 @@ private static bool ShouldRegisterObjectType(TypeReference typeReference)
         private static bool ShouldProcessTypeChoices(TypeReference typeReference)
         {
             if (typeReference.TypeChoices is null ||
-                typeReference.TypeChoices.All(typeChoice => typeChoice.Type == ObjectType.String && typeChoice.EnumValues is not null))
+                // When all type choices are enum, it will be handled by EnumClassEntityRegistrar
+                typeReference.TypeChoices.All(IsEnumString))
             {
                 return false;
             }
 
             return true;
         }
 
+        private static bool IsEnumString(TypeDefinition typeDefinition)
+        {
+            return typeDefinition.Type == ObjectType.String && typeDefinition.EnumValues is not null;
+        }
+
         private static void TryHandleSingleTypeChoice(TypeReference typeReference)
         {
             if (typeReference.TypeChoices is null)
@@ -421,6 +427,36 @@ private void ProcessTypeChoices(IEnumerable<string> nameHierarchy, IEnumerable<T
                 Process(SetNameSuffix(nameHierarchy, registrationOptions.TypeChoicesTypeNameSuffix + typeChoiceIndex++), typeChoice, namespaceEntity);
             }
         }
+        private void ProcessTypeDefinitionWithExtensions(string className, TypeDefinition typeDefinition, IList<TypeDefinition> extensions, NamespaceEntity namespaceEntity)
+        {
+            if (extensions.Count > 0)
+            {
+                var enumChoice = typeDefinition.TypeChoices?.FirstOrDefault(IsEnumString);
+                foreach(var extension in extensions)
+                {
+                    var enumChoiceExtension = IsEnumString(extension) ? extension : extension.TypeChoices?.FirstOrDefault(IsEnumString);
+                    if (enumChoiceExtension?.EnumValues?.Any() ?? false)
+                    {
+                        if (typeDefinition.EnumValues is not null)
+                        {
+                            typeDefinition.EnumValues = typeDefinition.EnumValues.Concat(enumChoiceExtension.EnumValues).ToList();
+                        }
+                        else if (enumChoice is not null)
+                        {
+                            enumChoice.EnumValues = (enumChoice.EnumValues ?? []).Concat(enumChoiceExtension.EnumValues).ToList();
+                        }
+                        else
+                        {
+                            enumChoice = SerializationHelper.DeserializeTo<TypeDefinition>(enumChoiceExtension);
+                            typeDefinition.TypeChoices = (typeDefinition.TypeChoices ?? [])
+                                .Concat([enumChoice]);
+                        }
+                    }
+                }
+            }
+
+            Process([className], typeDefinition, namespaceEntity);
+        }
 
         private static string[] SetNameSuffix(IEnumerable<string> nameHierarchy, string suffix)
         {

src/WebExtensions.Net.Generator/Extensions/StringExtensions.cs

@@ -32,7 +32,7 @@ public static string ToCapitalCase(this string name)
 
         public static string ToCSharpName(this string name, bool toCapitalCase = false, bool avoidReservedKeywords = true)
         {
-            var tokenizedNameSegments = name.Split(['-', '_', '<', '>', ' '], System.StringSplitOptions.RemoveEmptyEntries);
+            var tokenizedNameSegments = name.Split(['-', '_', '.', '<', '>', ' '], System.StringSplitOptions.RemoveEmptyEntries);
             name = string.Join("", tokenizedNameSegments.Select((tokenizedNameSegment, index) =>
             {
                 var startsWithAsciiLetter = char.IsAsciiLetter(tokenizedNameSegment[0]);

src/WebExtensions.Net/Generated/Manifest/OptionalOnlyPermission.cs

@@ -6,5 +6,12 @@ namespace WebExtensions.Net.Manifest
     [JsonConverter(typeof(EnumStringConverter<OptionalOnlyPermission>))]
     public enum OptionalOnlyPermission
     {
+        /// <summary>trialML</summary>
+        [EnumValue("trialML")]
+        TrialML,
+
+        /// <summary>userScripts</summary>
+        [EnumValue("userScripts")]
+        UserScripts,
     }
 }

src/WebExtensions.Net/Generated/Manifest/OptionalPermissionNoPrompt.cs

@@ -9,5 +9,45 @@ public enum OptionalPermissionNoPrompt
         /// <summary>idle</summary>
         [EnumValue("idle")]
         Idle,
+
+        /// <summary>cookies</summary>
+        [EnumValue("cookies")]
+        Cookies,
+
+        /// <summary>scripting</summary>
+        [EnumValue("scripting")]
+        Scripting,
+
+        /// <summary>webRequest</summary>
+        [EnumValue("webRequest")]
+        WebRequest,
+
+        /// <summary>webRequestAuthProvider</summary>
+        [EnumValue("webRequestAuthProvider")]
+        WebRequestAuthProvider,
+
+        /// <summary>webRequestBlocking</summary>
+        [EnumValue("webRequestBlocking")]
+        WebRequestBlocking,
+
+        /// <summary>webRequestFilterResponse</summary>
+        [EnumValue("webRequestFilterResponse")]
+        WebRequestFilterResponse,
+
+        /// <summary>webRequestFilterResponse.serviceWorkerScript</summary>
+        [EnumValue("webRequestFilterResponse.serviceWorkerScript")]
+        WebRequestFilterResponseServiceWorkerScript,
+
+        /// <summary>menus.overrideContext</summary>
+        [EnumValue("menus.overrideContext")]
+        MenusOverrideContext,
+
+        /// <summary>search</summary>
+        [EnumValue("search")]
+        Search,
+
+        /// <summary>activeTab</summary>
+        [EnumValue("activeTab")]
+        ActiveTab,
     }
 }

src/WebExtensions.Net/Generated/Manifest/OptionalPermissionType2.cs

@@ -21,5 +21,81 @@ public enum OptionalPermissionType2
         /// <summary>notifications</summary>
         [EnumValue("notifications")]
         Notifications,
+
+        /// <summary>browserSettings</summary>
+        [EnumValue("browserSettings")]
+        BrowserSettings,
+
+        /// <summary>declarativeNetRequestFeedback</summary>
+        [EnumValue("declarativeNetRequestFeedback")]
+        DeclarativeNetRequestFeedback,
+
+        /// <summary>downloads</summary>
+        [EnumValue("downloads")]
+        Downloads,
+
+        /// <summary>downloads.open</summary>
+        [EnumValue("downloads.open")]
+        DownloadsOpen,
+
+        /// <summary>management</summary>
+        [EnumValue("management")]
+        Management,
+
+        /// <summary>privacy</summary>
+        [EnumValue("privacy")]
+        Privacy,
+
+        /// <summary>proxy</summary>
+        [EnumValue("proxy")]
+        Proxy,
+
+        /// <summary>nativeMessaging</summary>
+        [EnumValue("nativeMessaging")]
+        NativeMessaging,
+
+        /// <summary>webNavigation</summary>
+        [EnumValue("webNavigation")]
+        WebNavigation,
+
+        /// <summary>bookmarks</summary>
+        [EnumValue("bookmarks")]
+        Bookmarks,
+
+        /// <summary>browsingData</summary>
+        [EnumValue("browsingData")]
+        BrowsingData,
+
+        /// <summary>devtools</summary>
+        [EnumValue("devtools")]
+        Devtools,
+
+        /// <summary>find</summary>
+        [EnumValue("find")]
+        Find,
+
+        /// <summary>history</summary>
+        [EnumValue("history")]
+        History,
+
+        /// <summary>pkcs11</summary>
+        [EnumValue("pkcs11")]
+        Pkcs11,
+
+        /// <summary>sessions</summary>
+        [EnumValue("sessions")]
+        Sessions,
+
+        /// <summary>tabs</summary>
+        [EnumValue("tabs")]
+        Tabs,
+
+        /// <summary>tabHide</summary>
+        [EnumValue("tabHide")]
+        TabHide,
+
+        /// <summary>topSites</summary>
+        [EnumValue("topSites")]
+        TopSites,
     }
 }

src/WebExtensions.Net/Generated/Manifest/Permission.cs

@@ -9,6 +9,7 @@ public partial class Permission : BaseMultiTypeObject
     {
         private readonly PermissionNoPrompt valuePermissionNoPrompt;
         private readonly OptionalPermission valueOptionalPermission;
+        private readonly PermissionType3 valuePermissionType3;
 
         /// <summary>Creates a new instance of <see cref="Permission" />.</summary>
         /// <param name="value">The value.</param>
@@ -24,6 +25,13 @@ public Permission(OptionalPermission value) : base(value, typeof(OptionalPermiss
             valueOptionalPermission = value;
         }
 
+        /// <summary>Creates a new instance of <see cref="Permission" />.</summary>
+        /// <param name="value">The value.</param>
+        public Permission(PermissionType3 value) : base(value, typeof(PermissionType3))
+        {
+            valuePermissionType3 = value;
+        }
+
         /// <summary>Converts from <see cref="Permission" /> to <see cref="PermissionNoPrompt" />.</summary>
         /// <param name="value">The value to convert from.</param>
         public static implicit operator PermissionNoPrompt(Permission value) => value.valuePermissionNoPrompt;
@@ -39,5 +47,13 @@ public Permission(OptionalPermission value) : base(value, typeof(OptionalPermiss
         /// <summary>Converts from <see cref="OptionalPermission" /> to <see cref="Permission" />.</summary>
         /// <param name="value">The value to convert from.</param>
         public static implicit operator Permission(OptionalPermission value) => new(value);
+
+        /// <summary>Converts from <see cref="Permission" /> to <see cref="PermissionType3" />.</summary>
+        /// <param name="value">The value to convert from.</param>
+        public static implicit operator PermissionType3(Permission value) => value.valuePermissionType3;
+
+        /// <summary>Converts from <see cref="PermissionType3" /> to <see cref="Permission" />.</summary>
+        /// <param name="value">The value to convert from.</param>
+        public static implicit operator Permission(PermissionType3 value) => new(value);
     }
 }

src/WebExtensions.Net/Generated/Manifest/PermissionNoPromptType3.cs

@@ -17,5 +17,41 @@ public enum PermissionNoPromptType3
         /// <summary>unlimitedStorage</summary>
         [EnumValue("unlimitedStorage")]
         UnlimitedStorage,
+
+        /// <summary>contextualIdentities</summary>
+        [EnumValue("contextualIdentities")]
+        ContextualIdentities,
+
+        /// <summary>declarativeNetRequestWithHostAccess</summary>
+        [EnumValue("declarativeNetRequestWithHostAccess")]
+        DeclarativeNetRequestWithHostAccess,
+
+        /// <summary>dns</summary>
+        [EnumValue("dns")]
+        Dns,
+
+        /// <summary>theme</summary>
+        [EnumValue("theme")]
+        Theme,
+
+        /// <summary>captivePortal</summary>
+        [EnumValue("captivePortal")]
+        CaptivePortal,
+
+        /// <summary>identity</summary>
+        [EnumValue("identity")]
+        Identity,
+
+        /// <summary>menus</summary>
+        [EnumValue("menus")]
+        Menus,
+
+        /// <summary>contextMenus</summary>
+        [EnumValue("contextMenus")]
+        ContextMenus,
+
+        /// <summary>geckoProfiler</summary>
+        [EnumValue("geckoProfiler")]
+        GeckoProfiler,
     }
 }

src/WebExtensions.Net/Generated/Manifest/PermissionPrivileged.cs

@@ -9,5 +9,21 @@ public enum PermissionPrivileged
         /// <summary>mozillaAddons</summary>
         [EnumValue("mozillaAddons")]
         MozillaAddons,
+
+        /// <summary>activityLog</summary>
+        [EnumValue("activityLog")]
+        ActivityLog,
+
+        /// <summary>networkStatus</summary>
+        [EnumValue("networkStatus")]
+        NetworkStatus,
+
+        /// <summary>telemetry</summary>
+        [EnumValue("telemetry")]
+        Telemetry,
+
+        /// <summary>normandyAddonStudy</summary>
+        [EnumValue("normandyAddonStudy")]
+        NormandyAddonStudy,
     }
 }

src/WebExtensions.Net/Generated/Manifest/PermissionType3.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace WebExtensions.Net.Manifest
+{
+    /// <summary></summary>
+    [JsonConverter(typeof(EnumStringConverter<PermissionType3>))]
+    public enum PermissionType3
+    {
+        /// <summary>declarativeNetRequest</summary>
+        [EnumValue("declarativeNetRequest")]
+        DeclarativeNetRequest,
+    }
+}

src/WebExtensions.Net/Generated/generated.txt

@@ -1 +1 @@
-This file is auto generated at 2025-03-02T13:19:35
+This file is auto generated at 2025-03-02T21:45:07

test/WebExtensions.Net.BrowserExtensionIntegrationTest/Tests/PermissionsApiTests.cs

@@ -32,9 +32,9 @@ public async Task GetSelf()
             {
                 Permissions =
                 [
-                    new Permission(new OptionalPermission("alarms")),
-                    new Permission(new OptionalPermission("bookmarks")),
-                    new Permission(new OptionalPermission("cookies"))
+                    new Permission(PermissionNoPromptType3.Alarms),
+                    new Permission(OptionalPermissionType2.Bookmarks),
+                    new Permission((PermissionNoPrompt)OptionalPermissionNoPrompt.Cookies)
                 ]
             });