Skip to content

Fix readonly tuple detection #674

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
Perryvw merged 1 commit into from
Jul 19, 2019
Merged

Fix readonly tuple detection #674

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
8 changes: 4 additions & 4 deletions src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ export function isExplicitArrayType(type: ts.Type, checker: ts.TypeChecker, prog
return type.types.some(t => isExplicitArrayType(t, checker, program));
}

if (isStandardLibraryType(type, "ReadonlyArray", program)) {
return true;
const flags = ts.NodeBuilderFlags.InTypeAlias | ts.NodeBuilderFlags.AllowEmptyTuple;
let typeNode = checker.typeToTypeNode(type, undefined, flags);
if (typeNode && ts.isTypeOperatorNode(typeNode) && typeNode.operator === ts.SyntaxKind.ReadonlyKeyword) {
typeNode = typeNode.type;
}

const flags = ts.NodeBuilderFlags.InTypeAlias | ts.NodeBuilderFlags.AllowEmptyTuple;
const typeNode = checker.typeToTypeNode(type, undefined, flags);
return typeNode !== undefined && (ts.isArrayTypeNode(typeNode) || ts.isTupleTypeNode(typeNode));
}

Expand Down
9 changes: 9 additions & 0 deletions test/unit/tuples.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ test("Tuple access", () => {
expect(result).toBe(5);
});

test("Readonly Tuple access", () => {
const result = util.transpileAndExecute(
`const tuple: readonly [number, number, number] = [3,5,1];
return tuple[1];`
);

expect(result).toBe(5);
});

test("Tuple union access", () => {
const result = util.transpileAndExecute(
`function makeTuple(): [number, number, number] | [string, string, string] { return [3,5,1]; }
Expand Down