typescript 4.7.0-dev.20220418 → 4.7.0-dev.20220421

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 = ts.versionMajorMinor + ".0-dev.20220418";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220421";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -33175,7 +33175,8 @@ var ts;
             var pos = getNodePos();
             parseExpected(112 /* TypeOfKeyword */);
             var entityName = parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ true);
-            var typeArguments = tryParseTypeArguments();
+            // Make sure we perform ASI to prevent parsing the next line's type arguments as part of an instantiation expression.
+            var typeArguments = !scanner.hasPrecedingLineBreak() ? tryParseTypeArguments() : undefined;
             return finishNode(factory.createTypeQueryNode(entityName, typeArguments), pos);
         }
         function parseTypeParameter() {
@@ -61923,11 +61924,14 @@ var ts;
                     return type[cache] = elementType;
                 }
             }
-            // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
-            // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
-            // construct the type Box<T[X]>.
-            if (isGenericMappedType(objectType) && !objectType.declaration.nameType) {
-                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
+            // If the object type is a mapped type { [P in K]: E }, where K is generic, or { [P in K as N]: E }, where
+            // K is generic and N is assignable to P, instantiate E using a mapper that substitutes the index type for P.
+            // For example, for an index access { [P in K]: Box<T[P]> }[X], we construct the type Box<T[X]>.
+            if (isGenericMappedType(objectType)) {
+                var nameType = getNameTypeFromMappedType(objectType);
+                if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+                    return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
+                }
             }
             return type[cache] = type;
         }
@@ -74247,10 +74251,15 @@ var ts;
                 prop = getPropertyOfType(apparentType, right.escapedText);
             }
             // In `Foo.Bar.Baz`, 'Foo' is not referenced if 'Bar' is a const enum or a module containing only const enums.
+            // `Foo` is also not referenced in `enum FooCopy { Bar = Foo.Bar }`, because the enum member value gets inlined
+            // here even if `Foo` is not a const enum.
+            //
             // The exceptions are:
             //   1. if 'isolatedModules' is enabled, because the const enum value will not be inlined, and
             //   2. if 'preserveConstEnums' is enabled and the expression is itself an export, e.g. `export = Foo.Bar.Baz`.
-            if (ts.isIdentifier(left) && parentSymbol && (compilerOptions.isolatedModules || !(prop && isConstEnumOrConstEnumOnlyModule(prop)) || ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(node))) {
+            if (ts.isIdentifier(left) && parentSymbol && (compilerOptions.isolatedModules ||
+                !(prop && (isConstEnumOrConstEnumOnlyModule(prop) || prop.flags & 8 /* EnumMember */ && node.parent.kind === 299 /* EnumMember */)) ||
+                ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(node))) {
                 markAliasReferenced(parentSymbol, node);
             }
             var propType;
@@ -85985,15 +85994,20 @@ var ts;
                         return propertyDeclaration;
                     }
                 }
-                else if (ts.isMetaProperty(parent)) {
-                    var parentType = getTypeOfNode(parent);
-                    var propertyDeclaration = getPropertyOfType(parentType, node.escapedText);
-                    if (propertyDeclaration) {
-                        return propertyDeclaration;
-                    }
-                    if (parent.keywordToken === 103 /* NewKeyword */) {
+                else if (ts.isMetaProperty(parent) && parent.name === node) {
+                    if (parent.keywordToken === 103 /* NewKeyword */ && ts.idText(node) === "target") {
+                        // `target` in `new.target`
                         return checkNewTargetMetaProperty(parent).symbol;
                     }
+                    // The `meta` in `import.meta` could be given `getTypeOfNode(parent).symbol` (the `ImportMeta` interface symbol), but
+                    // we have a fake expression type made for other reasons already, whose transient `meta`
+                    // member should more exactly be the kind of (declarationless) symbol we want.
+                    // (See #44364 and #45031 for relevant implementation PRs)
+                    if (parent.keywordToken === 100 /* ImportKeyword */ && ts.idText(node) === "meta") {
+                        return getGlobalImportMetaExpressionType().members.get("meta");
+                    }
+                    // no other meta properties are valid syntax, thus no others should have symbols
+                    return undefined;
                 }
             }
             switch (node.kind) {
@@ -94671,7 +94685,7 @@ var ts;
             }
             resumeLexicalEnvironment();
             var needsSyntheticConstructor = !constructor && isDerivedClass;
-            var indexOfFirstStatementAfterSuper = 0;
+            var indexOfFirstStatementAfterSuperAndPrologue = 0;
             var prologueStatementCount = 0;
             var superStatementIndex = -1;
             var statements = [];
@@ -94680,8 +94694,11 @@ var ts;
                 superStatementIndex = ts.findSuperStatementIndex(constructor.body.statements, prologueStatementCount);
                 // If there was a super call, visit existing statements up to and including it
                 if (superStatementIndex >= 0) {
-                    indexOfFirstStatementAfterSuper = superStatementIndex + 1;
-                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuper - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                    indexOfFirstStatementAfterSuperAndPrologue = superStatementIndex + 1;
+                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuperAndPrologue - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                }
+                else if (prologueStatementCount >= 0) {
+                    indexOfFirstStatementAfterSuperAndPrologue = prologueStatementCount;
                 }
             }
             if (needsSyntheticConstructor) {
@@ -94717,22 +94734,20 @@ var ts;
                         }
                     }
                     if (parameterPropertyDeclarationCount > 0) {
-                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuper, parameterPropertyDeclarationCount);
+                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue, parameterPropertyDeclarationCount);
                         // If there was a super() call found, add parameter properties immediately after it
                         if (superStatementIndex >= 0) {
                             ts.addRange(statements, parameterProperties);
                         }
-                        // If a synthetic super() call was added, add them just after it
-                        else if (needsSyntheticConstructor) {
-                            statements = __spreadArray(__spreadArray([
-                                statements[0]
-                            ], parameterProperties, true), statements.slice(1), true);
-                        }
-                        // Since there wasn't a super() call, add them to the top of the constructor
                         else {
-                            statements = __spreadArray(__spreadArray([], parameterProperties, true), statements, true);
+                            // Add add parameter properties to the top of the constructor after the prologue
+                            var superAndPrologueStatementCount = prologueStatementCount;
+                            // If a synthetic super() call was added, need to account for that
+                            if (needsSyntheticConstructor)
+                                superAndPrologueStatementCount++;
+                            statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, superAndPrologueStatementCount), true), parameterProperties, true), statements.slice(superAndPrologueStatementCount), true);
                         }
-                        indexOfFirstStatementAfterSuper += parameterPropertyDeclarationCount;
+                        indexOfFirstStatementAfterSuperAndPrologue += parameterPropertyDeclarationCount;
                     }
                 }
             }
@@ -94742,7 +94757,7 @@ var ts;
             addPropertyOrClassStaticBlockStatements(statements, properties, receiver);
             // Add existing statements after the initial prologues and super call
             if (constructor) {
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuper + prologueStatementCount));
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue));
             }
             statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment());
             return ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), 
@@ -98783,7 +98798,7 @@ var ts;
                 // ```
                 insertCaptureThisForNodeIfNeeded(prologue, constructor);
             }
-            var body = factory.createBlock(ts.setTextRange(factory.createNodeArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], existingPrologue, true), prologue, true), (superStatementIndex <= existingPrologue.length ? ts.emptyArray : ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, existingPrologue.length, superStatementIndex)), true), statements, true)), 
+            var body = factory.createBlock(ts.setTextRange(factory.createNodeArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], existingPrologue, true), prologue, true), (superStatementIndex <= existingPrologue.length ? ts.emptyArray : ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, existingPrologue.length, superStatementIndex - existingPrologue.length)), true), statements, true)), 
             /*location*/ constructor.body.statements), 
             /*multiLine*/ true);
             ts.setTextRange(body, constructor.body);
@@ -119759,6 +119774,18 @@ var ts;
         }
         return undefined;
     }
+    function removeDiagnosticsOfLibraryFiles(state) {
+        if (!state.cleanedDiagnosticsOfLibFiles) {
+            state.cleanedDiagnosticsOfLibFiles = true;
+            var program_1 = ts.Debug.checkDefined(state.program);
+            var options_2 = program_1.getCompilerOptions();
+            ts.forEach(program_1.getSourceFiles(), function (f) {
+                return program_1.isSourceFileDefaultLibrary(f) &&
+                    !ts.skipTypeChecking(f, options_2, program_1) &&
+                    removeSemanticDiagnosticsOf(state, f.resolvedPath);
+            });
+        }
+    }
     /**
      *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
      *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
@@ -119768,28 +119795,17 @@ var ts;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         // If affected files is everything except default library, then nothing more to do
         if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
-            if (!state.cleanedDiagnosticsOfLibFiles) {
-                state.cleanedDiagnosticsOfLibFiles = true;
-                var program_1 = ts.Debug.checkDefined(state.program);
-                var options_2 = program_1.getCompilerOptions();
-                ts.forEach(program_1.getSourceFiles(), function (f) {
-                    return program_1.isSourceFileDefaultLibrary(f) &&
-                        !ts.skipTypeChecking(f, options_2, program_1) &&
-                        removeSemanticDiagnosticsOf(state, f.resolvedPath);
-                });
-            }
+            removeDiagnosticsOfLibraryFiles(state);
             // When a change affects the global scope, all files are considered to be affected without updating their signature
             // That means when affected file is handled, its signature can be out of date
             // To avoid this, ensure that we update the signature for any affected file in this scenario.
             ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
             return;
         }
-        else {
-            ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
-        }
-        if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
-            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host); });
-        }
+        ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
+        if (state.compilerOptions.assumeChangesOnlyAffectDirectDependencies)
+            return;
+        handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
     }
     /**
      * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
@@ -119831,16 +119847,41 @@ var ts;
         var oldSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
         return newSignature !== oldSignature;
     }
+    function forEachKeyOfExportedModulesMap(state, filePath, fn) {
+        // Go through exported modules from cache first
+        var keys = state.currentAffectedFilesExportedModulesMap.getKeys(filePath);
+        var result = keys && ts.forEachKey(keys, fn);
+        if (result)
+            return result;
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        keys = state.exportedModulesMap.getKeys(filePath);
+        return keys && ts.forEachKey(keys, function (exportedFromPath) {
+            var _a;
+            // If the cache had an updated value, skip
+            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
+                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) ?
+                fn(exportedFromPath) :
+                undefined;
+        });
+    }
+    function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host) {
+        var _a;
+        if (!((_a = state.fileInfos.get(filePath)) === null || _a === void 0 ? void 0 : _a.affectsGlobalScope))
+            return false;
+        // Every file needs to be handled
+        ts.BuilderState.getAllFilesExcludingDefaultLibraryFile(state, state.program, /*firstSourceFile*/ undefined)
+            .forEach(function (file) { return handleDtsMayChangeOf(state, file.resolvedPath, cancellationToken, computeHash, host); });
+        removeDiagnosticsOfLibraryFiles(state);
+        return true;
+    }
     /**
-     * Iterate on referencing modules that export entities from affected file
+     * Iterate on referencing modules that export entities from affected file and delete diagnostics and add pending emit
      */
-    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
-        var _a, _b;
+    function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
         // If there was change in signature (dts output) for the changed file,
         // then only we need to handle pending file emit
-        if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath)) {
+        if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath))
             return;
-        }
         if (!isChangedSignature(state, affectedFile.resolvedPath))
             return;
         // Since isolated modules dont change js files, files affected by change in signature is itself
@@ -119853,7 +119894,9 @@ var ts;
                 var currentPath = queue.pop();
                 if (!seenFileNamesMap.has(currentPath)) {
                     seenFileNamesMap.set(currentPath, true);
-                    fn(state, currentPath);
+                    if (handleDtsMayChangeOfGlobalScope(state, currentPath, cancellationToken, computeHash, host))
+                        return;
+                    handleDtsMayChangeOf(state, currentPath, cancellationToken, computeHash, host);
                     if (isChangedSignature(state, currentPath)) {
                         var currentSourceFile = ts.Debug.checkDefined(state.program).getSourceFileByPath(currentPath);
                         queue.push.apply(queue, ts.BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath));
@@ -119865,56 +119908,38 @@ var ts;
         var seenFileAndExportsOfFile = new ts.Set();
         // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.currentAffectedFilesExportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
-            return forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
-        });
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        (_b = state.exportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _b === void 0 ? void 0 : _b.forEach(function (exportedFromPath) {
-            var _a;
-            // If the cache had an updated value, skip
-            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
-                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) &&
-                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, function (exportedFromPath) {
+            if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, computeHash, host))
+                return true;
+            var references = state.referencedMap.getKeys(exportedFromPath);
+            return references && ts.forEachKey(references, function (filePath) {
+                return handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, computeHash, host);
+            });
         });
     }
     /**
-     * Iterate on files referencing referencedPath
+     * handle dts and semantic diagnostics on file and iterate on anything that exports this file
+     * return true when all work is done and we can exit handling dts emit and semantic diagnostics
      */
-    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+    function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, computeHash, host) {
         var _a;
-        (_a = state.referencedMap.getKeys(referencedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (filePath) {
-            return forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
-        });
-    }
-    /**
-     * fn on file and iterate on anything that exports this file
-     */
-    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
-        var _a, _b, _c;
-        if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath)) {
-            return;
-        }
-        fn(state, filePath);
+        if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath))
+            return undefined;
+        if (handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host))
+            return true;
+        handleDtsMayChangeOf(state, filePath, cancellationToken, computeHash, host);
         ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.currentAffectedFilesExportedModulesMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
-            return forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
-        });
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        (_b = state.exportedModulesMap.getKeys(filePath)) === null || _b === void 0 ? void 0 : _b.forEach(function (exportedFromPath) {
-            var _a;
-            // If the cache had an updated value, skip
-            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
-                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) &&
-                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        forEachKeyOfExportedModulesMap(state, filePath, function (exportedFromPath) {
+            return handleDtsMayChangeOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, cancellationToken, computeHash, host);
         });
         // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        (_c = state.referencedMap.getKeys(filePath)) === null || _c === void 0 ? void 0 : _c.forEach(function (referencingFilePath) {
+        (_a = state.referencedMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (referencingFilePath) {
             return !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                fn(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+                handleDtsMayChangeOf(// Dont add to seen since this is not yet done with the export removal
+                state, referencingFilePath, cancellationToken, computeHash, host);
+        });
+        return undefined;
     }
     /**
      * This is called after completing operation on the next affected file.

package/package.json

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