@typescript-deploys/pr-build 4.7.0-pr-48294-7 → 4.7.0-pr-48264-4

package/lib/protocol.d.ts

@@ -42,6 +42,7 @@ declare namespace ts.server.protocol {
         Rename = "rename",
         Saveto = "saveto",
         SignatureHelp = "signatureHelp",
+        SourceDefinitionAndBoundSpan = "sourceDefinitionAndBoundSpan",
         Status = "status",
         TypeDefinition = "typeDefinition",
         ProjectInfo = "projectInfo",
@@ -661,6 +662,9 @@ declare namespace ts.server.protocol {
     interface DefinitionAndBoundSpanRequest extends FileLocationRequest {
         readonly command: CommandTypes.DefinitionAndBoundSpan;
     }
+    interface SourceDefinitionAndBoundSpanRequest extends FileLocationRequest {
+        readonly command: CommandTypes.SourceDefinitionAndBoundSpan;
+    }
     interface DefinitionAndBoundSpanResponse extends Response {
         readonly body: DefinitionInfoAndBoundSpan;
     }

package/lib/tsc.js

@@ -11431,6 +11431,10 @@ var ts;
         }
     }
     ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isAnyImportOrBareOrAccessedRequire(node) {
+        return isAnyImportSyntax(node) || isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+    }
+    ts.isAnyImportOrBareOrAccessedRequire = isAnyImportOrBareOrAccessedRequire;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
             case 265:
@@ -12861,14 +12865,14 @@ var ts;
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function tryGetModuleSpecifierFromDeclaration(node) {
-        var _a, _b, _c;
+        var _a, _b;
         switch (node.kind) {
             case 253:
-                return node.initializer.arguments[0].text;
+                return (_a = ts.findAncestor(node.initializer, function (node) { return isRequireCall(node, true); })) === null || _a === void 0 ? void 0 : _a.arguments[0];
             case 265:
-                return (_a = ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text;
+                return ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike);
             case 264:
-                return (_c = ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike)) === null || _c === void 0 ? void 0 : _c.text;
+                return ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike);
             default:
                 ts.Debug.assertNever(node);
         }
@@ -13343,18 +13347,22 @@ var ts;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 264 ||
+        if (node.kind === 264 ||
             node.kind === 263 ||
             node.kind === 266 && !!node.name ||
             node.kind === 267 ||
             node.kind === 273 ||
             node.kind === 269 ||
             node.kind === 274 ||
-            node.kind === 270 && exportAssignmentIsAlias(node) ||
-            ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
-            ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 63 && isAliasableExpression(node.parent.right) ||
-            node.kind === 296 ||
-            node.kind === 295 && isAliasableExpression(node.initializer);
+            node.kind === 270 && exportAssignmentIsAlias(node)) {
+            return true;
+        }
+        return isInJSFile(node) && (ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
+            ts.isPropertyAccessExpression(node)
+                && ts.isBinaryExpression(node.parent)
+                && node.parent.left === node
+                && node.parent.operatorToken.kind === 63
+                && isAliasableExpression(node.parent.right));
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
@@ -13365,6 +13373,7 @@ var ts;
             case 274:
             case 270:
             case 264:
+            case 273:
                 return node.parent;
             case 160:
                 do {
@@ -32004,6 +32013,13 @@ var ts;
             description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
             defaultValueDescription: false,
         },
+        {
+            name: "noDtsResolution",
+            type: "boolean",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Modules,
+            defaultValueDescription: false,
+        },
         {
             name: "sourceRoot",
             type: "string",
@@ -34104,6 +34120,7 @@ var ts;
         Extensions[Extensions["Json"] = 2] = "Json";
         Extensions[Extensions["TSConfig"] = 3] = "TSConfig";
         Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly";
+        Extensions[Extensions["TypeScriptButNotDts"] = 5] = "TypeScriptButNotDts";
     })(Extensions || (Extensions = {}));
     function resolvedTypeScriptOnly(resolved) {
         if (!resolved) {
@@ -34900,13 +34917,31 @@ var ts;
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, undefined, jsOnlyExtensions, undefined);
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, lookupConfig) {
-        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, lookupConfig ? tsconfigExtensions : (compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions), redirectedReference);
+        var extensions;
+        if (lookupConfig) {
+            extensions = tsconfigExtensions;
+        }
+        else if (compilerOptions.noDtsResolution) {
+            extensions = [Extensions.TypeScriptButNotDts];
+            if (compilerOptions.allowJs)
+                extensions.push(Extensions.JavaScript);
+            if (compilerOptions.resolveJsonModule)
+                extensions.push(Extensions.Json);
+        }
+        else {
+            extensions = compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions;
+        }
+        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, extensions, redirectedReference);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
     function nodeModuleNameResolverWorker(features, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference) {
         var _a, _b;
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
+        var conditions = features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"];
+        if (compilerOptions.noDtsResolution) {
+            conditions.pop();
+        }
         var state = {
             compilerOptions: compilerOptions,
             host: host,
@@ -34914,7 +34949,7 @@ var ts;
             failedLookupLocations: failedLookupLocations,
             packageJsonInfoCache: cache,
             features: features,
-            conditions: features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"]
+            conditions: conditions,
         };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
@@ -35089,20 +35124,22 @@ var ts;
                     default: return tryExtension(".d.ts");
                 }
             case Extensions.TypeScript:
+            case Extensions.TypeScriptButNotDts:
+                var useDts = extensions === Extensions.TypeScript;
                 switch (originalExtension) {
                     case ".mjs":
                     case ".mts":
                     case ".d.mts":
-                        return tryExtension(".mts") || tryExtension(".d.mts");
+                        return tryExtension(".mts") || (useDts ? tryExtension(".d.mts") : undefined);
                     case ".cjs":
                     case ".cts":
                     case ".d.cts":
-                        return tryExtension(".cts") || tryExtension(".d.cts");
+                        return tryExtension(".cts") || (useDts ? tryExtension(".d.cts") : undefined);
                     case ".json":
                         candidate += ".json";
-                        return tryExtension(".d.ts");
+                        return useDts ? tryExtension(".d.ts") : undefined;
                     default:
-                        return tryExtension(".ts") || tryExtension(".tsx") || tryExtension(".d.ts");
+                        return tryExtension(".ts") || tryExtension(".tsx") || (useDts ? tryExtension(".d.ts") : undefined);
                 }
             case Extensions.JavaScript:
                 switch (originalExtension) {
@@ -35307,6 +35344,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TypeScriptButNotDts:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -35375,6 +35413,8 @@ var ts;
                 return extension === ".json";
             case Extensions.TypeScript:
                 return extension === ".ts" || extension === ".tsx" || extension === ".d.ts";
+            case Extensions.TypeScriptButNotDts:
+                return extension === ".ts" || extension === ".tsx";
             case Extensions.DtsOnly:
                 return extension === ".d.ts";
         }
@@ -45300,7 +45340,7 @@ var ts;
                 if (!omitTypeAlias) {
                     return errorType;
                 }
-                return getGlobalTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
@@ -45693,7 +45733,7 @@ var ts;
                         }
                     }
                     var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304); }) ? constructorTypes : types;
-                    type = getUnionType(sourceTypes, 2);
+                    type = getUnionType(sourceTypes);
                 }
             }
             var widened = getWidenedType(addOptionality(type, false, definedInMethod && !definedInConstructor));
@@ -46866,7 +46906,7 @@ var ts;
                     }
                 }
                 if (memberTypeList.length) {
-                    var enumType_1 = getUnionType(memberTypeList, 1, symbol, undefined, undefined);
+                    var enumType_1 = getUnionType(memberTypeList, 1, symbol, undefined);
                     if (enumType_1.flags & 1048576) {
                         enumType_1.flags |= 1024;
                         enumType_1.symbol = symbol;
@@ -49213,7 +49253,7 @@ var ts;
             type.resolvedTypeArguments = source.resolvedTypeArguments;
             return type;
         }
-        function createDeferredTypeReference(target, node, mapper, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createDeferredTypeReference(target, node, mapper, aliasSymbol, aliasTypeArguments) {
             if (!aliasSymbol) {
                 aliasSymbol = getAliasSymbolForTypeNode(node);
                 var localAliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
@@ -49225,7 +49265,6 @@ var ts;
             type.mapper = mapper;
             type.aliasSymbol = aliasSymbol;
             type.aliasTypeArguments = aliasTypeArguments;
-            type.aliasMapper = aliasMapper;
             return type;
         }
         function getTypeArguments(type) {
@@ -49283,7 +49322,7 @@ var ts;
             }
             return checkNoTypeArguments(node, symbol) ? type : errorType;
         }
-        function getGlobalTypeAliasInstantiation(symbol, typeArguments, aliasSymbol, aliasTypeArguments) {
+        function getTypeAliasInstantiation(symbol, typeArguments, aliasSymbol, aliasTypeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
             if (type === intrinsicMarkerType && intrinsicTypeKinds.has(symbol.escapedName) && typeArguments && typeArguments.length === 1) {
                 return getStringMappingType(symbol, typeArguments[0]);
@@ -49297,33 +49336,6 @@ var ts;
             }
             return instantiation;
         }
-        function getLocalTypeAliasInstantiation(symbol, typeArguments, outerTypeParameterMapper, aliasSymbol, aliasTypeArguments) {
-            var type = getDeclaredTypeOfSymbol(symbol);
-            if (type === intrinsicMarkerType && intrinsicTypeKinds.has(symbol.escapedName) && typeArguments && typeArguments.length === 1) {
-                return getStringMappingType(symbol, typeArguments[0]);
-            }
-            var links = getSymbolLinks(symbol);
-            var outerTypeParameters = getOuterTypeParametersOfAlias(symbol);
-            var mappedOuterParams = outerTypeParameterMapper && outerTypeParameters && instantiateTypes(outerTypeParameters, outerTypeParameterMapper);
-            var typeParameters = links.typeParameters;
-            var id = getTypeListId(ts.concatenate(mappedOuterParams, typeArguments)) + getAliasId(aliasSymbol, aliasTypeArguments);
-            var instantiation = links.instantiations.get(id);
-            if (!instantiation) {
-                var outerTypeArgumentMapper = outerTypeParameters && mappedOuterParams && createTypeMapper(outerTypeParameters, mappedOuterParams);
-                var argumentMapper = createTypeMapper(typeParameters, fillMissingTypeArguments(typeArguments, typeParameters, getMinTypeArgumentCount(typeParameters), ts.isInJSFile(symbol.valueDeclaration)));
-                var combinedMapper = outerTypeArgumentMapper ? combineTypeMappers(argumentMapper, outerTypeArgumentMapper) : argumentMapper;
-                links.instantiations.set(id, instantiation = instantiateTypeWithAlias(type, combinedMapper, aliasSymbol, aliasTypeArguments));
-            }
-            return instantiation;
-        }
-        function getOuterTypeParametersOfAlias(symbol) {
-            var _a;
-            var links = getSymbolLinks(symbol);
-            if (!links.outerTypeParameters) {
-                links.outerTypeParameters = ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) && getOuterTypeParameters(symbol.declarations[0], true);
-            }
-            return links.outerTypeParameters;
-        }
         function getTypeFromTypeAliasReference(node, symbol) {
             if (ts.getCheckFlags(symbol) & 1048576) {
                 var typeArguments = typeArgumentsFromTypeReferenceNode(node);
@@ -49350,7 +49362,7 @@ var ts;
                 }
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var newAliasSymbol = aliasSymbol && (isLocalTypeAlias(symbol) || !isLocalTypeAlias(aliasSymbol)) ? aliasSymbol : undefined;
-                return getGlobalTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), newAliasSymbol, getTypeArgumentsForAliasSymbol(newAliasSymbol));
+                return getTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), newAliasSymbol, getTypeArgumentsForAliasSymbol(newAliasSymbol));
             }
             return checkNoTypeArguments(node, symbol) ? type : errorType;
         }
@@ -50186,7 +50198,7 @@ var ts;
             result.types = types;
             return result;
         }
-        function getUnionType(types, unionReduction, aliasSymbol, aliasTypeArguments, aliasMapper, origin) {
+        function getUnionType(types, unionReduction, aliasSymbol, aliasTypeArguments, origin) {
             if (unionReduction === void 0) { unionReduction = 1; }
             if (types.length === 0) {
                 return neverType;
@@ -50253,7 +50265,7 @@ var ts;
             }
             var objectFlags = (includes & 36323363 ? 0 : 65536) |
                 (includes & 2097152 ? 33554432 : 0);
-            return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, aliasMapper, origin);
+            return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
         }
         function getUnionOrIntersectionTypePredicate(signatures, kind) {
             var first;
@@ -50288,7 +50300,7 @@ var ts;
         function typePredicateKindsMatch(a, b) {
             return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
         }
-        function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments, aliasMapper, origin) {
+        function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments, origin) {
             if (types.length === 0) {
                 return neverType;
             }
@@ -50308,7 +50320,6 @@ var ts;
                 type.origin = origin;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
-                type.aliasMapper = aliasMapper;
                 if (types.length === 2 && types[0].flags & 512 && types[1].flags & 512) {
                     type.flags |= 16;
                     type.intrinsicName = "boolean";
@@ -50321,7 +50332,7 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), 1, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), undefined);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), 1, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
             }
             return links.resolvedType;
         }
@@ -50459,16 +50470,15 @@ var ts;
             types[index] = getUnionTypeFromSortedList(result, 65536);
             return true;
         }
-        function createIntersectionType(types, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
             var result = createType(2097152);
             result.objectFlags = getPropagatingFlagsOfTypes(types, 98304);
             result.types = types;
             result.aliasSymbol = aliasSymbol;
             result.aliasTypeArguments = aliasTypeArguments;
-            result.aliasMapper = aliasMapper;
             return result;
         }
-        function getIntersectionType(types, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
             var typeMembershipMap = new ts.Map();
             var includes = addTypesToIntersection(typeMembershipMap, 0, types);
             var typeSet = ts.arrayFrom(typeMembershipMap.values());
@@ -50516,16 +50526,16 @@ var ts;
             if (!result) {
                 if (includes & 1048576) {
                     if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
                     }
                     else if (eachIsUnionContaining(typeSet, 32768)) {
                         var undefinedOrMissingType = exactOptionalPropertyTypes && ts.some(typeSet, function (t) { return containsType(t.types, missingType); }) ? missingType : undefinedType;
                         removeFromEach(typeSet, 32768);
-                        result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1, aliasSymbol, aliasTypeArguments);
                     }
                     else if (eachIsUnionContaining(typeSet, 65536)) {
                         removeFromEach(typeSet, 65536);
-                        result = getUnionType([getIntersectionType(typeSet), nullType], 1, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getUnionType([getIntersectionType(typeSet), nullType], 1, aliasSymbol, aliasTypeArguments);
                     }
                     else {
                         if (!checkCrossProductUnion(typeSet)) {
@@ -50533,7 +50543,7 @@ var ts;
                         }
                         var constituents = getCrossProductIntersections(typeSet);
                         var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152); }) ? createOriginUnionOrIntersectionType(2097152, typeSet) : undefined;
-                        result = getUnionType(constituents, 1, aliasSymbol, aliasTypeArguments, aliasMapper, origin);
+                        result = getUnionType(constituents, 1, aliasSymbol, aliasTypeArguments, origin);
                     }
                 }
                 else {
@@ -50579,7 +50589,7 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), undefined);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
             }
             return links.resolvedType;
         }
@@ -50674,7 +50684,7 @@ var ts;
             var propertyTypes = ts.map(getPropertiesOfType(type), function (prop) { return getLiteralTypeFromProperty(prop, include); });
             var indexKeyTypes = ts.map(getIndexInfosOfType(type), function (info) { return info !== enumNumberIndexInfo && isKeyTypeIncluded(info.keyType, include) ?
                 info.keyType === stringType && include & 8 ? stringOrNumberType : info.keyType : neverType; });
-            return getUnionType(ts.concatenate(propertyTypes, indexKeyTypes), 1, undefined, undefined, undefined, origin);
+            return getUnionType(ts.concatenate(propertyTypes, indexKeyTypes), 1, undefined, undefined, origin);
         }
         function isPossiblyReducibleByInstantiation(type) {
             return ts.some(type.types, function (t) {
@@ -50701,7 +50711,7 @@ var ts;
                 return type;
             }
             var extractTypeAlias = getGlobalExtractSymbol();
-            return extractTypeAlias ? getGlobalTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
+            return extractTypeAlias ? getTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
         }
         function getIndexTypeOrString(type) {
             var indexType = getExtractStringType(getIndexType(type));
@@ -50831,14 +50841,13 @@ var ts;
             result.type = type;
             return result;
         }
-        function createIndexedAccessType(objectType, indexType, accessFlags, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createIndexedAccessType(objectType, indexType, accessFlags, aliasSymbol, aliasTypeArguments) {
             var type = createType(8388608);
             type.objectType = objectType;
             type.indexType = indexType;
             type.accessFlags = accessFlags;
             type.aliasSymbol = aliasSymbol;
             type.aliasTypeArguments = aliasTypeArguments;
-            type.aliasMapper = aliasMapper;
             return type;
         }
         function isJSLiteralType(type) {
@@ -51156,9 +51165,9 @@ var ts;
             var templateMapper = combineTypeMappers(objectType.mapper, mapper);
             return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
         }
-        function getIndexedAccessType(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function getIndexedAccessType(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0; }
-            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) || (accessNode ? errorType : unknownType);
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
         }
         function indexTypeLessThan(indexType, limit) {
             return everyType(indexType, function (t) {
@@ -51172,7 +51181,7 @@ var ts;
                 return false;
             });
         }
-        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
@@ -51192,7 +51201,7 @@ var ts;
                 var id = objectType.id + "," + indexType.id + "," + persistentAccessFlags + getAliasId(aliasSymbol, aliasTypeArguments);
                 var type = indexedAccessTypes.get(id);
                 if (!type) {
-                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, persistentAccessFlags, aliasSymbol, aliasTypeArguments, aliasMapper));
+                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, persistentAccessFlags, aliasSymbol, aliasTypeArguments));
                 }
                 return type;
             }
@@ -51217,8 +51226,8 @@ var ts;
                     return undefined;
                 }
                 return accessFlags & 4
-                    ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments, aliasMapper)
-                    : getUnionType(propTypes, 1, aliasSymbol, aliasTypeArguments, aliasMapper);
+                    ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments)
+                    : getUnionType(propTypes, 1, aliasSymbol, aliasTypeArguments);
             }
             return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, accessNode, accessFlags | 8 | 64);
         }
@@ -51228,7 +51237,7 @@ var ts;
                 var objectType = getTypeFromTypeNode(node.objectType);
                 var indexType = getTypeFromTypeNode(node.indexType);
                 var potentialAlias = getAliasSymbolForTypeNode(node);
-                var resolved = getIndexedAccessType(objectType, indexType, 0, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias), undefined);
+                var resolved = getIndexedAccessType(objectType, indexType, 0, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias));
                 links.resolvedType = resolved.flags & 8388608 &&
                     resolved.objectType === objectType &&
                     resolved.indexType === indexType ?
@@ -51346,7 +51355,6 @@ var ts;
                 result.combinedMapper = combinedMapper;
                 result.aliasSymbol = aliasSymbol || root.aliasSymbol;
                 result.aliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(root.aliasTypeArguments, mapper);
-                result.aliasMapper = result.aliasSymbol ? mapper : undefined;
                 return "break";
             };
             while (true) {
@@ -52082,7 +52090,7 @@ var ts;
                 var result = target.instantiations.get(id);
                 if (!result) {
                     var newMapper = createTypeMapper(typeParameters, typeArguments);
-                    result = target.objectFlags & 4 ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments, mapper) :
+                    result = target.objectFlags & 4 ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) :
                         target.objectFlags & 32 ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) :
                             instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
                     target.instantiations.set(id, result);
@@ -52158,7 +52166,7 @@ var ts;
                             return instantiateAnonymousType(type, prependTypeMapping(typeVariable, t, mapper));
                         }
                         return t;
-                    }, aliasSymbol, aliasTypeArguments, mapper);
+                    }, aliasSymbol, aliasTypeArguments);
                 }
             }
             return instantiateType(getConstraintTypeFromMappedType(type), mapper) === wildcardType ? wildcardType : instantiateAnonymousType(type, mapper, aliasSymbol, aliasTypeArguments);
@@ -52220,7 +52228,6 @@ var ts;
             result.mapper = mapper;
             result.aliasSymbol = aliasSymbol || type.aliasSymbol;
             result.aliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-            result.aliasMapper = mapper;
             return result;
         }
         function getConditionalTypeInstantiation(type, mapper, aliasSymbol, aliasTypeArguments) {
@@ -52234,7 +52241,7 @@ var ts;
                     var checkType_1 = root.checkType;
                     var distributionType = root.isDistributive ? getMappedType(checkType_1, newMapper_1) : undefined;
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 | 131072) ?
-                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments, mapper) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -52291,8 +52298,8 @@ var ts;
                 var newAliasSymbol = aliasSymbol || type.aliasSymbol;
                 var newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
                 return flags & 2097152 || origin && origin.flags & 2097152 ?
-                    getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments, mapper) :
-                    getUnionType(newTypes, 1, newAliasSymbol, newAliasTypeArguments, mapper);
+                    getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments) :
+                    getUnionType(newTypes, 1, newAliasSymbol, newAliasTypeArguments);
             }
             if (flags & 4194304) {
                 return getIndexType(instantiateType(type.type, mapper));
@@ -52306,7 +52313,7 @@ var ts;
             if (flags & 8388608) {
                 var newAliasSymbol = aliasSymbol || type.aliasSymbol;
                 var newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), type.accessFlags, undefined, newAliasSymbol, newAliasTypeArguments, mapper);
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), type.accessFlags, undefined, newAliasSymbol, newAliasTypeArguments);
             }
             if (flags & 16777216) {
                 return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper), aliasSymbol, aliasTypeArguments);
@@ -54050,10 +54057,7 @@ var ts;
                     if (variances === ts.emptyArray) {
                         return 1;
                     }
-                    var outerTypeParameters = getOuterTypeParametersOfAlias(source.aliasSymbol);
-                    var sourceArgs = outerTypeParameters && source.aliasMapper ? ts.concatenate(source.aliasTypeArguments, instantiateTypes(outerTypeParameters, source.aliasMapper)) : source.aliasTypeArguments;
-                    var targetArgs = outerTypeParameters && target.aliasMapper ? ts.concatenate(target.aliasTypeArguments, instantiateTypes(outerTypeParameters, target.aliasMapper)) : target.aliasTypeArguments;
-                    var varianceResult = relateVariances(sourceArgs, targetArgs, variances, intersectionState);
+                    var varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances, intersectionState);
                     if (varianceResult !== undefined) {
                         return varianceResult;
                     }
@@ -55143,10 +55147,8 @@ var ts;
         }
         function getAliasVariances(symbol) {
             var links = getSymbolLinks(symbol);
-            var params = ts.concatenate(links.typeParameters, getOuterTypeParametersOfAlias(symbol));
-            return getVariancesWorker(params, links, function (_links, param, marker) {
-                var mapper = makeUnaryTypeMapper(param, marker);
-                var type = getLocalTypeAliasInstantiation(symbol, instantiateTypes(links.typeParameters, mapper), mapper);
+            return getVariancesWorker(links.typeParameters, links, function (_links, param, marker) {
+                var type = getTypeAliasInstantiation(symbol, instantiateTypes(links.typeParameters, makeUnaryTypeMapper(param, marker)));
                 type.aliasTypeArgumentsContainsMarker = true;
                 return type;
             });
@@ -55703,7 +55705,7 @@ var ts;
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288, undefined) || unknownSymbol;
             }
             return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
-                getGlobalTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
                 reducedType;
         }
         function getNonNullableType(type) {
@@ -57668,7 +57670,7 @@ var ts;
                         newOrigin = createOriginUnionOrIntersectionType(1048576, originFiltered);
                     }
                 }
-                return getUnionTypeFromSortedList(filtered, type.objectFlags, undefined, undefined, undefined, newOrigin);
+                return getUnionTypeFromSortedList(filtered, type.objectFlags, undefined, undefined, newOrigin);
             }
             return type.flags & 131072 || f(type) ? type : neverType;
         }
@@ -57704,9 +57706,9 @@ var ts;
             }
             return changed ? mappedTypes && getUnionType(mappedTypes, noReductions ? 0 : 1) : type;
         }
-        function mapTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function mapTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments) {
             return type.flags & 1048576 && aliasSymbol ?
-                getUnionType(ts.map(type.types, mapper), 1, aliasSymbol, aliasTypeArguments, aliasMapper) :
+                getUnionType(ts.map(type.types, mapper), 1, aliasSymbol, aliasTypeArguments) :
                 mapType(type, mapper);
         }
         function extractTypesOfKind(type, kind) {
@@ -60360,7 +60362,7 @@ var ts;
                     var params = getSymbolLinks(managedSym).typeParameters;
                     if (ts.length(params) >= 2) {
                         var args = fillMissingTypeArguments([ctorType, attributesType], params, 2, ts.isInJSFile(context));
-                        return getGlobalTypeAliasInstantiation(managedSym, args);
+                        return getTypeAliasInstantiation(managedSym, args);
                     }
                 }
                 if (ts.length(declaredManagedType.typeParameters) >= 2) {
@@ -67439,7 +67441,7 @@ var ts;
                 if (!baseConstraint || (baseConstraint.flags & 3) || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint)) {
                     var awaitedSymbol = getGlobalAwaitedSymbol(true);
                     if (awaitedSymbol) {
-                        return getGlobalTypeAliasInstantiation(awaitedSymbol, [unwrapAwaitedType(type)]);
+                        return getTypeAliasInstantiation(awaitedSymbol, [unwrapAwaitedType(type)]);
                     }
                 }
             }