fixed crashes from recursive base constraints (#681)

tomblind · Perryvw · commit f7cb2a2b084d · 2019-07-23T20:58:16.000+02:00
fixes #680
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -135,7 +135,7 @@ export function isStaticNode(node: ts.Node): boolean {
 export function isStringType(type: ts.Type, checker: ts.TypeChecker, program: ts.Program): boolean {
     if (type.symbol) {
         const baseConstraint = checker.getBaseConstraintOfType(type);
-        if (baseConstraint) {
+        if (baseConstraint && baseConstraint !== type) {
             return isStringType(baseConstraint, checker, program);
         }
     }
@@ -166,7 +166,7 @@ export function isNumberType(type: ts.Type): boolean {
 export function isExplicitArrayType(type: ts.Type, checker: ts.TypeChecker, program: ts.Program): boolean {
     if (type.symbol) {
         const baseConstraint = checker.getBaseConstraintOfType(type);
-        if (baseConstraint) {
+        if (baseConstraint && baseConstraint !== type) {
             return isExplicitArrayType(baseConstraint, checker, program);
         }
     }
diff --git a/test/unit/enum.spec.ts b/test/unit/enum.spec.ts
@@ -172,3 +172,27 @@ test("Const enum index identifier chain", () => {
 
     expect(result).toBe(4);
 });
+
+test("enum toString", () => {
+    const code = `
+        enum TestEnum {
+            A,
+            B,
+            C,
+        }
+        let test = TestEnum.A;
+        return test.toString();`;
+    expect(util.transpileAndExecute(code)).toBe(0);
+});
+
+test("enum concat", () => {
+    const code = `
+        enum TestEnum {
+            A,
+            B,
+            C,
+        }
+        let test = TestEnum.A;
+        return test + "_foobar";`;
+    expect(util.transpileAndExecute(code)).toBe("0_foobar");
+});

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ export function isStaticNode(node: ts.Node): boolean {`
`135`	`135`	`export function isStringType(type: ts.Type, checker: ts.TypeChecker, program: ts.Program): boolean {`
`136`	`136`	`if (type.symbol) {`
`137`	`137`	`const baseConstraint = checker.getBaseConstraintOfType(type);`
`138`		`- if (baseConstraint) {`
	`138`	`+ if (baseConstraint && baseConstraint !== type) {`
`139`	`139`	`return isStringType(baseConstraint, checker, program);`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -166,7 +166,7 @@ export function isNumberType(type: ts.Type): boolean {`
`166`	`166`	`export function isExplicitArrayType(type: ts.Type, checker: ts.TypeChecker, program: ts.Program): boolean {`
`167`	`167`	`if (type.symbol) {`
`168`	`168`	`const baseConstraint = checker.getBaseConstraintOfType(type);`
`169`		`- if (baseConstraint) {`
	`169`	`+ if (baseConstraint && baseConstraint !== type) {`
`170`	`170`	`return isExplicitArrayType(baseConstraint, checker, program);`
`171`	`171`	`}`
`172`	`172`	`}`