Merge pull request #302 from zhangxichang/chore/add-basedpyright-and-refactor

chore: add basedpyright, refactor android sign config with better type safety

Author: zhangxichang

package.json

@@ -17,7 +17,7 @@
 		"check": "run-p 'check:*'",
 		"check:tsc": "tsc",
 		"check:eslint": "eslint src",
-		"check:format": "biome check",
+		"check:script": "uv run basedpyright scripts",
 		"native:dev": "tauri dev",
 		"native:build": "tauri build",
 		"native:build:debug": "tauri build --debug",

pyproject.toml

@@ -2,12 +2,19 @@
 name = "scripts"
 version = "0.1.0"
 requires-python = ">=3.14"
-dependencies = [
+
+dependencies = ["kopyt>=0.0.2"]
+
+[dependency-groups]
+lint = ["basedpyright>=1.39.3"]
+jupyter = [
     "black>=26.3.1",
     "isort>=8.0.1",
     "jupyterlab>=4.5.7",
     "jupyterlab-code-formatter>=3.0.3",
-    "jupyterlab-lsp>=5.2.0",
-    "kopyt>=0.0.2",
-    "python-lsp-server[all]>=1.14.0",
+    "jupyterlab-lsp>=5.3.0",
+    "python-lsp-server>=1.14.0",
 ]
+
+[tool.pyright]
+typeCheckingMode = "standard"

scripts/insert_android_sign_config.py

@@ -1,7 +1,7 @@
 from argparse import ArgumentParser
 from os import path
 from shutil import copyfile
-from typing import Optional
+from typing import Optional, TypeGuard
 from kopyt import Parser
 from kopyt.node import (
     CallSuffix,
@@ -14,19 +14,21 @@
 from kopyt.position import Position
 
 
-def is_postfix_unary_expression(node) -> bool:
+def is_postfix_unary_expression(node) -> TypeGuard[PostfixUnaryExpression]:
     return isinstance(node, PostfixUnaryExpression)
 
 
-def is_simple_identifier(node, value: Optional[str] = None) -> bool:
+def is_simple_identifier(
+    node, value: Optional[str] = None
+) -> TypeGuard[SimpleIdentifier]:
     if not isinstance(node, SimpleIdentifier):
         return False
     if value is not None and node.value != value:
         return False
     return True
 
 
-def is_call_suffix(node) -> bool:
+def is_call_suffix(node) -> TypeGuard[CallSuffix]:
     return isinstance(node, CallSuffix)
 
 
@@ -36,6 +38,18 @@ def get_call_suffix_with_lambda(node) -> Optional[CallSuffix]:
     return None
 
 
+def _has_release_value_arg(arguments) -> bool:
+    """Check if any ValueArgument wraps a LineStringLiteral '"release"'."""
+    for arg in arguments:
+        if not isinstance(arg, ValueArgument):
+            continue
+        if not isinstance(arg.value, LineStringLiteral):
+            continue
+        if arg.value.value == '"release"':
+            return True
+    return False
+
+
 def find_suffixes_with_lambda(postfix_node: PostfixUnaryExpression) -> list[CallSuffix]:
     result = []
     for suffix in postfix_node.suffixes:
@@ -68,14 +82,8 @@ def find_call_suffix_with_release_arg(
             continue
         if suffix.arguments is None:
             continue
-
-        for arg in suffix.arguments:
-            if not isinstance(arg, ValueArgument):
-                continue
-            if not isinstance(arg.value, LineStringLiteral):
-                continue
-            if arg.value.value == '"release"':
-                return suffix
+        if _has_release_value_arg(suffix.arguments):
+            return suffix
 
     return None
 
@@ -87,6 +95,7 @@ def find_release_buildtype_suffix(
         call_suffix = get_call_suffix_with_lambda(buildtypes_suffix)
         if not call_suffix:
             continue
+        assert call_suffix.lambda_expression is not None
 
         buildtypes_lambda = call_suffix.lambda_expression.value
         buildtypes_expr = find_expression_by_name(
@@ -138,10 +147,10 @@ def find_release_buildtype_suffix(
 use_signing_configs_code = 'signingConfig = signingConfigs.getByName("release")'
 
 for root_statement in gradle_build_script.statements:
-    if not is_postfix_unary_expression(root_statement.statement):
+    android_expr = root_statement.statement
+    if not is_postfix_unary_expression(android_expr):
         continue
 
-    android_expr = root_statement.statement
     if not is_simple_identifier(android_expr.expression, "android"):
         continue
 
@@ -150,11 +159,13 @@ def find_release_buildtype_suffix(
         continue
 
     android_call = call_suffixes[0]
-    android_lambda = android_call.lambda_expression.value
+    android_lambda = android_call.lambda_expression
+    if android_lambda is None:
+        continue
 
-    android_lambda.statements = [Parser(signing_configs_code).parse_statement()] + list(
-        android_lambda.statements
-    )
+    android_lambda.value.statements = [
+        Parser(signing_configs_code).parse_statement()
+    ] + list(android_lambda.value.statements)
 
     release_suffix = find_release_buildtype_suffix(android_expr)
     if release_suffix and release_suffix.lambda_expression: