cycode 3.25.1.dev6__py3-none-any.whl → 3.25.2.dev2__py3-none-any.whl

cycode/cli/apps/scan/remote_url_resolver.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from cycode.cli import consts
 from cycode.cli.utils.git_proxy import git_proxy
 from cycode.cli.utils.shell_executor import shell
@@ -9,7 +7,7 @@ from cycode.logger import get_logger
 logger = get_logger('Remote URL Resolver')
 
 
-def _get_plastic_repository_name(path: str) -> Optional[str]:
+def _get_plastic_repository_name(path: str) -> str | None:
     """Get the name of the Plastic repository from the current working directory.
 
     The command to execute is:
@@ -45,7 +43,7 @@ def _get_plastic_repository_name(path: str) -> Optional[str]:
         return None
 
 
-def _get_plastic_repository_list(working_dir: Optional[str] = None) -> dict[str, str]:
+def _get_plastic_repository_list(working_dir: str | None = None) -> dict[str, str]:
     """Get the list of Plastic repositories and their GUIDs.
 
     The command to execute is:
@@ -84,7 +82,7 @@ def _get_plastic_repository_list(working_dir: Optional[str] = None) -> dict[str,
         return repo_name_to_guid
 
 
-def _try_to_get_plastic_remote_url(path: str) -> Optional[str]:
+def _try_to_get_plastic_remote_url(path: str) -> str | None:
     repository_name = _get_plastic_repository_name(path)
     if not repository_name:
         return None
@@ -98,7 +96,7 @@ def _try_to_get_plastic_remote_url(path: str) -> Optional[str]:
     return f'{consts.PLASTIC_VCS_REMOTE_URI_PREFIX}{repository_guid}'
 
 
-def _try_get_git_remote_url(path: str) -> Optional[str]:
+def _try_get_git_remote_url(path: str) -> str | None:
     try:
         repo = git_proxy.get_repo(path, search_parent_directories=True)
         remote_url = repo.remotes[0].config_reader.get('url')
@@ -113,7 +111,7 @@ def _try_get_git_remote_url(path: str) -> Optional[str]:
         return None
 
 
-def _try_get_any_remote_url(path: str) -> Optional[str]:
+def _try_get_any_remote_url(path: str) -> str | None:
     remote_url = _try_get_git_remote_url(path)
     if not remote_url:
         remote_url = _try_to_get_plastic_remote_url(path)
@@ -121,7 +119,7 @@ def _try_get_any_remote_url(path: str) -> Optional[str]:
     return remote_url
 
 
-def get_remote_url_scan_parameter(paths: tuple[str, ...]) -> Optional[str]:
+def get_remote_url_scan_parameter(paths: tuple[str, ...]) -> str | None:
     remote_urls = set()
     for path in paths:
         # FIXME(MarshalX): perf issue. This looping will produce:

cycode/cli/apps/scan/repository/repository_command.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import click
 import typer
@@ -25,7 +25,7 @@ def repository_command(
         Path, typer.Argument(exists=True, resolve_path=True, help='Path to Git repository to scan.', show_default=False)
     ],
     branch: Annotated[
-        Optional[str], typer.Option('--branch', '-b', help='Branch to scan.', show_default='default branch')
+        str | None, typer.Option('--branch', '-b', help='Branch to scan.', show_default='default branch')
     ] = None,
 ) -> None:
     try:

cycode/cli/apps/scan/scan_command.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import click
 import typer
@@ -121,7 +121,7 @@ def scan_command(
         ),
     ] = None,
     export_file: Annotated[
-        Optional[Path],
+        Path | None,
         typer.Option(
             '--export-file',
             help='Export file. Path to the file where the export will be saved.',

cycode/cli/apps/scan/scan_parameters.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import typer
 
 from cycode import _BOOT_WALL
@@ -23,7 +21,7 @@ def _get_default_scan_parameters(ctx: typer.Context) -> dict:
     }
 
 
-def get_scan_parameters(ctx: typer.Context, paths: Optional[tuple[str, ...]] = None) -> dict:
+def get_scan_parameters(ctx: typer.Context, paths: tuple[str, ...] | None = None) -> dict:
     scan_parameters = _get_default_scan_parameters(ctx)
 
     if not paths:

cycode/cli/apps/scan/scan_result.py

@@ -1,5 +1,5 @@
 import os
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import typer
 
@@ -26,8 +26,8 @@ logger = get_logger('Scan Results')
 
 
 def _get_document_by_file_name(
-    documents: list[Document], file_name: str, unique_id: Optional[str] = None
-) -> Optional[Document]:
+    documents: list[Document], file_name: str, unique_id: str | None = None
+) -> Document | None:
     normalized_file_name = normalize_file_path(file_name)
     for document in documents:
         if normalize_file_path(document.path) == normalized_file_name and document.unique_id == unique_id:
@@ -132,7 +132,7 @@ def _map_detections_per_file_and_commit_id(scan_type: str, raw_detections: list[
 
             file_name = _get_file_name_from_detection(scan_type, raw_detection)
             detection: Detection = DetectionSchema().load(raw_detection)
-            commit_id: Optional[str] = detection.detection_details.get('commit_id')  # could be None
+            commit_id: str | None = detection.detection_details.get('commit_id')  # could be None
             group_by_key = (file_name, commit_id)
 
             if group_by_key in detections_per_files:
@@ -187,7 +187,7 @@ def get_sync_scan_result(scan_type: str, scan_results: 'ScanResultsSyncFlow') ->
 
 
 def print_local_scan_results(
-    ctx: typer.Context, local_scan_results: list[LocalScanResult], errors: Optional[dict[str, 'CliError']] = None
+    ctx: typer.Context, local_scan_results: list[LocalScanResult], errors: dict[str, 'CliError'] | None = None
 ) -> None:
     printer = ctx.obj.get('console_printer')
     printer.update_ctx(ctx)

cycode/cli/console.py

@@ -1,5 +1,5 @@
 import os
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from rich.console import Console, RenderResult
 from rich.markdown import Heading, Markdown
@@ -14,7 +14,7 @@ console_err = Console(stderr=True)
 console = console_out  # alias
 
 
-def is_dark_console() -> Optional[bool]:
+def is_dark_console() -> bool | None:
     """Detect if the console is dark or light.
 
     This function checks the environment variables and terminal type to determine if the console is dark or light.

cycode/cli/exceptions/custom_exceptions.py

@@ -129,7 +129,7 @@ _SSL_ERROR_TRUST_HINT = (
     'If you use an on-premises installation or a proxy that intercepts SSL traffic, '
     f'set {consts.ENABLE_TRUSTSTORE_ENV_VAR_NAME}=1 to trust the CA certificates installed in your '
     f'machine certificate store, or {_SSL_ERROR_CA_BUNDLE_HINT}'
-    if trust_store.is_supported() and not trust_store.is_enabled()
+    if not trust_store.is_enabled()
     else f'If you use an on-premises installation or a proxy that intercepts SSL traffic, {_SSL_ERROR_CA_BUNDLE_HINT}'
 )
 

cycode/cli/exceptions/handle_errors.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import click
 import typer
 
@@ -8,7 +6,7 @@ from cycode.cli.models import CliError, CliErrors
 
 def handle_errors(
     ctx: typer.Context, err: BaseException, cli_errors: CliErrors, *, return_exception: bool = False
-) -> Optional['CliError']:
+) -> CliError | None:
     printer = ctx.obj.get('console_printer')
     printer.print_exception(err)
 

cycode/cli/exceptions/handle_scan_errors.py

@@ -1,5 +1,4 @@
 import zipfile
-from typing import Optional
 
 import typer
 
@@ -10,7 +9,7 @@ from cycode.cli.models import CliError, CliErrors
 from cycode.cli.utils.git_proxy import git_proxy
 
 
-def handle_scan_exception(ctx: typer.Context, err: Exception, *, return_exception: bool = False) -> Optional[CliError]:
+def handle_scan_exception(ctx: typer.Context, err: Exception, *, return_exception: bool = False) -> CliError | None:
     ctx.obj['did_fail'] = True
 
     errors: CliErrors = {

cycode/cli/files_collector/commit_range_documents.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import typer
 
@@ -47,7 +47,7 @@ def get_safe_head_reference_for_diff(repo: 'Repo') -> str:
         return consts.GIT_EMPTY_TREE_OBJECT
 
 
-def get_staged_diff_index(repo: 'Repo', paths: Optional[list[str]] = None) -> tuple[str, 'DiffIndex']:
+def get_staged_diff_index(repo: 'Repo', paths: list[str] | None = None) -> tuple[str, 'DiffIndex']:
     """Diff the index against HEAD, or against the empty tree in repositories with no commits.
 
     GitPython only inverts the `R` flag for HEAD, so `R` must be off for the empty tree to keep
@@ -65,7 +65,7 @@ def get_staged_diff_index(repo: 'Repo', paths: Optional[list[str]] = None) -> tu
     return head_reference, repo.index.diff(head_reference, create_patch=True, R=reverse, paths=paths or None)
 
 
-def _does_reach_to_max_commits_to_scan_limit(commit_ids: list[str], max_commits_count: Optional[int]) -> bool:
+def _does_reach_to_max_commits_to_scan_limit(commit_ids: list[str], max_commits_count: int | None) -> bool:
     if max_commits_count is None:
         return False
 
@@ -73,7 +73,7 @@ def _does_reach_to_max_commits_to_scan_limit(commit_ids: list[str], max_commits_
 
 
 def collect_commit_range_diff_documents(
-    ctx: typer.Context, path: str, commit_range: str, max_commits_count: Optional[int] = None
+    ctx: typer.Context, path: str, commit_range: str, max_commits_count: int | None = None
 ) -> list[Document]:
     """Collects documents from a specified commit range in a Git repository.
 
@@ -138,7 +138,7 @@ def collect_commit_range_diff_documents(
     return commit_documents_to_scan
 
 
-def calculate_pre_receive_commit_range(repo_path: str, branch_update_details: str) -> Optional[str]:
+def calculate_pre_receive_commit_range(repo_path: str, branch_update_details: str) -> str | None:
     end_commit = _get_end_commit_from_branch_update_details(branch_update_details)
 
     # branch is deleted, no need to perform scan
@@ -168,7 +168,7 @@ def _get_end_commit_from_branch_update_details(update_details: str) -> str:
     return end_commit
 
 
-def _get_oldest_unupdated_commit_for_branch(repo: 'Repo', commit: str) -> Optional[str]:
+def _get_oldest_unupdated_commit_for_branch(repo: 'Repo', commit: str) -> str | None:
     # get a list of commits by chronological order that are not in the remote repository yet
     # more info about rev-list command: https://git-scm.com/docs/git-rev-list
 
@@ -181,12 +181,12 @@ def _get_oldest_unupdated_commit_for_branch(repo: 'Repo', commit: str) -> Option
     return commits[0]
 
 
-def _get_file_content_from_commit_diff(repo: 'Repo', commit: str, diff: 'Diff') -> Optional[str]:
+def _get_file_content_from_commit_diff(repo: 'Repo', commit: str, diff: 'Diff') -> str | None:
     file_path = get_diff_file_path(diff, relative=True)
     return get_file_content_from_commit_path(repo, commit, file_path)
 
 
-def _get_blob_content(blob: Optional['Blob']) -> Optional[str]:
+def _get_blob_content(blob: 'Blob | None') -> str | None:
     """Read a diff-side blob's content in-process, with no subprocess spawn.
 
     `diff.a_blob`/`diff.b_blob` already hold whatever git loaded to compute the patch, so this is
@@ -266,7 +266,7 @@ def parse_pre_receive_input() -> str:
     return pre_receive_input.splitlines()[0]
 
 
-def parse_pre_push_input() -> Optional[str]:
+def parse_pre_push_input() -> str | None:
     """Parse input to pre-push hook details.
 
     Example input:
@@ -289,7 +289,7 @@ def is_invoked_by_pre_commit_framework() -> bool:
     return os.getenv(consts.PRE_COMMIT_FRAMEWORK_ENV_VAR_NAME) == '1'
 
 
-def get_pre_commit_framework_push_range() -> Optional[str]:
+def get_pre_commit_framework_push_range() -> str | None:
     """Get the commit range to scan when invoked as a pre-push hook by the pre-commit framework.
 
     The pre-commit framework reads git's pre-push stdin itself and never forwards it to hooks.
@@ -379,7 +379,7 @@ def _get_default_branches_for_merge_base(repo: 'Repo') -> list[str]:
     return default_branches
 
 
-def calculate_pre_push_commit_range(push_update_details: str) -> Optional[str]:
+def calculate_pre_push_commit_range(push_update_details: str) -> str | None:
     """Calculate the commit range for pre-push hook scanning.
 
     Args:
@@ -430,7 +430,7 @@ def calculate_pre_push_commit_range(push_update_details: str) -> Optional[str]:
     return f'{remote_object_name}..{local_object_name}'
 
 
-def get_diff_file_path(diff: 'Diff', relative: bool = False, repo: Optional['Repo'] = None) -> Optional[str]:
+def get_diff_file_path(diff: 'Diff', relative: bool = False, repo: 'Repo | None' = None) -> str | None:
     """Get the file path from a git Diff object.
 
     Args:
@@ -470,7 +470,7 @@ def get_pre_commit_modified_documents(
     repo_path: str,
     base_ref: str = consts.GIT_HEAD_COMMIT_REV,
     include_unstaged: bool = False,
-    paths: Optional[list[str]] = None,
+    paths: list[str] | None = None,
     collect_file_contents: bool = True,
 ) -> tuple[list[Document], list[Document], list[Document]]:
     """Diffs `base_ref` against the staged index (default) or the full working tree.
@@ -562,7 +562,7 @@ def get_pre_commit_modified_documents(
     return from_ref_documents, working_copy_documents, diff_documents
 
 
-def parse_commit_range(commit_range: str, path: str) -> tuple[Optional[str], Optional[str], Optional[str]]:
+def parse_commit_range(commit_range: str, path: str) -> tuple[str | None, str | None, str | None]:
     """Parses a git commit range string and returns the full SHAs for the 'from' and 'to' commits.
     Also, it returns the separator in the commit range.
 

cycode/cli/files_collector/models/in_memory_zip.py

@@ -3,7 +3,7 @@ import tempfile
 from collections import defaultdict
 from os import SEEK_END
 from pathlib import Path
-from typing import IO, Optional
+from typing import IO
 from zipfile import ZIP_DEFLATED, ZipFile
 
 from cycode.cli import consts
@@ -17,7 +17,7 @@ logger = get_logger('ZIP')
 _SPOOL_DIRECTORY_NAME = 'tmp'
 
 
-def _get_spool_directory(configuration_manager: ConfigurationManager) -> Optional[str]:
+def _get_spool_directory(configuration_manager: ConfigurationManager) -> str | None:
     """Directory to spill big ZIPs into. None falls back to the system temp directory."""
     try:
         directory = Path(configuration_manager.global_config_file_manager.get_config_directory_path())
@@ -47,7 +47,7 @@ class InMemoryZip:
         self._files_count = 0
         self._extension_statistics = defaultdict(int)
 
-    def append(self, filename: str, unique_id: Optional[str], content: str) -> None:
+    def append(self, filename: str, unique_id: str | None, content: str) -> None:
         self._files_count += 1
         self._extension_statistics[Path(filename).suffix] += 1
 

cycode/cli/files_collector/repository_documents.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterator
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from cycode.cli.utils.git_proxy import git_proxy
 
@@ -15,11 +15,11 @@ def _should_process_git_object(obj: 'Blob', _: int) -> bool:
 
 def get_git_repository_tree_file_entries(
     path: str, branch: str
-) -> Union[Iterator['IndexObjUnion'], Iterator['TraversedTreeTup']]:
+) -> Iterator['IndexObjUnion'] | Iterator['TraversedTreeTup']:
     return git_proxy.get_repo(path).tree(branch).traverse(predicate=_should_process_git_object)
 
 
-def get_file_content_from_commit_path(repo: 'Repo', commit: str, file_path: str) -> Optional[str]:
+def get_file_content_from_commit_path(repo: 'Repo', commit: str, file_path: str) -> str | None:
     try:
         return repo.git.show(f'{commit}:{file_path}')
     except git_proxy.get_git_command_error():

cycode/cli/files_collector/sca/base_restore_dependencies.py

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -19,9 +18,9 @@ def build_dep_tree_path(path: str, generated_file_name: str) -> str:
 def execute_commands(
     commands: list[list[str]],
     timeout: int,
-    output_file_path: Optional[str] = None,
-    working_directory: Optional[str] = None,
-) -> Optional[str]:
+    output_file_path: str | None = None,
+    working_directory: str | None = None,
+) -> str | None:
     logger.debug(
         'Executing restore commands, %s',
         {
@@ -67,7 +66,7 @@ class BaseRestoreDependencies(ABC):
         self.command_timeout = command_timeout
         self.create_output_file_manually = create_output_file_manually
 
-    def restore(self, document: Document) -> Optional[Document]:
+    def restore(self, document: Document) -> Document | None:
         return self.try_restore_dependencies(document)
 
     def get_manifest_file_path(self, document: Document) -> str:
@@ -75,7 +74,7 @@ class BaseRestoreDependencies(ABC):
             join_paths(get_path_from_context(self.ctx), document.path) if self.ctx.obj.get('monitor') else document.path
         )
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_file_path = self.get_manifest_file_path(document)
         restore_file_paths = [
             build_dep_tree_path(document.absolute_path, restore_file_path_item)
@@ -122,7 +121,7 @@ class BaseRestoreDependencies(ABC):
 
         return Document(relative_restore_file_path, restore_file_content, self.is_git_diff)
 
-    def get_manifest_dir(self, document: Document) -> Optional[str]:
+    def get_manifest_dir(self, document: Document) -> str | None:
         """Return the directory containing the manifest file, resolving monitor-mode paths.
 
         Uses the same path resolution as get_manifest_file_path() to ensure consistency.
@@ -143,7 +142,7 @@ class BaseRestoreDependencies(ABC):
 
         return None
 
-    def get_working_directory(self, document: Document) -> Optional[str]:
+    def get_working_directory(self, document: Document) -> str | None:
         return str(Path(document.absolute_path).parent)
 
     def get_restored_lock_file_name(self, restore_file_path: str) -> str:

cycode/cli/files_collector/sca/go/restore_go_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -19,7 +18,7 @@ class RestoreGoDependencies(BaseRestoreDependencies):
     def __init__(self, ctx: typer.Context, is_git_diff: bool, command_timeout: int) -> None:
         super().__init__(ctx, is_git_diff, command_timeout, create_output_file_manually=True)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_exists = (Path(self.get_working_directory(document)) / BUILD_GO_FILE_NAME).is_file()
         lock_exists = (Path(self.get_working_directory(document)) / BUILD_GO_LOCK_FILE_NAME).is_file()
 

cycode/cli/files_collector/sca/maven/restore_gradle_dependencies.py

@@ -1,7 +1,6 @@
 import os
 import platform
 import re
-from typing import Optional
 
 import typer
 
@@ -22,7 +21,7 @@ GRADLEW_BAT_FILE_NAME = 'gradlew.bat'
 
 class RestoreGradleDependencies(BaseRestoreDependencies):
     def __init__(
-        self, ctx: typer.Context, is_git_diff: bool, command_timeout: int, projects: Optional[set[str]] = None
+        self, ctx: typer.Context, is_git_diff: bool, command_timeout: int, projects: set[str] | None = None
     ) -> None:
         super().__init__(ctx, is_git_diff, command_timeout, create_output_file_manually=True)
         self.gradle_executable = self._resolve_gradle_executable()
@@ -58,7 +57,7 @@ class RestoreGradleDependencies(BaseRestoreDependencies):
     def get_lock_file_names(self) -> list[str]:
         return [self.get_lock_file_name()]
 
-    def get_working_directory(self, document: Document) -> Optional[str]:
+    def get_working_directory(self, document: Document) -> str | None:
         return get_path_from_context(self.ctx) if self.is_gradle_sub_projects() else None
 
     def get_all_projects(self) -> set[str]:

cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py

@@ -1,7 +1,6 @@
 import json
 from os import path
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -21,7 +20,7 @@ MAVEN_CYCLONE_DEP_TREE_FILE_NAME = 'bom.json'
 MAVEN_DEP_TREE_FILE_NAME = 'bcde.mvndeps'
 
 
-def _has_dependency_graph(bom_content: Optional[str]) -> bool:
+def _has_dependency_graph(bom_content: str | None) -> bool:
     try:
         if not bom_content:
             return False
@@ -52,7 +51,7 @@ class RestoreMavenDependencies(BaseRestoreDependencies):
     def get_lock_file_names(self) -> list[str]:
         return [self.get_lock_file_name()]
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_file_path = self.get_manifest_file_path(document)
         if document.content is None:
             return self.restore_from_secondary_command(document, manifest_file_path)
@@ -68,7 +67,7 @@ class RestoreMavenDependencies(BaseRestoreDependencies):
 
         return restore_dependencies_document
 
-    def restore_from_secondary_command(self, document: Document, manifest_file_path: str) -> Optional[Document]:
+    def restore_from_secondary_command(self, document: Document, manifest_file_path: str) -> Document | None:
         restore_content = execute_commands(
             commands=self.create_secondary_restore_commands(manifest_file_path),
             timeout=self.command_timeout,

cycode/cli/files_collector/sca/npm/restore_bun_dependencies.py

@@ -1,7 +1,6 @@
 import json
 import re
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -26,7 +25,7 @@ MINIMUM_BUN_VERSION = (1, 2)
 BUN_VERSION_COMMAND = ['bun', '--version']
 
 
-def _indicates_bun(package_json_content: Optional[str]) -> bool:
+def _indicates_bun(package_json_content: str | None) -> bool:
     """Return True if package.json content signals that this project uses Bun."""
     if not package_json_content:
         return False
@@ -43,7 +42,7 @@ def _indicates_bun(package_json_content: Optional[str]) -> bool:
     return isinstance(engines, dict) and 'bun' in engines
 
 
-def _parse_bun_version(raw_version: Optional[str]) -> Optional[tuple[int, int]]:
+def _parse_bun_version(raw_version: str | None) -> tuple[int, int] | None:
     """Parse the (major, minor) version from `bun --version` output (e.g. '1.2.3')."""
     if not raw_version:
         return None
@@ -91,7 +90,7 @@ class RestoreBunDependencies(BaseRestoreDependencies):
             return False
         return True
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / BUN_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/npm/restore_deno_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -21,7 +20,7 @@ class RestoreDenoDependencies(BaseRestoreDependencies):
     def is_project(self, document: Document) -> bool:
         return Path(document.path).name in DENO_MANIFEST_FILE_NAMES
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         if not manifest_dir:
             return None

cycode/cli/files_collector/sca/npm/restore_pnpm_dependencies.py

@@ -1,6 +1,5 @@
 import json
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -19,7 +18,7 @@ logger = get_logger('Pnpm Restore Dependencies')
 PNPM_MANIFEST_FILE_NAME = MANIFEST_FILE_NAME
 
 
-def _indicates_pnpm(package_json_content: Optional[str]) -> bool:
+def _indicates_pnpm(package_json_content: str | None) -> bool:
     """Return True if package.json content signals that this project uses pnpm."""
     if not package_json_content:
         return False
@@ -53,7 +52,7 @@ class RestorePnpmDependencies(BaseRestoreDependencies):
 
         return _indicates_pnpm(document.content)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / PNPM_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/npm/restore_yarn_dependencies.py

@@ -1,6 +1,5 @@
 import json
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -19,7 +18,7 @@ logger = get_logger('Yarn Restore Dependencies')
 YARN_MANIFEST_FILE_NAME = MANIFEST_FILE_NAME
 
 
-def _indicates_yarn(package_json_content: Optional[str]) -> bool:
+def _indicates_yarn(package_json_content: str | None) -> bool:
     """Return True if package.json content signals that this project uses Yarn."""
     if not package_json_content:
         return False
@@ -53,7 +52,7 @@ class RestoreYarnDependencies(BaseRestoreDependencies):
 
         return _indicates_yarn(document.content)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / YARN_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/npm/workspace/coverage.py

@@ -2,7 +2,7 @@
 
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, NamedTuple, Optional
+from typing import TYPE_CHECKING, NamedTuple
 
 from cycode.cli.files_collector.sca.npm.workspace.files import logger, resolved_path
 from cycode.cli.files_collector.sca.npm.workspace.globs import declares_workspace_member
@@ -49,7 +49,7 @@ def _containing_scan_roots(manifest_dir: Path, scan_roots: tuple) -> list:
     ]
 
 
-def _resolve_walk_boundary(manifest_dir: Path, scan_roots: tuple) -> Optional[Path]:
+def _resolve_walk_boundary(manifest_dir: Path, scan_roots: tuple) -> Path | None:
     for root_dir in manifest_dir.parents:
         if (root_dir / _GIT_DIR_NAME).exists():
             return root_dir
@@ -76,7 +76,7 @@ def _workspace_root_candidates(manifest_dir: Path, scan_roots: tuple) -> 'Iterat
             return
 
 
-def _find_covering_workspace(manifest_dir: Path, scan_roots: tuple) -> Optional[WorkspaceCoverage]:
+def _find_covering_workspace(manifest_dir: Path, scan_roots: tuple) -> WorkspaceCoverage | None:
     for root_dir in _workspace_root_candidates(manifest_dir, scan_roots):
         member_path = manifest_dir.relative_to(root_dir).as_posix()
 
@@ -98,7 +98,7 @@ def _find_covering_workspace(manifest_dir: Path, scan_roots: tuple) -> Optional[
     return None
 
 
-def find_covering_workspace(manifest_dir: Optional[str], scan_roots: tuple = ()) -> Optional[WorkspaceCoverage]:
+def find_covering_workspace(manifest_dir: str | None, scan_roots: tuple = ()) -> WorkspaceCoverage | None:
     if not manifest_dir:
         return None
 
@@ -115,7 +115,7 @@ def _is_inside_scanned_paths(scan_roots: tuple, root_dir: Path) -> bool:
     return any(is_sub_path(directory, resolved_root_dir) for directory in directories)
 
 
-def is_covered_workspace_member(manifest_dir: Optional[str], document_path: str, scan_roots: tuple = ()) -> bool:
+def is_covered_workspace_member(manifest_dir: str | None, document_path: str, scan_roots: tuple = ()) -> bool:
     coverage = find_covering_workspace(manifest_dir, scan_roots)
     if coverage is None:
         return False