typescript 4.9.0-dev.20221018 → 4.9.0-dev.20221020

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.9";
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -55946,7 +55946,7 @@ var ts;
                 if (relation !== identityRelation) {
                     if (!result && (source.flags & 2097152 || source.flags & 262144 && target.flags & 1048576)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 ? source.types : [source], !!(target.flags & 1048576));
-                        if (constraint && !(constraint.flags & 131072) && everyType(constraint, function (c) { return c !== source; })) {
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) {
                             result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState);
                         }
                     }
@@ -57526,8 +57526,7 @@ var ts;
             return !!(type.flags & 109440);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 ? ts.find(type.types, isUnitType) || type : type;
@@ -60362,7 +60361,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -60595,7 +60594,7 @@ var ts;
                     !!(prop.flags & 16777216) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, true); });
                 if (isKnownProperty) {
@@ -60672,7 +60671,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 : 65536);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -60834,7 +60833,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -61163,10 +61162,10 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, 111551) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551) {
+                if (getAllSymbolFlags(target) & (111551 | 1048576)) {
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -69785,7 +69784,7 @@ var ts;
             if (isGenericObjectType(type)) {
                 var baseConstraint = getBaseConstraintOfType(type);
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752)) {
                     return true;
                 }
@@ -88705,18 +88704,18 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
             needUMDDynamicImportHelper = true;
             if (ts.isSimpleCopiableExpression(arg)) {
                 var argClone = ts.isGeneratedIdentifier(arg) ? arg : ts.isStringLiteral(arg) ? factory.createStringLiteralFromNode(arg) : ts.setEmitFlags(ts.setTextRange(factory.cloneNode(arg), arg), 1536);
-                return factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(arg, containsLexicalThis), undefined, createImportCallExpressionAMD(argClone, containsLexicalThis));
+                return factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(arg), undefined, createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
             else {
                 var temp = factory.createTempVariable(hoistVariableDeclaration);
-                return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(temp, containsLexicalThis), undefined, createImportCallExpressionAMD(temp, containsLexicalThis)));
+                return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(temp, true), undefined, createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
         }
         function createImportCallExpressionAMD(arg, containsLexicalThis) {
@@ -88745,9 +88744,10 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
             var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), undefined, []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), undefined, arg ? [arg] : []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -88757,11 +88757,9 @@ var ts;
             }
             else {
                 func = factory.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864) {

package/lib/tsserver.js

@@ -109,7 +109,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21720,13 +21720,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27658,11 +27656,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28021,7 +28017,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32155,13 +32150,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -67009,7 +67002,7 @@ var ts;
                     // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
                     if (!result && (source.flags & 2097152 /* TypeFlags.Intersection */ || source.flags & 262144 /* TypeFlags.TypeParameter */ && target.flags & 1048576 /* TypeFlags.Union */)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* TypeFlags.Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* TypeFlags.Union */));
-                        if (constraint && !(constraint.flags & 131072 /* TypeFlags.Never */) && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
                             // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
                             result = isRelatedTo(constraint, target, 1 /* RecursionFlags.Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                         }
@@ -68898,8 +68891,7 @@ var ts;
             return !!(type.flags & 109440 /* TypeFlags.Unit */);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440 /* TypeFlags.Unit */);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -72131,7 +72123,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72412,7 +72404,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72493,7 +72485,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72682,7 +72674,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -73072,13 +73064,13 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, /*excludes*/ 111551 /* SymbolFlags.Value */) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551 /* SymbolFlags.Value */)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551 /* SymbolFlags.Value */) {
+                if (getAllSymbolFlags(target) & (111551 /* SymbolFlags.Value */ | 1048576 /* SymbolFlags.ExportValue */)) {
                     // An alias resolving to a const enum cannot be elided if (1) 'isolatedModules' is enabled
                     // (because the const enum value will not be inlined), or if (2) the alias is an export
                     // of a const enum declaration that will be preserved.
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -83049,7 +83041,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -107395,7 +107387,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107418,7 +107410,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107427,7 +107419,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107477,14 +107469,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107505,14 +107503,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -142736,6 +142729,12 @@ var ts;
                 var label = ts.getTargetLabel(node.parent, node.text);
                 return label ? [createDefinitionInfoFromName(typeChecker, label, "label" /* ScriptElementKind.label */, node.text, /*containerName*/ undefined)] : undefined; // TODO: GH#18217
             }
+            if (node.kind === 105 /* SyntaxKind.ReturnKeyword */) {
+                var functionDeclaration = ts.findAncestor(node.parent, function (n) {
+                    return ts.isClassStaticBlockDeclaration(n) ? "quit" : ts.isFunctionLikeDeclaration(n);
+                });
+                return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+            }
             if (ts.isStaticModifier(node) && ts.isClassStaticBlockDeclaration(node.parent)) {
                 var classDecl = node.parent.parent;
                 var _c = getSymbol(classDecl, typeChecker, stopAtAlias), symbol_1 = _c.symbol, failedAliasResolution_1 = _c.failedAliasResolution;

package/lib/tsserverlibrary.js

@@ -108,7 +108,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21719,13 +21719,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27657,11 +27655,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28020,7 +28016,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32154,13 +32149,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -67008,7 +67001,7 @@ var ts;
                     // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
                     if (!result && (source.flags & 2097152 /* TypeFlags.Intersection */ || source.flags & 262144 /* TypeFlags.TypeParameter */ && target.flags & 1048576 /* TypeFlags.Union */)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* TypeFlags.Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* TypeFlags.Union */));
-                        if (constraint && !(constraint.flags & 131072 /* TypeFlags.Never */) && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
                             // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
                             result = isRelatedTo(constraint, target, 1 /* RecursionFlags.Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                         }
@@ -68897,8 +68890,7 @@ var ts;
             return !!(type.flags & 109440 /* TypeFlags.Unit */);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440 /* TypeFlags.Unit */);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -72130,7 +72122,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72411,7 +72403,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72492,7 +72484,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72681,7 +72673,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -73071,13 +73063,13 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, /*excludes*/ 111551 /* SymbolFlags.Value */) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551 /* SymbolFlags.Value */)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551 /* SymbolFlags.Value */) {
+                if (getAllSymbolFlags(target) & (111551 /* SymbolFlags.Value */ | 1048576 /* SymbolFlags.ExportValue */)) {
                     // An alias resolving to a const enum cannot be elided if (1) 'isolatedModules' is enabled
                     // (because the const enum value will not be inlined), or if (2) the alias is an export
                     // of a const enum declaration that will be preserved.
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -83048,7 +83040,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -107394,7 +107386,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107417,7 +107409,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107426,7 +107418,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107476,14 +107468,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107504,14 +107502,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -143154,6 +143147,12 @@ var ts;
                 var label = ts.getTargetLabel(node.parent, node.text);
                 return label ? [createDefinitionInfoFromName(typeChecker, label, "label" /* ScriptElementKind.label */, node.text, /*containerName*/ undefined)] : undefined; // TODO: GH#18217
             }
+            if (node.kind === 105 /* SyntaxKind.ReturnKeyword */) {
+                var functionDeclaration = ts.findAncestor(node.parent, function (n) {
+                    return ts.isClassStaticBlockDeclaration(n) ? "quit" : ts.isFunctionLikeDeclaration(n);
+                });
+                return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+            }
             if (ts.isStaticModifier(node) && ts.isClassStaticBlockDeclaration(node.parent)) {
                 var classDecl = node.parent.parent;
                 var _c = getSymbol(classDecl, typeChecker, stopAtAlias), symbol_1 = _c.symbol, failedAliasResolution_1 = _c.failedAliasResolution;

package/lib/typescript.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21710,13 +21710,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27648,11 +27646,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28011,7 +28007,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32145,13 +32140,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -66999,7 +66992,7 @@ var ts;
                     // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
                     if (!result && (source.flags & 2097152 /* TypeFlags.Intersection */ || source.flags & 262144 /* TypeFlags.TypeParameter */ && target.flags & 1048576 /* TypeFlags.Union */)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* TypeFlags.Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* TypeFlags.Union */));
-                        if (constraint && !(constraint.flags & 131072 /* TypeFlags.Never */) && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
                             // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
                             result = isRelatedTo(constraint, target, 1 /* RecursionFlags.Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                         }
@@ -68888,8 +68881,7 @@ var ts;
             return !!(type.flags & 109440 /* TypeFlags.Unit */);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440 /* TypeFlags.Unit */);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -72121,7 +72113,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72402,7 +72394,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72483,7 +72475,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72672,7 +72664,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -73062,13 +73054,13 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, /*excludes*/ 111551 /* SymbolFlags.Value */) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551 /* SymbolFlags.Value */)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551 /* SymbolFlags.Value */) {
+                if (getAllSymbolFlags(target) & (111551 /* SymbolFlags.Value */ | 1048576 /* SymbolFlags.ExportValue */)) {
                     // An alias resolving to a const enum cannot be elided if (1) 'isolatedModules' is enabled
                     // (because the const enum value will not be inlined), or if (2) the alias is an export
                     // of a const enum declaration that will be preserved.
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -83039,7 +83031,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -107385,7 +107377,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107408,7 +107400,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107417,7 +107409,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107467,14 +107459,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107495,14 +107493,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -143145,6 +143138,12 @@ var ts;
                 var label = ts.getTargetLabel(node.parent, node.text);
                 return label ? [createDefinitionInfoFromName(typeChecker, label, "label" /* ScriptElementKind.label */, node.text, /*containerName*/ undefined)] : undefined; // TODO: GH#18217
             }
+            if (node.kind === 105 /* SyntaxKind.ReturnKeyword */) {
+                var functionDeclaration = ts.findAncestor(node.parent, function (n) {
+                    return ts.isClassStaticBlockDeclaration(n) ? "quit" : ts.isFunctionLikeDeclaration(n);
+                });
+                return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+            }
             if (ts.isStaticModifier(node) && ts.isClassStaticBlockDeclaration(node.parent)) {
                 var classDecl = node.parent.parent;
                 var _c = getSymbol(classDecl, typeChecker, stopAtAlias), symbol_1 = _c.symbol, failedAliasResolution_1 = _c.failedAliasResolution;

package/lib/typescriptServices.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21710,13 +21710,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27648,11 +27646,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28011,7 +28007,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32145,13 +32140,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -66999,7 +66992,7 @@ var ts;
                     // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
                     if (!result && (source.flags & 2097152 /* TypeFlags.Intersection */ || source.flags & 262144 /* TypeFlags.TypeParameter */ && target.flags & 1048576 /* TypeFlags.Union */)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* TypeFlags.Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* TypeFlags.Union */));
-                        if (constraint && !(constraint.flags & 131072 /* TypeFlags.Never */) && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
                             // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
                             result = isRelatedTo(constraint, target, 1 /* RecursionFlags.Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                         }
@@ -68888,8 +68881,7 @@ var ts;
             return !!(type.flags & 109440 /* TypeFlags.Unit */);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440 /* TypeFlags.Unit */);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -72121,7 +72113,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72402,7 +72394,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72483,7 +72475,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72672,7 +72664,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -73062,13 +73054,13 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, /*excludes*/ 111551 /* SymbolFlags.Value */) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551 /* SymbolFlags.Value */)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551 /* SymbolFlags.Value */) {
+                if (getAllSymbolFlags(target) & (111551 /* SymbolFlags.Value */ | 1048576 /* SymbolFlags.ExportValue */)) {
                     // An alias resolving to a const enum cannot be elided if (1) 'isolatedModules' is enabled
                     // (because the const enum value will not be inlined), or if (2) the alias is an export
                     // of a const enum declaration that will be preserved.
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -83039,7 +83031,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -107385,7 +107377,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107408,7 +107400,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107417,7 +107409,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107467,14 +107459,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107495,14 +107493,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {
@@ -143145,6 +143138,12 @@ var ts;
                 var label = ts.getTargetLabel(node.parent, node.text);
                 return label ? [createDefinitionInfoFromName(typeChecker, label, "label" /* ScriptElementKind.label */, node.text, /*containerName*/ undefined)] : undefined; // TODO: GH#18217
             }
+            if (node.kind === 105 /* SyntaxKind.ReturnKeyword */) {
+                var functionDeclaration = ts.findAncestor(node.parent, function (n) {
+                    return ts.isClassStaticBlockDeclaration(n) ? "quit" : ts.isFunctionLikeDeclaration(n);
+                });
+                return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+            }
             if (ts.isStaticModifier(node) && ts.isClassStaticBlockDeclaration(node.parent)) {
                 var classDecl = node.parent.parent;
                 var _c = getSymbol(classDecl, typeChecker, stopAtAlias), symbol_1 = _c.symbol, failedAliasResolution_1 = _c.failedAliasResolution;

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221018");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221020");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -21700,13 +21700,11 @@ var ts;
      * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator.
      */
     function createBaseNodeFactory() {
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         return {
             createBaseSourceFileNode: createBaseSourceFileNode,
             createBaseIdentifierNode: createBaseIdentifierNode,
@@ -27638,11 +27636,9 @@ var ts;
                 rawTextScanner.setText("`" + rawText + "`");
                 break;
             case 15 /* SyntaxKind.TemplateHead */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("`" + rawText + "${");
                 break;
             case 16 /* SyntaxKind.TemplateMiddle */:
-                // tslint:disable-next-line no-invalid-template-strings
                 rawTextScanner.setText("}" + rawText + "${");
                 break;
             case 17 /* SyntaxKind.TemplateTail */:
@@ -28001,7 +27997,6 @@ var ts;
         return node;
     }
     ts.createInputFiles = createInputFiles;
-    // tslint:disable-next-line variable-name
     var SourceMapSource;
     /**
      * Create an external source map source file reference
@@ -32135,13 +32130,11 @@ var ts;
         var scanner = ts.createScanner(99 /* ScriptTarget.Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 4096 /* NodeFlags.DisallowInContext */ | 16384 /* NodeFlags.DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
-        // tslint:disable variable-name
         var NodeConstructor;
         var TokenConstructor;
         var IdentifierConstructor;
         var PrivateIdentifierConstructor;
         var SourceFileConstructor;
-        // tslint:enable variable-name
         function countNode(node) {
             nodeCount++;
             return node;
@@ -66989,7 +66982,7 @@ var ts;
                     // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
                     if (!result && (source.flags & 2097152 /* TypeFlags.Intersection */ || source.flags & 262144 /* TypeFlags.TypeParameter */ && target.flags & 1048576 /* TypeFlags.Union */)) {
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* TypeFlags.Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* TypeFlags.Union */));
-                        if (constraint && !(constraint.flags & 131072 /* TypeFlags.Never */) && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
                             // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
                             result = isRelatedTo(constraint, target, 1 /* RecursionFlags.Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                         }
@@ -68878,8 +68871,7 @@ var ts;
             return !!(type.flags & 109440 /* TypeFlags.Unit */);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440 /* TypeFlags.Unit */);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -72111,7 +72103,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 /* SyntaxKind.TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -72392,7 +72384,7 @@ var ts;
                     !!(prop.flags & 16777216 /* SymbolFlags.Optional */) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, /*assumeTrue*/ true); });
                 if (isKnownProperty) {
@@ -72473,7 +72465,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 /* TypeFacts.NEUndefined */ : 65536 /* TypeFacts.EQUndefined */);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -72662,7 +72654,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -73052,13 +73044,13 @@ var ts;
         function markAliasReferenced(symbol, location) {
             if (isNonLocalAlias(symbol, /*excludes*/ 111551 /* SymbolFlags.Value */) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551 /* SymbolFlags.Value */)) {
                 var target = resolveAlias(symbol);
-                if (getAllSymbolFlags(target) & 111551 /* SymbolFlags.Value */) {
+                if (getAllSymbolFlags(target) & (111551 /* SymbolFlags.Value */ | 1048576 /* SymbolFlags.ExportValue */)) {
                     // An alias resolving to a const enum cannot be elided if (1) 'isolatedModules' is enabled
                     // (because the const enum value will not be inlined), or if (2) the alias is an export
                     // of a const enum declaration that will be preserved.
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -83029,7 +83021,7 @@ var ts;
                 // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 /* TypeFlags.AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752 /* TypeFlags.TypeVariable */)) {
                     return true;
                 }
@@ -107375,7 +107367,7 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
@@ -107398,7 +107390,7 @@ var ts;
                 return factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
@@ -107407,7 +107399,7 @@ var ts;
                 return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(
                 /*condition*/ factory.createIdentifier("__syncRequire"), 
                 /*questionToken*/ undefined, 
-                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, /* isInlineable */ true), 
                 /*colonToken*/ undefined, 
                 /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
@@ -107457,14 +107449,20 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
-            // import("./blah")
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            // import(x)
             // emit as
-            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // var _a;
+            // (_a = x, Promise.resolve().then(() => require(_a)) /*CommonJs Require*/
             // We have to wrap require in then callback so that require is done in asynchronously
             // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
-            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            // If the arg is not inlineable, we have to evaluate it in the current scope with a temp var
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
+            var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), 
+            /*typeArguments*/ undefined, 
+            /*argumentsArray*/ []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), 
+            /*typeArguments*/ undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -107485,14 +107483,9 @@ var ts;
                 /*typeParameters*/ undefined, 
                 /*parameters*/ [], 
                 /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                // if there is a lexical 'this' in the import call arguments, ensure we indicate
-                // that this new function expression indicates it captures 'this' so that the
-                // es2015 transformer will properly substitute 'this' with '_this'.
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8 /* EmitFlags.CapturesThis */);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864 /* EmitFlags.NeverApplyImportHelper */) {

package/package.json

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