Merge pull request #17765 from tycho01/6229-known-length-tuples

add `strictTuples` flag giving tuples known length
microsoft · Nov 8, 2017 · 90f87ef · 90f87ef
2 parents b7d36b2 + c1c7926
commit 90f87ef
Show file tree

Hide file tree

Showing 53 changed files with 847 additions and 298 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7310,6 +7310,9 @@ namespace ts {
                 property.type = typeParameter;
                 properties.push(property);
             }
+            const lengthSymbol = createSymbol(SymbolFlags.Property, "length" as __String);
+            lengthSymbol.type = getLiteralType(arity);
+            properties.push(lengthSymbol);
             const type = <GenericType & InterfaceTypeWithDeclaredMembers>createObjectType(ObjectFlags.Tuple | ObjectFlags.Reference);
             type.typeParameters = typeParameters;
             type.outerTypeParameters = undefined;

diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt b/tests/baselines/reference/arityAndOrderCompatibility01.errors.txt
@@ -1,59 +1,57 @@
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(13,12): error TS2493: Tuple type '[string, number]' with length '2' cannot be assigned to tuple with length '3'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(14,12): error TS2460: Type 'StrNum' has no property '2'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,5): error TS2461: Type '{ 0: string; 1: number; }' is not an array type.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,12): error TS2460: Type '{ 0: string; 1: number; }' has no property '2'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(15,12): error TS2493: Tuple type '[string, number]' with length '2' cannot be assigned to tuple with length '3'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(16,12): error TS2460: Type 'StrNum' has no property '2'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2461: Type '{ 0: string; 1: number; length: 2; }' is not an array type.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,12): error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
   Property '2' is missing in type '[string, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(17,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type 'StrNum' is not assignable to type '[number, number, number]'.
   Property '2' is missing in type 'StrNum'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(18,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
-  Property '2' is missing in type '{ 0: string; 1: number; }'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(19,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
+  Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
   Property '2' is missing in type '[string, number]'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(20,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type 'StrNum' is not assignable to type '[string, number, number]'.
   Property '2' is missing in type 'StrNum'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(21,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string, number, number]'.
-  Property '2' is missing in type '{ 0: string; 1: number; }'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(22,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
+  Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '[string, number]' is not assignable to type '[number]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(23,5): error TS2322: Type 'StrNum' is not assignable to type '[number]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error TS2322: Type 'StrNum' is not assignable to type '[number]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(24,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
-  Property 'length' is missing in type '{ 0: string; 1: number; }'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
-  Types of property 'pop' are incompatible.
-    Type '() => string | number' is not assignable to type '() => string'.
-      Type 'string | number' is not assignable to type 'string'.
-        Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
-  Types of property 'pop' are incompatible.
-    Type '() => string | number' is not assignable to type '() => string'.
-      Type 'string | number' is not assignable to type 'string'.
-        Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
-  Property 'length' is missing in type '{ 0: string; 1: number; }'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
+  Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '[string, number]' is not assignable to type '[string]'.
+  Types of property 'length' are incompatible.
+    Type '2' is not assignable to type '1'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
+  Types of property 'length' are incompatible.
+    Type '2' is not assignable to type '1'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
+  Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
   Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(29,5): error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(31,5): error TS2322: Type 'StrNum' is not assignable to type '[number, string]'.
   Types of property '0' are incompatible.
     Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
-  Property 'length' is missing in type '{ 0: string; 1: number; }'.
+tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
+  Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
 
 
 ==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (19 errors) ====
     interface StrNum extends Array<string|number> {
         0: string;
         1: number;
+        length: 2;
     }
 
     var x: [string, number];
     var y: StrNum
     var z: {
         0: string;
         1: number;
+        length: 2;
     }
 
     var [a, b, c] = x;
@@ -64,9 +62,9 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2460: Type 'StrNum' has no property '2'.
     var [g, h, i] = z;
         ~~~~~~~~~
-!!! error TS2461: Type '{ 0: string; 1: number; }' is not an array type.
+!!! error TS2461: Type '{ 0: string; 1: number; length: 2; }' is not an array type.
                ~
-!!! error TS2460: Type '{ 0: string; 1: number; }' has no property '2'.
+!!! error TS2460: Type '{ 0: string; 1: number; length: 2; }' has no property '2'.
     var j1: [number, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, number, number]'.
@@ -77,8 +75,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322:   Property '2' is missing in type 'StrNum'.
     var j3: [number, number, number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; }'.
+!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
     var k1: [string, number, number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string, number, number]'.
@@ -89,8 +87,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322:   Property '2' is missing in type 'StrNum'.
     var k3: [string, number, number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string, number, number]'.
-!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; }'.
+!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string, number, number]'.
+!!! error TS2322:   Property '2' is missing in type '{ 0: string; 1: number; length: 2; }'.
     var l1: [number] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number]'.
@@ -103,26 +101,22 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var l3: [number] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number]'.
-!!! error TS2322:   Property 'length' is missing in type '{ 0: string; 1: number; }'.
+!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number]'.
+!!! error TS2322:   Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
     var m1: [string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[string]'.
-!!! error TS2322:   Types of property 'pop' are incompatible.
-!!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
-!!! error TS2322:       Type 'string | number' is not assignable to type 'string'.
-!!! error TS2322:         Type 'number' is not assignable to type 'string'.
+!!! error TS2322:   Types of property 'length' are incompatible.
+!!! error TS2322:     Type '2' is not assignable to type '1'.
     var m2: [string] = y;
         ~~
 !!! error TS2322: Type 'StrNum' is not assignable to type '[string]'.
-!!! error TS2322:   Types of property 'pop' are incompatible.
-!!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
-!!! error TS2322:       Type 'string | number' is not assignable to type 'string'.
-!!! error TS2322:         Type 'number' is not assignable to type 'string'.
+!!! error TS2322:   Types of property 'length' are incompatible.
+!!! error TS2322:     Type '2' is not assignable to type '1'.
     var m3: [string] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
-!!! error TS2322:   Property 'length' is missing in type '{ 0: string; 1: number; }'.
+!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[string]'.
+!!! error TS2322:   Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
     var n1: [number, string] = x;
         ~~
 !!! error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
@@ -134,8 +128,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var n3: [number, string] = z;
         ~~
-!!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[number, string]'.
-!!! error TS2322:   Property 'length' is missing in type '{ 0: string; 1: number; }'.
+!!! error TS2322: Type '{ 0: string; 1: number; length: 2; }' is not assignable to type '[number, string]'.
+!!! error TS2322:   Property 'push' is missing in type '{ 0: string; 1: number; length: 2; }'.
     var o1: [string, number] = x;
     var o2: [string, number] = y;
     var o3: [string, number] = y;

diff --git a/tests/baselines/reference/arityAndOrderCompatibility01.js b/tests/baselines/reference/arityAndOrderCompatibility01.js
@@ -2,13 +2,15 @@
 interface StrNum extends Array<string|number> {
     0: string;
     1: number;
+    length: 2;
 }
 
 var x: [string, number];
 var y: StrNum
 var z: {
     0: string;
     1: number;
+    length: 2;
 }
 
 var [a, b, c] = x;