Use rule-based pluralization for DisplayCollectionName default

Replaces naive label + "s" with _pluralize() covering consonant-y → -ies
(Company → Companies, Category → Categories), s/x/z/ch/sh → -es
(Class → Classes, Box → Boxes), and the regular -s case. Callers can
still override via display_collection_name for irregular plurals.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Abel Milash

src/PowerPlatform/Dataverse/data/_odata.py

@@ -978,6 +978,28 @@ def _label(self, text: str) -> Dict[str, Any]:
             ],
         }
 
+    @staticmethod
+    def _pluralize(word: str) -> str:
+        """Return a simple English plural for *word*.
+
+        Covers the most common patterns without an external dependency:
+        - consonant + y  → -ies  (Company → Companies, Category → Categories)
+        - s / x / z      → -es   (Class → Classes, Box → Boxes)
+        - ch / sh        → -es   (Match → Matches, Dish → Dishes)
+        - everything else → -s   (Product → Products, Account → Accounts)
+
+        For irregular plurals (e.g. Person → People) callers should supply
+        ``display_collection_name`` explicitly.
+        """
+        if not word:
+            return word
+        suffix = word.lower()
+        if suffix.endswith("y") and len(suffix) > 1 and suffix[-2] not in "aeiou":
+            return word[:-1] + "ies"
+        if suffix.endswith(("ch", "sh", "s", "x", "z")):
+            return word + "es"
+        return word + "s"
+
     def _to_pascal(self, name: str) -> str:
         parts = re.split(r"[^A-Za-z0-9]+", name)
         return "".join(p[:1].upper() + p[1:] for p in parts if p)
@@ -1020,7 +1042,7 @@ def _create_entity(
             "SchemaName": table_schema_name,
             "DisplayName": self._label(display_name),
             "DisplayCollectionName": self._label(
-                display_collection_name if display_collection_name is not None else display_name + "s"
+                display_collection_name if display_collection_name is not None else self._pluralize(display_name)
             ),
             "Description": self._label(description if description is not None else f"Custom entity for {display_name}"),
             "OwnershipType": "UserOwned",
@@ -1656,7 +1678,7 @@ def _create_table(
         :type primary_column_schema_name: ``str`` | ``None``
         :param display_name: Human-readable display name for the table. Defaults to ``table_schema_name``.
         :type display_name: ``str`` | ``None``
-        :param display_collection_name: Plural display name shown in navigation. Defaults to ``display_name + "s"``.
+        :param display_collection_name: Plural display name shown in navigation. Defaults to a simple English plural of ``display_name``.
         :type display_collection_name: ``str`` | ``None``
         :param description: Description for the table. Defaults to a generated string.
         :type description: ``str`` | ``None``
@@ -2157,7 +2179,7 @@ def _build_create_entity(
             "SchemaName": table,
             "DisplayName": self._label(label),
             "DisplayCollectionName": self._label(
-                display_collection_name if display_collection_name is not None else label + "s"
+                display_collection_name if display_collection_name is not None else self._pluralize(label)
             ),
             "Description": self._label(description if description is not None else f"Custom entity for {label}"),
             "OwnershipType": "UserOwned",

src/PowerPlatform/Dataverse/operations/batch.py

@@ -382,7 +382,7 @@ def create(
             When omitted, defaults to the table schema name.
         :type display_name: str or None
         :param display_collection_name: Plural display name shown in navigation (e.g. ``"Products"``).
-            When omitted, defaults to ``display_name + "s"``.
+            When omitted, a simple English plural of ``display_name`` is used.
         :type display_collection_name: str or None
         :param description: Description for the table. When omitted, a default description is generated.
         :type description: str or None

src/PowerPlatform/Dataverse/operations/tables.py

@@ -103,7 +103,8 @@ def create(
             (e.g. ``"Product"``). When omitted, defaults to the table schema name.
         :type display_name: :class:`str` or None
         :param display_collection_name: Plural display name shown in navigation
-            (e.g. ``"Products"``). When omitted, defaults to ``display_name + "s"``.
+            (e.g. ``"Products"``). When omitted, a simple English plural of
+            ``display_name`` is used (e.g. ``"Company"`` → ``"Companies"``).
         :type display_collection_name: :class:`str` or None
         :param description: Description for the table. When omitted, a default
             description is generated.

tests/unit/data/test_odata_internal.py

@@ -596,6 +596,61 @@ def test_to_pascal_basic(self):
         self.assertEqual(client._to_pascal("single"), "Single")
 
 
+class TestPluralize(unittest.TestCase):
+    """Unit tests for _ODataClient._pluralize."""
+
+    def _p(self, word: str) -> str:
+        return _ODataClient._pluralize(word)
+
+    # --- regular -s words ---
+    def test_regular_word(self):
+        self.assertEqual(self._p("Product"), "Products")
+
+    def test_regular_word_account(self):
+        self.assertEqual(self._p("Account"), "Accounts")
+
+    # --- consonant + y → -ies ---
+    def test_consonant_y_company(self):
+        self.assertEqual(self._p("Company"), "Companies")
+
+    def test_consonant_y_category(self):
+        self.assertEqual(self._p("Category"), "Categories")
+
+    def test_consonant_y_policy(self):
+        self.assertEqual(self._p("Policy"), "Policies")
+
+    # --- vowel + y → -ys (not -ies) ---
+    def test_vowel_y_key(self):
+        self.assertEqual(self._p("Key"), "Keys")
+
+    def test_vowel_y_day(self):
+        self.assertEqual(self._p("Day"), "Days")
+
+    # --- -s / -x / -z / -ch / -sh → -es ---
+    def test_s_ending(self):
+        self.assertEqual(self._p("Class"), "Classes")
+
+    def test_x_ending(self):
+        self.assertEqual(self._p("Box"), "Boxes")
+
+    def test_ch_ending(self):
+        self.assertEqual(self._p("Match"), "Matches")
+
+    def test_sh_ending(self):
+        self.assertEqual(self._p("Dish"), "Dishes")
+
+    # --- multi-word display names ---
+    def test_multi_word(self):
+        self.assertEqual(self._p("Health Inspection"), "Health Inspections")
+
+    def test_multi_word_y(self):
+        self.assertEqual(self._p("Budget Category"), "Budget Categories")
+
+    # --- edge cases ---
+    def test_empty_string(self):
+        self.assertEqual(self._p(""), "")
+
+
 class TestRequestErrorParsing(unittest.TestCase):
     """Unit tests for _ODataClient._request error response handling."""
 
@@ -2908,7 +2963,7 @@ def test_display_name_defaults_to_schema_name(self):
         self.assertEqual(body["DisplayName"]["LocalizedLabels"][0]["Label"], "new_TestTable")
 
     def test_display_collection_name_derived_from_display_name(self):
-        """_build_create_entity appends 's' to display_name for DisplayCollectionName."""
+        """_build_create_entity uses _pluralize(display_name) for DisplayCollectionName."""
         body = self._body(display_name="Test Table")
         self.assertEqual(body["DisplayCollectionName"]["LocalizedLabels"][0]["Label"], "Test Tables")
 
@@ -3020,8 +3075,8 @@ def test_display_collection_name_explicit(self):
         body = json.loads(self.od._build_create_entity("new_TestTable", {}, display_collection_name="Test Tables").body)
         self.assertEqual(body["DisplayCollectionName"]["LocalizedLabels"][0]["Label"], "Test Tables")
 
-    def test_display_collection_name_defaults_to_display_name_plus_s(self):
-        """_build_create_entity appends 's' to the label when display_collection_name is omitted."""
+    def test_display_collection_name_defaults_to_pluralized_label(self):
+        """_build_create_entity uses _pluralize(label) when display_collection_name is omitted."""
         body = self._body(display_name="Widget")
         self.assertEqual(body["DisplayCollectionName"]["LocalizedLabels"][0]["Label"], "Widgets")