Skip to content

Remove AllOf and AnyOf. #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnwpark merged 1 commit into from
Jan 29, 2026
Merged

Remove AllOf and AnyOf. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 0 additions & 168 deletions tests/test_type_eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

from typemap.type_eval import eval_typing
from typemap.typing import (
AllOf,
AnyOf,
Attrs,
Bool,
FromUnion,
Expand Down Expand Up @@ -1243,172 +1241,6 @@ def test_eval_bool_05():
assert d == Literal[False]


def test_eval_all_01():
d = eval_typing(AllOf[()])
assert d == _BoolLiteral[True]

d = eval_typing(AllOf[_BoolLiteral[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[_BoolLiteral[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AllOf[_BoolLiteral[True], _BoolLiteral[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[_BoolLiteral[True], _BoolLiteral[False]])
assert d == _BoolLiteral[False]
d = eval_typing(AllOf[_BoolLiteral[False], _BoolLiteral[True]])
assert d == _BoolLiteral[False]
d = eval_typing(AllOf[_BoolLiteral[False], _BoolLiteral[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AllOf[Literal[True] | Literal[False]])
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[int | Never])
assert d == _BoolLiteral[False]
d = eval_typing(
AllOf[Literal[0] | Literal[True], Literal[2] | Literal[True]]
)
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[Literal[0] | Literal[1], Literal[2] | Literal[True]])
assert d == _BoolLiteral[False]
d = eval_typing(AllOf[Literal[0] | Literal[1], Literal[2] | Literal[3]])
assert d == _BoolLiteral[False]


def test_eval_all_02():
d = eval_typing(AllOf[()])
assert d == _BoolLiteral[True]

d = eval_typing(AllOf[Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[Literal[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AllOf[Literal[True], Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AllOf[Literal[True], Literal[False]])
assert d == _BoolLiteral[False]
d = eval_typing(AllOf[Literal[False], Literal[True]])
assert d == _BoolLiteral[False]


type ContainsAllInt[Ts] = AllOf[*[IsSub[t, int] for t in Iter[Ts]]]
type ContainsAllIntToLiteral[Ts] = (
Literal[True] if Bool[ContainsAllInt[Ts]] else Literal[False]
)


def test_eval_all_03():
d = eval_typing(ContainsAllInt[tuple[()]])
assert d == _BoolLiteral[True]

d = eval_typing(ContainsAllInt[tuple[int]])
assert d == _BoolLiteral[True]
d = eval_typing(ContainsAllInt[tuple[str]])
assert d == _BoolLiteral[False]

d = eval_typing(ContainsAllInt[tuple[int, int]])
assert d == _BoolLiteral[True]
d = eval_typing(ContainsAllInt[tuple[int, str]])
assert d == _BoolLiteral[False]
d = eval_typing(ContainsAllInt[tuple[str, str]])
assert d == _BoolLiteral[False]


def test_eval_all_04():
d = eval_typing(ContainsAllIntToLiteral[tuple[()]])
assert d == Literal[True]

d = eval_typing(ContainsAllIntToLiteral[tuple[int]])
assert d == Literal[True]
d = eval_typing(ContainsAllIntToLiteral[tuple[str]])
assert d == Literal[False]


def test_eval_any_01():
d = eval_typing(AnyOf[()])
assert d == _BoolLiteral[False]

d = eval_typing(AnyOf[_BoolLiteral[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[_BoolLiteral[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AnyOf[_BoolLiteral[True], _BoolLiteral[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[_BoolLiteral[True], _BoolLiteral[False]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[_BoolLiteral[False], _BoolLiteral[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[_BoolLiteral[False], _BoolLiteral[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AnyOf[Literal[True] | Literal[False]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[int | Never])
assert d == _BoolLiteral[False]
d = eval_typing(
AnyOf[Literal[0] | Literal[True], Literal[2] | Literal[True]]
)
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[0] | Literal[1], Literal[2] | Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[0] | Literal[1], Literal[2] | Literal[3]])
assert d == _BoolLiteral[False]


def test_eval_any_02():
d = eval_typing(AnyOf[()])
assert d == _BoolLiteral[False]

d = eval_typing(AnyOf[Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[False]])
assert d == _BoolLiteral[False]

d = eval_typing(AnyOf[Literal[True], Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[True], Literal[False]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[False], Literal[True]])
assert d == _BoolLiteral[True]
d = eval_typing(AnyOf[Literal[False], Literal[False]])
assert d == _BoolLiteral[False]


type ContainsAnyInt[Ts] = AnyOf[*[IsSub[t, int] for t in Iter[Ts]]]
type ContainsAnyIntToLiteral[Ts] = (
Literal[True] if Bool[ContainsAnyInt[Ts]] else Literal[False]
)


def test_eval_any_03():
d = eval_typing(ContainsAnyInt[tuple[()]])
assert d == _BoolLiteral[False]

d = eval_typing(ContainsAnyInt[tuple[int]])
assert d == _BoolLiteral[True]
d = eval_typing(ContainsAnyInt[tuple[str]])
assert d == _BoolLiteral[False]

d = eval_typing(ContainsAnyInt[tuple[int, int]])
assert d == _BoolLiteral[True]
d = eval_typing(ContainsAnyInt[tuple[int, str]])
assert d == _BoolLiteral[True]
d = eval_typing(ContainsAnyInt[tuple[str, str]])
assert d == _BoolLiteral[False]


def test_eval_any_04():
d = eval_typing(ContainsAnyIntToLiteral[tuple[()]])
assert d == Literal[False]

d = eval_typing(ContainsAnyIntToLiteral[tuple[int]])
assert d == Literal[True]
d = eval_typing(ContainsAnyIntToLiteral[tuple[str]])
assert d == Literal[False]


def test_eval_literal_generic_01():
d = eval_typing(_BoolLiteral[True])
assert d == _BoolLiteral[True]
Expand Down
14 changes: 0 additions & 14 deletions typemap/type_eval/_eval_operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
_get_class_type_hint_namespaces,
)
from typemap.typing import (
AllOf,
AnyOf,
Attrs,
Bool,
Capitalize,
Expand Down Expand Up @@ -274,18 +272,6 @@ def _eval_Bool(tp, *, ctx):
return _eval_bool_tp(tp, ctx)


@type_eval.register_evaluator(AllOf)
@_lift_evaluated
def _eval_AllOf(*tp, ctx):
return _BoolLiteral[all(_eval_bool_tp(tp, ctx) for tp in tp)]


@type_eval.register_evaluator(AnyOf)
@_lift_evaluated
def _eval_AnyOf(*tp, ctx):
return _BoolLiteral[any(_eval_bool_tp(tp, ctx) for tp in tp)]


@type_eval.register_evaluator(_BoolLiteral)
@_lift_evaluated
def _eval_BoolLiteral(tp, *, ctx):
Expand Down
10 changes: 0 additions & 10 deletions typemap/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,16 +231,6 @@ def Bool(self, tp):
return _BoolGenericAlias(self, tp)


@_SpecialForm
def AllOf(self, tp):
return _BoolGenericAlias(self, tp)


@_SpecialForm
def AnyOf(self, tp):
return _BoolGenericAlias(self, tp)


class _BoolLiteralGenericAlias(_LiteralGenericAlias, _root=True): # type: ignore[call-arg]
def __bool__(self):
return typing.get_args(self)[0]
Expand Down