diff --git a/packages/pyright-internal/src/analyzer/typedDicts.ts b/packages/pyright-internal/src/analyzer/typedDicts.ts index 42a4d676e6b1..9ef19587977f 100644 --- a/packages/pyright-internal/src/analyzer/typedDicts.ts +++ b/packages/pyright-internal/src/analyzer/typedDicts.ts @@ -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(); diff --git a/packages/pyright-internal/src/tests/samples/typedDictReadOnly2.py b/packages/pyright-internal/src/tests/samples/typedDictReadOnly2.py index 12e446b96cbe..01b7905e4058 100644 --- a/packages/pyright-internal/src/tests/samples/typedDictReadOnly2.py +++ b/packages/pyright-internal/src/tests/samples/typedDictReadOnly2.py @@ -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 + diff --git a/packages/pyright-internal/src/tests/typeEvaluator5.test.ts b/packages/pyright-internal/src/tests/typeEvaluator5.test.ts index dba285a01535..66c0eb83b8f6 100644 --- a/packages/pyright-internal/src/tests/typeEvaluator5.test.ts +++ b/packages/pyright-internal/src/tests/typeEvaluator5.test.ts @@ -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', () => {