Skip to content

Commit 8b5a42c

Browse files
author
khoden
committed
FBP-None: nots.py add MORE typings
Побочный рефакторинг, давно напрашивался, плюс помог мне чуть освоится в этом файле. commit_hash:c8dbe9573b9d41f85ad255ba9470cb93bf87d69c
1 parent f1c6983 commit 8b5a42c

File tree

3 files changed

+181
-77
lines changed

3 files changed

+181
-77
lines changed

build/plugins/lib/nots/package_manager/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import typing
1+
from typing import Literal
22

33
from .base import (
44
bundle_node_modules,
@@ -14,10 +14,13 @@
1414
from .pnpm import PnpmPackageManager
1515
from .npm import NpmPackageManager
1616

17+
18+
type PackageManagerType = Literal["pnpm", "npm"]
19+
1720
manager = PnpmPackageManager
1821

1922

20-
def get_package_manager_type(key: typing.Literal["pnpm", "npm"]) -> typing.Type[BasePackageManager]:
23+
def get_package_manager_type(key: PackageManagerType) -> type[BasePackageManager]:
2124
if key == "pnpm":
2225
return PnpmPackageManager
2326
if key == "npm":
@@ -33,6 +36,7 @@ def get_package_manager_type(key: typing.Literal["pnpm", "npm"]) -> typing.Type[
3336
"PackageJson",
3437
"PackageJsonWorkspaceError",
3538
"PackageManagerCommandError",
39+
"PackageManagerType",
3640
"bundle_node_modules",
3741
"constants",
3842
"extract_node_modules",

build/plugins/lib/nots/typescript/ts_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def inline_extend(self, dep_paths):
157157
"""
158158
extends = self.data.get(RootFields.extends)
159159

160-
if type(extends) == list:
160+
if isinstance(extends, list):
161161
paths = [self.extend_one(dep_paths, ext_value) for ext_value in extends]
162162
flatten_paths = [item for row in paths for item in row]
163163
else:

0 commit comments

Comments
 (0)