typescript 4.9.0-dev.20220831 → 4.9.0-dev.20220901

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.9";
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -54762,7 +54762,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152) {
+            if (type.flags & 2097152 && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -60381,11 +60381,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768);

package/lib/tsserver.js

@@ -109,7 +109,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -65621,7 +65621,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -72140,11 +72140,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152 /* TypeFacts.NEUndefinedOrNull */);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768 /* TypeFacts.TypeofNEHostObject */);
@@ -172211,13 +172218,13 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(host.importServicePlugin);
+                                ts.Debug.assertIsDefined(host.importPlugin);
                                 resolvedPath = ts.combinePaths(initialDir, "node_modules");
                                 log("Dynamically importing ".concat(moduleName, " from ").concat(initialDir, " (resolved to ").concat(resolvedPath, ")"));
                                 _a.label = 1;
                             case 1:
                                 _a.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, host.importServicePlugin(resolvedPath, moduleName)];
+                                return [4 /*yield*/, host.importPlugin(resolvedPath, moduleName)];
                             case 2:
                                 result = _a.sent();
                                 return [3 /*break*/, 4];
@@ -173296,7 +173303,7 @@ var ts;
             };
             Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -173353,7 +173360,7 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(this.projectService.host.importServicePlugin);
+                                ts.Debug.assertIsDefined(this.projectService.host.importPlugin);
                                 log = function (message) { return _this.projectService.logger.info(message); };
                                 logError = function (message) {
                                     (errorLogs !== null && errorLogs !== void 0 ? errorLogs : (errorLogs = [])).push(message);
@@ -174054,7 +174061,7 @@ var ts;
             /*@internal*/
             ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -177498,7 +177505,7 @@ var ts;
             /*@internal*/
             ProjectService.prototype.requestEnablePlugin = function (project, pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _a;
-                if (!this.host.importServicePlugin && !this.host.require) {
+                if (!this.host.importPlugin && !this.host.require) {
                     this.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -177508,7 +177515,7 @@ var ts;
                     return;
                 }
                 // If the host supports dynamic import, begin enabling the plugin asynchronously.
-                if (this.host.importServicePlugin) {
+                if (this.host.importPlugin) {
                     var importPromise = project.beginEnablePluginAsync(pluginConfigEntry, searchPaths, pluginConfigOverrides);
                     (_a = this.pendingPluginEnablements) !== null && _a !== void 0 ? _a : (this.pendingPluginEnablements = new ts.Map());
                     var promises = this.pendingPluginEnablements.get(project);
@@ -181807,7 +181814,7 @@ var ts;
                 setImmediate: function (x) { return setTimeout(x, 0); },
                 clearImmediate: function (handle) { return clearTimeout(handle); },
                 /* eslint-enable no-restricted-globals */
-                importServicePlugin: function (initialDir, moduleName) { return __awaiter(_this, void 0, void 0, function () {
+                importPlugin: function (initialDir, moduleName) { return __awaiter(_this, void 0, void 0, function () {
                     var packageRoot, packageJson, packageJsonResponse, e_1, browser, scriptPath, module_1, e_2;
                     return __generator(this, function (_a) {
                         switch (_a.label) {

package/lib/tsserverlibrary.d.ts

@@ -7044,7 +7044,6 @@ declare namespace ts.server {
         gc?(): void;
         trace?(s: string): void;
         require?(initialPath: string, moduleName: string): ModuleImportResult;
-        importServicePlugin?(root: string, moduleName: string): Promise<ModuleImportResult>;
     }
 }
 declare namespace ts.server {

package/lib/tsserverlibrary.js

@@ -108,7 +108,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -65620,7 +65620,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -72139,11 +72139,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152 /* TypeFacts.NEUndefinedOrNull */);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768 /* TypeFacts.TypeofNEHostObject */);
@@ -172210,13 +172217,13 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(host.importServicePlugin);
+                                ts.Debug.assertIsDefined(host.importPlugin);
                                 resolvedPath = ts.combinePaths(initialDir, "node_modules");
                                 log("Dynamically importing ".concat(moduleName, " from ").concat(initialDir, " (resolved to ").concat(resolvedPath, ")"));
                                 _a.label = 1;
                             case 1:
                                 _a.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, host.importServicePlugin(resolvedPath, moduleName)];
+                                return [4 /*yield*/, host.importPlugin(resolvedPath, moduleName)];
                             case 2:
                                 result = _a.sent();
                                 return [3 /*break*/, 4];
@@ -173295,7 +173302,7 @@ var ts;
             };
             Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -173352,7 +173359,7 @@ var ts;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                ts.Debug.assertIsDefined(this.projectService.host.importServicePlugin);
+                                ts.Debug.assertIsDefined(this.projectService.host.importPlugin);
                                 log = function (message) { return _this.projectService.logger.info(message); };
                                 logError = function (message) {
                                     (errorLogs !== null && errorLogs !== void 0 ? errorLogs : (errorLogs = [])).push(message);
@@ -174053,7 +174060,7 @@ var ts;
             /*@internal*/
             ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                 var host = this.projectService.host;
-                if (!host.require && !host.importServicePlugin) {
+                if (!host.require && !host.importPlugin) {
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -177497,7 +177504,7 @@ var ts;
             /*@internal*/
             ProjectService.prototype.requestEnablePlugin = function (project, pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _a;
-                if (!this.host.importServicePlugin && !this.host.require) {
+                if (!this.host.importPlugin && !this.host.require) {
                     this.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
@@ -177507,7 +177514,7 @@ var ts;
                     return;
                 }
                 // If the host supports dynamic import, begin enabling the plugin asynchronously.
-                if (this.host.importServicePlugin) {
+                if (this.host.importPlugin) {
                     var importPromise = project.beginEnablePluginAsync(pluginConfigEntry, searchPaths, pluginConfigOverrides);
                     (_a = this.pendingPluginEnablements) !== null && _a !== void 0 ? _a : (this.pendingPluginEnablements = new ts.Map());
                     var promises = this.pendingPluginEnablements.get(project);

package/lib/typescript.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -65611,7 +65611,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -72130,11 +72130,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152 /* TypeFacts.NEUndefinedOrNull */);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768 /* TypeFacts.TypeofNEHostObject */);

package/lib/typescriptServices.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -65611,7 +65611,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -72130,11 +72130,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152 /* TypeFacts.NEUndefinedOrNull */);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768 /* TypeFacts.TypeofNEHostObject */);

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220831");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220901");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -65601,7 +65601,7 @@ var ts;
             if (reduced !== type) {
                 return reduced;
             }
-            if (type.flags & 2097152 /* TypeFlags.Intersection */) {
+            if (type.flags & 2097152 /* TypeFlags.Intersection */ && ts.some(type.types, isEmptyAnonymousObjectType)) {
                 var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
                 if (normalizedTypes !== type.types) {
                     return getIntersectionType(normalizedTypes);
@@ -72120,11 +72120,18 @@ var ts;
                 }
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
+                    var propertyAccess = getDiscriminantPropertyAccess(typeOfExpr.expression, type);
+                    if (propertyAccess) {
+                        return narrowTypeByDiscriminant(type, propertyAccess, function (t) { return narrowTypeByLiteralExpression(t, literal, assumeTrue); });
+                    }
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
                         return getAdjustedTypeWithFacts(type, 2097152 /* TypeFacts.NEUndefinedOrNull */);
                     }
                     return type;
                 }
+                return narrowTypeByLiteralExpression(type, literal, assumeTrue);
+            }
+            function narrowTypeByLiteralExpression(type, literal, assumeTrue) {
                 return assumeTrue ?
                     narrowTypeByTypeName(type, literal.text) :
                     getTypeWithFacts(type, typeofNEFacts.get(literal.text) || 32768 /* TypeFacts.TypeofNEHostObject */);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.9.0-dev.20220831",
+    "version": "4.9.0-dev.20220901",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [