typescript 5.0.0-dev.20221205 → 5.0.0-dev.20221207

package/lib/typingsInstaller.js

@@ -50,7 +50,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20221205`;
+var version = `${versionMajorMinor}.0-dev.20221207`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1310,22 +1310,8 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
   function enableDebugInfo() {
     if (isDebugInfoEnabled)
       return;
-    let weakTypeTextMap;
-    let weakNodeTextMap;
-    function getWeakTypeTextMap() {
-      if (weakTypeTextMap === void 0) {
-        if (typeof WeakMap === "function")
-          weakTypeTextMap = /* @__PURE__ */ new WeakMap();
-      }
-      return weakTypeTextMap;
-    }
-    function getWeakNodeTextMap() {
-      if (weakNodeTextMap === void 0) {
-        if (typeof WeakMap === "function")
-          weakNodeTextMap = /* @__PURE__ */ new WeakMap();
-      }
-      return weakNodeTextMap;
-    }
+    const weakTypeTextMap = /* @__PURE__ */ new WeakMap();
+    const weakNodeTextMap = /* @__PURE__ */ new WeakMap();
     Object.defineProperties(objectAllocator.getSymbolConstructor().prototype, {
       __tsDebuggerDisplay: {
         value() {
@@ -1354,11 +1340,10 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
       } },
       __debugTypeToString: {
         value() {
-          const map2 = getWeakTypeTextMap();
-          let text = map2 == null ? void 0 : map2.get(this);
+          let text = weakTypeTextMap.get(this);
           if (text === void 0) {
             text = this.checker.typeToString(this);
-            map2 == null ? void 0 : map2.set(this, text);
+            weakTypeTextMap.set(this, text);
           }
           return text;
         }
@@ -1410,13 +1395,12 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
             value(includeTrivia) {
               if (nodeIsSynthesized(this))
                 return "";
-              const map2 = getWeakNodeTextMap();
-              let text = map2 == null ? void 0 : map2.get(this);
+              let text = weakNodeTextMap.get(this);
               if (text === void 0) {
                 const parseNode = getParseTreeNode(this);
                 const sourceFile = parseNode && getSourceFileOfNode(parseNode);
                 text = sourceFile ? getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                map2 == null ? void 0 : map2.set(this, text);
+                weakNodeTextMap.set(this, text);
               }
               return text;
             }
@@ -25757,17 +25741,29 @@ function formatExtensions(extensions) {
 }
 function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache) {
   if (resultFromCache) {
-    resultFromCache.failedLookupLocations.push(...failedLookupLocations);
-    resultFromCache.affectingLocations.push(...affectingLocations);
+    resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
+    resultFromCache.affectingLocations = updateResolutionField(resultFromCache.affectingLocations, affectingLocations);
+    resultFromCache.resolutionDiagnostics = updateResolutionField(resultFromCache.resolutionDiagnostics, diagnostics);
     return resultFromCache;
   }
   return {
     resolvedModule: resolved && { resolvedFileName: resolved.path, originalPath: resolved.originalPath === true ? void 0 : resolved.originalPath, extension: resolved.extension, isExternalLibraryImport, packageId: resolved.packageId },
-    failedLookupLocations,
-    affectingLocations,
-    resolutionDiagnostics: diagnostics
+    failedLookupLocations: initializeResolutionField(failedLookupLocations),
+    affectingLocations: initializeResolutionField(affectingLocations),
+    resolutionDiagnostics: initializeResolutionField(diagnostics)
   };
 }
+function initializeResolutionField(value) {
+  return value.length ? value : void 0;
+}
+function updateResolutionField(to, value) {
+  if (!(value == null ? void 0 : value.length))
+    return to;
+  if (!(to == null ? void 0 : to.length))
+    return value;
+  to.push(...value);
+  return to;
+}
 function readPackageJsonField(jsonContent, fieldName, typeOfTag, state) {
   if (!hasProperty(jsonContent, fieldName)) {
     if (state.traceEnabled) {
@@ -25879,8 +25875,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
     }
   }
   const containingDirectory = getDirectoryPath(containingFile);
-  const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference);
-  let result = perFolderCache && perFolderCache.get(moduleName, resolutionMode);
+  let result = cache == null ? void 0 : cache.getFromDirectoryCache(moduleName, resolutionMode, containingDirectory, redirectedReference);
   if (result) {
     if (traceEnabled) {
       trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -25930,11 +25925,9 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
     if (result && result.resolvedModule)
       perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
     perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
-    if (perFolderCache) {
-      perFolderCache.set(moduleName, resolutionMode, result);
-      if (!isExternalModuleNameRelative(moduleName)) {
-        cache.getOrCreateCacheForModuleName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
-      }
+    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);
     }
   }
   if (traceEnabled) {
@@ -26051,7 +26044,7 @@ function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, state) {
 function resolveJSModule(moduleName, initialDir, host) {
   const { resolvedModule, failedLookupLocations } = tryResolveJSModuleWorker(moduleName, initialDir, host);
   if (!resolvedModule) {
-    throw new Error(`Could not resolve JS module '${moduleName}' starting at '${initialDir}'. Looked in: ${failedLookupLocations.join(", ")}`);
+    throw new Error(`Could not resolve JS module '${moduleName}' starting at '${initialDir}'. Looked in: ${failedLookupLocations == null ? void 0 : failedLookupLocations.join(", ")}`);
   }
   return resolvedModule.resolvedFileName;
 }
@@ -26817,7 +26810,7 @@ function loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, directo
   return loadModuleFromNearestNodeModulesDirectoryWorker(4 /* Declaration */, moduleName, directory, state, true, void 0, void 0);
 }
 function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
-  const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */, redirectedReference);
+  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */;
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
@@ -26831,7 +26824,7 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName,
   function lookup(extensions2) {
     return forEachAncestorDirectory(normalizeSlashes(directory), (ancestorDirectory) => {
       if (getBaseFileName(ancestorDirectory) !== "node_modules") {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state);
+        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, ancestorDirectory, redirectedReference, state);
         if (resolutionFromCache) {
           return resolutionFromCache;
         }
@@ -26964,8 +26957,8 @@ function mangleScopedPackageName(packageName) {
   }
   return packageName;
 }
-function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, state) {
-  const result = cache && cache.get(containingDirectory);
+function tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, containingDirectory, redirectedReference, state) {
+  const result = cache && cache.getFromNonRelativeNameCache(moduleName, mode, containingDirectory, redirectedReference);
   if (result) {
     if (state.traceEnabled) {
       trace(state.host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -27008,9 +27001,8 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
       return { value: resolvedUsingSettings };
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, void 0, redirectedReference);
       const resolved2 = forEachAncestorDirectory(containingDirectory, (directory) => {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, state);
+        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, void 0, directory, redirectedReference, state);
         if (resolutionFromCache) {
           return resolutionFromCache;
         }
@@ -31680,7 +31672,7 @@ var BuilderState;
       }
     }
     if (sourceFile.resolvedTypeReferenceDirectiveNames) {
-      sourceFile.resolvedTypeReferenceDirectiveNames.forEach((resolvedTypeReferenceDirective) => {
+      sourceFile.resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => {
         if (!resolvedTypeReferenceDirective) {
           return;
         }
@@ -31802,6 +31794,26 @@ var BuilderState;
     (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = /* @__PURE__ */ new Set())).add(path2);
   }
   BuilderState2.updateSignatureOfFile = updateSignatureOfFile;
+  function computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, onNewSignature) {
+    programOfThisState.emit(
+      sourceFile,
+      (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
+        Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
+        onNewSignature(computeSignatureWithDiagnostics(
+          programOfThisState,
+          sourceFile,
+          text,
+          host,
+          data
+        ), sourceFiles);
+      },
+      cancellationToken,
+      true,
+      void 0,
+      true
+    );
+  }
+  BuilderState2.computeDtsSignature = computeDtsSignature;
   function updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, host, useFileVersionAsSignature = state.useFileVersionAsSignature) {
     var _a2;
     if ((_a2 = state.hasCalledUpdateShapeSignature) == null ? void 0 : _a2.has(sourceFile.resolvedPath))
@@ -31810,26 +31822,12 @@ var BuilderState;
     const prevSignature = info.signature;
     let latestSignature;
     if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
-      programOfThisState.emit(
-        sourceFile,
-        (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
-          Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
-          latestSignature = computeSignatureWithDiagnostics(
-            programOfThisState,
-            sourceFile,
-            text,
-            host,
-            data
-          );
-          if (latestSignature !== prevSignature) {
-            updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
-          }
-        },
-        cancellationToken,
-        true,
-        void 0,
-        true
-      );
+      computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, (signature, sourceFiles) => {
+        latestSignature = signature;
+        if (latestSignature !== prevSignature) {
+          updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
+        }
+      });
     }
     if (latestSignature === void 0) {
       latestSignature = sourceFile.version;
@@ -31853,27 +31851,24 @@ var BuilderState;
     if (!state.exportedModulesMap)
       return;
     (state.oldExportedModulesMap || (state.oldExportedModulesMap = /* @__PURE__ */ new Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
-    if (!exportedModulesFromDeclarationEmit) {
-      state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
-      return;
-    }
-    let exportedModules;
-    exportedModulesFromDeclarationEmit.forEach((symbol) => addExportedModule(getReferencedFilesFromImportedModuleSymbol(symbol)));
+    const exportedModules = getExportedModules(exportedModulesFromDeclarationEmit);
     if (exportedModules) {
       state.exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
     } else {
       state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
     }
-    function addExportedModule(exportedModulePaths) {
-      if (exportedModulePaths == null ? void 0 : exportedModulePaths.length) {
-        if (!exportedModules) {
-          exportedModules = /* @__PURE__ */ new Set();
-        }
-        exportedModulePaths.forEach((path2) => exportedModules.add(path2));
-      }
-    }
   }
   BuilderState2.updateExportedModules = updateExportedModules;
+  function getExportedModules(exportedModulesFromDeclarationEmit) {
+    let exportedModules;
+    exportedModulesFromDeclarationEmit == null ? void 0 : exportedModulesFromDeclarationEmit.forEach(
+      (symbol) => getReferencedFilesFromImportedModuleSymbol(symbol).forEach(
+        (path2) => (exportedModules != null ? exportedModules : exportedModules = /* @__PURE__ */ new Set()).add(path2)
+      )
+    );
+    return exportedModules;
+  }
+  BuilderState2.getExportedModules = getExportedModules;
   function getAllDependencies(state, programOfThisState, sourceFile) {
     const compilerOptions = programOfThisState.getCompilerOptions();
     if (outFile(compilerOptions)) {

package/package.json

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