Skip to content

Array union fix #243

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 3 commits into from
Oct 15, 2018
Merged

Array union fix #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75cce08
Updated check for array types to include unions and intersections tha…
tomblind Oct 15, 2018
528d557
fix for detecting arrays/tuples in aliases
tomblind Oct 15, 2018
beb8cce
added tests
tomblind Oct 15, 2018
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
11 changes: 9 additions & 2 deletions src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,16 @@ export class TSHelper {
|| (type.flags & ts.TypeFlags.StringLiteral) !== 0;
}

public static isArrayTypeNode(typeNode: ts.TypeNode): boolean {
return typeNode.kind === ts.SyntaxKind.ArrayType
|| typeNode.kind === ts.SyntaxKind.TupleType
|| ((typeNode.kind === ts.SyntaxKind.UnionType || typeNode.kind === ts.SyntaxKind.IntersectionType)
&& (typeNode as ts.UnionOrIntersectionTypeNode).types.some(this.isArrayTypeNode));
}

public static isArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {
const typeNode = checker.typeToTypeNode(type);
return typeNode && (typeNode.kind === ts.SyntaxKind.ArrayType || typeNode.kind === ts.SyntaxKind.TupleType);
const typeNode = checker.typeToTypeNode(type, undefined, ts.NodeBuilderFlags.InTypeAlias);
return typeNode && this.isArrayTypeNode(typeNode);
}

public static isTupleReturnCall(node: ts.Node, checker: ts.TypeChecker): boolean {
Expand Down
41 changes: 41 additions & 0 deletions test/unit/array.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { Expect, Test, TestCase } from "alsatian";
import * as util from "../src/util";

export class ArrayTests {
@Test("Array access")
public arrayAccess(): void {
const lua = util.transpileString(
`const arr: number[] = [3,5,1];
return arr[1];`
);
const result = util.executeLua(lua);
Expect(result).toBe(5);
}

@Test("Array union access")
public arrayUnionAccess(): void {
const lua = util.transpileString(
`function makeArray(): number[] | string[] { return [3,5,1]; }
const arr = makeArray();
return arr[1];`
);
const result = util.executeLua(lua);
Expect(result).toBe(5);
}

@Test("Array intersection access")
public arrayIntersectionAccess(): void {
const lua = util.transpileString(
`type I = number[] & {foo: string};
function makeArray(): I {
let t = [3,5,1];
(t as I).foo = "bar";
return (t as I);
}
const arr = makeArray();
return arr[1];`
);
const result = util.executeLua(lua);
Expect(result).toBe(5);
}
}
27 changes: 27 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 @@ -51,6 +51,33 @@ export class TupleTests {
Expect(result).toBe(5);
}

@Test("Tuple union access")
public tupleUnionAccess(): void {
const lua = util.transpileString(
`function makeTuple(): [number, number, number] | [string, string, string] { return [3,5,1]; }
const tuple = makeTuple();
return tuple[1];`
);
const result = util.executeLua(lua);
Expect(result).toBe(5);
}

@Test("Tuple intersection access")
public tupleIntersectionAccess(): void {
const lua = util.transpileString(
`type I = [number, number, number] & {foo: string};
function makeTuple(): I {
let t = [3,5,1];
(t as I).foo = "bar";
return (t as I);
}
const tuple = makeTuple();
return tuple[1];`
);
const result = util.executeLua(lua);
Expect(result).toBe(5);
}

@Test("Tuple Destruct")
public tupleDestruct(): void {
// Transpile
Expand Down