diff --git a/packages/type-utils/src/isTypeReadonly.ts b/packages/type-utils/src/isTypeReadonly.ts
index d5d05e94a0e8..632108cd6b3a 100644
--- a/packages/type-utils/src/isTypeReadonly.ts
+++ b/packages/type-utils/src/isTypeReadonly.ts
@@ -107,9 +107,16 @@ function isTypeReadonlyObject(
function checkIndexSignature(kind: ts.IndexKind): Readonlyness {
const indexInfo = checker.getIndexInfoOfType(type, kind);
if (indexInfo) {
- return indexInfo.isReadonly
- ? Readonlyness.Readonly
- : Readonlyness.Mutable;
+ if (!indexInfo.isReadonly) {
+ return Readonlyness.Mutable;
+ }
+
+ return isTypeReadonlyRecurser(
+ checker,
+ indexInfo.type,
+ options,
+ seenTypes,
+ );
}
return Readonlyness.UnknownType;
@@ -119,20 +126,37 @@ function isTypeReadonlyObject(
if (properties.length) {
// ensure the properties are marked as readonly
for (const property of properties) {
- if (
- !(
- isPropertyReadonlyInType(type, property.getEscapedName(), checker) ||
- (options.treatMethodsAsReadonly &&
- property.valueDeclaration !== undefined &&
- hasSymbol(property.valueDeclaration) &&
- isSymbolFlagSet(
- property.valueDeclaration.symbol,
- ts.SymbolFlags.Method,
- ))
- )
- ) {
- return Readonlyness.Mutable;
+ if (options.treatMethodsAsReadonly) {
+ if (
+ property.valueDeclaration !== undefined &&
+ hasSymbol(property.valueDeclaration) &&
+ isSymbolFlagSet(
+ property.valueDeclaration.symbol,
+ ts.SymbolFlags.Method,
+ )
+ ) {
+ continue;
+ }
+
+ const declarations = property.getDeclarations();
+ const lastDeclaration =
+ declarations !== undefined && declarations.length > 0
+ ? declarations[declarations.length - 1]
+ : undefined;
+ if (
+ lastDeclaration !== undefined &&
+ hasSymbol(lastDeclaration) &&
+ isSymbolFlagSet(lastDeclaration.symbol, ts.SymbolFlags.Method)
+ ) {
+ continue;
+ }
+ }
+
+ if (isPropertyReadonlyInType(type, property.getEscapedName(), checker)) {
+ continue;
}
+
+ return Readonlyness.Mutable;
}
// all properties were readonly
diff --git a/packages/type-utils/tests/isTypeReadonly.test.ts b/packages/type-utils/tests/isTypeReadonly.test.ts
index 5afc3b6e59ca..d63ecf422d93 100644
--- a/packages/type-utils/tests/isTypeReadonly.test.ts
+++ b/packages/type-utils/tests/isTypeReadonly.test.ts
@@ -109,6 +109,34 @@ describe('isTypeReadonly', () => {
])('handles non fully readonly sets and maps', runTests);
});
});
+
+ describe('IndexSignature', () => {
+ describe('is readonly', () => {
+ const runTests = runTestIsReadonly;
+
+ it.each([
+ ['type Test = { readonly [key: string]: string };'],
+ [
+ 'type Test = { readonly [key: string]: { readonly foo: readonly string[]; }; };',
+ ],
+ ])(
+ 'handles readonly PropertySignature inside a readonly IndexSignature',
+ runTests,
+ );
+ });
+
+ describe('is not readonly', () => {
+ const runTests = runTestIsNotReadonly;
+
+ it.each([
+ ['type Test = { [key: string]: string };'],
+ ['type Test = { readonly [key: string]: { foo: string[]; }; };'],
+ ])(
+ 'handles mutable PropertySignature inside a readonly IndexSignature',
+ runTests,
+ );
+ });
+ });
});
describe('treatMethodsAsReadonly', () => {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy