Revert "Add TupleBase with unusable mutating Array methods"

This reverts commits
4385444,
2399d58,
es55de3,
888da3c

Author: sandersn

src/compiler/checker.ts

@@ -330,7 +330,6 @@ namespace ts {
         let globalFunctionType: ObjectType;
         let globalArrayType: GenericType;
         let globalReadonlyArrayType: GenericType;
-        let globalTupleBaseType: GenericType;
         let globalStringType: ObjectType;
         let globalNumberType: ObjectType;
         let globalBooleanType: ObjectType;
@@ -773,7 +772,7 @@ namespace ts {
          * @param parameterName a name of the parameter to get the symbols for.
          * @return a tuple of two symbols
          */
-        function getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: __String): Symbol[] {
+        function getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: __String): [Symbol, Symbol] {
             const constructorDeclaration = parameter.parent;
             const classDeclaration = parameter.parent.parent;
 
@@ -4993,7 +4992,7 @@ namespace ts {
         function getBaseTypes(type: InterfaceType): BaseType[] {
             if (!type.resolvedBaseTypes) {
                 if (type.objectFlags & ObjectFlags.Tuple) {
-                    type.resolvedBaseTypes = [createTypeFromGenericGlobalType(globalTupleBaseType, [getUnionType(type.typeParameters)])];
+                    type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
                 else if (type.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     if (type.symbol.flags & SymbolFlags.Class) {
@@ -10018,7 +10017,7 @@ namespace ts {
             const typeParameters = type.typeParameters || emptyArray;
             let variances = type.variances;
             if (!variances) {
-                if (type === globalArrayType || type === globalReadonlyArrayType || type === globalTupleBaseType) {
+                if (type === globalArrayType || type === globalReadonlyArrayType) {
                     // Arrays are known to be covariant, no need to spend time computing this
                     variances = [Variance.Covariant];
                 }
@@ -10347,7 +10346,7 @@ namespace ts {
         function isArrayLikeType(type: Type): boolean {
             // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
-            return getObjectFlags(type) & ObjectFlags.Reference && ((<TypeReference>type).target === globalArrayType || (<TypeReference>type).target === globalReadonlyArrayType || (type as TypeReference).target === globalTupleBaseType) ||
+            return getObjectFlags(type) & ObjectFlags.Reference && ((<TypeReference>type).target === globalArrayType || (<TypeReference>type).target === globalReadonlyArrayType) ||
                 !(type.flags & TypeFlags.Nullable) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
 
@@ -24524,9 +24523,7 @@ namespace ts {
             anyArrayType = createArrayType(anyType);
             autoArrayType = createArrayType(autoType);
 
-            // TODO: ReadonlyArray and TupleBase should always be available, but haven't been required previously
             globalReadonlyArrayType = <GenericType>getGlobalTypeOrUndefined("ReadonlyArray" as __String, /*arity*/ 1);
-            globalTupleBaseType = <GenericType>getGlobalTypeOrUndefined("TupleBase" as __String, /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = <GenericType>getGlobalTypeOrUndefined("ThisType" as __String, /*arity*/ 1);
         }

src/lib/es5.d.ts

@@ -1240,23 +1240,6 @@ interface ArrayConstructor {
 
 declare const Array: ArrayConstructor;
 
-interface TupleBase<T> extends Array<T> {
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    push: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    pop: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    reverse: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    sort: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    shift: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    unshift: never;
-    /** Mutation is not allowed on tuples. Do not use this method. */
-    splice: never;
-}
-
 interface TypedPropertyDescriptor<T> {
     enumerable?: boolean;
     configurable?: boolean;

tests/baselines/reference/arityAndOrderCompatibility01.errors.txt

@@ -40,7 +40,7 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(32,5): error
 
 
 ==== tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts (19 errors) ====
-    interface StrNum extends TupleBase<string|number> {
+    interface StrNum extends Array<string|number> {
         0: string;
         1: number;
         length: 2;

tests/baselines/reference/arityAndOrderCompatibility01.js

@@ -1,5 +1,5 @@
 //// [arityAndOrderCompatibility01.ts]
-interface StrNum extends TupleBase<string|number> {
+interface StrNum extends Array<string|number> {
     0: string;
     1: number;
     length: 2;

tests/baselines/reference/arityAndOrderCompatibility01.symbols

@@ -1,7 +1,7 @@
 === tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts ===
-interface StrNum extends TupleBase<string|number> {
+interface StrNum extends Array<string|number> {
 >StrNum : Symbol(StrNum, Decl(arityAndOrderCompatibility01.ts, 0, 0))
->TupleBase : Symbol(TupleBase, Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     0: string;
     1: number;

tests/baselines/reference/arityAndOrderCompatibility01.types

@@ -1,7 +1,7 @@
 === tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts ===
-interface StrNum extends TupleBase<string|number> {
+interface StrNum extends Array<string|number> {
 >StrNum : StrNum
->TupleBase : TupleBase<T>
+>Array : T[]
 
     0: string;
     1: number;

tests/baselines/reference/assignmentCompatBetweenTupleAndArray.errors.txt

@@ -1,9 +1,8 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(17,1): error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
-  Types of property 'concat' are incompatible.
-    Type '{ (...items: ReadonlyArray<string | number>[]): (string | number)[]; (...items: (string | number | ReadonlyArray<string | number>)[]): (string | number)[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-      Type '(string | number)[]' is not assignable to type 'number[]'.
-        Type 'string | number' is not assignable to type 'number'.
-          Type 'string' is not assignable to type 'number'.
+  Types of property 'pop' are incompatible.
+    Type '() => string | number' is not assignable to type '() => number'.
+      Type 'string | number' is not assignable to type 'number'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not assignable to type '[{}]'.
   Property '0' is missing in type '{}[]'.
 
@@ -28,11 +27,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     numArray = numStrTuple;
     ~~~~~~~~
 !!! error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
-!!! error TS2322:   Types of property 'concat' are incompatible.
-!!! error TS2322:     Type '{ (...items: ReadonlyArray<string | number>[]): (string | number)[]; (...items: (string | number | ReadonlyArray<string | number>)[]): (string | number)[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-!!! error TS2322:       Type '(string | number)[]' is not assignable to type 'number[]'.
-!!! error TS2322:         Type 'string | number' is not assignable to type 'number'.
-!!! error TS2322:           Type 'string' is not assignable to type 'number'.
+!!! error TS2322:   Types of property 'pop' are incompatible.
+!!! error TS2322:     Type '() => string | number' is not assignable to type '() => number'.
+!!! error TS2322:       Type 'string | number' is not assignable to type 'number'.
+!!! error TS2322:         Type 'string' is not assignable to type 'number'.
     emptyObjTuple = emptyObjArray;
     ~~~~~~~~~~~~~
 !!! error TS2322: Type '{}[]' is not assignable to type '[{}]'.

tests/baselines/reference/tupleTypes.errors.txt

@@ -10,17 +10,15 @@ tests/cases/compiler/tupleTypes.ts(18,1): error TS2322: Type '[number, string, n
     Type '3' is not assignable to type '2'.
 tests/cases/compiler/tupleTypes.ts(41,1): error TS2322: Type 'undefined[]' is not assignable to type '[number, string]'.
 tests/cases/compiler/tupleTypes.ts(47,1): error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
-  Types of property 'concat' are incompatible.
-    Type '{ (...items: ReadonlyArray<string | number>[]): (string | number)[]; (...items: (string | number | ReadonlyArray<string | number>)[]): (string | number)[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-      Type '(string | number)[]' is not assignable to type 'number[]'.
-        Type 'string | number' is not assignable to type 'number'.
-          Type 'string' is not assignable to type 'number'.
+  Types of property 'pop' are incompatible.
+    Type '() => string | number' is not assignable to type '() => number'.
+      Type 'string | number' is not assignable to type 'number'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/tupleTypes.ts(49,1): error TS2322: Type '[number, {}]' is not assignable to type 'number[]'.
-  Types of property 'concat' are incompatible.
-    Type '{ (...items: ReadonlyArray<number | {}>[]): (number | {})[]; (...items: (number | {} | ReadonlyArray<number | {}>)[]): (number | {})[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-      Type '(number | {})[]' is not assignable to type 'number[]'.
-        Type 'number | {}' is not assignable to type 'number'.
-          Type '{}' is not assignable to type 'number'.
+  Types of property 'pop' are incompatible.
+    Type '() => number | {}' is not assignable to type '() => number'.
+      Type 'number | {}' is not assignable to type 'number'.
+        Type '{}' is not assignable to type 'number'.
 tests/cases/compiler/tupleTypes.ts(50,1): error TS2322: Type '[number, number]' is not assignable to type '[number, string]'.
   Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/tupleTypes.ts(51,1): error TS2322: Type '[number, {}]' is not assignable to type '[number, string]'.
@@ -94,20 +92,18 @@ tests/cases/compiler/tupleTypes.ts(51,1): error TS2322: Type '[number, {}]' is n
     a = a1;   // Error
     ~
 !!! error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
-!!! error TS2322:   Types of property 'concat' are incompatible.
-!!! error TS2322:     Type '{ (...items: ReadonlyArray<string | number>[]): (string | number)[]; (...items: (string | number | ReadonlyArray<string | number>)[]): (string | number)[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-!!! error TS2322:       Type '(string | number)[]' is not assignable to type 'number[]'.
-!!! error TS2322:         Type 'string | number' is not assignable to type 'number'.
-!!! error TS2322:           Type 'string' is not assignable to type 'number'.
+!!! error TS2322:   Types of property 'pop' are incompatible.
+!!! error TS2322:     Type '() => string | number' is not assignable to type '() => number'.
+!!! error TS2322:       Type 'string | number' is not assignable to type 'number'.
+!!! error TS2322:         Type 'string' is not assignable to type 'number'.
     a = a2;
     a = a3;   // Error
     ~
 !!! error TS2322: Type '[number, {}]' is not assignable to type 'number[]'.
-!!! error TS2322:   Types of property 'concat' are incompatible.
-!!! error TS2322:     Type '{ (...items: ReadonlyArray<number | {}>[]): (number | {})[]; (...items: (number | {} | ReadonlyArray<number | {}>)[]): (number | {})[]; }' is not assignable to type '{ (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }'.
-!!! error TS2322:       Type '(number | {})[]' is not assignable to type 'number[]'.
-!!! error TS2322:         Type 'number | {}' is not assignable to type 'number'.
-!!! error TS2322:           Type '{}' is not assignable to type 'number'.
+!!! error TS2322:   Types of property 'pop' are incompatible.
+!!! error TS2322:     Type '() => number | {}' is not assignable to type '() => number'.
+!!! error TS2322:       Type 'number | {}' is not assignable to type 'number'.
+!!! error TS2322:         Type '{}' is not assignable to type 'number'.
     a1 = a2;  // Error
     ~~
 !!! error TS2322: Type '[number, number]' is not assignable to type '[number, string]'.

tests/baselines/reference/typeInferenceWithTupleType.errors.txt

@@ -70,9 +70,9 @@ function zip<T, U>(array1: T[], array2: U[]): [[T, U]] {
 >i : Symbol(i, Decl(typeInferenceWithTupleType.ts, 14, 12))
 
         zipResult.push([array1[i], array2[i]]);
->zipResult.push : Symbol(TupleBase.push, Decl(lib.d.ts, --, --))
+>zipResult.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
 >zipResult : Symbol(zipResult, Decl(typeInferenceWithTupleType.ts, 13, 7))
->push : Symbol(TupleBase.push, Decl(lib.d.ts, --, --))
+>push : Symbol(Array.push, Decl(lib.d.ts, --, --))
 >array1 : Symbol(array1, Decl(typeInferenceWithTupleType.ts, 8, 19))
 >i : Symbol(i, Decl(typeInferenceWithTupleType.ts, 14, 12))
 >array2 : Symbol(array2, Decl(typeInferenceWithTupleType.ts, 8, 31))