typescript 4.6.0-dev.20211209 → 4.6.0-dev.20211213

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -44584,7 +44584,24 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 | 16))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072) {
                     return source;
                 }
@@ -44595,13 +44612,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 | 16))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608;
@@ -68826,7 +68839,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -54059,7 +54059,27 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    // If the type we're spreading from has properties that cannot
+                    // be spread into the rest type (e.g. getters, methods), ensure
+                    // they are explicitly omitted, as they would in the non-generic case.
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
@@ -54070,13 +54090,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608 /* ObjectRestType */;
@@ -82212,7 +82228,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/lib/tsserverlibrary.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -54253,7 +54253,27 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    // If the type we're spreading from has properties that cannot
+                    // be spread into the rest type (e.g. getters, methods), ensure
+                    // they are explicitly omitted, as they would in the non-generic case.
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
@@ -54264,13 +54284,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608 /* ObjectRestType */;
@@ -82406,7 +82422,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/lib/typescript.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -54253,7 +54253,27 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    // If the type we're spreading from has properties that cannot
+                    // be spread into the rest type (e.g. getters, methods), ensure
+                    // they are explicitly omitted, as they would in the non-generic case.
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
@@ -54264,13 +54284,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608 /* ObjectRestType */;
@@ -82406,7 +82422,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/lib/typescriptServices.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -54253,7 +54253,27 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    // If the type we're spreading from has properties that cannot
+                    // be spread into the rest type (e.g. getters, methods), ensure
+                    // they are explicitly omitted, as they would in the non-generic case.
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
@@ -54264,13 +54284,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608 /* ObjectRestType */;
@@ -82406,7 +82422,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211209";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211213";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -54048,7 +54048,27 @@ var ts;
                 return mapType(source, function (t) { return getRestType(t, properties, symbol); });
             }
             var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            var spreadableProperties = [];
+            var unspreadableToRestKeys = [];
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var literalTypeFromProperty = getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */);
+                if (!isTypeAssignableTo(literalTypeFromProperty, omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    spreadableProperties.push(prop);
+                }
+                else {
+                    unspreadableToRestKeys.push(literalTypeFromProperty);
+                }
+            }
             if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (unspreadableToRestKeys.length) {
+                    // If the type we're spreading from has properties that cannot
+                    // be spread into the rest type (e.g. getters, methods), ensure
+                    // they are explicitly omitted, as they would in the non-generic case.
+                    omitKeyType = getUnionType(__spreadArray([omitKeyType], unspreadableToRestKeys, true));
+                }
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
@@ -54059,13 +54079,9 @@ var ts;
                 return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
-            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
-                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
-                    && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
-                }
+            for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
+                var prop = spreadableProperties_1[_b];
+                members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
             }
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfosOfType(source));
             result.objectFlags |= 8388608 /* ObjectRestType */;
@@ -82201,7 +82217,7 @@ var ts;
                 for (var _a = 0, properties_4 = properties_5; _a < properties_4.length; _a++) {
                     var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
-                    if (existing && !isPropertyIdenticalTo(existing, prop)) {
+                    if (existing && prop.parent === existing.parent) {
                         seen.delete(prop.escapedName);
                     }
                 }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.6.0-dev.20211209",
+    "version": "4.6.0-dev.20211213",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -28,6 +28,7 @@
     "engines": {
         "node": ">=4.2.0"
     },
+    "packageManager": "npm@6.14.15",
     "devDependencies": {
         "@octokit/rest": "latest",
         "@types/browserify": "latest",