From 4a63ed7afa7361db95661c552114c70b75f56879 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 19 Sep 2017 16:12:13 -0700 Subject: [PATCH] Update LKG --- lib/tsc.js | 174 ++++++++++++++------------- lib/tsserver.js | 233 ++++++++++++++++++------------------ lib/tsserverlibrary.d.ts | 2 + lib/tsserverlibrary.js | 206 +++++++++++++++---------------- lib/typescript.d.ts | 6 + lib/typescript.js | 186 ++++++++++++++-------------- lib/typescriptServices.d.ts | 6 + lib/typescriptServices.js | 186 ++++++++++++++-------------- lib/typingsInstaller.js | 106 +++++++++------- 9 files changed, 572 insertions(+), 533 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index 2c30bda7bff..2a142736d66 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -5205,7 +5205,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -11093,7 +11093,7 @@ var ts; token() === 57 || isStartOfType(true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146); if (token() === 99) { node.name = createIdentifier(true); @@ -11109,15 +11109,9 @@ var ts; } node.questionToken = parseOptionalToken(55); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(true); + node.initializer = parseInitializer(true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32)) { signature.typeParameters = parseTypeParameters(); @@ -11147,7 +11141,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1)); setAwaitContext(!!(flags & 2)); - var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20) && (flags & 8)) { @@ -11691,11 +11685,16 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58) { if (scanner.hasPrecedingLineBreak() || (inParameter && token() === 17) || !isStartOfExpression()) { return undefined; } + if (inParameter && requireEqualsToken) { + var result = createMissingNode(71, true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } parseExpected(58); return parseAssignmentExpressionOrHigher(); @@ -11864,8 +11863,7 @@ var ts; } function tryParseAsyncSimpleArrowFunctionExpression() { if (token() === 120) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -11894,7 +11892,8 @@ var ts; if (!node.parameters) { return undefined; } - if (!allowAmbiguity && token() !== 36 && token() !== 17) { + if (!allowAmbiguity && ((token() !== 36 && token() !== 17) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { return undefined; } return node; @@ -13137,7 +13136,7 @@ var ts; var node = createNode(176); node.dotDotDotToken = parseOptionalToken(24); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingElement() { @@ -13153,7 +13152,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingPattern() { @@ -13187,7 +13186,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -17422,7 +17421,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -17525,12 +17524,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -17827,7 +17826,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -17989,31 +17988,40 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -18056,9 +18064,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false, cache); @@ -54107,27 +54123,16 @@ var ts; emit(node.literal); } function emitBlock(node) { - if (isSingleLineEmptyBlock(node)) { - writeToken(17, node.pos, node); - write(" "); - writeToken(18, node.statements.end, node); - } - else { - writeToken(17, node.pos, node); - emitBlockStatements(node); - increaseIndent(); - emitLeadingCommentsOfPosition(node.statements.end); - decreaseIndent(); - writeToken(18, node.statements.end, node); - } + writeToken(17, node.pos, node); + emitBlockStatements(node, !node.multiLine && isEmptyBlock(node)); + increaseIndent(); + emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); + writeToken(18, node.statements.end, node); } - function emitBlockStatements(node) { - if (ts.getEmitFlags(node) & 1) { - emitList(node, node.statements, 384); - } - else { - emitList(node, node.statements, 65); - } + function emitBlockStatements(node, forceSingleLine) { + var format = forceSingleLine || ts.getEmitFlags(node) & 1 ? 384 : 65; + emitList(node, node.statements, format); } function emitVariableStatement(node) { emitModifiers(node, node.modifiers); @@ -54485,16 +54490,11 @@ var ts; emit(body); } function emitModuleBlock(node) { - if (isEmptyBlock(node)) { - write("{ }"); - } - else { - pushNameGenerationScope(); - write("{"); - emitBlockStatements(node); - write("}"); - popNameGenerationScope(); - } + pushNameGenerationScope(); + write("{"); + emitBlockStatements(node, isEmptyBlock(node)); + write("}"); + popNameGenerationScope(); } function emitCaseBlock(node) { writeToken(17, node.pos); @@ -54890,6 +54890,12 @@ var ts; } var isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0; if (isEmpty && format & 16384) { + if (onBeforeEmitNodeArray) { + onBeforeEmitNodeArray(children); + } + if (onAfterEmitNodeArray) { + onAfterEmitNodeArray(children); + } return; } if (format & 7680) { @@ -55156,10 +55162,6 @@ var ts; && !ts.nodeIsSynthesized(node2) && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile); } - function isSingleLineEmptyBlock(block) { - return !block.multiLine - && isEmptyBlock(block); - } function isEmptyBlock(block) { return block.statements.length === 0 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); @@ -56400,7 +56402,7 @@ var ts; return ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()); } function processRootFile(fileName, isDefaultLib) { - processSourceFile(ts.normalizePath(fileName), isDefaultLib); + processSourceFile(ts.normalizePath(fileName), isDefaultLib, undefined); } function fileReferenceIsEqualTo(a, b) { return a.fileName === b.fileName; @@ -56525,8 +56527,8 @@ var ts; return sourceFileWithAddedExtension; } } - function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) { - getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, undefined); }, function (diagnostic) { + function processSourceFile(fileName, isDefaultLib, packageId, refFile, refPos, refEnd) { + getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, packageId); }, function (diagnostic) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; @@ -56592,7 +56594,7 @@ var ts; } }); if (packageId) { - var packageIdKey = packageId.name + "@" + packageId.version; + var packageIdKey = packageId.name + "/" + packageId.subModuleName + "@" + packageId.version; var fileFromPackageId = packageIdToSourceFile.get(packageIdKey); if (fileFromPackageId) { var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path); @@ -56639,7 +56641,7 @@ var ts; function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref) { var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, isDefaultLib, file, ref.pos, ref.end); + processSourceFile(referencedFileName, isDefaultLib, undefined, file, ref.pos, ref.end); }); } function processTypeReferenceDirectives(file) { @@ -56661,7 +56663,7 @@ var ts; var saveResolution = true; if (resolvedTypeReferenceDirective) { if (resolvedTypeReferenceDirective.primary) { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } else { if (previousResolution) { @@ -56674,7 +56676,7 @@ var ts; saveResolution = false; } else { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } } } diff --git a/lib/tsserver.js b/lib/tsserver.js index 15bfce1b4d5..75b0c16a3a3 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -4589,7 +4589,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -4692,12 +4692,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -4994,7 +4994,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -5156,31 +5156,40 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -5223,9 +5232,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false, cache); @@ -5450,7 +5467,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -12963,7 +12980,7 @@ var ts; token() === 57 || isStartOfType(true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146); if (token() === 99) { node.name = createIdentifier(true); @@ -12979,15 +12996,9 @@ var ts; } node.questionToken = parseOptionalToken(55); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(true); + node.initializer = parseInitializer(true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32)) { signature.typeParameters = parseTypeParameters(); @@ -13017,7 +13028,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1)); setAwaitContext(!!(flags & 2)); - var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20) && (flags & 8)) { @@ -13561,11 +13572,16 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58) { if (scanner.hasPrecedingLineBreak() || (inParameter && token() === 17) || !isStartOfExpression()) { return undefined; } + if (inParameter && requireEqualsToken) { + var result = createMissingNode(71, true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } parseExpected(58); return parseAssignmentExpressionOrHigher(); @@ -13734,8 +13750,7 @@ var ts; } function tryParseAsyncSimpleArrowFunctionExpression() { if (token() === 120) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -13764,7 +13779,8 @@ var ts; if (!node.parameters) { return undefined; } - if (!allowAmbiguity && token() !== 36 && token() !== 17) { + if (!allowAmbiguity && ((token() !== 36 && token() !== 17) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { return undefined; } return node; @@ -15007,7 +15023,7 @@ var ts; var node = createNode(176); node.dotDotDotToken = parseOptionalToken(24); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingElement() { @@ -15023,7 +15039,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingPattern() { @@ -15057,7 +15073,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -55500,27 +55516,16 @@ var ts; emit(node.literal); } function emitBlock(node) { - if (isSingleLineEmptyBlock(node)) { - writeToken(17, node.pos, node); - write(" "); - writeToken(18, node.statements.end, node); - } - else { - writeToken(17, node.pos, node); - emitBlockStatements(node); - increaseIndent(); - emitLeadingCommentsOfPosition(node.statements.end); - decreaseIndent(); - writeToken(18, node.statements.end, node); - } + writeToken(17, node.pos, node); + emitBlockStatements(node, !node.multiLine && isEmptyBlock(node)); + increaseIndent(); + emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); + writeToken(18, node.statements.end, node); } - function emitBlockStatements(node) { - if (ts.getEmitFlags(node) & 1) { - emitList(node, node.statements, 384); - } - else { - emitList(node, node.statements, 65); - } + function emitBlockStatements(node, forceSingleLine) { + var format = forceSingleLine || ts.getEmitFlags(node) & 1 ? 384 : 65; + emitList(node, node.statements, format); } function emitVariableStatement(node) { emitModifiers(node, node.modifiers); @@ -55878,16 +55883,11 @@ var ts; emit(body); } function emitModuleBlock(node) { - if (isEmptyBlock(node)) { - write("{ }"); - } - else { - pushNameGenerationScope(); - write("{"); - emitBlockStatements(node); - write("}"); - popNameGenerationScope(); - } + pushNameGenerationScope(); + write("{"); + emitBlockStatements(node, isEmptyBlock(node)); + write("}"); + popNameGenerationScope(); } function emitCaseBlock(node) { writeToken(17, node.pos); @@ -56283,6 +56283,12 @@ var ts; } var isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0; if (isEmpty && format & 16384) { + if (onBeforeEmitNodeArray) { + onBeforeEmitNodeArray(children); + } + if (onAfterEmitNodeArray) { + onAfterEmitNodeArray(children); + } return; } if (format & 7680) { @@ -56549,10 +56555,6 @@ var ts; && !ts.nodeIsSynthesized(node2) && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile); } - function isSingleLineEmptyBlock(block) { - return !block.multiLine - && isEmptyBlock(block); - } function isEmptyBlock(block) { return block.statements.length === 0 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); @@ -57870,7 +57872,7 @@ var ts; return ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()); } function processRootFile(fileName, isDefaultLib) { - processSourceFile(ts.normalizePath(fileName), isDefaultLib); + processSourceFile(ts.normalizePath(fileName), isDefaultLib, undefined); } function fileReferenceIsEqualTo(a, b) { return a.fileName === b.fileName; @@ -57995,8 +57997,8 @@ var ts; return sourceFileWithAddedExtension; } } - function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) { - getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, undefined); }, function (diagnostic) { + function processSourceFile(fileName, isDefaultLib, packageId, refFile, refPos, refEnd) { + getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, packageId); }, function (diagnostic) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; @@ -58062,7 +58064,7 @@ var ts; } }); if (packageId) { - var packageIdKey = packageId.name + "@" + packageId.version; + var packageIdKey = packageId.name + "/" + packageId.subModuleName + "@" + packageId.version; var fileFromPackageId = packageIdToSourceFile.get(packageIdKey); if (fileFromPackageId) { var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path); @@ -58109,7 +58111,7 @@ var ts; function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref) { var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, isDefaultLib, file, ref.pos, ref.end); + processSourceFile(referencedFileName, isDefaultLib, undefined, file, ref.pos, ref.end); }); } function processTypeReferenceDirectives(file) { @@ -58131,7 +58133,7 @@ var ts; var saveResolution = true; if (resolvedTypeReferenceDirective) { if (resolvedTypeReferenceDirective.primary) { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } else { if (previousResolution) { @@ -58144,7 +58146,7 @@ var ts; saveResolution = false; } else { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } } } @@ -70653,8 +70655,7 @@ var ts; return true; case 207: { var blockParent = context.currentTokenParent.parent; - if (blockParent.kind !== 187 && - blockParent.kind !== 186) { + if (!blockParent || blockParent.kind !== 187 && blockParent.kind !== 186) { return true; } } @@ -74665,7 +74666,7 @@ var ts; return { errors: [ts.createFileDiagnostic(sourceFile, start, length, message)] }; } function checkRootNode(node) { - if (ts.isToken(node)) { + if (ts.isToken(ts.isExpressionStatement(node) ? node.expression : node)) { return [ts.createDiagnosticForNode(node, Messages.InsufficientSelection)]; } return undefined; @@ -79217,24 +79218,23 @@ var ts; var file = changedFiles_1[_i]; this.cachedUnresolvedImportsPerFile.remove(file); } - var unresolvedImports; - if (hasChanges || changedFiles.length) { - var result = []; - for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) { - var sourceFile = _b[_a]; - this.extractUnresolvedImportsFromSourceFile(sourceFile, result); - } - this.lastCachedUnresolvedImportsList = server.toDeduplicatedSortedArray(result); - } - unresolvedImports = this.lastCachedUnresolvedImportsList; - var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, unresolvedImports, hasChanges); - if (this.setTypings(cachedTypings)) { - hasChanges = this.updateGraphWorker() || hasChanges; - } if (this.languageServiceEnabled) { + if (hasChanges || changedFiles.length) { + var result = []; + for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) { + var sourceFile = _b[_a]; + this.extractUnresolvedImportsFromSourceFile(sourceFile, result); + } + this.lastCachedUnresolvedImportsList = server.toDeduplicatedSortedArray(result); + } + var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasChanges); + if (this.setTypings(cachedTypings)) { + hasChanges = this.updateGraphWorker() || hasChanges; + } this.builder.onProjectUpdateGraph(); } else { + this.lastCachedUnresolvedImportsList = undefined; this.builder.clear(); } if (hasChanges) { @@ -83816,21 +83816,20 @@ var ts; this.eventSender.event(body, eventName); return; } - if (this.activeRequestCount > 0) { - this.activeRequestCount--; - } - else { - ts.Debug.fail("Received too many responses"); - } - while (this.requestQueue.length > 0) { - var queuedRequest = this.requestQueue.shift(); - if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) { - this.requestMap.delete(queuedRequest.operationId); - this.scheduleRequest(queuedRequest); - break; + if (response.kind === server.ActionSet) { + if (this.activeRequestCount > 0) { + this.activeRequestCount--; } - if (this.logger.hasLevel(server.LogLevel.verbose)) { - this.logger.info("Skipping defunct request for: " + queuedRequest.operationId); + while (this.requestQueue.length > 0) { + var queuedRequest = this.requestQueue.shift(); + if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) { + this.requestMap.delete(queuedRequest.operationId); + this.scheduleRequest(queuedRequest); + break; + } + if (this.logger.hasLevel(server.LogLevel.verbose)) { + this.logger.info("Skipping defunct request for: " + queuedRequest.operationId); + } } } this.projectService.updateTypingsForProject(response); diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index d43491f9436..f1378086052 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -2198,6 +2198,7 @@ declare namespace ts { } interface PackageId { name: string; + subModuleName: string; version: string; } enum Extension { @@ -2213,6 +2214,7 @@ declare namespace ts { interface ResolvedTypeReferenceDirective { primary: boolean; resolvedFileName?: string; + packageId?: PackageId; } interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations { resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective; diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 2d3d4cf3e54..d015bf7a597 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -4647,7 +4647,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -12160,7 +12160,7 @@ var ts; token() === 57 || isStartOfType(true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146); if (token() === 99) { node.name = createIdentifier(true); @@ -12176,15 +12176,9 @@ var ts; } node.questionToken = parseOptionalToken(55); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(true); + node.initializer = parseInitializer(true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32)) { signature.typeParameters = parseTypeParameters(); @@ -12214,7 +12208,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1)); setAwaitContext(!!(flags & 2)); - var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20) && (flags & 8)) { @@ -12758,11 +12752,16 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58) { if (scanner.hasPrecedingLineBreak() || (inParameter && token() === 17) || !isStartOfExpression()) { return undefined; } + if (inParameter && requireEqualsToken) { + var result = createMissingNode(71, true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } parseExpected(58); return parseAssignmentExpressionOrHigher(); @@ -12931,8 +12930,7 @@ var ts; } function tryParseAsyncSimpleArrowFunctionExpression() { if (token() === 120) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -12961,7 +12959,8 @@ var ts; if (!node.parameters) { return undefined; } - if (!allowAmbiguity && token() !== 36 && token() !== 17) { + if (!allowAmbiguity && ((token() !== 36 && token() !== 17) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { return undefined; } return node; @@ -14204,7 +14203,7 @@ var ts; var node = createNode(176); node.dotDotDotToken = parseOptionalToken(24); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingElement() { @@ -14220,7 +14219,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingPattern() { @@ -14254,7 +14253,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -17614,7 +17613,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -17717,12 +17716,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -18019,7 +18018,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -18181,31 +18180,40 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -18248,9 +18256,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false, cache); @@ -57206,27 +57222,16 @@ var ts; emit(node.literal); } function emitBlock(node) { - if (isSingleLineEmptyBlock(node)) { - writeToken(17, node.pos, node); - write(" "); - writeToken(18, node.statements.end, node); - } - else { - writeToken(17, node.pos, node); - emitBlockStatements(node); - increaseIndent(); - emitLeadingCommentsOfPosition(node.statements.end); - decreaseIndent(); - writeToken(18, node.statements.end, node); - } + writeToken(17, node.pos, node); + emitBlockStatements(node, !node.multiLine && isEmptyBlock(node)); + increaseIndent(); + emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); + writeToken(18, node.statements.end, node); } - function emitBlockStatements(node) { - if (ts.getEmitFlags(node) & 1) { - emitList(node, node.statements, 384); - } - else { - emitList(node, node.statements, 65); - } + function emitBlockStatements(node, forceSingleLine) { + var format = forceSingleLine || ts.getEmitFlags(node) & 1 ? 384 : 65; + emitList(node, node.statements, format); } function emitVariableStatement(node) { emitModifiers(node, node.modifiers); @@ -57584,16 +57589,11 @@ var ts; emit(body); } function emitModuleBlock(node) { - if (isEmptyBlock(node)) { - write("{ }"); - } - else { - pushNameGenerationScope(); - write("{"); - emitBlockStatements(node); - write("}"); - popNameGenerationScope(); - } + pushNameGenerationScope(); + write("{"); + emitBlockStatements(node, isEmptyBlock(node)); + write("}"); + popNameGenerationScope(); } function emitCaseBlock(node) { writeToken(17, node.pos); @@ -57989,6 +57989,12 @@ var ts; } var isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0; if (isEmpty && format & 16384) { + if (onBeforeEmitNodeArray) { + onBeforeEmitNodeArray(children); + } + if (onAfterEmitNodeArray) { + onAfterEmitNodeArray(children); + } return; } if (format & 7680) { @@ -58255,10 +58261,6 @@ var ts; && !ts.nodeIsSynthesized(node2) && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile); } - function isSingleLineEmptyBlock(block) { - return !block.multiLine - && isEmptyBlock(block); - } function isEmptyBlock(block) { return block.statements.length === 0 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); @@ -59576,7 +59578,7 @@ var ts; return ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()); } function processRootFile(fileName, isDefaultLib) { - processSourceFile(ts.normalizePath(fileName), isDefaultLib); + processSourceFile(ts.normalizePath(fileName), isDefaultLib, undefined); } function fileReferenceIsEqualTo(a, b) { return a.fileName === b.fileName; @@ -59701,8 +59703,8 @@ var ts; return sourceFileWithAddedExtension; } } - function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) { - getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, undefined); }, function (diagnostic) { + function processSourceFile(fileName, isDefaultLib, packageId, refFile, refPos, refEnd) { + getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, packageId); }, function (diagnostic) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; @@ -59768,7 +59770,7 @@ var ts; } }); if (packageId) { - var packageIdKey = packageId.name + "@" + packageId.version; + var packageIdKey = packageId.name + "/" + packageId.subModuleName + "@" + packageId.version; var fileFromPackageId = packageIdToSourceFile.get(packageIdKey); if (fileFromPackageId) { var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path); @@ -59815,7 +59817,7 @@ var ts; function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref) { var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, isDefaultLib, file, ref.pos, ref.end); + processSourceFile(referencedFileName, isDefaultLib, undefined, file, ref.pos, ref.end); }); } function processTypeReferenceDirectives(file) { @@ -59837,7 +59839,7 @@ var ts; var saveResolution = true; if (resolvedTypeReferenceDirective) { if (resolvedTypeReferenceDirective.primary) { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } else { if (previousResolution) { @@ -59850,7 +59852,7 @@ var ts; saveResolution = false; } else { - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } } } @@ -70653,8 +70655,7 @@ var ts; return true; case 207: { var blockParent = context.currentTokenParent.parent; - if (blockParent.kind !== 187 && - blockParent.kind !== 186) { + if (!blockParent || blockParent.kind !== 187 && blockParent.kind !== 186) { return true; } } @@ -74665,7 +74666,7 @@ var ts; return { errors: [ts.createFileDiagnostic(sourceFile, start, length, message)] }; } function checkRootNode(node) { - if (ts.isToken(node)) { + if (ts.isToken(ts.isExpressionStatement(node) ? node.expression : node)) { return [ts.createDiagnosticForNode(node, Messages.InsufficientSelection)]; } return undefined; @@ -80955,24 +80956,23 @@ var ts; var file = changedFiles_1[_i]; this.cachedUnresolvedImportsPerFile.remove(file); } - var unresolvedImports; - if (hasChanges || changedFiles.length) { - var result = []; - for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) { - var sourceFile = _b[_a]; - this.extractUnresolvedImportsFromSourceFile(sourceFile, result); - } - this.lastCachedUnresolvedImportsList = server.toDeduplicatedSortedArray(result); - } - unresolvedImports = this.lastCachedUnresolvedImportsList; - var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, unresolvedImports, hasChanges); - if (this.setTypings(cachedTypings)) { - hasChanges = this.updateGraphWorker() || hasChanges; - } if (this.languageServiceEnabled) { + if (hasChanges || changedFiles.length) { + var result = []; + for (var _a = 0, _b = this.program.getSourceFiles(); _a < _b.length; _a++) { + var sourceFile = _b[_a]; + this.extractUnresolvedImportsFromSourceFile(sourceFile, result); + } + this.lastCachedUnresolvedImportsList = server.toDeduplicatedSortedArray(result); + } + var cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasChanges); + if (this.setTypings(cachedTypings)) { + hasChanges = this.updateGraphWorker() || hasChanges; + } this.builder.onProjectUpdateGraph(); } else { + this.lastCachedUnresolvedImportsList = undefined; this.builder.clear(); } if (hasChanges) { diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts index dd3414c68fd..b908e7349bf 100644 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts @@ -2367,6 +2367,11 @@ declare namespace ts { * If accessing a non-index file, this should include its name e.g. "foo/bar". */ name: string; + /** + * Name of a submodule within this package. + * May be "". + */ + subModuleName: string; /** Version of the package, e.g. "1.2.3" */ version: string; } @@ -2383,6 +2388,7 @@ declare namespace ts { interface ResolvedTypeReferenceDirective { primary: boolean; resolvedFileName?: string; + packageId?: PackageId; } interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations { resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective; diff --git a/lib/typescript.js b/lib/typescript.js index ae40057ff89..44aae64f310 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -6955,7 +6955,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -13850,7 +13850,7 @@ var ts; token() === 57 /* AtToken */ || isStartOfType(/*inStartOfParameter*/ true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146 /* Parameter */); if (token() === 99 /* ThisKeyword */) { node.name = createIdentifier(/*isIdentifier*/ true); @@ -13876,15 +13876,9 @@ var ts; } node.questionToken = parseOptionalToken(55 /* QuestionToken */); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ true); + node.initializer = parseInitializer(/*inParameter*/ true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(/*inParameter*/ true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32 /* JSDoc */)) { signature.typeParameters = parseTypeParameters(); @@ -13928,7 +13922,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1 /* Yield */)); setAwaitContext(!!(flags & 2 /* Await */)); - var result = parseDelimitedList(16 /* Parameters */, flags & 32 /* JSDoc */ ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16 /* Parameters */, flags & 32 /* JSDoc */ ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8 /* RequireCompleteParameterList */)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20 /* CloseParenToken */) && (flags & 8 /* RequireCompleteParameterList */)) { @@ -14545,7 +14539,7 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58 /* EqualsToken */) { // It's not uncommon during typing for the user to miss writing the '=' token. Check if // there is no newline after the last token and if we're on an expression. If so, parse @@ -14560,6 +14554,13 @@ var ts; // do not try to parse initializer return undefined; } + if (inParameter && requireEqualsToken) { + // = is required when speculatively parsing arrow function parameters, + // so return a fake initializer as a signal that the equals token was missing + var result = createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } // Initializer[In, Yield] : // = AssignmentExpression[?In, ?Yield] @@ -14835,8 +14836,7 @@ var ts; function tryParseAsyncSimpleArrowFunctionExpression() { // We do a check here so that we won't be doing unnecessarily call to "lookAhead" if (token() === 120 /* AsyncKeyword */) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1 /* True */) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -14887,7 +14887,8 @@ var ts; // - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation. // // So we need just a bit of lookahead to ensure that it can only be a signature. - if (!allowAmbiguity && token() !== 36 /* EqualsGreaterThanToken */ && token() !== 17 /* OpenBraceToken */) { + if (!allowAmbiguity && ((token() !== 36 /* EqualsGreaterThanToken */ && token() !== 17 /* OpenBraceToken */) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { // Returning undefined here will cause our caller to rewind to where we started from. return undefined; } @@ -16446,7 +16447,7 @@ var ts; var node = createNode(176 /* BindingElement */); node.dotDotDotToken = parseOptionalToken(24 /* DotDotDotToken */); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + node.initializer = parseInitializer(/*inParameter*/ false); return finishNode(node); } function parseObjectBindingElement() { @@ -16462,7 +16463,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + node.initializer = parseInitializer(/*inParameter*/ false); return finishNode(node); } function parseObjectBindingPattern() { @@ -16496,7 +16497,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(/*inParameter*/ false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -21646,7 +21647,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -21761,12 +21762,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -22166,7 +22167,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -22347,32 +22348,41 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -22420,9 +22430,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false, cache); @@ -67844,28 +67862,17 @@ var ts; // Statements // function emitBlock(node) { - if (isSingleLineEmptyBlock(node)) { - writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); - write(" "); - writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); - } - else { - writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); - emitBlockStatements(node); - // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted - increaseIndent(); - emitLeadingCommentsOfPosition(node.statements.end); - decreaseIndent(); - writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); - } + writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); + emitBlockStatements(node, /*forceSingleLine*/ !node.multiLine && isEmptyBlock(node)); + // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted + increaseIndent(); + emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); + writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); } - function emitBlockStatements(node) { - if (ts.getEmitFlags(node) & 1 /* SingleLine */) { - emitList(node, node.statements, 384 /* SingleLineBlockStatements */); - } - else { - emitList(node, node.statements, 65 /* MultiLineBlockStatements */); - } + function emitBlockStatements(node, forceSingleLine) { + var format = forceSingleLine || ts.getEmitFlags(node) & 1 /* SingleLine */ ? 384 /* SingleLineBlockStatements */ : 65 /* MultiLineBlockStatements */; + emitList(node, node.statements, format); } function emitVariableStatement(node) { emitModifiers(node, node.modifiers); @@ -68233,16 +68240,11 @@ var ts; emit(body); } function emitModuleBlock(node) { - if (isEmptyBlock(node)) { - write("{ }"); - } - else { - pushNameGenerationScope(); - write("{"); - emitBlockStatements(node); - write("}"); - popNameGenerationScope(); - } + pushNameGenerationScope(); + write("{"); + emitBlockStatements(node, /*forceSingleLine*/ isEmptyBlock(node)); + write("}"); + popNameGenerationScope(); } function emitCaseBlock(node) { writeToken(17 /* OpenBraceToken */, node.pos); @@ -68691,6 +68693,12 @@ var ts; } var isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0; if (isEmpty && format & 16384 /* OptionalIfEmpty */) { + if (onBeforeEmitNodeArray) { + onBeforeEmitNodeArray(children); + } + if (onAfterEmitNodeArray) { + onAfterEmitNodeArray(children); + } return; } if (format & 7680 /* BracketsMask */) { @@ -68986,10 +68994,6 @@ var ts; && !ts.nodeIsSynthesized(node2) && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile); } - function isSingleLineEmptyBlock(block) { - return !block.multiLine - && isEmptyBlock(block); - } function isEmptyBlock(block) { return block.statements.length === 0 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); @@ -70561,7 +70565,7 @@ var ts; return ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()); } function processRootFile(fileName, isDefaultLib) { - processSourceFile(ts.normalizePath(fileName), isDefaultLib); + processSourceFile(ts.normalizePath(fileName), isDefaultLib, /*packageId*/ undefined); } function fileReferenceIsEqualTo(a, b) { return a.fileName === b.fileName; @@ -70706,8 +70710,8 @@ var ts; } } /** This has side effects through `findSourceFile`. */ - function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) { - getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, /*packageId*/ undefined); }, function (diagnostic) { + function processSourceFile(fileName, isDefaultLib, packageId, refFile, refPos, refEnd) { + getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, packageId); }, function (diagnostic) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; @@ -70779,7 +70783,7 @@ var ts; } }); if (packageId) { - var packageIdKey = packageId.name + "@" + packageId.version; + var packageIdKey = packageId.name + "/" + packageId.subModuleName + "@" + packageId.version; var fileFromPackageId = packageIdToSourceFile.get(packageIdKey); if (fileFromPackageId) { // Some other SourceFile already exists with this package name and version. @@ -70831,7 +70835,7 @@ var ts; function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref) { var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, isDefaultLib, file, ref.pos, ref.end); + processSourceFile(referencedFileName, isDefaultLib, /*packageId*/ undefined, file, ref.pos, ref.end); }); } function processTypeReferenceDirectives(file) { @@ -70857,7 +70861,7 @@ var ts; if (resolvedTypeReferenceDirective) { if (resolvedTypeReferenceDirective.primary) { // resolved from the primary path - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } else { // If we already resolved to this file, it must have been a secondary reference. Check file contents @@ -70875,7 +70879,7 @@ var ts; } else { // First resolution of this library - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } } } @@ -85025,8 +85029,8 @@ var ts; return true; case 207 /* Block */: { var blockParent = context.currentTokenParent.parent; - if (blockParent.kind !== 187 /* ArrowFunction */ && - blockParent.kind !== 186 /* FunctionExpression */) { + // In a codefix scenario, we can't rely on parents being set. So just always return true. + if (!blockParent || blockParent.kind !== 187 /* ArrowFunction */ && blockParent.kind !== 186 /* FunctionExpression */) { return true; } } @@ -89679,7 +89683,7 @@ var ts; return { errors: [ts.createFileDiagnostic(sourceFile, start, length, message)] }; } function checkRootNode(node) { - if (ts.isToken(node)) { + if (ts.isToken(ts.isExpressionStatement(node) ? node.expression : node)) { return [ts.createDiagnosticForNode(node, Messages.InsufficientSelection)]; } return undefined; diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts index cc7a778c17e..cf2545472d9 100644 --- a/lib/typescriptServices.d.ts +++ b/lib/typescriptServices.d.ts @@ -2367,6 +2367,11 @@ declare namespace ts { * If accessing a non-index file, this should include its name e.g. "foo/bar". */ name: string; + /** + * Name of a submodule within this package. + * May be "". + */ + subModuleName: string; /** Version of the package, e.g. "1.2.3" */ version: string; } @@ -2383,6 +2388,7 @@ declare namespace ts { interface ResolvedTypeReferenceDirective { primary: boolean; resolvedFileName?: string; + packageId?: PackageId; } interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations { resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective; diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index ae40057ff89..44aae64f310 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -6955,7 +6955,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -13850,7 +13850,7 @@ var ts; token() === 57 /* AtToken */ || isStartOfType(/*inStartOfParameter*/ true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146 /* Parameter */); if (token() === 99 /* ThisKeyword */) { node.name = createIdentifier(/*isIdentifier*/ true); @@ -13876,15 +13876,9 @@ var ts; } node.questionToken = parseOptionalToken(55 /* QuestionToken */); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ true); + node.initializer = parseInitializer(/*inParameter*/ true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(/*inParameter*/ true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32 /* JSDoc */)) { signature.typeParameters = parseTypeParameters(); @@ -13928,7 +13922,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1 /* Yield */)); setAwaitContext(!!(flags & 2 /* Await */)); - var result = parseDelimitedList(16 /* Parameters */, flags & 32 /* JSDoc */ ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16 /* Parameters */, flags & 32 /* JSDoc */ ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8 /* RequireCompleteParameterList */)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20 /* CloseParenToken */) && (flags & 8 /* RequireCompleteParameterList */)) { @@ -14545,7 +14539,7 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58 /* EqualsToken */) { // It's not uncommon during typing for the user to miss writing the '=' token. Check if // there is no newline after the last token and if we're on an expression. If so, parse @@ -14560,6 +14554,13 @@ var ts; // do not try to parse initializer return undefined; } + if (inParameter && requireEqualsToken) { + // = is required when speculatively parsing arrow function parameters, + // so return a fake initializer as a signal that the equals token was missing + var result = createMissingNode(71 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } // Initializer[In, Yield] : // = AssignmentExpression[?In, ?Yield] @@ -14835,8 +14836,7 @@ var ts; function tryParseAsyncSimpleArrowFunctionExpression() { // We do a check here so that we won't be doing unnecessarily call to "lookAhead" if (token() === 120 /* AsyncKeyword */) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1 /* True */) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -14887,7 +14887,8 @@ var ts; // - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation. // // So we need just a bit of lookahead to ensure that it can only be a signature. - if (!allowAmbiguity && token() !== 36 /* EqualsGreaterThanToken */ && token() !== 17 /* OpenBraceToken */) { + if (!allowAmbiguity && ((token() !== 36 /* EqualsGreaterThanToken */ && token() !== 17 /* OpenBraceToken */) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { // Returning undefined here will cause our caller to rewind to where we started from. return undefined; } @@ -16446,7 +16447,7 @@ var ts; var node = createNode(176 /* BindingElement */); node.dotDotDotToken = parseOptionalToken(24 /* DotDotDotToken */); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + node.initializer = parseInitializer(/*inParameter*/ false); return finishNode(node); } function parseObjectBindingElement() { @@ -16462,7 +16463,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(/*inParameter*/ false); + node.initializer = parseInitializer(/*inParameter*/ false); return finishNode(node); } function parseObjectBindingPattern() { @@ -16496,7 +16497,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(/*inParameter*/ false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -21646,7 +21647,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -21761,12 +21762,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -22166,7 +22167,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, /*onlyRecordFailures*/ false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -22347,32 +22348,41 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -22420,9 +22430,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, /*typesOnly*/ false, cache); @@ -67844,28 +67862,17 @@ var ts; // Statements // function emitBlock(node) { - if (isSingleLineEmptyBlock(node)) { - writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); - write(" "); - writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); - } - else { - writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); - emitBlockStatements(node); - // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted - increaseIndent(); - emitLeadingCommentsOfPosition(node.statements.end); - decreaseIndent(); - writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); - } + writeToken(17 /* OpenBraceToken */, node.pos, /*contextNode*/ node); + emitBlockStatements(node, /*forceSingleLine*/ !node.multiLine && isEmptyBlock(node)); + // We have to call emitLeadingComments explicitly here because otherwise leading comments of the close brace token will not be emitted + increaseIndent(); + emitLeadingCommentsOfPosition(node.statements.end); + decreaseIndent(); + writeToken(18 /* CloseBraceToken */, node.statements.end, /*contextNode*/ node); } - function emitBlockStatements(node) { - if (ts.getEmitFlags(node) & 1 /* SingleLine */) { - emitList(node, node.statements, 384 /* SingleLineBlockStatements */); - } - else { - emitList(node, node.statements, 65 /* MultiLineBlockStatements */); - } + function emitBlockStatements(node, forceSingleLine) { + var format = forceSingleLine || ts.getEmitFlags(node) & 1 /* SingleLine */ ? 384 /* SingleLineBlockStatements */ : 65 /* MultiLineBlockStatements */; + emitList(node, node.statements, format); } function emitVariableStatement(node) { emitModifiers(node, node.modifiers); @@ -68233,16 +68240,11 @@ var ts; emit(body); } function emitModuleBlock(node) { - if (isEmptyBlock(node)) { - write("{ }"); - } - else { - pushNameGenerationScope(); - write("{"); - emitBlockStatements(node); - write("}"); - popNameGenerationScope(); - } + pushNameGenerationScope(); + write("{"); + emitBlockStatements(node, /*forceSingleLine*/ isEmptyBlock(node)); + write("}"); + popNameGenerationScope(); } function emitCaseBlock(node) { writeToken(17 /* OpenBraceToken */, node.pos); @@ -68691,6 +68693,12 @@ var ts; } var isEmpty = isUndefined || children.length === 0 || start >= children.length || count === 0; if (isEmpty && format & 16384 /* OptionalIfEmpty */) { + if (onBeforeEmitNodeArray) { + onBeforeEmitNodeArray(children); + } + if (onAfterEmitNodeArray) { + onAfterEmitNodeArray(children); + } return; } if (format & 7680 /* BracketsMask */) { @@ -68986,10 +68994,6 @@ var ts; && !ts.nodeIsSynthesized(node2) && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile); } - function isSingleLineEmptyBlock(block) { - return !block.multiLine - && isEmptyBlock(block); - } function isEmptyBlock(block) { return block.statements.length === 0 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); @@ -70561,7 +70565,7 @@ var ts; return ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()); } function processRootFile(fileName, isDefaultLib) { - processSourceFile(ts.normalizePath(fileName), isDefaultLib); + processSourceFile(ts.normalizePath(fileName), isDefaultLib, /*packageId*/ undefined); } function fileReferenceIsEqualTo(a, b) { return a.fileName === b.fileName; @@ -70706,8 +70710,8 @@ var ts; } } /** This has side effects through `findSourceFile`. */ - function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) { - getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, /*packageId*/ undefined); }, function (diagnostic) { + function processSourceFile(fileName, isDefaultLib, packageId, refFile, refPos, refEnd) { + getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, refFile, refPos, refEnd, packageId); }, function (diagnostic) { var args = []; for (var _i = 1; _i < arguments.length; _i++) { args[_i - 1] = arguments[_i]; @@ -70779,7 +70783,7 @@ var ts; } }); if (packageId) { - var packageIdKey = packageId.name + "@" + packageId.version; + var packageIdKey = packageId.name + "/" + packageId.subModuleName + "@" + packageId.version; var fileFromPackageId = packageIdToSourceFile.get(packageIdKey); if (fileFromPackageId) { // Some other SourceFile already exists with this package name and version. @@ -70831,7 +70835,7 @@ var ts; function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref) { var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); - processSourceFile(referencedFileName, isDefaultLib, file, ref.pos, ref.end); + processSourceFile(referencedFileName, isDefaultLib, /*packageId*/ undefined, file, ref.pos, ref.end); }); } function processTypeReferenceDirectives(file) { @@ -70857,7 +70861,7 @@ var ts; if (resolvedTypeReferenceDirective) { if (resolvedTypeReferenceDirective.primary) { // resolved from the primary path - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } else { // If we already resolved to this file, it must have been a secondary reference. Check file contents @@ -70875,7 +70879,7 @@ var ts; } else { // First resolution of this library - processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, refFile, refPos, refEnd); + processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); } } } @@ -85025,8 +85029,8 @@ var ts; return true; case 207 /* Block */: { var blockParent = context.currentTokenParent.parent; - if (blockParent.kind !== 187 /* ArrowFunction */ && - blockParent.kind !== 186 /* FunctionExpression */) { + // In a codefix scenario, we can't rely on parents being set. So just always return true. + if (!blockParent || blockParent.kind !== 187 /* ArrowFunction */ && blockParent.kind !== 186 /* FunctionExpression */) { return true; } } @@ -89679,7 +89683,7 @@ var ts; return { errors: [ts.createFileDiagnostic(sourceFile, start, length, message)] }; } function checkRootNode(node) { - if (ts.isToken(node)) { + if (ts.isToken(ts.isExpressionStatement(node) ? node.expression : node)) { return [ts.createDiagnosticForNode(node, Messages.InsufficientSelection)]; } return undefined; diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 9aa63731908..2a984c6fb72 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -3619,7 +3619,7 @@ var ts; } ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo; function packageIdIsEqual(a, b) { - return a === b || a && b && a.name === b.name && a.version === b.version; + return a === b || a && b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version; } function typeDirectiveIsEqualTo(oldResolution, newResolution) { return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary; @@ -11103,7 +11103,7 @@ var ts; token() === 57 || isStartOfType(true); } - function parseParameter() { + function parseParameter(requireEqualsToken) { var node = createNode(146); if (token() === 99) { node.name = createIdentifier(true); @@ -11119,15 +11119,9 @@ var ts; } node.questionToken = parseOptionalToken(55); node.type = parseParameterType(); - node.initializer = parseBindingElementInitializer(true); + node.initializer = parseInitializer(true, requireEqualsToken); return addJSDocComment(finishNode(node)); } - function parseBindingElementInitializer(inParameter) { - return inParameter ? parseParameterInitializer() : parseNonParameterInitializer(); - } - function parseParameterInitializer() { - return parseInitializer(true); - } function fillSignature(returnToken, flags, signature) { if (!(flags & 32)) { signature.typeParameters = parseTypeParameters(); @@ -11157,7 +11151,7 @@ var ts; var savedAwaitContext = inAwaitContext(); setYieldContext(!!(flags & 1)); setAwaitContext(!!(flags & 2)); - var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : parseParameter); + var result = parseDelimitedList(16, flags & 32 ? parseJSDocParameter : function () { return parseParameter(!!(flags & 8)); }); setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); if (!parseExpected(20) && (flags & 8)) { @@ -11701,11 +11695,16 @@ var ts; } return expr; } - function parseInitializer(inParameter) { + function parseInitializer(inParameter, requireEqualsToken) { if (token() !== 58) { if (scanner.hasPrecedingLineBreak() || (inParameter && token() === 17) || !isStartOfExpression()) { return undefined; } + if (inParameter && requireEqualsToken) { + var result = createMissingNode(71, true, ts.Diagnostics._0_expected, "="); + result.escapedText = "= not found"; + return result; + } } parseExpected(58); return parseAssignmentExpressionOrHigher(); @@ -11874,8 +11873,7 @@ var ts; } function tryParseAsyncSimpleArrowFunctionExpression() { if (token() === 120) { - var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker); - if (isUnParenthesizedAsyncArrowFunction === 1) { + if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) { var asyncModifier = parseModifiersForArrowFunction(); var expr = parseBinaryExpressionOrHigher(0); return parseSimpleArrowFunctionExpression(expr, asyncModifier); @@ -11904,7 +11902,8 @@ var ts; if (!node.parameters) { return undefined; } - if (!allowAmbiguity && token() !== 36 && token() !== 17) { + if (!allowAmbiguity && ((token() !== 36 && token() !== 17) || + ts.find(node.parameters, function (p) { return p.initializer && ts.isIdentifier(p.initializer) && p.initializer.escapedText === "= not found"; }))) { return undefined; } return node; @@ -13147,7 +13146,7 @@ var ts; var node = createNode(176); node.dotDotDotToken = parseOptionalToken(24); node.name = parseIdentifierOrPattern(); - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingElement() { @@ -13163,7 +13162,7 @@ var ts; node.propertyName = propertyName; node.name = parseIdentifierOrPattern(); } - node.initializer = parseBindingElementInitializer(false); + node.initializer = parseInitializer(false); return finishNode(node); } function parseObjectBindingPattern() { @@ -13197,7 +13196,7 @@ var ts; node.name = parseIdentifierOrPattern(); node.type = parseTypeAnnotation(); if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(false); + node.initializer = parseNonParameterInitializer(); } return finishNode(node); } @@ -16693,7 +16692,7 @@ var ts; return undefined; } ts.Debug.assert(ts.extensionIsTypeScript(resolved.extension)); - return resolved.path; + return { fileName: resolved.path, packageId: resolved.packageId }; } function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) { return { @@ -16796,12 +16795,12 @@ var ts; var resolvedTypeReferenceDirective; if (resolved) { if (!options.preserveSymlinks) { - resolved = realpath(resolved, host, traceEnabled); + resolved = __assign({}, resolved, { fileName: realpath(resolved.fileName, host, traceEnabled) }); } if (traceEnabled) { - trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved, primary); + trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolved.fileName, primary); } - resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved }; + resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; } return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations }; function primaryLookup() { @@ -17098,7 +17097,7 @@ var ts; if (extension !== undefined) { var path_1 = tryFile(candidate, failedLookupLocations, false, state); if (path_1 !== undefined) { - return { path: path_1, extension: extension, packageId: undefined }; + return noPackageId({ path: path_1, ext: extension }); } } return loader(extensions, candidate, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state); @@ -17260,31 +17259,40 @@ var ts; } function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, considerPackageJson) { if (considerPackageJson === void 0) { considerPackageJson = true; } + var _a = considerPackageJson + ? getPackageJsonInfo(candidate, "", failedLookupLocations, onlyRecordFailures, state) + : { packageJsonContent: undefined, packageId: undefined }, packageJsonContent = _a.packageJsonContent, packageId = _a.packageId; + return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent)); + } + function loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, onlyRecordFailures, state, packageJsonContent) { + var fromPackageJson = packageJsonContent && loadModuleFromPackageJson(packageJsonContent, extensions, candidate, failedLookupLocations, state); + if (fromPackageJson) { + return fromPackageJson; + } var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); - var packageId; - if (considerPackageJson) { - var packageJsonPath = pathToPackageJson(candidate); - if (directoryExists && state.host.fileExists(packageJsonPath)) { - if (state.traceEnabled) { - trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); - } - var jsonContent = readJson(packageJsonPath, state.host); - if (typeof jsonContent.name === "string" && typeof jsonContent.version === "string") { - packageId = { name: jsonContent.name, version: jsonContent.version }; - } - var fromPackageJson = loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state); - if (fromPackageJson) { - return withPackageId(packageId, fromPackageJson); - } + return loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state); + } + function getPackageJsonInfo(nodeModuleDirectory, subModuleName, failedLookupLocations, onlyRecordFailures, _a) { + var host = _a.host, traceEnabled = _a.traceEnabled; + var directoryExists = !onlyRecordFailures && directoryProbablyExists(nodeModuleDirectory, host); + var packageJsonPath = pathToPackageJson(nodeModuleDirectory); + if (directoryExists && host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath); } - else { - if (directoryExists && state.traceEnabled) { - trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); - } - failedLookupLocations.push(packageJsonPath); + var packageJsonContent = readJson(packageJsonPath, host); + var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string" + ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version } + : undefined; + return { packageJsonContent: packageJsonContent, packageId: packageId }; + } + else { + if (directoryExists && traceEnabled) { + trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath); } + failedLookupLocations.push(packageJsonPath); + return { packageJsonContent: undefined, packageId: undefined }; } - return withPackageId(packageId, loadModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocations, !directoryExists, state)); } function loadModuleFromPackageJson(jsonContent, extensions, candidate, failedLookupLocations, state) { var file = tryReadPackageJsonFields(extensions !== Extensions.JavaScript, jsonContent, candidate, state); @@ -17327,9 +17335,17 @@ var ts; return ts.combinePaths(directory, "package.json"); } function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) { + var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest; + var packageRootPath = ts.combinePaths(nodeModulesFolder, top); + var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId; var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName)); - return loadModuleFromFileNoPackageId(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || - loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); + var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) || + loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent); + return withPackageId(packageId, pathAndExtension); + } + function getNameOfTopDirectory(name) { + var idx = name.indexOf(ts.directorySeparator); + return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) }; } function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) { return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false, cache);