@typescript-deploys/pr-build 5.1.0-pr-53268-4 → 5.1.0-pr-52062-4

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230315`;
+var version = `${versionMajorMinor}.0-insiders.20230316`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -2645,28 +2645,6 @@ function tryGetNativePerformanceHooks() {
 var timestamp = nativePerformance ? () => nativePerformance.now() : Date.now ? Date.now : () => +/* @__PURE__ */ new Date();
 
 // src/compiler/perfLogger.ts
-var nullLogger = {
-  logEvent: noop,
-  logErrEvent: noop,
-  logPerfEvent: noop,
-  logInfoEvent: noop,
-  logStartCommand: noop,
-  logStopCommand: noop,
-  logStartUpdateProgram: noop,
-  logStopUpdateProgram: noop,
-  logStartUpdateGraph: noop,
-  logStopUpdateGraph: noop,
-  logStartResolveModule: noop,
-  logStopResolveModule: noop,
-  logStartParseSourceFile: noop,
-  logStopParseSourceFile: noop,
-  logStartReadFile: noop,
-  logStopReadFile: noop,
-  logStartBindFile: noop,
-  logStopBindFile: noop,
-  logStartScheduledOperation: noop,
-  logStopScheduledOperation: noop
-};
 var etwModule;
 var _a;
 try {
@@ -2675,7 +2653,7 @@ try {
 } catch (e) {
   etwModule = void 0;
 }
-var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
 
 // src/compiler/_namespaces/ts.performance.ts
 var ts_performance_exports = {};
@@ -5168,13 +5146,15 @@ var sys = (() => {
       return buffer.toString("utf8");
     }
     function readFile(fileName, _encoding) {
-      perfLogger.logStartReadFile(fileName);
+      var _a2, _b;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
       const file = readFileWorker(fileName, _encoding);
-      perfLogger.logStopReadFile();
+      (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
       return file;
     }
     function writeFile2(fileName, data, writeByteOrderMark) {
-      perfLogger.logEvent("WriteFile: " + fileName);
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
       if (writeByteOrderMark) {
         data = byteOrderMarkIndicator + data;
       }
@@ -5195,7 +5175,8 @@ var sys = (() => {
       }
     }
     function getAccessibleFileSystemEntries(path) {
-      perfLogger.logEvent("ReadDir: " + (path || "."));
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path || "."));
       try {
         const entries = _fs.readdirSync(path || ".", { withFileTypes: true });
         const files = [];
@@ -25938,7 +25919,7 @@ function setExternalModuleIndicator(sourceFile) {
   sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
 }
 function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind) {
-  var _a2, _b;
+  var _a2, _b, _c, _d;
   (_a2 = tracing) == null ? void 0 : _a2.push(
     tracing.Phase.Parse,
     "createSourceFile",
@@ -25948,7 +25929,7 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
   );
   mark("beforeParse");
   let result;
-  perfLogger.logStartParseSourceFile(fileName);
+  (_b = perfLogger) == null ? void 0 : _b.logStartParseSourceFile(fileName);
   const {
     languageVersion,
     setExternalModuleIndicator: overrideSetExternalModuleIndicator,
@@ -25981,10 +25962,10 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
       setIndicator
     );
   }
-  perfLogger.logStopParseSourceFile();
+  (_c = perfLogger) == null ? void 0 : _c.logStopParseSourceFile();
   mark("afterParse");
   measure("Parse", "beforeParse", "afterParse");
-  (_b = tracing) == null ? void 0 : _b.pop();
+  (_d = tracing) == null ? void 0 : _d.pop();
   return result;
 }
 function parseIsolatedEntityName(text, languageVersion) {
@@ -37167,6 +37148,7 @@ function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanoni
   );
 }
 function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+  var _a2, _b, _c;
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   if (redirectedReference) {
     compilerOptions = redirectedReference.commandLine.options;
@@ -37208,10 +37190,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
       }
     }
-    perfLogger.logStartResolveModule(
-      moduleName
-      /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-    );
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
     switch (moduleResolution) {
       case 3 /* Node16 */:
         result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -37232,8 +37211,8 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
     }
     if (result && result.resolvedModule)
-      perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-    perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+      (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+    (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
     cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
     if (!isExternalModuleNameRelative(moduleName)) {
       cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
@@ -38884,10 +38863,11 @@ function initFlowNode(node) {
 }
 var binder = /* @__PURE__ */ createBinder();
 function bindSourceFile(file, options) {
+  var _a2, _b;
   mark("beforeBind");
-  perfLogger.logStartBindFile("" + file.fileName);
+  (_a2 = perfLogger) == null ? void 0 : _a2.logStartBindFile("" + file.fileName);
   binder(file, options);
-  perfLogger.logStopBindFile();
+  (_b = perfLogger) == null ? void 0 : _b.logStopBindFile();
   mark("afterBind");
   measure("Bind", "beforeBind", "afterBind");
 }
@@ -46006,7 +45986,7 @@ function createTypeChecker(host) {
             /*skipObjectFunctionPropertyAugment*/
             true
           ) || isEsmCjsRef) {
-            const moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
+            const moduleType = type.flags & 3670016 /* StructuredType */ ? getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference) : createDefaultPropertyWrapperForModule(symbol, symbol.parent);
             return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
           }
         }
@@ -55741,7 +55721,7 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
           addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
         } else if (isTupleType(type)) {
           const elements = getTypeArguments(type);
@@ -66616,13 +66596,17 @@ function createTypeChecker(host) {
       type,
       (t) => {
         var _a2;
-        if (isGenericMappedType(t) && !t.declaration.nameType) {
-          const constraint = getConstraintTypeFromMappedType(t);
-          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-            return substituteIndexedMappedType(t, propertyNameType);
-          }
+        if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
+          const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
+            const mappedType = t2;
+            const constraint = getConstraintTypeFromMappedType(mappedType);
+            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+              return substituteIndexedMappedType(mappedType, propertyNameType);
+            }
+          });
+          return newTypes.length ? getIntersectionType(newTypes) : void 0;
         } else if (t.flags & 3670016 /* StructuredType */) {
           const prop = getPropertyOfType(t, name);
           if (prop) {
@@ -119751,21 +119735,22 @@ function createWatchProgram(host) {
     updateProgram();
   }
   function updateProgram() {
+    var _a2, _b, _c, _d;
     switch (reloadLevel) {
       case 1 /* Partial */:
-        perfLogger.logStartUpdateProgram("PartialConfigReload");
+        (_a2 = perfLogger) == null ? void 0 : _a2.logStartUpdateProgram("PartialConfigReload");
         reloadFileNamesFromConfigFile();
         break;
       case 2 /* Full */:
-        perfLogger.logStartUpdateProgram("FullConfigReload");
+        (_b = perfLogger) == null ? void 0 : _b.logStartUpdateProgram("FullConfigReload");
         reloadConfigFile();
         break;
       default:
-        perfLogger.logStartUpdateProgram("SynchronizeProgram");
+        (_c = perfLogger) == null ? void 0 : _c.logStartUpdateProgram("SynchronizeProgram");
         synchronizeProgram();
         break;
     }
-    perfLogger.logStopUpdateProgram("Done");
+    (_d = perfLogger) == null ? void 0 : _d.logStopUpdateProgram("Done");
     return getCurrentBuilderProgram();
   }
   function reloadFileNamesFromConfigFile() {

package/lib/tsserver.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230315`;
+var version = `${versionMajorMinor}.0-insiders.20230316`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -5303,28 +5303,6 @@ function tryGetNativePerformanceHooks() {
 var timestamp = nativePerformance ? () => nativePerformance.now() : Date.now ? Date.now : () => +/* @__PURE__ */ new Date();
 
 // src/compiler/perfLogger.ts
-var nullLogger = {
-  logEvent: noop,
-  logErrEvent: noop,
-  logPerfEvent: noop,
-  logInfoEvent: noop,
-  logStartCommand: noop,
-  logStopCommand: noop,
-  logStartUpdateProgram: noop,
-  logStopUpdateProgram: noop,
-  logStartUpdateGraph: noop,
-  logStopUpdateGraph: noop,
-  logStartResolveModule: noop,
-  logStopResolveModule: noop,
-  logStartParseSourceFile: noop,
-  logStopParseSourceFile: noop,
-  logStartReadFile: noop,
-  logStopReadFile: noop,
-  logStartBindFile: noop,
-  logStopBindFile: noop,
-  logStartScheduledOperation: noop,
-  logStopScheduledOperation: noop
-};
 var etwModule;
 var _a;
 try {
@@ -5333,7 +5311,7 @@ try {
 } catch (e) {
   etwModule = void 0;
 }
-var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
 
 // src/compiler/_namespaces/ts.performance.ts
 var ts_performance_exports = {};
@@ -8614,13 +8592,15 @@ var sys = (() => {
       return buffer.toString("utf8");
     }
     function readFile(fileName, _encoding) {
-      perfLogger.logStartReadFile(fileName);
+      var _a2, _b;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
       const file = readFileWorker(fileName, _encoding);
-      perfLogger.logStopReadFile();
+      (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
       return file;
     }
     function writeFile2(fileName, data, writeByteOrderMark) {
-      perfLogger.logEvent("WriteFile: " + fileName);
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
       if (writeByteOrderMark) {
         data = byteOrderMarkIndicator + data;
       }
@@ -8641,7 +8621,8 @@ var sys = (() => {
       }
     }
     function getAccessibleFileSystemEntries(path) {
-      perfLogger.logEvent("ReadDir: " + (path || "."));
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path || "."));
       try {
         const entries = _fs.readdirSync(path || ".", { withFileTypes: true });
         const files = [];
@@ -30259,7 +30240,7 @@ function setExternalModuleIndicator(sourceFile) {
   sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
 }
 function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind) {
-  var _a2, _b;
+  var _a2, _b, _c, _d;
   (_a2 = tracing) == null ? void 0 : _a2.push(
     tracing.Phase.Parse,
     "createSourceFile",
@@ -30269,7 +30250,7 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
   );
   mark("beforeParse");
   let result;
-  perfLogger.logStartParseSourceFile(fileName);
+  (_b = perfLogger) == null ? void 0 : _b.logStartParseSourceFile(fileName);
   const {
     languageVersion,
     setExternalModuleIndicator: overrideSetExternalModuleIndicator,
@@ -30302,10 +30283,10 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
       setIndicator
     );
   }
-  perfLogger.logStopParseSourceFile();
+  (_c = perfLogger) == null ? void 0 : _c.logStopParseSourceFile();
   mark("afterParse");
   measure("Parse", "beforeParse", "afterParse");
-  (_b = tracing) == null ? void 0 : _b.pop();
+  (_d = tracing) == null ? void 0 : _d.pop();
   return result;
 }
 function parseIsolatedEntityName(text, languageVersion) {
@@ -41596,6 +41577,7 @@ function resolveModuleNameFromCache(moduleName, containingFile, cache, mode) {
   );
 }
 function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+  var _a2, _b, _c;
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   if (redirectedReference) {
     compilerOptions = redirectedReference.commandLine.options;
@@ -41637,10 +41619,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
       }
     }
-    perfLogger.logStartResolveModule(
-      moduleName
-      /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-    );
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
     switch (moduleResolution) {
       case 3 /* Node16 */:
         result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -41661,8 +41640,8 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
     }
     if (result && result.resolvedModule)
-      perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-    perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+      (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+    (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
     cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
     if (!isExternalModuleNameRelative(moduleName)) {
       cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
@@ -43433,10 +43412,11 @@ function initFlowNode(node) {
 }
 var binder = /* @__PURE__ */ createBinder();
 function bindSourceFile(file, options) {
+  var _a2, _b;
   mark("beforeBind");
-  perfLogger.logStartBindFile("" + file.fileName);
+  (_a2 = perfLogger) == null ? void 0 : _a2.logStartBindFile("" + file.fileName);
   binder(file, options);
-  perfLogger.logStopBindFile();
+  (_b = perfLogger) == null ? void 0 : _b.logStopBindFile();
   mark("afterBind");
   measure("Bind", "beforeBind", "afterBind");
 }
@@ -50603,7 +50583,7 @@ function createTypeChecker(host) {
             /*skipObjectFunctionPropertyAugment*/
             true
           ) || isEsmCjsRef) {
-            const moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
+            const moduleType = type.flags & 3670016 /* StructuredType */ ? getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference) : createDefaultPropertyWrapperForModule(symbol, symbol.parent);
             return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
           }
         }
@@ -60338,7 +60318,7 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
           addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
         } else if (isTupleType(type)) {
           const elements = getTypeArguments(type);
@@ -71213,13 +71193,17 @@ function createTypeChecker(host) {
       type,
       (t) => {
         var _a2;
-        if (isGenericMappedType(t) && !t.declaration.nameType) {
-          const constraint = getConstraintTypeFromMappedType(t);
-          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-            return substituteIndexedMappedType(t, propertyNameType);
-          }
+        if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
+          const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
+            const mappedType = t2;
+            const constraint = getConstraintTypeFromMappedType(mappedType);
+            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+              return substituteIndexedMappedType(mappedType, propertyNameType);
+            }
+          });
+          return newTypes.length ? getIntersectionType(newTypes) : void 0;
         } else if (t.flags & 3670016 /* StructuredType */) {
           const prop = getPropertyOfType(t, name);
           if (prop) {
@@ -124641,21 +124625,22 @@ function createWatchProgram(host) {
     updateProgram();
   }
   function updateProgram() {
+    var _a2, _b, _c, _d;
     switch (reloadLevel) {
       case 1 /* Partial */:
-        perfLogger.logStartUpdateProgram("PartialConfigReload");
+        (_a2 = perfLogger) == null ? void 0 : _a2.logStartUpdateProgram("PartialConfigReload");
         reloadFileNamesFromConfigFile();
         break;
       case 2 /* Full */:
-        perfLogger.logStartUpdateProgram("FullConfigReload");
+        (_b = perfLogger) == null ? void 0 : _b.logStartUpdateProgram("FullConfigReload");
         reloadConfigFile();
         break;
       default:
-        perfLogger.logStartUpdateProgram("SynchronizeProgram");
+        (_c = perfLogger) == null ? void 0 : _c.logStartUpdateProgram("SynchronizeProgram");
         synchronizeProgram();
         break;
     }
-    perfLogger.logStopUpdateProgram("Done");
+    (_d = perfLogger) == null ? void 0 : _d.logStopUpdateProgram("Done");
     return getCurrentBuilderProgram();
   }
   function reloadFileNamesFromConfigFile() {
@@ -170641,13 +170626,14 @@ var ThrottledOperations = class {
     return this.pendingTimeouts.delete(operationId);
   }
   static run(self, operationId, cb) {
-    perfLogger.logStartScheduledOperation(operationId);
+    var _a2, _b;
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation(operationId);
     self.pendingTimeouts.delete(operationId);
     if (self.logger) {
       self.logger.info(`Running: ${operationId}`);
     }
     cb();
-    perfLogger.logStopScheduledOperation();
+    (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
   }
 };
 var GcTimer = class {
@@ -170663,8 +170649,9 @@ var GcTimer = class {
     this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
   }
   static run(self) {
+    var _a2, _b;
     self.timerId = void 0;
-    perfLogger.logStartScheduledOperation("GC collect");
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation("GC collect");
     const log = self.logger.hasLevel(2 /* requestTime */);
     const before = log && self.host.getMemoryUsage();
     self.host.gc();
@@ -170672,7 +170659,7 @@ var GcTimer = class {
       const after = self.host.getMemoryUsage();
       self.logger.perftrc(`GC::before ${before}, after ${after}`);
     }
-    perfLogger.logStopScheduledOperation();
+    (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
   }
 };
 function getBaseConfigFileName(configFilePath) {
@@ -172377,9 +172364,9 @@ var Project3 = class {
    * @returns: true if set of files in the project stays the same and false - otherwise.
    */
   updateGraph() {
-    var _a2, _b, _c;
+    var _a2, _b, _c, _d, _e;
     (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.Session, "updateGraph", { name: this.projectName, kind: ProjectKind[this.projectKind] });
-    perfLogger.logStartUpdateGraph();
+    (_b = perfLogger) == null ? void 0 : _b.logStartUpdateGraph();
     this.resolutionCache.startRecordingFilesWithChangedResolutions();
     const hasNewProgram = this.updateGraphWorker();
     const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
@@ -172404,13 +172391,13 @@ var Project3 = class {
     if (hasAddedorRemovedFiles) {
       if (!this.autoImportProviderHost)
         this.autoImportProviderHost = void 0;
-      (_b = this.autoImportProviderHost) == null ? void 0 : _b.markAsDirty();
+      (_c = this.autoImportProviderHost) == null ? void 0 : _c.markAsDirty();
     }
     if (isFirstProgramLoad) {
       this.getPackageJsonAutoImportProvider();
     }
-    perfLogger.logStopUpdateGraph();
-    (_c = tracing) == null ? void 0 : _c.pop();
+    (_d = perfLogger) == null ? void 0 : _d.logStopUpdateGraph();
+    (_e = tracing) == null ? void 0 : _e.pop();
     return !hasNewProgram;
   }
   /** @internal */
@@ -178528,8 +178515,9 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     this.writeMessage(msg);
   }
   writeMessage(msg) {
+    var _a2;
     const msgText = formatMessage2(msg, this.logger, this.byteLength, this.host.newLine);
-    perfLogger.logEvent(`Response message size: ${msgText.length}`);
+    (_a2 = perfLogger) == null ? void 0 : _a2.logEvent(`Response message size: ${msgText.length}`);
     this.host.write(msgText);
   }
   event(body, eventName) {
@@ -180297,7 +180285,7 @@ ${e.message}`;
     }
   }
   onMessage(message) {
-    var _a2, _b, _c, _d, _e, _f, _g;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     this.gcTimer.scheduleCollect();
     this.performanceData = void 0;
     let start2;
@@ -180313,8 +180301,8 @@ ${e.message}`;
       request = this.parseMessage(message);
       relevantFile = request.arguments && request.arguments.file ? request.arguments : void 0;
       (_a2 = tracing) == null ? void 0 : _a2.instant(tracing.Phase.Session, "request", { seq: request.seq, command: request.command });
-      perfLogger.logStartCommand("" + request.command, this.toStringMessage(message).substring(0, 100));
-      (_b = tracing) == null ? void 0 : _b.push(
+      (_b = perfLogger) == null ? void 0 : _b.logStartCommand("" + request.command, this.toStringMessage(message).substring(0, 100));
+      (_c = tracing) == null ? void 0 : _c.push(
         tracing.Phase.Session,
         "executeCommand",
         { seq: request.seq, command: request.command },
@@ -180322,7 +180310,7 @@ ${e.message}`;
         true
       );
       const { response, responseRequired } = this.executeCommand(request);
-      (_c = tracing) == null ? void 0 : _c.pop();
+      (_d = tracing) == null ? void 0 : _d.pop();
       if (this.logger.hasLevel(2 /* requestTime */)) {
         const elapsedTime = hrTimeToMilliseconds(this.hrtime(start2)).toFixed(4);
         if (responseRequired) {
@@ -180331,8 +180319,8 @@ ${e.message}`;
           this.logger.perftrc(`${request.seq}::${request.command}: async elapsed time (in milliseconds) ${elapsedTime}`);
         }
       }
-      perfLogger.logStopCommand("" + request.command, "Success");
-      (_d = tracing) == null ? void 0 : _d.instant(tracing.Phase.Session, "response", { seq: request.seq, command: request.command, success: !!response });
+      (_e = perfLogger) == null ? void 0 : _e.logStopCommand("" + request.command, "Success");
+      (_f = tracing) == null ? void 0 : _f.instant(tracing.Phase.Session, "response", { seq: request.seq, command: request.command, success: !!response });
       if (response) {
         this.doOutput(
           response,
@@ -180353,10 +180341,10 @@ ${e.message}`;
         );
       }
     } catch (err) {
-      (_e = tracing) == null ? void 0 : _e.popAll();
+      (_g = tracing) == null ? void 0 : _g.popAll();
       if (err instanceof OperationCanceledException) {
-        perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
-        (_f = tracing) == null ? void 0 : _f.instant(tracing.Phase.Session, "commandCanceled", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command });
+        (_h = perfLogger) == null ? void 0 : _h.logStopCommand("" + (request && request.command), "Canceled: " + err);
+        (_i = tracing) == null ? void 0 : _i.instant(tracing.Phase.Session, "commandCanceled", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command });
         this.doOutput(
           { canceled: true },
           request.command,
@@ -180367,8 +180355,8 @@ ${e.message}`;
         return;
       }
       this.logErrorWorker(err, this.toStringMessage(message), relevantFile);
-      perfLogger.logStopCommand("" + (request && request.command), "Error: " + err);
-      (_g = tracing) == null ? void 0 : _g.instant(tracing.Phase.Session, "commandError", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command, message: err.message });
+      (_j = perfLogger) == null ? void 0 : _j.logStopCommand("" + (request && request.command), "Error: " + err);
+      (_k = tracing) == null ? void 0 : _k.instant(tracing.Phase.Session, "commandError", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command, message: err.message });
       this.doOutput(
         /*info*/
         void 0,
@@ -181369,15 +181357,16 @@ function initializeNodeSystem() {
       return this.loggingEnabled() && this.level >= level;
     }
     msg(s, type = "Err" /* Err */) {
+      var _a2, _b, _c;
       switch (type) {
         case "Info" /* Info */:
-          perfLogger.logInfoEvent(s);
+          (_a2 = perfLogger) == null ? void 0 : _a2.logInfoEvent(s);
           break;
         case "Perf" /* Perf */:
-          perfLogger.logPerfEvent(s);
+          (_b = perfLogger) == null ? void 0 : _b.logPerfEvent(s);
           break;
         default:
-          perfLogger.logErrEvent(s);
+          (_c = perfLogger) == null ? void 0 : _c.logErrEvent(s);
           break;
       }
       if (!this.canWrite())

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230315`;
+      version = `${versionMajorMinor}.0-insiders.20230316`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3081,40 +3081,17 @@ ${lanes.join("\n")}
   });
 
   // src/compiler/perfLogger.ts
-  var nullLogger, etwModule, _a, perfLogger;
+  var etwModule, _a, perfLogger;
   var init_perfLogger = __esm({
     "src/compiler/perfLogger.ts"() {
       "use strict";
-      init_ts2();
-      nullLogger = {
-        logEvent: noop,
-        logErrEvent: noop,
-        logPerfEvent: noop,
-        logInfoEvent: noop,
-        logStartCommand: noop,
-        logStopCommand: noop,
-        logStartUpdateProgram: noop,
-        logStopUpdateProgram: noop,
-        logStartUpdateGraph: noop,
-        logStopUpdateGraph: noop,
-        logStartResolveModule: noop,
-        logStopResolveModule: noop,
-        logStartParseSourceFile: noop,
-        logStopParseSourceFile: noop,
-        logStartReadFile: noop,
-        logStopReadFile: noop,
-        logStartBindFile: noop,
-        logStopBindFile: noop,
-        logStartScheduledOperation: noop,
-        logStopScheduledOperation: noop
-      };
       try {
         const etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) != null ? _a : "./node_modules/@microsoft/typescript-etw";
         etwModule =   require(etwModulePath);
       } catch (e) {
         etwModule = void 0;
       }
-      perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+      perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
     }
   });
 
@@ -6428,13 +6405,15 @@ ${lanes.join("\n")}
             return buffer.toString("utf8");
           }
           function readFile(fileName, _encoding) {
-            perfLogger.logStartReadFile(fileName);
+            var _a2, _b;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
             const file = readFileWorker(fileName, _encoding);
-            perfLogger.logStopReadFile();
+            (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
             return file;
           }
           function writeFile2(fileName, data, writeByteOrderMark) {
-            perfLogger.logEvent("WriteFile: " + fileName);
+            var _a2;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
             if (writeByteOrderMark) {
               data = byteOrderMarkIndicator + data;
             }
@@ -6455,7 +6434,8 @@ ${lanes.join("\n")}
             }
           }
           function getAccessibleFileSystemEntries(path) {
-            perfLogger.logEvent("ReadDir: " + (path || "."));
+            var _a2;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path || "."));
             try {
               const entries = _fs.readdirSync(path || ".", { withFileTypes: true });
               const files = [];
@@ -27727,7 +27707,7 @@ ${lanes.join("\n")}
     sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
   }
   function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind) {
-    var _a2, _b;
+    var _a2, _b, _c, _d;
     (_a2 = tracing) == null ? void 0 : _a2.push(
       tracing.Phase.Parse,
       "createSourceFile",
@@ -27737,7 +27717,7 @@ ${lanes.join("\n")}
     );
     mark("beforeParse");
     let result;
-    perfLogger.logStartParseSourceFile(fileName);
+    (_b = perfLogger) == null ? void 0 : _b.logStartParseSourceFile(fileName);
     const {
       languageVersion,
       setExternalModuleIndicator: overrideSetExternalModuleIndicator,
@@ -27770,10 +27750,10 @@ ${lanes.join("\n")}
         setIndicator
       );
     }
-    perfLogger.logStopParseSourceFile();
+    (_c = perfLogger) == null ? void 0 : _c.logStopParseSourceFile();
     mark("afterParse");
     measure("Parse", "beforeParse", "afterParse");
-    (_b = tracing) == null ? void 0 : _b.pop();
+    (_d = tracing) == null ? void 0 : _d.pop();
     return result;
   }
   function parseIsolatedEntityName(text, languageVersion) {
@@ -39498,6 +39478,7 @@ ${lanes.join("\n")}
     );
   }
   function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+    var _a2, _b, _c;
     const traceEnabled = isTraceEnabled(compilerOptions, host);
     if (redirectedReference) {
       compilerOptions = redirectedReference.commandLine.options;
@@ -39539,10 +39520,7 @@ ${lanes.join("\n")}
           trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
         }
       }
-      perfLogger.logStartResolveModule(
-        moduleName
-        /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-      );
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
       switch (moduleResolution) {
         case 3 /* Node16 */:
           result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -39563,8 +39541,8 @@ ${lanes.join("\n")}
           return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
       }
       if (result && result.resolvedModule)
-        perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-      perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+        (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+      (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
       cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
       if (!isExternalModuleNameRelative(moduleName)) {
         cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
@@ -41336,10 +41314,11 @@ ${lanes.join("\n")}
     return node;
   }
   function bindSourceFile(file, options) {
+    var _a2, _b;
     mark("beforeBind");
-    perfLogger.logStartBindFile("" + file.fileName);
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartBindFile("" + file.fileName);
     binder(file, options);
-    perfLogger.logStopBindFile();
+    (_b = perfLogger) == null ? void 0 : _b.logStopBindFile();
     mark("afterBind");
     measure("Bind", "beforeBind", "afterBind");
   }
@@ -48414,7 +48393,7 @@ ${lanes.join("\n")}
               /*skipObjectFunctionPropertyAugment*/
               true
             ) || isEsmCjsRef) {
-              const moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
+              const moduleType = type.flags & 3670016 /* StructuredType */ ? getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference) : createDefaultPropertyWrapperForModule(symbol, symbol.parent);
               return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
             }
           }
@@ -58149,7 +58128,7 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
             addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
           } else if (isTupleType(type)) {
             const elements = getTypeArguments(type);
@@ -69024,13 +69003,17 @@ ${lanes.join("\n")}
         type,
         (t) => {
           var _a2;
-          if (isGenericMappedType(t) && !t.declaration.nameType) {
-            const constraint = getConstraintTypeFromMappedType(t);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(t, propertyNameType);
-            }
+          if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
+            const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
+              const mappedType = t2;
+              const constraint = getConstraintTypeFromMappedType(mappedType);
+              const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+              const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+              if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                return substituteIndexedMappedType(mappedType, propertyNameType);
+              }
+            });
+            return newTypes.length ? getIntersectionType(newTypes) : void 0;
           } else if (t.flags & 3670016 /* StructuredType */) {
             const prop = getPropertyOfType(t, name);
             if (prop) {
@@ -122832,21 +122815,22 @@ ${lanes.join("\n")}
       updateProgram();
     }
     function updateProgram() {
+      var _a2, _b, _c, _d;
       switch (reloadLevel) {
         case 1 /* Partial */:
-          perfLogger.logStartUpdateProgram("PartialConfigReload");
+          (_a2 = perfLogger) == null ? void 0 : _a2.logStartUpdateProgram("PartialConfigReload");
           reloadFileNamesFromConfigFile();
           break;
         case 2 /* Full */:
-          perfLogger.logStartUpdateProgram("FullConfigReload");
+          (_b = perfLogger) == null ? void 0 : _b.logStartUpdateProgram("FullConfigReload");
           reloadConfigFile();
           break;
         default:
-          perfLogger.logStartUpdateProgram("SynchronizeProgram");
+          (_c = perfLogger) == null ? void 0 : _c.logStartUpdateProgram("SynchronizeProgram");
           synchronizeProgram();
           break;
       }
-      perfLogger.logStopUpdateProgram("Done");
+      (_d = perfLogger) == null ? void 0 : _d.logStopUpdateProgram("Done");
       return getCurrentBuilderProgram();
     }
     function reloadFileNamesFromConfigFile() {
@@ -167965,13 +167949,14 @@ ${options.prefix}` : "\n" : options.prefix
           return this.pendingTimeouts.delete(operationId);
         }
         static run(self, operationId, cb) {
-          perfLogger.logStartScheduledOperation(operationId);
+          var _a2, _b;
+          (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation(operationId);
           self.pendingTimeouts.delete(operationId);
           if (self.logger) {
             self.logger.info(`Running: ${operationId}`);
           }
           cb();
-          perfLogger.logStopScheduledOperation();
+          (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
         }
       };
       GcTimer = class {
@@ -167987,8 +167972,9 @@ ${options.prefix}` : "\n" : options.prefix
           this.timerId = this.host.setTimeout(GcTimer.run, this.delay, this);
         }
         static run(self) {
+          var _a2, _b;
           self.timerId = void 0;
-          perfLogger.logStartScheduledOperation("GC collect");
+          (_a2 = perfLogger) == null ? void 0 : _a2.logStartScheduledOperation("GC collect");
           const log = self.logger.hasLevel(2 /* requestTime */);
           const before = log && self.host.getMemoryUsage();
           self.host.gc();
@@ -167996,7 +167982,7 @@ ${options.prefix}` : "\n" : options.prefix
             const after = self.host.getMemoryUsage();
             self.logger.perftrc(`GC::before ${before}, after ${after}`);
           }
-          perfLogger.logStopScheduledOperation();
+          (_b = perfLogger) == null ? void 0 : _b.logStopScheduledOperation();
         }
       };
       indentStr = "\n    ";
@@ -169746,9 +169732,9 @@ ${options.prefix}` : "\n" : options.prefix
          * @returns: true if set of files in the project stays the same and false - otherwise.
          */
         updateGraph() {
-          var _a2, _b, _c;
+          var _a2, _b, _c, _d, _e;
           (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.Session, "updateGraph", { name: this.projectName, kind: ProjectKind[this.projectKind] });
-          perfLogger.logStartUpdateGraph();
+          (_b = perfLogger) == null ? void 0 : _b.logStartUpdateGraph();
           this.resolutionCache.startRecordingFilesWithChangedResolutions();
           const hasNewProgram = this.updateGraphWorker();
           const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
@@ -169773,13 +169759,13 @@ ${options.prefix}` : "\n" : options.prefix
           if (hasAddedorRemovedFiles) {
             if (!this.autoImportProviderHost)
               this.autoImportProviderHost = void 0;
-            (_b = this.autoImportProviderHost) == null ? void 0 : _b.markAsDirty();
+            (_c = this.autoImportProviderHost) == null ? void 0 : _c.markAsDirty();
           }
           if (isFirstProgramLoad) {
             this.getPackageJsonAutoImportProvider();
           }
-          perfLogger.logStopUpdateGraph();
-          (_c = tracing) == null ? void 0 : _c.pop();
+          (_d = perfLogger) == null ? void 0 : _d.logStopUpdateGraph();
+          (_e = tracing) == null ? void 0 : _e.pop();
           return !hasNewProgram;
         }
         /** @internal */
@@ -175957,8 +175943,9 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           this.writeMessage(msg);
         }
         writeMessage(msg) {
+          var _a2;
           const msgText = formatMessage2(msg, this.logger, this.byteLength, this.host.newLine);
-          perfLogger.logEvent(`Response message size: ${msgText.length}`);
+          (_a2 = perfLogger) == null ? void 0 : _a2.logEvent(`Response message size: ${msgText.length}`);
           this.host.write(msgText);
         }
         event(body, eventName) {
@@ -177726,7 +177713,7 @@ ${e.message}`;
           }
         }
         onMessage(message) {
-          var _a2, _b, _c, _d, _e, _f, _g;
+          var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           this.gcTimer.scheduleCollect();
           this.performanceData = void 0;
           let start;
@@ -177742,8 +177729,8 @@ ${e.message}`;
             request = this.parseMessage(message);
             relevantFile = request.arguments && request.arguments.file ? request.arguments : void 0;
             (_a2 = tracing) == null ? void 0 : _a2.instant(tracing.Phase.Session, "request", { seq: request.seq, command: request.command });
-            perfLogger.logStartCommand("" + request.command, this.toStringMessage(message).substring(0, 100));
-            (_b = tracing) == null ? void 0 : _b.push(
+            (_b = perfLogger) == null ? void 0 : _b.logStartCommand("" + request.command, this.toStringMessage(message).substring(0, 100));
+            (_c = tracing) == null ? void 0 : _c.push(
               tracing.Phase.Session,
               "executeCommand",
               { seq: request.seq, command: request.command },
@@ -177751,7 +177738,7 @@ ${e.message}`;
               true
             );
             const { response, responseRequired } = this.executeCommand(request);
-            (_c = tracing) == null ? void 0 : _c.pop();
+            (_d = tracing) == null ? void 0 : _d.pop();
             if (this.logger.hasLevel(2 /* requestTime */)) {
               const elapsedTime = hrTimeToMilliseconds(this.hrtime(start)).toFixed(4);
               if (responseRequired) {
@@ -177760,8 +177747,8 @@ ${e.message}`;
                 this.logger.perftrc(`${request.seq}::${request.command}: async elapsed time (in milliseconds) ${elapsedTime}`);
               }
             }
-            perfLogger.logStopCommand("" + request.command, "Success");
-            (_d = tracing) == null ? void 0 : _d.instant(tracing.Phase.Session, "response", { seq: request.seq, command: request.command, success: !!response });
+            (_e = perfLogger) == null ? void 0 : _e.logStopCommand("" + request.command, "Success");
+            (_f = tracing) == null ? void 0 : _f.instant(tracing.Phase.Session, "response", { seq: request.seq, command: request.command, success: !!response });
             if (response) {
               this.doOutput(
                 response,
@@ -177782,10 +177769,10 @@ ${e.message}`;
               );
             }
           } catch (err) {
-            (_e = tracing) == null ? void 0 : _e.popAll();
+            (_g = tracing) == null ? void 0 : _g.popAll();
             if (err instanceof OperationCanceledException) {
-              perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
-              (_f = tracing) == null ? void 0 : _f.instant(tracing.Phase.Session, "commandCanceled", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command });
+              (_h = perfLogger) == null ? void 0 : _h.logStopCommand("" + (request && request.command), "Canceled: " + err);
+              (_i = tracing) == null ? void 0 : _i.instant(tracing.Phase.Session, "commandCanceled", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command });
               this.doOutput(
                 { canceled: true },
                 request.command,
@@ -177796,8 +177783,8 @@ ${e.message}`;
               return;
             }
             this.logErrorWorker(err, this.toStringMessage(message), relevantFile);
-            perfLogger.logStopCommand("" + (request && request.command), "Error: " + err);
-            (_g = tracing) == null ? void 0 : _g.instant(tracing.Phase.Session, "commandError", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command, message: err.message });
+            (_j = perfLogger) == null ? void 0 : _j.logStopCommand("" + (request && request.command), "Error: " + err);
+            (_k = tracing) == null ? void 0 : _k.instant(tracing.Phase.Session, "commandError", { seq: request == null ? void 0 : request.seq, command: request == null ? void 0 : request.command, message: err.message });
             this.doOutput(
               /*info*/
               void 0,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230315`;
+      version = `${versionMajorMinor}.0-insiders.20230316`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3081,40 +3081,17 @@ ${lanes.join("\n")}
   });
 
   // src/compiler/perfLogger.ts
-  var nullLogger, etwModule, _a, perfLogger;
+  var etwModule, _a, perfLogger;
   var init_perfLogger = __esm({
     "src/compiler/perfLogger.ts"() {
       "use strict";
-      init_ts2();
-      nullLogger = {
-        logEvent: noop,
-        logErrEvent: noop,
-        logPerfEvent: noop,
-        logInfoEvent: noop,
-        logStartCommand: noop,
-        logStopCommand: noop,
-        logStartUpdateProgram: noop,
-        logStopUpdateProgram: noop,
-        logStartUpdateGraph: noop,
-        logStopUpdateGraph: noop,
-        logStartResolveModule: noop,
-        logStopResolveModule: noop,
-        logStartParseSourceFile: noop,
-        logStopParseSourceFile: noop,
-        logStartReadFile: noop,
-        logStopReadFile: noop,
-        logStartBindFile: noop,
-        logStopBindFile: noop,
-        logStartScheduledOperation: noop,
-        logStopScheduledOperation: noop
-      };
       try {
         const etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) != null ? _a : "./node_modules/@microsoft/typescript-etw";
         etwModule =   require(etwModulePath);
       } catch (e) {
         etwModule = void 0;
       }
-      perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+      perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
     }
   });
 
@@ -6428,13 +6405,15 @@ ${lanes.join("\n")}
             return buffer.toString("utf8");
           }
           function readFile(fileName, _encoding) {
-            perfLogger.logStartReadFile(fileName);
+            var _a2, _b;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
             const file = readFileWorker(fileName, _encoding);
-            perfLogger.logStopReadFile();
+            (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
             return file;
           }
           function writeFile2(fileName, data, writeByteOrderMark) {
-            perfLogger.logEvent("WriteFile: " + fileName);
+            var _a2;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
             if (writeByteOrderMark) {
               data = byteOrderMarkIndicator + data;
             }
@@ -6455,7 +6434,8 @@ ${lanes.join("\n")}
             }
           }
           function getAccessibleFileSystemEntries(path) {
-            perfLogger.logEvent("ReadDir: " + (path || "."));
+            var _a2;
+            (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path || "."));
             try {
               const entries = _fs.readdirSync(path || ".", { withFileTypes: true });
               const files = [];
@@ -27727,7 +27707,7 @@ ${lanes.join("\n")}
     sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
   }
   function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind) {
-    var _a2, _b;
+    var _a2, _b, _c, _d;
     (_a2 = tracing) == null ? void 0 : _a2.push(
       tracing.Phase.Parse,
       "createSourceFile",
@@ -27737,7 +27717,7 @@ ${lanes.join("\n")}
     );
     mark("beforeParse");
     let result;
-    perfLogger.logStartParseSourceFile(fileName);
+    (_b = perfLogger) == null ? void 0 : _b.logStartParseSourceFile(fileName);
     const {
       languageVersion,
       setExternalModuleIndicator: overrideSetExternalModuleIndicator,
@@ -27770,10 +27750,10 @@ ${lanes.join("\n")}
         setIndicator
       );
     }
-    perfLogger.logStopParseSourceFile();
+    (_c = perfLogger) == null ? void 0 : _c.logStopParseSourceFile();
     mark("afterParse");
     measure("Parse", "beforeParse", "afterParse");
-    (_b = tracing) == null ? void 0 : _b.pop();
+    (_d = tracing) == null ? void 0 : _d.pop();
     return result;
   }
   function parseIsolatedEntityName(text, languageVersion) {
@@ -39498,6 +39478,7 @@ ${lanes.join("\n")}
     );
   }
   function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+    var _a2, _b, _c;
     const traceEnabled = isTraceEnabled(compilerOptions, host);
     if (redirectedReference) {
       compilerOptions = redirectedReference.commandLine.options;
@@ -39539,10 +39520,7 @@ ${lanes.join("\n")}
           trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
         }
       }
-      perfLogger.logStartResolveModule(
-        moduleName
-        /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-      );
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
       switch (moduleResolution) {
         case 3 /* Node16 */:
           result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -39563,8 +39541,8 @@ ${lanes.join("\n")}
           return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
       }
       if (result && result.resolvedModule)
-        perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-      perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+        (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+      (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
       cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
       if (!isExternalModuleNameRelative(moduleName)) {
         cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
@@ -41336,10 +41314,11 @@ ${lanes.join("\n")}
     return node;
   }
   function bindSourceFile(file, options) {
+    var _a2, _b;
     mark("beforeBind");
-    perfLogger.logStartBindFile("" + file.fileName);
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartBindFile("" + file.fileName);
     binder(file, options);
-    perfLogger.logStopBindFile();
+    (_b = perfLogger) == null ? void 0 : _b.logStopBindFile();
     mark("afterBind");
     measure("Bind", "beforeBind", "afterBind");
   }
@@ -48414,7 +48393,7 @@ ${lanes.join("\n")}
               /*skipObjectFunctionPropertyAugment*/
               true
             ) || isEsmCjsRef) {
-              const moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
+              const moduleType = type.flags & 3670016 /* StructuredType */ ? getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference) : createDefaultPropertyWrapperForModule(symbol, symbol.parent);
               return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
             }
           }
@@ -58149,7 +58128,7 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
             addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
           } else if (isTupleType(type)) {
             const elements = getTypeArguments(type);
@@ -69024,13 +69003,17 @@ ${lanes.join("\n")}
         type,
         (t) => {
           var _a2;
-          if (isGenericMappedType(t) && !t.declaration.nameType) {
-            const constraint = getConstraintTypeFromMappedType(t);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(t, propertyNameType);
-            }
+          if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
+            const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
+              const mappedType = t2;
+              const constraint = getConstraintTypeFromMappedType(mappedType);
+              const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+              const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+              if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                return substituteIndexedMappedType(mappedType, propertyNameType);
+              }
+            });
+            return newTypes.length ? getIntersectionType(newTypes) : void 0;
           } else if (t.flags & 3670016 /* StructuredType */) {
             const prop = getPropertyOfType(t, name);
             if (prop) {
@@ -122832,21 +122815,22 @@ ${lanes.join("\n")}
       updateProgram();
     }
     function updateProgram() {
+      var _a2, _b, _c, _d;
       switch (reloadLevel) {
         case 1 /* Partial */:
-          perfLogger.logStartUpdateProgram("PartialConfigReload");
+          (_a2 = perfLogger) == null ? void 0 : _a2.logStartUpdateProgram("PartialConfigReload");
           reloadFileNamesFromConfigFile();
           break;
         case 2 /* Full */:
-          perfLogger.logStartUpdateProgram("FullConfigReload");
+          (_b = perfLogger) == null ? void 0 : _b.logStartUpdateProgram("FullConfigReload");
           reloadConfigFile();
           break;
         default:
-          perfLogger.logStartUpdateProgram("SynchronizeProgram");
+          (_c = perfLogger) == null ? void 0 : _c.logStartUpdateProgram("SynchronizeProgram");
           synchronizeProgram();
           break;
       }
-      perfLogger.logStopUpdateProgram("Done");
+      (_d = perfLogger) == null ? void 0 : _d.logStopUpdateProgram("Done");
       return getCurrentBuilderProgram();
     }
     function reloadFileNamesFromConfigFile() {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230315`;
+var version = `${versionMajorMinor}.0-insiders.20230316`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -2177,28 +2177,6 @@ var nativePerformance = nativePerformanceHooks == null ? void 0 : nativePerforma
 var timestamp = nativePerformance ? () => nativePerformance.now() : Date.now ? Date.now : () => +/* @__PURE__ */ new Date();
 
 // src/compiler/perfLogger.ts
-var nullLogger = {
-  logEvent: noop,
-  logErrEvent: noop,
-  logPerfEvent: noop,
-  logInfoEvent: noop,
-  logStartCommand: noop,
-  logStopCommand: noop,
-  logStartUpdateProgram: noop,
-  logStopUpdateProgram: noop,
-  logStartUpdateGraph: noop,
-  logStopUpdateGraph: noop,
-  logStartResolveModule: noop,
-  logStopResolveModule: noop,
-  logStartParseSourceFile: noop,
-  logStopParseSourceFile: noop,
-  logStartReadFile: noop,
-  logStopReadFile: noop,
-  logStartBindFile: noop,
-  logStopBindFile: noop,
-  logStartScheduledOperation: noop,
-  logStopScheduledOperation: noop
-};
 var etwModule;
 var _a;
 try {
@@ -2207,7 +2185,7 @@ try {
 } catch (e) {
   etwModule = void 0;
 }
-var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : nullLogger;
+var perfLogger = (etwModule == null ? void 0 : etwModule.logEvent) ? etwModule : void 0;
 
 // src/compiler/performance.ts
 var performanceImpl;
@@ -4556,13 +4534,15 @@ var sys = (() => {
       return buffer.toString("utf8");
     }
     function readFile(fileName, _encoding) {
-      perfLogger.logStartReadFile(fileName);
+      var _a2, _b;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logStartReadFile(fileName);
       const file = readFileWorker(fileName, _encoding);
-      perfLogger.logStopReadFile();
+      (_b = perfLogger) == null ? void 0 : _b.logStopReadFile();
       return file;
     }
     function writeFile2(fileName, data, writeByteOrderMark) {
-      perfLogger.logEvent("WriteFile: " + fileName);
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("WriteFile: " + fileName);
       if (writeByteOrderMark) {
         data = byteOrderMarkIndicator + data;
       }
@@ -4583,7 +4563,8 @@ var sys = (() => {
       }
     }
     function getAccessibleFileSystemEntries(path2) {
-      perfLogger.logEvent("ReadDir: " + (path2 || "."));
+      var _a2;
+      (_a2 = perfLogger) == null ? void 0 : _a2.logEvent("ReadDir: " + (path2 || "."));
       try {
         const entries = _fs.readdirSync(path2 || ".", { withFileTypes: true });
         const files = [];
@@ -27361,6 +27342,7 @@ function getConditions(options, esmMode) {
   return concatenate(conditions, options.customConditions);
 }
 function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+  var _a2, _b, _c;
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   if (redirectedReference) {
     compilerOptions = redirectedReference.commandLine.options;
@@ -27402,10 +27384,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]);
       }
     }
-    perfLogger.logStartResolveModule(
-      moduleName
-      /* , containingFile, ModuleResolutionKind[moduleResolution]*/
-    );
+    (_a2 = perfLogger) == null ? void 0 : _a2.logStartResolveModule(moduleName);
     switch (moduleResolution) {
       case 3 /* Node16 */:
         result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -27426,8 +27405,8 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
     }
     if (result && result.resolvedModule)
-      perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-    perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
+      (_b = perfLogger) == null ? void 0 : _b.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+    (_c = perfLogger) == null ? void 0 : _c.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
     cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
     if (!isExternalModuleNameRelative(moduleName)) {
       cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53268-4",
+  "version": "5.1.0-pr-52062-4",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "2beae62ff61bf7a01490690d001dc20434fb14bd"
+  "gitHead": "fec434c9c2e6e099b6887aa0986abf354b0c05c5"
 }