Update LKG

Author: mhegazy

lib/tsc.js

@@ -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;

lib/tsserver.js

@@ -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;

lib/tsserverlibrary.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;

lib/tsserverlibrary.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);