@typescript-deploys/pr-build 4.7.0-pr-48094-5 → 4.7.0-pr-48264-3

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

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220314";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220315";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -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 {
@@ -31993,6 +32002,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",
@@ -34093,6 +34109,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) {
@@ -34889,13 +34906,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,
@@ -34903,7 +34938,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);
@@ -35078,20 +35113,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) {
@@ -35296,6 +35333,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TypeScriptButNotDts:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -35364,6 +35402,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";
         }
@@ -45682,7 +45722,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));
@@ -56221,27 +56261,17 @@ var ts;
             return sourceStart.slice(0, startLen) !== targetStart.slice(0, startLen) ||
                 sourceEnd.slice(sourceEnd.length - endLen) !== targetEnd.slice(targetEnd.length - endLen);
         }
-        function isValidNumberString(s, roundTripOnly) {
-            if (s === "")
-                return false;
-            var n = +s;
-            return isFinite(n) && (!roundTripOnly || "" + n === s);
-        }
-        function isValidBigIntString(s, roundTripOnly) {
-            if (s === "")
-                return false;
+        function isValidBigIntString(s) {
             var scanner = ts.createScanner(99, false);
             var success = true;
             scanner.setOnError(function () { return success = false; });
             scanner.setText(s + "n");
             var result = scanner.scan();
-            var negative = result === 40;
-            if (negative) {
+            if (result === 40) {
                 result = scanner.scan();
             }
             var flags = scanner.getTokenFlags();
-            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512)
-                && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
+            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512);
         }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 | 4)) {
@@ -56249,8 +56279,8 @@ var ts;
             }
             if (source.flags & 128) {
                 var value = source.value;
-                return !!(target.flags & 8 && isValidNumberString(value, false) ||
-                    target.flags & 64 && isValidBigIntString(value, false) ||
+                return !!(target.flags & 8 && value !== "" && isFinite(+value) ||
+                    target.flags & 64 && value !== "" && isValidBigIntString(value) ||
                     target.flags & (512 | 98304) && value === target.intrinsicName);
             }
             if (source.flags & 134217728) {
@@ -56716,61 +56746,7 @@ var ts;
                 var types = target.types;
                 if (matches || ts.every(target.texts, function (s) { return s.length === 0; })) {
                     for (var i = 0; i < types.length; i++) {
-                        var source_1 = matches ? matches[i] : neverType;
-                        var target_3 = types[i];
-                        var sourceTypes = void 0;
-                        if (source_1.flags & 128 && target_3.flags & 8650752) {
-                            var inferenceContext = getInferenceInfoForType(target_3);
-                            var constraint = inferenceContext ? getConstraintOfTypeParameter(inferenceContext.typeParameter) : undefined;
-                            if (inferenceContext && constraint) {
-                                var str = source_1.value;
-                                var constraintTypes = constraint.flags & 1048576 ? constraint.types : [constraint];
-                                for (var _i = 0, constraintTypes_1 = constraintTypes; _i < constraintTypes_1.length; _i++) {
-                                    var constraintType = constraintTypes_1[_i];
-                                    if (constraintType.flags & 402653316) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(source_1);
-                                    }
-                                    if (constraintType.flags & 296 && isValidNumberString(str, true)) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(getNumberLiteralType(+str));
-                                    }
-                                    if (constraintType.flags & 2112 && isValidBigIntString(str, true)) {
-                                        var negative = str.startsWith("-");
-                                        var base10Value = ts.parsePseudoBigInt((negative ? str.slice(1) : str) + "n");
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(getBigIntLiteralType({ negative: negative, base10Value: base10Value }));
-                                    }
-                                    if (constraintType.flags & 528) {
-                                        if (str === trueType.intrinsicName) {
-                                            sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                            sourceTypes.push(trueType);
-                                        }
-                                        else if (str === falseType.intrinsicName) {
-                                            sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                            sourceTypes.push(falseType);
-                                        }
-                                    }
-                                    if (constraintType.flags & 65536 && str === nullType.intrinsicName) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(nullType);
-                                    }
-                                    if (constraintType.flags & 32768 && str === undefinedType.intrinsicName) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(undefinedType);
-                                    }
-                                }
-                            }
-                        }
-                        if (sourceTypes) {
-                            for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
-                                var source_2 = sourceTypes_3[_a];
-                                inferFromTypes(source_2, target_3);
-                            }
-                        }
-                        else {
-                            inferFromTypes(source_1, target_3);
-                        }
+                        inferFromTypes(matches ? matches[i] : neverType, types[i]);
                     }
                 }
             }