asdf

.gitignore

@@ -128,4 +128,7 @@ Thumbs.db
 .pdm-python
 .pyprojectx
 **/__pycache__
-/.venv/
+/.venv/
+
+# js files copied into the basedpyright pypi package
+basedpyright/*.js

basedpyright/langserver.py

@@ -4,4 +4,4 @@
 
 
 def main():
-    run("pyright-langserver")
+    run("langserver.index")

basedpyright/pyright.py

@@ -4,4 +4,4 @@
 
 
 def main():
-    run("pyright")
+    run("index")

basedpyright/run_node.py

@@ -7,4 +7,4 @@
 
 
 def run(script_name: str):
-    node.run([Path(__file__).parent / f"dist/{script_name}.js", *sys.argv[1:]])
+    node.run([Path(__file__).parent / f"{script_name}.js", *sys.argv[1:]])

dynamic_info.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from json import loads
+from pathlib import Path
+
+root_dir = Path(__file__).parent
+
+
+def get_version() -> str:
+    return loads((root_dir / "lerna.json").read_text())["version"]
+
+
+def get_description() -> str:
+    return loads((root_dir / "package.json").read_text())["description"]

pdm_build.py

@@ -1,12 +1,20 @@
 from __future__ import annotations
 
+from json import loads
 from pathlib import Path
-from shutil import copytree
+from shutil import copyfile, copytree
 
 from nodejs import npm
 
 if not Path("node_modules").exists():
     _ = npm.run(["ci"], check=True)
 _ = npm.run(["run", "build:cli:dev"], check=True)
 
-copytree("packages/pyright/dist", "basedpyright/dist", dirs_exist_ok=True)
+npm_package_dir = Path("packages/pyright")
+pypi_package_dir = Path("basedpyright")
+
+copytree(npm_package_dir / "dist", pypi_package_dir / "dist", dirs_exist_ok=True)
+for script_path in loads((npm_package_dir / "package.json").read_text())[
+    "bin"
+].values():
+    copyfile(npm_package_dir / script_path, pypi_package_dir / script_path)

pyproject.toml

@@ -8,13 +8,16 @@ package-type = "library"
 dev = ["black>=23", "pylint>=3.0.0a7", "ruff>=0.0.290"]
 
 [tool.pdm.version]
-source = "file"
-path = "__init__.py"
+source = "call"
+getter = "dynamic_info:get_version"
+
+[tool.pdm.description]
+source = "call"
+getter = "dynamic_info:get_description"
 
 [project]
 name = "basedpyright"
-dynamic = ["version"]
-description = "Default template for PDM package"
+dynamic = ["version", "description"]
 authors = [
     { name = "detachhead", email = "[email protected]" },
 ]
@@ -245,6 +248,8 @@ max-line-length = 200
 [tool.pyright]
 pythonVersion = "3.8"
 pythonPlatform = "All"
+include = ["basedpyright", "dynamic_info.py", "pdm_build.py"]
+exclude = ['basedpyright/dist']
 reportMissingTypeStubs = false
 strictListInference = true
 strictDictionaryInference = true
@@ -291,7 +296,7 @@ reportUnnecessaryComparison = true
 reportUnnecessaryContains = true
 reportAssertAlwaysTrue = true
 reportSelfClsParameterName = true
-reportImplicitStringConcatenation = false  # conflicts with black
+reportImplicitStringConcatenation = false                     # conflicts with black
 reportInvalidStubStatement = true
 reportIncompleteStub = true
 reportUnsupportedDunderAll = true