fix: generate_cnpj

Author: niltonpimentel02

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Utilitário `generate_alphanumeric_cnpj` [#741](https://github.com/brazilian-utils/python/pull/741)
+- Utilitário `generate_cnpj` com suporte a CNPJ alfanumérico [#741](https://github.com/brazilian-utils/python/pull/741)
 
 ## [2.4.0] - 2026-04-20
 

README.md

@@ -52,7 +52,6 @@ False
   - [format\_cnpj](#format_cnpj)
   - [remove\_symbols\_cnpj](#remove_symbols_cnpj)
   - [generate\_cnpj](#generate_cnpj)
-  - [generate\_alphanumeric\_cnpj](#generate_alphanumeric_cnpj)
 - [CEP](#cep)
   - [is\_valid\_cep](#is_valid_cep)
   - [format\_cep](#format_cep)
@@ -287,12 +286,16 @@ Exemplo:
 
 ### generate_cnpj
 
-Gera uma string de dígitos CNPJ válida aleatória. Um número de filial
-opcional pode ser fornecido; o padrão é 1.
+Gera uma string de CNPJ válida aleatória. Um número de filial opcional pode ser
+fornecido; o padrão é 1. Use `alphanumeric=True` para gerar um CNPJ cujas 12
+primeiras posições podem conter dígitos e letras maiúsculas.
 
 Argumentos:
 
-- branch (int): Um número de filial opcional a ser incluído no CNPJ.
+- branch (int | str): Um número de filial opcional a ser incluído no CNPJ.
+  Valores de filial alfanuméricos são aceitos apenas com
+  `alphanumeric=True`.
+- alphanumeric (bool): Define se o CNPJ gerado deve ser alfanumérico.
 
 Retorna:
 
@@ -306,29 +309,10 @@ Exemplo:
 '34665388000161'
 >>> generate_cnpj(1234)
 "01745284123455"
-```
-
-### generate_alphanumeric_cnpj
-
-Gera uma string de CNPJ alfanumérico válida aleatória. Um número de filial
-opcional pode ser fornecido; o padrão é '1'.
-
-Argumentos:
-
-- branch (str): Um número de filial opcional a ser incluído no CNPJ.
-
-Retorna:
-
-- str: Um CNPJ alfanumérico válido gerado aleatoriamente.
-
-Exemplo:
-
-```python
->>> from brutils import generate_alphanumeric_cnpj
->>> generate_alphanumeric_cnpj()
+>>> generate_cnpj(alphanumeric=True)
 "9359QAG9000184"
->>> generate_alphanumeric_cnpj('1234')
-"NX9K79E2123400"
+>>> generate_cnpj(branch="AB12", alphanumeric=True)
+"NX9K79E2AB1200"
 ```
 
 ## CEP

README_EN.md

@@ -51,7 +51,6 @@ False
   - [format\_cnpj](#format_cnpj)
   - [remove\_symbols\_cnpj](#remove_symbols_cnpj)
   - [generate\_cnpj](#generate_cnpj)
-  - [generate\_alphanumeric\_cnpj](#generate_alphanumeric_cnpj)
 - [CEP](#cep)
   - [is\_valid\_cep](#is_valid_cep)
   - [format\_cep](#format_cep)
@@ -289,12 +288,16 @@ Example:
 
 ### generate_cnpj
 
-Generates a random valid CNPJ (Brazilian Company Registration Number) digit
-string. An optional branch number parameter can be given; it defaults to 1.
+Generates a random valid CNPJ (Brazilian Company Registration Number) string.
+An optional branch number parameter can be given; it defaults to 1. Use
+`alphanumeric=True` to generate a CNPJ whose first 12 positions may contain
+digits and uppercase letters.
 
 Args:
 
-- branch (int): An optional branch number to be included in the CNPJ.
+- branch (int | str): An optional branch number to be included in the CNPJ.
+  Alphanumeric branch values are accepted only with `alphanumeric=True`.
+- alphanumeric (bool): Whether the generated CNPJ should be alphanumeric.
 
 Returns:
 
@@ -308,29 +311,10 @@ Example:
 '34665388000161'
 >>> generate_cnpj(1234)
 "01745284123455"
-```
-
-### generate_alphanumeric_cnpj
-
-Generates a random valid alphanumeric CNPJ string. An optional branch number
-parameter can be given; it defaults to '1'.
-
-Args:
-
-- branch (str): An optional branch number to be included in the CNPJ.
-
-Returns:
-
-- str: A randomly generated valid alphanumeric CNPJ string.
-
-Example:
-
-```python
->>> from brutils import generate_alphanumeric_cnpj
->>> generate_alphanumeric_cnpj()
+>>> generate_cnpj(alphanumeric=True)
 "9359QAG9000184"
->>> generate_alphanumeric_cnpj('1234')
-"NX9K79E2123400"
+>>> generate_cnpj(branch="AB12", alphanumeric=True)
+"NX9K79E2AB1200"
 ```
 
 ## CEP

brutils/__init__.py

@@ -14,7 +14,6 @@
 # CNPJ Imports
 from brutils.cnpj import format_cnpj
 from brutils.cnpj import generate as generate_cnpj
-from brutils.cnpj import generate_alphanumeric as generate_alphanumeric_cnpj
 from brutils.cnpj import is_valid as is_valid_cnpj
 from brutils.cnpj import remove_symbols as remove_symbols_cnpj
 
@@ -106,7 +105,6 @@
     # CNPJ
     "format_cnpj",
     "generate_cnpj",
-    "generate_alphanumeric_cnpj",
     "is_valid_cnpj",
     "remove_symbols_cnpj",
     # CPF

brutils/cnpj.py

@@ -215,13 +215,18 @@ def is_valid(cnpj: str) -> bool:
     return isinstance(cnpj, str) and validate(cnpj)
 
 
-def generate(branch: int = 1) -> str:
+def generate(branch: int | str = 1, alphanumeric: bool = False) -> str:
     """
-    Generates a random valid CNPJ digit string. An optional branch number
-    parameter can be given; it defaults to 1.
+    Generates a random valid CNPJ string. An optional branch number parameter
+    can be given; it defaults to 1. Use alphanumeric=True to generate a CNPJ
+    whose first 12 characters may contain digits and uppercase letters.
 
     Args:
-        branch (int): An optional branch number to be included in the CNPJ.
+        branch (int | str): An optional branch number to be included in the
+            CNPJ. Alphanumeric branch values are accepted only with
+            alphanumeric=True.
+        alphanumeric (bool): Whether the generated CNPJ should be
+            alphanumeric.
 
     Returns:
         str: A randomly generated valid CNPJ string.
@@ -231,8 +236,23 @@ def generate(branch: int = 1) -> str:
         "30180536000105"
         >>> generate(1234)
         "01745284123455"
+        >>> generate(branch="AB12", alphanumeric=True)
+        "NX9K79E2AB1200"
     """
 
+    if alphanumeric:
+        branch = str(branch)
+        branch = branch[:4] if len(branch) >= 4 else branch.zfill(4)
+        branch = (
+            "0001"
+            if branch == "0000" or not _is_alphanumeric(branch)
+            else branch
+        )
+        base = "".join(choices(digits * 3 + ascii_uppercase, k=8)) + branch
+
+        return base + _checksum(base)
+
+    branch = int(branch)
     branch %= 10000
     branch += int(branch == 0)
     branch = str(branch).zfill(4)
@@ -241,34 +261,6 @@ def generate(branch: int = 1) -> str:
     return base + _checksum(base)
 
 
-def generate_alphanumeric(branch: str = "1") -> str:
-    """
-    Generates a random valid alphanumeric CNPJ digit string. An optional branch
-    number parameter can be given; it defaults to '1'.
-
-    Args:
-        branch (str): An optional branch number to be included in the CNPJ.
-
-    Returns:
-        str: A randomly generated valid alphanumeric CNPJ string.
-
-    Example:
-        >>> generate_alphanumeric()
-        "9359QAG9000184"
-        >>> generate_alphanumeric('1234')
-        "NX9K79E2123400"
-    """
-
-    branch = branch[:4] if len(branch) >= 4 else branch.zfill(4)
-    branch = (
-        "0001" if branch == "0000" or not _is_alphanumeric(branch) else branch
-    )
-
-    base = "".join(choices(digits * 3 + ascii_uppercase, k=8)) + branch
-
-    return base + _checksum(base)
-
-
 def _hashdigit(cnpj: str, position: int) -> int:
     """
     Calculates the checksum digit at the given `position` for the provided

tests/test_cnpj.py

@@ -8,7 +8,6 @@
     display,
     format_cnpj,
     generate,
-    generate_alphanumeric,
     is_valid,
     remove_symbols,
     sieve,
@@ -88,10 +87,15 @@ def test_generate(self):
 
     def test_generate_alphanumeric(self):
         for _ in range(10_000):
-            generated = generate_alphanumeric()
+            generated = generate(alphanumeric=True)
             self.assertIs(validate(generated), True)
             self.assertIsNotNone(display(generated))
-        self.assertIs(validate(generate_alphanumeric(branch="1234")), True)
+        self.assertIs(
+            validate(generate(branch="1234", alphanumeric=True)), True
+        )
+        self.assertIs(
+            validate(generate(branch="AB12", alphanumeric=True)), True
+        )
 
     def test__hashdigit(self):
         self.assertEqual(_hashdigit("00000000000000", 13), 0)