Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion packages/pyright-internal/src/analyzer/typedDicts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,11 @@ function assignTypedDictToTypedDictInternal(
}
}
} else {
if (destEntry.isRequired !== srcEntry.isRequired && !destEntry.isReadOnly) {
const isRequiredMismatch = destEntry.isRequired
? !srcEntry.isRequired
: srcEntry.isRequired && !destEntry.isReadOnly;

if (isRequiredMismatch) {
const message = destEntry.isRequired
? LocAddendum.typedDictFieldRequired()
: LocAddendum.typedDictFieldNotRequired();
Expand Down
14 changes: 14 additions & 0 deletions packages/pyright-internal/src/tests/samples/typedDictReadOnly2.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,17 @@ class TD_B2(TypedDict):

# This should generate an error for x but not y.
class TD_B(TD_B1, TD_B2): ...


class TD_SrcNotReq(TypedDict):
tag: NotRequired[str]


class TD_DstReqReadOnly(TypedDict):
tag: ReadOnly[str]


def test_not_required_to_readonly_required(s: TD_SrcNotReq) -> None:
# This should generate an error because tag is required in TD_DstReqReadOnly.
d: TD_DstReqReadOnly = s

7 changes: 6 additions & 1 deletion packages/pyright-internal/src/tests/typeEvaluator5.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,12 @@ test('TypedDictReadOnly1', () => {

test('TypedDictReadOnly2', () => {
const analysisResults = TestUtils.typeAnalyzeSampleFiles(['typedDictReadOnly2.py']);
TestUtils.validateResults(analysisResults, 17);
TestUtils.validateResults(analysisResults, 18);
const requiredKeyError = analysisResults[0].errors.find((diagnostic) => diagnostic.range.start.line === 260);
assert.ok(requiredKeyError);
assert.strictEqual(requiredKeyError.range.start.character, 27);
assert.strictEqual(requiredKeyError.getRule(), DiagnosticRule.reportAssignmentType);
assert.match(requiredKeyError.message, /"tag" is required in "TD_DstReqReadOnly"/);
});

test('TypedDictReadOnly3', () => {
Expand Down
Loading