Consider arrays and tuples within one another as possibly requiring d…

…eferral (microsoft#37776)
wotterfree · Apr 3, 2020 · 7317292 · 7317292
1 parent 7cf4b12
commit 7317292
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 5 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11858,6 +11858,8 @@ namespace ts {
                 case SyntaxKind.IndexedAccessType:
                 case SyntaxKind.ConditionalType:
                 case SyntaxKind.TypeOperator:
+                case SyntaxKind.ArrayType:
+                case SyntaxKind.TupleType:
                     return isResolvedByTypeAlias(parent);
                 case SyntaxKind.TypeAliasDeclaration:
                     return true;

diff --git a/tests/baselines/reference/circularlyReferentialInterfaceAccessNoCrash.errors.txt b/tests/baselines/reference/circularlyReferentialInterfaceAccessNoCrash.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(1,12): error TS4109: Type arguments for 'Mx' circularly reference themselves.
-tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(8,16): error TS4109: Type arguments for 'Array' circularly reference themselves.
-tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(10,18): error TS4110: Tuple type arguments circularly reference themselves.
+tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(8,16): error TS4110: Tuple type arguments circularly reference themselves.
+tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(10,19): error TS4110: Tuple type arguments circularly reference themselves.
 
 
 ==== tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts (3 errors) ====
@@ -14,10 +14,10 @@ tests/cases/compiler/circularlyReferentialInterfaceAccessNoCrash.ts(10,18): erro
     }
 
     type ArrElem = ['list', ArrElem[number][0]][];
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4109: Type arguments for 'Array' circularly reference themselves.
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS4110: Tuple type arguments circularly reference themselves.
 
     type TupleElem = [['list', TupleElem[0][0]]];
-                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      ~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS4110: Tuple type arguments circularly reference themselves.
 
diff --git a/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.js b/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.js
@@ -0,0 +1,8 @@
+//// [deferredTypeReferenceWithinArrayWithinTuple.ts]
+type TypeStructure =
+  | ["or", TypeStructure[]] // problem is only here, when using array
+  | ["string"]
+  | ["number"] 
+  | ["list", TypeStructure] // with just this it is ok
+
+//// [deferredTypeReferenceWithinArrayWithinTuple.js]
diff --git a/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.symbols b/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/deferredTypeReferenceWithinArrayWithinTuple.ts ===
+type TypeStructure =
+>TypeStructure : Symbol(TypeStructure, Decl(deferredTypeReferenceWithinArrayWithinTuple.ts, 0, 0))
+
+  | ["or", TypeStructure[]] // problem is only here, when using array
+>TypeStructure : Symbol(TypeStructure, Decl(deferredTypeReferenceWithinArrayWithinTuple.ts, 0, 0))
+
+  | ["string"]
+  | ["number"] 
+  | ["list", TypeStructure] // with just this it is ok
+>TypeStructure : Symbol(TypeStructure, Decl(deferredTypeReferenceWithinArrayWithinTuple.ts, 0, 0))
+
diff --git a/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.types b/tests/baselines/reference/deferredTypeReferenceWithinArrayWithinTuple.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/deferredTypeReferenceWithinArrayWithinTuple.ts ===
+type TypeStructure =
+>TypeStructure : TypeStructure
+
+  | ["or", TypeStructure[]] // problem is only here, when using array
+  | ["string"]
+  | ["number"] 
+  | ["list", TypeStructure] // with just this it is ok
diff --git a/tests/cases/compiler/deferredTypeReferenceWithinArrayWithinTuple.ts b/tests/cases/compiler/deferredTypeReferenceWithinArrayWithinTuple.ts
@@ -0,0 +1,5 @@
+type TypeStructure =
+  | ["or", TypeStructure[]] // problem is only here, when using array
+  | ["string"]
+  | ["number"] 
+  | ["list", TypeStructure] // with just this it is ok