Skip to content

Commit 4982d99

Browse files
committed
fix: require ambient TypeScript namespace declarations
Signed-off-by: Efe Gökdemir <[email protected]>
1 parent 8ffd4f9 commit 4982d99

2 files changed

Lines changed: 33 additions & 2 deletions

File tree

‎src/skillspector/nested_artifacts.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,20 @@ def _zip_member_is_link(info: zipfile.ZipInfo) -> bool:
391391
)
392392

393393
_TYPESCRIPT_DECLARATION_SUFFIXES = (".d.ts", ".d.cts", ".d.mts")
394+
_TYPESCRIPT_AMBIENT_MEMBER = (
395+
r"(?:export\s+)?(?:"
396+
r"interface\s+[A-Za-z_$][\w$]*(?:\s*<[^{}]*>)?\s*\{[^{}]*\}|"
397+
r"type\s+[A-Za-z_$][\w$]*(?:\s*<[^;{}]*>)?\s*=\s*[^;{}]+;|"
398+
r"(?:const|let|var)\s+[A-Za-z_$][\w$]*(?:\s*:\s*[^;{}]+)?\s*;|"
399+
r"function\s+[A-Za-z_$][\w$]*\s*\([^{}]*\)\s*:\s*[^;{}]+;|"
400+
r"class\s+[A-Za-z_$][\w$]*\s*\{[^{}]*\}"
401+
r")"
402+
)
394403
_TYPESCRIPT_DECLARATION_FILE = re.compile(
395404
r"\A\s*(?:"
396405
r"(?:declare\s+(?:const|let|var|function|class)\b[^;{}]*;)|"
397-
r"(?:(?:declare\s+)?(?:export\s+)?namespace\s+[A-Za-z_$][\w$]*\s*\{[^{}]*\}\s*;?)|"
398-
r"(?:(?:declare\s+)?module\s+(?:[\"'][^\"']+[\"']|[A-Za-z_$][\w$]*)\s*\{[^{}]*\}\s*;?)|"
406+
rf"(?:declare\s+(?:export\s+)?namespace\s+[A-Za-z_$][\w$]*\s*\{{(?:\s*{_TYPESCRIPT_AMBIENT_MEMBER})*\s*\}}\s*;?)|"
407+
rf"(?:declare\s+module\s+(?:[\"'][^\"']+[\"']|[A-Za-z_$][\w$]*)\s*\{{(?:\s*{_TYPESCRIPT_AMBIENT_MEMBER})*\s*\}}\s*;?)|"
399408
r"(?:(?:export\s+)?interface\s+[A-Za-z_$][\w$]*(?:\s*<[^{}]*>)?\s*\{[^{}]*\}\s*;?)|"
400409
r"(?:(?:export\s+)?type\s+[A-Za-z_$][\w$]*(?:\s*<[^;{}]*>)?\s*=\s*[^;{}]+;)|"
401410
r"(?:import\s+type\b[^;{}]+;)|"

‎tests/nodes/test_nested_artifacts.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,28 @@ def test_mixed_typescript_declaration_and_runtime_stays_executable() -> None:
9393
assert is_executable_content("evil.d.ts", runtime)
9494

9595

96+
@pytest.mark.parametrize("path", ["types.d.ts", "types.d.cts", "types.d.mts"])
97+
def test_ambient_typescript_namespaces_and_modules_are_declarations(path: str) -> None:
98+
declaration = (
99+
b"declare namespace Payload { interface Value { name: string; } }\n"
100+
b'declare module "payload" { export function load(): string; }\n'
101+
)
102+
103+
assert not is_executable_content(path, declaration)
104+
105+
106+
@pytest.mark.parametrize(
107+
"runtime",
108+
[
109+
b'namespace Payload { console.log("runtime"); }\n',
110+
b'export namespace Payload { console.log("runtime"); }\n',
111+
b'declare namespace Payload { console.log("runtime"); }\n',
112+
],
113+
)
114+
def test_typescript_namespace_bodies_must_be_proven_ambient(runtime: bytes) -> None:
115+
assert is_executable_content("evil.d.ts", runtime)
116+
117+
96118
@pytest.mark.parametrize(
97119
"runtime",
98120
[

0 commit comments

Comments
 (0)