diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 38d6f55824254..58ee05aeb23aa 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -426,6 +426,15 @@ namespace ts { symbol = createSymbol(SymbolFlags.None, name); } } + else if (isDefaultExport && parent && symbol.declarations && symbol.declarations.length) { + // && parent because we only want to check the export default symbol. + // if there is already an export default declaration, make sure that their local names are the same. + if (symbol.declarations[0].localSymbol !== node.localSymbol) { + const message = Diagnostics.Merged_default_exports_must_have_the_same_name; + file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(symbol.declarations[0]) || symbol.declarations[0], message)); + file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(node) || node, message)); + } + } } addDeclarationToSymbol(symbol, node, includes); @@ -472,8 +481,8 @@ namespace ts { } const exportKind = symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0; const local = declareSymbol(container.locals!, /*parent*/ undefined, node, exportKind, symbolExcludes); - local.exportSymbol = declareSymbol(container.symbol.exports!, container.symbol, node, symbolFlags, symbolExcludes); node.localSymbol = local; + local.exportSymbol = declareSymbol(container.symbol.exports!, container.symbol, node, symbolFlags, symbolExcludes); return local; } else { @@ -1381,7 +1390,7 @@ namespace ts { function bindJSDocTypeAlias(node: JSDocTypedefTag | JSDocCallbackTag) { if (node.fullName) { setParentPointers(node, node.fullName); - } + } } function bindCallExpressionFlow(node: CallExpression) { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 706a35527653e..a68148e3e617e 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2489,7 +2489,10 @@ "category": "Error", "code": 2734 }, - + "Merged default exports must have the same name.": { + "category": "Error", + "code": 2735 + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", "code": 4000 diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 33829fccb7a7d..fee3869123757 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1414,11 +1414,11 @@ namespace ts { case SyntaxKind.ExportKeyword: nextToken(); if (token() === SyntaxKind.DefaultKeyword) { - return lookAhead(nextTokenCanFollowDefaultKeyword); + return lookAhead(nextTokenCanFollowDefaultModifier); } return token() !== SyntaxKind.AsteriskToken && token() !== SyntaxKind.AsKeyword && token() !== SyntaxKind.OpenBraceToken && canFollowModifier(); case SyntaxKind.DefaultKeyword: - return nextTokenCanFollowDefaultKeyword(); + return nextTokenCanFollowDefaultModifier(); case SyntaxKind.StaticKeyword: case SyntaxKind.GetKeyword: case SyntaxKind.SetKeyword: @@ -1441,12 +1441,37 @@ namespace ts { || isLiteralPropertyName(); } - function nextTokenCanFollowDefaultKeyword(): boolean { + /** + * For export default assignments like + * "export default foo" + * "export default async" + * no modifiers should be parsed. + */ + function nextTokenCanFollowDefaultModifier(): boolean { nextToken(); - return token() === SyntaxKind.ClassKeyword || token() === SyntaxKind.FunctionKeyword || - token() === SyntaxKind.InterfaceKeyword || - (token() === SyntaxKind.AbstractKeyword && lookAhead(nextTokenIsClassKeywordOnSameLine)) || - (token() === SyntaxKind.AsyncKeyword && lookAhead(nextTokenIsFunctionKeywordOnSameLine)); + switch (token()) { + case SyntaxKind.ClassKeyword: + case SyntaxKind.FunctionKeyword: + case SyntaxKind.EnumKeyword: + case SyntaxKind.NamespaceKeyword: + case SyntaxKind.ModuleKeyword: + case SyntaxKind.ConstKeyword: + return true; + + // The following keywords aren't reserved keywords and could be identifiers. + // We need to look at the next token to make sure these should be parsed as a modifier keyword, + // and not as an identifier. If they are followed by an identifier or a keyword on the same line, + // the current statement is not an export default assignment. + // See https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words + case SyntaxKind.InterfaceKeyword: + case SyntaxKind.AbstractKeyword: + case SyntaxKind.DeclareKeyword: + case SyntaxKind.AsyncKeyword: + case SyntaxKind.TypeKeyword: + return lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); + default: + return false; + } } // True if positioned at the start of a list element @@ -4081,14 +4106,14 @@ namespace ts { let expression: MemberExpression; if (token() === SyntaxKind.ImportKeyword) { if (lookAhead(nextTokenIsOpenParenOrLessThan)) { - // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "(" - // For example: - // var foo3 = require("subfolder - // import * as foo1 from "module-from-node - // We want this import to be a statement rather than import call expression - sourceFile.flags |= NodeFlags.PossiblyContainsDynamicImport; - expression = parseTokenNode(); - } + // We don't want to eagerly consume all import keyword as import call expression so we look a head to find "(" + // For example: + // var foo3 = require("subfolder + // import * as foo1 from "module-from-node + // We want this import to be a statement rather than import call expression + sourceFile.flags |= NodeFlags.PossiblyContainsDynamicImport; + expression = parseTokenNode(); + } else if (lookAhead(nextTokenIsDot)) { // This is an 'import.*' metaproperty (i.e. 'import.meta') const fullStart = scanner.getStartPos(); @@ -4101,7 +4126,7 @@ namespace ts { sourceFile.flags |= NodeFlags.PossiblyContainsImportMeta; } - else { + else { expression = parseMemberExpressionOrHigher(); } } @@ -5118,11 +5143,6 @@ namespace ts { return tokenIsIdentifierOrKeyword(token()) && !scanner.hasPrecedingLineBreak(); } - function nextTokenIsClassKeywordOnSameLine() { - nextToken(); - return token() === SyntaxKind.ClassKeyword && !scanner.hasPrecedingLineBreak(); - } - function nextTokenIsFunctionKeywordOnSameLine() { nextToken(); return token() === SyntaxKind.FunctionKeyword && !scanner.hasPrecedingLineBreak(); @@ -6233,7 +6253,7 @@ namespace ts { sourceFile.externalModuleIndicator = forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) || getImportMetaIfNecessary(sourceFile); - } + } function isAnExternalModuleIndicatorNode(node: Node) { return hasModifier(node, ModifierFlags.Export) @@ -6243,17 +6263,17 @@ namespace ts { || node.kind === SyntaxKind.ExportDeclaration ? node : undefined; - } + } function getImportMetaIfNecessary(sourceFile: SourceFile) { return sourceFile.flags & NodeFlags.PossiblyContainsImportMeta ? walkTreeForExternalModuleIndicators(sourceFile) : undefined; - } + } function walkTreeForExternalModuleIndicators(node: Node): Node | undefined { return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators); - } + } function isImportMeta(node: Node): boolean { return isMetaProperty(node) && node.keywordToken === SyntaxKind.ImportKeyword && node.name.escapedText === "meta"; @@ -6468,7 +6488,7 @@ namespace ts { break; } nextJSDocToken(); - } + } removeLeadingNewlines(comments); removeTrailingWhitespace(comments); return createJSDocComment(); diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts index 7af0b7c5ad77c..ee5771b0bbd5e 100644 --- a/src/compiler/transformers/ts.ts +++ b/src/compiler/transformers/ts.ts @@ -2653,34 +2653,12 @@ namespace ts { // `containerName` is the expression used inside of the enum for assignments. const containerName = getNamespaceContainerName(node); - // `exportName` is the expression used within this node's container for any exported references. - const exportName = hasModifier(node, ModifierFlags.Export) - ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) - : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); - - // x || (x = {}) - // exports.x || (exports.x = {}) - let moduleArg = - createLogicalOr( - exportName, - createAssignment( - exportName, - createObjectLiteral() - ) - ); - - if (hasNamespaceQualifiedExportName(node)) { - // `localName` is the expression used within this node's containing scope for any local references. - const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); - - // x = (exports.x || (exports.x = {})) - moduleArg = createAssignment(localName, moduleArg); - } + const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // (function (x) { // x[x["y"] = 0] = "y"; // ... - // })(x || (x = {})); + // })(x); const enumStatement = createExpressionStatement( createCall( createFunctionExpression( @@ -2693,23 +2671,19 @@ namespace ts { transformEnumBody(node, containerName) ), /*typeArguments*/ undefined, - [moduleArg] + [localName] ) ); setOriginalNode(enumStatement, node); - if (varAdded) { - // If a variable was added, synthetic comments are emitted on it, not on the moduleStatement. - setSyntheticLeadingComments(enumStatement, undefined); - setSyntheticTrailingComments(enumStatement, undefined); - } setTextRange(enumStatement, node); + setCommentRange(enumStatement, node); addEmitFlags(enumStatement, emitFlags); statements.push(enumStatement); // Add a DeclarationMarker for the enum to preserve trailing comments and mark // the end of the declaration. - statements.push(createEndOfDeclarationMarker(node)); + // statements.push(createEndOfDeclarationMarker(node)); return statements; } @@ -2803,18 +2777,6 @@ namespace ts { return isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules); } - /** - * Determines whether an exported declaration will have a qualified export name (e.g. `f.x` - * or `exports.x`). - */ - function hasNamespaceQualifiedExportName(node: Node) { - return isExportOfNamespace(node) - || (isExternalModuleExport(node) - && moduleKind !== ModuleKind.ES2015 - && moduleKind !== ModuleKind.ESNext - && moduleKind !== ModuleKind.System); - } - /** * Records that a declaration was emitted in the current scope, if it was the first * declaration for the provided symbol. @@ -2851,22 +2813,47 @@ namespace ts { * Adds a leading VariableStatement for a enum or module declaration. */ function addVarForEnumOrModuleDeclaration(statements: Statement[], node: ModuleDeclaration | EnumDeclaration) { - // Emit a variable statement for the module. We emit top-level enums as a `var` - // declaration to avoid static errors in global scripts scripts due to redeclaration. - // enums in any other scope are emitted as a `let` declaration. - const statement = createVariableStatement( - visitNodes(node.modifiers, modifierVisitor, isModifier), - createVariableDeclarationList([ - createVariableDeclaration( - getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) - ) - ], currentLexicalScope.kind === SyntaxKind.SourceFile ? NodeFlags.None : NodeFlags.Let) - ); - - setOriginalNode(statement, node); recordEmittedDeclarationInScope(node); if (isFirstEmittedDeclarationInScope(node)) { + // Emit a local variable statement for the module. We emit top-level enums as a `var` + // declaration to avoid static errors in global scripts scripts due to redeclaration. + // enums in any other scope are emitted as a `const` declaration. + const nodeModifierFlags = getModifierFlags(node); + const nodeIsExportDefault = (nodeModifierFlags & ModifierFlags.Export) && (nodeModifierFlags & ModifierFlags.Default); + + const fileIsExternalModule = isExternalModule(currentSourceFile); + const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + let varInitializer; + if (fileIsExternalModule && !currentNamespace) { + // toplevel declaration in an external module + // cannot merge with another var + varInitializer = createObjectLiteral(); + } + else { + const exportName = hasModifier(node, ModifierFlags.Export) && !nodeIsExportDefault + ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) + : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + varInitializer = createLogicalOr( + exportName, + createAssignment(exportName, createObjectLiteral()) + ); + } + + const statement = createVariableStatement( + visitNodes(node.modifiers, modifierVisitor, isModifier), + createVariableDeclarationList([ + createVariableDeclaration( + localName, + /* type */ undefined, + varInitializer + ) + ], currentLexicalScope.kind === SyntaxKind.SourceFile && !fileIsExternalModule ? NodeFlags.None : NodeFlags.Const) + ); + + setOriginalNode(statement, node); + + // Adjust the source map emit to match the old emitter. if (node.kind === SyntaxKind.EnumDeclaration) { setSourceMapRange(statement.declarationList, node); @@ -2882,32 +2869,28 @@ namespace ts { // module m1 { // function foo4Export() { // } - // } // trailing comment module + // } // trailing module comment // // Should emit: // // /** Module comment*/ - // var m1; + // var m1 = m1 || {}; // (function (m1) { // function foo4Export() { // } - // })(m1 || (m1 = {})); // trailing comment module + // })(m1); // trailing module comment // setCommentRange(statement, node); - addEmitFlags(statement, EmitFlags.NoTrailingComments | EmitFlags.HasEndOfDeclarationMarker); + addEmitFlags(statement, EmitFlags.NoTrailingComments); statements.push(statement); + if (nodeIsExportDefault) { + statements.push(createExportAssignment(/* decorators */ undefined, /* modifiers */ undefined, /* isExportEquals */ false, localName)); + } + else if (!currentNamespace && nodeModifierFlags & ModifierFlags.Export) { + statements.push(createExternalModuleExport(localName)); + } return true; } - else { - // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding - // declaration we do not emit a leading variable declaration. To preserve the - // begin/end semantics of the declararation and to properly handle exports - // we wrap the leading variable declaration in a `MergeDeclarationMarker`. - const mergeMarker = createMergeDeclarationMarker(statement); - setEmitFlags(mergeMarker, EmitFlags.NoComments | EmitFlags.HasEndOfDeclarationMarker); - statements.push(mergeMarker); - return false; - } } /** @@ -2948,33 +2931,11 @@ namespace ts { // `containerName` is the expression used inside of the namespace for exports. const containerName = getNamespaceContainerName(node); - // `exportName` is the expression used within this node's container for any exported references. - const exportName = hasModifier(node, ModifierFlags.Export) - ? getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) - : getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); - - // x || (x = {}) - // exports.x || (exports.x = {}) - let moduleArg = - createLogicalOr( - exportName, - createAssignment( - exportName, - createObjectLiteral() - ) - ); - - if (hasNamespaceQualifiedExportName(node)) { - // `localName` is the expression used within this node's containing scope for any local references. - const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); - - // x = (exports.x || (exports.x = {})) - moduleArg = createAssignment(localName, moduleArg); - } + const localName = getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // (function (x_1) { // x_1.y = ...; - // })(x || (x = {})); + // })(x); const moduleStatement = createExpressionStatement( createCall( createFunctionExpression( @@ -2987,23 +2948,16 @@ namespace ts { transformModuleBody(node, containerName) ), /*typeArguments*/ undefined, - [moduleArg] + [localName] ) ); setOriginalNode(moduleStatement, node); - if (varAdded) { - // If a variable was added, synthetic comments are emitted on it, not on the moduleStatement. - setSyntheticLeadingComments(moduleStatement, undefined); - setSyntheticTrailingComments(moduleStatement, undefined); - } + setCommentRange(moduleStatement, node); setTextRange(moduleStatement, node); addEmitFlags(moduleStatement, emitFlags); statements.push(moduleStatement); - // Add a DeclarationMarker for the namespace to preserve trailing comments and mark - // the end of the declaration. - statements.push(createEndOfDeclarationMarker(node)); return statements; } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js index b9338ff0ab505..db2313ff24ad7 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js @@ -23,7 +23,7 @@ var p = A.Point.Origin; var p = new A.Point(0, 0); // unexpected error here, bug 840000 //// [classPoint.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -33,7 +33,7 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); +})(A); //// [test.js] var p; var p = A.Point.Origin; diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js index f266c117dff68..aa67cdbd55987 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js @@ -58,7 +58,7 @@ var clodule1 = /** @class */ (function () { }()); (function (clodule1) { function f(x) { } -})(clodule1 || (clodule1 = {})); +})(clodule1); var clodule2 = /** @class */ (function () { function clodule2() { } @@ -71,7 +71,7 @@ var clodule2 = /** @class */ (function () { } return D; }()); -})(clodule2 || (clodule2 = {})); +})(clodule2); var clodule3 = /** @class */ (function () { function clodule3() { } @@ -79,7 +79,7 @@ var clodule3 = /** @class */ (function () { }()); (function (clodule3) { clodule3.y = { id: T }; -})(clodule3 || (clodule3 = {})); +})(clodule3); var clodule4 = /** @class */ (function () { function clodule4() { } @@ -91,4 +91,4 @@ var clodule4 = /** @class */ (function () { } return D; }()); -})(clodule4 || (clodule4 = {})); +})(clodule4); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js index abe399154dd1c..447a7fe98811e 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js @@ -28,4 +28,4 @@ var clodule = /** @class */ (function () { return x; } clodule.fn = fn; -})(clodule || (clodule = {})); +})(clodule); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js index 4bd5f9c7d370f..1e133846759dc 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js @@ -28,4 +28,4 @@ var clodule = /** @class */ (function () { return x; } clodule.fn = fn; -})(clodule || (clodule = {})); +})(clodule); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js index 6620c4fabf87e..d74f0446bba03 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js @@ -28,4 +28,4 @@ var clodule = /** @class */ (function () { return clodule.sfn('a'); } clodule.fn = fn; -})(clodule || (clodule = {})); +})(clodule); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js index de0bb3cd400a6..7616057bdc444 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js @@ -34,8 +34,8 @@ var Point = /** @class */ (function () { (function (Point) { function Origin() { return null; } //expected duplicate identifier error Point.Origin = Origin; -})(Point || (Point = {})); -var A; +})(Point); +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -49,5 +49,5 @@ var A; (function (Point) { function Origin() { return ""; } //expected duplicate identifier error Point.Origin = Origin; - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js index 50acdf1b9dadc..80c8ba6f0d984 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js @@ -33,8 +33,8 @@ var Point = /** @class */ (function () { }()); (function (Point) { function Origin() { return ""; } // not an error, since not exported -})(Point || (Point = {})); -var A; +})(Point); +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -47,5 +47,5 @@ var A; A.Point = Point; (function (Point) { function Origin() { return ""; } // not an error since not exported - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js index db07e83eb7f81..8228d4cdf2597 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js @@ -33,8 +33,8 @@ var Point = /** @class */ (function () { }()); (function (Point) { Point.Origin = ""; //expected duplicate identifier error -})(Point || (Point = {})); -var A; +})(Point); +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -47,5 +47,5 @@ var A; A.Point = Point; (function (Point) { Point.Origin = ""; //expected duplicate identifier error - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js index 246acf9af117b..867dd67b16d4a 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js @@ -33,8 +33,8 @@ var Point = /** @class */ (function () { }()); (function (Point) { var Origin = ""; // not an error, since not exported -})(Point || (Point = {})); -var A; +})(Point); +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -47,5 +47,5 @@ var A; A.Point = Point; (function (Point) { var Origin = ""; // not an error since not exported - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js index a6ca39648ae61..3078f2e951dd0 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js @@ -41,9 +41,9 @@ var a: { id: string }; //// [class.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { var Point = /** @class */ (function () { function Point(x, y) { @@ -53,19 +53,19 @@ var X; return Point; }()); Y.Point = Point; - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Y); +})(X); //// [module.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Point; + var Point = Y.Point || (Y.Point = {}); (function (Point) { Point.Origin = new Point(0, 0); - })(Point = Y.Point || (Y.Point = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Point); + })(Y); +})(X); //// [test.js] //var cl: { x: number; y: number; } var cl = new X.Y.Point(1, 1); @@ -78,7 +78,7 @@ var A = /** @class */ (function () { }()); (function (A) { A.Instance = new A(); -})(A || (A = {})); +})(A); // ensure merging works as expected var a = A.Instance; var a = new A(); diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js index 9187c99c84038..6e9f0f34f5d0c 100644 --- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js +++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRootES6.js @@ -41,9 +41,9 @@ var a: { id: string }; //// [class.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { class Point { constructor(x, y) { @@ -52,19 +52,19 @@ var X; } } Y.Point = Point; - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Y); +})(X); //// [module.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - let Point; + const Point = Y.Point || (Y.Point = {}); (function (Point) { Point.Origin = new Point(0, 0); - })(Point = Y.Point || (Y.Point = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Point); + })(Y); +})(X); //// [test.js] //var cl: { x: number; y: number; } var cl = new X.Y.Point(1, 1); @@ -74,7 +74,7 @@ class A { } (function (A) { A.Instance = new A(); -})(A || (A = {})); +})(A); // ensure merging works as expected var a = A.Instance; var a = new A(); diff --git a/tests/baselines/reference/ES5SymbolProperty2.js b/tests/baselines/reference/ES5SymbolProperty2.js index 3de8541a6c94d..ba191b6a8ce00 100644 --- a/tests/baselines/reference/ES5SymbolProperty2.js +++ b/tests/baselines/reference/ES5SymbolProperty2.js @@ -11,7 +11,7 @@ module M { (new M.C)[Symbol.iterator]; //// [ES5SymbolProperty2.js] -var M; +var M = M || (M = {}); (function (M) { var Symbol; var C = /** @class */ (function () { @@ -22,5 +22,5 @@ var M; }()); M.C = C; (new C)[Symbol.iterator]; -})(M || (M = {})); +})(M); (new M.C)[Symbol.iterator]; diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js index 40075310eb1f5..2c024c742e1e3 100644 --- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js @@ -17,11 +17,11 @@ var y: { x: number; y: number }; var y = new enumdule.Point(0, 0); //// [EnumAndModuleWithSameNameAndCommonRoot.js] -var enumdule; +var enumdule = enumdule || (enumdule = {}); (function (enumdule) { enumdule[enumdule["Red"] = 0] = "Red"; enumdule[enumdule["Blue"] = 1] = "Blue"; -})(enumdule || (enumdule = {})); +})(enumdule); (function (enumdule) { var Point = /** @class */ (function () { function Point(x, y) { @@ -31,7 +31,7 @@ var enumdule; return Point; }()); enumdule.Point = Point; -})(enumdule || (enumdule = {})); +})(enumdule); var x; var x = enumdule.Red; var y; diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js index 94faa0dd4b34c..ffbbb640afaad 100644 --- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js +++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js @@ -20,7 +20,7 @@ module A { //// [ExportClassWhichExtendsInterfaceWithInaccessibleType.js] -var A; +var A = A || (A = {}); (function (A) { var Point2d = /** @class */ (function () { function Point2d(x, y) { @@ -33,4 +33,4 @@ var A; return Point2d; }()); A.Point2d = Point2d; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index e609e3d1e6c81..a575b375c1a99 100644 --- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -60,4 +60,4 @@ var A; return Line; }()); A.Line = Line; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js index 7642a6cbe871a..00f947986e945 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js @@ -16,7 +16,7 @@ module A { //// [ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -29,4 +29,4 @@ var A; return points; }()); A.points = points; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js index 29416ab80b305..f21865e682a9e 100644 --- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js @@ -38,7 +38,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -66,4 +66,4 @@ var A; return Line; }()); A.Line = Line; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js index 2d7e408d81ba6..0409c1a55a9ce 100644 --- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js @@ -16,7 +16,7 @@ module A { } //// [ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -36,4 +36,4 @@ var A; return new Line({ x: 0, y: 0 }, p); } A.fromOrigin = fromOrigin; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js index ac8e36d42224a..bb7ca40f013e8 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js @@ -16,7 +16,7 @@ module A { } //// [ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -35,4 +35,4 @@ var A; return new Line({ x: 0, y: 0 }, p); } A.fromOrigin = fromOrigin; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js index b2abc1a4d31fc..a8f04def35053 100644 --- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js +++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js @@ -16,7 +16,7 @@ module A { } //// [ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -35,4 +35,4 @@ var A; return new Line({ x: 0, y: 0 }, p); } A.fromOrigin = fromOrigin; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js index e2b32a3bca409..3a1d170104ace 100644 --- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js @@ -23,8 +23,8 @@ module A { //// [ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js] -var A; +var A = A || (A = {}); (function (A) { A.Origin = { x: 0, y: 0 }; A.Origin3d = { x: 0, y: 0, z: 0 }; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js index 7625500a1d0a4..d19d868eab5ff 100644 --- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js +++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js @@ -24,8 +24,8 @@ module A { //// [ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.js] -var A; +var A = A || (A = {}); (function (A) { A.Origin = { x: 0, y: 0 }; A.Origin3d = { x: 0, y: 0, z: 0 }; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js index 401962dd2616f..ad791846fa7bb 100644 --- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js +++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js @@ -21,7 +21,7 @@ module A { } //// [ExportModuleWithAccessibleTypesOnItsExportedMembers.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -31,7 +31,7 @@ var A; return Point; }()); A.Point = Point; - var B; + var B = A.B || (A.B = {}); (function (B) { B.Origin = new Point(0, 0); var Line = /** @class */ (function () { @@ -43,5 +43,5 @@ var A; return Line; }()); B.Line = Line; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js index 0990c9bf2bd2d..b9b9051271eb8 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js @@ -12,7 +12,7 @@ module A { //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -23,4 +23,4 @@ var A; }()); A.Origin = { x: 0, y: 0 }; A.Unity = { start: new Point(0, 0), end: new Point(1, 0) }; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js index b454d785e9c7a..f8029b4b8375c 100644 --- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js +++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js @@ -12,7 +12,7 @@ module A { } //// [ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -22,4 +22,4 @@ var A; return Point; }()); A.UnitSquare = null; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js index e194bc3f8099c..a0fbd96cbfb47 100644 --- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js +++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js @@ -9,7 +9,7 @@ module A { } //// [ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js] -var A; +var A = A || (A = {}); (function (A) { var B = /** @class */ (function () { function B() { @@ -17,4 +17,4 @@ var A; return B; }()); A.beez2 = new Array(); -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js index 591845b627e2b..b5496ff0e94de 100644 --- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.js @@ -12,8 +12,8 @@ module A { //// [ExportVariableWithAccessibleTypeInTypeAnnotation.js] -var A; +var A = A || (A = {}); (function (A) { // valid since Point is exported A.Origin = { x: 0, y: 0 }; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js index d63edb655691a..55e1a0797a2bb 100644 --- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js +++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.js @@ -19,10 +19,10 @@ module A { //// [ExportVariableWithInaccessibleTypeInTypeAnnotation.js] -var A; +var A = A || (A = {}); (function (A) { // valid since Point is exported A.Origin = { x: 0, y: 0 }; // invalid Point3d is not exported A.Origin3d = { x: 0, y: 0, z: 0 }; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js index daa56620014bd..207cdd09d1c8b 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js @@ -44,21 +44,21 @@ var cl = B.Point.Origin; //// [function.js] -var A; +var A = A || (A = {}); (function (A) { function Point() { return { x: 0, y: 0 }; } A.Point = Point; -})(A || (A = {})); +})(A); //// [module.js] -var A; +var A = A || (A = {}); (function (A) { - var Point; + var Point = A.Point || (A.Point = {}); (function (Point) { Point.Origin = { x: 0, y: 0 }; - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); //// [test.js] var fn; var fn = A.Point; @@ -66,7 +66,7 @@ var cl; var cl = A.Point(); var cl = A.Point.Origin; // not expected to be an error. //// [simple.js] -var B; +var B = B || (B = {}); (function (B) { function Point() { return { x: 0, y: 0 }; @@ -74,8 +74,8 @@ var B; B.Point = Point; (function (Point) { Point.Origin = { x: 0, y: 0 }; - })(Point = B.Point || (B.Point = {})); -})(B || (B = {})); + })(Point); +})(B); var fn; var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected var cl; diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js index 13302ea391a09..1c6cfe5a3d475 100644 --- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js @@ -23,21 +23,21 @@ var cl = B.Point.Origin; //// [function.js] -var A; +var A = A || (A = {}); (function (A) { function Point() { return { x: 0, y: 0 }; } A.Point = Point; -})(A || (A = {})); +})(A); //// [module.js] -var B; +var B = B || (B = {}); (function (B) { - var Point; + var Point = B.Point || (B.Point = {}); (function (Point) { Point.Origin = { x: 0, y: 0 }; - })(Point = B.Point || (B.Point = {})); -})(B || (B = {})); + })(Point); +})(B); //// [test.js] var fn; var fn = A.Point; diff --git a/tests/baselines/reference/FunctionDeclaration7.js b/tests/baselines/reference/FunctionDeclaration7.js index 545d9f236cae0..5a184de8c5a62 100644 --- a/tests/baselines/reference/FunctionDeclaration7.js +++ b/tests/baselines/reference/FunctionDeclaration7.js @@ -4,6 +4,6 @@ module M { } //// [FunctionDeclaration7.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js index 699e7ce7678c5..5d72a76997154 100644 --- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js @@ -32,20 +32,20 @@ class A { //// [module.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Point; + var Point = Y.Point || (Y.Point = {}); (function (Point) { Point.Origin = new Point(0, 0); - })(Point = Y.Point || (Y.Point = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Point); + })(Y); +})(X); //// [classPoint.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { // duplicate identifier var Point = /** @class */ (function () { @@ -56,13 +56,13 @@ var X; return Point; }()); Y.Point = Point; - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Y); +})(X); //// [simple.js] -var A; +var A = A || (A = {}); (function (A) { A.Instance = new A(); -})(A || (A = {})); +})(A); // duplicate identifier var A = /** @class */ (function () { function A() { diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js index 740d02edd17ff..3fa6a09709d9f 100644 --- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js @@ -17,7 +17,7 @@ var y: { x: number; y: number }; var y = new enumdule.Point(0, 0); //// [ModuleAndEnumWithSameNameAndCommonRoot.js] -var enumdule; +var enumdule = enumdule || (enumdule = {}); (function (enumdule) { var Point = /** @class */ (function () { function Point(x, y) { @@ -27,11 +27,11 @@ var enumdule; return Point; }()); enumdule.Point = Point; -})(enumdule || (enumdule = {})); +})(enumdule); (function (enumdule) { enumdule[enumdule["Red"] = 0] = "Red"; enumdule[enumdule["Blue"] = 1] = "Blue"; -})(enumdule || (enumdule = {})); +})(enumdule); var x; var x = enumdule.Red; var y; diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js index e9b8f44f89543..2425aa0b28b8e 100644 --- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js @@ -30,32 +30,32 @@ module B { //// [module.js] -var A; +var A = A || (A = {}); (function (A) { - var Point; + var Point = A.Point || (A.Point = {}); (function (Point) { Point.Origin = { x: 0, y: 0 }; - })(Point = A.Point || (A.Point = {})); -})(A || (A = {})); + })(Point); +})(A); //// [function.js] -var A; +var A = A || (A = {}); (function (A) { // duplicate identifier error function Point() { return { x: 0, y: 0 }; } A.Point = Point; -})(A || (A = {})); +})(A); //// [simple.js] -var B; +var B = B || (B = {}); (function (B) { - var Point; + var Point = B.Point || (B.Point = {}); (function (Point) { Point.Origin = { x: 0, y: 0 }; - })(Point = B.Point || (B.Point = {})); + })(Point); // duplicate identifier error function Point() { return { x: 0, y: 0 }; } B.Point = Point; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js index 26d014f16c2f3..6047942ea0f28 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js @@ -34,7 +34,7 @@ var ag2 = new A.A2(); //// [ModuleWithExportedAndNonExportedClasses.js] -var A; +var A = A || (A = {}); (function (A_1) { var A = /** @class */ (function () { function A() { @@ -58,7 +58,7 @@ var A; } return AG2; }()); -})(A || (A = {})); +})(A); // no errors expected, these are all exported var a; var a = new A.A(); diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js index 713d2ac7f1870..30a06fe7d0f57 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedEnums.js @@ -12,19 +12,19 @@ var b = A.Day.Monday; //// [ModuleWithExportedAndNonExportedEnums.js] -var A; +var A = A || (A = {}); (function (A) { - var Color; + var Color = A.Color || (A.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Blue"] = 1] = "Blue"; - })(Color = A.Color || (A.Color = {})); - var Day; + })(Color); + var Day = Day || (Day = {}); (function (Day) { Day[Day["Monday"] = 0] = "Monday"; Day[Day["Tuesday"] = 1] = "Tuesday"; - })(Day || (Day = {})); -})(A || (A = {})); + })(Day); +})(A); // not an error since exported var a = A.Color.Red; // error not exported diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js index ed0e1f90bf33f..602bba7011da4 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedFunctions.js @@ -30,7 +30,7 @@ var fn2 = A.fn2; var fng2 = A.fng2; //// [ModuleWithExportedAndNonExportedFunctions.js] -var A; +var A = A || (A = {}); (function (A) { function fn(s) { return true; @@ -46,7 +46,7 @@ var A; function fng2(s) { return null; } -})(A || (A = {})); +})(A); // these should not be errors since the functions are exported var fn; var fn = A.fn; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js index e1c36200005c5..749d4284a931a 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js @@ -40,7 +40,7 @@ var line = Geometry.Lines.Line; //// [ModuleWithExportedAndNonExportedImportAlias.js] -var B; +var B = B || (B = {}); (function (B) { var Line = /** @class */ (function () { function Line(start, end) { @@ -50,14 +50,14 @@ var B; return Line; }()); B.Line = Line; -})(B || (B = {})); -var Geometry; +})(B); +var Geometry = Geometry || (Geometry = {}); (function (Geometry) { var Lines = B; Geometry.Origin = { x: 0, y: 0 }; // this is valid since B.Line _is_ visible outside Geometry Geometry.Unit = new Lines.Line(Geometry.Origin, { x: 1, y: 0 }); -})(Geometry || (Geometry = {})); +})(Geometry); // expected to work since all are exported var p; var p; diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js index 0a2c63342c6f4..ae0ed4cf34861 100644 --- a/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js +++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedVariables.js @@ -13,11 +13,11 @@ var y = A.y; //// [ModuleWithExportedAndNonExportedVariables.js] -var A; +var A = A || (A = {}); (function (A) { A.x = 'hello world'; var y = 12; -})(A || (A = {})); +})(A); var x; var x = A.x; // Error, since y is not exported diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.js b/tests/baselines/reference/NonInitializedExportInInternalModule.js index e1df1d41f5483..d1caf728114ae 100644 --- a/tests/baselines/reference/NonInitializedExportInInternalModule.js +++ b/tests/baselines/reference/NonInitializedExportInInternalModule.js @@ -35,7 +35,7 @@ module Inner { } //// [NonInitializedExportInInternalModule.js] -var Inner; +var Inner = Inner || (Inner = {}); (function (Inner) { var ; let; @@ -45,14 +45,14 @@ var Inner; } return A; }()); - var B; + var B = B || (B = {}); (function (B) { B.a = 1, B.c = 2; - })(B || (B = {})); - var C; + })(B); + var C = C || (C = {}); (function (C) { C.a = 1, C.c = 2; - })(C || (C = {})); + })(C); // Shouldn't be filtered Inner.a1 = 1; Inner.b1 = 1; @@ -67,4 +67,4 @@ var Inner; Inner.f1 = new D; Inner.g1 = new D; Inner.h1 = new D; -})(Inner || (Inner = {})); +})(Inner); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js index 134c14e3a8ecb..65dd3d3714aa6 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js @@ -41,7 +41,7 @@ var l: X.Y.Z.Line; //// [TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -49,7 +49,7 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); +})(A); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -59,15 +59,15 @@ var A; }; return Point; }()); -})(A || (A = {})); +})(A); // ensure merges as expected var p; var p; -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { var Line = /** @class */ (function () { function Line() { @@ -75,22 +75,22 @@ var X; return Line; }()); Z.Line = Line; - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { var Line = /** @class */ (function () { function Line() { } return Line; }()); - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); // ensure merges as expected var l; var l; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js index 16c37108d3f0a..d83bb00e868ae 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js @@ -42,23 +42,23 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 }); //// [part1.js] -var A; +var A = A || (A = {}); (function (A) { - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { function mirror(p) { return { x: p.y, y: p.x }; } Utils.mirror = mirror; - })(Utils = A.Utils || (A.Utils = {})); + })(Utils); A.Origin = { x: 0, y: 0 }; -})(A || (A = {})); +})(A); //// [part2.js] -var A; +var A = A || (A = {}); (function (A) { // not a collision, since we don't export var Origin = "0,0"; - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { var Plane = /** @class */ (function () { function Plane(tl, br) { @@ -68,8 +68,8 @@ var A; return Plane; }()); Utils.Plane = Plane; - })(Utils = A.Utils || (A.Utils = {})); -})(A || (A = {})); + })(Utils); +})(A); //// [part3.js] // test the merging actually worked var o; diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js index 9e7c7d46aee56..318ed4d7ae50b 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js @@ -33,7 +33,7 @@ module X { //// [TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point() { @@ -41,7 +41,7 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); +})(A); (function (A) { // expected error var Point = /** @class */ (function () { @@ -50,12 +50,12 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); -var X; +})(A); +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { var Line = /** @class */ (function () { function Line() { @@ -63,13 +63,13 @@ var X; return Line; }()); Z.Line = Line; - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { // expected error var Line = /** @class */ (function () { @@ -78,6 +78,6 @@ var X; return Line; }()); Z.Line = Line; - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js index b0565965b9f08..794ff44f9325e 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js @@ -32,25 +32,25 @@ export module A { //// [part1.js] "use strict"; exports.__esModule = true; -var A; +var A = {}; (function (A) { - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { function mirror(p) { return { x: p.y, y: p.x }; } Utils.mirror = mirror; - })(Utils = A.Utils || (A.Utils = {})); + })(Utils); A.Origin = { x: 0, y: 0 }; -})(A = exports.A || (exports.A = {})); +})(A); //// [part2.js] "use strict"; exports.__esModule = true; -var A; +var A = {}; (function (A) { // collision with 'Origin' var in other part of merged module A.Origin = { x: 0, y: 0 }; - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { var Plane = /** @class */ (function () { function Plane(tl, br) { @@ -60,5 +60,5 @@ var A; return Plane; }()); Utils.Plane = Plane; - })(Utils = A.Utils || (A.Utils = {})); -})(A = exports.A || (exports.A = {})); + })(Utils); +})(A); diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js index c3c05c722539d..96e780d445fd9 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js @@ -35,25 +35,25 @@ var l: X.Y.Z.Line; //// [TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); (function (A) { - var B; + var B = B || (B = {}); (function (B) { - })(B || (B = {})); -})(A || (A = {})); + })(B); +})(A); // ensure the right var decl is exported var x; var x = A.B.x; -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { var Line = /** @class */ (function () { function Line() { @@ -61,13 +61,13 @@ var X; return Line; }()); Z.Line = Line; - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Z || (Z = {}); (function (Z) { var Line = /** @class */ (function () { function Line() { @@ -75,9 +75,9 @@ var X; return Line; }()); Z.Line = Line; - })(Z || (Z = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(Y); +})(X); // make sure merging works as expected var l; var l; diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js index 4b6ee2b14e4bd..628d89bba6734 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js @@ -31,27 +31,27 @@ module otherRoot { } //// [part1.js] -var Root; +var Root = Root || (Root = {}); (function (Root) { - var A; + var A = Root.A || (Root.A = {}); (function (A) { - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { function mirror(p) { return { x: p.y, y: p.x }; } Utils.mirror = mirror; - })(Utils = A.Utils || (A.Utils = {})); - })(A = Root.A || (Root.A = {})); -})(Root || (Root = {})); + })(Utils); + })(A); +})(Root); //// [part2.js] -var otherRoot; +var otherRoot = otherRoot || (otherRoot = {}); (function (otherRoot) { - var A; + var A = otherRoot.A || (otherRoot.A = {}); (function (A) { // have to be fully qualified since in different root A.Origin = { x: 0, y: 0 }; - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { var Plane = /** @class */ (function () { function Plane(tl, br) { @@ -61,6 +61,6 @@ var otherRoot; return Plane; }()); Utils.Plane = Plane; - })(Utils = A.Utils || (A.Utils = {})); - })(A = otherRoot.A || (otherRoot.A = {})); -})(otherRoot || (otherRoot = {})); + })(Utils); + })(A); +})(otherRoot); diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js index d221274edd87b..5dcfa22fe24b1 100644 --- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js +++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js @@ -40,21 +40,21 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 }); //// [part1.js] -var A; +var A = A || (A = {}); (function (A) { - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { function mirror(p) { return { x: p.y, y: p.x }; } Utils.mirror = mirror; - })(Utils = A.Utils || (A.Utils = {})); -})(A || (A = {})); + })(Utils); +})(A); //// [part2.js] -var A; +var A = A || (A = {}); (function (A) { A.Origin = { x: 0, y: 0 }; - var Utils; + var Utils = A.Utils || (A.Utils = {}); (function (Utils) { var Plane = /** @class */ (function () { function Plane(tl, br) { @@ -64,8 +64,8 @@ var A; return Plane; }()); Utils.Plane = Plane; - })(Utils = A.Utils || (A.Utils = {})); -})(A || (A = {})); + })(Utils); +})(A); //// [part3.js] // test the merging actually worked var o; diff --git a/tests/baselines/reference/TypeGuardWithEnumUnion.js b/tests/baselines/reference/TypeGuardWithEnumUnion.js index f582c70857af7..31baff3610e4b 100644 --- a/tests/baselines/reference/TypeGuardWithEnumUnion.js +++ b/tests/baselines/reference/TypeGuardWithEnumUnion.js @@ -37,12 +37,12 @@ function f2(x: Color | string | string[]) { //// [TypeGuardWithEnumUnion.js] -var Color; +var Color = Color || (Color = {}); (function (Color) { Color[Color["R"] = 0] = "R"; Color[Color["G"] = 1] = "G"; Color[Color["B"] = 2] = "B"; -})(Color || (Color = {})); +})(Color); function f1(x) { if (typeof x === "number") { var y = x; diff --git a/tests/baselines/reference/acceptableAlias1.js b/tests/baselines/reference/acceptableAlias1.js index d93b2f8791f6f..e0c4946c6485e 100644 --- a/tests/baselines/reference/acceptableAlias1.js +++ b/tests/baselines/reference/acceptableAlias1.js @@ -8,6 +8,6 @@ module M { import r = M.X; //// [acceptableAlias1.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js index 82559b521dd85..587415112a562 100644 --- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js @@ -47,15 +47,15 @@ var C = /** @class */ (function () { C.foo = function () { }; return C; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); -var M; +})(E); +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var a; var b; var c; diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js index fe7a332b5eef1..f4050797e700d 100644 --- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js @@ -48,15 +48,15 @@ var C = /** @class */ (function () { C.foo = function () { }; return C; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); -var M; +})(E); +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var a; var b; var c; diff --git a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js index 1b5cb877d21bc..793944867a0bf 100644 --- a/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js +++ b/tests/baselines/reference/additionOperatorWithNullValueAndValidOperator.js @@ -32,12 +32,12 @@ var r16 = '' + null; //// [additionOperatorWithNullValueAndValidOperator.js] // If one operand is the null or undefined value, it is treated as having the type of the other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/additionOperatorWithNumberAndEnum.js b/tests/baselines/reference/additionOperatorWithNumberAndEnum.js index d559e98dc3eff..2fa77ddfbdf82 100644 --- a/tests/baselines/reference/additionOperatorWithNumberAndEnum.js +++ b/tests/baselines/reference/additionOperatorWithNumberAndEnum.js @@ -25,16 +25,16 @@ var r14 = c + c; //// [additionOperatorWithNumberAndEnum.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { F[F["c"] = 0] = "c"; F[F["d"] = 1] = "d"; -})(F || (F = {})); +})(F); var a; var b; var c; diff --git a/tests/baselines/reference/additionOperatorWithStringAndEveryType.js b/tests/baselines/reference/additionOperatorWithStringAndEveryType.js index 03456020c802f..6cfa20b23207e 100644 --- a/tests/baselines/reference/additionOperatorWithStringAndEveryType.js +++ b/tests/baselines/reference/additionOperatorWithStringAndEveryType.js @@ -39,12 +39,12 @@ var r19 = x + { a: '' }; var r20 = x + []; //// [additionOperatorWithStringAndEveryType.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/additionOperatorWithTypeParameter.js b/tests/baselines/reference/additionOperatorWithTypeParameter.js index a568f420a32a4..935e69c0d7347 100644 --- a/tests/baselines/reference/additionOperatorWithTypeParameter.js +++ b/tests/baselines/reference/additionOperatorWithTypeParameter.js @@ -40,11 +40,11 @@ function foo(t: T, u: U) { //// [additionOperatorWithTypeParameter.js] // type parameter type is not a valid operand of addition operator -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); function foo(t, u) { var a; var b; diff --git a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js index 68804694449e1..f10616292eaed 100644 --- a/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js +++ b/tests/baselines/reference/additionOperatorWithUndefinedValueAndValidOperator.js @@ -32,12 +32,12 @@ var r16 = '' + undefined; //// [additionOperatorWithUndefinedValueAndValidOperator.js] // If one operand is the null or undefined value, it is treated as having the type of the other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/aliasBug.js b/tests/baselines/reference/aliasBug.js index 502bc9e11a715..17831fa50bac7 100644 --- a/tests/baselines/reference/aliasBug.js +++ b/tests/baselines/reference/aliasBug.js @@ -20,7 +20,7 @@ function use() { //// [aliasBug.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { var Provide = /** @class */ (function () { function Provide() { @@ -28,9 +28,9 @@ var foo; return Provide; }()); foo.Provide = Provide; - var bar; + var bar = foo.bar || (foo.bar = {}); (function (bar) { - var baz; + var baz = bar.baz || (bar.baz = {}); (function (baz) { var boo = /** @class */ (function () { function boo() { @@ -38,9 +38,9 @@ var foo; return boo; }()); baz.boo = boo; - })(baz = bar.baz || (bar.baz = {})); - })(bar = foo.bar || (foo.bar = {})); -})(foo || (foo = {})); + })(baz); + })(bar); +})(foo); var provide = foo; var booz = foo.bar.baz; var p = new provide.Provide(); diff --git a/tests/baselines/reference/aliasErrors.js b/tests/baselines/reference/aliasErrors.js index 54edb24fff32d..51e8b816d4a39 100644 --- a/tests/baselines/reference/aliasErrors.js +++ b/tests/baselines/reference/aliasErrors.js @@ -31,7 +31,7 @@ function use() { //// [aliasErrors.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { var Provide = /** @class */ (function () { function Provide() { @@ -39,9 +39,9 @@ var foo; return Provide; }()); foo.Provide = Provide; - var bar; + var bar = foo.bar || (foo.bar = {}); (function (bar) { - var baz; + var baz = bar.baz || (bar.baz = {}); (function (baz) { var boo = /** @class */ (function () { function boo() { @@ -49,9 +49,9 @@ var foo; return boo; }()); baz.boo = boo; - })(baz = bar.baz || (bar.baz = {})); - })(bar = foo.bar || (foo.bar = {})); -})(foo || (foo = {})); + })(baz); + })(bar); +})(foo); var provide = foo; var booz = foo.bar.baz; var beez = foo.bar; diff --git a/tests/baselines/reference/aliasInaccessibleModule.js b/tests/baselines/reference/aliasInaccessibleModule.js index 66a59a9f0ee80..2e48e4860ec6a 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.js +++ b/tests/baselines/reference/aliasInaccessibleModule.js @@ -6,9 +6,9 @@ module M { } //// [aliasInaccessibleModule.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); //// [aliasInaccessibleModule.d.ts] diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js index 324581ce62295..1425f07315cc4 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.js +++ b/tests/baselines/reference/aliasInaccessibleModule2.js @@ -10,19 +10,19 @@ module M { } //// [aliasInaccessibleModule2.js] -var M; +var M = M || (M = {}); (function (M) { - var N; + var N = N || (N = {}); (function (N) { var C = /** @class */ (function () { function C() { } return C; }()); - })(N || (N = {})); + })(N); var R = N; M.X = R; -})(M || (M = {})); +})(M); //// [aliasInaccessibleModule2.d.ts] diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js index 468ff805b2dde..5828522081826 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.js +++ b/tests/baselines/reference/aliasesInSystemModule1.js @@ -32,12 +32,13 @@ System.register(["foo"], function (exports_1, context_1) { x = new alias.Class(); y = new cls(); z = new cls2(); + M = {}; (function (M) { M.cls = alias.Class; var x = new alias.Class(); var y = new M.cls(); var z = new cls2(); - })(M || (M = {})); + })(M); } }; }); diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js index af7208d5c99ec..bc022d763a1e2 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.js +++ b/tests/baselines/reference/aliasesInSystemModule2.js @@ -31,12 +31,13 @@ System.register(["foo"], function (exports_1, context_1) { x = new foo_1.alias.Class(); y = new cls(); z = new cls2(); + M = {}; (function (M) { M.cls = foo_1.alias.Class; var x = new foo_1.alias.Class(); var y = new M.cls(); var z = new cls2(); - })(M || (M = {})); + })(M); } }; }); diff --git a/tests/baselines/reference/alwaysStrictModule.js b/tests/baselines/reference/alwaysStrictModule.js index f5c5835df5f1e..ecf6d17c81e0c 100644 --- a/tests/baselines/reference/alwaysStrictModule.js +++ b/tests/baselines/reference/alwaysStrictModule.js @@ -7,10 +7,10 @@ module M { //// [alwaysStrictModule.js] "use strict"; -var M; +var M = M || (M = {}); (function (M) { function f() { var arguments = []; } M.f = f; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/alwaysStrictModule2.js b/tests/baselines/reference/alwaysStrictModule2.js index 157e11e760ad2..d3756fea349ff 100644 --- a/tests/baselines/reference/alwaysStrictModule2.js +++ b/tests/baselines/reference/alwaysStrictModule2.js @@ -16,17 +16,17 @@ module M { //// [out.js] "use strict"; -var M; +var M = M || (M = {}); (function (M) { function f() { var arguments = []; } M.f = f; -})(M || (M = {})); -var M; +})(M); +var M = M || (M = {}); (function (M) { function f2() { var arguments = []; } M.f2 = f2; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js index ff5a1166a89f4..d31839a05d891 100644 --- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js +++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.js @@ -7,10 +7,10 @@ module M { //// [alwaysStrictNoImplicitUseStrict.js] "use strict"; -var M; +var M = M || (M = {}); (function (M) { function f() { var arguments = []; } M.f = f; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/ambientClassDeclarationWithExtends.js b/tests/baselines/reference/ambientClassDeclarationWithExtends.js index 1b7bcf88b2084..02b65d0e21da1 100644 --- a/tests/baselines/reference/ambientClassDeclarationWithExtends.js +++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.js @@ -24,15 +24,15 @@ var f: E = new F(); //// [ambientClassDeclarationExtends_singleFile.js] -var D; +var D = D || (D = {}); (function (D) { var x; -})(D || (D = {})); +})(D); var d = new D(); //// [ambientClassDeclarationExtends_file1.js] -var F; +var F = F || (F = {}); (function (F) { var y; -})(F || (F = {})); +})(F); //// [ambientClassDeclarationExtends_file2.js] var f = new F(); diff --git a/tests/baselines/reference/ambientConstLiterals.js b/tests/baselines/reference/ambientConstLiterals.js index c5c0fbaafbc01..363b864a3d8f4 100644 --- a/tests/baselines/reference/ambientConstLiterals.js +++ b/tests/baselines/reference/ambientConstLiterals.js @@ -25,13 +25,13 @@ const c14 = Math.random() > 0.5 ? 123 : 456; function f(x) { return x; } -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; E[E["non identifier"] = 3] = "non identifier"; -})(E || (E = {})); +})(E); var c1 = "abc"; var c2 = 123; var c3 = c1; diff --git a/tests/baselines/reference/ambientInsideNonAmbient.js b/tests/baselines/reference/ambientInsideNonAmbient.js index 9a3c5558e0732..9ad34ac814284 100644 --- a/tests/baselines/reference/ambientInsideNonAmbient.js +++ b/tests/baselines/reference/ambientInsideNonAmbient.js @@ -16,9 +16,9 @@ module M2 { } //// [ambientInsideNonAmbient.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); -var M2; +})(M); +var M2 = M2 || (M2 = {}); (function (M2) { -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js index 69d3e095dc7e3..3406da417ee00 100644 --- a/tests/baselines/reference/amdImportAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js @@ -16,12 +16,12 @@ if(foo.E1.A === 0){ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var E1; + var E1 = {}; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; - })(E1 = exports.E1 || (exports.E1 = {})); + })(E1); }); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js index fe0a9be2a085d..5ce404570c236 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js @@ -43,12 +43,12 @@ define(["require", "exports"], function (require, exports) { return C1; }()); exports.C1 = C1; - var E1; + var E1 = {}; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; - })(E1 = exports.E1 || (exports.E1 = {})); + })(E1); }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/anonterface.js b/tests/baselines/reference/anonterface.js index 3c4e04cd23c82..ee542f212389d 100644 --- a/tests/baselines/reference/anonterface.js +++ b/tests/baselines/reference/anonterface.js @@ -15,7 +15,7 @@ c.m(function(n) { return "hello: "+n; },18); //// [anonterface.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -26,6 +26,6 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); var c = new M.C(); c.m(function (n) { return "hello: " + n; }, 18); diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js index 6871d6738aca7..388c50e670245 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.js +++ b/tests/baselines/reference/anyAssignabilityInInheritance.js @@ -113,15 +113,15 @@ var A2 = /** @class */ (function () { var r3 = foo3(a); // any var r3 = foo3(a); // any var r3 = foo3(a); // any -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var r3 = foo3(a); // any function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var r3 = foo3(a); // any var CC = /** @class */ (function () { function CC() { @@ -130,7 +130,7 @@ var CC = /** @class */ (function () { }()); (function (CC) { CC.bar = 1; -})(CC || (CC = {})); +})(CC); var r3 = foo3(a); // any var r3 = foo3(a); // any var r3 = foo3(a); // any diff --git a/tests/baselines/reference/anyAssignableToEveryType.js b/tests/baselines/reference/anyAssignableToEveryType.js index eff97905e4f4a..ec024eb4b343f 100644 --- a/tests/baselines/reference/anyAssignableToEveryType.js +++ b/tests/baselines/reference/anyAssignableToEveryType.js @@ -54,10 +54,10 @@ var C = /** @class */ (function () { }()); var ac; var ai; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var ae; var b = a; var c = a; diff --git a/tests/baselines/reference/anyAssignableToEveryType2.js b/tests/baselines/reference/anyAssignableToEveryType2.js index 28b4ab7148d90..f5e6cbc51844c 100644 --- a/tests/baselines/reference/anyAssignableToEveryType2.js +++ b/tests/baselines/reference/anyAssignableToEveryType2.js @@ -142,14 +142,14 @@ var A2 = /** @class */ (function () { } return A2; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -157,4 +157,4 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); diff --git a/tests/baselines/reference/anyDeclare.js b/tests/baselines/reference/anyDeclare.js index 8bb2f55eb84a9..dd9f6c4d387f7 100644 --- a/tests/baselines/reference/anyDeclare.js +++ b/tests/baselines/reference/anyDeclare.js @@ -7,8 +7,8 @@ module myMod { //// [anyDeclare.js] -var myMod; +var myMod = myMod || (myMod = {}); (function (myMod) { var myFn; function myFn() { } -})(myMod || (myMod = {})); +})(myMod); diff --git a/tests/baselines/reference/arithmeticOperatorWithEnum.js b/tests/baselines/reference/arithmeticOperatorWithEnum.js index 3572f3ecc41e4..b4f18ccbca426 100644 --- a/tests/baselines/reference/arithmeticOperatorWithEnum.js +++ b/tests/baselines/reference/arithmeticOperatorWithEnum.js @@ -152,11 +152,11 @@ var rj12 = 1 | E.b; //// [arithmeticOperatorWithEnum.js] // operands of an enum type are treated as having the primitive type Number. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/arithmeticOperatorWithEnumUnion.js b/tests/baselines/reference/arithmeticOperatorWithEnumUnion.js index 95bc0b866c91c..94e882e95226d 100644 --- a/tests/baselines/reference/arithmeticOperatorWithEnumUnion.js +++ b/tests/baselines/reference/arithmeticOperatorWithEnumUnion.js @@ -156,16 +156,16 @@ var rj12 = 1 | E.b; //// [arithmeticOperatorWithEnumUnion.js] // operands of an enum type are treated as having the primitive type Number. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { F[F["c"] = 0] = "c"; F[F["d"] = 1] = "d"; -})(F || (F = {})); +})(F); var a; var b; var c; diff --git a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js index 974e9930103d7..58da87b67943f 100644 --- a/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/arithmeticOperatorWithInvalidOperands.js @@ -584,12 +584,12 @@ var r10h6 = f | E.b; //// [arithmeticOperatorWithInvalidOperands.js] // these operators require their operands to be of type Any, the Number primitive type, or // an enum type -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js index 0c30e8d048492..7e7ec94df8e3d 100644 --- a/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js +++ b/tests/baselines/reference/arithmeticOperatorWithNullValueAndValidOperands.js @@ -113,11 +113,11 @@ var rj8 = E.b | null; //// [arithmeticOperatorWithNullValueAndValidOperands.js] // If one operand is the null or undefined value, it is treated as having the type of the // other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; // operator * diff --git a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js index 60ea9af32c2b5..6f4ebf3982166 100644 --- a/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js +++ b/tests/baselines/reference/arithmeticOperatorWithUndefinedValueAndValidOperands.js @@ -113,11 +113,11 @@ var rj8 = E.b | undefined; //// [arithmeticOperatorWithUndefinedValueAndValidOperands.js] // If one operand is the undefined or undefined value, it is treated as having the type of the // other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; // operator * diff --git a/tests/baselines/reference/arrayAssignmentTest5.js b/tests/baselines/reference/arrayAssignmentTest5.js index 71c84f374ee6c..84d8469e6571a 100644 --- a/tests/baselines/reference/arrayAssignmentTest5.js +++ b/tests/baselines/reference/arrayAssignmentTest5.js @@ -34,7 +34,7 @@ module Test { //// [arrayAssignmentTest5.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var Bug = /** @class */ (function () { function Bug() { @@ -52,4 +52,4 @@ var Test; return Bug; }()); Test.Bug = Bug; -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/arrayAssignmentTest6.js b/tests/baselines/reference/arrayAssignmentTest6.js index 8ed75d26b1988..47bf86fe166ba 100644 --- a/tests/baselines/reference/arrayAssignmentTest6.js +++ b/tests/baselines/reference/arrayAssignmentTest6.js @@ -21,7 +21,7 @@ module Test { //// [arrayAssignmentTest6.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var Bug = /** @class */ (function () { function Bug() { @@ -32,4 +32,4 @@ var Test; return Bug; }()); Test.Bug = Bug; -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js index c1251a50f3899..4efc1a1c4949e 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.js +++ b/tests/baselines/reference/arrayBestCommonTypes.js @@ -121,7 +121,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var EmptyTypes; +var EmptyTypes = EmptyTypes || (EmptyTypes = {}); (function (EmptyTypes) { var base = /** @class */ (function () { function base() { @@ -179,8 +179,8 @@ var EmptyTypes; }; return f; }()); -})(EmptyTypes || (EmptyTypes = {})); -var NonEmptyTypes; +})(EmptyTypes); +var NonEmptyTypes = NonEmptyTypes || (NonEmptyTypes = {}); (function (NonEmptyTypes) { var base = /** @class */ (function () { function base() { @@ -238,4 +238,4 @@ var NonEmptyTypes; }; return f; }()); -})(NonEmptyTypes || (NonEmptyTypes = {})); +})(NonEmptyTypes); diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js index d32683f8ed8b9..01681d7c37c43 100644 --- a/tests/baselines/reference/arrowFunctionContexts.js +++ b/tests/baselines/reference/arrowFunctionContexts.js @@ -136,20 +136,20 @@ var obj; // OK var arr = [function (n) { return ''; }]; var arr; // Incorrect error here (bug 829597) // Arrow function as enum value -var E; +var E = E || (E = {}); (function (E) { var _this = this; E[E["x"] = function () { return 4; }] = "x"; E[E["y"] = (function () { return _this; }).length] = "y"; // error, can't use this in enum -})(E || (E = {})); +})(E); // Arrow function as module variable initializer -var M; +var M = M || (M = {}); (function (M) { M.a = function (s) { return ''; }; var b = function (s) { return s; }; -})(M || (M = {})); +})(M); // Repeat above for module members that are functions? (necessary to redo all of them?) -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var _this = this; // Arrow function used in with statement @@ -178,19 +178,19 @@ var M2; var arr = [function (n) { return ''; }]; var arr; // Incorrect error here (bug 829597) // Arrow function as enum value - var E; + var E = E || (E = {}); (function (E) { var _this = this; E[E["x"] = function () { return 4; }] = "x"; E[E["y"] = (function () { return _this; }).length] = "y"; - })(E || (E = {})); + })(E); // Arrow function as module variable initializer - var M; + var M = M || (M = {}); (function (M) { M.a = function (s) { return ''; }; var b = function (s) { return s; }; - })(M || (M = {})); -})(M2 || (M2 = {})); + })(M); +})(M2); // (ParamList) => { ... } is a generic arrow function var generic1 = function (n) { return [n]; }; var generic1; // Incorrect error, Bug 829597 diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js index 2cc6aca998ea5..bbcd34095020f 100644 --- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.js +++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.js @@ -4,7 +4,7 @@ module M { } //// [arrowFunctionInExpressionStatement2.js] -var M; +var M = M || (M = {}); (function (M) { (function () { return 0; }); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.js b/tests/baselines/reference/arrowFunctionsMissingTokens.js index d0a8bde2a5365..c05ad4364c47f 100644 --- a/tests/baselines/reference/arrowFunctionsMissingTokens.js +++ b/tests/baselines/reference/arrowFunctionsMissingTokens.js @@ -66,17 +66,17 @@ module okay { } //// [arrowFunctionsMissingTokens.js] -var missingArrowsWithCurly; +var missingArrowsWithCurly = missingArrowsWithCurly || (missingArrowsWithCurly = {}); (function (missingArrowsWithCurly) { var a = function () { }; var b = function () { }; var c = function (x) { }; var d = function (x, y) { }; var e = function (x, y) { }; -})(missingArrowsWithCurly || (missingArrowsWithCurly = {})); -var missingCurliesWithArrow; +})(missingArrowsWithCurly); +var missingCurliesWithArrow = missingCurliesWithArrow || (missingCurliesWithArrow = {}); (function (missingCurliesWithArrow) { - var withStatement; + var withStatement = withStatement || (withStatement = {}); (function (withStatement) { var a = function () { var k = 10; }; var b = function () { var k = 10; }; @@ -84,14 +84,14 @@ var missingCurliesWithArrow; var d = function (x, y) { var k = 10; }; var e = function (x, y) { var k = 10; }; var f = function () { var k = 10; }; - })(withStatement || (withStatement = {})); - var withoutStatement; + })(withStatement); + var withoutStatement = withoutStatement || (withoutStatement = {}); (function (withoutStatement) { var a = function () { return ; }; - })(withoutStatement || (withoutStatement = {})); + })(withoutStatement); ; var b = function () { return ; }; -})(missingCurliesWithArrow || (missingCurliesWithArrow = {})); +})(missingCurliesWithArrow); var c = function (x) { return ; }; ; var d = function (x, y) { return ; }; @@ -99,19 +99,19 @@ var d = function (x, y) { return ; }; var e = function (x, y) { return ; }; ; var f = function () { return ; }; -var ce_nEst_pas_une_arrow_function; +var ce_nEst_pas_une_arrow_function = ce_nEst_pas_une_arrow_function || (ce_nEst_pas_une_arrow_function = {}); (function (ce_nEst_pas_une_arrow_function) { var a = (); var b = function () { return ; }; var c = (x); var d = function (x, y) { return ; }; var e = function (x, y) { return ; }; -})(ce_nEst_pas_une_arrow_function || (ce_nEst_pas_une_arrow_function = {})); -var okay; +})(ce_nEst_pas_une_arrow_function); +var okay = okay || (okay = {}); (function (okay) { var a = function () { }; var b = function () { }; var c = function (x) { }; var d = function (x, y) { }; var e = function (x, y) { }; -})(okay || (okay = {})); +})(okay); diff --git a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js index 74cd41de62237..15695b94275e4 100644 --- a/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js +++ b/tests/baselines/reference/asiPreventsParsingAsAmbientExternalModule02.js @@ -12,10 +12,10 @@ module container { //// [asiPreventsParsingAsAmbientExternalModule02.js] var declare; var module; -var container; +var container = container || (container = {}); (function (container) { declare; // this is the identifier 'declare' module; // this is the identifier 'module' "my external module"; // this is just a string { } // this is a block body -})(container || (container = {})); +})(container); diff --git a/tests/baselines/reference/asiPreventsParsingAsInterface03.js b/tests/baselines/reference/asiPreventsParsingAsInterface03.js index b35c94de5b2e9..1e62692f49f3f 100644 --- a/tests/baselines/reference/asiPreventsParsingAsInterface03.js +++ b/tests/baselines/reference/asiPreventsParsingAsInterface03.js @@ -9,9 +9,9 @@ namespace n { //// [asiPreventsParsingAsInterface03.js] var interface, I; -var n; +var n = n || (n = {}); (function (n) { interface; // This should be the identifier 'interface' I; // This should be the identifier 'I' { } // This should be a block body -})(n || (n = {})); +})(n); diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace03.js b/tests/baselines/reference/asiPreventsParsingAsNamespace03.js index 306ad1baf494d..ff0be010d8c15 100644 --- a/tests/baselines/reference/asiPreventsParsingAsNamespace03.js +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace03.js @@ -11,9 +11,9 @@ namespace container { //// [asiPreventsParsingAsNamespace03.js] var namespace; var n; -var container; +var container = container || (container = {}); (function (container) { namespace; // this is the identifier 'namespace' n; // this is the identifier 'n' { } // this is a block body -})(container || (container = {})); +})(container); diff --git a/tests/baselines/reference/asiPreventsParsingAsNamespace05.js b/tests/baselines/reference/asiPreventsParsingAsNamespace05.js index d7cab5ae28336..f4057c7e96939 100644 --- a/tests/baselines/reference/asiPreventsParsingAsNamespace05.js +++ b/tests/baselines/reference/asiPreventsParsingAsNamespace05.js @@ -11,13 +11,13 @@ a.b.c //// [asiPreventsParsingAsNamespace05.js] var namespace = 10; -var a; +var a = a || (a = {}); (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { b.c = 20; - })(b = a.b || (a.b = {})); -})(a || (a = {})); + })(b); +})(a); namespace; a.b.c; { diff --git a/tests/baselines/reference/asiPreventsParsingAsTypeAlias02.js b/tests/baselines/reference/asiPreventsParsingAsTypeAlias02.js index db6215388ffa7..df90654204ab6 100644 --- a/tests/baselines/reference/asiPreventsParsingAsTypeAlias02.js +++ b/tests/baselines/reference/asiPreventsParsingAsTypeAlias02.js @@ -12,8 +12,8 @@ namespace container { var type; var string; var Foo; -var container; +var container = container || (container = {}); (function (container) { type; Foo = string; -})(container || (container = {})); +})(container); diff --git a/tests/baselines/reference/assign1.js b/tests/baselines/reference/assign1.js index fa18c8f287bb7..1e83051b20d50 100644 --- a/tests/baselines/reference/assign1.js +++ b/tests/baselines/reference/assign1.js @@ -10,7 +10,7 @@ module M { //// [assign1.js] -var M; +var M = M || (M = {}); (function (M) { var x = { salt: 2, pepper: 0 }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/assignAnyToEveryType.js b/tests/baselines/reference/assignAnyToEveryType.js index 351c041523fc9..419f7c4e4768b 100644 --- a/tests/baselines/reference/assignAnyToEveryType.js +++ b/tests/baselines/reference/assignAnyToEveryType.js @@ -56,10 +56,10 @@ var e = null; e = x; var f = undefined; f = x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var g = x; var g2 = E.A; g2 = x; @@ -72,10 +72,10 @@ var h = x; var i = x; var j = x; var j2 = x; -var M; +var M = M || (M = {}); (function (M) { M.foo = 1; -})(M || (M = {})); +})(M); M = x; function k(a) { a = x; diff --git a/tests/baselines/reference/assignEveryTypeToAny.js b/tests/baselines/reference/assignEveryTypeToAny.js index 07bfbaddebc11..1e55b55fb8a18 100644 --- a/tests/baselines/reference/assignEveryTypeToAny.js +++ b/tests/baselines/reference/assignEveryTypeToAny.js @@ -73,10 +73,10 @@ var e = undefined; x = e; var e2; x = e2; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); x = E.A; var f = E.A; x = f; diff --git a/tests/baselines/reference/assignToEnum.js b/tests/baselines/reference/assignToEnum.js index 5f7048894fa32..63fc965720561 100644 --- a/tests/baselines/reference/assignToEnum.js +++ b/tests/baselines/reference/assignToEnum.js @@ -8,11 +8,11 @@ A.foo = A.bar; // invalid LHS //// [assignToEnum.js] -var A; +var A = A || (A = {}); (function (A) { A[A["foo"] = 0] = "foo"; A[A["bar"] = 1] = "bar"; -})(A || (A = {})); +})(A); A = undefined; // invalid LHS A = A.bar; // invalid LHS A.foo = 1; // invalid LHS diff --git a/tests/baselines/reference/assignToExistingClass.js b/tests/baselines/reference/assignToExistingClass.js index baa7dc3cc7329..4d7a7a3653726 100644 --- a/tests/baselines/reference/assignToExistingClass.js +++ b/tests/baselines/reference/assignToExistingClass.js @@ -16,7 +16,7 @@ module Test { //// [assignToExistingClass.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var Mocked = /** @class */ (function () { function Mocked() { @@ -33,4 +33,4 @@ var Test; }; return Tester; }()); -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/assignToFn.js b/tests/baselines/reference/assignToFn.js index 2ff8ceedfa67c..274122d493423 100644 --- a/tests/baselines/reference/assignToFn.js +++ b/tests/baselines/reference/assignToFn.js @@ -11,8 +11,8 @@ module M { //// [assignToFn.js] -var M; +var M = M || (M = {}); (function (M) { var x = { f: function (n) { return true; } }; x.f = "hello"; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/assignmentCompatForEnums.js b/tests/baselines/reference/assignmentCompatForEnums.js index 8db85399fa830..d0046362be843 100644 --- a/tests/baselines/reference/assignmentCompatForEnums.js +++ b/tests/baselines/reference/assignmentCompatForEnums.js @@ -15,11 +15,11 @@ function foo() { //// [assignmentCompatForEnums.js] -var TokenType; +var TokenType = TokenType || (TokenType = {}); (function (TokenType) { TokenType[TokenType["One"] = 0] = "One"; TokenType[TokenType["Two"] = 1] = "Two"; -})(TokenType || (TokenType = {})); +})(TokenType); ; var list = {}; function returnType() { return null; } diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js index d1e898d3c6d39..d4259ae62bec4 100644 --- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js @@ -113,7 +113,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -141,7 +141,7 @@ var Errors; } return OtherDerived; }(Base)); - var WithNonGenericSignaturesInBaseType; + var WithNonGenericSignaturesInBaseType = WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {}); (function (WithNonGenericSignaturesInBaseType) { // target type with non-generic call signatures var a2; @@ -184,8 +184,8 @@ var Errors; var b17; a17 = b17; b17 = a17; - })(WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {})); - var WithGenericSignaturesInBaseType; + })(WithNonGenericSignaturesInBaseType); + var WithGenericSignaturesInBaseType = WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}); (function (WithGenericSignaturesInBaseType) { // target type has generic call signature var a2; @@ -197,5 +197,5 @@ var Errors; var b3; a3 = b3; b3 = a3; - })(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {})); -})(Errors || (Errors = {})); + })(WithGenericSignaturesInBaseType); +})(Errors); diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js index aa0ce793dce04..9bdd12fbb3224 100644 --- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js +++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js @@ -113,7 +113,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -141,7 +141,7 @@ var Errors; } return OtherDerived; }(Base)); - var WithNonGenericSignaturesInBaseType; + var WithNonGenericSignaturesInBaseType = WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {}); (function (WithNonGenericSignaturesInBaseType) { // target type with non-generic call signatures var a2; @@ -184,8 +184,8 @@ var Errors; var b17; a17 = b17; // error b17 = a17; // error - })(WithNonGenericSignaturesInBaseType || (WithNonGenericSignaturesInBaseType = {})); - var WithGenericSignaturesInBaseType; + })(WithNonGenericSignaturesInBaseType); + var WithGenericSignaturesInBaseType = WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}); (function (WithGenericSignaturesInBaseType) { // target type has generic call signature var a2; @@ -197,5 +197,5 @@ var Errors; var b3; a3 = b3; // ok b3 = a3; // ok - })(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {})); -})(Errors || (Errors = {})); + })(WithGenericSignaturesInBaseType); +})(Errors); diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js index 78e657f5cb003..2027f7e94a0ba 100644 --- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js +++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js @@ -132,7 +132,7 @@ module GenericSignaturesValid { //// [assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js] // call signatures in derived types must have the same or fewer optional parameters as the target for assignment -var ClassTypeParam; +var ClassTypeParam = ClassTypeParam || (ClassTypeParam = {}); (function (ClassTypeParam) { var Base = /** @class */ (function () { function Base() { @@ -160,8 +160,8 @@ var ClassTypeParam; } return Base; }()); -})(ClassTypeParam || (ClassTypeParam = {})); -var GenericSignaturesInvalid; +})(ClassTypeParam); +var GenericSignaturesInvalid = GenericSignaturesInvalid || (GenericSignaturesInvalid = {}); (function (GenericSignaturesInvalid) { var Base2 = /** @class */ (function () { function Base2() { @@ -203,8 +203,8 @@ var GenericSignaturesInvalid; b.a5 = t.a4; b.a5 = t.a5; } -})(GenericSignaturesInvalid || (GenericSignaturesInvalid = {})); -var GenericSignaturesValid; +})(GenericSignaturesInvalid); +var GenericSignaturesValid = GenericSignaturesValid || (GenericSignaturesValid = {}); (function (GenericSignaturesValid) { var Base2 = /** @class */ (function () { function Base2() { @@ -232,4 +232,4 @@ var GenericSignaturesValid; } return Base2; }()); -})(GenericSignaturesValid || (GenericSignaturesValid = {})); +})(GenericSignaturesValid); diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js index cbe47f21a95f1..ef69d2ae75e95 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js @@ -70,7 +70,7 @@ b = a; // error var b2; a = b2; b2 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -96,4 +96,4 @@ var Generics; a = b3; // ok b3 = a; // ok } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js index 8af454eaf8d2e..bb9d4529c2844 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer2.js @@ -52,7 +52,7 @@ b = a; // error var b2; a = b2; b2 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { function foo() { var a; @@ -66,4 +66,4 @@ var Generics; a = b3; // ok b3 = a; // ok } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js index cc8dc2fb1b858..dad9881c6e82b 100644 --- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js @@ -74,7 +74,7 @@ var B2 = /** @class */ (function (_super) { var b2; a = b2; // ok b2 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -90,4 +90,4 @@ var Generics; a = b2; // ok b2 = a; // ok } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js index 2589f464c5315..1551beeb0046d 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js @@ -88,7 +88,7 @@ module ObjectTypes { //// [assignmentCompatWithObjectMembers.js] // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // no errors expected -var SimpleTypes; +var SimpleTypes = SimpleTypes || (SimpleTypes = {}); (function (SimpleTypes) { var S = /** @class */ (function () { function S() { @@ -127,8 +127,8 @@ var SimpleTypes; a2 = b; a2 = t2; a2 = t; -})(SimpleTypes || (SimpleTypes = {})); -var ObjectTypes; +})(SimpleTypes); +var ObjectTypes = ObjectTypes || (ObjectTypes = {}); (function (ObjectTypes) { var S = /** @class */ (function () { function S() { @@ -167,4 +167,4 @@ var ObjectTypes; a2 = b; a2 = t2; a2 = t; -})(ObjectTypes || (ObjectTypes = {})); +})(ObjectTypes); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js index 46dfee1ed80d1..989c8dff0ce54 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js @@ -106,7 +106,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var OnlyDerived; +var OnlyDerived = OnlyDerived || (OnlyDerived = {}); (function (OnlyDerived) { var Base = /** @class */ (function () { function Base() { @@ -164,8 +164,8 @@ var OnlyDerived; a2 = b; // error a2 = t2; // error a2 = t; // error -})(OnlyDerived || (OnlyDerived = {})); -var WithBase; +})(OnlyDerived); +var WithBase = WithBase || (WithBase = {}); (function (WithBase) { var Base = /** @class */ (function () { function Base() { @@ -223,4 +223,4 @@ var WithBase; a2 = b; // ok a2 = t2; // ok a2 = t; // ok -})(WithBase || (WithBase = {})); +})(WithBase); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js index efe6857f933a7..82a9dfe12e17b 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js @@ -111,7 +111,7 @@ module TargetIsPublic { //// [assignmentCompatWithObjectMembersAccessibility.js] // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M -var TargetIsPublic; +var TargetIsPublic = TargetIsPublic || (TargetIsPublic = {}); (function (TargetIsPublic) { // targets var Base = /** @class */ (function () { @@ -156,7 +156,7 @@ var TargetIsPublic; e = i; // errror e = d; // errror e = e; -})(TargetIsPublic || (TargetIsPublic = {})); +})(TargetIsPublic); (function (TargetIsPublic) { // targets var Base = /** @class */ (function () { @@ -203,4 +203,4 @@ var TargetIsPublic; e = i; // errror e = d; // errror e = e; -})(TargetIsPublic || (TargetIsPublic = {})); +})(TargetIsPublic); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js index c53936f696e39..8c6698db48c65 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js @@ -122,7 +122,7 @@ var Derived2 = /** @class */ (function (_super) { } return Derived2; }(Derived)); -var TargetHasOptional; +var TargetHasOptional = TargetHasOptional || (TargetHasOptional = {}); (function (TargetHasOptional) { var c; var a; @@ -144,8 +144,8 @@ var TargetHasOptional; b = f; b = a; b = c; -})(TargetHasOptional || (TargetHasOptional = {})); -var SourceHasOptional; +})(TargetHasOptional); +var SourceHasOptional = SourceHasOptional || (SourceHasOptional = {}); (function (SourceHasOptional) { var c; var a; @@ -166,4 +166,4 @@ var SourceHasOptional; b = f; // ok b = a; // ok b = c; // ok -})(SourceHasOptional || (SourceHasOptional = {})); +})(SourceHasOptional); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js index 60793f2843f1b..5775acd0c4264 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js @@ -125,7 +125,7 @@ var Derived2 = /** @class */ (function (_super) { } return Derived2; }(Derived)); -var TargetHasOptional; +var TargetHasOptional = TargetHasOptional || (TargetHasOptional = {}); (function (TargetHasOptional) { var c; var a; @@ -148,8 +148,8 @@ var TargetHasOptional; a = c; b = a; b = c; -})(TargetHasOptional || (TargetHasOptional = {})); -var SourceHasOptional; +})(TargetHasOptional); +var SourceHasOptional = SourceHasOptional || (SourceHasOptional = {}); (function (SourceHasOptional) { var c; var a; @@ -170,4 +170,4 @@ var SourceHasOptional; b = f; // error b = a; // ok b = c; // ok -})(SourceHasOptional || (SourceHasOptional = {})); +})(SourceHasOptional); diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js index 30e81f3f19f08..3718e5dda44bf 100644 --- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js +++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js @@ -88,7 +88,7 @@ module NumbersAndStrings { //// [assignmentCompatWithObjectMembersStringNumericNames.js] // members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M // string named numeric properties work correctly, errors below unless otherwise noted -var JustStrings; +var JustStrings = JustStrings || (JustStrings = {}); (function (JustStrings) { var S = /** @class */ (function () { function S() { @@ -127,8 +127,8 @@ var JustStrings; a2 = b; // ok a2 = t2; // ok a2 = t; -})(JustStrings || (JustStrings = {})); -var NumbersAndStrings; +})(JustStrings); +var NumbersAndStrings = NumbersAndStrings || (NumbersAndStrings = {}); (function (NumbersAndStrings) { var S = /** @class */ (function () { function S() { @@ -168,4 +168,4 @@ var NumbersAndStrings; a2 = b; // error a2 = t2; // error a2 = t; // error -})(NumbersAndStrings || (NumbersAndStrings = {})); +})(NumbersAndStrings); diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js index 62b22fc0091e7..f8264a44b3276 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js @@ -80,7 +80,7 @@ b = a; // error var b2; a = b2; // ok b2 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -117,4 +117,4 @@ var Generics; a3 = b4; // error b4 = a3; // error } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js index 50fe7b3f8b9be..9ea1156fe1fb3 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer2.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer2.js @@ -62,7 +62,7 @@ b = a; // error var b2; a = b2; // ok b2 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var b1; var a1; @@ -80,4 +80,4 @@ var Generics; a3 = b4; // error b4 = a3; // error } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js index d3306949906e2..1353ee3d2cee7 100644 --- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js +++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js @@ -29,7 +29,7 @@ var a; var b1; a = b1; // error b1 = a; // error -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -42,4 +42,4 @@ var Generics; a = b; // error b = a; // error } -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/assignmentCompatability1.js b/tests/baselines/reference/assignmentCompatability1.js index f629d5eba27e7..ae16f2e5866b0 100644 --- a/tests/baselines/reference/assignmentCompatability1.js +++ b/tests/baselines/reference/assignmentCompatability1.js @@ -10,17 +10,17 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability1.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.aa = {}; ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability10.js b/tests/baselines/reference/assignmentCompatability10.js index c21d0d57abdaf..70833c3f07681 100644 --- a/tests/baselines/reference/assignmentCompatability10.js +++ b/tests/baselines/reference/assignmentCompatability10.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x4 = __test1__.__val__obj4 //// [assignmentCompatability10.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithPublicAndOptional = /** @class */ (function () { function classWithPublicAndOptional(one, two) { @@ -30,5 +30,5 @@ var __test2__; var x4 = new classWithPublicAndOptional(1); ; __test2__.__val__x4 = x4; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x4 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability11.js b/tests/baselines/reference/assignmentCompatability11.js index 992e38f772634..130c303e63467 100644 --- a/tests/baselines/reference/assignmentCompatability11.js +++ b/tests/baselines/reference/assignmentCompatability11.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability11.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: 1 }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability12.js b/tests/baselines/reference/assignmentCompatability12.js index 3c802aab6e3d6..d80c58a39011c 100644 --- a/tests/baselines/reference/assignmentCompatability12.js +++ b/tests/baselines/reference/assignmentCompatability12.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability12.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: "1" }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability13.js b/tests/baselines/reference/assignmentCompatability13.js index ef4f24f710029..e38dc2f476d5e 100644 --- a/tests/baselines/reference/assignmentCompatability13.js +++ b/tests/baselines/reference/assignmentCompatability13.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability13.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: "1" }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability14.js b/tests/baselines/reference/assignmentCompatability14.js index bd4445cb515b0..ecee58b844ab9 100644 --- a/tests/baselines/reference/assignmentCompatability14.js +++ b/tests/baselines/reference/assignmentCompatability14.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability14.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: true }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability15.js b/tests/baselines/reference/assignmentCompatability15.js index 37f1be4bc99d4..f0e525f9272a2 100644 --- a/tests/baselines/reference/assignmentCompatability15.js +++ b/tests/baselines/reference/assignmentCompatability15.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability15.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: true }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability16.js b/tests/baselines/reference/assignmentCompatability16.js index 43c832016b0e3..9815aa5a1598e 100644 --- a/tests/baselines/reference/assignmentCompatability16.js +++ b/tests/baselines/reference/assignmentCompatability16.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability16.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: [1] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability17.js b/tests/baselines/reference/assignmentCompatability17.js index 09ce24b8f5da6..85bc3f309911e 100644 --- a/tests/baselines/reference/assignmentCompatability17.js +++ b/tests/baselines/reference/assignmentCompatability17.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability17.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: [1] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability18.js b/tests/baselines/reference/assignmentCompatability18.js index ad93e96303ff2..323cfe63d12e9 100644 --- a/tests/baselines/reference/assignmentCompatability18.js +++ b/tests/baselines/reference/assignmentCompatability18.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability18.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: [1] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability19.js b/tests/baselines/reference/assignmentCompatability19.js index f330f94e81c6b..bdf3802733885 100644 --- a/tests/baselines/reference/assignmentCompatability19.js +++ b/tests/baselines/reference/assignmentCompatability19.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability19.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: [1] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability2.js b/tests/baselines/reference/assignmentCompatability2.js index 0c45fa378c619..f494e2f82f2a4 100644 --- a/tests/baselines/reference/assignmentCompatability2.js +++ b/tests/baselines/reference/assignmentCompatability2.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability2.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability20.js b/tests/baselines/reference/assignmentCompatability20.js index 321ec78ee17ce..b32b342b59c4d 100644 --- a/tests/baselines/reference/assignmentCompatability20.js +++ b/tests/baselines/reference/assignmentCompatability20.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability20.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: ["1"] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability21.js b/tests/baselines/reference/assignmentCompatability21.js index 215ab5dc3979b..3bf74a3c6a2dc 100644 --- a/tests/baselines/reference/assignmentCompatability21.js +++ b/tests/baselines/reference/assignmentCompatability21.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability21.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: ["1"] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability22.js b/tests/baselines/reference/assignmentCompatability22.js index 04cc2a2d0abcf..cd302a8e882af 100644 --- a/tests/baselines/reference/assignmentCompatability22.js +++ b/tests/baselines/reference/assignmentCompatability22.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability22.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: [true] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability23.js b/tests/baselines/reference/assignmentCompatability23.js index 1d03236436059..714e858eaa62f 100644 --- a/tests/baselines/reference/assignmentCompatability23.js +++ b/tests/baselines/reference/assignmentCompatability23.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability23.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { two: [true] }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability24.js b/tests/baselines/reference/assignmentCompatability24.js index e6961264de827..aee63272ff049 100644 --- a/tests/baselines/reference/assignmentCompatability24.js +++ b/tests/baselines/reference/assignmentCompatability24.js @@ -10,17 +10,17 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability24.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = function f(a) { return a; }; ; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability25.js b/tests/baselines/reference/assignmentCompatability25.js index 52cc4326eaaa3..7a71374fa3dfc 100644 --- a/tests/baselines/reference/assignmentCompatability25.js +++ b/tests/baselines/reference/assignmentCompatability25.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability25.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability26.js b/tests/baselines/reference/assignmentCompatability26.js index 12479b7b8b94d..b6a81ad95d513 100644 --- a/tests/baselines/reference/assignmentCompatability26.js +++ b/tests/baselines/reference/assignmentCompatability26.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability26.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability27.js b/tests/baselines/reference/assignmentCompatability27.js index aeac55d9c1703..842b951766194 100644 --- a/tests/baselines/reference/assignmentCompatability27.js +++ b/tests/baselines/reference/assignmentCompatability27.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability27.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability28.js b/tests/baselines/reference/assignmentCompatability28.js index 27d2f7d09d0aa..b4c5d090654a7 100644 --- a/tests/baselines/reference/assignmentCompatability28.js +++ b/tests/baselines/reference/assignmentCompatability28.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability28.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability29.js b/tests/baselines/reference/assignmentCompatability29.js index 4488c5185309d..67a585fc7f51a 100644 --- a/tests/baselines/reference/assignmentCompatability29.js +++ b/tests/baselines/reference/assignmentCompatability29.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability29.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability3.js b/tests/baselines/reference/assignmentCompatability3.js index 7120e6ce3e24b..0fbf93c4a532f 100644 --- a/tests/baselines/reference/assignmentCompatability3.js +++ b/tests/baselines/reference/assignmentCompatability3.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability3.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.obj = { one: 1 }; __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability30.js b/tests/baselines/reference/assignmentCompatability30.js index e6729ad31942b..0463a8a5c3c1f 100644 --- a/tests/baselines/reference/assignmentCompatability30.js +++ b/tests/baselines/reference/assignmentCompatability30.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability30.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability31.js b/tests/baselines/reference/assignmentCompatability31.js index 20aab7d823bf7..4a82925264732 100644 --- a/tests/baselines/reference/assignmentCompatability31.js +++ b/tests/baselines/reference/assignmentCompatability31.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability31.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability32.js b/tests/baselines/reference/assignmentCompatability32.js index c1656c8b4261a..1444066e948f3 100644 --- a/tests/baselines/reference/assignmentCompatability32.js +++ b/tests/baselines/reference/assignmentCompatability32.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability32.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js index f078421a65bb9..e2ae7864b1a03 100644 --- a/tests/baselines/reference/assignmentCompatability33.js +++ b/tests/baselines/reference/assignmentCompatability33.js @@ -10,15 +10,15 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability33.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js index d0e04eddf3f13..f4e2a9aa3bc25 100644 --- a/tests/baselines/reference/assignmentCompatability34.js +++ b/tests/baselines/reference/assignmentCompatability34.js @@ -10,15 +10,15 @@ module __test2__ { __test2__.__val__obj = __test1__.__val__obj4 //// [assignmentCompatability34.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { __test2__.__val__obj = __test2__.obj; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability35.js b/tests/baselines/reference/assignmentCompatability35.js index c1a87636e82ef..804b48aaa1d57 100644 --- a/tests/baselines/reference/assignmentCompatability35.js +++ b/tests/baselines/reference/assignmentCompatability35.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability35.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability36.js b/tests/baselines/reference/assignmentCompatability36.js index c5d274ba0905b..989e0ca3ec764 100644 --- a/tests/baselines/reference/assignmentCompatability36.js +++ b/tests/baselines/reference/assignmentCompatability36.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability36.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js index 8f4bf522854c3..2ec9eea47273f 100644 --- a/tests/baselines/reference/assignmentCompatability37.js +++ b/tests/baselines/reference/assignmentCompatability37.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability37.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js index d89f5c735d6ea..78a3fc02e8095 100644 --- a/tests/baselines/reference/assignmentCompatability38.js +++ b/tests/baselines/reference/assignmentCompatability38.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability38.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability39.js b/tests/baselines/reference/assignmentCompatability39.js index 6a2c4e88e30b8..580bdc740c014 100644 --- a/tests/baselines/reference/assignmentCompatability39.js +++ b/tests/baselines/reference/assignmentCompatability39.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x2 = __test1__.__val__obj4 //// [assignmentCompatability39.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithTwoPublic = /** @class */ (function () { function classWithTwoPublic(one, two) { @@ -30,5 +30,5 @@ var __test2__; var x2 = new classWithTwoPublic(1, "a"); ; __test2__.__val__x2 = x2; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x2 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability4.js b/tests/baselines/reference/assignmentCompatability4.js index 7ce0f48bc18cc..744cf22aceebb 100644 --- a/tests/baselines/reference/assignmentCompatability4.js +++ b/tests/baselines/reference/assignmentCompatability4.js @@ -10,16 +10,16 @@ module __test2__ { __test2__.__val__aa = __test1__.__val__obj4 //// [assignmentCompatability4.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; __test2__.__val__aa = __test2__.aa; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__aa = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability40.js b/tests/baselines/reference/assignmentCompatability40.js index ecfd29d6213dc..b830ad0dd0653 100644 --- a/tests/baselines/reference/assignmentCompatability40.js +++ b/tests/baselines/reference/assignmentCompatability40.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x5 = __test1__.__val__obj4 //// [assignmentCompatability40.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithPrivate = /** @class */ (function () { function classWithPrivate(one) { @@ -29,5 +29,5 @@ var __test2__; var x5 = new classWithPrivate(1); ; __test2__.__val__x5 = x5; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x5 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability41.js b/tests/baselines/reference/assignmentCompatability41.js index dbba1e012621a..201af4c082bff 100644 --- a/tests/baselines/reference/assignmentCompatability41.js +++ b/tests/baselines/reference/assignmentCompatability41.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x6 = __test1__.__val__obj4 //// [assignmentCompatability41.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithTwoPrivate = /** @class */ (function () { function classWithTwoPrivate(one, two) { @@ -30,5 +30,5 @@ var __test2__; var x6 = new classWithTwoPrivate(1, "a"); ; __test2__.__val__x6 = x6; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x6 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability42.js b/tests/baselines/reference/assignmentCompatability42.js index 98ddf0bd4ec38..f0ee4788de397 100644 --- a/tests/baselines/reference/assignmentCompatability42.js +++ b/tests/baselines/reference/assignmentCompatability42.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x7 = __test1__.__val__obj4 //// [assignmentCompatability42.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithPublicPrivate = /** @class */ (function () { function classWithPublicPrivate(one, two) { @@ -30,5 +30,5 @@ var __test2__; var x7 = new classWithPublicPrivate(1, "a"); ; __test2__.__val__x7 = x7; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x7 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability43.js b/tests/baselines/reference/assignmentCompatability43.js index 0ff9bdb481991..15728fa25d0d4 100644 --- a/tests/baselines/reference/assignmentCompatability43.js +++ b/tests/baselines/reference/assignmentCompatability43.js @@ -10,18 +10,18 @@ module __test2__ { __test2__.__val__obj2 = __test1__.__val__obj4 //// [assignmentCompatability43.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; var obj2 = { one: 1, two: "a" }; ; __test2__.__val__obj2 = obj2; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj2 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability5.js b/tests/baselines/reference/assignmentCompatability5.js index ef38b738ad304..95a7653399b7e 100644 --- a/tests/baselines/reference/assignmentCompatability5.js +++ b/tests/baselines/reference/assignmentCompatability5.js @@ -10,18 +10,18 @@ module __test2__ { __test2__.__val__obj1 = __test1__.__val__obj4 //// [assignmentCompatability5.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; var obj1 = { one: 1 }; ; __test2__.__val__obj1 = obj1; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj1 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability6.js b/tests/baselines/reference/assignmentCompatability6.js index 7b1e2bb65d65f..c4044d0bf54a6 100644 --- a/tests/baselines/reference/assignmentCompatability6.js +++ b/tests/baselines/reference/assignmentCompatability6.js @@ -10,18 +10,18 @@ module __test2__ { __test2__.__val__obj3 = __test1__.__val__obj4 //// [assignmentCompatability6.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; var obj3 = {}; ; __test2__.__val__obj3 = obj3; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj3 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability7.js b/tests/baselines/reference/assignmentCompatability7.js index c6bf8e53bc168..e244e3f01991b 100644 --- a/tests/baselines/reference/assignmentCompatability7.js +++ b/tests/baselines/reference/assignmentCompatability7.js @@ -10,18 +10,18 @@ module __test2__ { __test2__.__val__obj4 = __test1__.__val__obj4 //// [assignmentCompatability7.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { ; var obj4 = { one: 1 }; ; __test2__.__val__obj4 = obj4; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__obj4 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability8.js b/tests/baselines/reference/assignmentCompatability8.js index b0aa9b4374f33..68d6b39c66f19 100644 --- a/tests/baselines/reference/assignmentCompatability8.js +++ b/tests/baselines/reference/assignmentCompatability8.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x1 = __test1__.__val__obj4 //// [assignmentCompatability8.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithPublic = /** @class */ (function () { function classWithPublic(one) { @@ -29,5 +29,5 @@ var __test2__; var x1 = new classWithPublic(1); ; __test2__.__val__x1 = x1; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x1 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentCompatability9.js b/tests/baselines/reference/assignmentCompatability9.js index 04fcec488b6f6..8d84fcc682f5a 100644 --- a/tests/baselines/reference/assignmentCompatability9.js +++ b/tests/baselines/reference/assignmentCompatability9.js @@ -10,14 +10,14 @@ module __test2__ { __test2__.__val__x3 = __test1__.__val__obj4 //// [assignmentCompatability9.js] -var __test1__; +var __test1__ = __test1__ || (__test1__ = {}); (function (__test1__) { ; var obj4 = { one: 1 }; ; __test1__.__val__obj4 = obj4; -})(__test1__ || (__test1__ = {})); -var __test2__; +})(__test1__); +var __test2__ = __test2__ || (__test2__ = {}); (function (__test2__) { var classWithOptional = /** @class */ (function () { function classWithOptional(one) { @@ -29,5 +29,5 @@ var __test2__; var x3 = new classWithOptional(); ; __test2__.__val__x3 = x3; -})(__test2__ || (__test2__ = {})); +})(__test2__); __test2__.__val__x3 = __test1__.__val__obj4; diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js index 1eacd789df1af..33049a29b36b1 100644 --- a/tests/baselines/reference/assignmentLHSIsValue.js +++ b/tests/baselines/reference/assignmentLHSIsValue.js @@ -98,14 +98,14 @@ var C = /** @class */ (function () { function foo() { this = value; } this = value; // identifiers: module, class, enum, function -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); M = value; C = value; -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); E = value; foo = value; // literals diff --git a/tests/baselines/reference/assignmentToFunction.js b/tests/baselines/reference/assignmentToFunction.js index 7462fdfcf3f84..612254ea012c5 100644 --- a/tests/baselines/reference/assignmentToFunction.js +++ b/tests/baselines/reference/assignmentToFunction.js @@ -13,11 +13,11 @@ module foo { //// [assignmentToFunction.js] function fn() { } fn = function () { return 3; }; -var foo; +var foo = foo || (foo = {}); (function (foo) { function xyz() { function bar() { } bar = null; } -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.js b/tests/baselines/reference/assignmentToObjectAndFunction.js index d60e2de4a5a78..214fbf33f8089 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.js +++ b/tests/baselines/reference/assignmentToObjectAndFunction.js @@ -40,16 +40,16 @@ var errFun = {}; // Error for no call signature function foo() { } (function (foo) { foo.boom = 0; -})(foo || (foo = {})); +})(foo); var goodFundule = foo; // ok function bar() { } (function (bar) { function apply(thisArg, argArray) { } bar.apply = apply; -})(bar || (bar = {})); +})(bar); var goodFundule2 = bar; // ok function bad() { } (function (bad) { bad.apply = 0; -})(bad || (bad = {})); +})(bad); var badFundule = bad; // error diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js index 543a54ca10e94..165724a05e5a8 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js @@ -77,9 +77,9 @@ x = 3; // OK (x) = 3; // OK x = ''; // Error (x) = ''; // Error -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); M.y = 3; // OK (M).y = 3; // OK (M.y) = 3; // OK @@ -88,13 +88,13 @@ M.y = ''; // Error (M.y) = ''; // Error M = { y: 3 }; // Error (M) = { y: 3 }; // Error -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { - })(M3 = M2.M3 || (M2.M3 = {})); + })(M3); M3 = { x: 3 }; // Error -})(M2 || (M2 = {})); +})(M2); M2.M3 = { x: 3 }; // OK (M2).M3 = { x: 3 }; // OK (M2.M3) = { x: 3 }; // OK @@ -120,10 +120,10 @@ function fn2(x, y) { (y)['t'] = ''; // Error (y['t']) = ''; // Error } -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); E = undefined; // Error (E) = undefined; // Error var C = /** @class */ (function () { diff --git a/tests/baselines/reference/assignmentToReferenceTypes.js b/tests/baselines/reference/assignmentToReferenceTypes.js index b593240aec35d..75f993e7d7043 100644 --- a/tests/baselines/reference/assignmentToReferenceTypes.js +++ b/tests/baselines/reference/assignmentToReferenceTypes.js @@ -32,9 +32,9 @@ var C = /** @class */ (function () { return C; }()); C = null; -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); E = null; function f() { } f = null; diff --git a/tests/baselines/reference/assignments.js b/tests/baselines/reference/assignments.js index 8143490083424..9a7cee7a27f02 100644 --- a/tests/baselines/reference/assignments.js +++ b/tests/baselines/reference/assignments.js @@ -47,10 +47,10 @@ var C = /** @class */ (function () { return C; }()); C = null; // Error -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); E = null; // Error E.A = null; // OK per spec, Error per implementation (509581) function fn() { } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js index 065aa675b6e57..def696abb0cc8 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.js @@ -66,8 +66,8 @@ class C { static async m5() { } static async m6() { } } -var M; +const M = {}; (function (M) { async function f1() { } M.f1 = f1; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js index 58b887c61a36f..770607019bcc2 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js @@ -182,7 +182,7 @@ var C = /** @class */ (function () { }; return C; }()); -var M; +var M = {}; (function (M) { function f1() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { @@ -190,4 +190,4 @@ var M; }); }); } M.f1 = f1; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js index 046b74e6569da..360e5f2c71a62 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js @@ -104,10 +104,10 @@ class C { return __awaiter(this, void 0, void 0, function* () { }); } } -var M; +const M = {}; (function (M) { function f1() { return __awaiter(this, void 0, void 0, function* () { }); } M.f1 = f1; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/asyncAwait_es2017.js b/tests/baselines/reference/asyncAwait_es2017.js index 70a4c63be2e12..a8a359aa64aae 100644 --- a/tests/baselines/reference/asyncAwait_es2017.js +++ b/tests/baselines/reference/asyncAwait_es2017.js @@ -73,11 +73,11 @@ class C { static async m5() { } static async m6() { } } -var M; +var M = M || (M = {}); (function (M) { async function f1() { } M.f1 = f1; -})(M || (M = {})); +})(M); async function f14() { block: { await 1; diff --git a/tests/baselines/reference/asyncAwait_es5.js b/tests/baselines/reference/asyncAwait_es5.js index ee8f160b2a4a7..21019015dac48 100644 --- a/tests/baselines/reference/asyncAwait_es5.js +++ b/tests/baselines/reference/asyncAwait_es5.js @@ -186,7 +186,7 @@ var C = /** @class */ (function () { }; return C; }()); -var M; +var M = M || (M = {}); (function (M) { function f1() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { @@ -194,7 +194,7 @@ var M; }); }); } M.f1 = f1; -})(M || (M = {})); +})(M); function f14() { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { diff --git a/tests/baselines/reference/asyncAwait_es6.js b/tests/baselines/reference/asyncAwait_es6.js index 3cfe3b3ceecbe..0340fec249be1 100644 --- a/tests/baselines/reference/asyncAwait_es6.js +++ b/tests/baselines/reference/asyncAwait_es6.js @@ -111,13 +111,13 @@ class C { return __awaiter(this, void 0, void 0, function* () { }); } } -var M; +var M = M || (M = {}); (function (M) { function f1() { return __awaiter(this, void 0, void 0, function* () { }); } M.f1 = f1; -})(M || (M = {})); +})(M); function f14() { return __awaiter(this, void 0, void 0, function* () { block: { diff --git a/tests/baselines/reference/asyncEnum_es5.js b/tests/baselines/reference/asyncEnum_es5.js index d65b4bdb510af..3e9f2174144e2 100644 --- a/tests/baselines/reference/asyncEnum_es5.js +++ b/tests/baselines/reference/asyncEnum_es5.js @@ -4,7 +4,7 @@ async enum E { } //// [asyncEnum_es5.js] -var E; +var E = E || (E = {}); (function (E) { E[E["Value"] = 0] = "Value"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/asyncEnum_es6.js b/tests/baselines/reference/asyncEnum_es6.js index 074de3dd0aee1..3f139675486bb 100644 --- a/tests/baselines/reference/asyncEnum_es6.js +++ b/tests/baselines/reference/asyncEnum_es6.js @@ -4,7 +4,7 @@ async enum E { } //// [asyncEnum_es6.js] -var E; +var E = E || (E = {}); (function (E) { E[E["Value"] = 0] = "Value"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.js b/tests/baselines/reference/asyncQualifiedReturnType_es5.js index 601dc8b3c476e..08becaeb4d39d 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es5.js +++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.js @@ -8,7 +8,7 @@ async function f(): X.MyPromise { } //// [asyncQualifiedReturnType_es5.js] -var X; +var X = X || (X = {}); (function (X) { var MyPromise = /** @class */ (function (_super) { __extends(MyPromise, _super); @@ -18,7 +18,7 @@ var X; return MyPromise; }(Promise)); X.MyPromise = MyPromise; -})(X || (X = {})); +})(X); function f() { return __awaiter(this, void 0, X.MyPromise, function () { return __generator(this, function (_a) { diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.js b/tests/baselines/reference/asyncQualifiedReturnType_es6.js index 4d5aa87bbffb4..ded8da92bcc67 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.js +++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.js @@ -8,12 +8,12 @@ async function f(): X.MyPromise { } //// [asyncQualifiedReturnType_es6.js] -var X; +var X = X || (X = {}); (function (X) { class MyPromise extends Promise { } X.MyPromise = MyPromise; -})(X || (X = {})); +})(X); function f() { return __awaiter(this, void 0, void 0, function* () { }); diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js index 3ff5f574488e4..130fc379cc713 100644 --- a/tests/baselines/reference/augmentExportEquals3.js +++ b/tests/baselines/reference/augmentExportEquals3.js @@ -29,7 +29,7 @@ define(["require", "exports"], function (require, exports) { function foo() { } (function (foo) { foo.v = 1; - })(foo || (foo = {})); + })(foo); return foo; }); //// [file2.js] diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js index be6c6859ba76e..769f8e1b2bc83 100644 --- a/tests/baselines/reference/augmentExportEquals4.js +++ b/tests/baselines/reference/augmentExportEquals4.js @@ -33,7 +33,7 @@ define(["require", "exports"], function (require, exports) { }()); (function (foo) { foo.v = 1; - })(foo || (foo = {})); + })(foo); return foo; }); //// [file2.js] diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js index 99c6c1602bd76..40ac412cf3716 100644 --- a/tests/baselines/reference/augmentExportEquals6.js +++ b/tests/baselines/reference/augmentExportEquals6.js @@ -42,10 +42,10 @@ define(["require", "exports"], function (require, exports) { return A; }()); foo.A = A; - var B; + var B = foo.B || (foo.B = {}); (function (B) { - })(B = foo.B || (foo.B = {})); - })(foo || (foo = {})); + })(B); + })(foo); return foo; }); //// [file2.js] diff --git a/tests/baselines/reference/augmentedTypesClass.js b/tests/baselines/reference/augmentedTypesClass.js index 01c39c98a1a49..e174be1bb9a0b 100644 --- a/tests/baselines/reference/augmentedTypesClass.js +++ b/tests/baselines/reference/augmentedTypesClass.js @@ -25,4 +25,4 @@ var c4 = /** @class */ (function () { }()); (function (c4) { c4[c4["One"] = 0] = "One"; -})(c4 || (c4 = {})); // error +})(c4); // error diff --git a/tests/baselines/reference/augmentedTypesClass2.js b/tests/baselines/reference/augmentedTypesClass2.js index a289446e53fdb..a797ed9ff6555 100644 --- a/tests/baselines/reference/augmentedTypesClass2.js +++ b/tests/baselines/reference/augmentedTypesClass2.js @@ -53,7 +53,7 @@ var c33 = /** @class */ (function () { }()); (function (c33) { c33[c33["One"] = 0] = "One"; -})(c33 || (c33 = {})); +})(c33); ; // class then import var c44 = /** @class */ (function () { diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js index 045109f858777..dcaf76e5139ed 100644 --- a/tests/baselines/reference/augmentedTypesClass3.js +++ b/tests/baselines/reference/augmentedTypesClass3.js @@ -29,7 +29,7 @@ var c5a = /** @class */ (function () { }()); (function (c5a) { var y = 2; -})(c5a || (c5a = {})); // should be ok +})(c5a); // should be ok var c5b = /** @class */ (function () { function c5b() { } @@ -38,7 +38,7 @@ var c5b = /** @class */ (function () { }()); (function (c5b) { c5b.y = 2; -})(c5b || (c5b = {})); // should be ok +})(c5b); // should be ok //// class then import var c5c = /** @class */ (function () { function c5c() { diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js index edd4a92d76706..8b1409e9cc6d2 100644 --- a/tests/baselines/reference/augmentedTypesEnum.js +++ b/tests/baselines/reference/augmentedTypesEnum.js @@ -37,27 +37,27 @@ module e6b { export var y = 2; } // should be error //// [augmentedTypesEnum.js] // enum then var -var e1111; +var e1111 = e1111 || (e1111 = {}); (function (e1111) { e1111[e1111["One"] = 0] = "One"; -})(e1111 || (e1111 = {})); // error +})(e1111); // error var e1111 = 1; // error // enum then function -var e2; +var e2 = e2 || (e2 = {}); (function (e2) { e2[e2["One"] = 0] = "One"; -})(e2 || (e2 = {})); // error +})(e2); // error function e2() { } // error -var e3; +var e3 = e3 || (e3 = {}); (function (e3) { e3[e3["One"] = 0] = "One"; -})(e3 || (e3 = {})); // error +})(e3); // error var e3 = function () { }; // error // enum then class -var e4; +var e4 = e4 || (e4 = {}); (function (e4) { e4[e4["One"] = 0] = "One"; -})(e4 || (e4 = {})); // error +})(e4); // error var e4 = /** @class */ (function () { function e4() { } @@ -65,39 +65,39 @@ var e4 = /** @class */ (function () { return e4; }()); // error // enum then enum -var e5; +var e5 = e5 || (e5 = {}); (function (e5) { e5[e5["One"] = 0] = "One"; -})(e5 || (e5 = {})); +})(e5); (function (e5) { e5[e5["Two"] = 0] = "Two"; -})(e5 || (e5 = {})); // error -var e5a; +})(e5); // error +var e5a = e5a || (e5a = {}); (function (e5a) { e5a[e5a["One"] = 0] = "One"; -})(e5a || (e5a = {})); // error +})(e5a); // error (function (e5a) { e5a[e5a["One"] = 0] = "One"; -})(e5a || (e5a = {})); // error +})(e5a); // error // enum then internal module -var e6; +var e6 = e6 || (e6 = {}); (function (e6) { e6[e6["One"] = 0] = "One"; -})(e6 || (e6 = {})); -var e6a; +})(e6); +var e6a = e6a || (e6a = {}); (function (e6a) { e6a[e6a["One"] = 0] = "One"; -})(e6a || (e6a = {})); +})(e6a); (function (e6a) { var y = 2; -})(e6a || (e6a = {})); // should be error -var e6b; +})(e6a); // should be error +var e6b = e6b || (e6b = {}); (function (e6b) { e6b[e6b["One"] = 0] = "One"; -})(e6b || (e6b = {})); +})(e6b); (function (e6b) { e6b.y = 2; -})(e6b || (e6b = {})); // should be error +})(e6b); // should be error // enum then import, messes with error reporting //enum e7 { One } //import e7 = require(''); // should be error diff --git a/tests/baselines/reference/augmentedTypesEnum2.js b/tests/baselines/reference/augmentedTypesEnum2.js index 0e6e70df26363..fac5de997b940 100644 --- a/tests/baselines/reference/augmentedTypesEnum2.js +++ b/tests/baselines/reference/augmentedTypesEnum2.js @@ -21,16 +21,16 @@ class e2 { // error //// [augmentedTypesEnum2.js] // enum then interface -var e1; +var e1 = e1 || (e1 = {}); (function (e1) { e1[e1["One"] = 0] = "One"; -})(e1 || (e1 = {})); // error +})(e1); // error // interface then enum works // enum then class -var e2; +var e2 = e2 || (e2 = {}); (function (e2) { e2[e2["One"] = 0] = "One"; -})(e2 || (e2 = {})); +})(e2); ; // error var e2 = /** @class */ (function () { function e2() { diff --git a/tests/baselines/reference/augmentedTypesEnum3.js b/tests/baselines/reference/augmentedTypesEnum3.js index 4df9dada5305e..d7ae2884bad0b 100644 --- a/tests/baselines/reference/augmentedTypesEnum3.js +++ b/tests/baselines/reference/augmentedTypesEnum3.js @@ -21,28 +21,28 @@ module A { } //// [augmentedTypesEnum3.js] -var E; +var E = E || (E = {}); (function (E) { var t; -})(E || (E = {})); +})(E); (function (E) { -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { -})(F || (F = {})); +})(F); (function (F) { var t; -})(F || (F = {})); -var A; +})(F); +var A = A || (A = {}); (function (A) { var o; -})(A || (A = {})); +})(A); (function (A) { A[A["b"] = 0] = "b"; -})(A || (A = {})); +})(A); (function (A) { A[A["c"] = 0] = "c"; -})(A || (A = {})); +})(A); (function (A) { var p; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js index a2dd4a664a3a7..3c1616d2dc810 100644 --- a/tests/baselines/reference/augmentedTypesFunction.js +++ b/tests/baselines/reference/augmentedTypesFunction.js @@ -65,17 +65,17 @@ var y3a = /** @class */ (function () { function y4() { } // error (function (y4) { y4[y4["One"] = 0] = "One"; -})(y4 || (y4 = {})); // error +})(y4); // error // function then internal module function y5() { } function y5a() { } (function (y5a) { var y = 2; -})(y5a || (y5a = {})); // should be an error +})(y5a); // should be an error function y5b() { } (function (y5b) { y5b.y = 3; -})(y5b || (y5b = {})); // should be an error +})(y5b); // should be an error function y5c() { } // function then import, messes with other errors //function y6() { } diff --git a/tests/baselines/reference/augmentedTypesInterface.js b/tests/baselines/reference/augmentedTypesInterface.js index 0409e157584a3..e8a2fa8ac6325 100644 --- a/tests/baselines/reference/augmentedTypesInterface.js +++ b/tests/baselines/reference/augmentedTypesInterface.js @@ -43,9 +43,9 @@ var i2 = /** @class */ (function () { }; return i2; }()); -var i3; +var i3 = i3 || (i3 = {}); (function (i3) { i3[i3["One"] = 0] = "One"; -})(i3 || (i3 = {})); +})(i3); ; // error //import i4 = require(''); // error diff --git a/tests/baselines/reference/augmentedTypesModules.js b/tests/baselines/reference/augmentedTypesModules.js index c0bb1747e6dc6..2dd6ccf2cdd6e 100644 --- a/tests/baselines/reference/augmentedTypesModules.js +++ b/tests/baselines/reference/augmentedTypesModules.js @@ -99,18 +99,18 @@ module m6 { export var y = 2; } //// [augmentedTypesModules.js] var m1 = 1; // Should be allowed -var m1a; +var m1a = m1a || (m1a = {}); (function (m1a) { var y = 2; -})(m1a || (m1a = {})); // error +})(m1a); // error var m1a = 1; // error -var m1b; +var m1b = m1b || (m1b = {}); (function (m1b) { m1b.y = 2; -})(m1b || (m1b = {})); // error +})(m1b); // error var m1b = 1; // error var m1c = 1; // Should be allowed -var m1d; +var m1d = m1d || (m1d = {}); (function (m1d) { var I = /** @class */ (function () { function I() { @@ -119,20 +119,20 @@ var m1d; return I; }()); m1d.I = I; -})(m1d || (m1d = {})); +})(m1d); var m1d = 1; // error function m2() { } ; // ok since the module is not instantiated -var m2a; +var m2a = m2a || (m2a = {}); (function (m2a) { var y = 2; -})(m2a || (m2a = {})); +})(m2a); function m2a() { } ; // error since the module is instantiated -var m2b; +var m2b = m2b || (m2b = {}); (function (m2b) { m2b.y = 2; -})(m2b || (m2b = {})); +})(m2b); function m2b() { } ; // error since the module is instantiated // should be errors to have function first @@ -140,7 +140,7 @@ function m2c() { } ; (function (m2c) { m2c.y = 2; -})(m2c || (m2c = {})); +})(m2c); function m2f() { } ; function m2g() { } @@ -153,16 +153,16 @@ function m2g() { } return C; }()); m2g.C = C; -})(m2g || (m2g = {})); +})(m2g); var m3 = /** @class */ (function () { function m3() { } return m3; }()); // ok since the module is not instantiated -var m3a; +var m3a = m3a || (m3a = {}); (function (m3a) { var y = 2; -})(m3a || (m3a = {})); +})(m3a); var m3a = /** @class */ (function () { function m3a() { } @@ -177,7 +177,7 @@ var m3b = /** @class */ (function () { }()); (function (m3b) { var y = 2; -})(m3b || (m3b = {})); +})(m3b); var m3c = /** @class */ (function () { function m3c() { } @@ -186,16 +186,16 @@ var m3c = /** @class */ (function () { }()); (function (m3c) { m3c.y = 2; -})(m3c || (m3c = {})); -var m3d; +})(m3c); +var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; -})(m3d || (m3d = {})); -var m3e; +})(m3d); +var m3e = m3e || (m3e = {}); (function (m3e) { m3e.y = 2; -})(m3e || (m3e = {})); -var m3g; +})(m3e); +var m3g = m3g || (m3g = {}); (function (m3g) { var C = /** @class */ (function () { function C() { @@ -204,29 +204,29 @@ var m3g; return C; }()); m3g.C = C; -})(m3g || (m3g = {})); -var m4; +})(m3g); +var m4 = m4 || (m4 = {}); (function (m4) { -})(m4 || (m4 = {})); -var m4a; +})(m4); +var m4a = m4a || (m4a = {}); (function (m4a) { var y = 2; -})(m4a || (m4a = {})); +})(m4a); (function (m4a) { m4a[m4a["One"] = 0] = "One"; -})(m4a || (m4a = {})); -var m4b; +})(m4a); +var m4b = m4b || (m4b = {}); (function (m4b) { m4b.y = 2; -})(m4b || (m4b = {})); +})(m4b); (function (m4b) { m4b[m4b["One"] = 0] = "One"; -})(m4b || (m4b = {})); -var m4c; +})(m4b); +var m4c = m4c || (m4c = {}); (function (m4c) { m4c[m4c["One"] = 0] = "One"; -})(m4c || (m4c = {})); -var m4d; +})(m4c); +var m4d = m4d || (m4d = {}); (function (m4d) { var C = /** @class */ (function () { function C() { @@ -234,18 +234,18 @@ var m4d; C.prototype.foo = function () { }; return C; }()); -})(m4d || (m4d = {})); +})(m4d); (function (m4d) { m4d[m4d["One"] = 0] = "One"; -})(m4d || (m4d = {})); +})(m4d); //// module then module -var m5; +var m5 = m5 || (m5 = {}); (function (m5) { m5.y = 2; -})(m5 || (m5 = {})); +})(m5); // module then import -var m6; +var m6 = m6 || (m6 = {}); (function (m6) { m6.y = 2; -})(m6 || (m6 = {})); +})(m6); //import m6 = require(''); diff --git a/tests/baselines/reference/augmentedTypesModules2.js b/tests/baselines/reference/augmentedTypesModules2.js index 995a85f39600d..0467679b97ac2 100644 --- a/tests/baselines/reference/augmentedTypesModules2.js +++ b/tests/baselines/reference/augmentedTypesModules2.js @@ -31,27 +31,27 @@ module m2g { export class C { foo() { } } } //// [augmentedTypesModules2.js] function m2() { } ; // ok since the module is not instantiated -var m2a; +var m2a = m2a || (m2a = {}); (function (m2a) { var y = 2; -})(m2a || (m2a = {})); +})(m2a); function m2a() { } ; // error since the module is instantiated -var m2b; +var m2b = m2b || (m2b = {}); (function (m2b) { m2b.y = 2; -})(m2b || (m2b = {})); +})(m2b); function m2b() { } ; // error since the module is instantiated function m2c() { } ; (function (m2c) { m2c.y = 2; -})(m2c || (m2c = {})); -var m2cc; +})(m2c); +var m2cc = m2cc || (m2cc = {}); (function (m2cc) { m2cc.y = 2; -})(m2cc || (m2cc = {})); +})(m2cc); function m2cc() { } ; // error to have module first function m2f() { } @@ -66,4 +66,4 @@ function m2g() { } return C; }()); m2g.C = C; -})(m2g || (m2g = {})); +})(m2g); diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js index 0537bd092b012..da9ca02d34043 100644 --- a/tests/baselines/reference/augmentedTypesModules3.js +++ b/tests/baselines/reference/augmentedTypesModules3.js @@ -12,10 +12,10 @@ var m3 = /** @class */ (function () { } return m3; }()); // ok since the module is not instantiated -var m3a; +var m3a = m3a || (m3a = {}); (function (m3a) { var y = 2; -})(m3a || (m3a = {})); +})(m3a); var m3a = /** @class */ (function () { function m3a() { } diff --git a/tests/baselines/reference/augmentedTypesModules3b.js b/tests/baselines/reference/augmentedTypesModules3b.js index 57957c13b8082..c2608d8b7d3f6 100644 --- a/tests/baselines/reference/augmentedTypesModules3b.js +++ b/tests/baselines/reference/augmentedTypesModules3b.js @@ -27,7 +27,7 @@ var m3b = /** @class */ (function () { }()); (function (m3b) { var y = 2; -})(m3b || (m3b = {})); +})(m3b); var m3c = /** @class */ (function () { function m3c() { } @@ -36,16 +36,16 @@ var m3c = /** @class */ (function () { }()); (function (m3c) { m3c.y = 2; -})(m3c || (m3c = {})); -var m3d; +})(m3c); +var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; -})(m3d || (m3d = {})); -var m3e; +})(m3d); +var m3e = m3e || (m3e = {}); (function (m3e) { m3e.y = 2; -})(m3e || (m3e = {})); -var m3g; +})(m3e); +var m3g = m3g || (m3g = {}); (function (m3g) { var C = /** @class */ (function () { function C() { @@ -54,4 +54,4 @@ var m3g; return C; }()); m3g.C = C; -})(m3g || (m3g = {})); +})(m3g); diff --git a/tests/baselines/reference/augmentedTypesModules4.js b/tests/baselines/reference/augmentedTypesModules4.js index b7a776ca16435..d718c7fef8d48 100644 --- a/tests/baselines/reference/augmentedTypesModules4.js +++ b/tests/baselines/reference/augmentedTypesModules4.js @@ -23,28 +23,28 @@ module m5 { export interface I { foo(): void } } // should already be reasonably //// [augmentedTypesModules4.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { -})(m4 || (m4 = {})); -var m4a; +})(m4); +var m4a = m4a || (m4a = {}); (function (m4a) { var y = 2; -})(m4a || (m4a = {})); +})(m4a); (function (m4a) { m4a[m4a["One"] = 0] = "One"; -})(m4a || (m4a = {})); -var m4b; +})(m4a); +var m4b = m4b || (m4b = {}); (function (m4b) { m4b.y = 2; -})(m4b || (m4b = {})); +})(m4b); (function (m4b) { m4b[m4b["One"] = 0] = "One"; -})(m4b || (m4b = {})); -var m4c; +})(m4b); +var m4c = m4c || (m4c = {}); (function (m4c) { m4c[m4c["One"] = 0] = "One"; -})(m4c || (m4c = {})); -var m4d; +})(m4c); +var m4d = m4d || (m4d = {}); (function (m4d) { var C = /** @class */ (function () { function C() { @@ -52,12 +52,12 @@ var m4d; C.prototype.foo = function () { }; return C; }()); -})(m4d || (m4d = {})); +})(m4d); (function (m4d) { m4d[m4d["One"] = 0] = "One"; -})(m4d || (m4d = {})); +})(m4d); //// module then module -var m5; +var m5 = m5 || (m5 = {}); (function (m5) { m5.y = 2; -})(m5 || (m5 = {})); +})(m5); diff --git a/tests/baselines/reference/augmentedTypesVar.js b/tests/baselines/reference/augmentedTypesVar.js index 9945737410d3a..44c545acb5ae8 100644 --- a/tests/baselines/reference/augmentedTypesVar.js +++ b/tests/baselines/reference/augmentedTypesVar.js @@ -61,22 +61,22 @@ var x4a = /** @class */ (function () { }()); // error // var then enum var x5 = 1; -var x5; +var x5 = x5 || (x5 = {}); (function (x5) { x5[x5["One"] = 0] = "One"; -})(x5 || (x5 = {})); // error +})(x5); // error // var then module var x6 = 1; var x6a = 1; // error -var x6a; +var x6a = x6a || (x6a = {}); (function (x6a) { var y = 2; -})(x6a || (x6a = {})); // error since instantiated +})(x6a); // error since instantiated var x6b = 1; // error -var x6b; +var x6b = x6b || (x6b = {}); (function (x6b) { x6b.y = 2; -})(x6b || (x6b = {})); // error +})(x6b); // error // var then import, messes with other error reporting //var x7 = 1; //import x7 = require(''); diff --git a/tests/baselines/reference/autonumberingInEnums.js b/tests/baselines/reference/autonumberingInEnums.js index 218b10ae44cb2..889b25594c78e 100644 --- a/tests/baselines/reference/autonumberingInEnums.js +++ b/tests/baselines/reference/autonumberingInEnums.js @@ -8,10 +8,10 @@ enum Foo { } //// [autonumberingInEnums.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["a"] = 1] = "a"; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { Foo[Foo["b"] = 0] = "b"; // should work fine -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/bestCommonTypeOfTuple.js b/tests/baselines/reference/bestCommonTypeOfTuple.js index 81cfa752f5de5..8f2dd9d8eaa06 100644 --- a/tests/baselines/reference/bestCommonTypeOfTuple.js +++ b/tests/baselines/reference/bestCommonTypeOfTuple.js @@ -29,14 +29,14 @@ var e4 = t4[3]; // number function f1(x) { return "foo"; } function f2(x) { return 10; } function f3(x) { return true; } -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["one"] = 0] = "one"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["two"] = 0] = "two"; -})(E2 || (E2 = {})); +})(E2); var t1; var t2; var t3; diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js index de83d56ab8ef8..5aca576524f7b 100644 --- a/tests/baselines/reference/bind1.js +++ b/tests/baselines/reference/bind1.js @@ -6,7 +6,7 @@ module M { //// [bind1.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -14,4 +14,4 @@ var M; return C; }()); // this should be an unresolved symbol I error M.C = C; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.js b/tests/baselines/reference/binopAssignmentShouldHaveType.js index c5a0357c7eed1..ddc32efd4858d 100644 --- a/tests/baselines/reference/binopAssignmentShouldHaveType.js +++ b/tests/baselines/reference/binopAssignmentShouldHaveType.js @@ -21,7 +21,7 @@ module Test { //// [binopAssignmentShouldHaveType.js] "use strict"; -var Test; +var Test = Test || (Test = {}); (function (Test) { var Bug = /** @class */ (function () { function Bug() { @@ -38,4 +38,4 @@ var Test; return Bug; }()); Test.Bug = Bug; -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js index 8827aa2d57fa1..c5effb4963cb8 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js @@ -82,9 +82,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any other type var var ResultIsNumber = ~ANY1; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js index 00766ee43033d..bc0afddb72eb3 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsNumber1 = ~BOOLEAN; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.js b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.js index 0bcf2fa39569b..03504a1bc6f9c 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithEnumType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithEnumType.js @@ -20,12 +20,12 @@ var ResultIsNumber4 = ~~~(ENUM1["A"] + ENUM1.B); //// [bitwiseNotOperatorWithEnumType.js] // ~ operator on enum type -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsNumber1 = ~ENUM1; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js index d446532caf88c..a40a54dc30b06 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js @@ -55,9 +55,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsNumber1 = ~NUMBER; diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js index 481e75e3378a2..39efbc8bcf9fb 100644 --- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js +++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js @@ -54,9 +54,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsNumber1 = ~STRING; diff --git a/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef.js index 552d099b07cf1..475a97b8c67b8 100644 --- a/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef.js +++ b/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef.js @@ -12,10 +12,10 @@ function foo2() { //// [blockScopedEnumVariablesUseBeforeDef.js] function foo1() { return E.A; - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; - })(E || (E = {})); + })(E); } function foo2() { return 0 /* A */; diff --git a/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef_preserve.js b/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef_preserve.js index 239a87f00426f..50ab3b97084c1 100644 --- a/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef_preserve.js +++ b/tests/baselines/reference/blockScopedEnumVariablesUseBeforeDef_preserve.js @@ -12,15 +12,15 @@ function foo2() { //// [blockScopedEnumVariablesUseBeforeDef_preserve.js] function foo1() { return E.A; - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; - })(E || (E = {})); + })(E); } function foo2() { return 0 /* A */; - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; - })(E || (E = {})); + })(E); } diff --git a/tests/baselines/reference/blockScopedNamespaceDifferentFile.js b/tests/baselines/reference/blockScopedNamespaceDifferentFile.js index 1ddb284f55cc0..1fca6db84d04b 100644 --- a/tests/baselines/reference/blockScopedNamespaceDifferentFile.js +++ b/tests/baselines/reference/blockScopedNamespaceDifferentFile.js @@ -22,7 +22,7 @@ declare namespace A { //// [out.js] // #15734 failed when test.ts comes before typings.d.ts -var C; +var C = C || (C = {}); (function (C) { var Name = /** @class */ (function () { function Name(parameters) { @@ -32,4 +32,4 @@ var C; return Name; }()); C.Name = Name; -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js index 27112f8d3c334..ca505443e2154 100644 --- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js @@ -129,7 +129,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -157,4 +157,4 @@ var Errors; } return OtherDerived; }(Base)); -})(Errors || (Errors = {})); +})(Errors); diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js index 9ecceb3ff4fa1..4337d07c54211 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js @@ -183,7 +183,7 @@ function foo10(x) { return c; } var r10 = foo10(1); -var M; +var M = M || (M = {}); (function (M) { M.x = 1; var C = /** @class */ (function () { @@ -192,7 +192,7 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); function foo11() { return M; } @@ -205,7 +205,7 @@ var r12 = foo12(); function m1() { return 1; } (function (m1) { m1.y = 2; -})(m1 || (m1 = {})); +})(m1); function foo13() { return m1; } @@ -217,18 +217,18 @@ var c1 = /** @class */ (function () { }()); (function (c1) { c1.x = 1; -})(c1 || (c1 = {})); +})(c1); function foo14() { return c1; } var r14 = foo14(); -var e1; +var e1 = e1 || (e1 = {}); (function (e1) { e1[e1["A"] = 0] = "A"; -})(e1 || (e1 = {})); +})(e1); (function (e1) { e1.y = 1; -})(e1 || (e1 = {})); +})(e1); function foo15() { return e1; } diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js index 129b17acdc64d..e366320b4a233 100644 --- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js +++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js @@ -6,12 +6,12 @@ module M var t = new M.ClassA[]; //// [cannotInvokeNewOnErrorExpression.js] -var M; +var M = M || (M = {}); (function (M) { var ClassA = /** @class */ (function () { function ClassA() { } return ClassA; }()); -})(M || (M = {})); +})(M); var t = new M.ClassA[]; diff --git a/tests/baselines/reference/castingTuple.js b/tests/baselines/reference/castingTuple.js index 4bb4f5f788bbe..3d04a5195a0dd 100644 --- a/tests/baselines/reference/castingTuple.js +++ b/tests/baselines/reference/castingTuple.js @@ -82,14 +82,14 @@ var F = /** @class */ (function (_super) { return F; }(A)); ; -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["one"] = 0] = "one"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["one"] = 0] = "one"; -})(E2 || (E2 = {})); +})(E2); // no error var numStrTuple = [5, "foo"]; var emptyObjTuple = numStrTuple; diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js index 8fcdd501707c4..a211f23121e6f 100644 --- a/tests/baselines/reference/chainedImportAlias.js +++ b/tests/baselines/reference/chainedImportAlias.js @@ -14,11 +14,11 @@ y.m.foo(); //// [chainedImportAlias_file0.js] "use strict"; exports.__esModule = true; -var m; +var m = {}; (function (m) { function foo() { } m.foo = foo; -})(m = exports.m || (exports.m = {})); +})(m); //// [chainedImportAlias_file1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/checkForObjectTooStrict.js b/tests/baselines/reference/checkForObjectTooStrict.js index d8a30eac7627b..623d27c677c08 100644 --- a/tests/baselines/reference/checkForObjectTooStrict.js +++ b/tests/baselines/reference/checkForObjectTooStrict.js @@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var Object = /** @class */ (function () { function Object() { @@ -53,7 +53,7 @@ var Foo; return Object; }()); Foo.Object = Object; -})(Foo || (Foo = {})); +})(Foo); var Bar = /** @class */ (function (_super) { __extends(Bar, _super); function Bar() { diff --git a/tests/baselines/reference/circularImportAlias.js b/tests/baselines/reference/circularImportAlias.js index 8e1f076bda07a..1101b546cfda1 100644 --- a/tests/baselines/reference/circularImportAlias.js +++ b/tests/baselines/reference/circularImportAlias.js @@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var B; +var B = B || (B = {}); (function (B) { B.a = A; var D = /** @class */ (function (_super) { @@ -45,8 +45,8 @@ var B; return D; }(B.a.C)); B.D = D; -})(B || (B = {})); -var A; +})(B); +var A = A || (A = {}); (function (A) { var C = /** @class */ (function () { function C() { @@ -55,6 +55,6 @@ var A; }()); A.C = C; A.b = B; -})(A || (A = {})); +})(A); var c; var c = new B.a.C(); diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js index f4542118ae7b3..190415512775e 100644 --- a/tests/baselines/reference/circularReference.js +++ b/tests/baselines/reference/circularReference.js @@ -37,7 +37,7 @@ export module M1 { "use strict"; exports.__esModule = true; var foo2 = require("./foo2"); -var M1; +var M1 = {}; (function (M1) { var C1 = /** @class */ (function () { function C1() { @@ -48,12 +48,12 @@ var M1; return C1; }()); M1.C1 = C1; -})(M1 = exports.M1 || (exports.M1 = {})); +})(M1); //// [foo2.js] "use strict"; exports.__esModule = true; var foo1 = require("./foo1"); -var M1; +var M1 = {}; (function (M1) { var C1 = /** @class */ (function () { function C1() { @@ -67,4 +67,4 @@ var M1; return C1; }()); M1.C1 = C1; -})(M1 = exports.M1 || (exports.M1 = {})); +})(M1); diff --git a/tests/baselines/reference/circularTypeofWithFunctionModule.js b/tests/baselines/reference/circularTypeofWithFunctionModule.js index 179beee21689b..e2a04f2e7fe72 100644 --- a/tests/baselines/reference/circularTypeofWithFunctionModule.js +++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js @@ -44,4 +44,4 @@ function maker(value) { return Bar; }(Foo)); maker.Bar = Bar; -})(maker || (maker = {})); +})(maker); diff --git a/tests/baselines/reference/classAbstractImportInstantiation.js b/tests/baselines/reference/classAbstractImportInstantiation.js index a12853bbc1226..b3ed4fbdb1932 100644 --- a/tests/baselines/reference/classAbstractImportInstantiation.js +++ b/tests/baselines/reference/classAbstractImportInstantiation.js @@ -11,7 +11,7 @@ new myA; //// [classAbstractImportInstantiation.js] -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -20,6 +20,6 @@ var M; }()); M.A = A; new A; -})(M || (M = {})); +})(M); var myA = M.A; new myA; diff --git a/tests/baselines/reference/classAbstractInAModule.js b/tests/baselines/reference/classAbstractInAModule.js index b0cd4663ef7f9..2aa6980131750 100644 --- a/tests/baselines/reference/classAbstractInAModule.js +++ b/tests/baselines/reference/classAbstractInAModule.js @@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -37,6 +37,6 @@ var M; return B; }(A)); M.B = B; -})(M || (M = {})); +})(M); new M.A; new M.B; diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.js b/tests/baselines/reference/classAndInterfaceWithSameName.js index 964cd8cd32247..9963d98fa653a 100644 --- a/tests/baselines/reference/classAndInterfaceWithSameName.js +++ b/tests/baselines/reference/classAndInterfaceWithSameName.js @@ -18,11 +18,11 @@ var C = /** @class */ (function () { } return C; }()); -var M; +var M = M || (M = {}); (function (M) { var D = /** @class */ (function () { function D() { } return D; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classAndVariableWithSameName.js b/tests/baselines/reference/classAndVariableWithSameName.js index 8ceaa91a73d51..03d0f08646888 100644 --- a/tests/baselines/reference/classAndVariableWithSameName.js +++ b/tests/baselines/reference/classAndVariableWithSameName.js @@ -17,7 +17,7 @@ var C = /** @class */ (function () { return C; }()); // error var C = ''; // error -var M; +var M = M || (M = {}); (function (M) { var D = /** @class */ (function () { function D() { @@ -25,4 +25,4 @@ var M; return D; }()); var D = 1; // error -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js index c5803fc98f676..9744780e385a9 100644 --- a/tests/baselines/reference/classConstructorAccessibility.js +++ b/tests/baselines/reference/classConstructorAccessibility.js @@ -56,7 +56,7 @@ var E = /** @class */ (function () { var c = new C(1); var d = new D(1); // error var e = new E(1); // error -var Generic; +var Generic = Generic || (Generic = {}); (function (Generic) { var C = /** @class */ (function () { function C(x) { @@ -79,7 +79,7 @@ var Generic; var c = new C(1); var d = new D(1); // error var e = new E(1); // error -})(Generic || (Generic = {})); +})(Generic); //// [classConstructorAccessibility.d.ts] diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js index 4456eaf97bb9f..37b2f95190451 100644 --- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js +++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js @@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var N = /** @class */ (function () { function N() { @@ -35,8 +35,8 @@ var M; M.N = N; (function (N) { N.v = 0; - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(N); +})(M); (function (M) { var O = /** @class */ (function (_super) { __extends(O, _super); @@ -46,4 +46,4 @@ var M; return O; }(M.N)); M.O = O; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js index 124633d305859..7e3c1137e636c 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js @@ -7,7 +7,7 @@ module M { } //// [classDoesNotDependOnPrivateMember.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -15,7 +15,7 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); //// [classDoesNotDependOnPrivateMember.d.ts] diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js index 8764060eabf28..5eb99e57cc2cc 100644 --- a/tests/baselines/reference/classExpression.js +++ b/tests/baselines/reference/classExpression.js @@ -25,11 +25,11 @@ var y = { return C2; }()) }; -var M; +var M = M || (M = {}); (function (M) { var z = /** @class */ (function () { function C4() { } return C4; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js index cc3ea1d87f904..ceb66442ce4ad 100644 --- a/tests/baselines/reference/classExtendingPrimitive.js +++ b/tests/baselines/reference/classExtendingPrimitive.js @@ -90,10 +90,10 @@ var C7 = /** @class */ (function (_super) { } return C7; }(Undefined)); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var C8 = /** @class */ (function (_super) { __extends(C8, _super); function C8() { diff --git a/tests/baselines/reference/classExtendingQualifiedName.js b/tests/baselines/reference/classExtendingQualifiedName.js index a2f466574bfb0..a97065b1e18b4 100644 --- a/tests/baselines/reference/classExtendingQualifiedName.js +++ b/tests/baselines/reference/classExtendingQualifiedName.js @@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -35,4 +35,4 @@ var M; } return D; }(M.C)); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classExtendingQualifiedName2.js b/tests/baselines/reference/classExtendingQualifiedName2.js index 240eb8001ae8e..eb41bef1d6d11 100644 --- a/tests/baselines/reference/classExtendingQualifiedName2.js +++ b/tests/baselines/reference/classExtendingQualifiedName2.js @@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -36,4 +36,4 @@ var M; } return D; }(M.C)); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js index b02124c281a44..c3ae1e36684a8 100644 --- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js @@ -33,8 +33,8 @@ var A = /** @class */ (function () { return A; }()); (function (A) { -})(A || (A = {})); -var Foo; +})(A); +var Foo = Foo || (Foo = {}); (function (Foo) { var A = 1; var B = /** @class */ (function (_super) { @@ -44,4 +44,4 @@ var Foo; } return B; }(A)); -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js index 8af7fbe16eebc..23a3614c54dec 100644 --- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js +++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js @@ -25,7 +25,7 @@ var A = /** @class */ (function () { } return A; }()); -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var A = 1; var B = /** @class */ (function (_super) { @@ -35,4 +35,4 @@ var Foo; } return B; }(A)); -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js index 1274b44575c08..ceddede855aa2 100644 --- a/tests/baselines/reference/classExtendsEveryObjectType.js +++ b/tests/baselines/reference/classExtendsEveryObjectType.js @@ -52,10 +52,10 @@ var C3 = /** @class */ (function (_super) { } return C3; }(x)); // error -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); var C4 = /** @class */ (function (_super) { __extends(C4, _super); function C4() { diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.js b/tests/baselines/reference/classExtendsItselfIndirectly2.js index 0a634d953eebf..3589496763d99 100644 --- a/tests/baselines/reference/classExtendsItselfIndirectly2.js +++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js @@ -43,7 +43,7 @@ var C = /** @class */ (function (_super) { } return C; }(N.E)); // error -var M; +var M = M || (M = {}); (function (M) { var D = /** @class */ (function (_super) { __extends(D, _super); @@ -53,8 +53,8 @@ var M; return D; }(C)); M.D = D; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var E = /** @class */ (function (_super) { __extends(E, _super); @@ -64,8 +64,8 @@ var N; return E; }(M.D)); N.E = E; -})(N || (N = {})); -var O; +})(N); +var O = O || (O = {}); (function (O) { var C2 = /** @class */ (function (_super) { __extends(C2, _super); @@ -74,7 +74,7 @@ var O; } return C2; }(Q.E2)); // error - var P; + var P = P || (P = {}); (function (P) { var D2 = /** @class */ (function (_super) { __extends(D2, _super); @@ -84,8 +84,8 @@ var O; return D2; }(C2)); P.D2 = D2; - })(P || (P = {})); - var Q; + })(P); + var Q = Q || (Q = {}); (function (Q) { var E2 = /** @class */ (function (_super) { __extends(E2, _super); @@ -95,5 +95,5 @@ var O; return E2; }(P.D2)); Q.E2 = E2; - })(Q || (Q = {})); -})(O || (O = {})); + })(Q); +})(O); diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js index 36a55d2914eed..28bfec0cb413c 100644 --- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js +++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js @@ -27,7 +27,7 @@ var C = /** @class */ (function () { } return C; }()); -var M; +var M = M || (M = {}); (function (M) { var C = 1; var D = /** @class */ (function (_super) { @@ -37,4 +37,4 @@ var M; } return D; }(C)); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js index 6276dced5a7c2..a5fd0051ebeb9 100644 --- a/tests/baselines/reference/classImplementsImportedInterface.js +++ b/tests/baselines/reference/classImplementsImportedInterface.js @@ -13,7 +13,7 @@ module M2 { } //// [classImplementsImportedInterface.js] -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var C = /** @class */ (function () { function C() { @@ -21,4 +21,4 @@ var M2; C.prototype.foo = function () { }; return C; }()); -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/classStaticInitializersUsePropertiesBeforeDeclaration.js b/tests/baselines/reference/classStaticInitializersUsePropertiesBeforeDeclaration.js index 28edb94345b43..676411de5de83 100644 --- a/tests/baselines/reference/classStaticInitializersUsePropertiesBeforeDeclaration.js +++ b/tests/baselines/reference/classStaticInitializersUsePropertiesBeforeDeclaration.js @@ -27,14 +27,14 @@ var Foo = /** @class */ (function () { Foo.namespaceMember = Namespace.A; return Foo; }()); -var Enum; +var Enum = Enum || (Enum = {}); (function (Enum) { Enum[Enum["A"] = 0] = "A"; -})(Enum || (Enum = {})); +})(Enum); var ObjLiteral = { A: 0 }; -var Namespace; +var Namespace = Namespace || (Namespace = {}); (function (Namespace) { Namespace.A = 0; -})(Namespace || (Namespace = {})); +})(Namespace); diff --git a/tests/baselines/reference/classTypeParametersInStatics.js b/tests/baselines/reference/classTypeParametersInStatics.js index 76f7997bbcd62..a13d07c58148b 100644 --- a/tests/baselines/reference/classTypeParametersInStatics.js +++ b/tests/baselines/reference/classTypeParametersInStatics.js @@ -34,7 +34,7 @@ module Editor { } //// [classTypeParametersInStatics.js] -var Editor; +var Editor = Editor || (Editor = {}); (function (Editor) { var List = /** @class */ (function () { function List(isHead, data) { @@ -62,4 +62,4 @@ var Editor; return List; }()); Editor.List = List; -})(Editor || (Editor = {})); +})(Editor); diff --git a/tests/baselines/reference/classWithConstructors.js b/tests/baselines/reference/classWithConstructors.js index c2900623a9d4d..b37d2edb3b56e 100644 --- a/tests/baselines/reference/classWithConstructors.js +++ b/tests/baselines/reference/classWithConstructors.js @@ -63,7 +63,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var NonGeneric; +var NonGeneric = NonGeneric || (NonGeneric = {}); (function (NonGeneric) { var C = /** @class */ (function () { function C(x) { @@ -90,8 +90,8 @@ var NonGeneric; var d = new D(); // error var d2 = new D(1); // ok var d3 = new D(''); // ok -})(NonGeneric || (NonGeneric = {})); -var Generics; +})(NonGeneric); +var Generics = Generics || (Generics = {}); (function (Generics) { var C = /** @class */ (function () { function C(x) { @@ -118,4 +118,4 @@ var Generics; var d = new D(); // error var d2 = new D(1); // ok var d3 = new D(''); // ok -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index 2c5b14e93a897..bf7c3ae201b28 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -148,7 +148,7 @@ var b = /** @class */ (function (_super) { } return b; }(a)); -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var b = /** @class */ (function () { function b() { @@ -161,10 +161,10 @@ var m1; } return d; }()); -})(m1 || (m1 = {})); -var m2; +})(m1); +var m2 = m2 || (m2 = {}); (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { var c = /** @class */ (function (_super) { __extends(c, _super); @@ -180,8 +180,8 @@ var m2; return ib2; }()); m3.ib2 = ib2; - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 || (m2 = {})); + })(m3); +})(m2); var c = /** @class */ (function (_super) { __extends(c, _super); function c() { diff --git a/tests/baselines/reference/clinterfaces.js b/tests/baselines/reference/clinterfaces.js index 8e5e28ebcb338..4bc6f45ff974c 100644 --- a/tests/baselines/reference/clinterfaces.js +++ b/tests/baselines/reference/clinterfaces.js @@ -27,7 +27,7 @@ export = Foo; //// [clinterfaces.js] "use strict"; -var M; +var M = {}; (function (M) { var C = /** @class */ (function () { function C() { @@ -39,7 +39,7 @@ var M; } return D; }()); -})(M || (M = {})); +})(M); var Foo = /** @class */ (function () { function Foo() { } diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js index 3e1f5a6adc42a..08981546869b4 100644 --- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js +++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js @@ -16,7 +16,7 @@ var b: A.B; // ok //// [cloduleAcrossModuleDefinitions.js] -var A; +var A = A || (A = {}); (function (A) { var B = /** @class */ (function () { function B() { @@ -26,11 +26,11 @@ var A; return B; }()); A.B = B; -})(A || (A = {})); +})(A); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var b; // ok diff --git a/tests/baselines/reference/cloduleAndTypeParameters.js b/tests/baselines/reference/cloduleAndTypeParameters.js index 4c8ca5e11ecbd..daae2f9341b89 100644 --- a/tests/baselines/reference/cloduleAndTypeParameters.js +++ b/tests/baselines/reference/cloduleAndTypeParameters.js @@ -26,4 +26,4 @@ var Foo = /** @class */ (function () { return Baz; }()); Foo.Baz = Baz; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/cloduleGenericOnSelfMember.js b/tests/baselines/reference/cloduleGenericOnSelfMember.js index 11e88f1a09152..1903f7dbe7971 100644 --- a/tests/baselines/reference/cloduleGenericOnSelfMember.js +++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js @@ -42,4 +42,4 @@ var Service = /** @class */ (function (_super) { name: "1", value: 5 }; -})(Service || (Service = {})); +})(Service); diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.js b/tests/baselines/reference/cloduleSplitAcrossFiles.js index b6394b13015af..28f46c0890de1 100644 --- a/tests/baselines/reference/cloduleSplitAcrossFiles.js +++ b/tests/baselines/reference/cloduleSplitAcrossFiles.js @@ -16,8 +16,8 @@ var D = /** @class */ (function () { return D; }()); //// [cloduleSplitAcrossFiles_module.js] -var D; +var D = D || (D = {}); (function (D) { D.y = "hi"; -})(D || (D = {})); +})(D); D.y; diff --git a/tests/baselines/reference/cloduleStaticMembers.js b/tests/baselines/reference/cloduleStaticMembers.js index 8d59de41e68c9..11ff86fb2c952 100644 --- a/tests/baselines/reference/cloduleStaticMembers.js +++ b/tests/baselines/reference/cloduleStaticMembers.js @@ -25,4 +25,4 @@ var Clod = /** @class */ (function () { var q = x; var s = Clod.y; var t = y; -})(Clod || (Clod = {})); +})(Clod); diff --git a/tests/baselines/reference/cloduleTest1.js b/tests/baselines/reference/cloduleTest1.js index 9e7edc77c7135..3dc205de33b56 100644 --- a/tests/baselines/reference/cloduleTest1.js +++ b/tests/baselines/reference/cloduleTest1.js @@ -12,9 +12,9 @@ //// [cloduleTest1.js] -var $; +var $ = $ || ($ = {}); (function ($) { function ajax(options) { } $.ajax = ajax; -})($ || ($ = {})); +})($); var it = $('.foo').addClass('bar'); diff --git a/tests/baselines/reference/cloduleTest2.js b/tests/baselines/reference/cloduleTest2.js index 96221ed58a2ab..2a4b00c7e5f39 100644 --- a/tests/baselines/reference/cloduleTest2.js +++ b/tests/baselines/reference/cloduleTest2.js @@ -37,47 +37,47 @@ declare class m4d extends m3d { } var r2 = new m4d(); // error //// [cloduleTest2.js] -var T1; +var T1 = T1 || (T1 = {}); (function (T1) { - var m3d; + var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; - })(m3d || (m3d = {})); + })(m3d); var r = new m3d(); // error -})(T1 || (T1 = {})); -var T2; +})(T1); +var T2 = T2 || (T2 = {}); (function (T2) { - var m3d; + var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; - })(m3d || (m3d = {})); + })(m3d); var r = new m3d(); // error -})(T2 || (T2 = {})); -var T3; +})(T2); +var T3 = T3 || (T3 = {}); (function (T3) { - var m3d; + var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; - })(m3d || (m3d = {})); + })(m3d); var r = new m3d(); r.foo(); r.bar(); // error r.y; // error -})(T3 || (T3 = {})); -var T4; +})(T3); +var T4 = T4 || (T4 = {}); (function (T4) { - var m3d; + var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; - })(m3d || (m3d = {})); + })(m3d); var r = new m3d(); r.foo(); r.bar(); // error r.y; // error -})(T4 || (T4 = {})); -var m3d; +})(T4); +var m3d = m3d || (m3d = {}); (function (m3d) { m3d.y = 2; -})(m3d || (m3d = {})); +})(m3d); var r = new m3d(); // error var r2 = new m4d(); // error diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.js b/tests/baselines/reference/cloduleWithDuplicateMember1.js index b8178a3ca51cc..201b16e067d0d 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember1.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember1.js @@ -36,10 +36,10 @@ var C = /** @class */ (function () { }()); (function (C) { C.x = 1; -})(C || (C = {})); +})(C); (function (C) { function foo() { } C.foo = foo; function x() { } C.x = x; -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.js b/tests/baselines/reference/cloduleWithDuplicateMember2.js index 62b2fa3c11d12..48b4ed82d7441 100644 --- a/tests/baselines/reference/cloduleWithDuplicateMember2.js +++ b/tests/baselines/reference/cloduleWithDuplicateMember2.js @@ -29,8 +29,8 @@ var C = /** @class */ (function () { }()); (function (C) { C.x = 1; -})(C || (C = {})); +})(C); (function (C) { function x() { } C.x = x; -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js index e976c37904bee..d117d2fa32952 100644 --- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js @@ -18,10 +18,10 @@ module Moclodule { //// [cloduleWithPriorInstantiatedModule.js] // Non-ambient & instantiated module. -var Moclodule; +var Moclodule = Moclodule || (Moclodule = {}); (function (Moclodule) { var x = 10; -})(Moclodule || (Moclodule = {})); +})(Moclodule); var Moclodule = /** @class */ (function () { function Moclodule() { } @@ -35,4 +35,4 @@ var Moclodule = /** @class */ (function () { return Manager; }()); Moclodule.Manager = Manager; -})(Moclodule || (Moclodule = {})); +})(Moclodule); diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js index 166df315618dd..d4b72fd3ff5ec 100644 --- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js +++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js @@ -29,4 +29,4 @@ var Moclodule = /** @class */ (function () { return Manager; }()); Moclodule.Manager = Manager; -})(Moclodule || (Moclodule = {})); +})(Moclodule); diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.js b/tests/baselines/reference/cloduleWithRecursiveReference.js index 9b81239a01fee..b474009069098 100644 --- a/tests/baselines/reference/cloduleWithRecursiveReference.js +++ b/tests/baselines/reference/cloduleWithRecursiveReference.js @@ -8,7 +8,7 @@ module M } //// [cloduleWithRecursiveReference.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -18,5 +18,5 @@ var M; M.C = C; (function (C_1) { C_1.C = M.C; - })(C = M.C || (M.C = {})); -})(M || (M = {})); + })(C); +})(M); diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js index 5e3c49a2153d5..c7c90cc7e8432 100644 --- a/tests/baselines/reference/clodulesDerivedClasses.js +++ b/tests/baselines/reference/clodulesDerivedClasses.js @@ -42,12 +42,12 @@ var Shape = /** @class */ (function () { return Shape; }()); (function (Shape) { - var Utils; + var Utils = Shape.Utils || (Shape.Utils = {}); (function (Utils) { function convert() { return null; } Utils.convert = convert; - })(Utils = Shape.Utils || (Shape.Utils = {})); -})(Shape || (Shape = {})); + })(Utils); +})(Shape); var Path = /** @class */ (function (_super) { __extends(Path, _super); function Path() { @@ -56,11 +56,11 @@ var Path = /** @class */ (function (_super) { return Path; }(Shape)); (function (Path) { - var Utils; + var Utils = Path.Utils || (Path.Utils = {}); (function (Utils) { function convert2() { return null; } Utils.convert2 = convert2; - })(Utils = Path.Utils || (Path.Utils = {})); -})(Path || (Path = {})); + })(Utils); +})(Path); diff --git a/tests/baselines/reference/collisionCodeGenEnumWithEnumMemberConflict.js b/tests/baselines/reference/collisionCodeGenEnumWithEnumMemberConflict.js index 1e56eb8bd9f3d..add37f2146ff6 100644 --- a/tests/baselines/reference/collisionCodeGenEnumWithEnumMemberConflict.js +++ b/tests/baselines/reference/collisionCodeGenEnumWithEnumMemberConflict.js @@ -5,8 +5,8 @@ enum Color { } //// [collisionCodeGenEnumWithEnumMemberConflict.js] -var Color; +var Color = Color || (Color = {}); (function (Color) { Color[Color["Color"] = 0] = "Color"; Color[Color["Thing"] = 0] = "Thing"; -})(Color || (Color = {})); +})(Color); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js index e43eddd3a46ff..3a4c724de4835 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js @@ -46,7 +46,7 @@ module M { // Shouldnt be _M } //// [collisionCodeGenModuleWithAccessorChildren.js] -var M; +var M = M || (M = {}); (function (M_1) { M_1.x = 3; var c = /** @class */ (function () { @@ -61,7 +61,7 @@ var M; }); return c; }()); -})(M || (M = {})); +})(M); (function (M_2) { var d = /** @class */ (function () { function d() { @@ -76,7 +76,7 @@ var M; }); return d; }()); -})(M || (M = {})); +})(M); (function (M) { var e = /** @class */ (function () { function e() { @@ -90,7 +90,7 @@ var M; }); return e; }()); -})(M || (M = {})); +})(M); (function (M_3) { var f = /** @class */ (function () { function f() { @@ -105,7 +105,7 @@ var M; }); return f; }()); -})(M || (M = {})); +})(M); (function (M) { var e = /** @class */ (function () { function e() { @@ -119,4 +119,4 @@ var M; }); return e; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js index 23afcb0cae5e0..e418dbbd50d76 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js @@ -24,7 +24,7 @@ module M { } //// [collisionCodeGenModuleWithConstructorChildren.js] -var M; +var M = M || (M = {}); (function (M_1) { M_1.x = 3; var c = /** @class */ (function () { @@ -33,7 +33,7 @@ var M; } return c; }()); -})(M || (M = {})); +})(M); (function (M_2) { var d = /** @class */ (function () { function d(M, p) { @@ -42,7 +42,7 @@ var M; } return d; }()); -})(M || (M = {})); +})(M); (function (M_3) { var d2 = /** @class */ (function () { function d2() { @@ -51,4 +51,4 @@ var M; } return d2; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js index 3662f5d6ddd44..28143375232d5 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.js @@ -7,11 +7,11 @@ module m1 { } //// [collisionCodeGenModuleWithEnumMemberConflict.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { - var e; + var e = e || (e = {}); (function (e) { e[e["m1"] = 0] = "m1"; e[e["m2"] = 0] = "m2"; - })(e || (e = {})); -})(m1 || (m1 = {})); + })(e); +})(m1); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js index afe3cb43f28f9..78f2bae37beac 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.js @@ -20,23 +20,23 @@ module M { } //// [collisionCodeGenModuleWithFunctionChildren.js] -var M; +var M = M || (M = {}); (function (M_1) { M_1.x = 3; function fn(M, p) { if (p === void 0) { p = M_1.x; } } -})(M || (M = {})); +})(M); (function (M_2) { function fn2() { var M; var p = M_2.x; } -})(M || (M = {})); +})(M); (function (M_3) { function fn3() { function M() { var p = M_3.x; } } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js index 150feab3236c9..eb16bbeda5cf1 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js @@ -16,7 +16,7 @@ var foo = new m2.m2(); var foo = new m2._m2(); //// [collisionCodeGenModuleWithMemberClassConflict.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1_1) { var m1 = /** @class */ (function () { function m1() { @@ -24,9 +24,9 @@ var m1; return m1; }()); m1_1.m1 = m1; -})(m1 || (m1 = {})); +})(m1); var foo = new m1.m1(); -var m2; +var m2 = m2 || (m2 = {}); (function (m2_1) { var m2 = /** @class */ (function () { function m2() { @@ -40,6 +40,6 @@ var m2; return _m2; }()); m2_1._m2 = _m2; -})(m2 || (m2 = {})); +})(m2); var foo = new m2.m2(); var foo = new m2._m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js index ae48d1d36f827..4cc43cac00eff 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js @@ -8,7 +8,7 @@ module m1 { var foo = new m1.m2(); //// [collisionCodeGenModuleWithMemberInterfaceConflict.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var m2 = /** @class */ (function () { function m2() { @@ -16,5 +16,5 @@ var m1; return m2; }()); m1.m2 = m2; -})(m1 || (m1 = {})); +})(m1); var foo = new m1.m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js index 1a23b81c139e2..e96de48cf9986 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.js @@ -6,9 +6,9 @@ module m1 { var foo = m1.m1; //// [collisionCodeGenModuleWithMemberVariable.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1_1) { m1_1.m1 = 10; var b = m1_1.m1; -})(m1 || (m1 = {})); +})(m1); var foo = m1.m1; diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js index e75d84f9df45f..68a3707b5e661 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js @@ -33,7 +33,7 @@ module M { // Shouldnt bn _M } //// [collisionCodeGenModuleWithMethodChildren.js] -var M; +var M = M || (M = {}); (function (M_1) { M_1.x = 3; var c = /** @class */ (function () { @@ -44,7 +44,7 @@ var M; }; return c; }()); -})(M || (M = {})); +})(M); (function (M_2) { var d = /** @class */ (function () { function d() { @@ -55,7 +55,7 @@ var M; }; return d; }()); -})(M || (M = {})); +})(M); (function (M_3) { var e = /** @class */ (function () { function e() { @@ -67,7 +67,7 @@ var M; }; return e; }()); -})(M || (M = {})); +})(M); (function (M) { var f = /** @class */ (function () { function f() { @@ -76,4 +76,4 @@ var M; }; return f; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js index 1d2865bbafd9a..ff594940d13d1 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js @@ -43,17 +43,17 @@ module M { } //// [collisionCodeGenModuleWithModuleChildren.js] -var M; +var M = M || (M = {}); (function (M_1) { M_1.x = 3; - var m1; + var m1 = m1 || (m1 = {}); (function (m1) { var M = 10; var p = M_1.x; - })(m1 || (m1 = {})); -})(M || (M = {})); + })(m1); +})(M); (function (M_2) { - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var M = /** @class */ (function () { function M() { @@ -62,30 +62,30 @@ var M; }()); var p = M_2.x; var p2 = new M(); - })(m2 || (m2 = {})); -})(M || (M = {})); + })(m2); +})(M); (function (M_3) { - var m3; + var m3 = m3 || (m3 = {}); (function (m3) { function M() { } var p = M_3.x; var p2 = M(); - })(m3 || (m3 = {})); -})(M || (M = {})); + })(m3); +})(M); (function (M) { - var m3; + var m3 = m3 || (m3 = {}); (function (m3) { var p = M.x; var p2; - })(m3 || (m3 = {})); -})(M || (M = {})); + })(m3); +})(M); (function (M_4) { - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { - var M; + var M = M || (M = {}); (function (M) { var p = M_4.x; - })(M || (M = {})); - })(m4 || (m4 = {})); -})(M || (M = {})); + })(M); + })(m4); +})(M); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js index db1abb520b07a..be2461b9072be 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js @@ -30,7 +30,7 @@ var foo3 = new m2.c1(); var foo2 = new m2.m2(); //// [collisionCodeGenModuleWithModuleReopening.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1_1) { var m1 = /** @class */ (function () { function m1() { @@ -38,7 +38,7 @@ var m1; return m1; }()); m1_1.m1 = m1; -})(m1 || (m1 = {})); +})(m1); var foo = new m1.m1(); (function (m1) { var c1 = /** @class */ (function () { @@ -49,9 +49,9 @@ var foo = new m1.m1(); m1.c1 = c1; var b = new c1(); var c = new m1.m1(); -})(m1 || (m1 = {})); +})(m1); var foo2 = new m1.c1(); -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { var c1 = /** @class */ (function () { function c1() { @@ -61,7 +61,7 @@ var m2; m2.c1 = c1; m2.b10 = 10; var x = new c1(); -})(m2 || (m2 = {})); +})(m2); var foo3 = new m2.c1(); (function (m2_1) { var m2 = /** @class */ (function () { @@ -73,6 +73,6 @@ var foo3 = new m2.c1(); var b = new m2(); var d = m2_1.b10; var c = new m2_1.c1(); -})(m2 || (m2 = {})); +})(m2); var foo3 = new m2.c1(); var foo2 = new m2.m2(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js index 097117222e374..7284339e3efdb 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js @@ -9,7 +9,7 @@ module m1 { var foo = new m1.c1(); //// [collisionCodeGenModuleWithPrivateMember.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1_1) { var m1 = /** @class */ (function () { function m1() { @@ -23,5 +23,5 @@ var m1; return c1; }()); m1_1.c1 = c1; -})(m1 || (m1 = {})); +})(m1); var foo = new m1.c1(); diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js index 6a5056281a168..35100eb321622 100644 --- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js +++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js @@ -10,7 +10,7 @@ var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكو //// [collisionCodeGenModuleWithUnicodeNames.js] -var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123; +var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 || (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = {}); (function (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1) { var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = /** @class */ (function () { function 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() { @@ -18,5 +18,5 @@ var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄü return 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123; }()); 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123; -})(才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 || (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = {})); +})(才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123); var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123(); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js index 1a16f4a2d5f95..3093487716873 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js @@ -41,12 +41,12 @@ module m4 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m2; + var m2 = {}; (function (m2) { - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndAmbientClass_globalFile.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js index 0e717b01d3bd0..712e7842720c2 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js @@ -64,11 +64,11 @@ module m4 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m2; + var m2 = {}; (function (m2) { - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndAmbientEnum_globalFile.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js index 050799d4c2b7b..7188d5d099c67 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js @@ -17,8 +17,8 @@ module m2 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m2; + var m2 = {}; (function (m2) { var a = 10; - })(m2 || (m2 = {})); + })(m2); }); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js index 44294f51cb5ee..a8626a3d92a77 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunctionInGlobalFile.js @@ -12,7 +12,7 @@ module m4 { } //// [collisionExportsRequireAndAmbientFunctionInGlobalFile.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js index 2eb5ea74f920e..aea25f1b74c32 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js @@ -106,13 +106,13 @@ define(["require", "exports"], function (require, exports) { return null; } exports.foo2 = foo2; - var m2; + var m2 = {}; (function (m2) { var a = 10; - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndAmbientModule_globalFile.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js index 8454248845a61..b458de27dd256 100644 --- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js @@ -30,13 +30,13 @@ module m4 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m2; + var m2 = {}; (function (m2) { var a = 10; - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndAmbientVar_globalFile.js] -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js index f0d383b06515a..175f15d747ce0 100644 --- a/tests/baselines/reference/collisionExportsRequireAndClass.js +++ b/tests/baselines/reference/collisionExportsRequireAndClass.js @@ -52,7 +52,7 @@ define(["require", "exports"], function (require, exports) { return exports; }()); exports.exports = exports; - var m1; + var m1 = {}; (function (m1) { var require = /** @class */ (function () { function require() { @@ -64,8 +64,8 @@ define(["require", "exports"], function (require, exports) { } return exports; }()); - })(m1 || (m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { var require = /** @class */ (function () { function require() { @@ -79,7 +79,7 @@ define(["require", "exports"], function (require, exports) { return exports; }()); m2.exports = exports; - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndClass_globalFile.js] var require = /** @class */ (function () { @@ -92,7 +92,7 @@ var exports = /** @class */ (function () { } return exports; }()); -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { var require = /** @class */ (function () { function require() { @@ -104,8 +104,8 @@ var m3; } return exports; }()); -})(m3 || (m3 = {})); -var m4; +})(m3); +var m4 = m4 || (m4 = {}); (function (m4) { var require = /** @class */ (function () { function require() { @@ -119,4 +119,4 @@ var m4; return exports; }()); m4.exports = exports; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js index 4bb6614ffe768..8655894fa3bcf 100644 --- a/tests/baselines/reference/collisionExportsRequireAndEnum.js +++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js @@ -64,77 +64,77 @@ module m4 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var require; + var require = {}; (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; - })(require = exports.require || (exports.require = {})); - var exports; + })(require); + var exports = {}; (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; - })(exports = exports.exports || (exports.exports = {})); - var m1; + })(exports); + var m1 = {}; (function (m1) { - var require; + var require = require || (require = {}); (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; - })(require || (require = {})); - var exports; + })(require); + var exports = exports || (exports = {}); (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; - })(exports || (exports = {})); - })(m1 || (m1 = {})); - var m2; + })(exports); + })(m1); + var m2 = {}; (function (m2) { - var require; + var require = m2.require || (m2.require = {}); (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; - })(require = m2.require || (m2.require = {})); - var exports; + })(require); + var exports = m2.exports || (m2.exports = {}); (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; - })(exports = m2.exports || (m2.exports = {})); - })(m2 || (m2 = {})); + })(exports); + })(m2); }); //// [collisionExportsRequireAndEnum_globalFile.js] -var require; +var require = require || (require = {}); (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; -})(require || (require = {})); -var exports; +})(require); +var exports = exports || (exports = {}); (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; -})(exports || (exports = {})); -var m3; +})(exports); +var m3 = m3 || (m3 = {}); (function (m3) { - var require; + var require = require || (require = {}); (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; - })(require || (require = {})); - var exports; + })(require); + var exports = exports || (exports = {}); (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; - })(exports || (exports = {})); -})(m3 || (m3 = {})); -var m4; + })(exports); +})(m3); +var m4 = m4 || (m4 = {}); (function (m4) { - var require; + var require = m4.require || (m4.require = {}); (function (require) { require[require["_thisVal1"] = 0] = "_thisVal1"; require[require["_thisVal2"] = 1] = "_thisVal2"; - })(require = m4.require || (m4.require = {})); - var exports; + })(require); + var exports = m4.exports || (m4.exports = {}); (function (exports) { exports[exports["_thisVal1"] = 0] = "_thisVal1"; exports[exports["_thisVal2"] = 1] = "_thisVal2"; - })(exports = m4.exports || (m4.exports = {})); -})(m4 || (m4 = {})); + })(exports); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js index 1da8cf29d665f..f77080ad2dcb9 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunction.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js @@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) { return "require"; } exports.require = require; - var m1; + var m1 = {}; (function (m1) { function exports() { return 1; @@ -42,8 +42,8 @@ define(["require", "exports"], function (require, exports) { function require() { return "require"; } - })(m1 || (m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { function exports() { return 1; @@ -53,5 +53,5 @@ define(["require", "exports"], function (require, exports) { return "require"; } m2.require = require; - })(m2 || (m2 = {})); + })(m2); }); diff --git a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js index 1865d1aceff74..2ad928ed4cb92 100644 --- a/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndFunctionInGlobalFile.js @@ -29,7 +29,7 @@ function exports() { function require() { return "require"; } -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { function exports() { return 1; @@ -37,8 +37,8 @@ var m3; function require() { return "require"; } -})(m3 || (m3 = {})); -var m4; +})(m3); +var m4 = m4 || (m4 = {}); (function (m4) { function exports() { return 1; @@ -48,4 +48,4 @@ var m4; return "require"; } m4.require = require; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js index ac243d3252681..6a632f35a156c 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js @@ -26,7 +26,7 @@ module m2 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m; + var m = {}; (function (m) { var c = /** @class */ (function () { function c() { @@ -34,23 +34,23 @@ define(["require", "exports"], function (require, exports) { return c; }()); m.c = c; - })(m = exports.m || (exports.m = {})); + })(m); var exports = m.c; var require = m.c; new exports(); new require(); - var m1; + var m1 = {}; (function (m1) { var exports = m.c; var require = m.c; new exports(); new require(); - })(m1 || (m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { m2.exports = m.c; m2.require = m.c; new m2.exports(); new m2.require(); - })(m2 || (m2 = {})); + })(m2); }); diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js index 547be309a0f74..f4b4eb77e1963 100644 --- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js +++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js @@ -23,7 +23,7 @@ module m2 { } //// [collisionExportsRequireAndInternalModuleAliasInGlobalFile.js] -var mOfGloalFile; +var mOfGloalFile = mOfGloalFile || (mOfGloalFile = {}); (function (mOfGloalFile) { var c = /** @class */ (function () { function c() { @@ -31,22 +31,22 @@ var mOfGloalFile; return c; }()); mOfGloalFile.c = c; -})(mOfGloalFile || (mOfGloalFile = {})); +})(mOfGloalFile); var exports = mOfGloalFile.c; var require = mOfGloalFile.c; new exports(); new require(); -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var exports = mOfGloalFile.c; var require = mOfGloalFile.c; new exports(); new require(); -})(m1 || (m1 = {})); -var m2; +})(m1); +var m2 = m2 || (m2 = {}); (function (m2) { m2.exports = mOfGloalFile.c; m2.require = mOfGloalFile.c; new m2.exports(); new m2.require(); -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js index ffbdfc4353673..1a6e0862d1f3a 100644 --- a/tests/baselines/reference/collisionExportsRequireAndModule.js +++ b/tests/baselines/reference/collisionExportsRequireAndModule.js @@ -95,7 +95,7 @@ module m4 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var require; + var require = {}; (function (require) { var C = /** @class */ (function () { function C() { @@ -103,12 +103,12 @@ define(["require", "exports"], function (require, exports) { return C; }()); require.C = C; - })(require = exports.require || (exports.require = {})); + })(require); function foo() { return null; } exports.foo = foo; - var exports; + var exports = {}; (function (exports) { var C = /** @class */ (function () { function C() { @@ -116,14 +116,14 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - })(exports = exports.exports || (exports.exports = {})); + })(exports); function foo2() { return null; } exports.foo2 = foo2; - var m1; + var m1 = {}; (function (m1) { - var require; + var require = require || (require = {}); (function (require) { var C = /** @class */ (function () { function C() { @@ -131,8 +131,8 @@ define(["require", "exports"], function (require, exports) { return C; }()); require.C = C; - })(require || (require = {})); - var exports; + })(require); + var exports = exports || (exports = {}); (function (exports) { var C = /** @class */ (function () { function C() { @@ -140,11 +140,11 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - })(exports || (exports = {})); - })(m1 || (m1 = {})); - var m2; + })(exports); + })(m1); + var m2 = {}; (function (m2) { - var require; + var require = m2.require || (m2.require = {}); (function (require) { var C = /** @class */ (function () { function C() { @@ -152,8 +152,8 @@ define(["require", "exports"], function (require, exports) { return C; }()); require.C = C; - })(require = m2.require || (m2.require = {})); - var exports; + })(require); + var exports = m2.exports || (m2.exports = {}); (function (exports) { var C = /** @class */ (function () { function C() { @@ -161,11 +161,11 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - })(exports = m2.exports || (m2.exports = {})); - })(m2 || (m2 = {})); + })(exports); + })(m2); }); //// [collisionExportsRequireAndModule_globalFile.js] -var require; +var require = require || (require = {}); (function (require) { var C = /** @class */ (function () { function C() { @@ -173,8 +173,8 @@ var require; return C; }()); require.C = C; -})(require || (require = {})); -var exports; +})(require); +var exports = exports || (exports = {}); (function (exports) { var C = /** @class */ (function () { function C() { @@ -182,10 +182,10 @@ var exports; return C; }()); exports.C = C; -})(exports || (exports = {})); -var m3; +})(exports); +var m3 = m3 || (m3 = {}); (function (m3) { - var require; + var require = require || (require = {}); (function (require) { var C = /** @class */ (function () { function C() { @@ -193,8 +193,8 @@ var m3; return C; }()); require.C = C; - })(require || (require = {})); - var exports; + })(require); + var exports = exports || (exports = {}); (function (exports) { var C = /** @class */ (function () { function C() { @@ -202,11 +202,11 @@ var m3; return C; }()); exports.C = C; - })(exports || (exports = {})); -})(m3 || (m3 = {})); -var m4; + })(exports); +})(m3); +var m4 = m4 || (m4 = {}); (function (m4) { - var require; + var require = m4.require || (m4.require = {}); (function (require) { var C = /** @class */ (function () { function C() { @@ -214,8 +214,8 @@ var m4; return C; }()); require.C = C; - })(require = m4.require || (m4.require = {})); - var exports; + })(require); + var exports = m4.exports || (m4.exports = {}); (function (exports) { var C = /** @class */ (function () { function C() { @@ -223,5 +223,5 @@ var m4; return C; }()); exports.C = C; - })(exports = m4.exports || (m4.exports = {})); -})(m4 || (m4 = {})); + })(exports); +})(m4); diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js index 9a20472ea685b..27289899a8917 100644 --- a/tests/baselines/reference/collisionExportsRequireAndVar.js +++ b/tests/baselines/reference/collisionExportsRequireAndVar.js @@ -35,27 +35,27 @@ define(["require", "exports"], function (require, exports) { exports.foo = foo; var exports = 1; var require = "require"; - var m1; + var m1 = {}; (function (m1) { var exports = 0; var require = "require"; - })(m1 || (m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { m2.exports = 0; m2.require = "require"; - })(m2 || (m2 = {})); + })(m2); }); //// [collisionExportsRequireAndVar_globalFile.js] var exports = 0; var require = "require"; -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { var exports = 0; var require = "require"; -})(m3 || (m3 = {})); -var m4; +})(m3); +var m4 = m4 || (m4 = {}); (function (m4) { m4.exports = 0; m4.require = "require"; -})(m4 || (m4 = {})); +})(m4); diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js index 423b685c8d617..0ffde3e355ba2 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js @@ -7,9 +7,9 @@ import _this = a; // Error //// [collisionThisExpressionAndAliasInGlobal.js] var _this_1 = this; -var a; +var a = a || (a = {}); (function (a) { a.b = 10; -})(a || (a = {})); +})(a); var f = function () { return _this_1; }; var _this = a; // Error diff --git a/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js index c2dc1db265b14..81abb60ad6f09 100644 --- a/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndEnumInGlobal.js @@ -7,9 +7,9 @@ var f = () => this; //// [collisionThisExpressionAndEnumInGlobal.js] var _this_1 = this; -var _this; +var _this = _this || (_this = {}); (function (_this) { _this[_this["_thisVal1"] = 0] = "_thisVal1"; _this[_this["_thisVal2"] = 1] = "_thisVal2"; -})(_this || (_this = {})); +})(_this); var f = function () { return _this_1; }; diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js index 14627f199596f..4a79fbd5df57f 100644 --- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js @@ -7,12 +7,12 @@ var f = () => this; //// [collisionThisExpressionAndModuleInGlobal.js] var _this_1 = this; -var _this; +var _this = _this || (_this = {}); (function (_this) { var c = /** @class */ (function () { function c() { } return c; }()); -})(_this || (_this = {})); +})(_this); var f = function () { return _this_1; }; diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.js b/tests/baselines/reference/commentEmitAtEndOfFile1.js index d6ba7b158d6f2..a473cf2874d7b 100644 --- a/tests/baselines/reference/commentEmitAtEndOfFile1.js +++ b/tests/baselines/reference/commentEmitAtEndOfFile1.js @@ -14,8 +14,8 @@ module empty { // test var f = ''; // test #2 -var foo; +var foo = foo || (foo = {}); (function (foo) { function bar() { } -})(foo || (foo = {})); +})(foo); // test #4 diff --git a/tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js b/tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js index 6f99037a61d4b..4f2a727598825 100644 --- a/tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js +++ b/tests/baselines/reference/commentInNamespaceDeclarationWithIdentifierPathName.js @@ -7,14 +7,14 @@ namespace hello.hi.world } //// [commentInNamespaceDeclarationWithIdentifierPathName.js] -var hello; +var hello = hello || (hello = {}); (function (hello) { - var hi; + var hi = hello.hi || (hello.hi = {}); (function (hi) { - var world; + var world = hi.world || (hi.world = {}); (function (world) { function foo() { } // TODO, blah - })(world = hi.world || (hi.world = {})); - })(hi = hello.hi || (hello.hi = {})); -})(hello || (hello = {})); + })(world); + })(hi); +})(hello); diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js index 353b70f4d3c08..1fd85e87ec722 100644 --- a/tests/baselines/reference/commentOnExportEnumDeclaration.js +++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js @@ -12,9 +12,9 @@ exports.__esModule = true; /** * comment */ -var Color; +var Color = {}; (function (Color) { Color[Color["r"] = 0] = "r"; Color[Color["g"] = 1] = "g"; Color[Color["b"] = 2] = "b"; -})(Color = exports.Color || (exports.Color = {})); +})(Color); diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index 03dc8559d77ee..c3a12b78a9bfb 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -11,9 +11,9 @@ define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ - var outerModule; + var outerModule = {}; (function (outerModule) { - var InnerModule; + var InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}); (function (InnerModule) { /// class b comment var b = /** @class */ (function () { @@ -22,8 +22,8 @@ define(["require", "exports"], function (require, exports) { return b; }()); InnerModule.b = b; - })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {})); - })(outerModule = exports.outerModule || (exports.outerModule = {})); + })(InnerModule); + })(outerModule); }); diff --git a/tests/baselines/reference/commentsEnums.js b/tests/baselines/reference/commentsEnums.js index 8fe7097ad8e36..f5ff2cb3b3b27 100644 --- a/tests/baselines/reference/commentsEnums.js +++ b/tests/baselines/reference/commentsEnums.js @@ -13,13 +13,13 @@ x = Colors.FancyPink; //// [commentsEnums.js] /** Enum of colors*/ -var Colors; +var Colors = Colors || (Colors = {}); (function (Colors) { /** Fancy name for 'blue'*/ Colors[Colors["Cornflower"] = 0] = "Cornflower"; /* blue */ /** Fancy name for 'pink'*/ Colors[Colors["FancyPink"] = 1] = "FancyPink"; -})(Colors || (Colors = {})); // trailing comment +})(Colors); // trailing comment var x = Colors.Cornflower; x = Colors.FancyPink; diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 6271c677e65bd..5e9caf5337e2f 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -65,14 +65,14 @@ define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ - var m1; + var m1 = {}; (function (m1) { /** foo's comment*/ function foo() { return m1.b; } /** m2 comments*/ - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { /** class comment;*/ var c = /** @class */ (function () { @@ -84,17 +84,17 @@ define(["require", "exports"], function (require, exports) { ; /** i*/ m2.i = new c(); - })(m2 = m1.m2 || (m1.m2 = {})); + })(m2); /** exported function*/ function fooExport() { return foo(); } m1.fooExport = fooExport; - })(m1 = exports.m1 || (exports.m1 = {})); + })(m1); m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ - var m4; + var m4 = {}; (function (m4) { /** foo's comment */ @@ -103,7 +103,7 @@ define(["require", "exports"], function (require, exports) { } /** m2 comments */ - var m2; + var m2 = m4.m2 || (m4.m2 = {}); (function (m2) { /** class comment; */ var c = /** @class */ (function () { @@ -115,13 +115,13 @@ define(["require", "exports"], function (require, exports) { ; /** i */ m2.i = new c(); - })(m2 = m4.m2 || (m4.m2 = {})); + })(m2); /** exported function */ function fooExport() { return foo(); } m4.fooExport = fooExport; - })(m4 = exports.m4 || (exports.m4 = {})); + })(m4); m4.fooExport(); var myvar2 = new m4.m2.c(); }); diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index bb8eab82c1e06..086538c373653 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -65,14 +65,14 @@ define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ - var m1; + var m1 = {}; (function (m1) { /** foo's comment*/ function foo() { return m1.b; } /** m2 comments*/ - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { /** class comment;*/ var c = /** @class */ (function () { @@ -84,17 +84,17 @@ define(["require", "exports"], function (require, exports) { ; /** i*/ m2.i = new c(); - })(m2 = m1.m2 || (m1.m2 = {})); + })(m2); /** exported function*/ function fooExport() { return foo(); } m1.fooExport = fooExport; - })(m1 = exports.m1 || (exports.m1 = {})); + })(m1); m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ - var m4; + var m4 = {}; (function (m4) { /** foo's comment */ @@ -103,7 +103,7 @@ define(["require", "exports"], function (require, exports) { } /** m2 comments */ - var m2; + var m2 = m4.m2 || (m4.m2 = {}); (function (m2) { /** class comment; */ var c = /** @class */ (function () { @@ -115,13 +115,13 @@ define(["require", "exports"], function (require, exports) { ; /** i */ m2.i = new c(); - })(m2 = m4.m2 || (m4.m2 = {})); + })(m2); /** exported function */ function fooExport() { return foo(); } m4.fooExport = fooExport; - })(m4 = exports.m4 || (exports.m4 = {})); + })(m4); m4.fooExport(); var myvar2 = new m4.m2.c(); }); diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 10c25efd00801..c502146816be3 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -64,14 +64,14 @@ export var newVar2 = new extMod.m4.m2.c(); "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** Module comment*/ -var m1; +var m1 = {}; (function (m1) { /** foo's comment*/ function foo() { return m1.b; } /** m2 comments*/ - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { /** class comment;*/ var c = /** @class */ (function () { @@ -83,17 +83,17 @@ var m1; ; /** i*/ m2.i = new c(); - })(m2 = m1.m2 || (m1.m2 = {})); + })(m2); /** exported function*/ function fooExport() { return foo(); } m1.fooExport = fooExport; -})(m1 = exports.m1 || (exports.m1 = {})); +})(m1); m1.fooExport(); var myvar = new m1.m2.c(); /** Module comment */ -var m4; +var m4 = {}; (function (m4) { /** foo's comment */ @@ -102,7 +102,7 @@ var m4; } /** m2 comments */ - var m2; + var m2 = m4.m2 || (m4.m2 = {}); (function (m2) { /** class comment; */ var c = /** @class */ (function () { @@ -114,13 +114,13 @@ var m4; ; /** i */ m2.i = new c(); - })(m2 = m4.m2 || (m4.m2 = {})); + })(m2); /** exported function */ function fooExport() { return foo(); } m4.fooExport = fooExport; -})(m4 = exports.m4 || (exports.m4 = {})); +})(m4); m4.fooExport(); var myvar2 = new m4.m2.c(); //// [commentsExternalModules_1.js] diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js index dcccc48f2a02a..2a30f4d2c553c 100644 --- a/tests/baselines/reference/commentsFormatting.js +++ b/tests/baselines/reference/commentsFormatting.js @@ -86,7 +86,7 @@ this is 4 spaces left aligned but above line is empty } //// [commentsFormatting.js] -var m; +var m = m || (m = {}); (function (m) { /** this is first line - aligned to class declaration * this is 4 spaces left aligned @@ -184,7 +184,7 @@ this is 4 spaces left aligned but above line is empty return c4; }()); m.c4 = c4; -})(m || (m = {})); +})(m); //// [commentsFormatting.d.ts] diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index f6907855d3f32..db568b46e8f4e 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -99,14 +99,14 @@ new m7.m8.m9.c(); //// [commentsModules.js] /** Module comment*/ -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { /** foo's comment*/ function foo() { return m1.b; } /** m2 comments*/ - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { /** class comment;*/ var c = /** @class */ (function () { @@ -118,7 +118,7 @@ var m1; ; /** i*/ m2.i = new c(); - })(m2 = m1.m2 || (m1.m2 = {})); + })(m2); /** exported function*/ function fooExport() { return foo(); @@ -139,13 +139,13 @@ var m1; */ function foo4Export() { } -})(m1 || (m1 = {})); // trailing comment module +})(m1); // trailing comment module m1.fooExport(); var myvar = new m1.m2.c(); /** module comment of m2.m3*/ -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -154,15 +154,15 @@ var m2; return c; }()); m3.c = c; - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 || (m2 = {})); /* trailing dotted module comment*/ + })(m3); +})(m2); /* trailing dotted module comment*/ new m2.m3.c(); /** module comment of m3.m4.m5*/ -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { - var m4; + var m4 = m3.m4 || (m3.m4 = {}); (function (m4) { - var m5; + var m5 = m4.m5 || (m4.m5 = {}); (function (m5) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -171,18 +171,18 @@ var m3; return c; }()); m5.c = c; - })(m5 = m4.m5 || (m4.m5 = {})); - })(m4 = m3.m4 || (m3.m4 = {})); -})(m3 || (m3 = {})); // trailing dotted module 2 + })(m5); + })(m4); +})(m3); // trailing dotted module 2 new m3.m4.m5.c(); /** module comment of m4.m5.m6*/ -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { - var m5; + var m5 = m4.m5 || (m4.m5 = {}); (function (m5) { - var m6; + var m6 = m5.m6 || (m5.m6 = {}); (function (m6) { - var m7; + var m7 = m6.m7 || (m6.m7 = {}); (function (m7) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -191,20 +191,20 @@ var m4; return c; }()); m7.c = c; - })(m7 = m6.m7 || (m6.m7 = {})); /* trailing inner module */ /* multiple comments*/ - })(m6 = m5.m6 || (m5.m6 = {})); - })(m5 = m4.m5 || (m4.m5 = {})); -})(m4 || (m4 = {})); + })(m7); /* trailing inner module */ /* multiple comments*/ + })(m6); + })(m5); +})(m4); new m4.m5.m6.m7.c(); /** module comment of m5.m6.m7*/ -var m5; +var m5 = m5 || (m5 = {}); (function (m5) { - var m6; + var m6 = m5.m6 || (m5.m6 = {}); (function (m6) { - var m7; + var m7 = m6.m7 || (m6.m7 = {}); (function (m7) { /** module m8 comment*/ - var m8; + var m8 = m7.m8 || (m7.m8 = {}); (function (m8) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -213,16 +213,16 @@ var m5; return c; }()); m8.c = c; - })(m8 = m7.m8 || (m7.m8 = {})); - })(m7 = m6.m7 || (m6.m7 = {})); - })(m6 = m5.m6 || (m5.m6 = {})); -})(m5 || (m5 = {})); + })(m8); + })(m7); + })(m6); +})(m5); new m5.m6.m7.m8.c(); -var m6; +var m6 = m6 || (m6 = {}); (function (m6) { - var m7; + var m7 = m6.m7 || (m6.m7 = {}); (function (m7) { - var m8; + var m8 = m7.m8 || (m7.m8 = {}); (function (m8) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -231,16 +231,16 @@ var m6; return c; }()); m8.c = c; - })(m8 = m7.m8 || (m7.m8 = {})); - })(m7 = m6.m7 || (m6.m7 = {})); -})(m6 || (m6 = {})); + })(m8); + })(m7); +})(m6); new m6.m7.m8.c(); -var m7; +var m7 = m7 || (m7 = {}); (function (m7) { - var m8; + var m8 = m7.m8 || (m7.m8 = {}); (function (m8) { /** module m9 comment*/ - var m9; + var m9 = m8.m9 || (m8.m9 = {}); (function (m9) { /** Exported class comment*/ var c = /** @class */ (function () { @@ -262,9 +262,9 @@ var m7; return e; }()); m9.e = e; - })(m9 = m8.m9 || (m8.m9 = {})); - })(m8 = m7.m8 || (m7.m8 = {})); -})(m7 || (m7 = {})); + })(m9); + })(m8); +})(m7); new m7.m8.m9.c(); diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index c06a568959442..aee89babdaff0 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi declare module*/ - var multiM; + var multiM = {}; (function (multiM) { /// class b comment var b = /** @class */ (function () { @@ -49,7 +49,7 @@ define(["require", "exports"], function (require, exports) { return b; }()); multiM.b = b; - })(multiM = exports.multiM || (exports.multiM = {})); + })(multiM); /** thi is multi module 2*/ (function (multiM) { /** class c comment*/ @@ -66,7 +66,7 @@ define(["require", "exports"], function (require, exports) { return e; }()); multiM.e = e; - })(multiM = exports.multiM || (exports.multiM = {})); + })(multiM); new multiM.b(); new multiM.c(); }); @@ -75,7 +75,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); /** this is multi module 3 comment*/ - var multiM; + var multiM = {}; (function (multiM) { /** class d comment*/ var d = /** @class */ (function () { @@ -91,7 +91,7 @@ define(["require", "exports"], function (require, exports) { return f; }()); multiM.f = f; - })(multiM = exports.multiM || (exports.multiM = {})); + })(multiM); new multiM.d(); }); diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js index cb50f21289346..f09fcc6a8f107 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.js +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js @@ -25,7 +25,7 @@ new multiM.c(); //// [commentsMultiModuleSingleFile.js] /** this is multi declare module*/ -var multiM; +var multiM = multiM || (multiM = {}); (function (multiM) { /** class b*/ var b = /** @class */ (function () { @@ -41,7 +41,7 @@ var multiM; return d; }()); multiM.d = d; -})(multiM || (multiM = {})); +})(multiM); /// this is multi module 2 (function (multiM) { /** class c comment*/ @@ -58,7 +58,7 @@ var multiM; return e; }()); multiM.e = e; -})(multiM || (multiM = {})); +})(multiM); new multiM.b(); new multiM.c(); diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js index ae7442f109a64..b2085f94f5a6d 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.js +++ b/tests/baselines/reference/commentsdoNotEmitComments.js @@ -123,7 +123,7 @@ var c = (function () { }()); var i = new c(); var i1_i; -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var b = (function () { function b(x) { @@ -132,7 +132,7 @@ var m1; return b; }()); m1.b = b; -})(m1 || (m1 = {})); +})(m1); var shade = 1; diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js index dd8f3608cf33f..b12c65c1ebcd7 100644 --- a/tests/baselines/reference/commentsemitComments.js +++ b/tests/baselines/reference/commentsemitComments.js @@ -131,7 +131,7 @@ var i = new c(); /**interface instance comments*/ var i1_i; /** this is module comment*/ -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { /** class b */ var b = /** @class */ (function () { @@ -141,7 +141,7 @@ var m1; return b; }()); m1.b = b; -})(m1 || (m1 = {})); +})(m1); //// [commentsemitComments.d.ts] diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js index 9a1e89136a6dc..6d6683f0f22a3 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js @@ -42,12 +42,12 @@ var C1 = /** @class */ (function () { return C1; }()); exports.C1 = C1; -var E1; +var E1 = {}; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; -})(E1 = exports.E1 || (exports.E1 = {})); +})(E1); //// [foo_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js index ad547ea769b64..a8c93d9f29f48 100644 --- a/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js +++ b/tests/baselines/reference/comparisonOperatorWithIdenticalPrimitiveType.js @@ -80,12 +80,12 @@ var rh6 = null !== null; var rh7 = undefined !== undefined; //// [comparisonOperatorWithIdenticalPrimitiveType.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js index 3872e950f4010..fb017eb518b8a 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipPrimitiveType.js @@ -216,12 +216,12 @@ var r8e1 = e !== c; var r8e1 = e !== d; //// [comparisonOperatorWithNoRelationshipPrimitiveType.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.js index 7042a84150298..c9e82f79abc14 100644 --- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.js +++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipTypeParameter.js @@ -157,12 +157,12 @@ function foo(t: T, u: U) { } //// [comparisonOperatorWithNoRelationshipTypeParameter.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.js b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.js index 9a52b04b548ab..ced268dd4aec9 100644 --- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.js +++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.js @@ -169,12 +169,12 @@ var r8b7 = g !== x; //// [comparisonOperatorWithOneOperandIsAny.js] var x; -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); function foo(t) { var foo_r1 = t < x; var foo_r2 = t > x; diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js index 32ec46fe52cdf..b26356fa209ca 100644 --- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js +++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.js @@ -166,12 +166,12 @@ var r8b6 = f !== null; var r8b7 = g !== null; //// [comparisonOperatorWithOneOperandIsNull.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); function foo(t) { var foo_r1 = t < null; var foo_r2 = t > null; diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.js b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.js index 9ec4c9ce122f4..878f9b4b139c4 100644 --- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.js +++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.js @@ -169,12 +169,12 @@ var r8b7 = g !== x; //// [comparisonOperatorWithOneOperandIsUndefined.js] var x; -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); function foo(t) { var foo_r1 = t < x; var foo_r2 = t > x; diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.js b/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.js index fc0323a89aa08..a42617c799b9c 100644 --- a/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.js +++ b/tests/baselines/reference/comparisonOperatorWithSubtypeEnumAndNumber.js @@ -69,12 +69,12 @@ var rh5 = E.a !== 0; var rh6 = 0 !== E.a; //// [comparisonOperatorWithSubtypeEnumAndNumber.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; // operator < diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js index a8a59b84b8834..b049b72ea4f2e 100644 --- a/tests/baselines/reference/complexNarrowingWithAny.js +++ b/tests/baselines/reference/complexNarrowingWithAny.js @@ -621,7 +621,7 @@ exports.__esModule = true; // import * as import50 from '@angular/forms/src/directives/ng_control'; // import * as import51 from '@angular/forms/src/directives/control_container'; //stubbed out imports -var import44; +var import44 = {}; (function (import44) { var FormGroupDirective = /** @class */ (function () { function FormGroupDirective(any) { @@ -629,8 +629,8 @@ var import44; return FormGroupDirective; }()); import44.FormGroupDirective = FormGroupDirective; -})(import44 || (import44 = {})); -var import45; +})(import44); +var import45 = {}; (function (import45) { var NgControlStatus = /** @class */ (function () { function NgControlStatus(any) { @@ -644,8 +644,8 @@ var import45; return NgControlStatusGroup; }()); import45.NgControlStatusGroup = NgControlStatusGroup; -})(import45 || (import45 = {})); -var import46; +})(import45); +var import46 = {}; (function (import46) { var DefaultValueAccessor = /** @class */ (function () { function DefaultValueAccessor(any) { @@ -653,8 +653,8 @@ var import46; return DefaultValueAccessor; }()); import46.DefaultValueAccessor = DefaultValueAccessor; -})(import46 || (import46 = {})); -var import47; +})(import46); +var import47 = {}; (function (import47) { var FormControlName = /** @class */ (function () { function FormControlName(any) { @@ -662,8 +662,8 @@ var import47; return FormControlName; }()); import47.FormControlName = FormControlName; -})(import47 || (import47 = {})); -var import48; +})(import47); +var import48 = {}; (function (import48) { var FormControlName = /** @class */ (function () { function FormControlName(any) { @@ -671,15 +671,15 @@ var import48; return FormControlName; }()); import48.FormControlName = FormControlName; -})(import48 || (import48 = {})); +})(import48); //HERE BE DRAGONS //Using a value here - 65+ seconds to typecheck -var import49; +var import49 = {}; (function (import49) { //real code uses an opaque token, using new String() to simulate. //export var NG_VALUE_ACCESSOR = new OpaqueToken('ngValueAccessor') import49.NG_VALUE_ACCESSOR = new String('foo'); -})(import49 || (import49 = {})); +})(import49); //using a class - < 1 sec typecheck // namespace import49 { // export class NG_VALUE_ACCESSOR { @@ -687,7 +687,7 @@ var import49; // } // } //END DRAGONS -var import50; +var import50 = {}; (function (import50) { var NgControl = /** @class */ (function () { function NgControl(any) { @@ -695,8 +695,8 @@ var import50; return NgControl; }()); import50.NgControl = NgControl; -})(import50 || (import50 = {})); -var import51; +})(import50); +var import51 = {}; (function (import51) { var ControlContainer = /** @class */ (function () { function ControlContainer(any) { @@ -704,7 +704,7 @@ var import51; return ControlContainer; }()); import51.ControlContainer = ControlContainer; -})(import51 || (import51 = {})); +})(import51); var _View_AppComponent0 = /** @class */ (function () { function _View_AppComponent0(viewUtils, parentInjector, declarationEl) { } diff --git a/tests/baselines/reference/complicatedPrivacy.js b/tests/baselines/reference/complicatedPrivacy.js index 94c00e32330a8..2f6e9459ddd5e 100644 --- a/tests/baselines/reference/complicatedPrivacy.js +++ b/tests/baselines/reference/complicatedPrivacy.js @@ -105,9 +105,9 @@ module mglo5 { //// [complicatedPrivacy.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { function f1(c1) { } @@ -133,7 +133,7 @@ var m1; return C2; }()); m2.C2 = C2; - })(m2 = m1.m2 || (m1.m2 = {})); + })(m2); function f2(arg1) { } m1.f2 = f2; @@ -147,11 +147,11 @@ var m1; function f5(arg2) { } m1.f5 = f5; - var m3; + var m3 = m3 || (m3 = {}); (function (m3) { function f2(f1) { } - })(m3 || (m3 = {})); + })(m3); var C1 = /** @class */ (function () { function C1() { } @@ -163,15 +163,15 @@ var m1; return C5; }()); m1.C5 = C5; -})(m1 || (m1 = {})); +})(m1); var C2 = /** @class */ (function () { function C2() { } return C2; }()); -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { var c_pr = /** @class */ (function () { function c_pr() { @@ -182,22 +182,22 @@ var m2; return c_pr; }()); m3.c_pr = c_pr; - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var C = /** @class */ (function () { function C() { } return C; }()); - var m5; + var m5 = m5 || (m5 = {}); (function (m5) { - var m6; + var m6 = m5.m6 || (m5.m6 = {}); (function (m6) { function f1() { return new C(); } - })(m6 = m5.m6 || (m5.m6 = {})); - })(m5 || (m5 = {})); - })(m4 || (m4 = {})); - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 || (m2 = {})); + })(m6); + })(m5); + })(m4); + })(m3); +})(m2); diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js index ae53d0641783a..c1b8f8eeaf4b8 100644 --- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js +++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.js @@ -51,11 +51,11 @@ var x7: void; x7 += a; //// [compoundAdditionAssignmentLHSCanBeAssigned.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; var x1; diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js index 24fa635a0a127..8b3444e704485 100644 --- a/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js +++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCannotBeAssigned.js @@ -19,12 +19,12 @@ x5 += ''; //// [compoundAdditionAssignmentLHSCannotBeAssigned.js] // string can add every type, and result string cannot be assigned to below types -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var x1; x1 += ''; var x2; diff --git a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js index cef1d3e424e97..e1e0c6f6984ed 100644 --- a/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js +++ b/tests/baselines/reference/compoundAdditionAssignmentWithInvalidOperands.js @@ -41,11 +41,11 @@ x5 += true; x5 += {}; //// [compoundAdditionAssignmentWithInvalidOperands.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var x1; x1 += a; diff --git a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js index baeaa1538db94..33feb00a4139a 100644 --- a/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js +++ b/tests/baselines/reference/compoundArithmeticAssignmentLHSCanBeAssigned.js @@ -27,12 +27,12 @@ x3 *= null; x3 *= undefined; //// [compoundArithmeticAssignmentLHSCanBeAssigned.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js index 5c71f717bb237..288daba74ed9d 100644 --- a/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js +++ b/tests/baselines/reference/compoundArithmeticAssignmentWithInvalidOperands.js @@ -61,11 +61,11 @@ x6 *= '' x6 *= {}; //// [compoundArithmeticAssignmentWithInvalidOperands.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; var x1; diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js index 306bae602a525..c8bc62d2d5c4c 100644 --- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js @@ -161,16 +161,16 @@ function foo() { this *= value; this += value; // identifiers: module, class, enum, function -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); M *= value; M += value; C *= value; C += value; -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); E *= value; E += value; foo *= value; diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js index 4f02150cbe697..6c96758be9d20 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCanBeAssigned1.js @@ -27,12 +27,12 @@ x3 **= null; x3 **= undefined; //// [compoundExponentiationAssignmentLHSCanBeAssigned1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js index b04e60d373b3c..4b9f24103e1d1 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSCannotBeAssigned.js @@ -61,11 +61,11 @@ x6 **= '' x6 **= {}; //// [compoundExponentiationAssignmentLHSCannotBeAssigned.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; var x1; diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js index b3fa40390b36a..d254ceb738f2d 100644 --- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js +++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js @@ -120,14 +120,14 @@ function foo() { } this = Math.pow(this, value); // identifiers: module, class, enum, function -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); M = Math.pow(M, value); C = Math.pow(C, value); -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); E = Math.pow(E, value); foo = Math.pow(foo, value); // literals diff --git a/tests/baselines/reference/compoundVarDecl1.js b/tests/baselines/reference/compoundVarDecl1.js index 99450b8b2851c..56317952abaac 100644 --- a/tests/baselines/reference/compoundVarDecl1.js +++ b/tests/baselines/reference/compoundVarDecl1.js @@ -4,9 +4,9 @@ module Foo { var a = 1, b = 1; a = b + 2; } var foo = 4, bar = 5; //// [compoundVarDecl1.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var a = 1, b = 1; a = b + 2; -})(Foo || (Foo = {})); +})(Foo); var foo = 4, bar = 5; diff --git a/tests/baselines/reference/computedPropertiesTransformedInOtherwiseNonTSClasses.js b/tests/baselines/reference/computedPropertiesTransformedInOtherwiseNonTSClasses.js index 85ad97f560b8e..5babc12e69ea5 100644 --- a/tests/baselines/reference/computedPropertiesTransformedInOtherwiseNonTSClasses.js +++ b/tests/baselines/reference/computedPropertiesTransformedInOtherwiseNonTSClasses.js @@ -9,7 +9,7 @@ namespace NS { //// [computedPropertiesTransformedInOtherwiseNonTSClasses.js] -var NS; +var NS = NS || (NS = {}); (function (NS) { NS.x = Symbol(); var NotTransformed = /** @class */ (function () { @@ -18,4 +18,4 @@ var NS; return NotTransformed; }()); NS.x; -})(NS || (NS = {})); +})(NS); diff --git a/tests/baselines/reference/computedPropertyNames19_ES5.js b/tests/baselines/reference/computedPropertyNames19_ES5.js index 8d471863586db..3c33a6bac4568 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES5.js +++ b/tests/baselines/reference/computedPropertyNames19_ES5.js @@ -6,10 +6,10 @@ module M { } //// [computedPropertyNames19_ES5.js] -var M; +var M = M || (M = {}); (function (M) { var _a; var obj = (_a = {}, _a[this.bar] = 0, _a); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/computedPropertyNames19_ES6.js b/tests/baselines/reference/computedPropertyNames19_ES6.js index 99ebde491ec70..7ecfd2da8f41e 100644 --- a/tests/baselines/reference/computedPropertyNames19_ES6.js +++ b/tests/baselines/reference/computedPropertyNames19_ES6.js @@ -6,9 +6,9 @@ module M { } //// [computedPropertyNames19_ES6.js] -var M; +var M = M || (M = {}); (function (M) { var obj = { [this.bar]: 0 }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/computedPropertyNames47_ES5.js b/tests/baselines/reference/computedPropertyNames47_ES5.js index f423d230fe9ef..ad40b3f5f7369 100644 --- a/tests/baselines/reference/computedPropertyNames47_ES5.js +++ b/tests/baselines/reference/computedPropertyNames47_ES5.js @@ -7,14 +7,14 @@ var o = { //// [computedPropertyNames47_ES5.js] var _a; -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["x"] = 0] = "x"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["x"] = 0] = "x"; -})(E2 || (E2 = {})); +})(E2); var o = (_a = {}, _a[E1.x || E2.x] = 0, _a); diff --git a/tests/baselines/reference/computedPropertyNames47_ES6.js b/tests/baselines/reference/computedPropertyNames47_ES6.js index 0b6cb352999c3..5c287d06061b9 100644 --- a/tests/baselines/reference/computedPropertyNames47_ES6.js +++ b/tests/baselines/reference/computedPropertyNames47_ES6.js @@ -6,14 +6,14 @@ var o = { }; //// [computedPropertyNames47_ES6.js] -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["x"] = 0] = "x"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["x"] = 0] = "x"; -})(E2 || (E2 = {})); +})(E2); var o = { [E1.x || E2.x]: 0 }; diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.js b/tests/baselines/reference/computedPropertyNames48_ES5.js index b4e2d95634b30..19ce5d5ecb010 100644 --- a/tests/baselines/reference/computedPropertyNames48_ES5.js +++ b/tests/baselines/reference/computedPropertyNames48_ES5.js @@ -19,10 +19,10 @@ extractIndexer({ //// [computedPropertyNames48_ES5.js] var _a, _b, _c; -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 0] = "x"; -})(E || (E = {})); +})(E); var a; extractIndexer((_a = {}, _a[a] = "", diff --git a/tests/baselines/reference/computedPropertyNames48_ES6.js b/tests/baselines/reference/computedPropertyNames48_ES6.js index 8e54d67238c21..7d5b6cd5b748a 100644 --- a/tests/baselines/reference/computedPropertyNames48_ES6.js +++ b/tests/baselines/reference/computedPropertyNames48_ES6.js @@ -18,10 +18,10 @@ extractIndexer({ }); // Should return any (widened form of undefined) //// [computedPropertyNames48_ES6.js] -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 0] = "x"; -})(E || (E = {})); +})(E); var a; extractIndexer({ [a]: "" diff --git a/tests/baselines/reference/computedPropertyNames7_ES5.js b/tests/baselines/reference/computedPropertyNames7_ES5.js index 6adc38b410c03..f10ae6812b09b 100644 --- a/tests/baselines/reference/computedPropertyNames7_ES5.js +++ b/tests/baselines/reference/computedPropertyNames7_ES5.js @@ -8,10 +8,10 @@ var v = { //// [computedPropertyNames7_ES5.js] var _a; -var E; +var E = E || (E = {}); (function (E) { E[E["member"] = 0] = "member"; -})(E || (E = {})); +})(E); var v = (_a = {}, _a[E.member] = 0, _a); diff --git a/tests/baselines/reference/computedPropertyNames7_ES6.js b/tests/baselines/reference/computedPropertyNames7_ES6.js index ee1e1c85c06a8..551b20db624cc 100644 --- a/tests/baselines/reference/computedPropertyNames7_ES6.js +++ b/tests/baselines/reference/computedPropertyNames7_ES6.js @@ -7,10 +7,10 @@ var v = { } //// [computedPropertyNames7_ES6.js] -var E; +var E = E || (E = {}); (function (E) { E[E["member"] = 0] = "member"; -})(E || (E = {})); +})(E); var v = { [E.member]: 0 }; diff --git a/tests/baselines/reference/constDeclarations-access3.js b/tests/baselines/reference/constDeclarations-access3.js index 945c688321361..06c1ff3803e33 100644 --- a/tests/baselines/reference/constDeclarations-access3.js +++ b/tests/baselines/reference/constDeclarations-access3.js @@ -44,10 +44,10 @@ M.x.toString(); //// [constDeclarations-access3.js] -var M; +var M = M || (M = {}); (function (M) { M.x = 0; -})(M || (M = {})); +})(M); // Errors M.x = 1; M.x += 2; diff --git a/tests/baselines/reference/constDeclarations-scopes.js b/tests/baselines/reference/constDeclarations-scopes.js index a40edb87ec99c..87ee896aa4f8a 100644 --- a/tests/baselines/reference/constDeclarations-scopes.js +++ b/tests/baselines/reference/constDeclarations-scopes.js @@ -231,7 +231,7 @@ var F3 = function () { n = c; }; // modules -var m; +var m = m || (m = {}); (function (m) { const c = 0; n = c; @@ -239,7 +239,7 @@ var m; const c = false; var b2 = c; } -})(m || (m = {})); +})(m); // methods class C { constructor() { diff --git a/tests/baselines/reference/constDeclarations-validContexts.js b/tests/baselines/reference/constDeclarations-validContexts.js index dba61fec63520..0f18a05986021 100644 --- a/tests/baselines/reference/constDeclarations-validContexts.js +++ b/tests/baselines/reference/constDeclarations-validContexts.js @@ -191,13 +191,13 @@ var F3 = function () { const c21 = 0; }; // modules -var m; +var m = m || (m = {}); (function (m) { const c22 = 0; { const c23 = 0; } -})(m || (m = {})); +})(m); // methods class C { constructor() { diff --git a/tests/baselines/reference/constDeclarations2.js b/tests/baselines/reference/constDeclarations2.js index f176e093610e7..19e062be9d573 100644 --- a/tests/baselines/reference/constDeclarations2.js +++ b/tests/baselines/reference/constDeclarations2.js @@ -9,12 +9,12 @@ module M { //// [constDeclarations2.js] // No error -var M; +var M = M || (M = {}); (function (M) { M.c1 = false; M.c2 = 23; M.c3 = 0, M.c4 = "", M.c5 = null; -})(M || (M = {})); +})(M); //// [constDeclarations2.d.ts] diff --git a/tests/baselines/reference/constEnumErrors.js b/tests/baselines/reference/constEnumErrors.js index 4afd98982f014..96c2d12eff45e 100644 --- a/tests/baselines/reference/constEnumErrors.js +++ b/tests/baselines/reference/constEnumErrors.js @@ -44,10 +44,10 @@ const enum NaNOrInfinity { } //// [constEnumErrors.js] -var E; +var E = E || (E = {}); (function (E) { var x = 1; -})(E || (E = {})); +})(E); var y0 = E2[1]; var name = "A"; var y1 = E2[name]; diff --git a/tests/baselines/reference/constEnumMergingWithValues3.js b/tests/baselines/reference/constEnumMergingWithValues3.js index 7e105976d2d04..3a409953fff6b 100644 --- a/tests/baselines/reference/constEnumMergingWithValues3.js +++ b/tests/baselines/reference/constEnumMergingWithValues3.js @@ -9,9 +9,9 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var foo; + var foo = {}; (function (foo) { foo[foo["A"] = 0] = "A"; - })(foo || (foo = {})); + })(foo); return foo; }); diff --git a/tests/baselines/reference/constEnumMergingWithValues4.js b/tests/baselines/reference/constEnumMergingWithValues4.js index 3d70f5ad2c940..7842683a82b6c 100644 --- a/tests/baselines/reference/constEnumMergingWithValues4.js +++ b/tests/baselines/reference/constEnumMergingWithValues4.js @@ -13,9 +13,9 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var foo; + var foo = {}; (function (foo) { var x = 1; - })(foo || (foo = {})); + })(foo); return foo; }); diff --git a/tests/baselines/reference/constEnumMergingWithValues5.js b/tests/baselines/reference/constEnumMergingWithValues5.js index 50a6e5c6925fa..9154c0ff8b7cb 100644 --- a/tests/baselines/reference/constEnumMergingWithValues5.js +++ b/tests/baselines/reference/constEnumMergingWithValues5.js @@ -8,12 +8,12 @@ export = foo //// [m1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var foo; + var foo = {}; (function (foo) { - var E; + var E = E || (E = {}); (function (E) { E[E["X"] = 0] = "X"; - })(E || (E = {})); - })(foo || (foo = {})); + })(E); + })(foo); return foo; }); diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.js b/tests/baselines/reference/constEnumOnlyModuleMerging.js index 1d32fe748ab1b..7a52b7158f645 100644 --- a/tests/baselines/reference/constEnumOnlyModuleMerging.js +++ b/tests/baselines/reference/constEnumOnlyModuleMerging.js @@ -14,13 +14,13 @@ module B { } //// [constEnumOnlyModuleMerging.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { Outer.x = 1; -})(Outer || (Outer = {})); -var B; +})(Outer); +var B = B || (B = {}); (function (B) { var O = Outer; var x = 0 /* X */; var y = O.x; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/constEnums.js b/tests/baselines/reference/constEnums.js index 893872b410082..445a2396babfc 100644 --- a/tests/baselines/reference/constEnums.js +++ b/tests/baselines/reference/constEnums.js @@ -154,17 +154,17 @@ function bar(e: A.B.C.E): number { } //// [constEnums.js] -var A2; +var A2 = A2 || (A2 = {}); (function (A2) { - var B; + var B = A2.B || (A2.B = {}); (function (B) { // module C will be classified as value - var C; + var C = B.C || (B.C = {}); (function (C) { var x = 1; - })(C = B.C || (B.C = {})); - })(B = A2.B || (A2.B = {})); -})(A2 || (A2 = {})); + })(C); + })(B); +})(A2); var I2 = A2.B; function foo0(e) { if (e === 1 /* V1 */) { diff --git a/tests/baselines/reference/constIndexedAccess.js b/tests/baselines/reference/constIndexedAccess.js index ea203c38e3ff8..39a99df04a3c7 100644 --- a/tests/baselines/reference/constIndexedAccess.js +++ b/tests/baselines/reference/constIndexedAccess.js @@ -37,10 +37,10 @@ var s1 = test[0 /* zero */]; var n1 = test[1 /* one */]; var s2 = test[0 /* "zero" */]; var n2 = test[1 /* "one" */]; -var numbersNotConst; +var numbersNotConst = numbersNotConst || (numbersNotConst = {}); (function (numbersNotConst) { numbersNotConst[numbersNotConst["zero"] = 0] = "zero"; numbersNotConst[numbersNotConst["one"] = 1] = "one"; -})(numbersNotConst || (numbersNotConst = {})); +})(numbersNotConst); var s3 = test[numbersNotConst.zero]; var n3 = test[numbersNotConst.one]; diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js index 066a20ac9b39c..91e3b63711fc7 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance.js @@ -73,8 +73,8 @@ module MemberWithConstructSignature { //// [constructSignatureAssignabilityInInheritance.js] // Checking basic subtype relations with construct signatures -var MemberWithConstructSignature; +var MemberWithConstructSignature = MemberWithConstructSignature || (MemberWithConstructSignature = {}); (function (MemberWithConstructSignature) { var b; var r = new b.a(1); -})(MemberWithConstructSignature || (MemberWithConstructSignature = {})); +})(MemberWithConstructSignature); diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js index 935dc0756ec46..9b8e309b5935e 100644 --- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js +++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js @@ -127,7 +127,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -155,4 +155,4 @@ var Errors; } return OtherDerived; }(Base)); -})(Errors || (Errors = {})); +})(Errors); diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.js b/tests/baselines/reference/constructSignaturesWithOverloads2.js index e998a3a4d808f..8ccb48d24a66a 100644 --- a/tests/baselines/reference/constructSignaturesWithOverloads2.js +++ b/tests/baselines/reference/constructSignaturesWithOverloads2.js @@ -49,7 +49,7 @@ var C = /** @class */ (function () { }()); (function (C) { C.x = 1; -})(C || (C = {})); +})(C); var r1 = new C(1, ''); var C2 = /** @class */ (function () { function C2(x) { @@ -58,7 +58,7 @@ var C2 = /** @class */ (function () { }()); (function (C2) { C2.x = 1; -})(C2 || (C2 = {})); +})(C2); var r2 = new C2(1, ''); var i2; var r4 = new i2(1, ''); diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.js b/tests/baselines/reference/constructorArgWithGenericCallSignature.js index 0891e10ababba..bfe8f68d0c97b 100644 --- a/tests/baselines/reference/constructorArgWithGenericCallSignature.js +++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.js @@ -15,7 +15,7 @@ var test = new Test.MyClass(func); // Should be OK //// [constructorArgWithGenericCallSignature.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var MyClass = /** @class */ (function () { function MyClass(func) { @@ -25,7 +25,7 @@ var Test; Test.MyClass = MyClass; function F(func) { } Test.F = F; -})(Test || (Test = {})); +})(Test); var func; Test.F(func); // OK var test = new Test.MyClass(func); // Should be OK diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.js b/tests/baselines/reference/constructorHasPrototypeProperty.js index cc4a238a2119e..13044e6fd15ae 100644 --- a/tests/baselines/reference/constructorHasPrototypeProperty.js +++ b/tests/baselines/reference/constructorHasPrototypeProperty.js @@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var NonGeneric; +var NonGeneric = NonGeneric || (NonGeneric = {}); (function (NonGeneric) { var C = /** @class */ (function () { function C() { @@ -63,8 +63,8 @@ var NonGeneric; r.foo; var r2 = D.prototype; r2.bar; -})(NonGeneric || (NonGeneric = {})); -var Generic; +})(NonGeneric); +var Generic = Generic || (Generic = {}); (function (Generic) { var C = /** @class */ (function () { function C() { @@ -82,4 +82,4 @@ var Generic; var ra = r.foo; // any var r2 = D.prototype; // D var rb = r2.baz; // any -})(Generic || (Generic = {})); +})(Generic); diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 59d5f1ed988f2..9e08711a2113f 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -295,7 +295,7 @@ var __extends = (this && this.__extends) || (function () { })(); var fs = module; ("fs"); -var TypeScriptAllInOne; +var TypeScriptAllInOne = TypeScriptAllInOne || (TypeScriptAllInOne = {}); (function (TypeScriptAllInOne) { var Program = /** @class */ (function () { function Program() { @@ -347,7 +347,7 @@ var TypeScriptAllInOne; } console.log('Done'); return 0; -})(TypeScriptAllInOne || (TypeScriptAllInOne = {})); +})(TypeScriptAllInOne); var BasicFeatures = /** @class */ (function () { function BasicFeatures() { } @@ -557,15 +557,15 @@ rest: string[]; DefaultValue(value ? : string = "Hello"); { } } -var Weekdays; +var Weekdays = Weekdays || (Weekdays = {}); (function (Weekdays) { Weekdays[Weekdays["Monday"] = 0] = "Monday"; Weekdays[Weekdays["Tuesday"] = 1] = "Tuesday"; Weekdays[Weekdays["Weekend"] = 2] = "Weekend"; -})(Weekdays || (Weekdays = {})); -var Fruit; +})(Weekdays); +var Fruit = Fruit || (Fruit = {}); (function (Fruit) { Fruit[Fruit["Apple"] = 0] = "Apple"; Fruit[Fruit["Pear"] = 1] = "Pear"; -})(Fruit || (Fruit = {})); +})(Fruit); TypeScriptAllInOne.Program.Main(); diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js index 17ef4814740d0..0b2b9791bf5be 100644 --- a/tests/baselines/reference/contextualTyping.js +++ b/tests/baselines/reference/contextualTyping.js @@ -235,12 +235,12 @@ var C1T5 = /** @class */ (function () { return C1T5; }()); // CONTEXT: Module property declaration -var C2T5; +var C2T5 = C2T5 || (C2T5 = {}); (function (C2T5) { C2T5.foo = function (i) { return i; }; -})(C2T5 || (C2T5 = {})); +})(C2T5); // CONTEXT: Variable declaration var c3t1 = (function (s) { return s; }); var c3t2 = ({ @@ -274,12 +274,12 @@ var C4T5 = /** @class */ (function () { return C4T5; }()); // CONTEXT: Module property assignment -var C5T5; +var C5T5 = C5T5 || (C5T5 = {}); (function (C5T5) { C5T5.foo = function (i, s) { return s; }; -})(C5T5 || (C5T5 = {})); +})(C5T5); // CONTEXT: Variable assignment var c6t5; c6t5 = function (n) { return ({}); }; diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map index 08dc69b0315a7..eb030b5211baf 100644 --- a/tests/baselines/reference/contextualTyping.js.map +++ b/tests/baselines/reference/contextualTyping.js.map @@ -1,2 +1,2 @@ //// [contextualTyping.js.map] -{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file +{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,GAAJ,IAAI,KAAJ,IAAI,OAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,EAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,GAAJ,IAAI,KAAJ,IAAI,OAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,EAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,SAAS,IAAI,CAAC,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt index 32ad39b72b9ef..1581716ff0401 100644 --- a/tests/baselines/reference/contextualTyping.sourcemap.txt +++ b/tests/baselines/reference/contextualTyping.sourcemap.txt @@ -134,35 +134,46 @@ sourceFile:contextualTyping.ts 1->Emitted(10, 1) Source(20, 1) + SourceIndex(0) 2 >Emitted(10, 40) Source(20, 40) + SourceIndex(0) --- ->>>var C2T5; +>>>var C2T5 = C2T5 || (C2T5 = {}); 1 > 2 >^^^^ 3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^ +6 > ^^^^^ +7 > ^^^^ +8 > ^^^^^^^ 1 > > 2 >module 3 > C2T5 -4 > { - > export var foo: (i: number, s: string) => number = function(i) { - > return i; - > } - > } +4 > +5 > C2T5 +6 > +7 > C2T5 +8 > { + > export var foo: (i: number, s: string) => number = function(i) { + > return i; + > } + > } 1 >Emitted(11, 1) Source(21, 1) + SourceIndex(0) 2 >Emitted(11, 5) Source(21, 8) + SourceIndex(0) 3 >Emitted(11, 9) Source(21, 12) + SourceIndex(0) -4 >Emitted(11, 10) Source(25, 2) + SourceIndex(0) +4 >Emitted(11, 12) Source(21, 8) + SourceIndex(0) +5 >Emitted(11, 16) Source(21, 12) + SourceIndex(0) +6 >Emitted(11, 21) Source(21, 8) + SourceIndex(0) +7 >Emitted(11, 25) Source(21, 12) + SourceIndex(0) +8 >Emitted(11, 32) Source(25, 2) + SourceIndex(0) --- >>>(function (C2T5) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^^ 4 > ^^^^^^^^^^^^^^^-> -1-> +1 > 2 >module 3 > C2T5 -1->Emitted(12, 1) Source(21, 1) + SourceIndex(0) +1 >Emitted(12, 1) Source(21, 1) + SourceIndex(0) 2 >Emitted(12, 12) Source(21, 8) + SourceIndex(0) 3 >Emitted(12, 16) Source(21, 12) + SourceIndex(0) --- @@ -203,7 +214,7 @@ sourceFile:contextualTyping.ts 1 >^^^^ 2 > ^ 3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> +4 > ^^^^-> 1 > > 2 > } @@ -212,34 +223,28 @@ sourceFile:contextualTyping.ts 2 >Emitted(15, 6) Source(24, 6) + SourceIndex(0) 3 >Emitted(15, 7) Source(24, 6) + SourceIndex(0) --- ->>>})(C2T5 || (C2T5 = {})); +>>>})(C2T5); 1-> 2 >^ 3 > ^^ 4 > ^^^^ -5 > ^^^^^ -6 > ^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >} 3 > 4 > C2T5 -5 > -6 > C2T5 -7 > { - > export var foo: (i: number, s: string) => number = function(i) { - > return i; - > } - > } +5 > { + > export var foo: (i: number, s: string) => number = function(i) { + > return i; + > } + > } 1->Emitted(16, 1) Source(25, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(25, 2) + SourceIndex(0) 3 >Emitted(16, 4) Source(21, 8) + SourceIndex(0) 4 >Emitted(16, 8) Source(21, 12) + SourceIndex(0) -5 >Emitted(16, 13) Source(21, 8) + SourceIndex(0) -6 >Emitted(16, 17) Source(21, 12) + SourceIndex(0) -7 >Emitted(16, 25) Source(25, 2) + SourceIndex(0) +5 >Emitted(16, 10) Source(25, 2) + SourceIndex(0) --- >>>// CONTEXT: Variable declaration 1-> @@ -1038,36 +1043,47 @@ sourceFile:contextualTyping.ts 1->Emitted(49, 1) Source(65, 1) + SourceIndex(0) 2 >Emitted(49, 39) Source(65, 39) + SourceIndex(0) --- ->>>var C5T5; +>>>var C5T5 = C5T5 || (C5T5 = {}); 1 > 2 >^^^^ 3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^ +6 > ^^^^^ +7 > ^^^^ +8 > ^^^^^^^ 1 > > 2 >module 3 > C5T5 -4 > { - > export var foo: (i: number, s: string) => string; - > foo = function(i, s) { - > return s; - > } - > } +4 > +5 > C5T5 +6 > +7 > C5T5 +8 > { + > export var foo: (i: number, s: string) => string; + > foo = function(i, s) { + > return s; + > } + > } 1 >Emitted(50, 1) Source(66, 1) + SourceIndex(0) 2 >Emitted(50, 5) Source(66, 8) + SourceIndex(0) 3 >Emitted(50, 9) Source(66, 12) + SourceIndex(0) -4 >Emitted(50, 10) Source(71, 2) + SourceIndex(0) +4 >Emitted(50, 12) Source(66, 8) + SourceIndex(0) +5 >Emitted(50, 16) Source(66, 12) + SourceIndex(0) +6 >Emitted(50, 21) Source(66, 8) + SourceIndex(0) +7 >Emitted(50, 25) Source(66, 12) + SourceIndex(0) +8 >Emitted(50, 32) Source(71, 2) + SourceIndex(0) --- >>>(function (C5T5) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^^ 4 > ^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 >module 3 > C5T5 -1->Emitted(51, 1) Source(66, 1) + SourceIndex(0) +1 >Emitted(51, 1) Source(66, 1) + SourceIndex(0) 2 >Emitted(51, 12) Source(66, 8) + SourceIndex(0) 3 >Emitted(51, 16) Source(66, 12) + SourceIndex(0) --- @@ -1118,7 +1134,7 @@ sourceFile:contextualTyping.ts 1 >^^^^ 2 > ^ 3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^-> +4 > ^^^^-> 1 > > 2 > } @@ -1127,35 +1143,29 @@ sourceFile:contextualTyping.ts 2 >Emitted(54, 6) Source(70, 6) + SourceIndex(0) 3 >Emitted(54, 7) Source(70, 6) + SourceIndex(0) --- ->>>})(C5T5 || (C5T5 = {})); +>>>})(C5T5); 1-> 2 >^ 3 > ^^ 4 > ^^^^ -5 > ^^^^^ -6 > ^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >} 3 > 4 > C5T5 -5 > -6 > C5T5 -7 > { - > export var foo: (i: number, s: string) => string; - > foo = function(i, s) { - > return s; - > } - > } +5 > { + > export var foo: (i: number, s: string) => string; + > foo = function(i, s) { + > return s; + > } + > } 1->Emitted(55, 1) Source(71, 1) + SourceIndex(0) 2 >Emitted(55, 2) Source(71, 2) + SourceIndex(0) 3 >Emitted(55, 4) Source(66, 8) + SourceIndex(0) 4 >Emitted(55, 8) Source(66, 12) + SourceIndex(0) -5 >Emitted(55, 13) Source(66, 8) + SourceIndex(0) -6 >Emitted(55, 17) Source(66, 12) + SourceIndex(0) -7 >Emitted(55, 25) Source(71, 2) + SourceIndex(0) +5 >Emitted(55, 10) Source(71, 2) + SourceIndex(0) --- >>>// CONTEXT: Variable assignment 1-> diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js index 4605db05c6cfe..4e00fa711838b 100644 --- a/tests/baselines/reference/convertKeywordsYes.js +++ b/tests/baselines/reference/convertKeywordsYes.js @@ -441,7 +441,7 @@ var bigClass = /** @class */ (function () { } return bigClass; }()); -var bigEnum; +var bigEnum = bigEnum || (bigEnum = {}); (function (bigEnum) { bigEnum[bigEnum["constructor"] = 0] = "constructor"; bigEnum[bigEnum["any"] = 1] = "any"; @@ -497,8 +497,8 @@ var bigEnum; bigEnum[bigEnum["void"] = 51] = "void"; bigEnum[bigEnum["while"] = 52] = "while"; bigEnum[bigEnum["with"] = 53] = "with"; -})(bigEnum || (bigEnum = {})); -var bigModule; +})(bigEnum); +var bigModule = bigModule || (bigModule = {}); (function (bigModule) { var constructor = /** @class */ (function () { function constructor() { @@ -570,4 +570,4 @@ var bigModule; } return declare; }()); -})(bigModule || (bigModule = {})); +})(bigModule); diff --git a/tests/baselines/reference/covariance1.js b/tests/baselines/reference/covariance1.js index 9e9c4615c2b13..6be9493c0d790 100644 --- a/tests/baselines/reference/covariance1.js +++ b/tests/baselines/reference/covariance1.js @@ -18,7 +18,7 @@ module M { //// [covariance1.js] -var M; +var M = M || (M = {}); (function (M) { var XX = /** @class */ (function () { function XX(m1) { @@ -33,4 +33,4 @@ var M; f({ x: a }); // ok var b; f({ x: b }); // ok covariant subtype -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/crashRegressionTest.js b/tests/baselines/reference/crashRegressionTest.js index 78e8fcae09992..aa11558567c52 100644 --- a/tests/baselines/reference/crashRegressionTest.js +++ b/tests/baselines/reference/crashRegressionTest.js @@ -26,11 +26,11 @@ module MsPortal.Util.TemplateEngine { //// [crashRegressionTest.js] -var MsPortal; +var MsPortal = MsPortal || (MsPortal = {}); (function (MsPortal) { - var Util; + var Util = MsPortal.Util || (MsPortal.Util = {}); (function (Util) { - var TemplateEngine; + var TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {}); (function (TemplateEngine) { "use strict"; var StringTemplate = /** @class */ (function () { @@ -50,6 +50,6 @@ var MsPortal; return TemplateStorage; }()); TemplateEngine.TemplateStorage = TemplateStorage; - })(TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {})); - })(Util = MsPortal.Util || (MsPortal.Util = {})); -})(MsPortal || (MsPortal = {})); + })(TemplateEngine); + })(Util); +})(MsPortal); diff --git a/tests/baselines/reference/customTransforms/after.js b/tests/baselines/reference/customTransforms/after.js index 8bda237545f4c..fbe0ddf0710eb 100644 --- a/tests/baselines/reference/customTransforms/after.js +++ b/tests/baselines/reference/customTransforms/after.js @@ -8,8 +8,8 @@ var c = /** @class */ (function () { }()); (function () { }); //@after -var e; +var e = e || (e = {}); (function (e) { -})(e || (e = {})); +})(e); // leading function f2() { } // trailing diff --git a/tests/baselines/reference/customTransforms/before.js b/tests/baselines/reference/customTransforms/before.js index a2729fc4529f4..c99c142db43d7 100644 --- a/tests/baselines/reference/customTransforms/before.js +++ b/tests/baselines/reference/customTransforms/before.js @@ -7,9 +7,9 @@ var c = /** @class */ (function () { return c; }()); (function () { }); -var e; +var e = e || (e = {}); (function (e) { -})(e || (e = {})); +})(e); // leading /*@before*/ function f2() { } // trailing diff --git a/tests/baselines/reference/customTransforms/both.js b/tests/baselines/reference/customTransforms/both.js index b759c76ce3816..d8628ca1c6e15 100644 --- a/tests/baselines/reference/customTransforms/both.js +++ b/tests/baselines/reference/customTransforms/both.js @@ -9,9 +9,9 @@ var c = /** @class */ (function () { }()); (function () { }); //@after -var e; +var e = e || (e = {}); (function (e) { -})(e || (e = {})); +})(e); // leading /*@before*/ function f2() { } // trailing diff --git a/tests/baselines/reference/declFileEnumUsedAsValue.js b/tests/baselines/reference/declFileEnumUsedAsValue.js index ad5a859a047fb..51654afddef4c 100644 --- a/tests/baselines/reference/declFileEnumUsedAsValue.js +++ b/tests/baselines/reference/declFileEnumUsedAsValue.js @@ -7,12 +7,12 @@ enum e { var x = e; //// [declFileEnumUsedAsValue.js] -var e; +var e = e || (e = {}); (function (e) { e[e["a"] = 0] = "a"; e[e["b"] = 1] = "b"; e[e["c"] = 2] = "c"; -})(e || (e = {})); +})(e); var x = e; diff --git a/tests/baselines/reference/declFileEnums.js b/tests/baselines/reference/declFileEnums.js index e643f26e1d97b..bdee7b71ef80f 100644 --- a/tests/baselines/reference/declFileEnums.js +++ b/tests/baselines/reference/declFileEnums.js @@ -36,39 +36,39 @@ enum e5 { //// [declFileEnums.js] -var e1; +var e1 = e1 || (e1 = {}); (function (e1) { e1[e1["a"] = 0] = "a"; e1[e1["b"] = 1] = "b"; e1[e1["c"] = 2] = "c"; -})(e1 || (e1 = {})); -var e2; +})(e1); +var e2 = e2 || (e2 = {}); (function (e2) { e2[e2["a"] = 10] = "a"; e2[e2["b"] = 12] = "b"; e2[e2["c"] = 10] = "c"; -})(e2 || (e2 = {})); -var e3; +})(e2); +var e3 = e3 || (e3 = {}); (function (e3) { e3[e3["a"] = 10] = "a"; e3[e3["b"] = Math.PI] = "b"; e3[e3["c"] = 13] = "c"; -})(e3 || (e3 = {})); -var e4; +})(e3); +var e4 = e4 || (e4 = {}); (function (e4) { e4[e4["a"] = 0] = "a"; e4[e4["b"] = 1] = "b"; e4[e4["c"] = 2] = "c"; e4[e4["d"] = 10] = "d"; e4[e4["e"] = 11] = "e"; -})(e4 || (e4 = {})); -var e5; +})(e4); +var e5 = e5 || (e5 = {}); (function (e5) { e5[e5["Friday"] = 0] = "Friday"; e5[e5["Saturday"] = 1] = "Saturday"; e5[e5["Sunday"] = 2] = "Sunday"; e5[e5["Weekend days"] = 3] = "Weekend days"; -})(e5 || (e5 = {})); +})(e5); //// [declFileEnums.d.ts] diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js index 8a57cef6b255d..2af61fdf865a9 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js @@ -23,9 +23,9 @@ export = m; //// [declFileExportAssignmentImportInternalModule.js] "use strict"; -var m3; +var m3 = {}; (function (m3) { -})(m3 || (m3 = {})); +})(m3); var m = m3; module.exports = m; diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 8a6b297f81d3f..ddaefdca759b8 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -26,9 +26,9 @@ export var x: c.b1.a.m2.c1; //// [declFileExportImportChain_a.js] define(["require", "exports"], function (require, exports) { "use strict"; - var m1; + var m1 = {}; (function (m1) { - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { var c1 = /** @class */ (function () { function c1() { @@ -36,8 +36,8 @@ define(["require", "exports"], function (require, exports) { return c1; }()); m2.c1 = c1; - })(m2 = m1.m2 || (m1.m2 = {})); - })(m1 || (m1 = {})); + })(m2); + })(m1); return m1; }); //// [declFileExportImportChain_b.js] diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 684ac2a1dfbe2..a24b673cbe9e0 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -23,9 +23,9 @@ export var x: c.b.m2.c1; //// [declFileExportImportChain2_a.js] define(["require", "exports"], function (require, exports) { "use strict"; - var m1; + var m1 = {}; (function (m1) { - var m2; + var m2 = m1.m2 || (m1.m2 = {}); (function (m2) { var c1 = /** @class */ (function () { function c1() { @@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) { return c1; }()); m2.c1 = c1; - })(m2 = m1.m2 || (m1.m2 = {})); - })(m1 || (m1 = {})); + })(m2); + })(m1); return m1; }); //// [declFileExportImportChain2_b.js] diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index 74003f18c0601..eea5a73b9676c 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -55,7 +55,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); exports.__esModule = true; -var C; +var C = {}; (function (C) { var A = /** @class */ (function () { function A() { @@ -88,7 +88,7 @@ var C; return D; }()); C.D = D; -})(C = exports.C || (exports.C = {})); +})(C); exports.b = C.F; exports.c = C.F2; exports.d = C.F3; diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index 3162d5358b987..735a146dce229 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -56,11 +56,11 @@ var __extends = (this && this.__extends) || (function () { }; })(); // Module -var templa; +var templa = templa || (templa = {}); (function (templa) { - var dom; + var dom = templa.dom || (templa.dom = {}); (function (dom) { - var mvc; + var mvc = dom.mvc || (dom.mvc = {}); (function (mvc) { var AbstractElementController = /** @class */ (function (_super) { __extends(AbstractElementController, _super); @@ -70,16 +70,16 @@ var templa; return AbstractElementController; }(templa.mvc.AbstractController)); mvc.AbstractElementController = AbstractElementController; - })(mvc = dom.mvc || (dom.mvc = {})); - })(dom = templa.dom || (templa.dom = {})); -})(templa || (templa = {})); + })(mvc); + })(dom); +})(templa); // Module (function (templa) { - var dom; + var dom = templa.dom || (templa.dom = {}); (function (dom) { - var mvc; + var mvc = dom.mvc || (dom.mvc = {}); (function (mvc) { - var composite; + var composite = mvc.composite || (mvc.composite = {}); (function (composite) { var AbstractCompositeElementController = /** @class */ (function (_super) { __extends(AbstractCompositeElementController, _super); @@ -91,10 +91,10 @@ var templa; return AbstractCompositeElementController; }(templa.dom.mvc.AbstractElementController)); composite.AbstractCompositeElementController = AbstractCompositeElementController; - })(composite = mvc.composite || (mvc.composite = {})); - })(mvc = dom.mvc || (dom.mvc = {})); - })(dom = templa.dom || (templa.dom = {})); -})(templa || (templa = {})); + })(composite); + })(mvc); + })(dom); +})(templa); //// [declFileGenericType2.d.ts] diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js index 18bc4739f0c6a..9223565c5ef58 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.js +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -11,9 +11,9 @@ export = b; //// [declFileImportChainInExportAssignment.js] "use strict"; -var m; +var m = {}; (function (m) { - var c; + var c = m.c || (m.c = {}); (function (c_1) { var c = /** @class */ (function () { function c() { @@ -21,8 +21,8 @@ var m; return c; }()); c_1.c = c; - })(c = m.c || (m.c = {})); -})(m || (m = {})); + })(c); +})(m); var a = m.c; var b = a; module.exports = b; diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index 7e6366b99bd16..5e81b13bf4e5f 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -13,7 +13,7 @@ module m2 { } //// [declFileInternalAliases.js] -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -21,17 +21,17 @@ var m; return c; }()); m.c = c; -})(m || (m = {})); -var m1; +})(m); +var m1 = m1 || (m1 = {}); (function (m1) { var x = m.c; m1.d = new x(); // emit the type as m.c -})(m1 || (m1 = {})); -var m2; +})(m1); +var m2 = m2 || (m2 = {}); (function (m2) { m2.x = m.c; m2.d = new m2.x(); // emit the type as x -})(m2 || (m2 = {})); +})(m2); //// [declFileInternalAliases.d.ts] diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index 7ef3f3b2b0e9a..7f1bdf719c5ec 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -9,7 +9,7 @@ var d = { }; //// [declFileModuleAssignmentInObjectLiteralProperty.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var c = /** @class */ (function () { function c() { @@ -17,7 +17,7 @@ var m1; return c; }()); m1.c = c; -})(m1 || (m1 = {})); +})(m1); var d = { m1: { m: m1 }, m2: { c: m1.c } diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js index 08032aa114dd4..2259ae209b965 100644 --- a/tests/baselines/reference/declFileModuleContinuation.js +++ b/tests/baselines/reference/declFileModuleContinuation.js @@ -10,11 +10,11 @@ module A.B.C { } //// [declFileModuleContinuation.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var W = /** @class */ (function () { function W() { @@ -22,9 +22,9 @@ var A; return W; }()); C.W = W; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(C); + })(B); +})(A); //// [declFileModuleContinuation.d.ts] diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js index eb007161c6fb4..f7691af8e2a9d 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js @@ -7,7 +7,7 @@ module m { } //// [declFileModuleWithPropertyOfTypeModule.js] -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -16,7 +16,7 @@ var m; }()); m.c = c; m.a = m; -})(m || (m = {})); +})(m); //// [declFileModuleWithPropertyOfTypeModule.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js index 5f97bc8ce54c7..cc9dc4620ef8b 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js @@ -56,7 +56,7 @@ var c = /** @class */ (function () { } return c; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -70,7 +70,7 @@ var m; return g; }()); m.g = g; -})(m || (m = {})); +})(m); var g = /** @class */ (function () { function g() { } diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js index dd37502ac0078..9d4fee6ab94a4 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js @@ -23,7 +23,7 @@ var c = /** @class */ (function () { } return c; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -37,7 +37,7 @@ var m; return g; }()); m.g = g; -})(m || (m = {})); +})(m); var g = /** @class */ (function () { function g() { } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js index 3c85b86f6e81e..5ab758c1e6e9f 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js @@ -31,7 +31,7 @@ module M { } //// [declFileTypeAnnotationTypeAlias.js] -var M; +var M = M || (M = {}); (function (M) { var c = /** @class */ (function () { function c() { @@ -39,7 +39,7 @@ var M; return c; }()); M.c = c; - var m; + var m = M.m || (M.m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -47,10 +47,10 @@ var M; return c; }()); m.c = c; - })(m = M.m || (M.m = {})); -})(M || (M = {})); + })(m); +})(M); (function (M) { - var N; + var N = M.N || (M.N = {}); (function (N) { var Window = /** @class */ (function () { function Window() { @@ -58,8 +58,8 @@ var M; return Window; }()); N.Window = Window; - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(N); +})(M); //// [declFileTypeAnnotationTypeAlias.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js index e41ef4be9812a..3251ce2474b54 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js @@ -49,7 +49,7 @@ var g = /** @class */ (function () { } return g; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -57,7 +57,7 @@ var m; return c; }()); m.c = c; -})(m || (m = {})); +})(m); // Object literal with everything var x; // Function type diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js index ec34fbc0c965d..371bd160dde3c 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js @@ -48,7 +48,7 @@ var c = /** @class */ (function () { } return c; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -62,7 +62,7 @@ var m; return g; }()); m.g = g; -})(m || (m = {})); +})(m); var g = /** @class */ (function () { function g() { } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js index abec702b33bfc..3723d19e7f5ca 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js @@ -48,7 +48,7 @@ var c = /** @class */ (function () { } return c; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -62,7 +62,7 @@ var m; return g; }()); m.g = g; -})(m || (m = {})); +})(m); var g = /** @class */ (function () { function g() { } diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js index 85735ff96cf2e..c34fdba4386c5 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js @@ -27,7 +27,7 @@ var c = /** @class */ (function () { } return c; }()); -var m; +var m = m || (m = {}); (function (m) { var c = /** @class */ (function () { function c() { @@ -41,7 +41,7 @@ var m; return g; }()); m.g = g; -})(m || (m = {})); +})(m); var g = /** @class */ (function () { function g() { } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index 20d784489d99a..42ecb72d45ee0 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -100,7 +100,7 @@ module m { //// [declFileTypeAnnotationVisibilityErrorAccessors.js] -var m; +var m = m || (m = {}); (function (m) { var private1 = /** @class */ (function () { function private1() { @@ -113,7 +113,7 @@ var m; return public1; }()); m.public1 = public1; - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var public2 = /** @class */ (function () { function public2() { @@ -121,7 +121,7 @@ var m; return public2; }()); m2.public2 = public2; - })(m2 || (m2 = {})); + })(m2); var c = /** @class */ (function () { function c() { } @@ -257,7 +257,7 @@ var m; return c; }()); m.c = c; -})(m || (m = {})); +})(m); //// [declFileTypeAnnotationVisibilityErrorAccessors.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js index 4e1edd7fe396e..3b40339795af8 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js @@ -45,7 +45,7 @@ module m { //// [declFileTypeAnnotationVisibilityErrorParameterOfFunction.js] -var m; +var m = m || (m = {}); (function (m) { var private1 = /** @class */ (function () { function private1() { @@ -83,7 +83,7 @@ var m; if (param === void 0) { param = new public1(); } } m.foo14 = foo14; - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var public2 = /** @class */ (function () { function public2() { @@ -91,7 +91,7 @@ var m; return public2; }()); m2.public2 = public2; - })(m2 || (m2 = {})); + })(m2); function foo111(param) { } function foo112(param) { @@ -104,7 +104,7 @@ var m; if (param === void 0) { param = new m2.public2(); } } m.foo114 = foo114; -})(m || (m = {})); +})(m); //// [declFileTypeAnnotationVisibilityErrorParameterOfFunction.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js index 8a2437a2ac41b..647b76834e863 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js @@ -57,7 +57,7 @@ module m { //// [declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js] -var m; +var m = m || (m = {}); (function (m) { var private1 = /** @class */ (function () { function private1() { @@ -99,7 +99,7 @@ var m; return new public1(); } m.foo14 = foo14; - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var public2 = /** @class */ (function () { function public2() { @@ -107,7 +107,7 @@ var m; return public2; }()); m2.public2 = public2; - })(m2 || (m2 = {})); + })(m2); function foo111() { return; } @@ -122,7 +122,7 @@ var m; return new m2.public2(); } m.foo114 = foo114; -})(m || (m = {})); +})(m); //// [declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js index fd39a6e20d968..450e67e76e44a 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js @@ -41,9 +41,9 @@ module M2 { //// [declFileTypeAnnotationVisibilityErrorTypeAlias.js] -var M; +var M = M || (M = {}); (function (M) { - var N; + var N = M.N || (M.N = {}); (function (N) { var Window = /** @class */ (function () { function Window() { @@ -51,11 +51,11 @@ var M; return Window; }()); N.Window = Window; - })(N = M.N || (M.N = {})); -})(M || (M = {})); -var M1; + })(N); +})(M); +var M1 = M1 || (M1 = {}); (function (M1) { - var N; + var N = M1.N || (M1.N = {}); (function (N) { var Window = /** @class */ (function () { function Window() { @@ -63,9 +63,9 @@ var M1; return Window; }()); N.Window = Window; - })(N = M1.N || (M1.N = {})); -})(M1 || (M1 = {})); -var M2; + })(N); +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { var private1 = /** @class */ (function () { function private1() { @@ -77,7 +77,7 @@ var M2; } return public1; }()); - var m3; + var m3 = m3 || (m3 = {}); (function (m3) { var public1 = /** @class */ (function () { function public1() { @@ -85,8 +85,8 @@ var M2; return public1; }()); m3.public1 = public1; - })(m3 || (m3 = {})); -})(M2 || (M2 = {})); + })(m3); +})(M2); //// [declFileTypeAnnotationVisibilityErrorTypeAlias.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js index ecb3e035e2a39..7bfb37d3094e4 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js @@ -34,14 +34,14 @@ module m { } //// [declFileTypeAnnotationVisibilityErrorTypeLiteral.js] -var m; +var m = m || (m = {}); (function (m) { var private1 = /** @class */ (function () { function private1() { } return private1; }()); - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var public1 = /** @class */ (function () { function public1() { @@ -49,7 +49,7 @@ var m; return public1; }()); m2.public1 = public1; - })(m2 || (m2 = {})); + })(m2); m.x2 = { x: new private1(), y: new m2.public1(), @@ -60,7 +60,7 @@ var m; m.x3 = m.x; m.y2 = m.y; m.z2 = m.z; -})(m || (m = {})); +})(m); //// [declFileTypeAnnotationVisibilityErrorTypeLiteral.d.ts] diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js index 6bdcedae7d70c..945981b986405 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js @@ -33,7 +33,7 @@ module m { //// [declFileTypeAnnotationVisibilityErrorVariableDeclaration.js] -var m; +var m = m || (m = {}); (function (m) { var private1 = /** @class */ (function () { function private1() { @@ -53,7 +53,7 @@ var m; var x2; var y2 = new public1(); m.l2 = new public1(); - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var public2 = /** @class */ (function () { function public2() { @@ -61,11 +61,11 @@ var m; return public2; }()); m2.public2 = public2; - })(m2 || (m2 = {})); + })(m2); var x3; var y3 = new m2.public2(); m.l3 = new m2.public2(); -})(m || (m = {})); +})(m); //// [declFileTypeAnnotationVisibilityErrorVariableDeclaration.d.ts] diff --git a/tests/baselines/reference/declFileTypeofEnum.js b/tests/baselines/reference/declFileTypeofEnum.js index 467e264dab79f..cd362ea03efde 100644 --- a/tests/baselines/reference/declFileTypeofEnum.js +++ b/tests/baselines/reference/declFileTypeofEnum.js @@ -14,7 +14,7 @@ var daysOfMonth = days; var daysOfYear: typeof days; //// [declFileTypeofEnum.js] -var days; +var days = days || (days = {}); (function (days) { days[days["monday"] = 0] = "monday"; days[days["tuesday"] = 1] = "tuesday"; @@ -23,7 +23,7 @@ var days; days[days["friday"] = 4] = "friday"; days[days["saturday"] = 5] = "saturday"; days[days["sunday"] = 6] = "sunday"; -})(days || (days = {})); +})(days); var weekendDay = days.saturday; var daysOfMonth = days; var daysOfYear; diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index da8f7df5bf867..a0e082d9b5436 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -22,7 +22,7 @@ var d = { }; //// [declFileTypeofInAnonymousType.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var c = /** @class */ (function () { function c() { @@ -30,13 +30,13 @@ var m1; return c; }()); m1.c = c; - var e; + var e = m1.e || (m1.e = {}); (function (e) { e[e["weekday"] = 0] = "weekday"; e[e["weekend"] = 1] = "weekend"; e[e["holiday"] = 2] = "holiday"; - })(e = m1.e || (m1.e = {})); -})(m1 || (m1 = {})); + })(e); +})(m1); var a; var b = { c: m1.c, diff --git a/tests/baselines/reference/declFileTypeofModule.js b/tests/baselines/reference/declFileTypeofModule.js index c5e268cb4fc59..e566e12ad0574 100644 --- a/tests/baselines/reference/declFileTypeofModule.js +++ b/tests/baselines/reference/declFileTypeofModule.js @@ -13,14 +13,14 @@ var m2_1 = m2; var m2_2: typeof m2; //// [declFileTypeofModule.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { -})(m1 || (m1 = {})); +})(m1); var m1_1 = m1; var m1_2; -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { -})(m2 || (m2 = {})); +})(m2); var m2_1 = m2; var m2_2; diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js index b24cc03e8e1c3..88124527ac19b 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js @@ -33,11 +33,11 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var base; + var base = Y.base || (Y.base = {}); (function (base) { var W = /** @class */ (function (_super) { __extends(W, _super); @@ -47,15 +47,15 @@ var X; return W; }(A.B.Base.W)); base.W = W; - })(base = Y.base || (Y.base = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(base); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var base; + var base = Y.base || (Y.base = {}); (function (base) { - var Z; + var Z = base.Z || (base.Z = {}); (function (Z) { var W = /** @class */ (function (_super) { __extends(W, _super); @@ -65,10 +65,10 @@ var X; return W; }(X.Y.base.W)); Z.W = W; - })(Z = base.Z || (base.Z = {})); - })(base = Y.base || (Y.base = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(base); + })(Y); +})(X); //// [declFileWithClassNameConflictingWithClassReferredByExtendsClause.d.ts] diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js index 518ae22415022..4ffc66c3e0ebd 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js @@ -31,9 +31,9 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { var EventManager = /** @class */ (function () { function EventManager() { @@ -41,12 +41,12 @@ var A; return EventManager; }()); B.EventManager = EventManager; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var ContextMenu = /** @class */ (function (_super) { __extends(ContextMenu, _super); @@ -56,9 +56,9 @@ var A; return ContextMenu; }(B.EventManager)); C.ContextMenu = ContextMenu; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(C); + })(B); +})(A); //// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts] diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js index f6f849a6a24cb..46259835cc839 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js @@ -11,13 +11,13 @@ module X.A.B.C { } //// [declFileWithInternalModuleNameConflictsInExtendsClause1.js] -var X; +var X = X || (X = {}); (function (X) { - var A; + var A = X.A || (X.A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var W = /** @class */ (function () { function W() { @@ -25,10 +25,10 @@ var X; return W; }()); C.W = W; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); - })(A = X.A || (X.A = {})); -})(X || (X = {})); + })(C); + })(B); + })(A); +})(X); //// [declFileWithInternalModuleNameConflictsInExtendsClause1.d.ts] diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js index 3e363990b6d61..7a498374a4f19 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js @@ -14,13 +14,13 @@ module X.A.B.C { } //// [declFileWithInternalModuleNameConflictsInExtendsClause2.js] -var X; +var X = X || (X = {}); (function (X) { - var A; + var A = X.A || (X.A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var W = /** @class */ (function () { function W() { @@ -28,10 +28,10 @@ var X; return W; }()); C.W = W; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); - })(A = X.A || (X.A = {})); -})(X || (X = {})); + })(C); + })(B); + })(A); +})(X); //// [declFileWithInternalModuleNameConflictsInExtendsClause2.d.ts] diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js index 73c1a0b322789..3b66a50459d2c 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js @@ -14,13 +14,13 @@ module X.A.B.C { } //// [declFileWithInternalModuleNameConflictsInExtendsClause3.js] -var X; +var X = X || (X = {}); (function (X) { - var A; + var A = X.A || (X.A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var W = /** @class */ (function () { function W() { @@ -28,10 +28,10 @@ var X; return W; }()); C.W = W; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); - })(A = X.A || (X.A = {})); -})(X || (X = {})); + })(C); + })(B); + })(A); +})(X); //// [declFileWithInternalModuleNameConflictsInExtendsClause3.d.ts] diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index f1f23b7f22ef8..5ca27bdb7d59f 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -22,7 +22,7 @@ module M { } //// [declInput-2.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -47,7 +47,7 @@ var M; return D; }()); M.D = D; -})(M || (M = {})); +})(M); //// [declInput-2.d.ts] diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js index c27c39cb4a3d8..fe9611f8f7c00 100644 --- a/tests/baselines/reference/declInput4.js +++ b/tests/baselines/reference/declInput4.js @@ -16,7 +16,7 @@ module M { } //// [declInput4.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -38,7 +38,7 @@ var M; return D; }()); M.D = D; -})(M || (M = {})); +})(M); //// [declInput4.d.ts] diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js index 4c928b0cfcb29..8e7987ef306e2 100644 --- a/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js +++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict2.js @@ -22,14 +22,14 @@ class Foo { //// [declarationEmitClassMemberNameConflict2.js] var Bar = 'bar'; -var Hello; +var Hello = Hello || (Hello = {}); (function (Hello) { Hello[Hello["World"] = 0] = "World"; -})(Hello || (Hello = {})); -var Hello1; +})(Hello); +var Hello1 = Hello1 || (Hello1 = {}); (function (Hello1) { Hello1[Hello1["World1"] = 0] = "World1"; -})(Hello1 || (Hello1 = {})); +})(Hello1); var Foo = /** @class */ (function () { function Foo() { // Same names + string => OK diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js index b4aea71a24148..436fc764c6b78 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js @@ -4,11 +4,11 @@ module M { } //// [declarationEmitDestructuringArrayPattern3.js] -var M; +var M = M || (M = {}); (function (M) { var _a; _a = [1, 2], M.a = _a[0], M.b = _a[1]; -})(M || (M = {})); +})(M); //// [declarationEmitDestructuringArrayPattern3.d.ts] diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js index 10d7427388a5e..696930c2cd161 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js @@ -37,11 +37,11 @@ function f15() { return { a4: a4, b4: b4, c4: c4 }; } var _f = f15(), a4 = _f.a4, b4 = _f.b4, c4 = _f.c4; -var m; +var m = m || (m = {}); (function (m) { var _a; _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4; -})(m || (m = {})); +})(m); //// [declarationEmitDestructuringObjectLiteralPattern.d.ts] diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js index 66dfe225e83c9..86d488bacc587 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js @@ -22,11 +22,11 @@ function f15() { return { a4: a4, b4: b4, c4: c4 }; } var _c = f15(), a4 = _c.a4, b4 = _c.b4, c4 = _c.c4; -var m; +var m = m || (m = {}); (function (m) { var _a; _a = f15(), m.a4 = _a.a4, m.b4 = _a.b4, m.c4 = _a.c4; -})(m || (m = {})); +})(m); //// [declarationEmitDestructuringObjectLiteralPattern2.d.ts] diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js index dc037d7db11f6..2eec29287a624 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js @@ -6,7 +6,7 @@ module m { } //// [declarationEmitDestructuringPrivacyError.js] -var m; +var m = m || (m = {}); (function (m) { var _a; var c = /** @class */ (function () { @@ -15,7 +15,7 @@ var m; return c; }()); _a = [10, new c(), 30], m.x = _a[0], m.y = _a[1], m.z = _a[2]; -})(m || (m = {})); +})(m); //// [declarationEmitDestructuringPrivacyError.d.ts] diff --git a/tests/baselines/reference/declarationEmitEnumReadonlyProperty.js b/tests/baselines/reference/declarationEmitEnumReadonlyProperty.js index 75c4ce5139d43..c34eb0ad352d1 100644 --- a/tests/baselines/reference/declarationEmitEnumReadonlyProperty.js +++ b/tests/baselines/reference/declarationEmitEnumReadonlyProperty.js @@ -11,11 +11,11 @@ class C { let x: E.A = new C().type; //// [declarationEmitEnumReadonlyProperty.js] -var E; +var E = E || (E = {}); (function (E) { E["A"] = "a"; E["B"] = "b"; -})(E || (E = {})); +})(E); var C = /** @class */ (function () { function C() { this.type = E.A; diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends5.js b/tests/baselines/reference/declarationEmitExpressionInExtends5.js index d34ffee996b41..2b7c5dbe64013 100644 --- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js @@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Test; +var Test = Test || (Test = {}); (function (Test) { var SomeClass = /** @class */ (function () { function SomeClass() { @@ -54,7 +54,7 @@ var Test; return SomeClass; } Test.getClass = getClass; -})(Test || (Test = {})); +})(Test); //// [declarationEmitExpressionInExtends5.d.ts] diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js index 0e28eee781d9c..0b0b975f19006 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js @@ -11,9 +11,9 @@ export = m; //// [declarationEmitImportInExportAssignmentModule.js] "use strict"; -var m; +var m = {}; (function (m) { - var c; + var c = m.c || (m.c = {}); (function (c_1) { var c = /** @class */ (function () { function c() { @@ -21,8 +21,8 @@ var m; return c; }()); c_1.c = c; - })(c = m.c || (m.c = {})); -})(m || (m = {})); + })(c); +})(m); module.exports = m; diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index 57b11a88afbdd..3b996c43c821a 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -51,7 +51,7 @@ export module M.Q { //// [declarationEmit_nameConflicts_1.js] "use strict"; -var f; +var f = {}; (function (f) { var c = /** @class */ (function () { function c() { @@ -59,13 +59,13 @@ var f; return c; }()); f.c = c; -})(f || (f = {})); +})(f); module.exports = f; //// [declarationEmit_nameConflicts_0.js] "use strict"; exports.__esModule = true; var im = require("./declarationEmit_nameConflicts_1"); -var M; +var M = {}; (function (M) { function f() { } M.f = f; @@ -75,19 +75,19 @@ var M; return C; }()); M.C = C; - var N; + var N = M.N || (M.N = {}); (function (N) { function g() { } N.g = g; ; - })(N = M.N || (M.N = {})); + })(N); M.a = M.f; M.b = M.C; M.c = N; M.d = im; -})(M = exports.M || (exports.M = {})); +})(M); (function (M) { - var P; + var P = M.P || (M.P = {}); (function (P) { function f() { } P.f = f; @@ -97,22 +97,22 @@ var M; return C; }()); P.C = C; - var N; + var N = P.N || (P.N = {}); (function (N) { function g() { } N.g = g; ; - })(N = P.N || (P.N = {})); + })(N); P.im = M.P.f; P.a = M.a; // emitted incorrectly as typeof f P.b = M.b; // ok P.c = M.c; // ok P.g = M.c.g; // ok P.d = M.d; // emitted incorrectly as typeof im - })(P = M.P || (M.P = {})); -})(M = exports.M || (exports.M = {})); + })(P); +})(M); (function (M) { - var Q; + var Q = M.Q || (M.Q = {}); (function (Q) { function f() { } Q.f = f; @@ -122,14 +122,14 @@ var M; return C; }()); Q.C = C; - var N; + var N = Q.N || (Q.N = {}); (function (N) { function g() { } N.g = g; ; - })(N = Q.N || (Q.N = {})); - })(Q = M.Q || (M.Q = {})); -})(M = exports.M || (exports.M = {})); + })(N); + })(Q); +})(M); //// [declarationEmit_nameConflicts_1.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.js b/tests/baselines/reference/declarationEmitNameConflicts2.js index d0c111c56b785..fba20194cfec9 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts2.js +++ b/tests/baselines/reference/declarationEmitNameConflicts2.js @@ -16,11 +16,11 @@ module X.Y.base.Z { } //// [declarationEmitNameConflicts2.js] -var X; +var X = X || (X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var base; + var base = Y.base || (Y.base = {}); (function (base) { function f() { } base.f = f; @@ -30,30 +30,30 @@ var X; return C; }()); base.C = C; - var M; + var M = base.M || (base.M = {}); (function (M) { - })(M = base.M || (base.M = {})); - var E; + })(M); + var E = base.E || (base.E = {}); (function (E) { - })(E = base.E || (base.E = {})); - })(base = Y.base || (Y.base = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(E); + })(base); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var base; + var base = Y.base || (Y.base = {}); (function (base) { - var Z; + var Z = base.Z || (base.Z = {}); (function (Z) { Z.f = X.Y.base.f; // Should be base.f Z.C = X.Y.base.C; // Should be base.C Z.M = X.Y.base.M; // Should be base.M Z.E = X.Y.base.E; // Should be base.E - })(Z = base.Z || (base.Z = {})); - })(base = Y.base || (Y.base = {})); - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); + })(Z); + })(base); + })(Y); +})(X); //// [declarationEmitNameConflicts2.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.js b/tests/baselines/reference/declarationEmitNameConflicts3.js index 9d98d54bdb5e4..d753a248cc0d7 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts3.js +++ b/tests/baselines/reference/declarationEmitNameConflicts3.js @@ -40,26 +40,26 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { - var D; + var D = M.D || (M.D = {}); (function (D) { function f() { } D.f = f; - })(D = M.D || (M.D = {})); - var C; + })(D); + var C = M.C || (M.C = {}); (function (C) { function f() { } C.f = f; - })(C = M.C || (M.C = {})); - var E; + })(C); + var E = M.E || (M.E = {}); (function (E) { function f() { } E.f = f; - })(E = M.E || (M.E = {})); -})(M || (M = {})); + })(E); +})(M); (function (M) { - var P; + var P = M.P || (M.P = {}); (function (P) { var C = /** @class */ (function () { function C() { @@ -76,15 +76,15 @@ var M; return E; }(C)); P.E = E; - var D; + var D = P.D || (P.D = {}); (function (D) { D[D["f"] = 0] = "f"; - })(D = P.D || (P.D = {})); + })(D); P.w = M.D.f; // error, should be typeof M.D.f P.x = M.C.f; // error, should be typeof M.C.f P.x = M.E.f; // error, should be typeof M.E.f - })(P = M.P || (M.P = {})); -})(M || (M = {})); + })(P); +})(M); //// [declarationEmitNameConflicts3.d.ts] diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index 4b4aca4f4b2d3..6a85b5b4443ff 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -9,9 +9,9 @@ export module M { //// [declarationEmitNameConflictsWithAlias.js] "use strict"; exports.__esModule = true; -var M; +var M = {}; (function (M) { -})(M = exports.M || (exports.M = {})); +})(M); //// [declarationEmitNameConflictsWithAlias.d.ts] diff --git a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js index f928b06466771..47e33cd8e57df 100644 --- a/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js +++ b/tests/baselines/reference/declarationFilesGeneratingTypeReferences.js @@ -13,9 +13,9 @@ namespace Test { //// [out.js] /// -var Test; +var Test = Test || (Test = {}); (function (Test) { -})(Test || (Test = {})); +})(Test); //// [out.d.ts] diff --git a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js index 88343a7d08e5c..96b927c05c7cf 100644 --- a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js +++ b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js @@ -9,13 +9,13 @@ namespace foo { //// [declarationFunctionTypeNonlocalShouldNotBeAnError.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { function bar() { } foo.obj = { bar: bar }; -})(foo || (foo = {})); +})(foo); //// [declarationFunctionTypeNonlocalShouldNotBeAnError.d.ts] diff --git a/tests/baselines/reference/declarationsAndAssignments.js b/tests/baselines/reference/declarationsAndAssignments.js index b4bba2412893a..161cf76b111fd 100644 --- a/tests/baselines/reference/declarationsAndAssignments.js +++ b/tests/baselines/reference/declarationsAndAssignments.js @@ -279,11 +279,11 @@ function f14(_a) { f14([2, ["abc", { x: 0, y: true }]]); f14([2, ["abc", { x: 0 }]]); f14([2, ["abc", { y: false }]]); // Error, no x -var M; +var M = M || (M = {}); (function (M) { var _a; _a = [1, 2], M.a = _a[0], M.b = _a[1]; -})(M || (M = {})); +})(M); function f15() { var a = "hello"; var b = 1; diff --git a/tests/baselines/reference/declareAlreadySeen.js b/tests/baselines/reference/declareAlreadySeen.js index 51421a67cb711..b7067b7e90af9 100644 --- a/tests/baselines/reference/declareAlreadySeen.js +++ b/tests/baselines/reference/declareAlreadySeen.js @@ -9,6 +9,6 @@ module M { } //// [declareAlreadySeen.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js index e29c4076c9154..ba63538530d14 100644 --- a/tests/baselines/reference/decoratorOnClassMethod11.js +++ b/tests/baselines/reference/decoratorOnClassMethod11.js @@ -15,7 +15,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -var M; +var M = M || (M = {}); (function (M) { var _this = this; var C = /** @class */ (function () { @@ -28,4 +28,4 @@ var M; ], C.prototype, "method", null); return C; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js index 99a2060883ec9..9ecd0a279ff8a 100644 --- a/tests/baselines/reference/decoratorOnClassMethod12.js +++ b/tests/baselines/reference/decoratorOnClassMethod12.js @@ -29,7 +29,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -var M; +var M = M || (M = {}); (function (M) { var S = /** @class */ (function () { function S() { @@ -48,4 +48,4 @@ var M; ], C.prototype, "method", null); return C; }(S)); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/decoratorOnEnum.js b/tests/baselines/reference/decoratorOnEnum.js index 14651b6592834..108c3c56431d2 100644 --- a/tests/baselines/reference/decoratorOnEnum.js +++ b/tests/baselines/reference/decoratorOnEnum.js @@ -6,6 +6,6 @@ enum E { } //// [decoratorOnEnum.js] -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/decoratorOnEnum2.js b/tests/baselines/reference/decoratorOnEnum2.js index fecff1f3413be..f1ab97a279e88 100644 --- a/tests/baselines/reference/decoratorOnEnum2.js +++ b/tests/baselines/reference/decoratorOnEnum2.js @@ -6,7 +6,7 @@ enum E { } //// [decoratorOnEnum2.js] -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); A; diff --git a/tests/baselines/reference/decoratorOnImportEquals1.js b/tests/baselines/reference/decoratorOnImportEquals1.js index 9ad947683312c..216e7d171a088 100644 --- a/tests/baselines/reference/decoratorOnImportEquals1.js +++ b/tests/baselines/reference/decoratorOnImportEquals1.js @@ -11,6 +11,6 @@ module M2 { } //// [decoratorOnImportEquals1.js] -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { -})(M1 || (M1 = {})); +})(M1); diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js index ce6a085ebf868..51b514aff003e 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js @@ -59,9 +59,9 @@ var A = /** @class */ (function () { } return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsNumber1 = --ANY; diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js index b7fb464782b4e..8bba4a66b8139 100644 --- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -91,9 +91,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsNumber1 = --ANY2; diff --git a/tests/baselines/reference/decrementOperatorWithEnumType.js b/tests/baselines/reference/decrementOperatorWithEnumType.js index 306482faf3199..c4bfebd9bdcf1 100644 --- a/tests/baselines/reference/decrementOperatorWithEnumType.js +++ b/tests/baselines/reference/decrementOperatorWithEnumType.js @@ -15,12 +15,12 @@ ENUM1[A]--; //// [decrementOperatorWithEnumType.js] // -- operator on enum type -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // expression var ResultIsNumber1 = --ENUM1["A"]; diff --git a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.js index 66a1252cdd0a3..abccfde0b6849 100644 --- a/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.js @@ -24,16 +24,16 @@ ENUM1--; //// [decrementOperatorWithEnumTypeInvalidOperations.js] // -- operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsNumber1 = --ENUM; diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.js b/tests/baselines/reference/decrementOperatorWithNumberType.js index 426df8ab525c6..0eb19d439427c 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberType.js +++ b/tests/baselines/reference/decrementOperatorWithNumberType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { } return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsNumber1 = --NUMBER; diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js index ac0f66f7ec502..5f8ef3f163182 100644 --- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js @@ -57,9 +57,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); //number type var var ResultIsNumber1 = --NUMBER1; diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js index 047d4f7acb395..d9429fe5a1d0e 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js @@ -64,9 +64,9 @@ var A = /** @class */ (function () { A.foo = function () { return true; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsNumber1 = --BOOLEAN; diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js index 3012ac31e1fa8..a4b757cbb9659 100644 --- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js @@ -76,9 +76,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsNumber1 = --STRING; diff --git a/tests/baselines/reference/defaultArgsInFunctionExpressions.js b/tests/baselines/reference/defaultArgsInFunctionExpressions.js index d9cae93344f3e..5f789a59923f2 100644 --- a/tests/baselines/reference/defaultArgsInFunctionExpressions.js +++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.js @@ -60,9 +60,9 @@ var f4 = function (a) { var f5 = function (a) { if (a === void 0) { a = function (s) { return s; }; } }; -var U; +var U = U || (U = {}); (function (U) { -})(U || (U = {})); +})(U); var f6 = function (t) { if (t === void 0) { t = T; } }; diff --git a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js index 9367a8fc374fd..01d1f12019d19 100644 --- a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js +++ b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js @@ -33,11 +33,11 @@ var MyComponent = /** @class */ (function () { return MyComponent; }()); exports["default"] = MyComponent; -var Something; +var Something = {}; (function (Something) { var MyComponent = 2; // Shadow declaration, so symbol is only usable via the self-import Something.create = make(me["default"]); -})(Something = exports.Something || (exports.Something = {})); +})(Something); //// [this.d.ts] diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js index 9c433ce3a2b11..2877d9b4f9f36 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge01.js +++ b/tests/baselines/reference/defaultExportsCannotMerge01.js @@ -39,7 +39,7 @@ exports.default = Decl; (function (Decl) { Decl.x = 10; Decl.y = 20; -})(Decl = exports.Decl || (exports.Decl = {})); +})(Decl); //// [m2.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js index f8f375377ebdb..a7a69e9ceaba6 100644 --- a/tests/baselines/reference/defaultExportsCannotMerge04.js +++ b/tests/baselines/reference/defaultExportsCannotMerge04.js @@ -19,4 +19,4 @@ function Foo() { } exports.default = Foo; (function (Foo) { -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js index 52a8676c5f898..ded9ae12cb837 100644 --- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js @@ -81,9 +81,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsBoolean1 = delete ANY1; diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js index 14dd859352c6f..0fe98049305f8 100644 --- a/tests/baselines/reference/deleteOperatorWithBooleanType.js +++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsBoolean1 = delete BOOLEAN; diff --git a/tests/baselines/reference/deleteOperatorWithEnumType.js b/tests/baselines/reference/deleteOperatorWithEnumType.js index 0a17b300d3d80..8a3145842ad50 100644 --- a/tests/baselines/reference/deleteOperatorWithEnumType.js +++ b/tests/baselines/reference/deleteOperatorWithEnumType.js @@ -24,16 +24,16 @@ delete ENUM, ENUM1; //// [deleteOperatorWithEnumType.js] // delete operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsBoolean1 = delete ENUM; diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js index bb58eef6fec7e..c6032582cbe17 100644 --- a/tests/baselines/reference/deleteOperatorWithNumberType.js +++ b/tests/baselines/reference/deleteOperatorWithNumberType.js @@ -56,9 +56,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsBoolean1 = delete NUMBER; diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js index 07e17948a4b5e..8964f21fc0071 100644 --- a/tests/baselines/reference/deleteOperatorWithStringType.js +++ b/tests/baselines/reference/deleteOperatorWithStringType.js @@ -55,9 +55,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsBoolean1 = delete STRING; diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js index 233894553100f..d14c8c847a62a 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js +++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js @@ -141,10 +141,10 @@ b2("string", { x: 200, y: true }); b6(["string", 1, 2]); // Shouldn't be an error b7([["string"], 1, [[true, false]]]); // Shouldn't be an error // If the declaration specifies a binding pattern, the parameter type is the implied type of that binding pattern (section 5.1.3) -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["a"] = 0] = "a"; -})(Foo || (Foo = {})); +})(Foo); function c0(_a) { var _b = _a.z, x = _b.x, j = _b.y.j; } diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.js b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.js index 5e14800bb5646..7433998198bd1 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.js +++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5iterable.js @@ -157,10 +157,10 @@ b2("string", { x: 200, y: true }); b6(["string", 1, 2]); // Shouldn't be an error b7([["string"], 1, [[true, false]]]); // Shouldn't be an error // If the declaration specifies a binding pattern, the parameter type is the implied type of that binding pattern (section 5.1.3) -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["a"] = 0] = "a"; -})(Foo || (Foo = {})); +})(Foo); function c0(_a) { var _b = _a.z, x = _b.x, j = _b.y.j; } diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES6.js b/tests/baselines/reference/destructuringParameterDeclaration1ES6.js index 3a155b14fd581..be87c6376fff6 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration1ES6.js +++ b/tests/baselines/reference/destructuringParameterDeclaration1ES6.js @@ -125,10 +125,10 @@ b1([1, 2, 3]); // z is widen to the type any[] b2("string", { x: 200, y: "string" }); b2("string", { x: 200, y: true }); // If the declaration specifies a binding pattern, the parameter type is the implied type of that binding pattern (section 5.1.3) -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["a"] = 0] = "a"; -})(Foo || (Foo = {})); +})(Foo); function c0({ z: { x, y: { j } } }) { } function c1({ z } = { z: 10 }) { } function c2({ z = 10 }) { } diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.js b/tests/baselines/reference/destructuringParameterDeclaration3ES5.js index 08dfa25a4d42e..d228f1a473049 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.js +++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.js @@ -69,11 +69,11 @@ a11([1, 2]); // Parameter type is number[] function foo(...a) { } foo("hello", 1, 2); foo("hello", "world"); -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); function foo1(...a) { } foo1(1, 2, 3, E.a); foo1(1, 2, 3, 0 /* a */, E.b); diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js index 087bf87aaea25..4d25ffe26f259 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js +++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5iterable.js @@ -125,11 +125,11 @@ function foo() { } foo("hello", 1, 2); foo("hello", "world"); -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); function foo1() { var a = []; for (var _i = 0; _i < arguments.length; _i++) { diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.js b/tests/baselines/reference/destructuringParameterDeclaration3ES6.js index 2857cb2276be9..d84ee6b6d64f5 100644 --- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.js +++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.js @@ -69,11 +69,11 @@ a11([1, 2]); // Parameter type is number[] function foo(...a) { } foo("hello", 1, 2); foo("hello", "world"); -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); function foo1(...a) { } foo1(1, 2, 3, E.a); foo1(1, 2, 3, 0 /* a */, E.b); diff --git a/tests/baselines/reference/differentTypesWithSameName.js b/tests/baselines/reference/differentTypesWithSameName.js index 1ea9fe2e4fa98..8417bb4fc23d7 100644 --- a/tests/baselines/reference/differentTypesWithSameName.js +++ b/tests/baselines/reference/differentTypesWithSameName.js @@ -17,7 +17,7 @@ var v: variable = new variable(); m.doSomething(v); //// [differentTypesWithSameName.js] -var m; +var m = m || (m = {}); (function (m) { var variable = /** @class */ (function () { function variable() { @@ -28,7 +28,7 @@ var m; function doSomething(v) { } m.doSomething = doSomething; -})(m || (m = {})); +})(m); var variable = /** @class */ (function () { function variable() { } diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js index 751d93ddc63bd..549cfb3298297 100644 --- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js +++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js @@ -129,7 +129,7 @@ var f16 = function (a, b) { function foo(func) { } foo(function () { return true; }); foo(function () { return false; }); -var m; +var m = m || (m = {}); (function (m) { var City = /** @class */ (function () { function City(x, thing) { @@ -138,9 +138,9 @@ var m; } return City; }()); - var Enum; + var Enum = m.Enum || (m.Enum = {}); (function (Enum) { Enum[Enum["claw"] = (function () { return 10; })()] = "claw"; - })(Enum = m.Enum || (m.Enum = {})); + })(Enum); m.v = function (x) { return new City(Enum.claw); }; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/dottedModuleName.js b/tests/baselines/reference/dottedModuleName.js index 32d98676d6c59..ace153743c9a2 100644 --- a/tests/baselines/reference/dottedModuleName.js +++ b/tests/baselines/reference/dottedModuleName.js @@ -20,35 +20,35 @@ module M.N { //// [dottedModuleName.js] -var M; +var M = M || (M = {}); (function (M) { - var N; + var N = M.N || (M.N = {}); (function (N) { 2 * x; - var X; + var X = N.X || (N.X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { Z.v2 = f(Z.v); - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); - })(X = N.X || (N.X = {})); - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(Z); + })(Y); + })(X); + })(N); +})(M); (function (M) { - var N; + var N = M.N || (M.N = {}); (function (N) { - var X; + var X = N.X || (N.X = {}); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { - var Z; + var Z = Y.Z || (Y.Z = {}); (function (Z) { Z.v = N.f(10); - })(Z = Y.Z || (Y.Z = {})); - })(Y = X.Y || (X.Y = {})); - })(X = N.X || (N.X = {})); - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(Z); + })(Y); + })(X); + })(N); +})(M); diff --git a/tests/baselines/reference/dottedModuleName2.js b/tests/baselines/reference/dottedModuleName2.js index 33c3f459f7474..95f74b47f763a 100644 --- a/tests/baselines/reference/dottedModuleName2.js +++ b/tests/baselines/reference/dottedModuleName2.js @@ -44,28 +44,28 @@ module M //// [dottedModuleName2.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); -var AA; + })(B); +})(A); +var AA = AA || (AA = {}); (function (AA) { - var B; + var B = AA.B || (AA.B = {}); (function (B) { B.x = 1; - })(B = AA.B || (AA.B = {})); -})(AA || (AA = {})); + })(B); +})(AA); var tmpOK = AA.B.x; var tmpError = A.B.x; (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { C.x = 1; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(C); + })(B); +})(A); diff --git a/tests/baselines/reference/dottedNamesInSystem.js b/tests/baselines/reference/dottedNamesInSystem.js index b65dba306f16e..c4514ff646d94 100644 --- a/tests/baselines/reference/dottedNamesInSystem.js +++ b/tests/baselines/reference/dottedNamesInSystem.js @@ -19,17 +19,17 @@ System.register([], function (exports_1, context_1) { return { setters: [], execute: function () { + exports_1("A", A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { function foo() { } C.foo = foo; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); - })(A || (A = {})); - exports_1("A", A); + })(C); + })(B); + })(A); } }; }); diff --git a/tests/baselines/reference/doubleUnderscoreEnumEmit.js b/tests/baselines/reference/doubleUnderscoreEnumEmit.js index 933ed55433081..5ed360dbe0d27 100644 --- a/tests/baselines/reference/doubleUnderscoreEnumEmit.js +++ b/tests/baselines/reference/doubleUnderscoreEnumEmit.js @@ -20,19 +20,19 @@ namespace Bar { } //// [doubleUnderscoreEnumEmit.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["__a"] = 1] = "__a"; Foo[Foo["(Anonymous function)"] = 2] = "(Anonymous function)"; Foo[Foo["(Anonymous class)"] = 4] = "(Anonymous class)"; Foo[Foo["__call"] = 10] = "__call"; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { function ___call() { return 5; } Foo.___call = ___call; -})(Foo || (Foo = {})); +})(Foo); function Bar() { return "no"; } @@ -41,4 +41,4 @@ function Bar() { return 5; } Bar.__call = __call; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js index 251468519ad04..46dc42120f610 100644 --- a/tests/baselines/reference/downlevelLetConst13.js +++ b/tests/baselines/reference/downlevelLetConst13.js @@ -28,7 +28,7 @@ exports.bar1 = [1][0]; exports.bar2 = [2][0]; exports.bar3 = { a: 1 }.a; exports.bar4 = { a: 1 }.a; -var M; +var M = {}; (function (M) { M.baz = 100; M.baz2 = true; @@ -36,4 +36,4 @@ var M; M.bar6 = [2][0]; M.bar7 = { a: 1 }.a; M.bar8 = { a: 1 }.a; -})(M = exports.M || (exports.M = {})); +})(M); diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index 338489b20c379..65ec31ad9e96d 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -321,7 +321,7 @@ function bar2() { } use(x); } -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { var x = 1; use(x); @@ -329,8 +329,8 @@ var M1; use(y); var z = { a: 1 }.a; use(z); -})(M1 || (M1 = {})); -var M2; +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { { var x_5 = 1; @@ -341,8 +341,8 @@ var M2; use(z_5); } use(x); -})(M2 || (M2 = {})); -var M3; +})(M2); +var M3 = M3 || (M3 = {}); (function (M3) { var x = 1; use(x); @@ -350,8 +350,8 @@ var M3; use(y); var z = { a: 1 }.a; use(z); -})(M3 || (M3 = {})); -var M4; +})(M3); +var M4 = M4 || (M4 = {}); (function (M4) { { var x_6 = 1; @@ -364,7 +364,7 @@ var M4; use(x); use(y); use(z); -})(M4 || (M4 = {})); +})(M4); function foo3() { for (var x_7;;) { use(x_7); diff --git a/tests/baselines/reference/duplicateAnonymousInners1.js b/tests/baselines/reference/duplicateAnonymousInners1.js index 6442bdb05ad54..8325d2103ce22 100644 --- a/tests/baselines/reference/duplicateAnonymousInners1.js +++ b/tests/baselines/reference/duplicateAnonymousInners1.js @@ -26,7 +26,7 @@ module Foo { //// [duplicateAnonymousInners1.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var Helper = /** @class */ (function () { function Helper() { @@ -40,7 +40,7 @@ var Foo; }()); // Inner should show up in intellisense Foo.Outer = 0; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { // Should not be an error var Helper = /** @class */ (function () { @@ -50,4 +50,4 @@ var Foo; }()); // Inner should not show up in intellisense // Outer should show up in intellisense -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.js b/tests/baselines/reference/duplicateAnonymousModuleClasses.js index f786c106cb358..122d802794aa5 100644 --- a/tests/baselines/reference/duplicateAnonymousModuleClasses.js +++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.js @@ -57,14 +57,14 @@ module Gar { //// [duplicateAnonymousModuleClasses.js] -var F; +var F = F || (F = {}); (function (F) { var Helper = /** @class */ (function () { function Helper() { } return Helper; }()); -})(F || (F = {})); +})(F); (function (F) { // Should not be an error var Helper = /** @class */ (function () { @@ -72,15 +72,15 @@ var F; } return Helper; }()); -})(F || (F = {})); -var Foo; +})(F); +var Foo = Foo || (Foo = {}); (function (Foo) { var Helper = /** @class */ (function () { function Helper() { } return Helper; }()); -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { // Should not be an error var Helper = /** @class */ (function () { @@ -88,17 +88,17 @@ var Foo; } return Helper; }()); -})(Foo || (Foo = {})); -var Gar; +})(Foo); +var Gar = Gar || (Gar = {}); (function (Gar) { - var Foo; + var Foo = Foo || (Foo = {}); (function (Foo) { var Helper = /** @class */ (function () { function Helper() { } return Helper; }()); - })(Foo || (Foo = {})); + })(Foo); (function (Foo) { // Should not be an error var Helper = /** @class */ (function () { @@ -106,5 +106,5 @@ var Gar; } return Helper; }()); - })(Foo || (Foo = {})); -})(Gar || (Gar = {})); + })(Foo); +})(Gar); diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js index e33e86e59bc96..860ce7c5ceaf1 100644 --- a/tests/baselines/reference/duplicateExportAssignments.js +++ b/tests/baselines/reference/duplicateExportAssignments.js @@ -58,10 +58,10 @@ var y = /** @class */ (function () { module.exports = x; //// [foo3.js] "use strict"; -var x; +var x = {}; (function (x_1) { x_1.x = 10; -})(x || (x = {})); +})(x); var y = /** @class */ (function () { function y() { } diff --git a/tests/baselines/reference/duplicateIdentifierEnum.js b/tests/baselines/reference/duplicateIdentifierEnum.js index c6d9fe979fad5..31e55626b5db1 100644 --- a/tests/baselines/reference/duplicateIdentifierEnum.js +++ b/tests/baselines/reference/duplicateIdentifierEnum.js @@ -40,10 +40,10 @@ enum E { //// [duplicateIdentifierEnum_A.js] // Test the error message when attempting to merge an enum with a class, an interface, or a function. -var A; +var A = A || (A = {}); (function (A) { A[A["bar"] = 0] = "bar"; -})(A || (A = {})); +})(A); var A = /** @class */ (function () { function A() { } @@ -52,10 +52,10 @@ var A = /** @class */ (function () { function C() { return 0; } -var D; +var D = D || (D = {}); (function (D) { D[D["bar"] = 0] = "bar"; -})(D || (D = {})); +})(D); var E = /** @class */ (function () { function E() { } @@ -66,7 +66,7 @@ var E = /** @class */ (function () { function D() { return 0; } -var E; +var E = E || (E = {}); (function (E) { E[E["bar"] = 0] = "bar"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js index 97c169c9d085d..7483da86866df 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js @@ -53,7 +53,7 @@ declare module N { //// [duplicateIdentifiersAcrossContainerBoundaries.js] -var M; +var M = M || (M = {}); (function (M) { var I = /** @class */ (function () { function I() { @@ -61,11 +61,11 @@ var M; return I; }()); M.I = I; -})(M || (M = {})); +})(M); (function (M) { function f() { } M.f = f; -})(M || (M = {})); +})(M); (function (M) { var f = /** @class */ (function () { function f() { @@ -73,10 +73,10 @@ var M; return f; }()); // error M.f = f; -})(M || (M = {})); +})(M); (function (M) { function g() { } -})(M || (M = {})); +})(M); (function (M) { var g = /** @class */ (function () { function g() { @@ -84,7 +84,7 @@ var M; return g; }()); // no error M.g = g; -})(M || (M = {})); +})(M); (function (M) { var C = /** @class */ (function () { function C() { @@ -92,27 +92,27 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); (function (M) { function C() { } // no error -})(M || (M = {})); +})(M); (function (M) { M.v = 3; -})(M || (M = {})); +})(M); (function (M) { M.v = 3; // error for redeclaring var in a different parent -})(M || (M = {})); +})(M); var Foo = /** @class */ (function () { function Foo() { } return Foo; }()); (function (Foo) { -})(Foo || (Foo = {})); -var N; +})(Foo); +var N = N || (N = {}); (function (N) { - var F; + var F = N.F || (N.F = {}); (function (F) { var t; - })(F = N.F || (N.F = {})); -})(N || (N = {})); + })(F); +})(N); diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index 465b2f7b8e916..b83fe3259ac1c 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -51,13 +51,13 @@ var Foo = /** @class */ (function () { } return Foo; }()); -var N; +var N = N || (N = {}); (function (N) { - var F; + var F = N.F || (N.F = {}); (function (F) { var t; - })(F = N.F || (N.F = {})); -})(N || (N = {})); + })(F); +})(N); //// [file2.js] var I = /** @class */ (function () { function I() { @@ -71,9 +71,9 @@ var f = /** @class */ (function () { return f; }()); // error -- cannot merge function with non-ambient class var v = 3; -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { -})(Foo || (Foo = {})); +})(Foo); //// [file1.d.ts] diff --git a/tests/baselines/reference/duplicateLocalVariable4.js b/tests/baselines/reference/duplicateLocalVariable4.js index 34fe30a1f1c12..833c8ad9e0413 100644 --- a/tests/baselines/reference/duplicateLocalVariable4.js +++ b/tests/baselines/reference/duplicateLocalVariable4.js @@ -7,9 +7,9 @@ var x = E; var x = E.a; //// [duplicateLocalVariable4.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; -})(E || (E = {})); +})(E); var x = E; var x = E.a; diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js index 9e9b3686fd8c4..f0fa008e2fdbe 100644 --- a/tests/baselines/reference/duplicateStringIndexers.js +++ b/tests/baselines/reference/duplicateStringIndexers.js @@ -36,7 +36,7 @@ module test { //// [duplicateStringIndexers.js] // it is an error to have duplicate index signatures of the same kind in a type -var test; +var test = test || (test = {}); (function (test) { var C = /** @class */ (function () { function C() { @@ -44,4 +44,4 @@ var test; return C; }()); var a; -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index b98137283b383..b6801c7a53598 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -70,30 +70,30 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; // Should report error only once for instantiated module - var M; + var M = {}; (function (M) { - var inst; + var inst = inst || (inst = {}); (function (inst) { var t; - })(inst || (inst = {})); + })(inst); (function (inst) { var t; - })(inst = M.inst || (M.inst = {})); - })(M || (M = {})); + })(inst); + })(M); // Variables of the same / different type - var M2; + var M2 = {}; (function (M2) { var v; var w; - })(M2 || (M2 = {})); + })(M2); (function (M) { - var F; + var F = F || (F = {}); (function (F) { var t; - })(F || (F = {})); + })(F); function F() { } // Only one error for duplicate identifier (don't consider visibility) M.F = F; - })(M || (M = {})); + })(M); (function (M) { var C = /** @class */ (function () { function C() { @@ -102,6 +102,6 @@ define(["require", "exports"], function (require, exports) { }()); (function (C) { var t; - })(C = M.C || (M.C = {})); - })(M || (M = {})); + })(C); + })(M); }); diff --git a/tests/baselines/reference/duplicateVarAndImport2.js b/tests/baselines/reference/duplicateVarAndImport2.js index 42d500d588a11..3bd72b5411fe6 100644 --- a/tests/baselines/reference/duplicateVarAndImport2.js +++ b/tests/baselines/reference/duplicateVarAndImport2.js @@ -7,8 +7,8 @@ import a = M; //// [duplicateVarAndImport2.js] // error since module is instantiated var a; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); var a = M; diff --git a/tests/baselines/reference/duplicateVariablesByScope.js b/tests/baselines/reference/duplicateVariablesByScope.js index 1bd0b69f0203c..11554c1997cc8 100644 --- a/tests/baselines/reference/duplicateVariablesByScope.js +++ b/tests/baselines/reference/duplicateVariablesByScope.js @@ -33,13 +33,13 @@ class C { //// [duplicateVariablesByScope.js] // duplicate local variables are only reported at global scope -var M; +var M = M || (M = {}); (function (M) { for (var j = 0; j < 10; j++) { } for (var j = 0; j < 10; j++) { } -})(M || (M = {})); +})(M); function foo() { var x = 2; var x = 1; diff --git a/tests/baselines/reference/duplicateVariablesWithAny.js b/tests/baselines/reference/duplicateVariablesWithAny.js index 9742b1bef570a..e1e62d1641b57 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.js +++ b/tests/baselines/reference/duplicateVariablesWithAny.js @@ -23,12 +23,12 @@ var x; var x = 2; //error var y = ""; var y; //error -var N; +var N = N || (N = {}); (function (N) { var x; var x = 2; //error var y = ""; var y; //error -})(N || (N = {})); +})(N); var z; var z; // ok diff --git a/tests/baselines/reference/dynamicNames.js b/tests/baselines/reference/dynamicNames.js index 89a5076fc3697..31d13e2d815d0 100644 --- a/tests/baselines/reference/dynamicNames.js +++ b/tests/baselines/reference/dynamicNames.js @@ -164,12 +164,12 @@ exports.s0 = Symbol(); "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const module_1 = require("./module"); -var N; +const N = {}; (function (N) { N.c2 = "a"; N.c3 = 1; N.s1 = module_1.s0; -})(N || (N = {})); +})(N); exports.c4 = "a"; exports.c5 = 1; exports.s2 = module_1.s0; diff --git a/tests/baselines/reference/emitMemberAccessExpression.js b/tests/baselines/reference/emitMemberAccessExpression.js index bdda7b833d2ff..4d522f1d5187a 100644 --- a/tests/baselines/reference/emitMemberAccessExpression.js +++ b/tests/baselines/reference/emitMemberAccessExpression.js @@ -27,11 +27,11 @@ module Microsoft.PeopleAtWork.Model { //// [emitMemberAccessExpression_file2.js] /// "use strict"; -var Microsoft; +var Microsoft = Microsoft || (Microsoft = {}); (function (Microsoft) { - var PeopleAtWork; + var PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}); (function (PeopleAtWork) { - var Model; + var Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}); (function (Model) { var _Person = /** @class */ (function () { function _Person() { @@ -42,20 +42,20 @@ var Microsoft; return _Person; }()); Model._Person = _Person; - })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {})); - })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {})); -})(Microsoft || (Microsoft = {})); + })(Model); + })(PeopleAtWork); +})(Microsoft); //// [emitMemberAccessExpression_file1.js] /// "use strict"; //// [emitMemberAccessExpression_file3.js] /// /// -var Microsoft; +var Microsoft = Microsoft || (Microsoft = {}); (function (Microsoft) { - var PeopleAtWork; + var PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}); (function (PeopleAtWork) { - var Model; + var Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}); (function (Model) { var KnockoutExtentions = /** @class */ (function () { function KnockoutExtentions() { @@ -63,6 +63,6 @@ var Microsoft; return KnockoutExtentions; }()); Model.KnockoutExtentions = KnockoutExtentions; - })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {})); - })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {})); -})(Microsoft || (Microsoft = {})); + })(Model); + })(PeopleAtWork); +})(Microsoft); diff --git a/tests/baselines/reference/emptyEnum.js b/tests/baselines/reference/emptyEnum.js index 0188e1ecbaed0..e14ad908c233a 100644 --- a/tests/baselines/reference/emptyEnum.js +++ b/tests/baselines/reference/emptyEnum.js @@ -3,6 +3,6 @@ enum E { } //// [emptyEnum.js] -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumAssignability.js b/tests/baselines/reference/enumAssignability.js index ecb289a947c47..334627ba8a360 100644 --- a/tests/baselines/reference/enumAssignability.js +++ b/tests/baselines/reference/enumAssignability.js @@ -56,14 +56,14 @@ module Others { //// [enumAssignability.js] // enums assignable to number, any, Object, errors unless otherwise noted -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { F[F["B"] = 0] = "B"; -})(F || (F = {})); +})(F); var e = E.A; var f = F.B; e = f; @@ -72,7 +72,7 @@ e = 1; // ok f = 1; // ok var x = e; // ok x = f; // ok -var Others; +var Others = Others || (Others = {}); (function (Others) { var a = e; // ok var C = /** @class */ (function () { @@ -107,4 +107,4 @@ var Others; var a = e; var b = e; } -})(Others || (Others = {})); +})(Others); diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.js b/tests/baselines/reference/enumAssignabilityInInheritance.js index a2d38cf2e14d0..59772bb059037 100644 --- a/tests/baselines/reference/enumAssignabilityInInheritance.js +++ b/tests/baselines/reference/enumAssignabilityInInheritance.js @@ -111,10 +111,10 @@ var r4 = foo16(E.A); //// [enumAssignabilityInInheritance.js] // enum is only a subtype of number, no types are subtypes of enum, all of these except the first are errors -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var r = foo(E.A); // E var r2 = foo(1); // number var r3 = foo(null); // any @@ -139,15 +139,15 @@ var A2 = /** @class */ (function () { var r4 = foo10(E.A); var r4 = foo11(E.A); var r4 = foo12(E.A); -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; -})(E2 || (E2 = {})); +})(E2); var r4 = foo13(E.A); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var r4 = foo14(E.A); var CC = /** @class */ (function () { function CC() { @@ -156,7 +156,7 @@ var CC = /** @class */ (function () { }()); (function (CC) { CC.bar = 1; -})(CC || (CC = {})); +})(CC); var r4 = foo15(E.A); var r4 = foo16(E.A); var r4 = foo16(E.A); diff --git a/tests/baselines/reference/enumAssignmentCompat.js b/tests/baselines/reference/enumAssignmentCompat.js index f68ffdaa8a42c..b8f23d926e27d 100644 --- a/tests/baselines/reference/enumAssignmentCompat.js +++ b/tests/baselines/reference/enumAssignmentCompat.js @@ -39,7 +39,7 @@ W.D; var p: W.D; //// [enumAssignmentCompat.js] -var W; +var W = W || (W = {}); (function (W) { var D = /** @class */ (function () { function D() { @@ -47,12 +47,12 @@ var W; return D; }()); W.D = D; -})(W || (W = {})); +})(W); (function (W) { W[W["a"] = 0] = "a"; W[W["b"] = 1] = "b"; W[W["c"] = 2] = "c"; -})(W || (W = {})); +})(W); var x = W; var y = W; var z = W; // error diff --git a/tests/baselines/reference/enumAssignmentCompat2.js b/tests/baselines/reference/enumAssignmentCompat2.js index b27187c1253d8..a081756645415 100644 --- a/tests/baselines/reference/enumAssignmentCompat2.js +++ b/tests/baselines/reference/enumAssignmentCompat2.js @@ -38,12 +38,12 @@ W.D; var p: W.D; //// [enumAssignmentCompat2.js] -var W; +var W = W || (W = {}); (function (W) { W[W["a"] = 0] = "a"; W[W["b"] = 1] = "b"; W[W["c"] = 2] = "c"; -})(W || (W = {})); +})(W); (function (W) { var D = /** @class */ (function () { function D() { @@ -51,7 +51,7 @@ var W; return D; }()); W.D = D; -})(W || (W = {})); +})(W); var x = W; var y = W; var z = W; // error diff --git a/tests/baselines/reference/enumAssignmentCompat3.js b/tests/baselines/reference/enumAssignmentCompat3.js index accaaa7a99e20..a3b55a63fa9ea 100644 --- a/tests/baselines/reference/enumAssignmentCompat3.js +++ b/tests/baselines/reference/enumAssignmentCompat3.js @@ -90,83 +90,83 @@ abc = merged2; // ok merged2 = abc; // ok //// [enumAssignmentCompat3.js] -var First; +var First = First || (First = {}); (function (First) { - var E; + var E = First.E || (First.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; - })(E = First.E || (First.E = {})); -})(First || (First = {})); -var Abc; + })(E); +})(First); +var Abc = Abc || (Abc = {}); (function (Abc) { - var E; + var E = Abc.E || (Abc.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; - })(E = Abc.E || (Abc.E = {})); - var Nope; + })(E); + var Nope = Abc.Nope || (Abc.Nope = {}); (function (Nope) { Nope[Nope["a"] = 0] = "a"; Nope[Nope["b"] = 1] = "b"; Nope[Nope["c"] = 2] = "c"; - })(Nope = Abc.Nope || (Abc.Nope = {})); -})(Abc || (Abc = {})); -var Abcd; + })(Nope); +})(Abc); +var Abcd = Abcd || (Abcd = {}); (function (Abcd) { - var E; + var E = Abcd.E || (Abcd.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; E[E["d"] = 3] = "d"; - })(E = Abcd.E || (Abcd.E = {})); -})(Abcd || (Abcd = {})); -var Ab; + })(E); +})(Abcd); +var Ab = Ab || (Ab = {}); (function (Ab) { - var E; + var E = Ab.E || (Ab.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; - })(E = Ab.E || (Ab.E = {})); -})(Ab || (Ab = {})); -var Cd; + })(E); +})(Ab); +var Cd = Cd || (Cd = {}); (function (Cd) { - var E; + var E = Cd.E || (Cd.E = {}); (function (E) { E[E["c"] = 0] = "c"; E[E["d"] = 1] = "d"; - })(E = Cd.E || (Cd.E = {})); -})(Cd || (Cd = {})); -var Decl; + })(E); +})(Cd); +var Decl = Decl || (Decl = {}); (function (Decl) { -})(Decl || (Decl = {})); -var Merged; +})(Decl); +var Merged = Merged || (Merged = {}); (function (Merged) { - var E; + var E = Merged.E || (Merged.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; - })(E = Merged.E || (Merged.E = {})); + })(E); (function (E) { E[E["c"] = 3] = "c"; E[E["d"] = 4] = "d"; - })(E = Merged.E || (Merged.E = {})); -})(Merged || (Merged = {})); -var Merged2; + })(E); +})(Merged); +var Merged2 = Merged2 || (Merged2 = {}); (function (Merged2) { - var E; + var E = Merged2.E || (Merged2.E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; - })(E = Merged2.E || (Merged2.E = {})); + })(E); (function (E) { E.d = 5; - })(E = Merged2.E || (Merged2.E = {})); -})(Merged2 || (Merged2 = {})); + })(E); +})(Merged2); var abc; var secondAbc; var secondAbcd; diff --git a/tests/baselines/reference/enumAssignmentCompat4.js b/tests/baselines/reference/enumAssignmentCompat4.js index 35bc9319ce9c3..e36cf702f9728 100644 --- a/tests/baselines/reference/enumAssignmentCompat4.js +++ b/tests/baselines/reference/enumAssignmentCompat4.js @@ -24,27 +24,27 @@ let broken = [ //// [enumAssignmentCompat4.js] -var M; +var M = M || (M = {}); (function (M) { - var MyEnum; + var MyEnum = M.MyEnum || (M.MyEnum = {}); (function (MyEnum) { MyEnum[MyEnum["BAR"] = 0] = "BAR"; - })(MyEnum = M.MyEnum || (M.MyEnum = {})); + })(MyEnum); M.object2 = { foo: MyEnum.BAR }; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { - var MyEnum; + var MyEnum = N.MyEnum || (N.MyEnum = {}); (function (MyEnum) { MyEnum[MyEnum["FOO"] = 0] = "FOO"; - })(MyEnum = N.MyEnum || (N.MyEnum = {})); + })(MyEnum); ; N.object1 = { foo: MyEnum.FOO }; -})(N || (N = {})); +})(N); var broken = [ N.object1, M.object2 diff --git a/tests/baselines/reference/enumAssignmentCompat5.js b/tests/baselines/reference/enumAssignmentCompat5.js index a7c96929f084c..877f01d9b29e9 100644 --- a/tests/baselines/reference/enumAssignmentCompat5.js +++ b/tests/baselines/reference/enumAssignmentCompat5.js @@ -25,18 +25,18 @@ let ca: Computed.A = 1; // error, Computed.A isn't a literal type because Comput //// [enumAssignmentCompat5.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); -var Computed; +})(E); +var Computed = Computed || (Computed = {}); (function (Computed) { Computed[Computed["A"] = 2] = "A"; Computed[Computed["B"] = 4] = "B"; Computed[Computed["C"] = 8] = "C"; -})(Computed || (Computed = {})); +})(Computed); var n; var e = n; // ok because it's too inconvenient otherwise e = 0; // ok, in range diff --git a/tests/baselines/reference/enumBasics.js b/tests/baselines/reference/enumBasics.js index 3db9bc566c344..ce4ead311a390 100644 --- a/tests/baselines/reference/enumBasics.js +++ b/tests/baselines/reference/enumBasics.js @@ -82,12 +82,12 @@ var doPropagate = [ //// [enumBasics.js] // Enum without initializers have first member = 0 and successive members = N + 1 -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; -})(E1 || (E1 = {})); +})(E1); // Enum type is a subtype of Number var x = E1.A; // Enum object type is anonymous with properties of the enum type and numeric indexer @@ -98,55 +98,55 @@ var e; var s = E1[e.A]; var s; // Enum with only constant members -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 1] = "A"; E2[E2["B"] = 2] = "B"; E2[E2["C"] = 3] = "C"; -})(E2 || (E2 = {})); +})(E2); // Enum with only computed members -var E3; +var E3 = E3 || (E3 = {}); (function (E3) { E3[E3["X"] = 'foo'.length] = "X"; E3[E3["Y"] = 7] = "Y"; E3[E3["Z"] = +'foo'] = "Z"; -})(E3 || (E3 = {})); +})(E3); // Enum with constant members followed by computed members -var E4; +var E4 = E4 || (E4 = {}); (function (E4) { E4[E4["X"] = 0] = "X"; E4[E4["Y"] = 1] = "Y"; E4[E4["Z"] = 'foo'.length] = "Z"; -})(E4 || (E4 = {})); +})(E4); // Enum with > 2 constant members with no initializer for first member, non zero initializer for second element -var E5; +var E5 = E5 || (E5 = {}); (function (E5) { E5[E5["A"] = 0] = "A"; E5[E5["B"] = 3] = "B"; E5[E5["C"] = 4] = "C"; // 4 -})(E5 || (E5 = {})); -var E6; +})(E5); +var E6 = E6 || (E6 = {}); (function (E6) { E6[E6["A"] = 0] = "A"; E6[E6["B"] = 0] = "B"; E6[E6["C"] = 1] = "C"; // 1 -})(E6 || (E6 = {})); +})(E6); // Enum with computed member initializer of type 'any' -var E7; +var E7 = E7 || (E7 = {}); (function (E7) { E7[E7["A"] = 'foo'['foo']] = "A"; -})(E7 || (E7 = {})); +})(E7); // Enum with computed member initializer of type number -var E8; +var E8 = E8 || (E8 = {}); (function (E8) { E8[E8["B"] = 'foo'['foo']] = "B"; -})(E8 || (E8 = {})); +})(E8); //Enum with computed member intializer of same enum type -var E9; +var E9 = E9 || (E9 = {}); (function (E9) { E9[E9["A"] = 0] = "A"; E9[E9["B"] = 0] = "B"; -})(E9 || (E9 = {})); +})(E9); // (refer to .js to validate) // Enum constant members are propagated var doNotPropagate = [ diff --git a/tests/baselines/reference/enumBasics1.js b/tests/baselines/reference/enumBasics1.js index 76e60cde35516..858a799f504df 100644 --- a/tests/baselines/reference/enumBasics1.js +++ b/tests/baselines/reference/enumBasics1.js @@ -38,12 +38,12 @@ enum E2 { // should error for continued autonumbering } //// [enumBasics1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 1] = "A"; E[E["B"] = 2] = "B"; E[E["C"] = 3] = "C"; -})(E || (E = {})); +})(E); /* var a: E; var b = E["B"]; // shouldn't error @@ -64,12 +64,12 @@ class C { var e = E; // shouldn't error */ E.A.A; // should error -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; E2[E2["B"] = 1] = "B"; -})(E2 || (E2 = {})); +})(E2); (function (E2) { E2[E2["C"] = 0] = "C"; E2[E2["D"] = 1] = "D"; -})(E2 || (E2 = {})); +})(E2); diff --git a/tests/baselines/reference/enumClassification.js b/tests/baselines/reference/enumClassification.js index 5b6269ec3fdfe..f35648db7fa8d 100644 --- a/tests/baselines/reference/enumClassification.js +++ b/tests/baselines/reference/enumClassification.js @@ -85,37 +85,37 @@ enum E20 { // the enum type is classified as a literal enum type. An enum type that doesn't adhere // to this pattern is classified as a numeric enum type. // Examples of literal enum types -var E01; +var E01 = E01 || (E01 = {}); (function (E01) { E01[E01["A"] = 0] = "A"; -})(E01 || (E01 = {})); -var E02; +})(E01); +var E02 = E02 || (E02 = {}); (function (E02) { E02[E02["A"] = 123] = "A"; -})(E02 || (E02 = {})); -var E03; +})(E02); +var E03 = E03 || (E03 = {}); (function (E03) { E03["A"] = "hello"; -})(E03 || (E03 = {})); -var E04; +})(E03); +var E04 = E04 || (E04 = {}); (function (E04) { E04[E04["A"] = 0] = "A"; E04[E04["B"] = 1] = "B"; E04[E04["C"] = 2] = "C"; -})(E04 || (E04 = {})); -var E05; +})(E04); +var E05 = E05 || (E05 = {}); (function (E05) { E05[E05["A"] = 0] = "A"; E05[E05["B"] = 10] = "B"; E05[E05["C"] = 11] = "C"; -})(E05 || (E05 = {})); -var E06; +})(E05); +var E06 = E06 || (E06 = {}); (function (E06) { E06["A"] = "one"; E06["B"] = "two"; E06["C"] = "three"; -})(E06 || (E06 = {})); -var E07; +})(E06); +var E07 = E07 || (E07 = {}); (function (E07) { E07[E07["A"] = 0] = "A"; E07[E07["B"] = 1] = "B"; @@ -123,39 +123,39 @@ var E07; E07[E07["D"] = 10] = "D"; E07[E07["E"] = 11] = "E"; E07["F"] = "bye"; -})(E07 || (E07 = {})); -var E08; +})(E07); +var E08 = E08 || (E08 = {}); (function (E08) { E08[E08["A"] = 10] = "A"; E08["B"] = "hello"; E08[E08["C"] = 10] = "C"; E08["D"] = "hello"; E08[E08["E"] = 10] = "E"; -})(E08 || (E08 = {})); +})(E08); // Examples of numeric enum types with only constant members -var E10; +var E10 = E10 || (E10 = {}); (function (E10) { -})(E10 || (E10 = {})); -var E11; +})(E10); +var E11 = E11 || (E11 = {}); (function (E11) { E11[E11["A"] = 0] = "A"; E11[E11["B"] = 1] = "B"; E11[E11["C"] = 2] = "C"; -})(E11 || (E11 = {})); -var E12; +})(E11); +var E12 = E12 || (E12 = {}); (function (E12) { E12[E12["A"] = 1] = "A"; E12[E12["B"] = 2] = "B"; E12[E12["C"] = 4] = "C"; -})(E12 || (E12 = {})); +})(E12); // Examples of numeric enum types with constant and computed members -var E20; +var E20 = E20 || (E20 = {}); (function (E20) { E20[E20["A"] = "foo".length] = "A"; E20[E20["B"] = E20.A + 1] = "B"; E20[E20["C"] = +"123"] = "C"; E20[E20["D"] = Math.sin(1)] = "D"; -})(E20 || (E20 = {})); +})(E20); //// [enumClassification.d.ts] diff --git a/tests/baselines/reference/enumCodeGenNewLines1.js b/tests/baselines/reference/enumCodeGenNewLines1.js index 6bdc967792268..58667b89de9c8 100644 --- a/tests/baselines/reference/enumCodeGenNewLines1.js +++ b/tests/baselines/reference/enumCodeGenNewLines1.js @@ -7,9 +7,9 @@ enum foo { //// [enumCodeGenNewLines1.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { foo[foo["b"] = 1] = "b"; foo[foo["c"] = 2] = "c"; foo[foo["d"] = 3] = "d"; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js index 5c32fe5a16b3c..1d196a0d547e4 100644 --- a/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js +++ b/tests/baselines/reference/enumConflictsWithGlobalIdentifier.js @@ -7,10 +7,10 @@ var y = Position.IgnoreRulesSpecific; //// [enumConflictsWithGlobalIdentifier.js] -var Position; +var Position = Position || (Position = {}); (function (Position) { Position[Position["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; -})(Position || (Position = {})); +})(Position); var x = IgnoreRulesSpecific. ; var y = Position.IgnoreRulesSpecific; diff --git a/tests/baselines/reference/enumConstantMemberWithString.js b/tests/baselines/reference/enumConstantMemberWithString.js index fc61ed484c84b..40962b019f935 100644 --- a/tests/baselines/reference/enumConstantMemberWithString.js +++ b/tests/baselines/reference/enumConstantMemberWithString.js @@ -34,31 +34,31 @@ declare enum T6 { //// [enumConstantMemberWithString.js] -var T1; +var T1 = T1 || (T1 = {}); (function (T1) { T1["a"] = "1"; T1["b"] = "12"; T1["c"] = "123"; T1[T1["d"] = 0] = "d"; T1[T1["e"] = 0] = "e"; -})(T1 || (T1 = {})); -var T2; +})(T1); +var T2 = T2 || (T2 = {}); (function (T2) { T2["a"] = "1"; T2["b"] = "12"; -})(T2 || (T2 = {})); -var T3; +})(T2); +var T3 = T3 || (T3 = {}); (function (T3) { T3["a"] = "1"; T3["b"] = "12"; T3[T3["c"] = 1] = "c"; T3[T3["d"] = 0] = "d"; -})(T3 || (T3 = {})); -var T4; +})(T3); +var T4 = T4 || (T4 = {}); (function (T4) { T4["a"] = "1"; -})(T4 || (T4 = {})); -var T5; +})(T4); +var T5 = T5 || (T5 = {}); (function (T5) { T5["a"] = "12"; -})(T5 || (T5 = {})); +})(T5); diff --git a/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js index d78ce824256d8..fbcc32352f6fb 100644 --- a/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js +++ b/tests/baselines/reference/enumConstantMemberWithStringEmitDeclaration.js @@ -30,30 +30,30 @@ declare enum T6 { //// [enumConstantMemberWithStringEmitDeclaration.js] -var T1; +var T1 = T1 || (T1 = {}); (function (T1) { T1["a"] = "1"; T1["b"] = "12"; T1["c"] = "123"; -})(T1 || (T1 = {})); -var T2; +})(T1); +var T2 = T2 || (T2 = {}); (function (T2) { T2["a"] = "1"; T2["b"] = "12"; -})(T2 || (T2 = {})); -var T3; +})(T2); +var T3 = T3 || (T3 = {}); (function (T3) { T3["a"] = "1"; T3["b"] = "12"; -})(T3 || (T3 = {})); -var T4; +})(T3); +var T4 = T4 || (T4 = {}); (function (T4) { T4["a"] = "1"; -})(T4 || (T4 = {})); -var T5; +})(T4); +var T5 = T5 || (T5 = {}); (function (T5) { T5["a"] = "12"; -})(T5 || (T5 = {})); +})(T5); //// [enumConstantMemberWithStringEmitDeclaration.d.ts] diff --git a/tests/baselines/reference/enumConstantMembers.js b/tests/baselines/reference/enumConstantMembers.js index a74d057063923..f2ecf5ac5f62a 100644 --- a/tests/baselines/reference/enumConstantMembers.js +++ b/tests/baselines/reference/enumConstantMembers.js @@ -42,22 +42,22 @@ const enum E6 { //// [enumConstantMembers.js] // Constant members allow negatives, but not decimals. Also hex literals are allowed -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["a"] = 1] = "a"; E1[E1["b"] = 2] = "b"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["a"] = -1] = "a"; E2[E2["b"] = 0] = "b"; -})(E2 || (E2 = {})); -var E3; +})(E2); +var E3 = E3 || (E3 = {}); (function (E3) { E3[E3["a"] = 0.1] = "a"; E3[E3["b"] = 1.1] = "b"; // Error because 0.1 is not a constant -})(E3 || (E3 = {})); -var E5; +})(E3); +var E5 = E5 || (E5 = {}); (function (E5) { E5[E5["a"] = Infinity] = "a"; E5[E5["b"] = Infinity] = "b"; @@ -66,4 +66,4 @@ var E5; E5[E5["e"] = NaN] = "e"; E5[E5["f"] = Infinity] = "f"; E5[E5["g"] = -Infinity] = "g"; -})(E5 || (E5 = {})); +})(E5); diff --git a/tests/baselines/reference/enumErrors.js b/tests/baselines/reference/enumErrors.js index 17b67864c7068..43125f595e6dd 100644 --- a/tests/baselines/reference/enumErrors.js +++ b/tests/baselines/reference/enumErrors.js @@ -42,49 +42,49 @@ enum E12 { //// [enumErrors.js] // Enum named with PredefinedTypes -var any; +var any = any || (any = {}); (function (any) { -})(any || (any = {})); -var number; +})(any); +var number = number || (number = {}); (function (number) { -})(number || (number = {})); -var string; +})(number); +var string = string || (string = {}); (function (string) { -})(string || (string = {})); -var boolean; +})(string); +var boolean = boolean || (boolean = {}); (function (boolean) { -})(boolean || (boolean = {})); +})(boolean); // Enum with computed member initializer of type Number -var E5; +var E5 = E5 || (E5 = {}); (function (E5) { E5[E5["C"] = new Number(30)] = "C"; -})(E5 || (E5 = {})); -var E9; +})(E5); +var E9 = E9 || (E9 = {}); (function (E9) { E9[E9["A"] = 0] = "A"; E9[E9["B"] = 0] = "B"; -})(E9 || (E9 = {})); +})(E9); //Enum with computed member intializer of different enum type // Bug 707850: This should be allowed -var E10; +var E10 = E10 || (E10 = {}); (function (E10) { E10[E10["A"] = 0] = "A"; E10[E10["B"] = 0] = "B"; -})(E10 || (E10 = {})); +})(E10); // Enum with computed member intializer of other types -var E11; +var E11 = E11 || (E11 = {}); (function (E11) { E11[E11["A"] = true] = "A"; E11[E11["B"] = new Date()] = "B"; E11[E11["C"] = window] = "C"; E11[E11["D"] = {}] = "D"; -})(E11 || (E11 = {})); +})(E11); // Enum with string valued member and computed member initializers -var E12; +var E12 = E12 || (E12 = {}); (function (E12) { E12["A"] = ""; E12[E12["B"] = 0] = "B"; E12[E12["C"] = 0] = "C"; E12[E12["D"] = 0] = "D"; E12[E12["E"] = 0] = "E"; -})(E12 || (E12 = {})); +})(E12); diff --git a/tests/baselines/reference/enumExportMergingES6.js b/tests/baselines/reference/enumExportMergingES6.js index 7a5ea5f271857..f8ed628d7d59c 100644 --- a/tests/baselines/reference/enumExportMergingES6.js +++ b/tests/baselines/reference/enumExportMergingES6.js @@ -11,13 +11,14 @@ export enum Animals { //// [enumExportMergingES6.js] -export var Animals; +export const Animals = {}; +export { Animals }; (function (Animals) { Animals[Animals["Cat"] = 1] = "Cat"; -})(Animals || (Animals = {})); +})(Animals); (function (Animals) { Animals[Animals["Dog"] = 2] = "Dog"; -})(Animals || (Animals = {})); +})(Animals); (function (Animals) { Animals[Animals["CatDog"] = 3] = "CatDog"; -})(Animals || (Animals = {})); +})(Animals); diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js index 2a1865d3ccd0d..2ca30997f9333 100644 --- a/tests/baselines/reference/enumFromExternalModule.js +++ b/tests/baselines/reference/enumFromExternalModule.js @@ -13,10 +13,10 @@ var x = f.Mode.Open; //// [enumFromExternalModule_0.js] "use strict"; exports.__esModule = true; -var Mode; +var Mode = {}; (function (Mode) { Mode[Mode["Open"] = 0] = "Open"; -})(Mode = exports.Mode || (exports.Mode = {})); +})(Mode); //// [enumFromExternalModule_1.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/enumGenericTypeClash.js b/tests/baselines/reference/enumGenericTypeClash.js index 91fba388638f2..785d1a82edcbc 100644 --- a/tests/baselines/reference/enumGenericTypeClash.js +++ b/tests/baselines/reference/enumGenericTypeClash.js @@ -11,4 +11,4 @@ var X = /** @class */ (function () { }()); (function (X) { X[X["MyVal"] = 0] = "MyVal"; -})(X || (X = {})); +})(X); diff --git a/tests/baselines/reference/enumIdentifierLiterals.js b/tests/baselines/reference/enumIdentifierLiterals.js index 5f132b965f20d..bd0aeea9fa126 100644 --- a/tests/baselines/reference/enumIdentifierLiterals.js +++ b/tests/baselines/reference/enumIdentifierLiterals.js @@ -8,11 +8,11 @@ enum Nums { } //// [enumIdentifierLiterals.js] -var Nums; +var Nums = Nums || (Nums = {}); (function (Nums) { Nums[Nums[1] = 0] = 1; Nums[Nums[1.1] = 1] = 1.1; Nums[Nums[1.2] = 2] = 1.2; Nums[Nums["13e-1"] = 3] = "13e-1"; Nums[Nums[61453] = 4] = 61453; -})(Nums || (Nums = {})); +})(Nums); diff --git a/tests/baselines/reference/enumIndexer.js b/tests/baselines/reference/enumIndexer.js index 561461229c721..dd614ff5f3a9d 100644 --- a/tests/baselines/reference/enumIndexer.js +++ b/tests/baselines/reference/enumIndexer.js @@ -8,11 +8,11 @@ var x = _arr.map(o => MyEnumType[o.key] === enumValue); // these are not same ty //// [enumIndexer.js] -var MyEnumType; +var MyEnumType = MyEnumType || (MyEnumType = {}); (function (MyEnumType) { MyEnumType[MyEnumType["foo"] = 0] = "foo"; MyEnumType[MyEnumType["bar"] = 1] = "bar"; -})(MyEnumType || (MyEnumType = {})); +})(MyEnumType); var _arr = [{ key: 'foo' }, { key: 'bar' }]; var enumValue = MyEnumType.foo; var x = _arr.map(function (o) { return MyEnumType[o.key] === enumValue; }); // these are not same type diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js index 9401ad34d42c5..7574906faddea 100644 --- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js +++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js @@ -132,10 +132,10 @@ interface I20 { //// [enumIsNotASubtypeOfAnythingButNumber.js] // enums are only subtypes of number, any and no other types -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var A = /** @class */ (function () { function A() { } @@ -146,14 +146,14 @@ var A2 = /** @class */ (function () { } return A2; }()); -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; -})(E2 || (E2 = {})); +})(E2); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -161,4 +161,4 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); diff --git a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js index 077e5690dd84d..1f5405307cc0c 100644 --- a/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js +++ b/tests/baselines/reference/enumLiteralAssignableToEnumInsideUnion.js @@ -30,38 +30,38 @@ const e5: Ka.Foo | boolean = Z.Foo.A; // ok //// [enumLiteralAssignableToEnumInsideUnion.js] -var X; +var X = X || (X = {}); (function (X) { - var Foo; + var Foo = X.Foo || (X.Foo = {}); (function (Foo) { Foo[Foo["A"] = 0] = "A"; Foo[Foo["B"] = 1] = "B"; - })(Foo = X.Foo || (X.Foo = {})); -})(X || (X = {})); -var Y; + })(Foo); +})(X); +var Y = Y || (Y = {}); (function (Y) { - var Foo; + var Foo = Y.Foo || (Y.Foo = {}); (function (Foo) { Foo[Foo["A"] = 0] = "A"; Foo[Foo["B"] = 1] = "B"; - })(Foo = Y.Foo || (Y.Foo = {})); -})(Y || (Y = {})); -var Z; + })(Foo); +})(Y); +var Z = Z || (Z = {}); (function (Z) { - var Foo; + var Foo = Z.Foo || (Z.Foo = {}); (function (Foo) { Foo[Foo["A"] = 2] = "A"; Foo[Foo["B"] = 4] = "B"; - })(Foo = Z.Foo || (Z.Foo = {})); -})(Z || (Z = {})); -var Ka; + })(Foo); +})(Z); +var Ka = Ka || (Ka = {}); (function (Ka) { - var Foo; + var Foo = Ka.Foo || (Ka.Foo = {}); (function (Foo) { Foo[Foo["A"] = 1024] = "A"; Foo[Foo["B"] = 2048] = "B"; - })(Foo = Ka.Foo || (Ka.Foo = {})); -})(Ka || (Ka = {})); + })(Foo); +})(Ka); var e0 = Y.Foo.A; // ok var e1 = Z.Foo.A; // not legal, Z is computed var e2 = Z.Foo.A; // still not legal diff --git a/tests/baselines/reference/enumLiteralUnionNotWidened.js b/tests/baselines/reference/enumLiteralUnionNotWidened.js index a58e93324760b..3ce047bf55872 100644 --- a/tests/baselines/reference/enumLiteralUnionNotWidened.js +++ b/tests/baselines/reference/enumLiteralUnionNotWidened.js @@ -22,17 +22,17 @@ function fn2(x: D): List { return asList(x); } //// [enumLiteralUnionNotWidened.js] // repro from #22093 -var A; +var A = A || (A = {}); (function (A) { A["one"] = "one"; A["two"] = "two"; -})(A || (A = {})); +})(A); ; -var B; +var B = B || (B = {}); (function (B) { B["foo"] = "foo"; B["bar"] = "bar"; -})(B || (B = {})); +})(B); ; var List = /** @class */ (function () { function List() { diff --git a/tests/baselines/reference/enumLiteralsSubtypeReduction.js b/tests/baselines/reference/enumLiteralsSubtypeReduction.js index b24944dd2fc10..225f257fc63a6 100644 --- a/tests/baselines/reference/enumLiteralsSubtypeReduction.js +++ b/tests/baselines/reference/enumLiteralsSubtypeReduction.js @@ -2056,7 +2056,7 @@ function run(a: number) { //// [enumLiteralsSubtypeReduction.js] -var E; +var E = E || (E = {}); (function (E) { E[E["E0"] = 0] = "E0"; E[E["E1"] = 1] = "E1"; @@ -3082,7 +3082,7 @@ var E; E[E["E1021"] = 1021] = "E1021"; E[E["E1022"] = 1022] = "E1022"; E[E["E1023"] = 1023] = "E1023"; -})(E || (E = {})); +})(E); function run(a) { switch (a) { case 0: diff --git a/tests/baselines/reference/enumMapBackIntoItself.js b/tests/baselines/reference/enumMapBackIntoItself.js index 80a4b88479f5d..15ede18339830 100644 --- a/tests/baselines/reference/enumMapBackIntoItself.js +++ b/tests/baselines/reference/enumMapBackIntoItself.js @@ -10,12 +10,12 @@ var test = TShirtSize[mySize]; test + '' //// [enumMapBackIntoItself.js] -var TShirtSize; +var TShirtSize = TShirtSize || (TShirtSize = {}); (function (TShirtSize) { TShirtSize[TShirtSize["Small"] = 0] = "Small"; TShirtSize[TShirtSize["Medium"] = 1] = "Medium"; TShirtSize[TShirtSize["Large"] = 2] = "Large"; -})(TShirtSize || (TShirtSize = {})); +})(TShirtSize); var mySize = TShirtSize.Large; var test = TShirtSize[mySize]; // specifically checking output here, bug was that test used to be undefined at runtime diff --git a/tests/baselines/reference/enumMemberResolution.js b/tests/baselines/reference/enumMemberResolution.js index ec27342471d24..1843a99d8ba0c 100644 --- a/tests/baselines/reference/enumMemberResolution.js +++ b/tests/baselines/reference/enumMemberResolution.js @@ -8,10 +8,10 @@ var z = Position2.IgnoreRulesSpecific; // no error //// [enumMemberResolution.js] -var Position2; +var Position2 = Position2 || (Position2 = {}); (function (Position2) { Position2[Position2["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific"; -})(Position2 || (Position2 = {})); +})(Position2); var x = IgnoreRulesSpecific. ; // error var y = 1; diff --git a/tests/baselines/reference/enumMerging.js b/tests/baselines/reference/enumMerging.js index c3fa7fffeb30e..5972c2396294b 100644 --- a/tests/baselines/reference/enumMerging.js +++ b/tests/baselines/reference/enumMerging.js @@ -69,101 +69,101 @@ module M6 { //// [enumMerging.js] // Enum with only constant members across 2 declarations with the same root module // Enum with initializer in all declarations with constant members with the same root module -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { - var EImpl1; + var EImpl1 = EImpl1 || (EImpl1 = {}); (function (EImpl1) { EImpl1[EImpl1["A"] = 0] = "A"; EImpl1[EImpl1["B"] = 1] = "B"; EImpl1[EImpl1["C"] = 2] = "C"; - })(EImpl1 || (EImpl1 = {})); + })(EImpl1); (function (EImpl1) { EImpl1[EImpl1["D"] = 1] = "D"; EImpl1[EImpl1["E"] = 2] = "E"; EImpl1[EImpl1["F"] = 3] = "F"; - })(EImpl1 || (EImpl1 = {})); - var EConst1; + })(EImpl1); + var EConst1 = M1.EConst1 || (M1.EConst1 = {}); (function (EConst1) { EConst1[EConst1["A"] = 3] = "A"; EConst1[EConst1["B"] = 2] = "B"; EConst1[EConst1["C"] = 1] = "C"; - })(EConst1 = M1.EConst1 || (M1.EConst1 = {})); + })(EConst1); (function (EConst1) { EConst1[EConst1["D"] = 7] = "D"; EConst1[EConst1["E"] = 9] = "E"; EConst1[EConst1["F"] = 8] = "F"; - })(EConst1 = M1.EConst1 || (M1.EConst1 = {})); + })(EConst1); var x = [EConst1.A, EConst1.B, EConst1.C, EConst1.D, EConst1.E, EConst1.F]; -})(M1 || (M1 = {})); +})(M1); // Enum with only computed members across 2 declarations with the same root module -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { - var EComp2; + var EComp2 = M2.EComp2 || (M2.EComp2 = {}); (function (EComp2) { EComp2[EComp2["A"] = 'foo'.length] = "A"; EComp2[EComp2["B"] = 'foo'.length] = "B"; EComp2[EComp2["C"] = 'foo'.length] = "C"; - })(EComp2 = M2.EComp2 || (M2.EComp2 = {})); + })(EComp2); (function (EComp2) { EComp2[EComp2["D"] = 'foo'.length] = "D"; EComp2[EComp2["E"] = 'foo'.length] = "E"; EComp2[EComp2["F"] = 'foo'.length] = "F"; - })(EComp2 = M2.EComp2 || (M2.EComp2 = {})); + })(EComp2); var x = [EComp2.A, EComp2.B, EComp2.C, EComp2.D, EComp2.E, EComp2.F]; -})(M2 || (M2 = {})); +})(M2); // Enum with initializer in only one of two declarations with constant members with the same root module -var M3; +var M3 = M3 || (M3 = {}); (function (M3) { - var EInit; + var EInit = EInit || (EInit = {}); (function (EInit) { EInit[EInit["A"] = 0] = "A"; EInit[EInit["B"] = 1] = "B"; - })(EInit || (EInit = {})); + })(EInit); (function (EInit) { EInit[EInit["C"] = 1] = "C"; EInit[EInit["D"] = 2] = "D"; EInit[EInit["E"] = 3] = "E"; - })(EInit || (EInit = {})); -})(M3 || (M3 = {})); + })(EInit); +})(M3); // Enums with same name but different root module -var M4; +var M4 = M4 || (M4 = {}); (function (M4) { - var Color; + var Color = M4.Color || (M4.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; Color[Color["Blue"] = 2] = "Blue"; - })(Color = M4.Color || (M4.Color = {})); -})(M4 || (M4 = {})); -var M5; + })(Color); +})(M4); +var M5 = M5 || (M5 = {}); (function (M5) { - var Color; + var Color = M5.Color || (M5.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; Color[Color["Blue"] = 2] = "Blue"; - })(Color = M5.Color || (M5.Color = {})); -})(M5 || (M5 = {})); -var M6; + })(Color); +})(M5); +var M6 = M6 || (M6 = {}); (function (M6) { - var A; + var A = M6.A || (M6.A = {}); (function (A) { - var Color; + var Color = A.Color || (A.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; Color[Color["Blue"] = 2] = "Blue"; - })(Color = A.Color || (A.Color = {})); - })(A = M6.A || (M6.A = {})); -})(M6 || (M6 = {})); + })(Color); + })(A); +})(M6); (function (M6) { - var A; + var A = M6.A || (M6.A = {}); (function (A) { - var Color; + var Color = A.Color || (A.Color = {}); (function (Color) { Color[Color["Yellow"] = 1] = "Yellow"; - })(Color = A.Color || (A.Color = {})); - })(A = M6.A || (M6.A = {})); + })(Color); + })(A); var t = A.Color.Yellow; t = A.Color.Red; -})(M6 || (M6 = {})); +})(M6); diff --git a/tests/baselines/reference/enumMergingErrors.js b/tests/baselines/reference/enumMergingErrors.js index 05482f48377d9..95ea56e1f74be 100644 --- a/tests/baselines/reference/enumMergingErrors.js +++ b/tests/baselines/reference/enumMergingErrors.js @@ -44,86 +44,86 @@ module M2 { //// [enumMergingErrors.js] // Enum with constant, computed, constant members split across 3 declarations with the same root module -var M; +var M = M || (M = {}); (function (M) { - var E1; + var E1 = M.E1 || (M.E1 = {}); (function (E1) { E1[E1["A"] = 0] = "A"; - })(E1 = M.E1 || (M.E1 = {})); - var E2; + })(E1); + var E2 = M.E2 || (M.E2 = {}); (function (E2) { E2[E2["C"] = 0] = "C"; - })(E2 = M.E2 || (M.E2 = {})); - var E3; + })(E2); + var E3 = M.E3 || (M.E3 = {}); (function (E3) { E3[E3["A"] = 0] = "A"; - })(E3 = M.E3 || (M.E3 = {})); -})(M || (M = {})); + })(E3); +})(M); (function (M) { - var E1; + var E1 = M.E1 || (M.E1 = {}); (function (E1) { E1[E1["B"] = 'foo'.length] = "B"; - })(E1 = M.E1 || (M.E1 = {})); - var E2; + })(E1); + var E2 = M.E2 || (M.E2 = {}); (function (E2) { E2[E2["B"] = 'foo'.length] = "B"; - })(E2 = M.E2 || (M.E2 = {})); - var E3; + })(E2); + var E3 = M.E3 || (M.E3 = {}); (function (E3) { E3[E3["C"] = 0] = "C"; - })(E3 = M.E3 || (M.E3 = {})); -})(M || (M = {})); + })(E3); +})(M); (function (M) { - var E1; + var E1 = M.E1 || (M.E1 = {}); (function (E1) { E1[E1["C"] = 0] = "C"; - })(E1 = M.E1 || (M.E1 = {})); - var E2; + })(E1); + var E2 = M.E2 || (M.E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; - })(E2 = M.E2 || (M.E2 = {})); - var E3; + })(E2); + var E3 = M.E3 || (M.E3 = {}); (function (E3) { E3[E3["B"] = 'foo'.length] = "B"; - })(E3 = M.E3 || (M.E3 = {})); -})(M || (M = {})); + })(E3); +})(M); // Enum with no initializer in either declaration with constant members with the same root module -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { - var E1; + var E1 = M1.E1 || (M1.E1 = {}); (function (E1) { E1[E1["A"] = 0] = "A"; - })(E1 = M1.E1 || (M1.E1 = {})); -})(M1 || (M1 = {})); + })(E1); +})(M1); (function (M1) { - var E1; + var E1 = M1.E1 || (M1.E1 = {}); (function (E1) { E1[E1["B"] = 0] = "B"; - })(E1 = M1.E1 || (M1.E1 = {})); -})(M1 || (M1 = {})); + })(E1); +})(M1); (function (M1) { - var E1; + var E1 = M1.E1 || (M1.E1 = {}); (function (E1) { E1[E1["C"] = 0] = "C"; - })(E1 = M1.E1 || (M1.E1 = {})); -})(M1 || (M1 = {})); + })(E1); +})(M1); // Enum with initializer in only one of three declarations with constant members with the same root module -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { - var E1; + var E1 = M2.E1 || (M2.E1 = {}); (function (E1) { E1[E1["A"] = 0] = "A"; - })(E1 = M2.E1 || (M2.E1 = {})); -})(M2 || (M2 = {})); + })(E1); +})(M2); (function (M2) { - var E1; + var E1 = M2.E1 || (M2.E1 = {}); (function (E1) { E1[E1["B"] = 0] = "B"; - })(E1 = M2.E1 || (M2.E1 = {})); -})(M2 || (M2 = {})); + })(E1); +})(M2); (function (M2) { - var E1; + var E1 = M2.E1 || (M2.E1 = {}); (function (E1) { E1[E1["C"] = 0] = "C"; - })(E1 = M2.E1 || (M2.E1 = {})); -})(M2 || (M2 = {})); + })(E1); +})(M2); diff --git a/tests/baselines/reference/enumNegativeLiteral1.js b/tests/baselines/reference/enumNegativeLiteral1.js index 39b03acb7265f..1e5074d3ecd58 100644 --- a/tests/baselines/reference/enumNegativeLiteral1.js +++ b/tests/baselines/reference/enumNegativeLiteral1.js @@ -5,9 +5,9 @@ enum E { //// [enumNegativeLiteral1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = -5] = "a"; E[E["b"] = -4] = "b"; E[E["c"] = -3] = "c"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumNumbering1.js b/tests/baselines/reference/enumNumbering1.js index f5b09d10f4074..a251564886422 100644 --- a/tests/baselines/reference/enumNumbering1.js +++ b/tests/baselines/reference/enumNumbering1.js @@ -9,11 +9,11 @@ enum Test { //// [enumNumbering1.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { Test[Test["A"] = 0] = "A"; Test[Test["B"] = 1] = "B"; Test[Test["C"] = Math.floor(Math.random() * 1000)] = "C"; Test[Test["D"] = 10] = "D"; Test[Test["E"] = 11] = "E"; // Error but shouldn't be -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/enumOperations.js b/tests/baselines/reference/enumOperations.js index 96d9ace576c08..d410f3b1a7867 100644 --- a/tests/baselines/reference/enumOperations.js +++ b/tests/baselines/reference/enumOperations.js @@ -17,10 +17,10 @@ enumType >>>anyType; //// [enumOperations.js] -var Enum; +var Enum = Enum || (Enum = {}); (function (Enum) { Enum[Enum["None"] = 0] = "None"; -})(Enum || (Enum = {})); +})(Enum); var enumType = Enum.None; var numberType = 0; var anyType = 0; diff --git a/tests/baselines/reference/enumPropertyAccess.js b/tests/baselines/reference/enumPropertyAccess.js index 1ac82b0a3de27..f72e63f65c487 100644 --- a/tests/baselines/reference/enumPropertyAccess.js +++ b/tests/baselines/reference/enumPropertyAccess.js @@ -15,11 +15,11 @@ function fill(f: B) { } //// [enumPropertyAccess.js] -var Colors; +var Colors = Colors || (Colors = {}); (function (Colors) { Colors[Colors["Red"] = 0] = "Red"; Colors[Colors["Green"] = 1] = "Green"; -})(Colors || (Colors = {})); +})(Colors); var x = Colors.Red; // type of 'x' should be 'Colors' var p = x.Green; // error x.toFixed(); // ok diff --git a/tests/baselines/reference/enumUsedBeforeDeclaration.js b/tests/baselines/reference/enumUsedBeforeDeclaration.js index 63fc38471b27e..4d161bc786bd6 100644 --- a/tests/baselines/reference/enumUsedBeforeDeclaration.js +++ b/tests/baselines/reference/enumUsedBeforeDeclaration.js @@ -9,9 +9,9 @@ const enum ConstColor { Red, Green, Blue } //// [enumUsedBeforeDeclaration.js] var v = Color.Green; var v2 = 1 /* Green */; -var Color; +var Color = Color || (Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; Color[Color["Blue"] = 2] = "Blue"; -})(Color || (Color = {})); +})(Color); diff --git a/tests/baselines/reference/enumWithComputedMember.js b/tests/baselines/reference/enumWithComputedMember.js index ca4bfac7adb58..2db7e18c8826b 100644 --- a/tests/baselines/reference/enumWithComputedMember.js +++ b/tests/baselines/reference/enumWithComputedMember.js @@ -7,9 +7,9 @@ enum A { //// [enumWithComputedMember.js] -var A; +var A = A || (A = {}); (function (A) { A[A["X"] = "".length] = "X"; A[A["Y"] = A.X] = "Y"; A[A["Z"] = void 0] = "Z"; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/enumWithInfinityProperty.js b/tests/baselines/reference/enumWithInfinityProperty.js index 2ab45fbd9bec1..3860d4f3b20ae 100644 --- a/tests/baselines/reference/enumWithInfinityProperty.js +++ b/tests/baselines/reference/enumWithInfinityProperty.js @@ -5,7 +5,7 @@ enum A { //// [enumWithInfinityProperty.js] -var A; +var A = A || (A = {}); (function (A) { A[A["Infinity"] = 1] = "Infinity"; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/enumWithNaNProperty.js b/tests/baselines/reference/enumWithNaNProperty.js index ad3e5f3a7f210..5e037e14c4413 100644 --- a/tests/baselines/reference/enumWithNaNProperty.js +++ b/tests/baselines/reference/enumWithNaNProperty.js @@ -5,7 +5,7 @@ enum A { //// [enumWithNaNProperty.js] -var A; +var A = A || (A = {}); (function (A) { A[A["NaN"] = 1] = "NaN"; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/enumWithNegativeInfinityProperty.js b/tests/baselines/reference/enumWithNegativeInfinityProperty.js index 867545fb14aa9..7f24c7aac859f 100644 --- a/tests/baselines/reference/enumWithNegativeInfinityProperty.js +++ b/tests/baselines/reference/enumWithNegativeInfinityProperty.js @@ -5,7 +5,7 @@ enum A { //// [enumWithNegativeInfinityProperty.js] -var A; +var A = A || (A = {}); (function (A) { A[A["-Infinity"] = 1] = "-Infinity"; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/enumWithParenthesizedInitializer1.js b/tests/baselines/reference/enumWithParenthesizedInitializer1.js index f81af2c4dda62..0788352bd3ee7 100644 --- a/tests/baselines/reference/enumWithParenthesizedInitializer1.js +++ b/tests/baselines/reference/enumWithParenthesizedInitializer1.js @@ -4,7 +4,7 @@ enum E { } //// [enumWithParenthesizedInitializer1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["e"] = -3] = "e"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumWithPrimitiveName.js b/tests/baselines/reference/enumWithPrimitiveName.js index 4b894b58a803f..08eddc41d87c2 100644 --- a/tests/baselines/reference/enumWithPrimitiveName.js +++ b/tests/baselines/reference/enumWithPrimitiveName.js @@ -4,12 +4,12 @@ enum number { } enum any { } //// [enumWithPrimitiveName.js] -var string; +var string = string || (string = {}); (function (string) { -})(string || (string = {})); -var number; +})(string); +var number = number || (number = {}); (function (number) { -})(number || (number = {})); -var any; +})(number); +var any = any || (any = {}); (function (any) { -})(any || (any = {})); +})(any); diff --git a/tests/baselines/reference/enumWithQuotedElementName1.js b/tests/baselines/reference/enumWithQuotedElementName1.js index 8f945e07cee57..2d681402bcdf0 100644 --- a/tests/baselines/reference/enumWithQuotedElementName1.js +++ b/tests/baselines/reference/enumWithQuotedElementName1.js @@ -4,7 +4,7 @@ enum E { } //// [enumWithQuotedElementName1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["fo\"o"] = 0] = "fo\"o"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumWithQuotedElementName2.js b/tests/baselines/reference/enumWithQuotedElementName2.js index 8490c2b763fb5..cdb6fb9a2e364 100644 --- a/tests/baselines/reference/enumWithQuotedElementName2.js +++ b/tests/baselines/reference/enumWithQuotedElementName2.js @@ -4,7 +4,7 @@ enum E { } //// [enumWithQuotedElementName2.js] -var E; +var E = E || (E = {}); (function (E) { E[E["fo'o"] = 0] = "fo'o"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumWithUnicodeEscape1.js b/tests/baselines/reference/enumWithUnicodeEscape1.js index 68116bd1c126c..f2306c5ccf002 100644 --- a/tests/baselines/reference/enumWithUnicodeEscape1.js +++ b/tests/baselines/reference/enumWithUnicodeEscape1.js @@ -5,7 +5,7 @@ enum E { //// [enumWithUnicodeEscape1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["gold \u2730"] = 0] = "gold \u2730"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumWithoutInitializerAfterComputedMember.js b/tests/baselines/reference/enumWithoutInitializerAfterComputedMember.js index 8d203e9fd71ae..85265ffa285cc 100644 --- a/tests/baselines/reference/enumWithoutInitializerAfterComputedMember.js +++ b/tests/baselines/reference/enumWithoutInitializerAfterComputedMember.js @@ -6,9 +6,9 @@ enum E { } //// [enumWithoutInitializerAfterComputedMember.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 0] = "b"; E[E["c"] = 1] = "c"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations1.js b/tests/baselines/reference/enumsWithMultipleDeclarations1.js index 67bca48db5316..ea7be1965fe96 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations1.js +++ b/tests/baselines/reference/enumsWithMultipleDeclarations1.js @@ -12,13 +12,13 @@ enum E { } //// [enumsWithMultipleDeclarations1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); (function (E) { E[E["B"] = 0] = "B"; -})(E || (E = {})); +})(E); (function (E) { E[E["C"] = 0] = "C"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations2.js b/tests/baselines/reference/enumsWithMultipleDeclarations2.js index 55cab82bbc575..630c11baee2c3 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations2.js +++ b/tests/baselines/reference/enumsWithMultipleDeclarations2.js @@ -12,13 +12,13 @@ enum E { } //// [enumsWithMultipleDeclarations2.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); (function (E) { E[E["B"] = 1] = "B"; -})(E || (E = {})); +})(E); (function (E) { E[E["C"] = 0] = "C"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.js b/tests/baselines/reference/enumsWithMultipleDeclarations3.js index b6ff6da451ba7..c5464589f106a 100644 --- a/tests/baselines/reference/enumsWithMultipleDeclarations3.js +++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.js @@ -7,7 +7,7 @@ enum E { } //// [enumsWithMultipleDeclarations3.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.js b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.js index 78e65bca40007..ae6f513f6da28 100644 --- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.js +++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType01.js @@ -45,12 +45,12 @@ namespace Test5 { import lol = Test5.Foo. //// [errorForUsingPropertyOfTypeAsType01.js] -var Test1; +var Test1 = Test1 || (Test1 = {}); (function (Test1) { var x = ""; var y = ""; -})(Test1 || (Test1 = {})); -var Test2; +})(Test1); +var Test2 = Test2 || (Test2 = {}); (function (Test2) { var Foo = /** @class */ (function () { function Foo() { @@ -60,20 +60,20 @@ var Test2; Test2.Foo = Foo; var x = ""; var y = ""; -})(Test2 || (Test2 = {})); -var Test3; +})(Test2); +var Test3 = Test3 || (Test3 = {}); (function (Test3) { var x = ""; var y = ""; -})(Test3 || (Test3 = {})); -var Test4; +})(Test3); +var Test4 = Test4 || (Test4 = {}); (function (Test4) { var x = ""; var y = ""; -})(Test4 || (Test4 = {})); -var Test5; +})(Test4); +var Test5 = Test5 || (Test5 = {}); (function (Test5) { var x = ""; var y = ""; -})(Test5 || (Test5 = {})); +})(Test5); var lol = Test5.Foo.; diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.js b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.js index d621a89cbf24e..e437b82c2bfe0 100644 --- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.js +++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType02.js @@ -6,9 +6,9 @@ namespace Test1 { } //// [errorForUsingPropertyOfTypeAsType02.js] -var Test1; +var Test1 = Test1 || (Test1 = {}); (function (Test1) { function foo(x) { var a = x.abc; } -})(Test1 || (Test1 = {})); +})(Test1); diff --git a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.js b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.js index d433563086099..d59ee59f69c4f 100644 --- a/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.js +++ b/tests/baselines/reference/errorForUsingPropertyOfTypeAsType03.js @@ -27,14 +27,14 @@ namespace Test1 { } //// [errorForUsingPropertyOfTypeAsType03.js] -var Test1; +var Test1 = Test1 || (Test1 = {}); (function (Test1) { - var Color; + var Color = Color || (Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; Color[Color["Blue"] = 2] = "Blue"; - })(Color || (Color = {})); + })(Color); var a1; var a2; var a3; @@ -47,4 +47,4 @@ var Test1; var d1; var d2; var d3; -})(Test1 || (Test1 = {})); +})(Test1); diff --git a/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.js b/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.js index b4bcec70e7c8f..fb4c6f4fffdc9 100644 --- a/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.js +++ b/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.js @@ -10,17 +10,17 @@ namespace A { } //// [errorRecoveryWithDotFollowedByNamespaceKeyword.js] -var A; +var A = A || (A = {}); (function (A) { function foo() { if (true) { B. ; - var B = void 0; + var B = B || (B = {}); (function (B) { function baz() { } B.baz = baz; - })(B || (B = {})); + })(B); } } -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/es3-oldStyleOctalLiteralInEnums.js b/tests/baselines/reference/es3-oldStyleOctalLiteralInEnums.js index 0098d841f2ae5..e1448db725afc 100644 --- a/tests/baselines/reference/es3-oldStyleOctalLiteralInEnums.js +++ b/tests/baselines/reference/es3-oldStyleOctalLiteralInEnums.js @@ -5,8 +5,8 @@ enum E { } //// [es3-oldStyleOctalLiteralInEnums.js] -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = -1] = "x"; E[E["y"] = 2] = "y"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/es5-oldStyleOctalLiteralInEnums.js b/tests/baselines/reference/es5-oldStyleOctalLiteralInEnums.js index 71f718054fe5a..e5fe4f8e1d9e1 100644 --- a/tests/baselines/reference/es5-oldStyleOctalLiteralInEnums.js +++ b/tests/baselines/reference/es5-oldStyleOctalLiteralInEnums.js @@ -5,8 +5,8 @@ enum E { } //// [es5-oldStyleOctalLiteralInEnums.js] -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = -1] = "x"; E[E["y"] = 2] = "y"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js index 88b9c1b22ca89..35088dde379cd 100644 --- a/tests/baselines/reference/es5ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js @@ -39,7 +39,7 @@ import M3 from "M3"; define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - var M; + var M = {}; (function (M) { // variable M.M_V = 0; @@ -51,18 +51,18 @@ define(["require", "exports"], function (require, exports) { }()); M.M_C = M_C; // instantiated module - var M_M; + var M_M = M.M_M || (M.M_M = {}); (function (M_M) { var x; - })(M_M = M.M_M || (M.M_M = {})); + })(M_M); // function function M_F() { } M.M_F = M_F; // enum - var M_E; + var M_E = M.M_E || (M.M_E = {}); (function (M_E) { - })(M_E = M.M_E || (M.M_E = {})); + })(M_E); // alias M.M_A = M_M; - })(M = exports.M || (exports.M = {})); + })(M); }); diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js index 833aca18fdc8e..361ec2600c085 100644 --- a/tests/baselines/reference/es6ClassTest3.js +++ b/tests/baselines/reference/es6ClassTest3.js @@ -15,7 +15,7 @@ module M { } //// [es6ClassTest3.js] -var M; +var M = M || (M = {}); (function (M) { var Visibility = /** @class */ (function () { function Visibility() { @@ -28,4 +28,4 @@ var M; ; return Visibility; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/es6ExportAll.js b/tests/baselines/reference/es6ExportAll.js index 9149bcfa2e7b8..b0e59483b5bd8 100644 --- a/tests/baselines/reference/es6ExportAll.js +++ b/tests/baselines/reference/es6ExportAll.js @@ -18,10 +18,11 @@ export * from "server"; //// [server.js] export class c { } -export var m; +export const m = {}; +export { m }; (function (m) { m.x = 10; -})(m || (m = {})); +})(m); export var x = 10; //// [client.js] export * from "server"; diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index ee949682f625d..af5559b1837ff 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -24,10 +24,10 @@ var c = /** @class */ (function () { return c; }()); exports.c = c; -var m; +var m = {}; (function (m) { m.x = 10; -})(m = exports.m || (exports.m = {})); +})(m); exports.x = 10; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6ExportClause.js b/tests/baselines/reference/es6ExportClause.js index 3c4a17f3812a2..02e0c7c063e1f 100644 --- a/tests/baselines/reference/es6ExportClause.js +++ b/tests/baselines/reference/es6ExportClause.js @@ -18,10 +18,10 @@ export { x }; //// [server.js] class c { } -var m; +const m = {}; (function (m) { m.x = 10; -})(m || (m = {})); +})(m); var x = 10; export { c }; export { c as c2 }; diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index 447bb8c5f14cb..ce4c5874e974e 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -25,11 +25,11 @@ var c = /** @class */ (function () { }()); exports.c = c; exports.c2 = c; -var m; +var m = {}; +exports.instantiatedModule = m; (function (m) { m.x = 10; -})(m || (m = {})); -exports.instantiatedModule = m; +})(m); var x = 10; exports.x = x; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js index 9fda5910fccc1..23f8baaa5333f 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js @@ -22,10 +22,11 @@ export { x } from "server"; //// [server.js] export class c { } -export var m; +export const m = {}; +export { m }; (function (m) { m.x = 10; -})(m || (m = {})); +})(m); export var x = 10; //// [client.js] export { c } from "server"; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 00e5f73f0fdde..36df59615b7c3 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -28,10 +28,10 @@ var c = /** @class */ (function () { return c; }()); exports.c = c; -var m; +var m = {}; (function (m) { m.x = 10; -})(m = exports.m || (exports.m = {})); +})(m); exports.x = 10; //// [client.js] "use strict"; diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index 8f6448ff59977..6a06e383fae51 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -14,7 +14,7 @@ export = x; //// [es6ImportNamedImportInIndirectExportAssignment_0.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { var c = /** @class */ (function () { function c() { @@ -22,7 +22,7 @@ var a; return c; }()); a.c = c; -})(a = exports.a || (exports.a = {})); +})(a); //// [es6ImportNamedImportInIndirectExportAssignment_1.js] "use strict"; var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0"); diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.js b/tests/baselines/reference/es6ModuleClassDeclaration.js index a228739abbfb7..91e77f038ad9c 100644 --- a/tests/baselines/reference/es6ModuleClassDeclaration.js +++ b/tests/baselines/reference/es6ModuleClassDeclaration.js @@ -147,7 +147,8 @@ c2.k = 20; c2.l = 30; new c(); new c2(); -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { class c3 { constructor() { @@ -186,8 +187,8 @@ export var m1; new c2(); new c3(); new c4(); -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { class c3 { constructor() { @@ -227,4 +228,4 @@ var m2; new c3(); new c4(); new m1.c3(); -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleConst.js b/tests/baselines/reference/es6ModuleConst.js index 117bf0fb4d0d2..3ff879b03a9ed 100644 --- a/tests/baselines/reference/es6ModuleConst.js +++ b/tests/baselines/reference/es6ModuleConst.js @@ -21,17 +21,18 @@ export const a = "hello"; export const x = a, y = x; const b = y; const c = b, d = c; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { m1.k = a; m1.l = b, m1.m = m1.k; const n = m1.k; const o = n, p = m1.k; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { m2.k = a; m2.l = b, m2.m = m2.k; const n = m1.k; const o = n, p = m2.k; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration.js b/tests/baselines/reference/es6ModuleConstEnumDeclaration.js index 1900db57b6037..6116bba2efc3f 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration.js +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration.js @@ -48,18 +48,19 @@ module m2 { //// [es6ModuleConstEnumDeclaration.js] var x = 0 /* a */; var y = 0 /* x */; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { var x1 = 0 /* a */; var y1 = 0 /* x */; var x2 = 0 /* a */; var y2 = 0 /* x */; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { var x1 = 0 /* a */; var y1 = 0 /* x */; var x2 = 0 /* a */; var y2 = 0 /* x */; var x3 = 0 /* a */; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js index 5fb31067e338b..473c03f08e218 100644 --- a/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js +++ b/tests/baselines/reference/es6ModuleConstEnumDeclaration2.js @@ -46,56 +46,58 @@ module m2 { } //// [es6ModuleConstEnumDeclaration2.js] -export var e1; +export const e1 = {}; +export { e1 }; (function (e1) { e1[e1["a"] = 0] = "a"; e1[e1["b"] = 1] = "b"; e1[e1["c"] = 2] = "c"; -})(e1 || (e1 = {})); -var e2; +})(e1); +const e2 = {}; (function (e2) { e2[e2["x"] = 0] = "x"; e2[e2["y"] = 1] = "y"; e2[e2["z"] = 2] = "z"; -})(e2 || (e2 = {})); +})(e2); var x = 0 /* a */; var y = 0 /* x */; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { - let e3; + const e3 = m1.e3 || (m1.e3 = {}); (function (e3) { e3[e3["a"] = 0] = "a"; e3[e3["b"] = 1] = "b"; e3[e3["c"] = 2] = "c"; - })(e3 = m1.e3 || (m1.e3 = {})); - let e4; + })(e3); + const e4 = e4 || (e4 = {}); (function (e4) { e4[e4["x"] = 0] = "x"; e4[e4["y"] = 1] = "y"; e4[e4["z"] = 2] = "z"; - })(e4 || (e4 = {})); + })(e4); var x1 = 0 /* a */; var y1 = 0 /* x */; var x2 = 0 /* a */; var y2 = 0 /* x */; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { - let e5; + const e5 = m2.e5 || (m2.e5 = {}); (function (e5) { e5[e5["a"] = 0] = "a"; e5[e5["b"] = 1] = "b"; e5[e5["c"] = 2] = "c"; - })(e5 = m2.e5 || (m2.e5 = {})); - let e6; + })(e5); + const e6 = e6 || (e6 = {}); (function (e6) { e6[e6["x"] = 0] = "x"; e6[e6["y"] = 1] = "y"; e6[e6["z"] = 2] = "z"; - })(e6 || (e6 = {})); + })(e6); var x1 = 0 /* a */; var y1 = 0 /* x */; var x2 = 0 /* a */; var y2 = 0 /* x */; var x3 = 0 /* a */; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleEnumDeclaration.js b/tests/baselines/reference/es6ModuleEnumDeclaration.js index 92a6f436c829a..f9ac0e3597fd0 100644 --- a/tests/baselines/reference/es6ModuleEnumDeclaration.js +++ b/tests/baselines/reference/es6ModuleEnumDeclaration.js @@ -46,56 +46,58 @@ module m2 { } //// [es6ModuleEnumDeclaration.js] -export var e1; +export const e1 = {}; +export { e1 }; (function (e1) { e1[e1["a"] = 0] = "a"; e1[e1["b"] = 1] = "b"; e1[e1["c"] = 2] = "c"; -})(e1 || (e1 = {})); -var e2; +})(e1); +const e2 = {}; (function (e2) { e2[e2["x"] = 0] = "x"; e2[e2["y"] = 1] = "y"; e2[e2["z"] = 2] = "z"; -})(e2 || (e2 = {})); +})(e2); var x = e1.a; var y = e2.x; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { - let e3; + const e3 = m1.e3 || (m1.e3 = {}); (function (e3) { e3[e3["a"] = 0] = "a"; e3[e3["b"] = 1] = "b"; e3[e3["c"] = 2] = "c"; - })(e3 = m1.e3 || (m1.e3 = {})); - let e4; + })(e3); + const e4 = e4 || (e4 = {}); (function (e4) { e4[e4["x"] = 0] = "x"; e4[e4["y"] = 1] = "y"; e4[e4["z"] = 2] = "z"; - })(e4 || (e4 = {})); + })(e4); var x1 = e1.a; var y1 = e2.x; var x2 = e3.a; var y2 = e4.x; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { - let e5; + const e5 = m2.e5 || (m2.e5 = {}); (function (e5) { e5[e5["a"] = 0] = "a"; e5[e5["b"] = 1] = "b"; e5[e5["c"] = 2] = "c"; - })(e5 = m2.e5 || (m2.e5 = {})); - let e6; + })(e5); + const e6 = e6 || (e6 = {}); (function (e6) { e6[e6["x"] = 0] = "x"; e6[e6["y"] = 1] = "y"; e6[e6["z"] = 2] = "z"; - })(e6 || (e6 = {})); + })(e6); var x1 = e1.a; var y1 = e2.x; var x2 = e5.a; var y2 = e6.x; var x3 = m1.e3.a; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleFunctionDeclaration.js b/tests/baselines/reference/es6ModuleFunctionDeclaration.js index 1305d0a4e1904..664987d1fefc1 100644 --- a/tests/baselines/reference/es6ModuleFunctionDeclaration.js +++ b/tests/baselines/reference/es6ModuleFunctionDeclaration.js @@ -35,7 +35,8 @@ function foo2() { } foo(); foo2(); -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { function foo3() { } @@ -46,8 +47,8 @@ export var m1; foo2(); foo3(); foo4(); -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { function foo3() { } @@ -59,4 +60,4 @@ var m2; foo3(); foo4(); m1.foo3(); -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleInternalImport.js b/tests/baselines/reference/es6ModuleInternalImport.js index 3f28ddb2b6095..b517b4379086c 100644 --- a/tests/baselines/reference/es6ModuleInternalImport.js +++ b/tests/baselines/reference/es6ModuleInternalImport.js @@ -20,25 +20,27 @@ module m2 { } //// [es6ModuleInternalImport.js] -export var m; +export const m = {}; +export { m }; (function (m) { m.a = 10; -})(m || (m = {})); +})(m); export var a1 = m.a; var a2 = m.a; var x = a1 + a2; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { m1.a3 = m.a; var a4 = m.a; var x = a1 + a2; var x2 = m1.a3 + a4; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { m2.a3 = m.a; var a4 = m.a; var x = a1 + a2; var x2 = m2.a3 + a4; var x4 = m1.a3 + m2.a3; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports.js b/tests/baselines/reference/es6ModuleInternalNamedImports.js index 1b8e2eea7b12d..8190f8e880fbe 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports.js +++ b/tests/baselines/reference/es6ModuleInternalNamedImports.js @@ -32,7 +32,8 @@ export module M { //// [es6ModuleInternalNamedImports.js] -export var M; +export const M = {}; +export { M }; (function (M) { // variable M.M_V = 0; @@ -41,17 +42,17 @@ export var M; } M.M_C = M_C; // instantiated module - let M_M; + const M_M = M.M_M || (M.M_M = {}); (function (M_M) { var x; - })(M_M = M.M_M || (M.M_M = {})); + })(M_M); // function function M_F() { } M.M_F = M_F; // enum - let M_E; + const M_E = M.M_E || (M.M_E = {}); (function (M_E) { - })(M_E = M.M_E || (M.M_E = {})); + })(M_E); // alias M.M_A = M_M; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.js b/tests/baselines/reference/es6ModuleInternalNamedImports2.js index 762d8f1d9d0bf..0fa1d2dcc7a76 100644 --- a/tests/baselines/reference/es6ModuleInternalNamedImports2.js +++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.js @@ -34,7 +34,8 @@ export module M { //// [es6ModuleInternalNamedImports2.js] -export var M; +export const M = {}; +export { M }; (function (M) { // variable M.M_V = 0; @@ -43,19 +44,19 @@ export var M; } M.M_C = M_C; // instantiated module - let M_M; + const M_M = M.M_M || (M.M_M = {}); (function (M_M) { var x; - })(M_M = M.M_M || (M.M_M = {})); + })(M_M); // function function M_F() { } M.M_F = M_F; // enum - let M_E; + const M_E = M.M_E || (M.M_E = {}); (function (M_E) { - })(M_E = M.M_E || (M.M_E = {})); + })(M_E); // alias M.M_A = M_M; -})(M || (M = {})); +})(M); (function (M) { -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/es6ModuleLet.js b/tests/baselines/reference/es6ModuleLet.js index 29d2a73bcf19d..53205f31ab996 100644 --- a/tests/baselines/reference/es6ModuleLet.js +++ b/tests/baselines/reference/es6ModuleLet.js @@ -21,17 +21,18 @@ export let a = "hello"; export let x = a, y = x; let b = y; let c = b, d = c; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { m1.k = a; m1.l = b, m1.m = m1.k; let n = m1.k; let o = n, p = m1.k; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { m2.k = a; m2.l = b, m2.m = m2.k; let n = m1.k; let o = n, p = m2.k; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6ModuleModuleDeclaration.js b/tests/baselines/reference/es6ModuleModuleDeclaration.js index 813c0fd4274ca..931e86bf68a42 100644 --- a/tests/baselines/reference/es6ModuleModuleDeclaration.js +++ b/tests/baselines/reference/es6ModuleModuleDeclaration.js @@ -25,33 +25,34 @@ module m2 { } //// [es6ModuleModuleDeclaration.js] -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { m1.a = 10; var b = 10; - let innerExportedModule; + const innerExportedModule = m1.innerExportedModule || (m1.innerExportedModule = {}); (function (innerExportedModule) { innerExportedModule.k = 10; var l = 10; - })(innerExportedModule = m1.innerExportedModule || (m1.innerExportedModule = {})); - let innerNonExportedModule; + })(innerExportedModule); + const innerNonExportedModule = m1.innerNonExportedModule || (m1.innerNonExportedModule = {}); (function (innerNonExportedModule) { innerNonExportedModule.x = 10; var y = 10; - })(innerNonExportedModule = m1.innerNonExportedModule || (m1.innerNonExportedModule = {})); -})(m1 || (m1 = {})); -var m2; + })(innerNonExportedModule); +})(m1); +const m2 = {}; (function (m2) { m2.a = 10; var b = 10; - let innerExportedModule; + const innerExportedModule = m2.innerExportedModule || (m2.innerExportedModule = {}); (function (innerExportedModule) { innerExportedModule.k = 10; var l = 10; - })(innerExportedModule = m2.innerExportedModule || (m2.innerExportedModule = {})); - let innerNonExportedModule; + })(innerExportedModule); + const innerNonExportedModule = m2.innerNonExportedModule || (m2.innerNonExportedModule = {}); (function (innerNonExportedModule) { innerNonExportedModule.x = 10; var y = 10; - })(innerNonExportedModule = m2.innerNonExportedModule || (m2.innerNonExportedModule = {})); -})(m2 || (m2 = {})); + })(innerNonExportedModule); +})(m2); diff --git a/tests/baselines/reference/es6ModuleVariableStatement.js b/tests/baselines/reference/es6ModuleVariableStatement.js index 50c9c3fb4a84b..b645bf69381d6 100644 --- a/tests/baselines/reference/es6ModuleVariableStatement.js +++ b/tests/baselines/reference/es6ModuleVariableStatement.js @@ -21,17 +21,18 @@ export var a = "hello"; export var x = a, y = x; var b = y; var c = b, d = c; -export var m1; +export const m1 = {}; +export { m1 }; (function (m1) { m1.k = a; m1.l = b, m1.m = m1.k; var n = m1.k; var o = n, p = m1.k; -})(m1 || (m1 = {})); -var m2; +})(m1); +const m2 = {}; (function (m2) { m2.k = a; m2.l = b, m2.m = m2.k; var n = m1.k; var o = n, p = m2.k; -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/es6modulekindWithES5Target12.js b/tests/baselines/reference/es6modulekindWithES5Target12.js index a0aafcae25e0a..b242d9a22937d 100644 --- a/tests/baselines/reference/es6modulekindWithES5Target12.js +++ b/tests/baselines/reference/es6modulekindWithES5Target12.js @@ -45,26 +45,28 @@ var C = /** @class */ (function () { export { C }; (function (C) { C.x = 1; -})(C || (C = {})); -export var E; +})(C); +export var E = {}; +export { E }; (function (E) { E[E["w"] = 1] = "w"; -})(E || (E = {})); +})(E); (function (E) { E[E["x"] = 2] = "x"; -})(E || (E = {})); +})(E); (function (E) { E.y = 1; -})(E || (E = {})); +})(E); (function (E) { E.z = 1; -})(E || (E = {})); -export var N; +})(E); +export var N = {}; +export { N }; (function (N) { N.x = 1; -})(N || (N = {})); +})(N); export function F() { } (function (F) { F.x = 1; -})(F || (F = {})); +})(F); diff --git a/tests/baselines/reference/es6modulekindWithES5Target5.js b/tests/baselines/reference/es6modulekindWithES5Target5.js index 14cacaffe406c..dcd1f3cad9aaf 100644 --- a/tests/baselines/reference/es6modulekindWithES5Target5.js +++ b/tests/baselines/reference/es6modulekindWithES5Target5.js @@ -8,11 +8,13 @@ export const enum E2 { } //// [es6modulekindWithES5Target5.js] -export var E1; +export var E1 = {}; +export { E1 }; (function (E1) { E1[E1["value1"] = 0] = "value1"; -})(E1 || (E1 = {})); -export var E2; +})(E1); +export var E2 = {}; +export { E2 }; (function (E2) { E2[E2["value1"] = 0] = "value1"; -})(E2 || (E2 = {})); +})(E2); diff --git a/tests/baselines/reference/es6modulekindWithES5Target7.js b/tests/baselines/reference/es6modulekindWithES5Target7.js index 5d85c9263d486..989c19003e47d 100644 --- a/tests/baselines/reference/es6modulekindWithES5Target7.js +++ b/tests/baselines/reference/es6modulekindWithES5Target7.js @@ -9,7 +9,8 @@ export namespace N2 { //// [es6modulekindWithES5Target7.js] -export var N; +export var N = {}; +export { N }; (function (N) { var x = 0; -})(N || (N = {})); +})(N); diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js index 501ecccaa5efc..28b4742ea5289 100644 --- a/tests/baselines/reference/escapedIdentifiers.js +++ b/tests/baselines/reference/escapedIdentifiers.js @@ -138,12 +138,12 @@ var b = 1; b++; \u0062++; // modules -var moduleType1; +var moduleType1 = moduleType1 || (moduleType1 = {}); (function (moduleType1) { -})(moduleType1 || (moduleType1 = {})); -var moduleType\u0032; +})(moduleType1); +var moduleType\u0032 = moduleType\u0032 || (moduleType\u0032 = {}); (function (moduleType\u0032) { -})(moduleType\u0032 || (moduleType\u0032 = {})); +})(moduleType\u0032); moduleType1.baz1 = 3; moduleType\u0031.baz1 = 3; moduleType2.baz2 = 3; diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target12.js b/tests/baselines/reference/esnextmodulekindWithES5Target12.js index 72d85ba1450e8..b986a6dcece5d 100644 --- a/tests/baselines/reference/esnextmodulekindWithES5Target12.js +++ b/tests/baselines/reference/esnextmodulekindWithES5Target12.js @@ -45,26 +45,28 @@ var C = /** @class */ (function () { export { C }; (function (C) { C.x = 1; -})(C || (C = {})); -export var E; +})(C); +export var E = {}; +export { E }; (function (E) { E[E["w"] = 1] = "w"; -})(E || (E = {})); +})(E); (function (E) { E[E["x"] = 2] = "x"; -})(E || (E = {})); +})(E); (function (E) { E.y = 1; -})(E || (E = {})); +})(E); (function (E) { E.z = 1; -})(E || (E = {})); -export var N; +})(E); +export var N = {}; +export { N }; (function (N) { N.x = 1; -})(N || (N = {})); +})(N); export function F() { } (function (F) { F.x = 1; -})(F || (F = {})); +})(F); diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target5.js b/tests/baselines/reference/esnextmodulekindWithES5Target5.js index 178a6c366f8ea..a037e9450d41e 100644 --- a/tests/baselines/reference/esnextmodulekindWithES5Target5.js +++ b/tests/baselines/reference/esnextmodulekindWithES5Target5.js @@ -8,11 +8,13 @@ export const enum E2 { } //// [esnextmodulekindWithES5Target5.js] -export var E1; +export var E1 = {}; +export { E1 }; (function (E1) { E1[E1["value1"] = 0] = "value1"; -})(E1 || (E1 = {})); -export var E2; +})(E1); +export var E2 = {}; +export { E2 }; (function (E2) { E2[E2["value1"] = 0] = "value1"; -})(E2 || (E2 = {})); +})(E2); diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target7.js b/tests/baselines/reference/esnextmodulekindWithES5Target7.js index be9e6984f42c2..6064b1581387d 100644 --- a/tests/baselines/reference/esnextmodulekindWithES5Target7.js +++ b/tests/baselines/reference/esnextmodulekindWithES5Target7.js @@ -9,7 +9,8 @@ export namespace N2 { //// [esnextmodulekindWithES5Target7.js] -export var N; +export var N = {}; +export { N }; (function (N) { var x = 0; -})(N || (N = {})); +})(N); diff --git a/tests/baselines/reference/everyTypeAssignableToAny.js b/tests/baselines/reference/everyTypeAssignableToAny.js index fd71ec624be67..1545b9d3fb067 100644 --- a/tests/baselines/reference/everyTypeAssignableToAny.js +++ b/tests/baselines/reference/everyTypeAssignableToAny.js @@ -69,10 +69,10 @@ var C = /** @class */ (function () { }()); var ac; var ai; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var ae; var b; var c; diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js index 43cd673ab655c..dabbdd3a3d02e 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js @@ -60,7 +60,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -70,7 +70,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); var aNumber = 9.9; var aString = 'this is a string'; var aDate = new Date(12); diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js index c9f90f14195d0..30ffd396f21ca 100644 --- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js +++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js @@ -67,7 +67,7 @@ var D = /** @class */ (function () { }()); function F(x) { return 42; } function F2(x) { return x < 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -77,8 +77,8 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var A = /** @class */ (function () { function A() { @@ -88,7 +88,7 @@ var N; N.A = A; function F2(x) { return x.toString(); } N.F2 = F2; -})(N || (N = {})); +})(N); var aNumber = 'this is a string'; var aString = 9.9; var aDate = 9.9; diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js index 7e7bd6adc6e3f..6a28658144c70 100644 --- a/tests/baselines/reference/everyTypeWithInitializer.js +++ b/tests/baselines/reference/everyTypeWithInitializer.js @@ -61,7 +61,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -71,7 +71,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); var aNumber = 9.9; var aString = 'this is a string'; var aDate = new Date(12); diff --git a/tests/baselines/reference/exactSpellingSuggestion.js b/tests/baselines/reference/exactSpellingSuggestion.js index 7b71065061d41..d5daaa95fcbdf 100644 --- a/tests/baselines/reference/exactSpellingSuggestion.js +++ b/tests/baselines/reference/exactSpellingSuggestion.js @@ -13,10 +13,10 @@ U8.bit_2 //// [exactSpellingSuggestion.js] // Fixes #16245 -- always suggest the exact match, even when // other options are very close -var U8; +var U8 = U8 || (U8 = {}); (function (U8) { U8[U8["BIT_0"] = 1] = "BIT_0"; U8[U8["BIT_1"] = 2] = "BIT_1"; U8[U8["BIT_2"] = 4] = "BIT_2"; -})(U8 || (U8 = {})); +})(U8); U8.bit_2; diff --git a/tests/baselines/reference/exponentiationOperatorWithEnum.js b/tests/baselines/reference/exponentiationOperatorWithEnum.js index 8175ca30c9e2c..5b1791cfc4e31 100644 --- a/tests/baselines/reference/exponentiationOperatorWithEnum.js +++ b/tests/baselines/reference/exponentiationOperatorWithEnum.js @@ -26,11 +26,11 @@ var r12 = 1 ** E.b; //// [exponentiationOperatorWithEnum.js] // operands of an enum type are treated as having the primitive type Number. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/exponentiationOperatorWithEnumUnion.js b/tests/baselines/reference/exponentiationOperatorWithEnumUnion.js index 0493c9cdefd8a..be5acd2afe7ef 100644 --- a/tests/baselines/reference/exponentiationOperatorWithEnumUnion.js +++ b/tests/baselines/reference/exponentiationOperatorWithEnumUnion.js @@ -30,16 +30,16 @@ var r12 = 1 ** E.b; //// [exponentiationOperatorWithEnumUnion.js] // operands of an enum type are treated as having the primitive type Number. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { F[F["c"] = 0] = "c"; F[F["d"] = 1] = "d"; -})(F || (F = {})); +})(F); var a; var b; var c; diff --git a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js index e7fb22ca6f1bf..254e99d517dd7 100644 --- a/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/exponentiationOperatorWithInvalidOperands.js @@ -71,12 +71,12 @@ var r1h6 = f ** E.b //// [exponentiationOperatorWithInvalidOperands.js] // these operators require their operands to be of type Any, the Number primitive type, or // an enum type -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a; var b; var c; diff --git a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js index a7fe81296e0a5..a0fecc5613bd5 100644 --- a/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js +++ b/tests/baselines/reference/exponentiationOperatorWithNullValueAndValidOperands.js @@ -23,11 +23,11 @@ var r8 = E.b ** null; //// [exponentiationOperatorWithNullValueAndValidOperands.js] // If one operand is the null or undefined value, it is treated as having the type of the // other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; // operator ** diff --git a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js index 0f9d04faaa290..16cc16738e721 100644 --- a/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js +++ b/tests/baselines/reference/exponentiationOperatorWithUndefinedValueAndValidOperands.js @@ -23,11 +23,11 @@ var rk8 = E.b ** undefined; //// [exponentiationOperatorWithUndefinedValueAndValidOperands.js] // If one operand is the undefined or undefined value, it is treated as having the type of the // other operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var a; var b; // operator * diff --git a/tests/baselines/reference/exportAlreadySeen.js b/tests/baselines/reference/exportAlreadySeen.js index 9f48b7ef9bb47..e8c933507c558 100644 --- a/tests/baselines/reference/exportAlreadySeen.js +++ b/tests/baselines/reference/exportAlreadySeen.js @@ -20,12 +20,12 @@ declare module A { } //// [exportAlreadySeen.js] -var M; +var M = M || (M = {}); (function (M) { M.x = 1; function f() { } M.f = f; - var N; + var N = M.N || (M.N = {}); (function (N) { var C = /** @class */ (function () { function C() { @@ -33,5 +33,5 @@ var M; return C; }()); N.C = C; - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(N); +})(M); diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js index 41b6e87ae0a5d..60cb8b6fee73b 100644 --- a/tests/baselines/reference/exportAssignmentAndDeclaration.js +++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js @@ -13,12 +13,12 @@ export = C1; //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - var E1; + var E1 = {}; (function (E1) { E1[E1["A"] = 0] = "A"; E1[E1["B"] = 1] = "B"; E1[E1["C"] = 2] = "C"; - })(E1 = exports.E1 || (exports.E1 = {})); + })(E1); var C1 = /** @class */ (function () { function C1() { } diff --git a/tests/baselines/reference/exportAssignmentCircularModules.js b/tests/baselines/reference/exportAssignmentCircularModules.js index 696c746f10441..d354446a1beaa 100644 --- a/tests/baselines/reference/exportAssignmentCircularModules.js +++ b/tests/baselines/reference/exportAssignmentCircularModules.js @@ -25,27 +25,27 @@ export = Foo; //// [foo_1.js] define(["require", "exports", "./foo_2"], function (require, exports, foo2) { "use strict"; - var Foo; + var Foo = {}; (function (Foo) { Foo.x = foo2.x; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); //// [foo_0.js] define(["require", "exports", "./foo_1"], function (require, exports, foo1) { "use strict"; - var Foo; + var Foo = {}; (function (Foo) { Foo.x = foo1.x; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); //// [foo_2.js] define(["require", "exports", "./foo_0"], function (require, exports, foo0) { "use strict"; - var Foo; + var Foo = {}; (function (Foo) { Foo.x = foo0.x; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js index a32da0a2e3f78..64d4ae58eccd7 100644 --- a/tests/baselines/reference/exportAssignmentEnum.js +++ b/tests/baselines/reference/exportAssignmentEnum.js @@ -18,12 +18,12 @@ var c = EnumE.C; //// [exportAssignmentEnum_A.js] "use strict"; -var E; +var E = {}; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); +})(E); module.exports = E; //// [exportAssignmentEnum_B.js] "use strict"; diff --git a/tests/baselines/reference/exportAssignmentError.js b/tests/baselines/reference/exportAssignmentError.js index 41485d228e550..7750468308f24 100644 --- a/tests/baselines/reference/exportAssignmentError.js +++ b/tests/baselines/reference/exportAssignmentError.js @@ -11,9 +11,9 @@ export = M2; // should not error //// [exportEqualsModule_A.js] define(["require", "exports"], function (require, exports) { "use strict"; - var M; + var M = {}; (function (M) { - })(M || (M = {})); + })(M); var M2 = M; return M2; }); diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js index b5c45785f8ff0..bdd082c6a2c50 100644 --- a/tests/baselines/reference/exportAssignmentInternalModule.js +++ b/tests/baselines/reference/exportAssignmentInternalModule.js @@ -15,9 +15,9 @@ var n: number = modM.x; //// [exportAssignmentInternalModule_A.js] define(["require", "exports"], function (require, exports) { "use strict"; - var M; + var M = {}; (function (M) { - })(M || (M = {})); + })(M); return M; }); //// [exportAssignmentInternalModule_B.js] diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js index ef48895b5cb7c..c0edfe2ed0c59 100644 --- a/tests/baselines/reference/exportAssignmentMergedModule.js +++ b/tests/baselines/reference/exportAssignmentMergedModule.js @@ -26,24 +26,24 @@ if(!!foo.b){ //// [foo_0.js] "use strict"; -var Foo; +var Foo = {}; (function (Foo) { function a() { return 5; } Foo.a = a; Foo.b = true; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { function c(a) { return a; } Foo.c = c; - var Test; + var Test = Foo.Test || (Foo.Test = {}); (function (Test) { Test.answer = 42; - })(Test = Foo.Test || (Foo.Test = {})); -})(Foo || (Foo = {})); + })(Test); +})(Foo); module.exports = Foo; //// [foo_1.js] "use strict"; diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js index 857488248bbee..c634c002db50a 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js @@ -27,7 +27,7 @@ define(["require", "exports"], function (require, exports) { }()); (function (Foo) { Foo.answer = 42; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); //// [foo_1.js] diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js index 7ba5a655c2010..228ff4aa9e6b8 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js @@ -20,15 +20,15 @@ if(color === foo.green){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - var foo; + var foo = {}; (function (foo) { foo[foo["red"] = 0] = "red"; foo[foo["green"] = 1] = "green"; foo[foo["blue"] = 2] = "blue"; - })(foo || (foo = {})); + })(foo); (function (foo) { foo.answer = 42; - })(foo || (foo = {})); + })(foo); return foo; }); //// [foo_1.js] diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js index f122b8fbe8b06..a777f0483c3b4 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js +++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js @@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) { } (function (foo) { foo.answer = 42; - })(foo || (foo = {})); + })(foo); return foo; }); //// [foo_1.js] diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js index a7acbaf34967c..f30d02fc5eb4a 100644 --- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js +++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js @@ -16,10 +16,10 @@ if(foo.answer === 42){ //// [foo_0.js] define(["require", "exports"], function (require, exports) { "use strict"; - var Foo; + var Foo = {}; (function (Foo) { Foo.answer = 42; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); //// [foo_1.js] diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js index 3e8c46cca11ba..bb05443fd0c6d 100644 --- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js +++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.js @@ -24,8 +24,8 @@ export = M; //// [exportAssignmentWithImportStatementPrivacyError.js] define(["require", "exports"], function (require, exports) { "use strict"; - var M; + var M = {}; (function (M) { - })(M || (M = {})); + })(M); return M; }); diff --git a/tests/baselines/reference/exportCodeGen.js b/tests/baselines/reference/exportCodeGen.js index fd0dff8f0826e..e9267f698dae7 100644 --- a/tests/baselines/reference/exportCodeGen.js +++ b/tests/baselines/reference/exportCodeGen.js @@ -56,43 +56,43 @@ module F { //// [exportCodeGen.js] // should replace all refs to 'x' in the body, // with fully qualified -var A; +var A = A || (A = {}); (function (A) { A.x = 12; function lt12() { return A.x < 12; } -})(A || (A = {})); +})(A); // should not fully qualify 'x' -var B; +var B = B || (B = {}); (function (B) { var x = 12; function lt12() { return x < 12; } -})(B || (B = {})); +})(B); // not copied, since not exported -var C; +var C = C || (C = {}); (function (C) { function no() { return false; } -})(C || (C = {})); +})(C); // copies, since exported -var D; +var D = D || (D = {}); (function (D) { function yes() { return true; } D.yes = yes; -})(D || (D = {})); +})(D); // validate all exportable statements -var E; +var E = E || (E = {}); (function (E) { - var Color; + var Color = E.Color || (E.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; - })(Color = E.Color || (E.Color = {})); + })(Color); function fn() { } E.fn = fn; var C = /** @class */ (function () { @@ -101,27 +101,27 @@ var E; return C; }()); E.C = C; - var M; + var M = E.M || (E.M = {}); (function (M) { M.x = 42; - })(M = E.M || (E.M = {})); -})(E || (E = {})); + })(M); +})(E); // validate all exportable statements, // which are not exported -var F; +var F = F || (F = {}); (function (F) { - var Color; + var Color = Color || (Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; - })(Color || (Color = {})); + })(Color); function fn() { } var C = /** @class */ (function () { function C() { } return C; }()); - var M; + var M = M || (M = {}); (function (M) { var x = 42; - })(M || (M = {})); -})(F || (F = {})); + })(M); +})(F); diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index f73102b562a5e..09819443a4d59 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -50,7 +50,7 @@ var Aaa = /** @class */ (function (_super) { return SomeType; }()); Aaa.SomeType = SomeType; -})(Aaa || (Aaa = {})); +})(Aaa); (function (Bbb) { var SomeType = /** @class */ (function () { function SomeType() { @@ -58,7 +58,7 @@ var Aaa = /** @class */ (function (_super) { return SomeType; }()); Bbb.SomeType = SomeType; -})(Bbb || (Bbb = {})); +})(Bbb); var a; diff --git a/tests/baselines/reference/exportDefaultClassInNamespace.js b/tests/baselines/reference/exportDefaultClassInNamespace.js index 47ecf64a303df..d8d2062ef73f6 100644 --- a/tests/baselines/reference/exportDefaultClassInNamespace.js +++ b/tests/baselines/reference/exportDefaultClassInNamespace.js @@ -9,7 +9,7 @@ namespace ns_abstract_class { //// [exportDefaultClassInNamespace.js] -var ns_class; +var ns_class = ns_class || (ns_class = {}); (function (ns_class) { var default_1 = /** @class */ (function () { function default_1() { @@ -17,8 +17,8 @@ var ns_class; return default_1; }()); ns_class.default_1 = default_1; -})(ns_class || (ns_class = {})); -var ns_abstract_class; +})(ns_class); +var ns_abstract_class = ns_abstract_class || (ns_abstract_class = {}); (function (ns_abstract_class) { var default_2 = /** @class */ (function () { function default_2() { @@ -26,4 +26,4 @@ var ns_abstract_class; return default_2; }()); ns_abstract_class.default_2 = default_2; -})(ns_abstract_class || (ns_abstract_class = {})); +})(ns_abstract_class); diff --git a/tests/baselines/reference/exportDefaultClodule.js b/tests/baselines/reference/exportDefaultClodule.js new file mode 100644 index 0000000000000..d31c9e77e2f9b --- /dev/null +++ b/tests/baselines/reference/exportDefaultClodule.js @@ -0,0 +1,36 @@ +//// [tests/cases/compiler/exportDefaultClodule.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { + A1: string +} +export default namespace A { + export const A2 = 32; +} + +//// [b.ts] +import A from "./a"; + +const a = new A(); +const a2 = A.A2; + +//// [a.js] +"use strict"; +exports.__esModule = true; +// https://github.com/Microsoft/TypeScript/issues/3792 +var A = /** @class */ (function () { + function A() { + } + return A; +}()); +exports["default"] = A; +(function (A) { + A.A2 = 32; +})(A); +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var a = new a_1["default"](); +var a2 = a_1["default"].A2; diff --git a/tests/baselines/reference/exportDefaultClodule.symbols b/tests/baselines/reference/exportDefaultClodule.symbols new file mode 100644 index 0000000000000..bd52b69e1d2ef --- /dev/null +++ b/tests/baselines/reference/exportDefaultClodule.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 3, 1)) + + A1: string +>A1 : Symbol(A.A1, Decl(a.ts, 1, 24)) +} +export default namespace A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 3, 1)) + + export const A2 = 32; +>A2 : Symbol(A2, Decl(a.ts, 5, 16)) +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const a = new A(); +>a : Symbol(a, Decl(b.ts, 2, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const a2 = A.A2; +>a2 : Symbol(a2, Decl(b.ts, 3, 5)) +>A.A2 : Symbol(A.A2, Decl(a.ts, 5, 16)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>A2 : Symbol(A.A2, Decl(a.ts, 5, 16)) + diff --git a/tests/baselines/reference/exportDefaultClodule.types b/tests/baselines/reference/exportDefaultClodule.types new file mode 100644 index 0000000000000..5fe805a6cb9a3 --- /dev/null +++ b/tests/baselines/reference/exportDefaultClodule.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { +>A : A + + A1: string +>A1 : string +} +export default namespace A { +>A : typeof A + + export const A2 = 32; +>A2 : 32 +>32 : 32 +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const a = new A(); +>a : A +>new A() : A +>A : typeof A + +const a2 = A.A2; +>a2 : 32 +>A.A2 : 32 +>A : typeof A +>A2 : 32 + diff --git a/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.errors.txt b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.errors.txt new file mode 100644 index 0000000000000..4f1987e490efa --- /dev/null +++ b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.errors.txt @@ -0,0 +1,17 @@ +tests/cases/compiler/a.ts(2,22): error TS2735: Merged default exports must have the same name. +tests/cases/compiler/a.ts(5,26): error TS2735: Merged default exports must have the same name. + + +==== tests/cases/compiler/a.ts (2 errors) ==== + // https://github.com/Microsoft/TypeScript/issues/3792 + export default class A { + ~ +!!! error TS2735: Merged default exports must have the same name. + A1: string = "init" + } + export default namespace B { + ~ +!!! error TS2735: Merged default exports must have the same name. + export const A2 = 32; + } + \ No newline at end of file diff --git a/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.js b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.js new file mode 100644 index 0000000000000..9e0395bc18479 --- /dev/null +++ b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.js @@ -0,0 +1,26 @@ +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { + A1: string = "init" +} +export default namespace B { + export const A2 = 32; +} + + +//// [a.js] +"use strict"; +exports.__esModule = true; +// https://github.com/Microsoft/TypeScript/issues/3792 +var A = /** @class */ (function () { + function A() { + this.A1 = "init"; + } + return A; +}()); +exports["default"] = A; +var B = {}; +exports["default"] = B; +(function (B) { + B.A2 = 32; +})(B); diff --git a/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.symbols b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.symbols new file mode 100644 index 0000000000000..5f136c7e1544b --- /dev/null +++ b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.symbols @@ -0,0 +1,15 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 3, 1)) + + A1: string = "init" +>A1 : Symbol(A.A1, Decl(a.ts, 1, 24)) +} +export default namespace B { +>B : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 3, 1)) + + export const A2 = 32; +>A2 : Symbol(A2, Decl(a.ts, 5, 16)) +} + diff --git a/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.types b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.types new file mode 100644 index 0000000000000..9c4cc8cd1ab1b --- /dev/null +++ b/tests/baselines/reference/exportDefaultCloduleWithDifferentNames.types @@ -0,0 +1,17 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default class A { +>A : A + + A1: string = "init" +>A1 : string +>"init" : "init" +} +export default namespace B { +>B : typeof A + + export const A2 = 32; +>A2 : 32 +>32 : 32 +} + diff --git a/tests/baselines/reference/exportDefaultConstEnum.js b/tests/baselines/reference/exportDefaultConstEnum.js new file mode 100644 index 0000000000000..426fe16621009 --- /dev/null +++ b/tests/baselines/reference/exportDefaultConstEnum.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/exportDefaultConstEnum.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export +default +const +enum +A +{ FOO } + +//// [b.ts] +import A from './a'; + +const x = A.FOO; + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var x = 0 /* FOO */; diff --git a/tests/baselines/reference/exportDefaultConstEnum.symbols b/tests/baselines/reference/exportDefaultConstEnum.symbols new file mode 100644 index 0000000000000..1721518e9c84a --- /dev/null +++ b/tests/baselines/reference/exportDefaultConstEnum.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export +default +const +enum +A +>A : Symbol(A, Decl(a.ts, 0, 0)) + +{ FOO } +>FOO : Symbol(A.FOO, Decl(a.ts, 6, 1)) + +=== tests/cases/compiler/b.ts === +import A from './a'; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const x = A.FOO; +>x : Symbol(x, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 6, 1)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 6, 1)) + diff --git a/tests/baselines/reference/exportDefaultConstEnum.types b/tests/baselines/reference/exportDefaultConstEnum.types new file mode 100644 index 0000000000000..fcdea25d70c5f --- /dev/null +++ b/tests/baselines/reference/exportDefaultConstEnum.types @@ -0,0 +1,22 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export +default +const +enum +A +>A : A + +{ FOO } +>FOO : A.FOO + +=== tests/cases/compiler/b.ts === +import A from './a'; +>A : typeof A + +const x = A.FOO; +>x : A.FOO +>A.FOO : A +>A : typeof A +>FOO : A + diff --git a/tests/baselines/reference/exportDefaultDeclareAbstractClass.js b/tests/baselines/reference/exportDefaultDeclareAbstractClass.js new file mode 100644 index 0000000000000..1c529045c8a95 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareAbstractClass.js @@ -0,0 +1,47 @@ +//// [tests/cases/compiler/exportDefaultDeclareAbstractClass.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare abstract class A { + foo(): number + } + +//// [b.ts] +import A from "./a"; + +class B extends A { + foo() { + return 0; + } +} + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +var __extends = (this && this.__extends) || (function () { + var extendStatics = function (d, b) { + extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return extendStatics(d, b); + } + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +exports.__esModule = true; +var a_1 = require("./a"); +var B = /** @class */ (function (_super) { + __extends(B, _super); + function B() { + return _super !== null && _super.apply(this, arguments) || this; + } + B.prototype.foo = function () { + return 0; + }; + return B; +}(a_1["default"])); diff --git a/tests/baselines/reference/exportDefaultDeclareAbstractClass.symbols b/tests/baselines/reference/exportDefaultDeclareAbstractClass.symbols new file mode 100644 index 0000000000000..021a6242631f0 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareAbstractClass.symbols @@ -0,0 +1,23 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare abstract class A { +>A : Symbol(A, Decl(a.ts, 0, 0)) + + foo(): number +>foo : Symbol(A.foo, Decl(a.ts, 1, 41)) + } + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +class B extends A { +>B : Symbol(B, Decl(b.ts, 0, 20)) +>A : Symbol(A, Decl(b.ts, 0, 6)) + + foo() { +>foo : Symbol(B.foo, Decl(b.ts, 2, 19)) + + return 0; + } +} diff --git a/tests/baselines/reference/exportDefaultDeclareAbstractClass.types b/tests/baselines/reference/exportDefaultDeclareAbstractClass.types new file mode 100644 index 0000000000000..0dc20bf6317c2 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareAbstractClass.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare abstract class A { +>A : A + + foo(): number +>foo : () => number + } + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +class B extends A { +>B : B +>A : A + + foo() { +>foo : () => number + + return 0; +>0 : 0 + } +} diff --git a/tests/baselines/reference/exportDefaultDeclareClass.js b/tests/baselines/reference/exportDefaultDeclareClass.js new file mode 100644 index 0000000000000..1cae113ff1eba --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareClass.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/exportDefaultDeclareClass.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare class A { + foo(): number + } + +//// [b.ts] +import A from "./a"; + +const x = new A().foo(); + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var x = new a_1["default"]().foo(); diff --git a/tests/baselines/reference/exportDefaultDeclareClass.symbols b/tests/baselines/reference/exportDefaultDeclareClass.symbols new file mode 100644 index 0000000000000..0c723eec34867 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareClass.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare class A { +>A : Symbol(A, Decl(a.ts, 0, 0)) + + foo(): number +>foo : Symbol(A.foo, Decl(a.ts, 1, 32)) + } + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const x = new A().foo(); +>x : Symbol(x, Decl(b.ts, 2, 5)) +>new A().foo : Symbol(A.foo, Decl(a.ts, 1, 32)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>foo : Symbol(A.foo, Decl(a.ts, 1, 32)) + diff --git a/tests/baselines/reference/exportDefaultDeclareClass.types b/tests/baselines/reference/exportDefaultDeclareClass.types new file mode 100644 index 0000000000000..d1d776a4446e2 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareClass.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare class A { +>A : A + + foo(): number +>foo : () => number + } + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const x = new A().foo(); +>x : number +>new A().foo() : number +>new A().foo : () => number +>new A() : A +>A : typeof A +>foo : () => number + diff --git a/tests/baselines/reference/exportDefaultDeclareConstEnum.js b/tests/baselines/reference/exportDefaultDeclareConstEnum.js new file mode 100644 index 0000000000000..3d920faca5852 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareConstEnum.js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/exportDefaultDeclareConstEnum.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare const enum A { FOO } + +//// [b.ts] +import A from "./a"; + +const x = A.FOO; + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var x = 0 /* FOO */; diff --git a/tests/baselines/reference/exportDefaultDeclareConstEnum.symbols b/tests/baselines/reference/exportDefaultDeclareConstEnum.symbols new file mode 100644 index 0000000000000..3b239837f5b1e --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareConstEnum.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare const enum A { FOO } +>A : Symbol(A, Decl(a.ts, 0, 0)) +>FOO : Symbol(A.FOO, Decl(a.ts, 1, 37)) + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const x = A.FOO; +>x : Symbol(x, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 1, 37)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 1, 37)) + diff --git a/tests/baselines/reference/exportDefaultDeclareConstEnum.types b/tests/baselines/reference/exportDefaultDeclareConstEnum.types new file mode 100644 index 0000000000000..a7fa1d1ec3f2f --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareConstEnum.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare const enum A { FOO } +>A : A +>FOO : A + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const x = A.FOO; +>x : A +>A.FOO : A +>A : typeof A +>FOO : A + diff --git a/tests/baselines/reference/exportDefaultDeclareEnum.js b/tests/baselines/reference/exportDefaultDeclareEnum.js new file mode 100644 index 0000000000000..831f431940261 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareEnum.js @@ -0,0 +1,19 @@ +//// [tests/cases/compiler/exportDefaultDeclareEnum.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare enum A { FOO } + +//// [b.ts] +import A from "./a"; + +const x = A.FOO; + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var x = a_1["default"].FOO; diff --git a/tests/baselines/reference/exportDefaultDeclareEnum.symbols b/tests/baselines/reference/exportDefaultDeclareEnum.symbols new file mode 100644 index 0000000000000..87c00d95e4fb6 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareEnum.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare enum A { FOO } +>A : Symbol(A, Decl(a.ts, 0, 0)) +>FOO : Symbol(A.FOO, Decl(a.ts, 1, 31)) + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const x = A.FOO; +>x : Symbol(x, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 1, 31)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 1, 31)) + diff --git a/tests/baselines/reference/exportDefaultDeclareEnum.types b/tests/baselines/reference/exportDefaultDeclareEnum.types new file mode 100644 index 0000000000000..6e7cb050fe59c --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareEnum.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare enum A { FOO } +>A : A +>FOO : A + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const x = A.FOO; +>x : A +>A.FOO : A +>A : typeof A +>FOO : A + diff --git a/tests/baselines/reference/exportDefaultDeclareFunction.js b/tests/baselines/reference/exportDefaultDeclareFunction.js new file mode 100644 index 0000000000000..9fc79dbe3e8ac --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareFunction.js @@ -0,0 +1,19 @@ +//// [tests/cases/compiler/exportDefaultDeclareFunction.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare function A(): number; + +//// [b.ts] +import A from "./a"; + +const x: number = A(); + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var x = a_1["default"](); diff --git a/tests/baselines/reference/exportDefaultDeclareFunction.symbols b/tests/baselines/reference/exportDefaultDeclareFunction.symbols new file mode 100644 index 0000000000000..dbb1d2fb8f53c --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareFunction.symbols @@ -0,0 +1,13 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare function A(): number; +>A : Symbol(A, Decl(a.ts, 0, 0)) + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const x: number = A(); +>x : Symbol(x, Decl(b.ts, 2, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) + diff --git a/tests/baselines/reference/exportDefaultDeclareFunction.types b/tests/baselines/reference/exportDefaultDeclareFunction.types new file mode 100644 index 0000000000000..00fe647d028a9 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareFunction.types @@ -0,0 +1,14 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare function A(): number; +>A : () => number + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : () => number + +const x: number = A(); +>x : number +>A() : number +>A : () => number + diff --git a/tests/baselines/reference/exportDefaultDeclareModule.js b/tests/baselines/reference/exportDefaultDeclareModule.js new file mode 100644 index 0000000000000..925fbf86839a8 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareModule.js @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/exportDefaultDeclareModule.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare module A { + export const A1: number; + export class A2 { + + } +} + +//// [b.ts] +import A from "./a"; + +const namespaceAUsage = A.A1 + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var namespaceAUsage = a_1["default"].A1; diff --git a/tests/baselines/reference/exportDefaultDeclareModule.symbols b/tests/baselines/reference/exportDefaultDeclareModule.symbols new file mode 100644 index 0000000000000..1a7883a39245a --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareModule.symbols @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare module A { +>A : Symbol(A, Decl(a.ts, 0, 0)) + + export const A1: number; +>A1 : Symbol(A1, Decl(a.ts, 2, 16)) + + export class A2 { +>A2 : Symbol(A2, Decl(a.ts, 2, 28)) + + } +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const namespaceAUsage = A.A1 +>namespaceAUsage : Symbol(namespaceAUsage, Decl(b.ts, 2, 5)) +>A.A1 : Symbol(A.A1, Decl(a.ts, 2, 16)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>A1 : Symbol(A.A1, Decl(a.ts, 2, 16)) + diff --git a/tests/baselines/reference/exportDefaultDeclareModule.types b/tests/baselines/reference/exportDefaultDeclareModule.types new file mode 100644 index 0000000000000..27b976108ae71 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareModule.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare module A { +>A : typeof A + + export const A1: number; +>A1 : number + + export class A2 { +>A2 : A2 + + } +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const namespaceAUsage = A.A1 +>namespaceAUsage : number +>A.A1 : number +>A : typeof A +>A1 : number + diff --git a/tests/baselines/reference/exportDefaultDeclareNamespace.js b/tests/baselines/reference/exportDefaultDeclareNamespace.js new file mode 100644 index 0000000000000..91723e34f6829 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareNamespace.js @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/exportDefaultDeclareNamespace.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare namespace A { + export const A1: number; + export class A2 { + + } +} + +//// [b.ts] +import A from "./a"; + +const namespaceAUsage = A.A1 + +//// [a.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var namespaceAUsage = a_1["default"].A1; diff --git a/tests/baselines/reference/exportDefaultDeclareNamespace.symbols b/tests/baselines/reference/exportDefaultDeclareNamespace.symbols new file mode 100644 index 0000000000000..110ecfa90adde --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareNamespace.symbols @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare namespace A { +>A : Symbol(A, Decl(a.ts, 0, 0)) + + export const A1: number; +>A1 : Symbol(A1, Decl(a.ts, 2, 16)) + + export class A2 { +>A2 : Symbol(A2, Decl(a.ts, 2, 28)) + + } +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) + +const namespaceAUsage = A.A1 +>namespaceAUsage : Symbol(namespaceAUsage, Decl(b.ts, 2, 5)) +>A.A1 : Symbol(A.A1, Decl(a.ts, 2, 16)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>A1 : Symbol(A.A1, Decl(a.ts, 2, 16)) + diff --git a/tests/baselines/reference/exportDefaultDeclareNamespace.types b/tests/baselines/reference/exportDefaultDeclareNamespace.types new file mode 100644 index 0000000000000..83672eb6eb940 --- /dev/null +++ b/tests/baselines/reference/exportDefaultDeclareNamespace.types @@ -0,0 +1,24 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default declare namespace A { +>A : typeof A + + export const A1: number; +>A1 : number + + export class A2 { +>A2 : A2 + + } +} + +=== tests/cases/compiler/b.ts === +import A from "./a"; +>A : typeof A + +const namespaceAUsage = A.A1 +>namespaceAUsage : number +>A.A1 : number +>A : typeof A +>A1 : number + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.js b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.js new file mode 100644 index 0000000000000..1705e8b2b267d --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.js @@ -0,0 +1,128 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES2015ModuleAMD.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +define(["require", "exports"], function (require, exports) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + /** + * export default enum A 1 comment + */ + const A = {}; + exports.default = A; + (function (A) { + A[A["FOO"] = 0] = "FOO"; + })(A); // export default enum A 1 trailing comment + /** + * export default enum A 2 comment + */ + (function (A) { + A[A["BAR"] = 2] = "BAR"; + })(A); // export default enum A 2 trailing comment + const enumAUsage = A.FOO; + /** + * export enum B 1 comment + */ + const B = {}; + (function (B) { + B[B["X"] = 0] = "X"; + })(B); // export enum B 1 trailing comment + // export enum B 2 comment + (function (B) { + B[B["Y"] = 1] = "Y"; + })(B); // export enum B 2 trailing comment + const enumBUsage = B.Y; + const ns = {}; + (function (ns) { + // enum ns.C 1 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment + })(ns); + (function (ns) { + // enum ns.C 3 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + const enumCUSage1 = C.X; + })(ns); + (function (ns) { + const enumCUsage2 = ns.C.X; + })(ns); +}); +//// [b.js] +define(["require", "exports", "./a"], function (require, exports, a_1) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + const enumAExternalUsage1 = a_1.default.FOO; + const enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; + const enumBExternalUsage1 = a_1.B.X; +}); diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.symbols b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.types b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleAMD.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.js b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.js new file mode 100644 index 0000000000000..3550327efc367 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.js @@ -0,0 +1,125 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES2015ModuleCommonJS.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +"use strict"; +// https://github.com/Microsoft/TypeScript/issues/3792 +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * export default enum A 1 comment + */ +const A = {}; +exports.default = A; +(function (A) { + A[A["FOO"] = 0] = "FOO"; +})(A); // export default enum A 1 trailing comment +/** + * export default enum A 2 comment + */ +(function (A) { + A[A["BAR"] = 2] = "BAR"; +})(A); // export default enum A 2 trailing comment +const enumAUsage = A.FOO; +/** + * export enum B 1 comment + */ +const B = {}; +(function (B) { + B[B["X"] = 0] = "X"; +})(B); // export enum B 1 trailing comment +// export enum B 2 comment +(function (B) { + B[B["Y"] = 1] = "Y"; +})(B); // export enum B 2 trailing comment +const enumBUsage = B.Y; +const ns = {}; +(function (ns) { + // enum ns.C 1 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment +})(ns); +(function (ns) { + // enum ns.C 3 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + const enumCUSage1 = C.X; +})(ns); +(function (ns) { + const enumCUsage2 = ns.C.X; +})(ns); +//// [b.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const a_1 = require("./a"); +const enumAExternalUsage1 = a_1.default.FOO; +const enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; +const enumBExternalUsage1 = a_1.B.X; diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.symbols b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.types b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleCommonJS.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.js b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.js new file mode 100644 index 0000000000000..01453c73530f9 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.js @@ -0,0 +1,122 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES2015ModuleES2015.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +/** + * export default enum A 1 comment + */ +export default const A = {}; +export default A; +(function (A) { + A[A["FOO"] = 0] = "FOO"; +})(A); // export default enum A 1 trailing comment +/** + * export default enum A 2 comment + */ +(function (A) { + A[A["BAR"] = 2] = "BAR"; +})(A); // export default enum A 2 trailing comment +const enumAUsage = A.FOO; +/** + * export enum B 1 comment + */ +export const B = {}; +export { B }; +(function (B) { + B[B["X"] = 0] = "X"; +})(B); // export enum B 1 trailing comment +// export enum B 2 comment +(function (B) { + B[B["Y"] = 1] = "Y"; +})(B); // export enum B 2 trailing comment +const enumBUsage = B.Y; +const ns = {}; +(function (ns) { + // enum ns.C 1 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment +})(ns); +(function (ns) { + // enum ns.C 3 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + const enumCUSage1 = C.X; +})(ns); +(function (ns) { + const enumCUsage2 = ns.C.X; +})(ns); +//// [b.js] +import A, { B } from "./a"; +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.symbols b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.types b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleES2015.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.js b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.js new file mode 100644 index 0000000000000..79748fec3f4b9 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.js @@ -0,0 +1,144 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES2015ModuleSystem.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +System.register([], function (exports_1, context_1) { + "use strict"; + var A, enumAUsage, B, enumBUsage, ns; + var __moduleName = context_1 && context_1.id; + return { + setters: [], + execute: function () {// https://github.com/Microsoft/TypeScript/issues/3792 + exports_1("A", A = {}); + exports_1("default", A); + /** + * export default enum A 1 comment + */ + (function (A) { + A[A["FOO"] = 0] = "FOO"; + })(A); // export default enum A 1 trailing comment + /** + * export default enum A 2 comment + */ + (function (A) { + A[A["BAR"] = 2] = "BAR"; + })(A); // export default enum A 2 trailing comment + enumAUsage = A.FOO; + exports_1("B", B = {}); + /** + * export enum B 1 comment + */ + (function (B) { + B[B["X"] = 0] = "X"; + })(B); // export enum B 1 trailing comment + // export enum B 2 comment + (function (B) { + B[B["Y"] = 1] = "Y"; + })(B); // export enum B 2 trailing comment + enumBUsage = B.Y; + ns = {}; + (function (ns) { + // enum ns.C 1 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment + })(ns); + (function (ns) { + // enum ns.C 3 comment + const C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + const enumCUSage1 = C.X; + })(ns); + (function (ns) { + const enumCUsage2 = ns.C.X; + })(ns); + } + }; +}); +//// [b.js] +System.register(["./a"], function (exports_1, context_1) { + "use strict"; + var a_1, enumAExternalUsage1, enumAExternalUsage2, enumBExternalUsage1; + var __moduleName = context_1 && context_1.id; + return { + setters: [ + function (a_1_1) { + a_1 = a_1_1; + } + ], + execute: function () { + enumAExternalUsage1 = a_1.default.FOO; + enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; + enumBExternalUsage1 = a_1.B.X; + } + }; +}); diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.symbols b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.types b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES2015ModuleSystem.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.js b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.js new file mode 100644 index 0000000000000..e59a5885c2dbe --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.js @@ -0,0 +1,128 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES5ModuleAMD.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +define(["require", "exports"], function (require, exports) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + /** + * export default enum A 1 comment + */ + var A = {}; + exports.default = A; + (function (A) { + A[A["FOO"] = 0] = "FOO"; + })(A); // export default enum A 1 trailing comment + /** + * export default enum A 2 comment + */ + (function (A) { + A[A["BAR"] = 2] = "BAR"; + })(A); // export default enum A 2 trailing comment + var enumAUsage = A.FOO; + /** + * export enum B 1 comment + */ + var B = {}; + (function (B) { + B[B["X"] = 0] = "X"; + })(B); // export enum B 1 trailing comment + // export enum B 2 comment + (function (B) { + B[B["Y"] = 1] = "Y"; + })(B); // export enum B 2 trailing comment + var enumBUsage = B.Y; + var ns = {}; + (function (ns) { + // enum ns.C 1 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment + })(ns); + (function (ns) { + // enum ns.C 3 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + var enumCUSage1 = C.X; + })(ns); + (function (ns) { + var enumCUsage2 = ns.C.X; + })(ns); +}); +//// [b.js] +define(["require", "exports", "./a"], function (require, exports, a_1) { + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + var enumAExternalUsage1 = a_1.default.FOO; + var enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; + var enumBExternalUsage1 = a_1.B.X; +}); diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.symbols b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.types b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleAMD.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.js b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.js new file mode 100644 index 0000000000000..9f6bb613f1d87 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.js @@ -0,0 +1,125 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES5ModuleCommonJS.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +"use strict"; +// https://github.com/Microsoft/TypeScript/issues/3792 +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * export default enum A 1 comment + */ +var A = {}; +exports.default = A; +(function (A) { + A[A["FOO"] = 0] = "FOO"; +})(A); // export default enum A 1 trailing comment +/** + * export default enum A 2 comment + */ +(function (A) { + A[A["BAR"] = 2] = "BAR"; +})(A); // export default enum A 2 trailing comment +var enumAUsage = A.FOO; +/** + * export enum B 1 comment + */ +var B = {}; +(function (B) { + B[B["X"] = 0] = "X"; +})(B); // export enum B 1 trailing comment +// export enum B 2 comment +(function (B) { + B[B["Y"] = 1] = "Y"; +})(B); // export enum B 2 trailing comment +var enumBUsage = B.Y; +var ns = {}; +(function (ns) { + // enum ns.C 1 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment +})(ns); +(function (ns) { + // enum ns.C 3 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + var enumCUSage1 = C.X; +})(ns); +(function (ns) { + var enumCUsage2 = ns.C.X; +})(ns); +//// [b.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var a_1 = require("./a"); +var enumAExternalUsage1 = a_1.default.FOO; +var enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; +var enumBExternalUsage1 = a_1.B.X; diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.symbols b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.types b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleCommonJS.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.js b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.js new file mode 100644 index 0000000000000..78f23eb4c1988 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.js @@ -0,0 +1,122 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES5ModuleES2015.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +/** + * export default enum A 1 comment + */ +export default var A = {}; +export default A; +(function (A) { + A[A["FOO"] = 0] = "FOO"; +})(A); // export default enum A 1 trailing comment +/** + * export default enum A 2 comment + */ +(function (A) { + A[A["BAR"] = 2] = "BAR"; +})(A); // export default enum A 2 trailing comment +var enumAUsage = A.FOO; +/** + * export enum B 1 comment + */ +export var B = {}; +export { B }; +(function (B) { + B[B["X"] = 0] = "X"; +})(B); // export enum B 1 trailing comment +// export enum B 2 comment +(function (B) { + B[B["Y"] = 1] = "Y"; +})(B); // export enum B 2 trailing comment +var enumBUsage = B.Y; +var ns = {}; +(function (ns) { + // enum ns.C 1 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment +})(ns); +(function (ns) { + // enum ns.C 3 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + var enumCUSage1 = C.X; +})(ns); +(function (ns) { + var enumCUsage2 = ns.C.X; +})(ns); +//// [b.js] +import A, { B } from "./a"; +var enumAExternalUsage1 = A.FOO; +var enumAExternalUsage2 = A[enumAExternalUsage1]; +var enumBExternalUsage1 = B.X; diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.symbols b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.types b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleES2015.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.js b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.js new file mode 100644 index 0000000000000..6e8e232cf3c78 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.js @@ -0,0 +1,144 @@ +//// [tests/cases/compiler/exportDefaultEnumTargetES5ModuleSystem.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +//// [b.ts] +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; + + +//// [a.js] +// https://github.com/Microsoft/TypeScript/issues/3792 +System.register([], function (exports_1, context_1) { + "use strict"; + var A, enumAUsage, B, enumBUsage, ns; + var __moduleName = context_1 && context_1.id; + return { + setters: [], + execute: function () {// https://github.com/Microsoft/TypeScript/issues/3792 + exports_1("A", A = {}); + exports_1("default", A); + /** + * export default enum A 1 comment + */ + (function (A) { + A[A["FOO"] = 0] = "FOO"; + })(A); // export default enum A 1 trailing comment + /** + * export default enum A 2 comment + */ + (function (A) { + A[A["BAR"] = 2] = "BAR"; + })(A); // export default enum A 2 trailing comment + enumAUsage = A.FOO; + exports_1("B", B = {}); + /** + * export enum B 1 comment + */ + (function (B) { + B[B["X"] = 0] = "X"; + })(B); // export enum B 1 trailing comment + // export enum B 2 comment + (function (B) { + B[B["Y"] = 1] = "Y"; + })(B); // export enum B 2 trailing comment + enumBUsage = B.Y; + ns = {}; + (function (ns) { + // enum ns.C 1 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["X"] = 0] = "X"; + })(C); // enum ns.C 1 trailing comment + // enum ns.C 2 comment + (function (C) { + C[C["Y"] = 1] = "Y"; + })(C); // enum ns.C 2 trailing comment + })(ns); + (function (ns) { + // enum ns.C 3 comment + var C = ns.C || (ns.C = {}); + (function (C) { + C[C["Z"] = 2] = "Z"; + })(C); // enum ns.C 3 trailing comment + var enumCUSage1 = C.X; + })(ns); + (function (ns) { + var enumCUsage2 = ns.C.X; + })(ns); + } + }; +}); +//// [b.js] +System.register(["./a"], function (exports_1, context_1) { + "use strict"; + var a_1, enumAExternalUsage1, enumAExternalUsage2, enumBExternalUsage1; + var __moduleName = context_1 && context_1.id; + return { + setters: [ + function (a_1_1) { + a_1 = a_1_1; + } + ], + execute: function () { + enumAExternalUsage1 = a_1.default.FOO; + enumAExternalUsage2 = a_1.default[enumAExternalUsage1]; + enumBExternalUsage1 = a_1.B.X; + } + }; +}); diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.symbols b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.symbols new file mode 100644 index 0000000000000..18b5d05b81291 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.symbols @@ -0,0 +1,124 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) + + BAR = 2 +>BAR : Symbol(A.BAR, Decl(a.ts, 10, 23)) + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : Symbol(enumAUsage, Decl(a.ts, 14, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 5, 29)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +/** + * export enum B 1 comment + */ +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + X = 0, +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) + + Y = 1 +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : Symbol(enumBUsage, Decl(a.ts, 28, 5)) +>B.Y : Symbol(B.Y, Decl(a.ts, 24, 15)) +>B : Symbol(B, Decl(a.ts, 14, 25), Decl(a.ts, 21, 1)) +>Y : Symbol(B.Y, Decl(a.ts, 24, 15)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 1 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + X = 0 +>X : Symbol(C.X, Decl(a.ts, 32, 19)) + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Y = 1 +>Y : Symbol(C.Y, Decl(a.ts, 36, 19)) + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + // enum ns.C 3 comment + export enum C { +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) + + Z = 2 +>Z : Symbol(C.Z, Decl(a.ts, 42, 19)) + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : Symbol(enumCUSage1, Decl(a.ts, 46, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 28, 22), Decl(a.ts, 39, 1), Decl(a.ts, 47, 1)) + + const enumCUsage2 = C.X +>enumCUsage2 : Symbol(enumCUsage2, Decl(a.ts, 50, 9)) +>C.X : Symbol(C.X, Decl(a.ts, 32, 19)) +>C : Symbol(C, Decl(a.ts, 30, 14), Decl(a.ts, 34, 5), Decl(a.ts, 40, 14)) +>X : Symbol(C.X, Decl(a.ts, 32, 19)) +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) +>A.FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>FOO : Symbol(A.FOO, Decl(a.ts, 5, 23)) + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : Symbol(enumAExternalUsage2, Decl(b.ts, 3, 5)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>enumAExternalUsage1 : Symbol(enumAExternalUsage1, Decl(b.ts, 2, 5)) + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : Symbol(enumBExternalUsage1, Decl(b.ts, 4, 5)) +>B.X : Symbol(B.X, Decl(a.ts, 19, 15)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>X : Symbol(B.X, Decl(a.ts, 19, 15)) + diff --git a/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.types b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.types new file mode 100644 index 0000000000000..6b767bc530318 --- /dev/null +++ b/tests/baselines/reference/exportDefaultEnumTargetES5ModuleSystem.types @@ -0,0 +1,131 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment +>A : A +>FOO : A.FOO + +/** + * export default enum A 2 comment + */ +export default enum A { +>A : A + + BAR = 2 +>BAR : A.BAR +>2 : 2 + +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; +>enumAUsage : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +/** + * export enum B 1 comment + */ +export enum B { +>B : B + + X = 0, +>X : B.X +>0 : 0 + +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { +>B : B + + Y = 1 +>Y : B.Y +>1 : 1 + +} // export enum B 2 trailing comment + +const enumBUsage = B.Y +>enumBUsage : B.Y +>B.Y : B.Y +>B : typeof B +>Y : B.Y + +namespace ns { +>ns : typeof ns + + // enum ns.C 1 comment + export enum C { +>C : C + + X = 0 +>X : C.X +>0 : 0 + + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { +>C : C + + Y = 1 +>Y : C.Y +>1 : 1 + + } // enum ns.C 2 trailing comment +} +namespace ns { +>ns : typeof ns + + // enum ns.C 3 comment + export enum C { +>C : C + + Z = 2 +>Z : C.Z +>2 : 2 + + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +>enumCUSage1 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +namespace ns { +>ns : typeof ns + + const enumCUsage2 = C.X +>enumCUsage2 : C.X +>C.X : C.X +>C : typeof C +>X : C.X +} + +=== tests/cases/compiler/b.ts === +import A, { B } from "./a"; +>A : typeof A +>B : typeof B + +const enumAExternalUsage1 = A.FOO; +>enumAExternalUsage1 : A.FOO +>A.FOO : A.FOO +>A : typeof A +>FOO : A.FOO + +const enumAExternalUsage2 = A[enumAExternalUsage1]; +>enumAExternalUsage2 : string +>A[enumAExternalUsage1] : string +>A : typeof A +>enumAExternalUsage1 : A.FOO + +const enumBExternalUsage1 = B.X; +>enumBExternalUsage1 : B.X +>B.X : B.X +>B : typeof B +>X : B.X + diff --git a/tests/baselines/reference/exportDefaultFunctionInNamespace.js b/tests/baselines/reference/exportDefaultFunctionInNamespace.js index 3a0c260ff0182..7fa61ff413215 100644 --- a/tests/baselines/reference/exportDefaultFunctionInNamespace.js +++ b/tests/baselines/reference/exportDefaultFunctionInNamespace.js @@ -44,12 +44,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; -var ns_function; +var ns_function = ns_function || (ns_function = {}); (function (ns_function) { default function () { } ns_function.default_1 = default_1; -})(ns_function || (ns_function = {})); -var ns_async_function; +})(ns_function); +var ns_async_function = ns_async_function || (ns_async_function = {}); (function (ns_async_function) { default function () { return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) { @@ -57,4 +57,4 @@ var ns_async_function; }); }); } ns_async_function.default_2 = default_2; -})(ns_async_function || (ns_async_function = {})); +})(ns_async_function); diff --git a/tests/baselines/reference/exportDefaultInvalidModifiers.errors.txt b/tests/baselines/reference/exportDefaultInvalidModifiers.errors.txt new file mode 100644 index 0000000000000..172da0df07a6c --- /dev/null +++ b/tests/baselines/reference/exportDefaultInvalidModifiers.errors.txt @@ -0,0 +1,42 @@ +tests/cases/compiler/exportDefaultAbstractConstEnum.ts(1,16): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration. +tests/cases/compiler/exportDefaultDeclareAbstractFunction.ts(1,24): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration. +tests/cases/compiler/exportDefaultDeclareStaticFunction.ts(1,24): error TS1044: 'static' modifier cannot appear on a module or namespace element. +tests/cases/compiler/exportDefaultDeclaresyncFunction.ts(1,24): error TS1040: 'async' modifier cannot be used in an ambient context. +tests/cases/compiler/exportDefaultDeclaresyncFunction.ts(1,51): error TS1055: Type 'void' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value. +tests/cases/compiler/exportDefaultStaticFunction.ts(1,16): error TS2304: Cannot find name 'static'. +tests/cases/compiler/exportDefaultStaticFunction.ts(1,23): error TS1005: ';' expected. +tests/cases/compiler/exportDefaultStaticFunction.ts(1,31): error TS1003: Identifier expected. + + +==== tests/cases/compiler/exportDefaultDeclareAbstractFunction.ts (1 errors) ==== + export default declare abstract function(a: number): void + ~~~~~~~~ +!!! error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration. + +==== tests/cases/compiler/exportDefaultDeclaresyncFunction.ts (2 errors) ==== + export default declare async function(a: number): void + ~~~~~ +!!! error TS1040: 'async' modifier cannot be used in an ambient context. + ~~~~ +!!! error TS1055: Type 'void' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value. + +==== tests/cases/compiler/exportDefaultDeclareStaticFunction.ts (1 errors) ==== + export default declare static function(a: number): void + ~~~~~~ +!!! error TS1044: 'static' modifier cannot appear on a module or namespace element. + +==== tests/cases/compiler/exportDefaultStaticFunction.ts (3 errors) ==== + export default static function(a: number): void + ~~~~~~ +!!! error TS2304: Cannot find name 'static'. + ~~~~~~~~ +!!! error TS1005: ';' expected. + ~ +!!! error TS1003: Identifier expected. + +==== tests/cases/compiler/exportDefaultAbstractConstEnum.ts (1 errors) ==== + export default abstract const enum A {} + ~~~~~~~~ +!!! error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration. + + \ No newline at end of file diff --git a/tests/baselines/reference/exportDefaultInvalidModifiers.js b/tests/baselines/reference/exportDefaultInvalidModifiers.js new file mode 100644 index 0000000000000..8af5dee745c60 --- /dev/null +++ b/tests/baselines/reference/exportDefaultInvalidModifiers.js @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/exportDefaultInvalidModifiers.ts] //// + +//// [exportDefaultDeclareAbstractFunction.ts] +export default declare abstract function(a: number): void + +//// [exportDefaultDeclaresyncFunction.ts] +export default declare async function(a: number): void + +//// [exportDefaultDeclareStaticFunction.ts] +export default declare static function(a: number): void + +//// [exportDefaultStaticFunction.ts] +export default static function(a: number): void + +//// [exportDefaultAbstractConstEnum.ts] +export default abstract const enum A {} + + + +//// [exportDefaultDeclareAbstractFunction.js] +"use strict"; +exports.__esModule = true; +//// [exportDefaultDeclaresyncFunction.js] +"use strict"; +exports.__esModule = true; +//// [exportDefaultDeclareStaticFunction.js] +"use strict"; +exports.__esModule = true; +//// [exportDefaultStaticFunction.js] +"use strict"; +exports.__esModule = true; +exports["default"] = static; +//// [exportDefaultAbstractConstEnum.js] +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/exportDefaultInvalidModifiers.symbols b/tests/baselines/reference/exportDefaultInvalidModifiers.symbols new file mode 100644 index 0000000000000..42539d9f7115d --- /dev/null +++ b/tests/baselines/reference/exportDefaultInvalidModifiers.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/exportDefaultDeclareAbstractFunction.ts === +export default declare abstract function(a: number): void +>a : Symbol(a, Decl(exportDefaultDeclareAbstractFunction.ts, 0, 41)) + +=== tests/cases/compiler/exportDefaultDeclaresyncFunction.ts === +export default declare async function(a: number): void +>a : Symbol(a, Decl(exportDefaultDeclaresyncFunction.ts, 0, 38)) + +=== tests/cases/compiler/exportDefaultDeclareStaticFunction.ts === +export default declare static function(a: number): void +>a : Symbol(a, Decl(exportDefaultDeclareStaticFunction.ts, 0, 39)) + +=== tests/cases/compiler/exportDefaultStaticFunction.ts === +export default static function(a: number): void +> : Symbol((Missing), Decl(exportDefaultStaticFunction.ts, 0, 21)) +>a : Symbol(a, Decl(exportDefaultStaticFunction.ts, 0, 31)) + +=== tests/cases/compiler/exportDefaultAbstractConstEnum.ts === +export default abstract const enum A {} +>A : Symbol(A, Decl(exportDefaultAbstractConstEnum.ts, 0, 0)) + + diff --git a/tests/baselines/reference/exportDefaultInvalidModifiers.types b/tests/baselines/reference/exportDefaultInvalidModifiers.types new file mode 100644 index 0000000000000..dffdb3d840c5d --- /dev/null +++ b/tests/baselines/reference/exportDefaultInvalidModifiers.types @@ -0,0 +1,23 @@ +=== tests/cases/compiler/exportDefaultDeclareAbstractFunction.ts === +export default declare abstract function(a: number): void +>a : number + +=== tests/cases/compiler/exportDefaultDeclaresyncFunction.ts === +export default declare async function(a: number): void +>a : number + +=== tests/cases/compiler/exportDefaultDeclareStaticFunction.ts === +export default declare static function(a: number): void +>a : number + +=== tests/cases/compiler/exportDefaultStaticFunction.ts === +export default static function(a: number): void +>static : any +> : (a: number) => void +>a : number + +=== tests/cases/compiler/exportDefaultAbstractConstEnum.ts === +export default abstract const enum A {} +>A : A + + diff --git a/tests/baselines/reference/exportDefaultNamespace.js b/tests/baselines/reference/exportDefaultNamespace.js new file mode 100644 index 0000000000000..e57478a7ffc3c --- /dev/null +++ b/tests/baselines/reference/exportDefaultNamespace.js @@ -0,0 +1,163 @@ +//// [tests/cases/compiler/exportDefaultNamespace.ts] //// + +//// [a.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * namespace A 1 leading comment + */ +export default namespace A { + export const A1 = 42; +} // namespace A 1 trailing comment + +/** + * namespace A 2 leading comment + */ +export default namespace A { + export function A2() { + return 0xC0FFEE; + } +} // namespace A 2 trailing comment + +const namespaceAUsage1 = A.A1; + +/** + * namespace B 1 leading comment + */ +export namespace B { + export const B1 = 42; +} // namespace B 1 trailing comment + +/** + * namespace B 2 leading comment + */ +export namespace B { + export function B2() { + return 0xC0FFEE; + } +} // namespace B 2 trailing comment + +const namespaceBUsage1 = B.B2(); + +namespace ns { + /** + * namespace C 1 leading comment + */ + export namespace C { + export const C1 = 42; + } // namespace C 1 trailing comment + + /** + * namespace C 2 leading comment + */ + export namespace C { + export function C2() { + return 0xC0FFEE; + } + } // namespace C 2 trailing comment + + const namespaceCUsage1 = C.C1; +} + +namespace ns { + /** + * namespace C 3 leading comment + */ + export namespace C { + export class C3 { } + } // namespace C 3 trailing comment +} + +namespace ns { + const namespaceCUsage2 = C.C1; +} + + +//// [b.ts] +import A, { B } from './a'; + +const namespaceAExternalUsage1 = A.A1; +const namespaceBExternalUsage1 = B.B2; + +//// [a.js] +"use strict"; +// https://github.com/Microsoft/TypeScript/issues/3792 +exports.__esModule = true; +/** + * namespace A 1 leading comment + */ +var A = {}; +exports["default"] = A; +(function (A) { + A.A1 = 42; +})(A); // namespace A 1 trailing comment +/** + * namespace A 2 leading comment + */ +(function (A) { + function A2() { + return 0xC0FFEE; + } + A.A2 = A2; +})(A); // namespace A 2 trailing comment +var namespaceAUsage1 = A.A1; +/** + * namespace B 1 leading comment + */ +var B = {}; +(function (B) { + B.B1 = 42; +})(B); // namespace B 1 trailing comment +/** + * namespace B 2 leading comment + */ +(function (B) { + function B2() { + return 0xC0FFEE; + } + B.B2 = B2; +})(B); // namespace B 2 trailing comment +var namespaceBUsage1 = B.B2(); +var ns = {}; +(function (ns) { + /** + * namespace C 1 leading comment + */ + var C = ns.C || (ns.C = {}); + (function (C) { + C.C1 = 42; + })(C); // namespace C 1 trailing comment + /** + * namespace C 2 leading comment + */ + (function (C) { + function C2() { + return 0xC0FFEE; + } + C.C2 = C2; + })(C); // namespace C 2 trailing comment + var namespaceCUsage1 = C.C1; +})(ns); +(function (ns) { + /** + * namespace C 3 leading comment + */ + var C = ns.C || (ns.C = {}); + (function (C) { + var C3 = /** @class */ (function () { + function C3() { + } + return C3; + }()); + C.C3 = C3; + })(C); // namespace C 3 trailing comment +})(ns); +(function (ns) { + var namespaceCUsage2 = ns.C.C1; +})(ns); +//// [b.js] +"use strict"; +exports.__esModule = true; +var a_1 = require("./a"); +var namespaceAExternalUsage1 = a_1["default"].A1; +var namespaceBExternalUsage1 = a_1.B.B2; diff --git a/tests/baselines/reference/exportDefaultNamespace.symbols b/tests/baselines/reference/exportDefaultNamespace.symbols new file mode 100644 index 0000000000000..4f596c387f5cf --- /dev/null +++ b/tests/baselines/reference/exportDefaultNamespace.symbols @@ -0,0 +1,140 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * namespace A 1 leading comment + */ +export default namespace A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 7, 1)) + + export const A1 = 42; +>A1 : Symbol(A1, Decl(a.ts, 6, 16)) + +} // namespace A 1 trailing comment + +/** + * namespace A 2 leading comment + */ +export default namespace A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 7, 1)) + + export function A2() { +>A2 : Symbol(A2, Decl(a.ts, 12, 28)) + + return 0xC0FFEE; + } +} // namespace A 2 trailing comment + +const namespaceAUsage1 = A.A1; +>namespaceAUsage1 : Symbol(namespaceAUsage1, Decl(a.ts, 18, 5)) +>A.A1 : Symbol(A.A1, Decl(a.ts, 6, 16)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(a.ts, 7, 1)) +>A1 : Symbol(A.A1, Decl(a.ts, 6, 16)) + +/** + * namespace B 1 leading comment + */ +export namespace B { +>B : Symbol(B, Decl(a.ts, 18, 30), Decl(a.ts, 25, 1)) + + export const B1 = 42; +>B1 : Symbol(B1, Decl(a.ts, 24, 16)) + +} // namespace B 1 trailing comment + +/** + * namespace B 2 leading comment + */ +export namespace B { +>B : Symbol(B, Decl(a.ts, 18, 30), Decl(a.ts, 25, 1)) + + export function B2() { +>B2 : Symbol(B2, Decl(a.ts, 30, 20)) + + return 0xC0FFEE; + } +} // namespace B 2 trailing comment + +const namespaceBUsage1 = B.B2(); +>namespaceBUsage1 : Symbol(namespaceBUsage1, Decl(a.ts, 36, 5)) +>B.B2 : Symbol(B.B2, Decl(a.ts, 30, 20)) +>B : Symbol(B, Decl(a.ts, 18, 30), Decl(a.ts, 25, 1)) +>B2 : Symbol(B.B2, Decl(a.ts, 30, 20)) + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 36, 32), Decl(a.ts, 56, 1), Decl(a.ts, 65, 1)) + + /** + * namespace C 1 leading comment + */ + export namespace C { +>C : Symbol(C, Decl(a.ts, 38, 14), Decl(a.ts, 44, 5), Decl(a.ts, 58, 14)) + + export const C1 = 42; +>C1 : Symbol(C1, Decl(a.ts, 43, 20)) + + } // namespace C 1 trailing comment + + /** + * namespace C 2 leading comment + */ + export namespace C { +>C : Symbol(C, Decl(a.ts, 38, 14), Decl(a.ts, 44, 5), Decl(a.ts, 58, 14)) + + export function C2() { +>C2 : Symbol(C2, Decl(a.ts, 49, 24)) + + return 0xC0FFEE; + } + } // namespace C 2 trailing comment + + const namespaceCUsage1 = C.C1; +>namespaceCUsage1 : Symbol(namespaceCUsage1, Decl(a.ts, 55, 9)) +>C.C1 : Symbol(C.C1, Decl(a.ts, 43, 20)) +>C : Symbol(C, Decl(a.ts, 38, 14), Decl(a.ts, 44, 5), Decl(a.ts, 58, 14)) +>C1 : Symbol(C.C1, Decl(a.ts, 43, 20)) +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 36, 32), Decl(a.ts, 56, 1), Decl(a.ts, 65, 1)) + + /** + * namespace C 3 leading comment + */ + export namespace C { +>C : Symbol(C, Decl(a.ts, 38, 14), Decl(a.ts, 44, 5), Decl(a.ts, 58, 14)) + + export class C3 { } +>C3 : Symbol(C3, Decl(a.ts, 62, 24)) + + } // namespace C 3 trailing comment +} + +namespace ns { +>ns : Symbol(ns, Decl(a.ts, 36, 32), Decl(a.ts, 56, 1), Decl(a.ts, 65, 1)) + + const namespaceCUsage2 = C.C1; +>namespaceCUsage2 : Symbol(namespaceCUsage2, Decl(a.ts, 68, 9)) +>C.C1 : Symbol(C.C1, Decl(a.ts, 43, 20)) +>C : Symbol(C, Decl(a.ts, 38, 14), Decl(a.ts, 44, 5), Decl(a.ts, 58, 14)) +>C1 : Symbol(C.C1, Decl(a.ts, 43, 20)) +} + + +=== tests/cases/compiler/b.ts === +import A, { B } from './a'; +>A : Symbol(A, Decl(b.ts, 0, 6)) +>B : Symbol(B, Decl(b.ts, 0, 11)) + +const namespaceAExternalUsage1 = A.A1; +>namespaceAExternalUsage1 : Symbol(namespaceAExternalUsage1, Decl(b.ts, 2, 5)) +>A.A1 : Symbol(A.A1, Decl(a.ts, 6, 16)) +>A : Symbol(A, Decl(b.ts, 0, 6)) +>A1 : Symbol(A.A1, Decl(a.ts, 6, 16)) + +const namespaceBExternalUsage1 = B.B2; +>namespaceBExternalUsage1 : Symbol(namespaceBExternalUsage1, Decl(b.ts, 3, 5)) +>B.B2 : Symbol(B.B2, Decl(a.ts, 30, 20)) +>B : Symbol(B, Decl(b.ts, 0, 11)) +>B2 : Symbol(B.B2, Decl(a.ts, 30, 20)) + diff --git a/tests/baselines/reference/exportDefaultNamespace.types b/tests/baselines/reference/exportDefaultNamespace.types new file mode 100644 index 0000000000000..9c34778960004 --- /dev/null +++ b/tests/baselines/reference/exportDefaultNamespace.types @@ -0,0 +1,147 @@ +=== tests/cases/compiler/a.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 + +/** + * namespace A 1 leading comment + */ +export default namespace A { +>A : typeof A + + export const A1 = 42; +>A1 : 42 +>42 : 42 + +} // namespace A 1 trailing comment + +/** + * namespace A 2 leading comment + */ +export default namespace A { +>A : typeof A + + export function A2() { +>A2 : () => number + + return 0xC0FFEE; +>0xC0FFEE : 12648430 + } +} // namespace A 2 trailing comment + +const namespaceAUsage1 = A.A1; +>namespaceAUsage1 : 42 +>A.A1 : 42 +>A : typeof A +>A1 : 42 + +/** + * namespace B 1 leading comment + */ +export namespace B { +>B : typeof B + + export const B1 = 42; +>B1 : 42 +>42 : 42 + +} // namespace B 1 trailing comment + +/** + * namespace B 2 leading comment + */ +export namespace B { +>B : typeof B + + export function B2() { +>B2 : () => number + + return 0xC0FFEE; +>0xC0FFEE : 12648430 + } +} // namespace B 2 trailing comment + +const namespaceBUsage1 = B.B2(); +>namespaceBUsage1 : number +>B.B2() : number +>B.B2 : () => number +>B : typeof B +>B2 : () => number + +namespace ns { +>ns : typeof ns + + /** + * namespace C 1 leading comment + */ + export namespace C { +>C : typeof C + + export const C1 = 42; +>C1 : 42 +>42 : 42 + + } // namespace C 1 trailing comment + + /** + * namespace C 2 leading comment + */ + export namespace C { +>C : typeof C + + export function C2() { +>C2 : () => number + + return 0xC0FFEE; +>0xC0FFEE : 12648430 + } + } // namespace C 2 trailing comment + + const namespaceCUsage1 = C.C1; +>namespaceCUsage1 : 42 +>C.C1 : 42 +>C : typeof C +>C1 : 42 +} + +namespace ns { +>ns : typeof ns + + /** + * namespace C 3 leading comment + */ + export namespace C { +>C : typeof C + + export class C3 { } +>C3 : C3 + + } // namespace C 3 trailing comment +} + +namespace ns { +>ns : typeof ns + + const namespaceCUsage2 = C.C1; +>namespaceCUsage2 : 42 +>C.C1 : 42 +>C : typeof C +>C1 : 42 +} + + +=== tests/cases/compiler/b.ts === +import A, { B } from './a'; +>A : typeof A +>B : typeof B + +const namespaceAExternalUsage1 = A.A1; +>namespaceAExternalUsage1 : 42 +>A.A1 : 42 +>A : typeof A +>A1 : 42 + +const namespaceBExternalUsage1 = B.B2; +>namespaceBExternalUsage1 : () => number +>B.B2 : () => number +>B : typeof B +>B2 : () => number + diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js index c8950a20e13dd..2986432c6a25e 100644 --- a/tests/baselines/reference/exportDefaultProperty.js +++ b/tests/baselines/reference/exportDefaultProperty.js @@ -44,7 +44,7 @@ fooLength + 1; //// [a.js] "use strict"; exports.__esModule = true; -var A; +var A = {}; (function (A) { var B = /** @class */ (function () { function B(b) { @@ -54,8 +54,8 @@ var A; A.B = B; (function (B) { B.b = 0; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); exports["default"] = A.B; //// [b.js] "use strict"; diff --git a/tests/baselines/reference/exportDefaultType.js b/tests/baselines/reference/exportDefaultType.js new file mode 100644 index 0000000000000..5e69c5a06ca20 --- /dev/null +++ b/tests/baselines/reference/exportDefaultType.js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/exportDefaultType.ts] //// + +//// [int.ts] +// https://github.com/Microsoft/TypeScript/issues/3792 +export default type int = number + +//// [b.ts] +import int from "./int"; + +const intUsage: int = 23; + +//// [int.js] +"use strict"; +exports.__esModule = true; +//// [b.js] +"use strict"; +exports.__esModule = true; +var intUsage = 23; diff --git a/tests/baselines/reference/exportDefaultType.symbols b/tests/baselines/reference/exportDefaultType.symbols new file mode 100644 index 0000000000000..22e3a2d7a6b3e --- /dev/null +++ b/tests/baselines/reference/exportDefaultType.symbols @@ -0,0 +1,13 @@ +=== tests/cases/compiler/int.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default type int = number +>int : Symbol(int, Decl(int.ts, 0, 0)) + +=== tests/cases/compiler/b.ts === +import int from "./int"; +>int : Symbol(int, Decl(b.ts, 0, 6)) + +const intUsage: int = 23; +>intUsage : Symbol(intUsage, Decl(b.ts, 2, 5)) +>int : Symbol(int, Decl(b.ts, 0, 6)) + diff --git a/tests/baselines/reference/exportDefaultType.types b/tests/baselines/reference/exportDefaultType.types new file mode 100644 index 0000000000000..9970afb1f9f6c --- /dev/null +++ b/tests/baselines/reference/exportDefaultType.types @@ -0,0 +1,13 @@ +=== tests/cases/compiler/int.ts === +// https://github.com/Microsoft/TypeScript/issues/3792 +export default type int = number +>int : number + +=== tests/cases/compiler/b.ts === +import int from "./int"; +>int : any + +const intUsage: int = 23; +>intUsage : number +>23 : 23 + diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js index 524675c6e3ee4..806088eccc695 100644 --- a/tests/baselines/reference/exportEqualsProperty.js +++ b/tests/baselines/reference/exportEqualsProperty.js @@ -42,7 +42,7 @@ fooLength + 1; //// [a.js] "use strict"; -var A; +var A = {}; (function (A) { var B = /** @class */ (function () { function B(b) { @@ -52,8 +52,8 @@ var A; A.B = B; (function (B) { B.b = 0; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); module.exports = A.B; //// [b.js] "use strict"; diff --git a/tests/baselines/reference/exportImportAlias.js b/tests/baselines/reference/exportImportAlias.js index 9b414bdb51412..32b89af5a9842 100644 --- a/tests/baselines/reference/exportImportAlias.js +++ b/tests/baselines/reference/exportImportAlias.js @@ -70,7 +70,7 @@ var p: M.D.Point; //// [exportImportAlias.js] // expect no errors here -var A; +var A = A || (A = {}); (function (A) { A.x = 'hello world'; var Point = /** @class */ (function () { @@ -81,16 +81,16 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); -var C; +})(A); +var C = C || (C = {}); (function (C) { C.a = A; -})(C || (C = {})); +})(C); var a = C.a.x; var b = new C.a.Point(0, 0); var c; var c; -var X; +var X = X || (X = {}); (function (X) { function Y() { return 42; @@ -105,16 +105,16 @@ var X; return Point; }()); Y.Point = Point; - })(Y = X.Y || (X.Y = {})); -})(X || (X = {})); -var Z; + })(Y); +})(X); +var Z = Z || (Z = {}); (function (Z) { // 'y' should be a fundule here Z.y = X.Y; -})(Z || (Z = {})); +})(Z); var m = Z.y(); var n = new Z.y.Point(0, 0); -var K; +var K = K || (K = {}); (function (K) { var L = /** @class */ (function () { function L(name) { @@ -125,12 +125,12 @@ var K; K.L = L; (function (L) { L.y = 12; - })(L = K.L || (K.L = {})); -})(K || (K = {})); -var M; + })(L); +})(K); +var M = M || (M = {}); (function (M) { M.D = K.L; -})(M || (M = {})); +})(M); var o; var o = new M.D('Hello'); var p; diff --git a/tests/baselines/reference/exportImportAndClodule.js b/tests/baselines/reference/exportImportAndClodule.js index 25942ae9dd480..ec4c740c1b7a3 100644 --- a/tests/baselines/reference/exportImportAndClodule.js +++ b/tests/baselines/reference/exportImportAndClodule.js @@ -20,7 +20,7 @@ var p: { x: number; y: number; } var p: M.D.Point; //// [exportImportAndClodule.js] -var K; +var K = K || (K = {}); (function (K) { var L = /** @class */ (function () { function L(name) { @@ -31,12 +31,12 @@ var K; K.L = L; (function (L) { L.y = 12; - })(L = K.L || (K.L = {})); -})(K || (K = {})); -var M; + })(L); +})(K); +var M = M || (M = {}); (function (M) { M.D = K.L; -})(M || (M = {})); +})(M); var o; var o = new M.D('Hello'); var p; diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.js b/tests/baselines/reference/exportImportNonInstantiatedModule.js index d9081efcd3619..1ead9829920fa 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule.js @@ -11,7 +11,7 @@ module B { var x: B.A1.I = { x: 1 }; //// [exportImportNonInstantiatedModule.js] -var B; +var B = B || (B = {}); (function (B) { -})(B || (B = {})); +})(B); var x = { x: 1 }; diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js index 24ecd232495c9..22a8cbe519e31 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js @@ -45,14 +45,14 @@ define(["require", "exports"], function (require, exports) { } return A; }()); - var B; + var B = {}; (function (B) { B.a = 1, B.c = 2; - })(B || (B = {})); - var C; + })(B); + var C = {}; (function (C) { C.a = 1, C.c = 2; - })(C || (C = {})); + })(C); // Shouldn't be filtered exports.a1 = 1; exports.b1 = 1; diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js index 8b4475e4bf9fa..d12aded836297 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js +++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js @@ -44,14 +44,14 @@ var A = /** @class */ (function () { } return A; }()); -var B; +var B = {}; (function (B) { B.a = 1, B.c = 2; -})(B || (B = {})); -var C; +})(B); +var C = {}; (function (C) { C.a = 1, C.c = 2; -})(C || (C = {})); +})(C); // Shouldn't be filtered exports.a1 = 1; exports.b1 = 1; diff --git a/tests/baselines/reference/exportNonInitializedVariablesES6.js b/tests/baselines/reference/exportNonInitializedVariablesES6.js index 20093a5edeb65..2e7d3339d0b46 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesES6.js +++ b/tests/baselines/reference/exportNonInitializedVariablesES6.js @@ -45,14 +45,14 @@ class A { } export var e; export let f; -var B; +const B = {}; (function (B) { B.a = 1, B.c = 2; -})(B || (B = {})); -var C; +})(B); +const C = {}; (function (C) { C.a = 1, C.c = 2; -})(C || (C = {})); +})(C); // Shouldn't be filtered export var a1 = 1; export let b1 = 1; diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js index 88f332eb30094..784553403e812 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js @@ -47,12 +47,14 @@ System.register([], function (exports_1, context_1) { } return A; }()); + B = {}; (function (B) { B.a = 1, B.c = 2; - })(B || (B = {})); + })(B); + C = {}; (function (C) { C.a = 1, C.c = 2; - })(C || (C = {})); + })(C); // Shouldn't be filtered exports_1("a1", a1 = 1); exports_1("b1", b1 = 1); diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js index bbea71b763dca..38d939c44a0ce 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js +++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js @@ -53,14 +53,14 @@ export let h1: D = new D; } return A; }()); - var B; + var B = {}; (function (B) { B.a = 1, B.c = 2; - })(B || (B = {})); - var C; + })(B); + var C = {}; (function (C) { C.a = 1, C.c = 2; - })(C || (C = {})); + })(C); // Shouldn't be filtered exports.a1 = 1; exports.b1 = 1; diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js index 3cf892571ec41..f8b2268796140 100644 --- a/tests/baselines/reference/exportPrivateType.js +++ b/tests/baselines/reference/exportPrivateType.js @@ -31,7 +31,7 @@ var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'. //// [exportPrivateType.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { var C1 = /** @class */ (function () { function C1() { @@ -44,5 +44,5 @@ var foo; C2.prototype.test = function () { return true; }; return C2; }()); -})(foo || (foo = {})); +})(foo); var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'. diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js index 068ac5db23b84..e48b63712374e 100644 --- a/tests/baselines/reference/exportedBlockScopedDeclarations.js +++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js @@ -26,17 +26,17 @@ define(["require", "exports"], function (require, exports) { function f() { var bar = bar; // compile error } - var NS; + var NS = {}; (function (NS) { NS.bar = NS.bar; // should be compile error - })(NS || (NS = {})); + })(NS); var foo1 = foo1; // compile error exports.bar1 = exports.bar1; // should be compile error function f1() { var bar1 = bar1; // compile error } - var NS1; + var NS1 = {}; (function (NS1) { NS1.bar1 = NS1.bar1; // should be compile error - })(NS1 || (NS1 = {})); + })(NS1); }); diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js index f93abb906d2a7..6f41a63da1fbf 100644 --- a/tests/baselines/reference/exportsAndImports1-amd.js +++ b/tests/baselines/reference/exportsAndImports1-amd.js @@ -47,17 +47,17 @@ define(["require", "exports"], function (require, exports) { return C; }()); exports.C = C; - var E; + var E = {}; + exports.E = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); - exports.E = E; - var M; - (function (M) { - })(M || (M = {})); + })(E); + var M = {}; exports.M = M; + (function (M) { + })(M); var a = M.x; exports.a = a; }); diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index 71e8de6f9faa0..c13688343010b 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -43,17 +43,17 @@ exports.f = f; class C { } exports.C = C; -var E; +const E = {}; +exports.E = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); -exports.E = E; -var M; -(function (M) { -})(M || (M = {})); +})(E); +const M = {}; exports.M = M; +(function (M) { +})(M); var a = M.x; exports.a = a; //// [t2.js] diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index 156a7bd1152a2..04c48159d9363 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -46,17 +46,17 @@ var C = /** @class */ (function () { return C; }()); exports.C = C; -var E; +var E = {}; +exports.E = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); -exports.E = E; -var M; -(function (M) { -})(M || (M = {})); +})(E); +var M = {}; exports.M = M; +(function (M) { +})(M); var a = M.x; exports.a = a; //// [t2.js] diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js index 6ee327f979d8a..156c42cf2acce 100644 --- a/tests/baselines/reference/exportsAndImports3-amd.js +++ b/tests/baselines/reference/exportsAndImports3-amd.js @@ -49,17 +49,17 @@ define(["require", "exports"], function (require, exports) { }()); exports.C = C; exports.C1 = C; - var E; + var E = {}; + exports.E1 = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E = exports.E || (exports.E = {})); - exports.E1 = E; - var M; - (function (M) { - })(M = exports.M || (exports.M = {})); + })(E); + var M = {}; exports.M1 = M; + (function (M) { + })(M); exports.a = M.x; exports.a1 = exports.a; }); diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index 541223717773e..890e7f356dba5 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -45,17 +45,17 @@ class C { } exports.C = C; exports.C1 = C; -var E; +const E = {}; +exports.E1 = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E = exports.E || (exports.E = {})); -exports.E1 = E; -var M; -(function (M) { -})(M = exports.M || (exports.M = {})); +})(E); +const M = {}; exports.M1 = M; +(function (M) { +})(M); exports.a = M.x; exports.a1 = exports.a; //// [t2.js] diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index e5a0b47639107..a4a5a3b621f0d 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -48,17 +48,17 @@ var C = /** @class */ (function () { }()); exports.C = C; exports.C1 = C; -var E; +var E = {}; +exports.E1 = E; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E = exports.E || (exports.E = {})); -exports.E1 = E; -var M; -(function (M) { -})(M = exports.M || (exports.M = {})); +})(E); +var M = {}; exports.M1 = M; +(function (M) { +})(M); exports.a = M.x; exports.a1 = exports.a; //// [t2.js] diff --git a/tests/baselines/reference/expr.js b/tests/baselines/reference/expr.js index 689ff1e27dc14..cee2514a2243a 100644 --- a/tests/baselines/reference/expr.js +++ b/tests/baselines/reference/expr.js @@ -246,12 +246,12 @@ function f() { } //// [expr.js] -var E; +var E = E || (E = {}); (function (E) { E[E["Red"] = 0] = "Red"; E[E["Green"] = 1] = "Green"; E[E["Blue"] = 2] = "Blue"; -})(E || (E = {})); +})(E); function f() { var a; var n = 3; diff --git a/tests/baselines/reference/extBaseClass1.js b/tests/baselines/reference/extBaseClass1.js index c328cfcd80199..3e515700cbb28 100644 --- a/tests/baselines/reference/extBaseClass1.js +++ b/tests/baselines/reference/extBaseClass1.js @@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var B = /** @class */ (function () { function B() { @@ -50,7 +50,7 @@ var M; return C; }(B)); M.C = C; -})(M || (M = {})); +})(M); (function (M) { var C2 = /** @class */ (function (_super) { __extends(C2, _super); @@ -60,8 +60,8 @@ var M; return C2; }(M.B)); M.C2 = C2; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var C3 = /** @class */ (function (_super) { __extends(C3, _super); @@ -71,4 +71,4 @@ var N; return C3; }(M.B)); N.C3 = C3; -})(N || (N = {})); +})(N); diff --git a/tests/baselines/reference/extBaseClass2.js b/tests/baselines/reference/extBaseClass2.js index 0af8e0314557b..0b6d10bf3851a 100644 --- a/tests/baselines/reference/extBaseClass2.js +++ b/tests/baselines/reference/extBaseClass2.js @@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var N; +var N = N || (N = {}); (function (N) { var C4 = /** @class */ (function (_super) { __extends(C4, _super); @@ -34,8 +34,8 @@ var N; return C4; }(M.B)); N.C4 = C4; -})(N || (N = {})); -var M; +})(N); +var M = M || (M = {}); (function (M) { var C5 = /** @class */ (function (_super) { __extends(C5, _super); @@ -45,4 +45,4 @@ var M; return C5; }(B)); M.C5 = C5; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js index 1ef5be538831e..d2cc05ef3cfee 100644 --- a/tests/baselines/reference/externalModuleResolution.js +++ b/tests/baselines/reference/externalModuleResolution.js @@ -18,10 +18,10 @@ x.Y // .ts should be picked //// [foo.js] "use strict"; -var M2; +var M2 = {}; (function (M2) { M2.Y = 1; -})(M2 || (M2 = {})); +})(M2); module.exports = M2; //// [consumer.js] "use strict"; diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js index 2c3c9facff18c..516f14044da45 100644 --- a/tests/baselines/reference/externalModuleResolution2.js +++ b/tests/baselines/reference/externalModuleResolution2.js @@ -19,10 +19,10 @@ x.X // .ts should be picked //// [foo.js] "use strict"; -var M2; +var M2 = {}; (function (M2) { M2.X = 1; -})(M2 || (M2 = {})); +})(M2); module.exports = M2; //// [consumer.js] "use strict"; diff --git a/tests/baselines/reference/fatArrowSelf.js b/tests/baselines/reference/fatArrowSelf.js index 4b12f5690f50e..49d1b91b7522d 100644 --- a/tests/baselines/reference/fatArrowSelf.js +++ b/tests/baselines/reference/fatArrowSelf.js @@ -25,7 +25,7 @@ module Consumer { } //// [fatArrowSelf.js] -var Events; +var Events = Events || (Events = {}); (function (Events) { var EventEmitter = /** @class */ (function () { function EventEmitter() { @@ -35,8 +35,8 @@ var Events; return EventEmitter; }()); Events.EventEmitter = EventEmitter; -})(Events || (Events = {})); -var Consumer; +})(Events); +var Consumer = Consumer || (Consumer = {}); (function (Consumer) { var EventEmitterConsummer = /** @class */ (function () { function EventEmitterConsummer(emitter) { @@ -52,4 +52,4 @@ var Consumer; }; return EventEmitterConsummer; }()); -})(Consumer || (Consumer = {})); +})(Consumer); diff --git a/tests/baselines/reference/flowControlTypeGuardThenSwitch.js b/tests/baselines/reference/flowControlTypeGuardThenSwitch.js index 381cdad58e17c..09b592b48a183 100644 --- a/tests/baselines/reference/flowControlTypeGuardThenSwitch.js +++ b/tests/baselines/reference/flowControlTypeGuardThenSwitch.js @@ -37,11 +37,11 @@ if (isBoth(foo)) { //// [flowControlTypeGuardThenSwitch.js] -var Kind; +var Kind = Kind || (Kind = {}); (function (Kind) { Kind[Kind["A"] = 0] = "A"; Kind[Kind["B"] = 1] = "B"; -})(Kind || (Kind = {})); +})(Kind); function isBoth(x) { return true; } diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js index acf517c757b4a..f2b67dff15bed 100644 --- a/tests/baselines/reference/for-inStatements.js +++ b/tests/baselines/reference/for-inStatements.js @@ -148,7 +148,7 @@ var B = /** @class */ (function (_super) { }(A)); var i; for (var x in i[42]) { } -var M; +var M = M || (M = {}); (function (M) { var X = /** @class */ (function () { function X() { @@ -156,13 +156,13 @@ var M; return X; }()); M.X = X; -})(M || (M = {})); +})(M); for (var x in M) { } for (var x in M.X) { } -var Color; +var Color = Color || (Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Blue"] = 1] = "Blue"; -})(Color || (Color = {})); +})(Color); for (var x in Color) { } for (var x in Color.Blue) { } diff --git a/tests/baselines/reference/for-of47.js b/tests/baselines/reference/for-of47.js index d7e596d2edc14..5100a0cba159c 100644 --- a/tests/baselines/reference/for-of47.js +++ b/tests/baselines/reference/for-of47.js @@ -10,10 +10,10 @@ for ({x, y: y = E.x} of array) { //// [for-of47.js] var x, y; var array = [{ x: "", y: true }]; -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 0] = "x"; -})(E || (E = {})); +})(E); for ({ x, y: y = E.x } of array) { x; y; diff --git a/tests/baselines/reference/for-of48.js b/tests/baselines/reference/for-of48.js index 65e23076fd952..22c1c81b2e270 100644 --- a/tests/baselines/reference/for-of48.js +++ b/tests/baselines/reference/for-of48.js @@ -10,10 +10,10 @@ for ({x, y = E.x} of array) { //// [for-of48.js] var x, y; var array = [{ x: "", y: true }]; -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 0] = "x"; -})(E || (E = {})); +})(E); for ({ x, y = E.x } of array) { x; y; diff --git a/tests/baselines/reference/forInModule.js b/tests/baselines/reference/forInModule.js index 24d2ede55fdd0..c4d6240de447d 100644 --- a/tests/baselines/reference/forInModule.js +++ b/tests/baselines/reference/forInModule.js @@ -6,9 +6,9 @@ module Foo { } //// [forInModule.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { for (var i = 0; i < 1; i++) { i + i; } -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js index a8713cfb37c20..0881795e33ca3 100644 --- a/tests/baselines/reference/forStatements.js +++ b/tests/baselines/reference/forStatements.js @@ -58,7 +58,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -68,7 +68,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); for (var aNumber = 9.9;;) { } for (var aString = 'this is a string';;) { } for (var aDate = new Date(12);;) { } diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js index fb2a7071c11a8..ab5c0e44a535b 100644 --- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js +++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js @@ -85,7 +85,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -95,7 +95,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); // all of these are errors for (var a;;) { } for (var a = 1;;) { } diff --git a/tests/baselines/reference/forgottenNew.js b/tests/baselines/reference/forgottenNew.js index 25b60e9af152b..f654f657254fb 100644 --- a/tests/baselines/reference/forgottenNew.js +++ b/tests/baselines/reference/forgottenNew.js @@ -6,7 +6,7 @@ module Tools { var logger = Tools.NullLogger(); //// [forgottenNew.js] -var Tools; +var Tools = Tools || (Tools = {}); (function (Tools) { var NullLogger = /** @class */ (function () { function NullLogger() { @@ -14,5 +14,5 @@ var Tools; return NullLogger; }()); Tools.NullLogger = NullLogger; -})(Tools || (Tools = {})); +})(Tools); var logger = Tools.NullLogger(); diff --git a/tests/baselines/reference/forwardRefInEnum.js b/tests/baselines/reference/forwardRefInEnum.js index 592adbd2534c0..25e9f11cf92a7 100644 --- a/tests/baselines/reference/forwardRefInEnum.js +++ b/tests/baselines/reference/forwardRefInEnum.js @@ -15,7 +15,7 @@ enum E1 { //// [forwardRefInEnum.js] -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { // illegal case // forward reference to the element of the same enum @@ -24,7 +24,7 @@ var E1; // forward reference to the element of the same enum E1[E1["Y"] = 0] = "Y"; E1[E1["Y1"] = 0] = "Y1"; -})(E1 || (E1 = {})); +})(E1); (function (E1) { E1[E1["Z"] = 4] = "Z"; -})(E1 || (E1 = {})); +})(E1); diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js index 77117bcd6399a..1e6b4ae117a40 100644 --- a/tests/baselines/reference/funClodule.js +++ b/tests/baselines/reference/funClodule.js @@ -24,7 +24,7 @@ function foo3() { } (function (foo3) { function x() { } foo3.x = x; -})(foo3 || (foo3 = {})); +})(foo3); var foo3 = /** @class */ (function () { function foo3() { } diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js index 348d25bd6706d..8dd9fe6789f03 100644 --- a/tests/baselines/reference/funcdecl.js +++ b/tests/baselines/reference/funcdecl.js @@ -116,12 +116,12 @@ function overload1(ns) { } var withOverloadSignature = overload1; function f(n) { } -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { function foo(n) { } m2.foo = foo; -})(m2 || (m2 = {})); +})(m2); m2.foo(function () { var b = 30; return b; diff --git a/tests/baselines/reference/functionCall5.js b/tests/baselines/reference/functionCall5.js index 705dc68b077e2..6b290e30374c3 100644 --- a/tests/baselines/reference/functionCall5.js +++ b/tests/baselines/reference/functionCall5.js @@ -4,7 +4,7 @@ function foo():m1.c1{return new m1.c1();}; var x = foo(); //// [functionCall5.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var c1 = /** @class */ (function () { function c1() { @@ -12,7 +12,7 @@ var m1; return c1; }()); m1.c1 = c1; -})(m1 || (m1 = {})); +})(m1); function foo() { return new m1.c1(); } ; var x = foo(); diff --git a/tests/baselines/reference/functionCall7.js b/tests/baselines/reference/functionCall7.js index cc2d9298afcdf..6a945818377e3 100644 --- a/tests/baselines/reference/functionCall7.js +++ b/tests/baselines/reference/functionCall7.js @@ -9,7 +9,7 @@ foo(); //// [functionCall7.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var c1 = /** @class */ (function () { function c1() { @@ -17,7 +17,7 @@ var m1; return c1; }()); m1.c1 = c1; -})(m1 || (m1 = {})); +})(m1); function foo(a) { a.a = 1; } ; var myC = new m1.c1(); diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.js b/tests/baselines/reference/functionExpressionContextualTyping1.js index 97cab6dd7e9f9..f3a80bfe590a5 100644 --- a/tests/baselines/reference/functionExpressionContextualTyping1.js +++ b/tests/baselines/reference/functionExpressionContextualTyping1.js @@ -59,11 +59,11 @@ class C { //// [functionExpressionContextualTyping1.js] // When a function expression with no type parameters and no parameter type annotations // is contextually typed (section 4.19) by a type T and a contextual signature S can be extracted from T -var E; +var E = E || (E = {}); (function (E) { E[E["red"] = 0] = "red"; E[E["blue"] = 1] = "blue"; -})(E || (E = {})); +})(E); // A contextual signature S is extracted from a function type T as follows: // If T is a function type with exactly one call signature, and if that call signature is non- generic, S is that signature. var a0 = function (num, str) { diff --git a/tests/baselines/reference/functionInIfStatementInModule.js b/tests/baselines/reference/functionInIfStatementInModule.js index 13cbc6532ef17..148301555f4c1 100644 --- a/tests/baselines/reference/functionInIfStatementInModule.js +++ b/tests/baselines/reference/functionInIfStatementInModule.js @@ -11,10 +11,10 @@ module Midori //// [functionInIfStatementInModule.js] -var Midori; +var Midori = Midori || (Midori = {}); (function (Midori) { if (false) { function Foo(src) { } } -})(Midori || (Midori = {})); +})(Midori); diff --git a/tests/baselines/reference/functionMergedWithModule.js b/tests/baselines/reference/functionMergedWithModule.js index 9265ee9bc1fc7..5c56bad7be3b9 100644 --- a/tests/baselines/reference/functionMergedWithModule.js +++ b/tests/baselines/reference/functionMergedWithModule.js @@ -19,19 +19,19 @@ function foo(title) { var x = 10; } (function (foo) { - var Bar; + var Bar = foo.Bar || (foo.Bar = {}); (function (Bar) { function f() { } Bar.f = f; - })(Bar = foo.Bar || (foo.Bar = {})); -})(foo || (foo = {})); + })(Bar); +})(foo); (function (foo) { - var Baz; + var Baz = foo.Baz || (foo.Baz = {}); (function (Baz) { function g() { foo.Bar.f(); } Baz.g = g; - })(Baz = foo.Baz || (foo.Baz = {})); -})(foo || (foo = {})); + })(Baz); +})(foo); diff --git a/tests/baselines/reference/functionNameConflicts.js b/tests/baselines/reference/functionNameConflicts.js index 87b61e3733d1f..c7a3bfbc8c767 100644 --- a/tests/baselines/reference/functionNameConflicts.js +++ b/tests/baselines/reference/functionNameConflicts.js @@ -30,13 +30,13 @@ function overrr() { //// [functionNameConflicts.js] //Function and variable of the same name in same declaration space //Function overload with different name from implementation signature -var M; +var M = M || (M = {}); (function (M) { function fn1() { } var fn1; var fn2; function fn2() { } -})(M || (M = {})); +})(M); function fn3() { } var fn3; function func() { diff --git a/tests/baselines/reference/functionOverloadErrors.js b/tests/baselines/reference/functionOverloadErrors.js index 1a15009de37fc..5552788ac615c 100644 --- a/tests/baselines/reference/functionOverloadErrors.js +++ b/tests/baselines/reference/functionOverloadErrors.js @@ -143,12 +143,12 @@ var cls = /** @class */ (function () { return cls; }()); //Function overloads with differing export -var M; +var M = M || (M = {}); (function (M) { function fn1() { } function fn2() { } M.fn2 = fn2; -})(M || (M = {})); +})(M); function dfn1() { } function dfn2() { } function fewerParams(n) { diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.js b/tests/baselines/reference/functionTypeArgumentArrayAssignment.js index 38188c3505a83..a1705cb6bf7e4 100644 --- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.js +++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.js @@ -12,9 +12,9 @@ module test { //// [functionTypeArgumentArrayAssignment.js] -var test; +var test = test || (test = {}); (function (test) { function map() { var ys = []; } -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js index 868a755bf7e82..2e98c112b2382 100644 --- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js +++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.js @@ -13,4 +13,4 @@ function fn() { } (function (fn) { fn.n = 1; -})(fn || (fn = {})); +})(fn); diff --git a/tests/baselines/reference/funduleSplitAcrossFiles.js b/tests/baselines/reference/funduleSplitAcrossFiles.js index bb59338a6300d..d69fa45b84753 100644 --- a/tests/baselines/reference/funduleSplitAcrossFiles.js +++ b/tests/baselines/reference/funduleSplitAcrossFiles.js @@ -12,8 +12,8 @@ D.y; //// [funduleSplitAcrossFiles_function.js] function D() { } //// [funduleSplitAcrossFiles_module.js] -var D; +var D = D || (D = {}); (function (D) { D.y = "hi"; -})(D || (D = {})); +})(D); D.y; diff --git a/tests/baselines/reference/fuzzy.js b/tests/baselines/reference/fuzzy.js index e5dd9a76fe7ed..e4957363be114 100644 --- a/tests/baselines/reference/fuzzy.js +++ b/tests/baselines/reference/fuzzy.js @@ -31,7 +31,7 @@ module M { //// [fuzzy.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C(x) { @@ -49,4 +49,4 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js index 40bc100ac3c8e..b20f46b2b7c4d 100644 --- a/tests/baselines/reference/generatedContextualTyping.js +++ b/tests/baselines/reference/generatedContextualTyping.js @@ -1156,102 +1156,102 @@ var x177 = function () { return [d1, d2]; }; var x178 = function () { return { n: [d1, d2] }; }; var x179 = function () { return function (n) { var n; return null; }; }; var x180 = function () { return { func: function (n) { return [d1, d2]; } }; }; -var x181; +var x181 = x181 || (x181 = {}); (function (x181) { var t = function () { return [d1, d2]; }; -})(x181 || (x181 = {})); -var x182; +})(x181); +var x182 = x182 || (x182 = {}); (function (x182) { var t = function () { return [d1, d2]; }; -})(x182 || (x182 = {})); -var x183; +})(x182); +var x183 = x183 || (x183 = {}); (function (x183) { var t = function named() { return [d1, d2]; }; -})(x183 || (x183 = {})); -var x184; +})(x183); +var x184 = x184 || (x184 = {}); (function (x184) { var t = function () { return [d1, d2]; }; -})(x184 || (x184 = {})); -var x185; +})(x184); +var x185 = x185 || (x185 = {}); (function (x185) { var t = function () { return [d1, d2]; }; -})(x185 || (x185 = {})); -var x186; +})(x185); +var x186 = x186 || (x186 = {}); (function (x186) { var t = function named() { return [d1, d2]; }; -})(x186 || (x186 = {})); -var x187; +})(x186); +var x187 = x187 || (x187 = {}); (function (x187) { var t = [d1, d2]; -})(x187 || (x187 = {})); -var x188; +})(x187); +var x188 = x188 || (x188 = {}); (function (x188) { var t = [d1, d2]; -})(x188 || (x188 = {})); -var x189; +})(x188); +var x189 = x189 || (x189 = {}); (function (x189) { var t = [d1, d2]; -})(x189 || (x189 = {})); -var x190; +})(x189); +var x190 = x190 || (x190 = {}); (function (x190) { var t = { n: [d1, d2] }; -})(x190 || (x190 = {})); -var x191; +})(x190); +var x191 = x191 || (x191 = {}); (function (x191) { var t = function (n) { var n; return null; }; -})(x191 || (x191 = {})); -var x192; +})(x191); +var x192 = x192 || (x192 = {}); (function (x192) { var t = { func: function (n) { return [d1, d2]; } }; -})(x192 || (x192 = {})); -var x193; +})(x192); +var x193 = x193 || (x193 = {}); (function (x193) { x193.t = function () { return [d1, d2]; }; -})(x193 || (x193 = {})); -var x194; +})(x193); +var x194 = x194 || (x194 = {}); (function (x194) { x194.t = function () { return [d1, d2]; }; -})(x194 || (x194 = {})); -var x195; +})(x194); +var x195 = x195 || (x195 = {}); (function (x195) { x195.t = function named() { return [d1, d2]; }; -})(x195 || (x195 = {})); -var x196; +})(x195); +var x196 = x196 || (x196 = {}); (function (x196) { x196.t = function () { return [d1, d2]; }; -})(x196 || (x196 = {})); -var x197; +})(x196); +var x197 = x197 || (x197 = {}); (function (x197) { x197.t = function () { return [d1, d2]; }; -})(x197 || (x197 = {})); -var x198; +})(x197); +var x198 = x198 || (x198 = {}); (function (x198) { x198.t = function named() { return [d1, d2]; }; -})(x198 || (x198 = {})); -var x199; +})(x198); +var x199 = x199 || (x199 = {}); (function (x199) { x199.t = [d1, d2]; -})(x199 || (x199 = {})); -var x200; +})(x199); +var x200 = x200 || (x200 = {}); (function (x200) { x200.t = [d1, d2]; -})(x200 || (x200 = {})); -var x201; +})(x200); +var x201 = x201 || (x201 = {}); (function (x201) { x201.t = [d1, d2]; -})(x201 || (x201 = {})); -var x202; +})(x201); +var x202 = x202 || (x202 = {}); (function (x202) { x202.t = { n: [d1, d2] }; -})(x202 || (x202 = {})); -var x203; +})(x202); +var x203 = x203 || (x203 = {}); (function (x203) { x203.t = function (n) { var n; return null; }; -})(x203 || (x203 = {})); -var x204; +})(x203); +var x204 = x204 || (x204 = {}); (function (x204) { x204.t = { func: function (n) { return [d1, d2]; } }; -})(x204 || (x204 = {})); +})(x204); var x206 = function () { return [d1, d2]; }; var x207 = function named() { return [d1, d2]; }; var x209 = function () { return [d1, d2]; }; diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.js b/tests/baselines/reference/generativeRecursionWithTypeOf.js index 19403d0450f83..93f4f081d18eb 100644 --- a/tests/baselines/reference/generativeRecursionWithTypeOf.js +++ b/tests/baselines/reference/generativeRecursionWithTypeOf.js @@ -17,10 +17,10 @@ var C = /** @class */ (function () { C.foo = function (x) { }; return C; }()); -var M; +var M = M || (M = {}); (function (M) { function f(x) { return new x(); } M.f = f; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/generatorInAmbientContext6.js b/tests/baselines/reference/generatorInAmbientContext6.js index 10cfa85d933af..f3f1e2acacbf6 100644 --- a/tests/baselines/reference/generatorInAmbientContext6.js +++ b/tests/baselines/reference/generatorInAmbientContext6.js @@ -4,11 +4,11 @@ module M { } //// [generatorInAmbientContext6.js] -var M; +var M = M || (M = {}); (function (M) { function* generator() { } M.generator = generator; -})(M || (M = {})); +})(M); //// [generatorInAmbientContext6.d.ts] diff --git a/tests/baselines/reference/generatorOverloads1.js b/tests/baselines/reference/generatorOverloads1.js index 0ce5ae10f4d8b..b682c32953cb5 100644 --- a/tests/baselines/reference/generatorOverloads1.js +++ b/tests/baselines/reference/generatorOverloads1.js @@ -6,7 +6,7 @@ module M { } //// [generatorOverloads1.js] -var M; +var M = M || (M = {}); (function (M) { function* f(s) { } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/generatorOverloads5.js b/tests/baselines/reference/generatorOverloads5.js index c6d928045fab1..a3ebe896c8421 100644 --- a/tests/baselines/reference/generatorOverloads5.js +++ b/tests/baselines/reference/generatorOverloads5.js @@ -6,7 +6,7 @@ module M { } //// [generatorOverloads5.js] -var M; +var M = M || (M = {}); (function (M) { function* f(s) { } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js index 42ba2b3233c43..4fae06d45dff7 100644 --- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js +++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.js @@ -87,38 +87,38 @@ module m6 { //// [genericCallToOverloadedMethodWithOverloadedArguments.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m1 || (m1 = {})); +})(m1); ////////////////////////////////////// -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m2 || (m2 = {})); +})(m2); ////////////////////////////////////// -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m3 || (m3 = {})); +})(m3); ////////////////////////////////////// -var m4; +var m4 = m4 || (m4 = {}); (function (m4) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m4 || (m4 = {})); +})(m4); ////////////////////////////////////// -var m5; +var m5 = m5 || (m5 = {}); (function (m5) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m5 || (m5 = {})); +})(m5); ////////////////////////////////////// -var m6; +var m6 = m6 || (m6 = {}); (function (m6) { var numPromise; var newPromise = numPromise.then(testFunction); -})(m6 || (m6 = {})); +})(m6); diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js index 1aabe9cfa2b1c..67a809aa3fd34 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js @@ -76,7 +76,7 @@ module TU { //// [genericCallWithGenericSignatureArguments2.js] // When a function expression is inferentially typed (section 4.9.3) and a type assigned to a parameter in that expression references type parameters for which inferences are being made, // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them. -var onlyT; +var onlyT = onlyT || (onlyT = {}); (function (onlyT) { function foo(a, b) { var r; @@ -97,21 +97,21 @@ var onlyT; var r7 = foo2(function (a) { return a; }, function (b) { return b; }); // error var r7b = foo2(function (a) { return a; }, function (b) { return b; }); // valid, T is inferred to be Date } - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; - })(E || (E = {})); - var F; + })(E); + var F = F || (F = {}); (function (F) { F[F["A"] = 0] = "A"; - })(F || (F = {})); + })(F); function foo3(x, a, b) { var r; return r; } var r7 = foo3(E.A, function (x) { return E.A; }, function (x) { return F.A; }); // error -})(onlyT || (onlyT = {})); -var TU; +})(onlyT); +var TU = TU || (TU = {}); (function (TU) { function foo(a, b) { var r; @@ -131,17 +131,17 @@ var TU; var r7 = foo2(function (a) { return a; }, function (b) { return b; }); var r7b = foo2(function (a) { return a; }, function (b) { return b; }); } - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; - })(E || (E = {})); - var F; + })(E); + var F = F || (F = {}); (function (F) { F[F["A"] = 0] = "A"; - })(F || (F = {})); + })(F); function foo3(x, a, b) { var r; return r; } var r7 = foo3(E.A, function (x) { return E.A; }, function (x) { return F.A; }); -})(TU || (TU = {})); +})(TU); diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js index 36566033a489f..968a18696632d 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js @@ -46,14 +46,14 @@ var r2 = foo('', function (x) { return ''; }, function (x) { return ''; }); // s var r3 = foo(null, function (x) { return ''; }, function (x) { return ''; }); // Object => Object var r4 = foo(null, function (x) { return ''; }, function (x) { return ''; }); // any => any var r5 = foo(new Object(), function (x) { return ''; }, function (x) { return ''; }); // Object => Object -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); -var F; +})(E); +var F = F || (F = {}); (function (F) { F[F["A"] = 0] = "A"; -})(F || (F = {})); +})(F); var r6 = foo(E.A, function (x) { return E.A; }, function (x) { return F.A; }); // number => number function foo2(x, a, b) { var r; diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js index 4f74b043bd9f3..f6270c9105d6d 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js @@ -51,7 +51,7 @@ module GenericParameter { //// [genericCallWithOverloadedConstructorTypedArguments.js] // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -var NonGenericParameter; +var NonGenericParameter = NonGenericParameter || (NonGenericParameter = {}); (function (NonGenericParameter) { var a; function foo4(cb) { @@ -60,8 +60,8 @@ var NonGenericParameter; var r = foo4(a); var b; var r2 = foo4(b); -})(NonGenericParameter || (NonGenericParameter = {})); -var GenericParameter; +})(NonGenericParameter); +var GenericParameter = GenericParameter || (GenericParameter = {}); (function (GenericParameter) { function foo5(cb) { return cb; @@ -83,4 +83,4 @@ var GenericParameter; var c2; var r14 = foo7(1, c); // new any => string; new(x:any, y?:any) => string var r15 = foo7(1, c2); // new any => string; new(x:any, y?:any) => string -})(GenericParameter || (GenericParameter = {})); +})(GenericParameter); diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js index 88044f82fdb18..bc51cd5a5e2e1 100644 --- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments2.js @@ -43,7 +43,7 @@ module GenericParameter { //// [genericCallWithOverloadedConstructorTypedArguments2.js] // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -var NonGenericParameter; +var NonGenericParameter = NonGenericParameter || (NonGenericParameter = {}); (function (NonGenericParameter) { var a; function foo4(cb) { @@ -51,8 +51,8 @@ var NonGenericParameter; } var b; var r3 = foo4(b); // ok -})(NonGenericParameter || (NonGenericParameter = {})); -var GenericParameter; +})(NonGenericParameter); +var GenericParameter = GenericParameter || (GenericParameter = {}); (function (GenericParameter) { function foo5(cb) { return cb; @@ -70,4 +70,4 @@ var GenericParameter; var r13 = foo7(1, a); // ok var c; var r14 = foo7(1, c); // ok -})(GenericParameter || (GenericParameter = {})); +})(GenericParameter); diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js index dea5948242be1..15e3156315f01 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.js @@ -47,7 +47,7 @@ module GenericParameter { //// [genericCallWithOverloadedFunctionTypedArguments.js] // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -var NonGenericParameter; +var NonGenericParameter = NonGenericParameter || (NonGenericParameter = {}); (function (NonGenericParameter) { var a; function foo4(cb) { @@ -56,8 +56,8 @@ var NonGenericParameter; var r = foo4(a); var r2 = foo4(function (x) { return x; }); var r4 = foo4(function (x) { return x; }); -})(NonGenericParameter || (NonGenericParameter = {})); -var GenericParameter; +})(NonGenericParameter); +var GenericParameter = GenericParameter || (GenericParameter = {}); (function (GenericParameter) { function foo5(cb) { return cb; @@ -78,4 +78,4 @@ var GenericParameter; var r13 = foo7(1, function (x) { return ''; }); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] var a; var r14 = foo7(1, a); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed] -})(GenericParameter || (GenericParameter = {})); +})(GenericParameter); diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js index b4f96f67942b8..a7544e7acfae7 100644 --- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments2.js @@ -40,15 +40,15 @@ module GenericParameter { //// [genericCallWithOverloadedFunctionTypedArguments2.js] // Function typed arguments with multiple signatures must be passed an implementation that matches all of them // Inferences are made quadratic-pairwise to and from these overload sets -var NonGenericParameter; +var NonGenericParameter = NonGenericParameter || (NonGenericParameter = {}); (function (NonGenericParameter) { var a; function foo4(cb) { return cb; } var r3 = foo4(function (x) { var r; return r; }); // ok -})(NonGenericParameter || (NonGenericParameter = {})); -var GenericParameter; +})(NonGenericParameter); +var GenericParameter = GenericParameter || (GenericParameter = {}); (function (GenericParameter) { function foo5(cb) { return cb; @@ -64,4 +64,4 @@ var GenericParameter; var r13 = foo7(1, function (x) { return x; }); // ok var a; var r14 = foo7(1, a); // ok -})(GenericParameter || (GenericParameter = {})); +})(GenericParameter); diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js index 61a4434db9aa6..0ca4970cbc2b0 100644 --- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js +++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js @@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var C1 = /** @class */ (function () { function C1() { @@ -72,4 +72,4 @@ var M; return D; }()); M.D = D; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js index 4cad4e20e7d69..939c6761293d1 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js @@ -8,7 +8,7 @@ module bar { //// [genericClassImplementingGenericInterfaceFromAnotherModule.js] -var bar; +var bar = bar || (bar = {}); (function (bar) { var Foo = /** @class */ (function () { function Foo() { @@ -16,7 +16,7 @@ var bar; return Foo; }()); bar.Foo = Foo; -})(bar || (bar = {})); +})(bar); //// [genericClassImplementingGenericInterfaceFromAnotherModule.d.ts] diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js index adaa1b5b19e6f..37db2836ccf3e 100644 --- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js +++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js @@ -89,11 +89,11 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Portal; +var Portal = Portal || (Portal = {}); (function (Portal) { - var Controls; + var Controls = Portal.Controls || (Portal.Controls = {}); (function (Controls) { - var Validators; + var Validators = Controls.Validators || (Controls.Validators = {}); (function (Validators) { var Validator = /** @class */ (function () { function Validator(message) { @@ -103,16 +103,16 @@ var Portal; return Validator; }()); Validators.Validator = Validator; - })(Validators = Controls.Validators || (Controls.Validators = {})); - })(Controls = Portal.Controls || (Portal.Controls = {})); -})(Portal || (Portal = {})); -var PortalFx; + })(Validators); + })(Controls); +})(Portal); +var PortalFx = PortalFx || (PortalFx = {}); (function (PortalFx) { - var ViewModels; + var ViewModels = PortalFx.ViewModels || (PortalFx.ViewModels = {}); (function (ViewModels) { - var Controls; + var Controls = ViewModels.Controls || (ViewModels.Controls = {}); (function (Controls) { - var Validators; + var Validators = Controls.Validators || (Controls.Validators = {}); (function (Validators) { var Validator = /** @class */ (function (_super) { __extends(Validator, _super); @@ -122,10 +122,10 @@ var PortalFx; return Validator; }(Portal.Controls.Validators.Validator)); Validators.Validator = Validator; - })(Validators = Controls.Validators || (Controls.Validators = {})); - })(Controls = ViewModels.Controls || (ViewModels.Controls = {})); - })(ViewModels = PortalFx.ViewModels || (PortalFx.ViewModels = {})); -})(PortalFx || (PortalFx = {})); + })(Validators); + })(Controls); + })(ViewModels); +})(PortalFx); var ViewModel = /** @class */ (function () { function ViewModel() { this.validators = ko.observableArray(); diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js index 30b98f7de2b80..35ef9ac5f5e6f 100644 --- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js +++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js @@ -67,7 +67,7 @@ module WithCandidates { //// [genericClassWithFunctionTypedMemberArguments.js] // Generic functions used as arguments for function typed parameters are not used to make inferences from // Using function arguments, no errors expected -var ImmediatelyFix; +var ImmediatelyFix = ImmediatelyFix || (ImmediatelyFix = {}); (function (ImmediatelyFix) { var C = /** @class */ (function () { function C() { @@ -92,8 +92,8 @@ var ImmediatelyFix; var c2 = new C2(); var ra = c2.foo(function (x) { return 1; }); // number var r3a = c2.foo(function (x) { return 1; }); // number -})(ImmediatelyFix || (ImmediatelyFix = {})); -var WithCandidates; +})(ImmediatelyFix); +var WithCandidates = WithCandidates || (WithCandidates = {}); (function (WithCandidates) { var C = /** @class */ (function () { function C() { @@ -134,4 +134,4 @@ var WithCandidates; var r11b = c3.foo3(1, function (x) { return ''; }, 1); // error var r12 = c3.foo3(1, function (a) { return ''; }, 1); // error } -})(WithCandidates || (WithCandidates = {})); +})(WithCandidates); diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js index 2b8199d6898e0..1b0f36e446c37 100644 --- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js +++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js @@ -78,7 +78,7 @@ var X = /** @class */ (function () { } return X; }()); -var Class; +var Class = Class || (Class = {}); (function (Class) { var G = /** @class */ (function () { function G() { @@ -106,8 +106,8 @@ var Class; var g2; var r = g2.foo2(c1, d1); var r2 = g2.foo2(c1, c1); -})(Class || (Class = {})); -var Interface; +})(Class); +var Interface = Interface || (Interface = {}); (function (Interface) { var c1 = new X(); var d1 = new X(); @@ -117,4 +117,4 @@ var Interface; var g2; var r = g2.foo2(c1, d1); var r2 = g2.foo2(c1, c1); -})(Interface || (Interface = {})); +})(Interface); diff --git a/tests/baselines/reference/genericClassWithStaticFactory.js b/tests/baselines/reference/genericClassWithStaticFactory.js index a8ca7b0247437..eccf22f3bb911 100644 --- a/tests/baselines/reference/genericClassWithStaticFactory.js +++ b/tests/baselines/reference/genericClassWithStaticFactory.js @@ -142,7 +142,7 @@ module Editor { } //// [genericClassWithStaticFactory.js] -var Editor; +var Editor = Editor || (Editor = {}); (function (Editor) { var List = /** @class */ (function () { function List(isHead, data) { @@ -264,4 +264,4 @@ var Editor; return ListFactory; }()); Editor.ListFactory = ListFactory; -})(Editor || (Editor = {})); +})(Editor); diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js index ba081f814dc81..a208c12d4215f 100644 --- a/tests/baselines/reference/genericClassesInModule.js +++ b/tests/baselines/reference/genericClassesInModule.js @@ -9,7 +9,7 @@ module Foo { var a = new Foo.B(); //// [genericClassesInModule.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var B = /** @class */ (function () { function B() { @@ -23,7 +23,7 @@ var Foo; return A; }()); Foo.A = A; -})(Foo || (Foo = {})); +})(Foo); var a = new Foo.B(); diff --git a/tests/baselines/reference/genericCloduleInModule.js b/tests/baselines/reference/genericCloduleInModule.js index 97fb6378df0da..7bc9bba05f6cd 100644 --- a/tests/baselines/reference/genericCloduleInModule.js +++ b/tests/baselines/reference/genericCloduleInModule.js @@ -13,7 +13,7 @@ var b: A.B; b.foo(); //// [genericCloduleInModule.js] -var A; +var A = A || (A = {}); (function (A) { var B = /** @class */ (function () { function B() { @@ -25,7 +25,7 @@ var A; A.B = B; (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var b; b.foo(); diff --git a/tests/baselines/reference/genericCloduleInModule2.js b/tests/baselines/reference/genericCloduleInModule2.js index 8f610bed876d7..c1b897961ba0d 100644 --- a/tests/baselines/reference/genericCloduleInModule2.js +++ b/tests/baselines/reference/genericCloduleInModule2.js @@ -16,7 +16,7 @@ var b: A.B; b.foo(); //// [genericCloduleInModule2.js] -var A; +var A = A || (A = {}); (function (A) { var B = /** @class */ (function () { function B() { @@ -26,12 +26,12 @@ var A; return B; }()); A.B = B; -})(A || (A = {})); +})(A); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var b; b.foo(); diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js index 45eec58281035..b0fad0d8a37fe 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js @@ -40,9 +40,9 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var EndGate; +var EndGate = EndGate || (EndGate = {}); (function (EndGate) { - var Tweening; + var Tweening = EndGate.Tweening || (EndGate.Tweening = {}); (function (Tweening) { var Tween = /** @class */ (function () { function Tween(from) { @@ -51,10 +51,10 @@ var EndGate; return Tween; }()); Tweening.Tween = Tween; - })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); -})(EndGate || (EndGate = {})); + })(Tweening); +})(EndGate); (function (EndGate) { - var Tweening; + var Tweening = EndGate.Tweening || (EndGate.Tweening = {}); (function (Tweening) { var NumberTween = /** @class */ (function (_super) { __extends(NumberTween, _super); @@ -64,5 +64,5 @@ var EndGate; return NumberTween; }(Tweening.Tween)); Tweening.NumberTween = NumberTween; - })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); -})(EndGate || (EndGate = {})); + })(Tweening); +})(EndGate); diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js index 66d71d14f922f..0af154fb8971f 100644 --- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js +++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js @@ -39,9 +39,9 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var EndGate; +var EndGate = EndGate || (EndGate = {}); (function (EndGate) { - var Tweening; + var Tweening = EndGate.Tweening || (EndGate.Tweening = {}); (function (Tweening) { var Tween = /** @class */ (function () { function Tween(from) { @@ -50,10 +50,10 @@ var EndGate; return Tween; }()); Tweening.Tween = Tween; - })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); -})(EndGate || (EndGate = {})); + })(Tweening); +})(EndGate); (function (EndGate) { - var Tweening; + var Tweening = EndGate.Tweening || (EndGate.Tweening = {}); (function (Tweening) { var NumberTween = /** @class */ (function (_super) { __extends(NumberTween, _super); @@ -63,5 +63,5 @@ var EndGate; return NumberTween; }(Tweening.Tween)); Tweening.NumberTween = NumberTween; - })(Tweening = EndGate.Tweening || (EndGate.Tweening = {})); -})(EndGate || (EndGate = {})); + })(Tweening); +})(EndGate); diff --git a/tests/baselines/reference/genericFunduleInModule.js b/tests/baselines/reference/genericFunduleInModule.js index 9bd1e47b420ed..190c2525d50e4 100644 --- a/tests/baselines/reference/genericFunduleInModule.js +++ b/tests/baselines/reference/genericFunduleInModule.js @@ -10,13 +10,13 @@ var b: A.B; A.B(1); //// [genericFunduleInModule.js] -var A; +var A = A || (A = {}); (function (A) { function B(x) { return x; } A.B = B; (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var b; A.B(1); diff --git a/tests/baselines/reference/genericFunduleInModule2.js b/tests/baselines/reference/genericFunduleInModule2.js index 2523b4fe12601..112ef422c9011 100644 --- a/tests/baselines/reference/genericFunduleInModule2.js +++ b/tests/baselines/reference/genericFunduleInModule2.js @@ -13,16 +13,16 @@ var b: A.B; A.B(1); //// [genericFunduleInModule2.js] -var A; +var A = A || (A = {}); (function (A) { function B(x) { return x; } A.B = B; -})(A || (A = {})); +})(A); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { B.x = 1; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var b; A.B(1); diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js index 56a64e8934f30..496e3961bf452 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter.js @@ -10,4 +10,4 @@ module foo { function foo(y, z) { return y; } (function (foo) { var y = 1; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js index 36637719e19f6..270b203a21678 100644 --- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js +++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js @@ -14,4 +14,4 @@ var foo = /** @class */ (function () { }()); (function (foo) { var y = 1; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js index 84f1a31d83ed1..a443d6da30c6b 100644 --- a/tests/baselines/reference/genericOfACloduleType1.js +++ b/tests/baselines/reference/genericOfACloduleType1.js @@ -19,7 +19,7 @@ var G = /** @class */ (function () { G.prototype.bar = function (x) { return x; }; return G; }()); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -35,8 +35,8 @@ var M; return X; }()); C.X = X; - })(C = M.C || (M.C = {})); + })(C); var g1 = new G(); g1.bar(null).foo(); -})(M || (M = {})); +})(M); var g2 = new G(); // was: error Type reference cannot refer to container 'M.C'. diff --git a/tests/baselines/reference/genericOfACloduleType2.js b/tests/baselines/reference/genericOfACloduleType2.js index 51607688724fe..6e57c6677cbca 100644 --- a/tests/baselines/reference/genericOfACloduleType2.js +++ b/tests/baselines/reference/genericOfACloduleType2.js @@ -22,7 +22,7 @@ var G = /** @class */ (function () { G.prototype.bar = function (x) { return x; }; return G; }()); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -38,11 +38,11 @@ var M; return X; }()); C.X = X; - })(C = M.C || (M.C = {})); + })(C); var g1 = new G(); g1.bar(null).foo(); // no error -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var g2 = new G(); -})(N || (N = {})); +})(N); diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js index b0132efc2c6eb..13e4573b9a0c2 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js @@ -40,16 +40,16 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var TypeScript2; +var TypeScript2 = TypeScript2 || (TypeScript2 = {}); (function (TypeScript2) { ; ; ; - var PullSymbolVisibility; + var PullSymbolVisibility = TypeScript2.PullSymbolVisibility || (TypeScript2.PullSymbolVisibility = {}); (function (PullSymbolVisibility) { PullSymbolVisibility[PullSymbolVisibility["Private"] = 0] = "Private"; PullSymbolVisibility[PullSymbolVisibility["Public"] = 1] = "Public"; - })(PullSymbolVisibility = TypeScript2.PullSymbolVisibility || (TypeScript2.PullSymbolVisibility = {})); + })(PullSymbolVisibility); var PullSymbol = /** @class */ (function () { function PullSymbol(name, declKind) { } @@ -70,4 +70,4 @@ var TypeScript2; return PullTypeSymbol; }(PullSymbol)); TypeScript2.PullTypeSymbol = PullTypeSymbol; -})(TypeScript2 || (TypeScript2 = {})); +})(TypeScript2); diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js index 90385f80048a5..aafe6deda2fc1 100644 --- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js +++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js @@ -44,7 +44,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var MemberName = /** @class */ (function () { function MemberName() { @@ -54,7 +54,7 @@ var TypeScript; return MemberName; }()); TypeScript.MemberName = MemberName; -})(TypeScript || (TypeScript = {})); +})(TypeScript); (function (TypeScript) { var PullSymbol = /** @class */ (function () { function PullSymbol() { @@ -86,4 +86,4 @@ var TypeScript; return PullTypeSymbol; }(PullSymbol)); TypeScript.PullTypeSymbol = PullTypeSymbol; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js index 98b84c426b5ef..a55470757ed8f 100644 --- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js +++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js @@ -72,7 +72,7 @@ var D = /** @class */ (function (_super) { } return D; }(C)); -var M; +var M = M || (M = {}); (function (M) { var E = /** @class */ (function () { function E() { @@ -80,7 +80,7 @@ var M; return E; }()); M.E = E; -})(M || (M = {})); +})(M); var D2 = /** @class */ (function (_super) { __extends(D2, _super); function D2() { diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js index bc4a40dfecdff..97d0d349bc47d 100644 --- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js +++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js @@ -28,7 +28,7 @@ module MyModule { } //// [getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js] -var MyModule; +var MyModule = MyModule || (MyModule = {}); (function (MyModule) { var MyClass = /** @class */ (function () { function MyClass() { @@ -44,4 +44,4 @@ var MyModule; return MyClass; }()); MyModule.MyClass = MyClass; -})(MyModule || (MyModule = {})); +})(MyModule); diff --git a/tests/baselines/reference/getEmitOutputOut.baseline b/tests/baselines/reference/getEmitOutputOut.baseline index 26bb4e1b69328..fb71c9e9bfa6e 100644 --- a/tests/baselines/reference/getEmitOutputOut.baseline +++ b/tests/baselines/reference/getEmitOutputOut.baseline @@ -2,12 +2,12 @@ EmitSkipped: false FileName : out.js /// -var foo; +var foo = foo || (foo = {}); (function (foo) { - var bar; + var bar = foo.bar || (foo.bar = {}); (function (bar) { var baz1 = bar.Baz.prototype; // Should emit as bar.Baz.prototype - })(bar = foo.bar || (foo.bar = {})); -})(foo || (foo = {})); + })(bar); +})(foo); var x; diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline index 7ad60f361bb01..4be0dd0bc7776 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline @@ -1,7 +1,7 @@ EmitSkipped: false FileName : /tests/cases/fourslash/inputFile.js -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -9,7 +9,7 @@ var M; return C; }()); M.foo = new C(); -})(M || (M = {})); +})(M); FileName : /tests/cases/fourslash/inputFile.d.ts declare module M { diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 46ba9652cc7db..3d0cd3908ddf9 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -9,10 +9,10 @@ define(["require", "exports"], function (require, exports) { } return C; }()); - var M; + var M = {}; (function (M) { M.foo = new C(); - })(M = exports.M || (exports.M = {})); + })(M); }); FileName : /tests/cases/fourslash/inputFile.d.ts diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index e76937b00ab7a..539269d0ead07 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -744,7 +744,7 @@ define(["require", "exports"], function (require, exports) { }); return C; }()); - var M; + var M = {}; (function (M_1) { var V; function F() { } @@ -793,7 +793,7 @@ define(["require", "exports"], function (require, exports) { }); return C; }()); - var M; + var M = M || (M = {}); (function (M) { var V; function F() { } @@ -821,7 +821,7 @@ define(["require", "exports"], function (require, exports) { ; ; ; - })(M || (M = {})); + })(M); function eF() { } M_1.eF = eF; ; @@ -870,7 +870,7 @@ define(["require", "exports"], function (require, exports) { return eC; }()); M_1.eC = eC; - var eM; + var eM = M_1.eM || (M_1.eM = {}); (function (eM) { var V; function F() { } @@ -898,9 +898,9 @@ define(["require", "exports"], function (require, exports) { ; ; ; - })(eM = M_1.eM || (M_1.eM = {})); + })(eM); ; - })(M || (M = {})); + })(M); function eF() { } exports.eF = eF; ; @@ -949,7 +949,7 @@ define(["require", "exports"], function (require, exports) { return eC; }()); exports.eC = eC; - var eM; + var eM = {}; (function (eM_1) { var V; function F() { } @@ -998,7 +998,7 @@ define(["require", "exports"], function (require, exports) { }); return C; }()); - var M; + var M = M || (M = {}); (function (M) { var V; function F() { } @@ -1026,7 +1026,7 @@ define(["require", "exports"], function (require, exports) { ; ; ; - })(M || (M = {})); + })(M); function eF() { } eM_1.eF = eF; ; @@ -1075,7 +1075,7 @@ define(["require", "exports"], function (require, exports) { return eC; }()); eM_1.eC = eC; - var eM; + var eM = eM_1.eM || (eM_1.eM = {}); (function (eM) { var V; function F() { } @@ -1103,9 +1103,9 @@ define(["require", "exports"], function (require, exports) { ; ; ; - })(eM = eM_1.eM || (eM_1.eM = {})); + })(eM); ; - })(eM = exports.eM || (exports.eM = {})); + })(eM); ; }); diff --git a/tests/baselines/reference/global.js b/tests/baselines/reference/global.js index a187e026710ed..4b1db3e6aa6ae 100644 --- a/tests/baselines/reference/global.js +++ b/tests/baselines/reference/global.js @@ -11,12 +11,12 @@ M.f(3); //// [global.js] -var M; +var M = M || (M = {}); (function (M) { function f(y) { return x + y; } M.f = f; -})(M || (M = {})); +})(M); var x = 10; M.f(3); diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js index 2a93b6cad7d1b..9447b74234529 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.js +++ b/tests/baselines/reference/heterogeneousArrayLiterals.js @@ -193,15 +193,15 @@ var derived2; var o = [derived, derived2]; // {}[] var p = [derived, derived2, base]; // Base[] var q = [[function () { return derived2; }], [function () { return derived; }]]; // {}[] -})(Derived || (Derived = {})); -var WithContextualType; +})(Derived); +var WithContextualType = WithContextualType || (WithContextualType = {}); (function (WithContextualType) { // no errors var a = [derived, derived2]; var b = [null]; var c = []; var d = [function () { return derived; }, function () { return derived2; }]; -})(WithContextualType || (WithContextualType = {})); +})(WithContextualType); function foo(t, u) { var a = [t, t]; // T[] var b = [t, null]; // T[] diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js index 1a2d83c710c4e..12f931c170c7c 100644 --- a/tests/baselines/reference/ifDoWhileStatements.js +++ b/tests/baselines/reference/ifDoWhileStatements.js @@ -195,7 +195,7 @@ var D = /** @class */ (function () { }()); function F(x) { return 42; } function F2(x) { return x < 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -205,8 +205,8 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var A = /** @class */ (function () { function A() { @@ -216,7 +216,7 @@ var N; N.A = A; function F2(x) { return x.toString(); } N.F2 = F2; -})(N || (N = {})); +})(N); // literals if (true) { } while (true) { } diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js index 0924f447d44be..2955b6ee4929d 100644 --- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js +++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js @@ -126,7 +126,7 @@ var Bar3 = /** @class */ (function (_super) { return Bar3; }(Foo)); // another level of indirection -var M; +var M = M || (M = {}); (function (M) { var Foo = /** @class */ (function () { function Foo() { @@ -161,9 +161,9 @@ var M; } return Bar3; }(Foo)); -})(M || (M = {})); +})(M); // two levels of privates -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var Foo = /** @class */ (function () { function Foo() { @@ -202,4 +202,4 @@ var M2; } return Bar3; }(Foo)); -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.js b/tests/baselines/reference/implicitAnyInAmbientDeclaration.js index 7807f8fc1ee02..6286c16ea74ee 100644 --- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.js +++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.js @@ -11,6 +11,6 @@ module Test { } //// [implicitAnyInAmbientDeclaration.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js index 60bea32e305fa..ebe55fb304a8a 100644 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js @@ -17,18 +17,18 @@ module m_private { //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js] "use strict"; exports.__esModule = true; -var m; +var m = {}; (function (m) { function foo() { } m.foo = foo; -})(m = exports.m || (exports.m = {})); +})(m); //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js] "use strict"; exports.__esModule = true; var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0"); -var m_private; +var m_private = {}; (function (m_private) { //import r2 = require('m'); // would be error m_private.C = r; // no error m_private.C.m.foo(); -})(m_private || (m_private = {})); +})(m_private); diff --git a/tests/baselines/reference/importAliasFromNamespace.js b/tests/baselines/reference/importAliasFromNamespace.js index 56a53d6e84716..7552713503976 100644 --- a/tests/baselines/reference/importAliasFromNamespace.js +++ b/tests/baselines/reference/importAliasFromNamespace.js @@ -22,19 +22,19 @@ namespace SomeOther.Thing { } //// [internal.js] -var My; +var My = My || (My = {}); (function (My) { - var Internal; + var Internal = My.Internal || (My.Internal = {}); (function (Internal) { function getThing() { } Internal.getThing = getThing; - })(Internal = My.Internal || (My.Internal = {})); -})(My || (My = {})); + })(Internal); +})(My); //// [usage.js] /// -var SomeOther; +var SomeOther = SomeOther || (SomeOther = {}); (function (SomeOther) { - var Thing; + var Thing = SomeOther.Thing || (SomeOther.Thing = {}); (function (Thing) { var Internal = My.Internal; var Foo = /** @class */ (function () { @@ -45,8 +45,8 @@ var SomeOther; return Foo; }()); Thing.Foo = Foo; - })(Thing = SomeOther.Thing || (SomeOther.Thing = {})); -})(SomeOther || (SomeOther = {})); + })(Thing); +})(SomeOther); //// [internal.d.ts] diff --git a/tests/baselines/reference/importAliasIdentifiers.js b/tests/baselines/reference/importAliasIdentifiers.js index 94c8c8079ade3..ea9f1c42ce556 100644 --- a/tests/baselines/reference/importAliasIdentifiers.js +++ b/tests/baselines/reference/importAliasIdentifiers.js @@ -47,7 +47,7 @@ var p: fundule.Point; var p: { x: number; y: number; }; //// [importAliasIdentifiers.js] -var moduleA; +var moduleA = moduleA || (moduleA = {}); (function (moduleA) { var Point = /** @class */ (function () { function Point(x, y) { @@ -57,7 +57,7 @@ var moduleA; return Point; }()); moduleA.Point = Point; -})(moduleA || (moduleA = {})); +})(moduleA); var alias = moduleA; var p; var p; @@ -69,7 +69,7 @@ var clodule = /** @class */ (function () { }()); (function (clodule) { var Point = { x: 0, y: 0 }; -})(clodule || (clodule = {})); +})(clodule); var clolias = clodule; var p; var p; @@ -79,7 +79,7 @@ function fundule() { } (function (fundule) { var Point = { x: 0, y: 0 }; -})(fundule || (fundule = {})); +})(fundule); var funlias = fundule; var p; var p; diff --git a/tests/baselines/reference/importAliasWithDottedName.js b/tests/baselines/reference/importAliasWithDottedName.js index b78657f53ad68..6a7e4aa3b9519 100644 --- a/tests/baselines/reference/importAliasWithDottedName.js +++ b/tests/baselines/reference/importAliasWithDottedName.js @@ -13,17 +13,17 @@ module A { } //// [importAliasWithDottedName.js] -var M; +var M = M || (M = {}); (function (M) { M.x = 1; - var N; + var N = M.N || (M.N = {}); (function (N) { N.y = 2; - })(N = M.N || (M.N = {})); -})(M || (M = {})); -var A; + })(N); +})(M); +var A = A || (A = {}); (function (A) { var N = M.N; var r = N.y; var r2 = M.N.y; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict1.js b/tests/baselines/reference/importAndVariableDeclarationConflict1.js index b812deec0ef45..9bb9172ca627e 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict1.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict1.js @@ -8,9 +8,9 @@ var x = ''; //// [importAndVariableDeclarationConflict1.js] -var m; +var m = m || (m = {}); (function (m_1) { m_1.m = ''; -})(m || (m = {})); +})(m); var x = m.m; var x = ''; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.js b/tests/baselines/reference/importAndVariableDeclarationConflict2.js index 03c8b8d9232b6..5505b1437e1c2 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict2.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.js @@ -12,10 +12,10 @@ class C { } //// [importAndVariableDeclarationConflict2.js] -var m; +var m = m || (m = {}); (function (m_1) { m_1.m = ''; -})(m || (m = {})); +})(m); var x = m.m; var C = /** @class */ (function () { function C() { diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict3.js b/tests/baselines/reference/importAndVariableDeclarationConflict3.js index 887aec16c59b0..078496783117e 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict3.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict3.js @@ -8,9 +8,9 @@ import x = m.m; //// [importAndVariableDeclarationConflict3.js] -var m; +var m = m || (m = {}); (function (m_1) { m_1.m = ''; -})(m || (m = {})); +})(m); var x = m.m; var x = m.m; diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict4.js b/tests/baselines/reference/importAndVariableDeclarationConflict4.js index 4949df6366a42..5056976e2b251 100644 --- a/tests/baselines/reference/importAndVariableDeclarationConflict4.js +++ b/tests/baselines/reference/importAndVariableDeclarationConflict4.js @@ -8,9 +8,9 @@ import x = m.m; //// [importAndVariableDeclarationConflict4.js] -var m; +var m = m || (m = {}); (function (m_1) { m_1.m = ''; -})(m || (m = {})); +})(m); var x = ''; var x = m.m; diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index 2eb9208910a07..48977ba9eaa41 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -143,7 +143,7 @@ var m4 = require("./importDecl_require"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); -var m1; +var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -151,7 +151,7 @@ var m1; var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); +})(m1); //Emit global only usage var glo_m4 = require("./importDecl_require1"); exports.useGlo_m4_d4 = glo_m4.d; @@ -161,12 +161,12 @@ var fncOnly_m4 = require("./importDecl_require2"); exports.useFncOnly_m4_f4 = fncOnly_m4.foo(); // only used privately no need to emit var private_m4 = require("./importDecl_require3"); -var usePrivate_m4_m1; +var usePrivate_m4_m1 = {}; (function (usePrivate_m4_m1) { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); -})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); +})(usePrivate_m4_m1); // Do not emit unused import var m5 = require("./importDecl_require4"); exports.d = m5.foo2(); diff --git a/tests/baselines/reference/importInTypePosition.js b/tests/baselines/reference/importInTypePosition.js index 23ed08db28524..c861910900954 100644 --- a/tests/baselines/reference/importInTypePosition.js +++ b/tests/baselines/reference/importInTypePosition.js @@ -22,7 +22,7 @@ module C { //// [importInTypePosition.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -33,11 +33,11 @@ var A; }()); A.Point = Point; A.Origin = new Point(0, 0); -})(A || (A = {})); +})(A); // no code gen expected -var C; +var C = C || (C = {}); (function (C) { var m; var p; var p = { x: 0, y: 0 }; -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index da492a7103d92..c5a0fa66da319 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -12,7 +12,7 @@ export module myModule { //// [importInsideModule_file2.js] "use strict"; exports.__esModule = true; -var myModule; +var myModule = {}; (function (myModule) { var a = foo.x; -})(myModule = exports.myModule || (exports.myModule = {})); +})(myModule); diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js index 0340bcd35cb3e..8675e436b89ab 100644 --- a/tests/baselines/reference/importNonExternalModule.js +++ b/tests/baselines/reference/importNonExternalModule.js @@ -14,10 +14,10 @@ if(foo.answer === 42){ //// [foo_0.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { foo.answer = 42; -})(foo || (foo = {})); +})(foo); //// [foo_1.js] define(["require", "exports", "./foo_0"], function (require, exports, foo) { "use strict"; diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.js b/tests/baselines/reference/importOnAliasedIdentifiers.js index ceb6ebb7b2e32..3b09372bd97fe 100644 --- a/tests/baselines/reference/importOnAliasedIdentifiers.js +++ b/tests/baselines/reference/importOnAliasedIdentifiers.js @@ -11,11 +11,11 @@ module B { } //// [importOnAliasedIdentifiers.js] -var A; +var A = A || (A = {}); (function (A) { -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var Z = A.X; // Alias for both type and member A.X var v = Z; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/importStatements.js b/tests/baselines/reference/importStatements.js index 9592f5a35d7bc..ef5a2b3148290 100644 --- a/tests/baselines/reference/importStatements.js +++ b/tests/baselines/reference/importStatements.js @@ -35,7 +35,7 @@ module E { } //// [importStatements.js] -var A; +var A = A || (A = {}); (function (A) { var Point = /** @class */ (function () { function Point(x, y) { @@ -46,25 +46,25 @@ var A; }()); A.Point = Point; A.Origin = new Point(0, 0); -})(A || (A = {})); +})(A); // no code gen expected -var C; +var C = C || (C = {}); (function (C) { var m; var p; var p = { x: 0, y: 0 }; -})(C || (C = {})); +})(C); // code gen expected -var D; +var D = D || (D = {}); (function (D) { var a = A; var p = new a.Point(1, 1); -})(D || (D = {})); -var E; +})(D); +var E = E || (E = {}); (function (E) { var a = A; function xDist(x) { return (a.Origin.x - x.x); } E.xDist = xDist; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/importStatementsInterfaces.js b/tests/baselines/reference/importStatementsInterfaces.js index 4f7bb4475659e..46eccff6d1c8e 100644 --- a/tests/baselines/reference/importStatementsInterfaces.js +++ b/tests/baselines/reference/importStatementsInterfaces.js @@ -43,22 +43,22 @@ module E { //// [importStatementsInterfaces.js] // no code gen expected -var C; +var C = C || (C = {}); (function (C) { var m; var p; var p = { x: 0, y: 0, z: 0 }; -})(C || (C = {})); +})(C); // no code gen expected -var D; +var D = D || (D = {}); (function (D) { var p; -})(D || (D = {})); +})(D); // no code gen expected -var E; +var E = E || (E = {}); (function (E) { function xDist(x) { return 0 - x.x; } E.xDist = xDist; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js index 263ab20108711..c7c350b930d9a 100644 --- a/tests/baselines/reference/import_reference-exported-alias.js +++ b/tests/baselines/reference/import_reference-exported-alias.js @@ -24,9 +24,9 @@ var x = new UserServices().getUserName(); //// [file1.js] define(["require", "exports"], function (require, exports) { "use strict"; - var App; + var App = {}; (function (App) { - var Services; + var Services = App.Services || (App.Services = {}); (function (Services) { var UserServices = /** @class */ (function () { function UserServices() { @@ -37,8 +37,8 @@ define(["require", "exports"], function (require, exports) { return UserServices; }()); Services.UserServices = UserServices; - })(Services = App.Services || (App.Services = {})); - })(App || (App = {})); + })(Services); + })(App); var Mod = App; return Mod; }); diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js index 624c5192b5036..e3da54a2b3e84 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.js +++ b/tests/baselines/reference/import_reference-to-type-alias.js @@ -21,9 +21,9 @@ var x = new Services.UserServices().getUserName(); define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var App; + var App = {}; (function (App) { - var Services; + var Services = App.Services || (App.Services = {}); (function (Services) { var UserServices = /** @class */ (function () { function UserServices() { @@ -34,8 +34,8 @@ define(["require", "exports"], function (require, exports) { return UserServices; }()); Services.UserServices = UserServices; - })(Services = App.Services || (App.Services = {})); - })(App = exports.App || (exports.App = {})); + })(Services); + })(App); }); //// [file2.js] define(["require", "exports", "file1"], function (require, exports, appJs) { diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js index aad4739b7766d..1973c27386b0c 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.js +++ b/tests/baselines/reference/importedAliasesInTypePositions.js @@ -22,13 +22,13 @@ export module ImportingModule { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var elaborate; + var elaborate = {}; (function (elaborate) { - var nested; + var nested = elaborate.nested || (elaborate.nested = {}); (function (nested) { - var mod; + var mod = nested.mod || (nested.mod = {}); (function (mod) { - var name; + var name = mod.name || (mod.name = {}); (function (name) { var ReferredTo = /** @class */ (function () { function ReferredTo() { @@ -38,16 +38,16 @@ define(["require", "exports"], function (require, exports) { return ReferredTo; }()); name.ReferredTo = ReferredTo; - })(name = mod.name || (mod.name = {})); - })(mod = nested.mod || (nested.mod = {})); - })(nested = elaborate.nested || (elaborate.nested = {})); - })(elaborate = exports.elaborate || (exports.elaborate = {})); + })(name); + })(mod); + })(nested); + })(elaborate); }); //// [file2.js] define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var ImportingModule; + var ImportingModule = {}; (function (ImportingModule) { var UsesReferredType = /** @class */ (function () { function UsesReferredType(referred) { @@ -55,5 +55,5 @@ define(["require", "exports"], function (require, exports) { } return UsesReferredType; }()); - })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {})); + })(ImportingModule); }); diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js index a8c0fc8cdbe78..f50384dff21d3 100644 --- a/tests/baselines/reference/importedModuleAddToGlobal.js +++ b/tests/baselines/reference/importedModuleAddToGlobal.js @@ -17,7 +17,7 @@ module C { } //// [importedModuleAddToGlobal.js] -var B; +var B = B || (B = {}); (function (B_1) { var B = /** @class */ (function () { function B() { @@ -25,8 +25,8 @@ var B; return B; }()); B_1.B = B; -})(B || (B = {})); -var C; +})(B); +var C = C || (C = {}); (function (C) { function hello() { return null; } -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.js b/tests/baselines/reference/inOperatorWithInvalidOperands.js index 005681b62857b..009dbbda2589b 100644 --- a/tests/baselines/reference/inOperatorWithInvalidOperands.js +++ b/tests/baselines/reference/inOperatorWithInvalidOperands.js @@ -44,10 +44,10 @@ var rb10 = x in undefined; var rc1 = {} in ''; //// [inOperatorWithInvalidOperands.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; -})(E || (E = {})); +})(E); var x; // invalid left operands // the left operand is required to be of type Any, the String primitive type, or the Number primitive type diff --git a/tests/baselines/reference/incrementAndDecrement.js b/tests/baselines/reference/incrementAndDecrement.js index 49324498c9a04..23ee0bf12e852 100644 --- a/tests/baselines/reference/incrementAndDecrement.js +++ b/tests/baselines/reference/incrementAndDecrement.js @@ -62,12 +62,12 @@ w--; // Error //// [incrementAndDecrement.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); +})(E); ; var x = 4; var e = E.B; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js index a2a579f32f967..4df148c5d6e4f 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js @@ -59,9 +59,9 @@ var A = /** @class */ (function () { } return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsNumber1 = ++ANY; diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js index c02e6e39a9892..afd8596722099 100644 --- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js @@ -88,9 +88,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsNumber1 = ++ANY2; diff --git a/tests/baselines/reference/incrementOperatorWithEnumType.js b/tests/baselines/reference/incrementOperatorWithEnumType.js index e3e843a45da57..e4cbbd2cbc7d7 100644 --- a/tests/baselines/reference/incrementOperatorWithEnumType.js +++ b/tests/baselines/reference/incrementOperatorWithEnumType.js @@ -14,12 +14,12 @@ ENUM1.B++; //// [incrementOperatorWithEnumType.js] // ++ operator on enum type -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // expression var ResultIsNumber1 = ++ENUM1["B"]; diff --git a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.js index 3bc43cefa4bab..1a5a18c09a4b4 100644 --- a/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithEnumTypeInvalidOperations.js @@ -24,16 +24,16 @@ ENUM1++; //// [incrementOperatorWithEnumTypeInvalidOperations.js] // ++ operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsNumber1 = ++ENUM; diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.js b/tests/baselines/reference/incrementOperatorWithNumberType.js index d4c857148e8ff..eb7a86e21515e 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberType.js +++ b/tests/baselines/reference/incrementOperatorWithNumberType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { } return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsNumber1 = ++NUMBER; diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js index efa8ceee45a16..b145636cabd1b 100644 --- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js +++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js @@ -57,9 +57,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); //number type var var ResultIsNumber1 = ++NUMBER1; diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js index 1cf837603aa95..06cc082309dfb 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js @@ -64,9 +64,9 @@ var A = /** @class */ (function () { A.foo = function () { return true; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsNumber1 = ++BOOLEAN; diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js index b8d12af683448..009650a8ed1d2 100644 --- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js +++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js @@ -76,9 +76,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsNumber1 = ++STRING; diff --git a/tests/baselines/reference/indexIntoEnum.js b/tests/baselines/reference/indexIntoEnum.js index bfc771975f39b..22311dfc9f226 100644 --- a/tests/baselines/reference/indexIntoEnum.js +++ b/tests/baselines/reference/indexIntoEnum.js @@ -7,10 +7,10 @@ module M { } //// [indexIntoEnum.js] -var M; +var M = M || (M = {}); (function (M) { - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); + })(E); var x = E[0]; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js index 29646cb0d435d..dfdc0c8101fe6 100644 --- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js +++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js @@ -28,7 +28,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var C1 = /** @class */ (function () { function C1() { @@ -42,8 +42,8 @@ var M; return C2; }()); M.C2 = C2; -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var D1 = /** @class */ (function (_super) { __extends(D1, _super); @@ -61,7 +61,7 @@ var N; return D2; }(M.C2)); N.D2 = D2; -})(N || (N = {})); +})(N); var c = new M.C2(); // no error var n = new N.D1(); // no error var n2 = new N.D2(); // error diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.js b/tests/baselines/reference/inheritedModuleMembersForClodule.js index de059274556df..c971fb0f58f1a 100644 --- a/tests/baselines/reference/inheritedModuleMembersForClodule.js +++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js @@ -56,7 +56,7 @@ var D = /** @class */ (function (_super) { } D.foo = foo; ; -})(D || (D = {})); +})(D); var E = /** @class */ (function (_super) { __extends(E, _super); function E() { diff --git a/tests/baselines/reference/innerAliases.js b/tests/baselines/reference/innerAliases.js index 93ccbd88edcc3..f248472970b9f 100644 --- a/tests/baselines/reference/innerAliases.js +++ b/tests/baselines/reference/innerAliases.js @@ -24,11 +24,11 @@ c = new D.inner.Class1(); //// [innerAliases.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var Class1 = /** @class */ (function () { function Class1() { @@ -36,14 +36,14 @@ var A; return Class1; }()); C.Class1 = Class1; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); -var D; + })(C); + })(B); +})(A); +var D = D || (D = {}); (function (D) { var inner = A.B.C; var c1 = new inner.Class1(); - var E; + var E = D.E || (D.E = {}); (function (E) { var Class2 = /** @class */ (function () { function Class2() { @@ -51,7 +51,7 @@ var D; return Class2; }()); E.Class2 = Class2; - })(E = D.E || (D.E = {})); -})(D || (D = {})); + })(E); +})(D); var c; c = new D.inner.Class1(); diff --git a/tests/baselines/reference/innerAliases2.js b/tests/baselines/reference/innerAliases2.js index 872a74e726182..a87465a7633dd 100644 --- a/tests/baselines/reference/innerAliases2.js +++ b/tests/baselines/reference/innerAliases2.js @@ -20,7 +20,7 @@ module consumer { //// [innerAliases2.js] -var _provider; +var _provider = _provider || (_provider = {}); (function (_provider) { var UsefulClass = /** @class */ (function () { function UsefulClass() { @@ -30,8 +30,8 @@ var _provider; return UsefulClass; }()); _provider.UsefulClass = UsefulClass; -})(_provider || (_provider = {})); -var consumer; +})(_provider); +var consumer = consumer || (consumer = {}); (function (consumer) { var provider = _provider; var g = null; @@ -39,4 +39,4 @@ var consumer; var p2 = new provider.UsefulClass(); return p2; } -})(consumer || (consumer = {})); +})(consumer); diff --git a/tests/baselines/reference/innerBoundLambdaEmit.js b/tests/baselines/reference/innerBoundLambdaEmit.js index 9a1928436d0cb..e132edf3d592d 100644 --- a/tests/baselines/reference/innerBoundLambdaEmit.js +++ b/tests/baselines/reference/innerBoundLambdaEmit.js @@ -10,7 +10,7 @@ interface Array { //// [innerBoundLambdaEmit.js] -var M; +var M = M || (M = {}); (function (M) { var Foo = /** @class */ (function () { function Foo() { @@ -19,4 +19,4 @@ var M; }()); M.Foo = Foo; var bar = function () { }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/innerExtern.js b/tests/baselines/reference/innerExtern.js index db149c66cfc2f..59bf87f38c2ea 100644 --- a/tests/baselines/reference/innerExtern.js +++ b/tests/baselines/reference/innerExtern.js @@ -14,9 +14,9 @@ module A { //// [innerExtern.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { var C = /** @class */ (function () { function C() { @@ -25,5 +25,5 @@ var A; return C; }()); B.C = C; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); diff --git a/tests/baselines/reference/innerFunc.js b/tests/baselines/reference/innerFunc.js index c790c09e271f2..3aeaf0b6c5523 100644 --- a/tests/baselines/reference/innerFunc.js +++ b/tests/baselines/reference/innerFunc.js @@ -17,7 +17,7 @@ function salt() { function pepper() { return 5; } return pepper(); } -var M; +var M = M || (M = {}); (function (M) { function tungsten() { function oxygen() { return 6; } @@ -25,4 +25,4 @@ var M; return oxygen(); } M.tungsten = tungsten; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/innerModExport1.js b/tests/baselines/reference/innerModExport1.js index 285120c7462cd..08673ca3fe396 100644 --- a/tests/baselines/reference/innerModExport1.js +++ b/tests/baselines/reference/innerModExport1.js @@ -20,7 +20,7 @@ module Outer { Outer.ExportFunc(); //// [innerModExport1.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { // inner mod 1 var non_export_var; @@ -34,5 +34,5 @@ var Outer; Outer.outer_var_export = 0; function outerFuncExport() { return 0; } Outer.outerFuncExport = outerFuncExport; -})(Outer || (Outer = {})); +})(Outer); Outer.ExportFunc(); diff --git a/tests/baselines/reference/innerModExport2.js b/tests/baselines/reference/innerModExport2.js index 2024cd8284fa9..3ae7653127900 100644 --- a/tests/baselines/reference/innerModExport2.js +++ b/tests/baselines/reference/innerModExport2.js @@ -21,7 +21,7 @@ module Outer { Outer.NonExportFunc(); //// [innerModExport2.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { // inner mod 1 var non_export_var; @@ -36,5 +36,5 @@ var Outer; Outer.outer_var_export = 0; function outerFuncExport() { return 0; } Outer.outerFuncExport = outerFuncExport; -})(Outer || (Outer = {})); +})(Outer); Outer.NonExportFunc(); diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js index 9533faf28e687..d4a5eb4735882 100644 --- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js +++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js @@ -56,7 +56,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var NonGeneric; +var NonGeneric = NonGeneric || (NonGeneric = {}); (function (NonGeneric) { var C = /** @class */ (function () { function C(a, b) { @@ -87,8 +87,8 @@ var NonGeneric; var r3 = r.y; r.y = 4; var r6 = d.y(); // error -})(NonGeneric || (NonGeneric = {})); -var Generic; +})(NonGeneric); +var Generic = Generic || (Generic = {}); (function (Generic) { var C = /** @class */ (function () { function C(a, b) { @@ -119,4 +119,4 @@ var Generic; var r3 = r.y; r.y = ''; var r6 = d.y(); // error -})(Generic || (Generic = {})); +})(Generic); diff --git a/tests/baselines/reference/instancePropertyInClassType.js b/tests/baselines/reference/instancePropertyInClassType.js index 32bd215f66aac..3bbdbac152380 100644 --- a/tests/baselines/reference/instancePropertyInClassType.js +++ b/tests/baselines/reference/instancePropertyInClassType.js @@ -39,7 +39,7 @@ module Generic { } //// [instancePropertyInClassType.js] -var NonGeneric; +var NonGeneric = NonGeneric || (NonGeneric = {}); (function (NonGeneric) { var C = /** @class */ (function () { function C(a, b) { @@ -63,8 +63,8 @@ var NonGeneric; var r3 = r.y; r.y = 4; var r6 = c.y(); // error -})(NonGeneric || (NonGeneric = {})); -var Generic; +})(NonGeneric); +var Generic = Generic || (Generic = {}); (function (Generic) { var C = /** @class */ (function () { function C(a, b) { @@ -88,4 +88,4 @@ var Generic; var r3 = r.y; r.y = ''; var r6 = c.y(); // error -})(Generic || (Generic = {})); +})(Generic); diff --git a/tests/baselines/reference/instanceofOperator.js b/tests/baselines/reference/instanceofOperator.js index b5df46f0e60bb..96e4f8f58f692 100644 --- a/tests/baselines/reference/instanceofOperator.js +++ b/tests/baselines/reference/instanceofOperator.js @@ -29,7 +29,7 @@ module test { // The instanceof operator requires the left operand to be of type Any or an object type, and the right // operand to be of type Any or a subtype of the ‘Function’ interface type. The result is always of the // Boolean primitive type. -var test; +var test = test || (test = {}); (function (test) { var Object = /** @class */ (function () { function Object() { @@ -45,4 +45,4 @@ var test; null instanceof null; obj instanceof Object; undefined instanceof undefined; -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/instantiatedModule.js b/tests/baselines/reference/instantiatedModule.js index 3e5b1b68a1a60..446baa950ecf3 100644 --- a/tests/baselines/reference/instantiatedModule.js +++ b/tests/baselines/reference/instantiatedModule.js @@ -62,10 +62,10 @@ var p3 = m3.Color.Blue; //// [instantiatedModule.js] // adding the var makes this an instantiated module -var M; +var M = M || (M = {}); (function (M) { M.Point = 1; -})(M || (M = {})); +})(M); // primary expression var m; var m = M; @@ -76,7 +76,7 @@ var p1; var p1; // making the point a class instead of an interface // makes this an instantiated mmodule -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var Point = /** @class */ (function () { function Point() { @@ -87,7 +87,7 @@ var M2; return Point; }()); M2.Point = Point; -})(M2 || (M2 = {})); +})(M2); var m2; var m2 = M2; // static side of the class @@ -99,14 +99,14 @@ var p2; var p2; var p2 = new m2.Point(); var p2 = new M2.Point(); -var M3; +var M3 = M3 || (M3 = {}); (function (M3) { - var Color; + var Color = M3.Color || (M3.Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color = M3.Color || (M3.Color = {})); -})(M3 || (M3 = {})); + })(Color); +})(M3); var m3; var m3 = M3; var a3; diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.js b/tests/baselines/reference/interMixingModulesInterfaces0.js index bedf1404c87b7..9db86963fa463 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces0.js +++ b/tests/baselines/reference/interMixingModulesInterfaces0.js @@ -16,14 +16,14 @@ module A { var x: A.B = A.B.createB(); //// [interMixingModulesInterfaces0.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var x = A.B.createB(); diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.js b/tests/baselines/reference/interMixingModulesInterfaces1.js index 97f9d339dc877..359ade0968a17 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces1.js +++ b/tests/baselines/reference/interMixingModulesInterfaces1.js @@ -16,14 +16,14 @@ module A { var x: A.B = A.B.createB(); //// [interMixingModulesInterfaces1.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var x = A.B.createB(); diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.js b/tests/baselines/reference/interMixingModulesInterfaces2.js index 3a8babaf0481c..2b76f141742d9 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces2.js +++ b/tests/baselines/reference/interMixingModulesInterfaces2.js @@ -16,14 +16,14 @@ module A { var x: A.B = null; //// [interMixingModulesInterfaces2.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = B || (B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B || (B = {})); -})(A || (A = {})); + })(B); +})(A); var x = null; diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.js b/tests/baselines/reference/interMixingModulesInterfaces3.js index 7f8579f9cd98e..55e47053a5f4b 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces3.js +++ b/tests/baselines/reference/interMixingModulesInterfaces3.js @@ -16,14 +16,14 @@ module A { var x: A.B = null; //// [interMixingModulesInterfaces3.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = B || (B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B || (B = {})); -})(A || (A = {})); + })(B); +})(A); var x = null; diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.js b/tests/baselines/reference/interMixingModulesInterfaces4.js index a7527b8ec8ffa..b2aa78c8818a5 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces4.js +++ b/tests/baselines/reference/interMixingModulesInterfaces4.js @@ -16,14 +16,14 @@ module A { var x : number = A.B.createB(); //// [interMixingModulesInterfaces4.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var x = A.B.createB(); diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.js b/tests/baselines/reference/interMixingModulesInterfaces5.js index 3edbcdfae4328..70df78d545ea2 100644 --- a/tests/baselines/reference/interMixingModulesInterfaces5.js +++ b/tests/baselines/reference/interMixingModulesInterfaces5.js @@ -16,14 +16,14 @@ module A { var x: number = A.B.createB(); //// [interMixingModulesInterfaces5.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { function createB() { return null; } B.createB = createB; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var x = A.B.createB(); diff --git a/tests/baselines/reference/interfaceAssignmentCompat.js b/tests/baselines/reference/interfaceAssignmentCompat.js index 98586da24e5a9..eb05b724d6322 100644 --- a/tests/baselines/reference/interfaceAssignmentCompat.js +++ b/tests/baselines/reference/interfaceAssignmentCompat.js @@ -53,14 +53,14 @@ M.test(); //// [interfaceAssignmentCompat.js] -var M; +var M = M || (M = {}); (function (M) { - var Color; + var Color = M.Color || (M.Color = {}); (function (Color) { Color[Color["Green"] = 0] = "Green"; Color[Color["Blue"] = 1] = "Blue"; Color[Color["Brown"] = 2] = "Brown"; - })(Color = M.Color || (M.Color = {})); + })(Color); function CompareEyes(a, b) { return a.color - b.color; } @@ -89,5 +89,5 @@ var M; return result; } M.test = test; -})(M || (M = {})); +})(M); M.test(); diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js index 3ff20d41fb268..216ec0e8d0212 100644 --- a/tests/baselines/reference/interfaceDeclaration3.js +++ b/tests/baselines/reference/interfaceDeclaration3.js @@ -59,7 +59,7 @@ interface I2 extends I1 { item:string; } define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var M1; + var M1 = {}; (function (M1) { var C1 = /** @class */ (function () { function C1() { @@ -86,8 +86,8 @@ define(["require", "exports"], function (require, exports) { } return C5; }()); - })(M1 || (M1 = {})); - var M2; + })(M1); + var M2 = {}; (function (M2) { var C1 = /** @class */ (function () { function C1() { @@ -104,7 +104,7 @@ define(["require", "exports"], function (require, exports) { } return C3; }()); - })(M2 = exports.M2 || (exports.M2 = {})); + })(M2); var C1 = /** @class */ (function () { function C1() { } diff --git a/tests/baselines/reference/interfaceDeclaration4.js b/tests/baselines/reference/interfaceDeclaration4.js index a85471dacbcd4..ac81aed4650bf 100644 --- a/tests/baselines/reference/interfaceDeclaration4.js +++ b/tests/baselines/reference/interfaceDeclaration4.js @@ -43,7 +43,7 @@ interface Foo.I1 { } //// [interfaceDeclaration4.js] // Import this module when test harness supports external modules. Also remove the internal module below. // import Foo = require("interfaceDeclaration5") -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var C1 = /** @class */ (function () { function C1() { @@ -51,7 +51,7 @@ var Foo; return C1; }()); Foo.C1 = C1; -})(Foo || (Foo = {})); +})(Foo); var C1 = /** @class */ (function () { function C1() { } diff --git a/tests/baselines/reference/interfaceInReopenedModule.js b/tests/baselines/reference/interfaceInReopenedModule.js index 001cb022762e9..28306144799d5 100644 --- a/tests/baselines/reference/interfaceInReopenedModule.js +++ b/tests/baselines/reference/interfaceInReopenedModule.js @@ -13,7 +13,7 @@ module m { //// [interfaceInReopenedModule.js] // In second instance of same module, exported interface is not visible -var m; +var m = m || (m = {}); (function (m) { var n = /** @class */ (function () { function n() { @@ -21,4 +21,4 @@ var m; return n; }()); m.n = n; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js index 3f2dd8903647d..c990b0211da05 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js @@ -49,14 +49,14 @@ var C = /** @class */ (function () { return C; }()); function f1() { } -var M; +var M = M || (M = {}); (function (M) { M.y = 1; -})(M || (M = {})); -var E; +})(M); +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var a = { a: 1, b: '', diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index f3632a20fff08..c4d9395969d9c 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -10,7 +10,7 @@ module c { } //// [internalAliasClass.js] -var a; +var a = a || (a = {}); (function (a) { var c = /** @class */ (function () { function c() { @@ -18,12 +18,12 @@ var a; return c; }()); a.c = c; -})(a || (a = {})); -var c; +})(a); +var c = c || (c = {}); (function (c) { var b = a.c; c.x = new b(); -})(c || (c = {})); +})(c); //// [internalAliasClass.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index b8090f80ae15b..be951cb3fe9e6 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -20,7 +20,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithExport.js] "use strict"; exports.__esModule = true; -var x; +var x = {}; (function (x) { var c = /** @class */ (function () { function c() { @@ -31,16 +31,16 @@ var x; return c; }()); x.c = c; -})(x = exports.x || (exports.x = {})); -var m2; +})(x); +var m2 = {}; (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { m3.c = x.c; m3.cProp = new m3.c(); var cReturnVal = m3.cProp.foo(10); - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 = exports.m2 || (exports.m2 = {})); + })(m3); +})(m2); exports.d = new m2.m3.c(); diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 0f15cec0e9cc9..8216c961a5fc0 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -18,7 +18,7 @@ export module m2 { //// [internalAliasClassInsideLocalModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var x; +var x = {}; (function (x) { var c = /** @class */ (function () { function c() { @@ -29,16 +29,16 @@ var x; return c; }()); x.c = c; -})(x = exports.x || (exports.x = {})); -var m2; +})(x); +var m2 = {}; (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { var c = x.c; m3.cProp = new c(); var cReturnVal = m3.cProp.foo(10); - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 = exports.m2 || (exports.m2 = {})); + })(m3); +})(m2); //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js index f5186e0e78dd5..348720c726113 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js @@ -20,7 +20,7 @@ export var d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js] "use strict"; exports.__esModule = true; -var x; +var x = {}; (function (x) { var c = /** @class */ (function () { function c() { @@ -31,14 +31,14 @@ var x; return c; }()); x.c = c; -})(x = exports.x || (exports.x = {})); -var m2; +})(x); +var m2 = {}; (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { var c = x.c; m3.cProp = new c(); var cReturnVal = m3.cProp.foo(10); - })(m3 = m2.m3 || (m2.m3 = {})); -})(m2 = exports.m2 || (exports.m2 = {})); + })(m3); +})(m2); exports.d = new m2.m3.c(); diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index 0af0418c72c27..6014879f66c34 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -14,7 +14,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithExport.js] "use strict"; exports.__esModule = true; -var x; +var x = {}; (function (x) { var c = /** @class */ (function () { function c() { @@ -25,7 +25,7 @@ var x; return c; }()); x.c = c; -})(x = exports.x || (exports.x = {})); +})(x); exports.xc = x.c; exports.cProp = new exports.xc(); var cReturnVal = exports.cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 08ef9ae1359c7..f2f15f3a64242 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -14,7 +14,7 @@ var cReturnVal = cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var x; +var x = {}; (function (x) { var c = /** @class */ (function () { function c() { @@ -25,7 +25,7 @@ var x; return c; }()); x.c = c; -})(x = exports.x || (exports.x = {})); +})(x); var xc = x.c; exports.cProp = new xc(); var cReturnVal = exports.cProp.foo(10); diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js index 9e4b7362f0f09..35f7e9a53f622 100644 --- a/tests/baselines/reference/internalAliasEnum.js +++ b/tests/baselines/reference/internalAliasEnum.js @@ -14,20 +14,20 @@ module c { //// [internalAliasEnum.js] -var a; +var a = a || (a = {}); (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); -})(a || (a = {})); -var c; + })(weekend); +})(a); +var c = c || (c = {}); (function (c) { var b = a.weekend; c.bVal = b.Sunday; -})(c || (c = {})); +})(c); //// [internalAliasEnum.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index f2810fec5b645..990eeab268e7e 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -16,20 +16,20 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); -})(a = exports.a || (exports.a = {})); -var c; + })(weekend); +})(a); +var c = {}; (function (c) { c.b = a.weekend; c.bVal = c.b.Sunday; -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasEnumInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 7762bbea74104..4be2633d73c2d 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -16,20 +16,20 @@ export module c { //// [internalAliasEnumInsideLocalModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); -})(a = exports.a || (exports.a = {})); -var c; + })(weekend); +})(a); +var c = {}; (function (c) { var b = a.weekend; c.bVal = b.Sunday; -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js index a84ebf0b9aded..11697023274e5 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js @@ -17,18 +17,18 @@ var happyFriday = c.b.Friday; //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); -})(a = exports.a || (exports.a = {})); -var c; + })(weekend); +})(a); +var c = {}; (function (c) { var b = a.weekend; c.bVal = b.Sunday; -})(c = exports.c || (exports.c = {})); +})(c); var happyFriday = c.b.Friday; diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 2c8c6c308b138..90cdf9dade7c8 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -15,15 +15,15 @@ export var bVal: b = b.Sunday; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); - })(a = exports.a || (exports.a = {})); + })(weekend); + })(a); exports.b = a.weekend; exports.bVal = exports.b.Sunday; }); diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index e8111a37cdd94..95281930f59c0 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -15,15 +15,15 @@ export var bVal: b = b.Sunday; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { - var weekend; + var weekend = a.weekend || (a.weekend = {}); (function (weekend) { weekend[weekend["Friday"] = 0] = "Friday"; weekend[weekend["Saturday"] = 1] = "Saturday"; weekend[weekend["Sunday"] = 2] = "Sunday"; - })(weekend = a.weekend || (a.weekend = {})); - })(a = exports.a || (exports.a = {})); + })(weekend); + })(a); var b = a.weekend; exports.bVal = b.Sunday; }); diff --git a/tests/baselines/reference/internalAliasFunction.js b/tests/baselines/reference/internalAliasFunction.js index 3930c6cb801e9..01218fbb27677 100644 --- a/tests/baselines/reference/internalAliasFunction.js +++ b/tests/baselines/reference/internalAliasFunction.js @@ -13,19 +13,19 @@ module c { //// [internalAliasFunction.js] -var a; +var a = a || (a = {}); (function (a) { function foo(x) { return x; } a.foo = foo; -})(a || (a = {})); -var c; +})(a); +var c = c || (c = {}); (function (c) { var b = a.foo; c.bVal = b(10); c.bVal2 = b; -})(c || (c = {})); +})(c); //// [internalAliasFunction.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index 95bb936bc75e2..70f2522f64733 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -15,19 +15,19 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { function foo(x) { return x; } a.foo = foo; -})(a = exports.a || (exports.a = {})); -var c; +})(a); +var c = {}; (function (c) { c.b = a.foo; c.bVal = c.b(10); c.bVal2 = c.b; -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index 50de6b470ee4c..9cac5e714bd7c 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -15,19 +15,19 @@ export module c { //// [internalAliasFunctionInsideLocalModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { function foo(x) { return x; } a.foo = foo; -})(a = exports.a || (exports.a = {})); -var c; +})(a); +var c = {}; (function (c) { var b = a.foo; var bVal = b(10); c.bVal2 = b; -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js index 543e9952f235a..87335d2e471c1 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js @@ -15,17 +15,17 @@ var d = c.b(11); //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { function foo(x) { return x; } a.foo = foo; -})(a = exports.a || (exports.a = {})); -var c; +})(a); +var c = {}; (function (c) { var b = a.foo; var bVal = b(10); c.bVal2 = b; -})(c = exports.c || (exports.c = {})); +})(c); var d = c.b(11); diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index 267045b625d5d..665af80bb696d 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -14,13 +14,13 @@ export var bVal2 = b; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { function foo(x) { return x; } a.foo = foo; - })(a = exports.a || (exports.a = {})); + })(a); exports.b = a.foo; exports.bVal = exports.b(10); exports.bVal2 = exports.b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index bb3b0e244d2fa..1436169988040 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -13,13 +13,13 @@ export var bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { function foo(x) { return x; } a.foo = foo; -})(a = exports.a || (exports.a = {})); +})(a); var b = a.foo; exports.bVal = b(10); exports.bVal2 = b; diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index 9d0b68096c814..3d80f9d40d8f1 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -12,9 +12,9 @@ module c { } //// [internalAliasInitializedModule.js] -var a; +var a = a || (a = {}); (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -22,13 +22,13 @@ var a; return c; }()); b.c = c; - })(b = a.b || (a.b = {})); -})(a || (a = {})); -var c; + })(b); +})(a); +var c = c || (c = {}); (function (c) { var b = a.b; c.x = new b.c(); -})(c || (c = {})); +})(c); //// [internalAliasInitializedModule.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 9f00c4291b716..6fa3db0248e67 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -15,9 +15,9 @@ export module c { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -25,13 +25,13 @@ define(["require", "exports"], function (require, exports) { return c; }()); b.c = c; - })(b = a.b || (a.b = {})); - })(a = exports.a || (exports.a = {})); - var c; + })(b); + })(a); + var c = {}; (function (c) { c.b = a.b; c.x = new c.b.c(); - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 62fa55f2af40f..68009c1874719 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -14,9 +14,9 @@ export module c { //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -24,13 +24,13 @@ var a; return c; }()); b.c = c; - })(b = a.b || (a.b = {})); -})(a = exports.a || (exports.a = {})); -var c; + })(b); +})(a); +var c = {}; (function (c) { var b = a.b; c.x = new b.c(); -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js index e098a74b1916c..7e98c423d1feb 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -16,9 +16,9 @@ export var d = new c.b.c(); //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -26,11 +26,11 @@ var a; return c; }()); b.c = c; - })(b = a.b || (a.b = {})); -})(a = exports.a || (exports.a = {})); -var c; + })(b); +})(a); +var c = {}; (function (c) { var b = a.b; c.x = new b.c(); -})(c = exports.c || (exports.c = {})); +})(c); exports.d = new c.b.c(); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 021d8db3ab677..9d6d1e2e5e27e 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -12,9 +12,9 @@ export var x: b.c = new b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -22,8 +22,8 @@ var a; return c; }()); b.c = c; - })(b = a.b || (a.b = {})); -})(a = exports.a || (exports.a = {})); + })(b); +})(a); exports.b = a.b; exports.x = new exports.b.c(); diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 8c971f149344a..a03ec1cf43007 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -13,9 +13,9 @@ export var x: b.c = new b.c(); define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { var c = /** @class */ (function () { function c() { @@ -23,8 +23,8 @@ define(["require", "exports"], function (require, exports) { return c; }()); b.c = c; - })(b = a.b || (a.b = {})); - })(a = exports.a || (exports.a = {})); + })(b); + })(a); var b = a.b; exports.x = new b.c(); }); diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js index aa902c2f56e21..8fb94ff0600bc 100644 --- a/tests/baselines/reference/internalAliasInterface.js +++ b/tests/baselines/reference/internalAliasInterface.js @@ -11,9 +11,9 @@ module c { //// [internalAliasInterface.js] -var c; +var c = c || (c = {}); (function (c) { -})(c || (c = {})); +})(c); //// [internalAliasInterface.d.ts] diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index bd50cd8bbc2ec..af3f7af62b06f 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -14,9 +14,9 @@ export module c { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var c; + var c = {}; (function (c) { - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index f7b08e6c170aa..a81c35685d0e3 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -14,9 +14,9 @@ export module c { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var c; + var c = {}; (function (c) { - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js index 19163ff1f66ab..6119df278839c 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -15,8 +15,8 @@ var x: c.b; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var c; + var c = {}; (function (c) { - })(c = exports.c || (exports.c = {})); + })(c); var x; }); diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js index 5233f9a790d5e..d1dcc31395e9e 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.js +++ b/tests/baselines/reference/internalAliasUninitializedModule.js @@ -14,10 +14,10 @@ module c { } //// [internalAliasUninitializedModule.js] -var c; +var c = c || (c = {}); (function (c) { c.x.foo(); -})(c || (c = {})); +})(c); //// [internalAliasUninitializedModule.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 7ca966e90b206..c133ed8e9ac94 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -16,10 +16,10 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js] "use strict"; exports.__esModule = true; -var c; +var c = {}; (function (c) { c.x.foo(); -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 22793f8aef5ae..09de5e7ed9a9b 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -16,10 +16,10 @@ export module c { //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var c; +var c = {}; (function (c) { c.x.foo(); -})(c = exports.c || (exports.c = {})); +})(c); //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts] diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js index a6b4f83de8e34..95592fb66af92 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -20,8 +20,8 @@ export var z: c.b.I; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var c; + var c = {}; (function (c) { c.x.foo(); - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasVar.js b/tests/baselines/reference/internalAliasVar.js index f1f3e437f576c..fe9ced83b81b0 100644 --- a/tests/baselines/reference/internalAliasVar.js +++ b/tests/baselines/reference/internalAliasVar.js @@ -10,15 +10,15 @@ module c { //// [internalAliasVar.js] -var a; +var a = a || (a = {}); (function (a) { a.x = 10; -})(a || (a = {})); -var c; +})(a); +var c = c || (c = {}); (function (c) { var b = a.x; c.bVal = b; -})(c || (c = {})); +})(c); //// [internalAliasVar.d.ts] diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index 34f044721c49e..bfe6687bcabaf 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -13,15 +13,15 @@ export module c { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { a.x = 10; - })(a = exports.a || (exports.a = {})); - var c; + })(a); + var c = {}; (function (c) { c.b = a.x; c.bVal = c.b; - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index 161dc0bf97368..69b7e3737d207 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -13,15 +13,15 @@ export module c { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { a.x = 10; - })(a = exports.a || (exports.a = {})); - var c; + })(a); + var c = {}; (function (c) { var b = a.x; c.bVal = b; - })(c = exports.c || (exports.c = {})); + })(c); }); diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js index a0192fc9daaf2..d2890121ad6a2 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js @@ -13,13 +13,13 @@ export var z = c.b; //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { a.x = 10; -})(a = exports.a || (exports.a = {})); -var c; +})(a); +var c = {}; (function (c) { var b = a.x; c.bVal = b; -})(c = exports.c || (exports.c = {})); +})(c); exports.z = c.b; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index d27b4e3188da2..d5b6b023ccbd4 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -12,10 +12,10 @@ export var bVal = b; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var a; + var a = {}; (function (a) { a.x = 10; - })(a = exports.a || (exports.a = {})); + })(a); exports.b = a.x; exports.bVal = exports.b; }); diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index 65c9204ed3c1e..682339f70edd4 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -11,10 +11,10 @@ export var bVal = b; //// [internalAliasVarInsideTopLevelModuleWithoutExport.js] "use strict"; exports.__esModule = true; -var a; +var a = {}; (function (a) { a.x = 10; -})(a = exports.a || (exports.a = {})); +})(a); var b = a.x; exports.bVal = b; diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js index 0e74d7ecd4ecc..b2cba7ecfbbe3 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js @@ -8,15 +8,15 @@ module a.e.f { //// [internalAliasWithDottedNameEmit.js] -var a; +var a = a || (a = {}); (function (a) { - var b; + var b = a.b || (a.b = {}); (function (b) { - var c; + var c = b.c || (b.c = {}); (function (c) { - })(c = b.c || (b.c = {})); - })(b = a.b || (a.b = {})); -})(a || (a = {})); + })(c); + })(b); +})(a); //// [internalAliasWithDottedNameEmit.d.ts] diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js index 8fef7e8d2e133..e0b4764c2f716 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -21,8 +21,8 @@ var A = /** @class */ (function () { }()); (function (A) { A.a = 10; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var A = 1; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js index f8523446d74a8..68e89f8bb0e19 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js @@ -20,4 +20,4 @@ var A = /** @class */ (function () { }()); (function (A) { A.a = 10; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js index be347879f6cd1..ac68aadb1770a 100644 --- a/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportInstantiatedModuleNotReferencingInstance.js @@ -11,11 +11,11 @@ module B { //// [internalImportInstantiatedModuleNotReferencingInstance.js] -var A; +var A = A || (A = {}); (function (A) { A.a = 10; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var A = 1; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js index eb3e4ceed73fc..490318b949782 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js @@ -18,7 +18,7 @@ var A = /** @class */ (function () { } return A; }()); -var B; +var B = B || (B = {}); (function (B) { var A = 1; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js index 8b6ce42014eba..29930dcb4e327 100644 --- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js +++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js @@ -10,7 +10,7 @@ module B { //// [internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.js] -var B; +var B = B || (B = {}); (function (B) { var A = 1; -})(B || (B = {})); +})(B); diff --git a/tests/baselines/reference/intrinsics.js b/tests/baselines/reference/intrinsics.js index e7c1dd5435437..741eaf95d1576 100644 --- a/tests/baselines/reference/intrinsics.js +++ b/tests/baselines/reference/intrinsics.js @@ -16,14 +16,14 @@ var foo: (__proto__: number) => void; //// [intrinsics.js] var hasOwnProperty; // Error -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var C = /** @class */ (function () { function C() { } return C; }()); -})(m1 || (m1 = {})); +})(m1); __proto__ = 0; // Error, __proto__ not defined m1.__proto__ = 0; var Foo = /** @class */ (function () { diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.js b/tests/baselines/reference/invalidAssignmentsToVoid.js index 8cb68baad21f8..6e5decdbcdace 100644 --- a/tests/baselines/reference/invalidAssignmentsToVoid.js +++ b/tests/baselines/reference/invalidAssignmentsToVoid.js @@ -38,10 +38,10 @@ x = C; x = c; var i; x = i; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); x = M; function f(a) { x = a; diff --git a/tests/baselines/reference/invalidBooleanAssignments.js b/tests/baselines/reference/invalidBooleanAssignments.js index b8daf44b91782..211577986461b 100644 --- a/tests/baselines/reference/invalidBooleanAssignments.js +++ b/tests/baselines/reference/invalidBooleanAssignments.js @@ -32,10 +32,10 @@ var a = x; var b = x; var c = x; var d = x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var e = x; var C = /** @class */ (function () { function C() { @@ -46,10 +46,10 @@ var f = x; var g = x; var h = x; var h2 = x; // no error -var M; +var M = M || (M = {}); (function (M) { M.a = 1; -})(M || (M = {})); +})(M); M = x; function i(a) { a = x; diff --git a/tests/baselines/reference/invalidEnumAssignments.js b/tests/baselines/reference/invalidEnumAssignments.js index dfdd0600ed0ce..31e4c511d6bb6 100644 --- a/tests/baselines/reference/invalidEnumAssignments.js +++ b/tests/baselines/reference/invalidEnumAssignments.js @@ -23,16 +23,16 @@ function f(a: T) { } //// [invalidEnumAssignments.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; -})(E || (E = {})); -var E2; +})(E); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; E2[E2["B"] = 1] = "B"; -})(E2 || (E2 = {})); +})(E2); var e; var e2; e = E2.A; diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.js b/tests/baselines/reference/invalidImportAliasIdentifiers.js index f22e704323ff0..f7da213735347 100644 --- a/tests/baselines/reference/invalidImportAliasIdentifiers.js +++ b/tests/baselines/reference/invalidImportAliasIdentifiers.js @@ -34,10 +34,10 @@ var C = /** @class */ (function () { return C; }()); var c = C; -var E; +var E = E || (E = {}); (function (E) { E[E["Red"] = 0] = "Red"; E[E["Blue"] = 1] = "Blue"; -})(E || (E = {})); +})(E); var e = E; var i = I; diff --git a/tests/baselines/reference/invalidInstantiatedModule.js b/tests/baselines/reference/invalidInstantiatedModule.js index 9cc6057bdcb31..c529b52ea7fb7 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.js +++ b/tests/baselines/reference/invalidInstantiatedModule.js @@ -16,7 +16,7 @@ var p: m.Point; // Error //// [invalidInstantiatedModule.js] -var M; +var M = M || (M = {}); (function (M) { var Point = /** @class */ (function () { function Point() { @@ -25,10 +25,10 @@ var M; }()); M.Point = Point; M.Point = 1; // Error -})(M || (M = {})); -var M2; +})(M); +var M2 = M2 || (M2 = {}); (function (M2) { M2.Point = 1; -})(M2 || (M2 = {})); +})(M2); var m = M2; var p; // Error diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js index 0c88a7b77fe2d..c1ed4a289042c 100644 --- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js @@ -93,7 +93,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Y; +var Y = Y || (Y = {}); (function (Y) { var A = /** @class */ (function () { function A() { @@ -107,8 +107,8 @@ var Y; } return BB; }(A)); -})(Y || (Y = {})); -var Y2; +})(Y); +var Y2 = Y2 || (Y2 = {}); (function (Y2) { var AA = /** @class */ (function () { function AA() { @@ -122,27 +122,27 @@ var Y2; } return B; }(AA)); -})(Y2 || (Y2 = {})); -var Y3; +})(Y2); +var Y3 = Y3 || (Y3 = {}); (function (Y3) { - var Module; + var Module = Module || (Module = {}); (function (Module) { var A = /** @class */ (function () { function A() { } return A; }()); - })(Module || (Module = {})); -})(Y3 || (Y3 = {})); -var Y4; + })(Module); +})(Y3); +var Y4 = Y4 || (Y4 = {}); (function (Y4) { - var Color; + var Color = Color || (Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color || (Color = {})); -})(Y4 || (Y4 = {})); -var YY; + })(Color); +})(Y4); +var YY = YY || (YY = {}); (function (YY) { var A = /** @class */ (function () { function A() { @@ -156,8 +156,8 @@ var YY; } return BB; }(A)); -})(YY || (YY = {})); -var YY2; +})(YY); +var YY2 = YY2 || (YY2 = {}); (function (YY2) { var AA = /** @class */ (function () { function AA() { @@ -171,27 +171,27 @@ var YY2; } return B; }(AA)); -})(YY2 || (YY2 = {})); -var YY3; +})(YY2); +var YY3 = YY3 || (YY3 = {}); (function (YY3) { - var Module; + var Module = Module || (Module = {}); (function (Module) { var A = /** @class */ (function () { function A() { } return A; }()); - })(Module || (Module = {})); -})(YY3 || (YY3 = {})); -var YY4; + })(Module); +})(YY3); +var YY4 = YY4 || (YY4 = {}); (function (YY4) { - var Color; + var Color = Color || (Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color || (Color = {})); -})(YY4 || (YY4 = {})); -var YYY; + })(Color); +})(YY4); +var YYY = YYY || (YYY = {}); (function (YYY) { var A = /** @class */ (function () { function A() { @@ -205,8 +205,8 @@ var YYY; } return BB; }(A)); -})(YYY || (YYY = {})); -var YYY2; +})(YYY); +var YYY2 = YYY2 || (YYY2 = {}); (function (YYY2) { var AA = /** @class */ (function () { function AA() { @@ -220,23 +220,23 @@ var YYY2; } return B; }(AA)); -})(YYY2 || (YYY2 = {})); -var YYY3; +})(YYY2); +var YYY3 = YYY3 || (YYY3 = {}); (function (YYY3) { - var Module; + var Module = Module || (Module = {}); (function (Module) { var A = /** @class */ (function () { function A() { } return A; }()); - })(Module || (Module = {})); -})(YYY3 || (YYY3 = {})); -var YYY4; + })(Module); +})(YYY3); +var YYY4 = YYY4 || (YYY4 = {}); (function (YYY4) { - var Color; + var Color = Color || (Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color || (Color = {})); -})(YYY4 || (YYY4 = {})); + })(Color); +})(YYY4); diff --git a/tests/baselines/reference/invalidModuleWithVarStatements.js b/tests/baselines/reference/invalidModuleWithVarStatements.js index caa6b24f00ff6..a2553bebb98c4 100644 --- a/tests/baselines/reference/invalidModuleWithVarStatements.js +++ b/tests/baselines/reference/invalidModuleWithVarStatements.js @@ -29,27 +29,27 @@ module YY3 { //// [invalidModuleWithVarStatements.js] // All of these should be an error -var Y; +var Y = Y || (Y = {}); (function (Y) { var x = 0; -})(Y || (Y = {})); -var Y2; +})(Y); +var Y2 = Y2 || (Y2 = {}); (function (Y2) { function fn(x) { } -})(Y2 || (Y2 = {})); -var Y4; +})(Y2); +var Y4 = Y4 || (Y4 = {}); (function (Y4) { var x = 0; -})(Y4 || (Y4 = {})); -var YY; +})(Y4); +var YY = YY || (YY = {}); (function (YY) { function fn(x) { } -})(YY || (YY = {})); -var YY2; +})(YY); +var YY2 = YY2 || (YY2 = {}); (function (YY2) { var x = 0; -})(YY2 || (YY2 = {})); -var YY3; +})(YY2); +var YY3 = YY3 || (YY3 = {}); (function (YY3) { function fn(x) { } -})(YY3 || (YY3 = {})); +})(YY3); diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js index 77ae17141b052..f53e77c4ecab1 100644 --- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js +++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js @@ -85,7 +85,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -95,7 +95,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); // all of these are errors var a; var a = 1; diff --git a/tests/baselines/reference/invalidNestedModules.js b/tests/baselines/reference/invalidNestedModules.js index 1ac56e8c688b0..7710cbf1b6d65 100644 --- a/tests/baselines/reference/invalidNestedModules.js +++ b/tests/baselines/reference/invalidNestedModules.js @@ -30,11 +30,11 @@ module M2 { //// [invalidNestedModules.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var Point = /** @class */ (function () { function Point() { @@ -42,11 +42,11 @@ var A; return Point; }()); C.Point = Point; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(C); + })(B); +})(A); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { var C = /** @class */ (function () { function C() { @@ -54,11 +54,11 @@ var A; return C; }()); B.C = C; - })(B = A.B || (A.B = {})); -})(A || (A = {})); -var M2; + })(B); +})(A); +var M2 = M2 || (M2 = {}); (function (M2) { - var X; + var X = M2.X || (M2.X = {}); (function (X) { var Point = /** @class */ (function () { function Point() { @@ -66,10 +66,10 @@ var M2; return Point; }()); X.Point = Point; - })(X = M2.X || (M2.X = {})); -})(M2 || (M2 = {})); + })(X); +})(M2); (function (M2) { - var X; + var X = M2.X || (M2.X = {}); (function (X) { - })(X = M2.X || (M2.X = {})); -})(M2 || (M2 = {})); + })(X); +})(M2); diff --git a/tests/baselines/reference/invalidNumberAssignments.js b/tests/baselines/reference/invalidNumberAssignments.js index 6b96686238f54..77a4abfcb9243 100644 --- a/tests/baselines/reference/invalidNumberAssignments.js +++ b/tests/baselines/reference/invalidNumberAssignments.js @@ -38,10 +38,10 @@ var e = x; var f = x; var g = 1; var g2 = 1; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); M = x; function i(a) { a = x; diff --git a/tests/baselines/reference/invalidStringAssignments.js b/tests/baselines/reference/invalidStringAssignments.js index 6f28d52f465c2..6741322c85001 100644 --- a/tests/baselines/reference/invalidStringAssignments.js +++ b/tests/baselines/reference/invalidStringAssignments.js @@ -41,17 +41,17 @@ var e = x; var f = x; var g = 1; var g2 = 1; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); M = x; function i(a) { a = x; } i = x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var j = x; diff --git a/tests/baselines/reference/invalidUndefinedAssignments.js b/tests/baselines/reference/invalidUndefinedAssignments.js index 7b436d3f8ccad..832bab5df1060 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.js +++ b/tests/baselines/reference/invalidUndefinedAssignments.js @@ -23,10 +23,10 @@ i = x; //// [invalidUndefinedAssignments.js] var x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); E = x; E.A = x; var C = /** @class */ (function () { @@ -39,10 +39,10 @@ C = x; var g; g = x; I = x; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); M = x; function i(a) { } // BUG 767030 diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js index a83337b9796ef..cd00fdffa7d3b 100644 --- a/tests/baselines/reference/invalidUndefinedValues.js +++ b/tests/baselines/reference/invalidUndefinedValues.js @@ -49,19 +49,19 @@ x = C; x = b; var c; x = c; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); x = M; x = { f: function () { } }; function f(a) { x = a; } x = f; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); x = E; x = E.A; diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js index cbbc9c31da21f..69f7e67eacfe2 100644 --- a/tests/baselines/reference/invalidVoidAssignments.js +++ b/tests/baselines/reference/invalidVoidAssignments.js @@ -44,19 +44,19 @@ var e = x; var f = x; var g = 1; var g2 = 1; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); M = x; function i(a) { a = x; } i = x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); x = E; x = E.A; x = { f: function () { } }; diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js index 0ecb649ab0190..51eb297eb7d08 100644 --- a/tests/baselines/reference/invalidVoidValues.js +++ b/tests/baselines/reference/invalidVoidValues.js @@ -31,10 +31,10 @@ var x; x = 1; x = ''; x = true; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); x = E; x = E.A; var C = /** @class */ (function () { @@ -47,10 +47,10 @@ x = a; var b; x = b; x = { f: function () { } }; -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); x = M; function f(a) { x = a; diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 83a926ab7d2eb..b3d5e70388c77 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -70,62 +70,62 @@ module schema { //// [isDeclarationVisibleNodeKinds.js] // Function types -var schema; +var schema = schema || (schema = {}); (function (schema_1) { function createValidator1(schema) { return undefined; } schema_1.createValidator1 = createValidator1; -})(schema || (schema = {})); +})(schema); // Constructor types (function (schema_2) { function createValidator2(schema) { return undefined; } schema_2.createValidator2 = createValidator2; -})(schema || (schema = {})); +})(schema); // union types (function (schema_3) { function createValidator3(schema) { return undefined; } schema_3.createValidator3 = createValidator3; -})(schema || (schema = {})); +})(schema); // Array types (function (schema_4) { function createValidator4(schema) { return undefined; } schema_4.createValidator4 = createValidator4; -})(schema || (schema = {})); +})(schema); // TypeLiterals (function (schema_5) { function createValidator5(schema) { return undefined; } schema_5.createValidator5 = createValidator5; -})(schema || (schema = {})); +})(schema); // Tuple types (function (schema_6) { function createValidator6(schema) { return undefined; } schema_6.createValidator6 = createValidator6; -})(schema || (schema = {})); +})(schema); // Paren Types (function (schema_7) { function createValidator7(schema) { return undefined; } schema_7.createValidator7 = createValidator7; -})(schema || (schema = {})); +})(schema); // Type reference (function (schema_8) { function createValidator8(schema) { return undefined; } schema_8.createValidator8 = createValidator8; -})(schema || (schema = {})); +})(schema); (function (schema) { var T = /** @class */ (function () { function T() { @@ -146,7 +146,7 @@ var schema; return T; }()); schema.T = T; -})(schema || (schema = {})); +})(schema); //// [isDeclarationVisibleNodeKinds.d.ts] diff --git a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js index f48f53d93fce3..95e66512ed195 100644 --- a/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js +++ b/tests/baselines/reference/isolatedModulesNonAmbientConstEnum.js @@ -4,10 +4,10 @@ var e = E.X; export var x; //// [file1.js] -var E; +const E = {}; (function (E) { E[E["X"] = 100] = "X"; -})(E || (E = {})); +})(E); ; var e = E.X; export var x; diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js index f92ee5acb33c5..086eaf6038b59 100644 --- a/tests/baselines/reference/jsxEmitWithAttributes.js +++ b/tests/baselines/reference/jsxEmitWithAttributes.js @@ -52,7 +52,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -62,7 +62,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js index 277a74a8c2f73..eadc61ab9ae03 100644 --- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js +++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js @@ -52,7 +52,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -62,7 +62,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js index 817ef769d5304..cfaf4d2d1f95e 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js +++ b/tests/baselines/reference/jsxFactoryIdentifier.js @@ -53,7 +53,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -63,7 +63,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map index ea0db5040efbc..fd434d76f8452 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.js.map +++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAYA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,EAAO;QAC7B,OAAO,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,SAAgB,aAAa,CAAC,IAAW;QAErC,OAAO,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAYA,MAAiB,OAAO,MAUvB;AAVD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,EAAO;QAC7B,OAAO,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,SAAgB,aAAa,CAAC,IAAW;QAErC,OAAO,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,EAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] {"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF,MAAM,CAAC;IACN,IAAI;QACH,OAAO;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt index b726ca466bdc4..b1ec5076ffb39 100644 --- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt @@ -10,12 +10,12 @@ sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; >>>Object.defineProperty(exports, "__esModule", { value: true }); ->>>var Element; +>>>const Element = {}; 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +2 >^^^^^^ +3 > ^^^^^^^ +4 > ^^^^^^ +5 > ^^^-> 1 >declare namespace JSX { > interface Element { > name: string; @@ -30,22 +30,22 @@ sourceFile:Element.ts >} > 2 >export namespace -3 > Element -4 > { - > export function isElement(el: any): el is JSX.Element { - > return el.markAsChildOfRootElement !== undefined; - > } - > - > export function createElement(args: any[]) { - > - > return { - > } - > } - > } +3 > Element +4 > { + > export function isElement(el: any): el is JSX.Element { + > return el.markAsChildOfRootElement !== undefined; + > } + > + > export function createElement(args: any[]) { + > + > return { + > } + > } + > } 1 >Emitted(3, 1) Source(13, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(13, 18) + SourceIndex(0) -3 >Emitted(3, 12) Source(13, 25) + SourceIndex(0) -4 >Emitted(3, 13) Source(23, 2) + SourceIndex(0) +2 >Emitted(3, 7) Source(13, 18) + SourceIndex(0) +3 >Emitted(3, 14) Source(13, 25) + SourceIndex(0) +4 >Emitted(3, 20) Source(23, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -183,7 +183,6 @@ sourceFile:Element.ts 2 > ^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^-> 1-> 2 > createElement 3 > (args: any[]) { @@ -197,48 +196,37 @@ sourceFile:Element.ts 3 >Emitted(12, 42) Source(22, 6) + SourceIndex(0) 4 >Emitted(12, 43) Source(22, 6) + SourceIndex(0) --- ->>>})(Element = exports.Element || (exports.Element = {})); -1-> +>>>})(Element); +1 > 2 >^ 3 > ^^ 4 > ^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > Element -5 > -6 > Element -7 > -8 > Element -9 > { - > export function isElement(el: any): el is JSX.Element { - > return el.markAsChildOfRootElement !== undefined; - > } - > - > export function createElement(args: any[]) { - > - > return { - > } - > } - > } -1->Emitted(13, 1) Source(23, 1) + SourceIndex(0) +5 > { + > export function isElement(el: any): el is JSX.Element { + > return el.markAsChildOfRootElement !== undefined; + > } + > + > export function createElement(args: any[]) { + > + > return { + > } + > } + > } +1 >Emitted(13, 1) Source(23, 1) + SourceIndex(0) 2 >Emitted(13, 2) Source(23, 2) + SourceIndex(0) 3 >Emitted(13, 4) Source(13, 18) + SourceIndex(0) 4 >Emitted(13, 11) Source(13, 25) + SourceIndex(0) -5 >Emitted(13, 14) Source(13, 18) + SourceIndex(0) -6 >Emitted(13, 29) Source(13, 25) + SourceIndex(0) -7 >Emitted(13, 34) Source(13, 18) + SourceIndex(0) -8 >Emitted(13, 49) Source(13, 25) + SourceIndex(0) -9 >Emitted(13, 57) Source(23, 2) + SourceIndex(0) +5 >Emitted(13, 13) Source(23, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; -1 > +1-> 2 >^^^^^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^^^ @@ -246,7 +234,7 @@ sourceFile:Element.ts 6 > ^ 7 > ^^^^^^^^^^^^^ 8 > ^ -1 > +1-> > >export let 2 > @@ -256,7 +244,7 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(14, 1) Source(25, 12) + SourceIndex(0) +1->Emitted(14, 1) Source(25, 12) + SourceIndex(0) 2 >Emitted(14, 9) Source(25, 12) + SourceIndex(0) 3 >Emitted(14, 22) Source(25, 25) + SourceIndex(0) 4 >Emitted(14, 25) Source(25, 28) + SourceIndex(0) diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js index 8e4b1d8fc12f8..a0e28f5b4898f 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js @@ -52,7 +52,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -62,7 +62,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js index 6c7c95e36ff1a..a5f53abb7c6ac 100644 --- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js +++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js @@ -52,7 +52,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -62,7 +62,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js index 63b45e878dd0f..0960ceccdb8bb 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js @@ -52,7 +52,7 @@ class A { //// [Element.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var Element; +const Element = {}; (function (Element) { function isElement(el) { return el.markAsChildOfRootElement !== undefined; @@ -62,7 +62,7 @@ var Element; return {}; } Element.createElement = createElement; -})(Element = exports.Element || (exports.Element = {})); +})(Element); exports.createElement = Element.createElement; function toCamelCase(text) { return text[0].toLowerCase() + text.substring(1); diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map index 4767276bd1039..e1b5f0fca7c58 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map +++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map @@ -1,3 +1,3 @@ //// [Element.js.map] -{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAYA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,EAAO;QAC7B,OAAO,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,SAAgB,aAAa,CAAC,IAAW;QAErC,OAAO,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] +{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAYA,MAAiB,OAAO,MAUvB;AAVD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,EAAO;QAC7B,OAAO,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,SAAgB,aAAa,CAAC,IAAW;QAErC,OAAO,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,EAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map] {"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF,MAAM,CAAC;IACN,IAAI;QACH,OAAO;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"} \ No newline at end of file diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt index 012613d79608b..8be94fef0a67d 100644 --- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt +++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt @@ -10,12 +10,12 @@ sourceFile:Element.ts ------------------------------------------------------------------- >>>"use strict"; >>>Object.defineProperty(exports, "__esModule", { value: true }); ->>>var Element; +>>>const Element = {}; 1 > -2 >^^^^ -3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +2 >^^^^^^ +3 > ^^^^^^^ +4 > ^^^^^^ +5 > ^^^-> 1 >declare namespace JSX { > interface Element { > name: string; @@ -30,22 +30,22 @@ sourceFile:Element.ts >} > 2 >export namespace -3 > Element -4 > { - > export function isElement(el: any): el is JSX.Element { - > return el.markAsChildOfRootElement !== undefined; - > } - > - > export function createElement(args: any[]) { - > - > return { - > } - > } - > } +3 > Element +4 > { + > export function isElement(el: any): el is JSX.Element { + > return el.markAsChildOfRootElement !== undefined; + > } + > + > export function createElement(args: any[]) { + > + > return { + > } + > } + > } 1 >Emitted(3, 1) Source(13, 1) + SourceIndex(0) -2 >Emitted(3, 5) Source(13, 18) + SourceIndex(0) -3 >Emitted(3, 12) Source(13, 25) + SourceIndex(0) -4 >Emitted(3, 13) Source(23, 2) + SourceIndex(0) +2 >Emitted(3, 7) Source(13, 18) + SourceIndex(0) +3 >Emitted(3, 14) Source(13, 25) + SourceIndex(0) +4 >Emitted(3, 20) Source(23, 2) + SourceIndex(0) --- >>>(function (Element) { 1-> @@ -183,7 +183,6 @@ sourceFile:Element.ts 2 > ^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^-> 1-> 2 > createElement 3 > (args: any[]) { @@ -197,48 +196,37 @@ sourceFile:Element.ts 3 >Emitted(12, 42) Source(22, 6) + SourceIndex(0) 4 >Emitted(12, 43) Source(22, 6) + SourceIndex(0) --- ->>>})(Element = exports.Element || (exports.Element = {})); -1-> +>>>})(Element); +1 > 2 >^ 3 > ^^ 4 > ^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > Element -5 > -6 > Element -7 > -8 > Element -9 > { - > export function isElement(el: any): el is JSX.Element { - > return el.markAsChildOfRootElement !== undefined; - > } - > - > export function createElement(args: any[]) { - > - > return { - > } - > } - > } -1->Emitted(13, 1) Source(23, 1) + SourceIndex(0) +5 > { + > export function isElement(el: any): el is JSX.Element { + > return el.markAsChildOfRootElement !== undefined; + > } + > + > export function createElement(args: any[]) { + > + > return { + > } + > } + > } +1 >Emitted(13, 1) Source(23, 1) + SourceIndex(0) 2 >Emitted(13, 2) Source(23, 2) + SourceIndex(0) 3 >Emitted(13, 4) Source(13, 18) + SourceIndex(0) 4 >Emitted(13, 11) Source(13, 25) + SourceIndex(0) -5 >Emitted(13, 14) Source(13, 18) + SourceIndex(0) -6 >Emitted(13, 29) Source(13, 25) + SourceIndex(0) -7 >Emitted(13, 34) Source(13, 18) + SourceIndex(0) -8 >Emitted(13, 49) Source(13, 25) + SourceIndex(0) -9 >Emitted(13, 57) Source(23, 2) + SourceIndex(0) +5 >Emitted(13, 13) Source(23, 2) + SourceIndex(0) --- >>>exports.createElement = Element.createElement; -1 > +1-> 2 >^^^^^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^^^ @@ -246,7 +234,7 @@ sourceFile:Element.ts 6 > ^ 7 > ^^^^^^^^^^^^^ 8 > ^ -1 > +1-> > >export let 2 > @@ -256,7 +244,7 @@ sourceFile:Element.ts 6 > . 7 > createElement 8 > ; -1 >Emitted(14, 1) Source(25, 12) + SourceIndex(0) +1->Emitted(14, 1) Source(25, 12) + SourceIndex(0) 2 >Emitted(14, 9) Source(25, 12) + SourceIndex(0) 3 >Emitted(14, 22) Source(25, 25) + SourceIndex(0) 4 >Emitted(14, 25) Source(25, 28) + SourceIndex(0) diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js index 873fa2a035a78..defc8c0913972 100644 --- a/tests/baselines/reference/keyofAndIndexedAccess.js +++ b/tests/baselines/reference/keyofAndIndexedAccess.js @@ -1061,11 +1061,11 @@ function f3(t, k, tk) { t[key] = tk; // ok, T[K] ==> T[keyof T] } } -var Flag; +var Flag = Flag || (Flag = {}); (function (Flag) { Flag["FLAG_1"] = "flag_1"; Flag["FLAG_2"] = "flag_2"; -})(Flag || (Flag = {})); +})(Flag); function getFlagsFromSimpleRecord(record, flags) { return record[flags[0]]; } diff --git a/tests/baselines/reference/labeledStatementWithLabel.js b/tests/baselines/reference/labeledStatementWithLabel.js index 4d5dc499e2573..6dbad3e644d6e 100644 --- a/tests/baselines/reference/labeledStatementWithLabel.js +++ b/tests/baselines/reference/labeledStatementWithLabel.js @@ -60,9 +60,9 @@ label: function gen1() { }); }); } label: { - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); + })(E); } label: label: { diff --git a/tests/baselines/reference/labeledStatementWithLabel_es2015.js b/tests/baselines/reference/labeledStatementWithLabel_es2015.js index e2eea4c53be0b..51cff11bc62e1 100644 --- a/tests/baselines/reference/labeledStatementWithLabel_es2015.js +++ b/tests/baselines/reference/labeledStatementWithLabel_es2015.js @@ -29,9 +29,9 @@ label: function gen1() { return __awaiter(this, void 0, void 0, function* () { }); } label: { - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); + })(E); } label: label: class C { diff --git a/tests/baselines/reference/labeledStatementWithLabel_strict.js b/tests/baselines/reference/labeledStatementWithLabel_strict.js index c4ac2caed06fd..0612079feb362 100644 --- a/tests/baselines/reference/labeledStatementWithLabel_strict.js +++ b/tests/baselines/reference/labeledStatementWithLabel_strict.js @@ -31,9 +31,9 @@ label: function gen1() { return __awaiter(this, void 0, void 0, function* () { }); } label: { - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); + })(E); } label: label: class C { diff --git a/tests/baselines/reference/lambdaPropSelf.js b/tests/baselines/reference/lambdaPropSelf.js index 7e42e4a44c2ad..90d0a5edb377d 100644 --- a/tests/baselines/reference/lambdaPropSelf.js +++ b/tests/baselines/reference/lambdaPropSelf.js @@ -41,7 +41,7 @@ var T = /** @class */ (function () { }; return T; }()); -var M; +var M = M || (M = {}); (function (M) { var x = this; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/letAndVarRedeclaration.js b/tests/baselines/reference/letAndVarRedeclaration.js index a87828f11ff3c..1eefb631d30a6 100644 --- a/tests/baselines/reference/letAndVarRedeclaration.js +++ b/tests/baselines/reference/letAndVarRedeclaration.js @@ -69,13 +69,13 @@ function f1() { function x() { } } } -var M0; +var M0 = M0 || (M0 = {}); (function (M0) { let x2; var x2; function x2() { } -})(M0 || (M0 = {})); -var M1; +})(M0); +var M1 = M1 || (M1 = {}); (function (M1) { let x2; { @@ -84,7 +84,7 @@ var M1; { function x2() { } } -})(M1 || (M1 = {})); +})(M1); let x11; for (var x11;;) { } @@ -93,9 +93,9 @@ function f2() { for (var x11;;) { } } -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { let x11; for (var x11;;) { } -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/letDeclarations-scopes.js b/tests/baselines/reference/letDeclarations-scopes.js index 9d6d9acb3d971..b35bc7ed6020a 100644 --- a/tests/baselines/reference/letDeclarations-scopes.js +++ b/tests/baselines/reference/letDeclarations-scopes.js @@ -247,7 +247,7 @@ var F3 = function () { n = l; }; // modules -var m; +var m = m || (m = {}); (function (m) { let l = 0; n = l; @@ -256,7 +256,7 @@ var m; var b2 = l; } lable: let l2 = 0; -})(m || (m = {})); +})(m); // methods class C { constructor() { diff --git a/tests/baselines/reference/letDeclarations-validContexts.js b/tests/baselines/reference/letDeclarations-validContexts.js index 94d9bed15541e..9d0bda70266d2 100644 --- a/tests/baselines/reference/letDeclarations-validContexts.js +++ b/tests/baselines/reference/letDeclarations-validContexts.js @@ -211,13 +211,13 @@ var F3 = function () { let l21 = 0; }; // modules -var m; +var m = m || (m = {}); (function (m) { let l22 = 0; { let l23 = 0; } -})(m || (m = {})); +})(m); // methods class C { constructor() { @@ -254,10 +254,10 @@ function f3() { label2: let l33 = 0; } } -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { label: let l34 = 0; { label2: let l35 = 0; } -})(m3 || (m3 = {})); +})(m3); diff --git a/tests/baselines/reference/letDeclarations2.js b/tests/baselines/reference/letDeclarations2.js index c8b0216fce41f..4539368414be1 100644 --- a/tests/baselines/reference/letDeclarations2.js +++ b/tests/baselines/reference/letDeclarations2.js @@ -5,11 +5,11 @@ module M { } //// [letDeclarations2.js] -var M; +var M = M || (M = {}); (function (M) { let l1 = "s"; M.l2 = 0; -})(M || (M = {})); +})(M); //// [letDeclarations2.d.ts] diff --git a/tests/baselines/reference/letKeepNamesOfTopLevelItems.js b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js index 96fd31ae536dd..aa8500a324fe6 100644 --- a/tests/baselines/reference/letKeepNamesOfTopLevelItems.js +++ b/tests/baselines/reference/letKeepNamesOfTopLevelItems.js @@ -13,7 +13,7 @@ var x; function foo() { var x; } -var A; +var A = A || (A = {}); (function (A) { var x; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/libMembers.js b/tests/baselines/reference/libMembers.js index 84e76851e99b4..47616c5e3a25b 100644 --- a/tests/baselines/reference/libMembers.js +++ b/tests/baselines/reference/libMembers.js @@ -21,7 +21,7 @@ s.substring(0); s.substring(3, 4); s.subby(12); // error unresolved String.fromCharCode(12); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -33,4 +33,4 @@ var M; a.length; a.push(new C()); (new C()).prototype; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/listFailure.js b/tests/baselines/reference/listFailure.js index 82063e04b0499..261bdf387ebc4 100644 --- a/tests/baselines/reference/listFailure.js +++ b/tests/baselines/reference/listFailure.js @@ -42,7 +42,7 @@ module Editor { } //// [listFailure.js] -var Editor; +var Editor = Editor || (Editor = {}); (function (Editor) { var Buffer = /** @class */ (function () { function Buffer() { @@ -86,4 +86,4 @@ var Editor; return Line; }()); Editor.Line = Line; -})(Editor || (Editor = {})); +})(Editor); diff --git a/tests/baselines/reference/literalTypes2.js b/tests/baselines/reference/literalTypes2.js index a5e0f6dcb84de..543dc2772bde0 100644 --- a/tests/baselines/reference/literalTypes2.js +++ b/tests/baselines/reference/literalTypes2.js @@ -180,12 +180,12 @@ aa = append(aa, 1); //// [literalTypes2.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); +})(E); var cond; function f1(p1, p2, p3, p4) { if (p1 === void 0) { p1 = 1; } diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js index 948e6ffa3e364..eedf7dbc34c51 100644 --- a/tests/baselines/reference/literalsInComputedProperties1.js +++ b/tests/baselines/reference/literalsInComputedProperties1.js @@ -78,7 +78,7 @@ z[1].toExponential(); z[2].toExponential(); z[3].toExponential(); z[4].toExponential(); -var X; +var X = X || (X = {}); (function (X) { X[X[1] = 1] = 1; X[X[2] = 2] = 2; @@ -86,7 +86,7 @@ var X; X[X["4"] = 4] = "4"; X[X["foo"] = 5] = "foo"; X[X["bar"] = 6] = "bar"; -})(X || (X = {})); +})(X); var a = X["foo"]; var a0 = X["bar"]; // TODO: make sure that enum still disallow template literals as member names diff --git a/tests/baselines/reference/localImportNameVsGlobalName.js b/tests/baselines/reference/localImportNameVsGlobalName.js index 916bdcc296050..5a3d5923ffc7d 100644 --- a/tests/baselines/reference/localImportNameVsGlobalName.js +++ b/tests/baselines/reference/localImportNameVsGlobalName.js @@ -14,17 +14,17 @@ module App { } //// [localImportNameVsGlobalName.js] -var Keyboard; +var Keyboard = Keyboard || (Keyboard = {}); (function (Keyboard) { - var Key; + var Key = Keyboard.Key || (Keyboard.Key = {}); (function (Key) { Key[Key["UP"] = 0] = "UP"; Key[Key["DOWN"] = 1] = "DOWN"; Key[Key["LEFT"] = 2] = "LEFT"; Key[Key["RIGHT"] = 3] = "RIGHT"; - })(Key = Keyboard.Key || (Keyboard.Key = {})); -})(Keyboard || (Keyboard = {})); -var App; + })(Key); +})(Keyboard); +var App = App || (App = {}); (function (App) { var Key = Keyboard.Key; function foo(key) { } @@ -32,4 +32,4 @@ var App; foo(Key.UP); foo(Key.DOWN); foo(Key.LEFT); -})(App || (App = {})); +})(App); diff --git a/tests/baselines/reference/localTypes1.js b/tests/baselines/reference/localTypes1.js index e25de18a865bf..a4ee2d7e4433a 100644 --- a/tests/baselines/reference/localTypes1.js +++ b/tests/baselines/reference/localTypes1.js @@ -155,12 +155,12 @@ var __extends = (this && this.__extends) || (function () { }; })(); function f1() { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -172,12 +172,12 @@ function f1() { } function f2() { function g() { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -191,12 +191,12 @@ function f2() { } function f3(b) { if (true) { - var E = void 0; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); if (b) { var C = /** @class */ (function () { function C() { @@ -221,12 +221,12 @@ function f3(b) { } function f5() { var z1 = function () { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -235,12 +235,12 @@ function f5() { return new C(); }; var z2 = function () { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -251,12 +251,12 @@ function f5() { } var A = /** @class */ (function () { function A() { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -264,12 +264,12 @@ var A = /** @class */ (function () { }()); } A.prototype.m = function () { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } @@ -279,12 +279,12 @@ var A = /** @class */ (function () { }; Object.defineProperty(A.prototype, "p", { get: function () { - var E; + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var C = /** @class */ (function () { function C() { } diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.js b/tests/baselines/reference/logicalAndOperatorWithEveryType.js index 12bc06e8357e1..c66bcb340d22d 100644 --- a/tests/baselines/reference/logicalAndOperatorWithEveryType.js +++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.js @@ -126,12 +126,12 @@ var rj10 = undefined && undefined; //// [logicalAndOperatorWithEveryType.js] // The && operator permits the operands to be of any type and produces a result of the same // type as the second operand. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a1; var a2; var a3; diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js index 971f9fafd1d28..ecab8b46fa614 100644 --- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js @@ -79,9 +79,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsBoolean1 = !ANY1; diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js index 84289a8b24d66..b90a32c808569 100644 --- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js +++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsBoolean1 = !BOOLEAN; diff --git a/tests/baselines/reference/logicalNotOperatorWithEnumType.js b/tests/baselines/reference/logicalNotOperatorWithEnumType.js index 382cf577713bc..3f80a4d49b883 100644 --- a/tests/baselines/reference/logicalNotOperatorWithEnumType.js +++ b/tests/baselines/reference/logicalNotOperatorWithEnumType.js @@ -23,16 +23,16 @@ var ResultIsBoolean5 = !!!(ENUM["B"] + ENUM.C); //// [logicalNotOperatorWithEnumType.js] // ! operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { ENUM[ENUM["A"] = 0] = "A"; ENUM[ENUM["B"] = 1] = "B"; ENUM[ENUM["C"] = 2] = "C"; -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsBoolean1 = !ENUM; diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js index f8d1b9233f655..a0024320003be 100644 --- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js +++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js @@ -56,9 +56,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsBoolean1 = !NUMBER; diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js index 2fc9455222996..5bec25994981b 100644 --- a/tests/baselines/reference/logicalNotOperatorWithStringType.js +++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js @@ -55,9 +55,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsBoolean1 = !STRING; diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.js b/tests/baselines/reference/logicalOrOperatorWithEveryType.js index 78601374c225a..d9b9bc814254b 100644 --- a/tests/baselines/reference/logicalOrOperatorWithEveryType.js +++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.js @@ -130,12 +130,12 @@ var rf10 = undefined || undefined; // undefined || undefined is any // If the || expression is not contextually typed, the right operand is contextually typed // by the type of the left operand and the result is of the best common type of the two // operand types. -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 1] = "b"; E[E["c"] = 2] = "c"; -})(E || (E = {})); +})(E); var a1; var a2; var a3; diff --git a/tests/baselines/reference/memberScope.js b/tests/baselines/reference/memberScope.js index 3d15adface9fa..48d6f5e61d4b8 100644 --- a/tests/baselines/reference/memberScope.js +++ b/tests/baselines/reference/memberScope.js @@ -8,7 +8,7 @@ module Salt { //// [memberScope.js] -var Salt; +var Salt = Salt || (Salt = {}); (function (Salt) { var Pepper = /** @class */ (function () { function Pepper() { @@ -17,4 +17,4 @@ var Salt; }()); Salt.Pepper = Pepper; var z = Basil.Pepper; -})(Salt || (Salt = {})); +})(Salt); diff --git a/tests/baselines/reference/mergeThreeInterfaces.js b/tests/baselines/reference/mergeThreeInterfaces.js index 7c887e4fc7c7e..32b4b8f85dc79 100644 --- a/tests/baselines/reference/mergeThreeInterfaces.js +++ b/tests/baselines/reference/mergeThreeInterfaces.js @@ -89,7 +89,7 @@ var r4 = b.foo; var r5 = b.bar; var r6 = b.baz; // basic non-generic and generic case inside a module -var M; +var M = M || (M = {}); (function (M) { var a; var r1 = a.foo; @@ -103,4 +103,4 @@ var M; var r5 = b.bar; // any, should be number // BUG 856491 var r6 = b.baz; // any, should be boolean -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/mergeThreeInterfaces2.js b/tests/baselines/reference/mergeThreeInterfaces2.js index ef504a5f6ec25..7890c5bd90b0c 100644 --- a/tests/baselines/reference/mergeThreeInterfaces2.js +++ b/tests/baselines/reference/mergeThreeInterfaces2.js @@ -70,42 +70,42 @@ module M2 { //// [mergeThreeInterfaces2.js] // two interfaces with the same root module should merge // root module now multiple module declarations -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var a; var r1 = a.foo; var r2 = a.bar; -})(M2 || (M2 = {})); +})(M2); (function (M2) { var a; var r1 = a.foo; var r2 = a.bar; var r3 = a.baz; -})(M2 || (M2 = {})); +})(M2); // same as above but with an additional level of nesting and third module declaration (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { var a; var r1 = a.foo; var r2 = a.bar; - })(M3 = M2.M3 || (M2.M3 = {})); -})(M2 || (M2 = {})); + })(M3); +})(M2); (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { var a; var r1 = a.foo; var r2 = a.bar; var r3 = a.baz; - })(M3 = M2.M3 || (M2.M3 = {})); -})(M2 || (M2 = {})); + })(M3); +})(M2); (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { var a; var r1 = a.foo; var r2 = a.bar; var r3 = a.baz; - })(M3 = M2.M3 || (M2.M3 = {})); -})(M2 || (M2 = {})); + })(M3); +})(M2); diff --git a/tests/baselines/reference/mergeTwoInterfaces.js b/tests/baselines/reference/mergeTwoInterfaces.js index 3396c62ec0781..a0bd3442d782c 100644 --- a/tests/baselines/reference/mergeTwoInterfaces.js +++ b/tests/baselines/reference/mergeTwoInterfaces.js @@ -66,7 +66,7 @@ var b; var r3 = b.foo; var r4 = b.bar; // basic non-generic and generic case inside a module -var M; +var M = M || (M = {}); (function (M) { var a; var r1 = a.foo; @@ -76,4 +76,4 @@ var M; var r3 = b.foo; // BUG 856491 var r4 = b.bar; // any, should be string -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/mergeTwoInterfaces2.js b/tests/baselines/reference/mergeTwoInterfaces2.js index 3ab21df428c0a..d8ccdbca073a5 100644 --- a/tests/baselines/reference/mergeTwoInterfaces2.js +++ b/tests/baselines/reference/mergeTwoInterfaces2.js @@ -50,31 +50,31 @@ module M2 { //// [mergeTwoInterfaces2.js] // two interfaces with the same root module should merge // root module now multiple module declarations -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var a; var r1 = a.foo; var r2 = a.bar; -})(M2 || (M2 = {})); +})(M2); (function (M2) { var a; var r1 = a.foo; var r2 = a.bar; -})(M2 || (M2 = {})); +})(M2); // same as above but with an additional level of nesting (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { var a; var r1 = a.foo; var r2 = a.bar; - })(M3 = M2.M3 || (M2.M3 = {})); -})(M2 || (M2 = {})); + })(M3); +})(M2); (function (M2) { - var M3; + var M3 = M2.M3 || (M2.M3 = {}); (function (M3) { var a; var r1 = a.foo; var r2 = a.bar; - })(M3 = M2.M3 || (M2.M3 = {})); -})(M2 || (M2 = {})); + })(M3); +})(M2); diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js index ec2eb4a1087cb..088b65910ff20 100644 --- a/tests/baselines/reference/mergeWithImportedNamespace.js +++ b/tests/baselines/reference/mergeWithImportedNamespace.js @@ -13,10 +13,10 @@ export namespace N { //// [f1.js] "use strict"; exports.__esModule = true; -var N; +var N = {}; (function (N) { N.x = 1; -})(N = exports.N || (exports.N = {})); +})(N); //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js index efa95d7763064..80737e9cefd48 100644 --- a/tests/baselines/reference/mergeWithImportedType.js +++ b/tests/baselines/reference/mergeWithImportedType.js @@ -11,10 +11,10 @@ export type E = E; //// [f1.js] "use strict"; exports.__esModule = true; -var E; +var E = {}; (function (E) { E[E["X"] = 0] = "X"; -})(E = exports.E || (exports.E = {})); +})(E); //// [f2.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/mergedDeclarations1.js b/tests/baselines/reference/mergedDeclarations1.js index f8663d1254976..ace14c035452d 100644 --- a/tests/baselines/reference/mergedDeclarations1.js +++ b/tests/baselines/reference/mergedDeclarations1.js @@ -26,7 +26,7 @@ function point(x, y) { return p1.x == p2.x && p1.y == p2.y; } point.equals = equals; -})(point || (point = {})); +})(point); var p1 = point(0, 0); var p2 = point.origin; var b = point.equals(p1, p2); diff --git a/tests/baselines/reference/mergedDeclarations2.js b/tests/baselines/reference/mergedDeclarations2.js index b35ec48f7a886..87c4bf30218c0 100644 --- a/tests/baselines/reference/mergedDeclarations2.js +++ b/tests/baselines/reference/mergedDeclarations2.js @@ -11,13 +11,13 @@ module Foo { } //// [mergedDeclarations2.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo[Foo["b"] = 0] = "b"; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { Foo[Foo["a"] = 0] = "a"; -})(Foo || (Foo = {})); +})(Foo); (function (Foo) { Foo.x = b; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/mergedDeclarations3.js b/tests/baselines/reference/mergedDeclarations3.js index d3b4e8fc9d579..733fb901b7d32 100644 --- a/tests/baselines/reference/mergedDeclarations3.js +++ b/tests/baselines/reference/mergedDeclarations3.js @@ -40,44 +40,44 @@ M.foo.y // ok M.foo.z // error //// [mergedDeclarations3.js] -var M; +var M = M || (M = {}); (function (M) { - var Color; + var Color = M.Color || (M.Color = {}); (function (Color) { Color[Color["Red"] = 0] = "Red"; Color[Color["Green"] = 1] = "Green"; - })(Color = M.Color || (M.Color = {})); -})(M || (M = {})); + })(Color); +})(M); (function (M) { - var Color; + var Color = M.Color || (M.Color = {}); (function (Color) { Color.Blue = 4; - })(Color = M.Color || (M.Color = {})); -})(M || (M = {})); + })(Color); +})(M); var p = M.Color.Blue; // ok (function (M) { function foo() { } M.foo = foo; -})(M || (M = {})); +})(M); (function (M) { - var foo; + var foo = foo || (foo = {}); (function (foo) { foo.x = 1; - })(foo || (foo = {})); -})(M || (M = {})); + })(foo); +})(M); (function (M) { - var foo; + var foo = M.foo || (M.foo = {}); (function (foo) { foo.y = 2; - })(foo = M.foo || (M.foo = {})); -})(M || (M = {})); + })(foo); +})(M); (function (M) { - var foo; + var foo = foo || (foo = {}); (function (foo) { foo.z = 1; - })(foo || (foo = {})); -})(M || (M = {})); + })(foo); +})(M); M.foo(); // ok M.foo.x; // error M.foo.y; // ok diff --git a/tests/baselines/reference/mergedDeclarations4.js b/tests/baselines/reference/mergedDeclarations4.js index c47632b0a69d9..83a568e8963ec 100644 --- a/tests/baselines/reference/mergedDeclarations4.js +++ b/tests/baselines/reference/mergedDeclarations4.js @@ -19,22 +19,22 @@ M.f(); M.f.hello; //// [mergedDeclarations4.js] -var M; +var M = M || (M = {}); (function (M) { function f() { } M.f = f; f(); M.f(); var r = f.hello; -})(M || (M = {})); +})(M); (function (M) { - var f; + var f = M.f || (M.f = {}); (function (f) { f.hello = 1; - })(f = M.f || (M.f = {})); + })(f); f(); M.f(); var r = f.hello; -})(M || (M = {})); +})(M); M.f(); M.f.hello; diff --git a/tests/baselines/reference/mergedEnumDeclarationCodeGen.js b/tests/baselines/reference/mergedEnumDeclarationCodeGen.js index ecf2474430eab..867b22b97ff44 100644 --- a/tests/baselines/reference/mergedEnumDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedEnumDeclarationCodeGen.js @@ -8,11 +8,11 @@ enum E { } //// [mergedEnumDeclarationCodeGen.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; E[E["b"] = 0] = "b"; -})(E || (E = {})); +})(E); (function (E) { E[E["c"] = 0] = "c"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js index d3d9b0cc9b1e4..3c2258beccd31 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js @@ -69,7 +69,7 @@ var D = /** @class */ (function (_super) { } return D; }(C)); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -81,4 +81,4 @@ var M; } return C2; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js index 62df614348201..1ed7c9fd854b5 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js @@ -75,7 +75,7 @@ var D = /** @class */ (function () { var a; var r = a.a; // generic interfaces in a module -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -92,4 +92,4 @@ var M; } return D; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js index 7de5b7e056ebc..1a52adec2437b 100644 --- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js +++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js @@ -106,7 +106,7 @@ var D = /** @class */ (function () { var a; var r = a.a; // generic interfaces in a module -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -133,4 +133,4 @@ var M; } return D; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js index cc5e0a8eb85cf..4f4ce56f6e60f 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js @@ -18,9 +18,9 @@ export module X { //// [mergedModuleDeclarationCodeGen.js] "use strict"; exports.__esModule = true; -var X; +var X = {}; (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y_1) { var A = /** @class */ (function () { function A(Y) { @@ -28,10 +28,10 @@ var X; } return A; }()); - })(Y = X.Y || (X.Y = {})); -})(X = exports.X || (exports.X = {})); + })(Y); +})(X); (function (X) { - var Y; + var Y = X.Y || (X.Y = {}); (function (Y) { var B = /** @class */ (function () { function B() { @@ -39,5 +39,5 @@ var X; return B; }()); Y.B = B; - })(Y = X.Y || (X.Y = {})); -})(X = exports.X || (exports.X = {})); + })(Y); +})(X); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js index 224042ac571a9..6b29f7b4ebc3c 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.js @@ -9,22 +9,22 @@ module my.data { } //// [mergedModuleDeclarationCodeGen2.js] -var my; +var my = my || (my = {}); (function (my) { - var data; + var data = my.data || (my.data = {}); (function (data) { - var foo; + var foo = data.foo || (data.foo = {}); (function (foo) { function buz() { } foo.buz = buz; - })(foo = data.foo || (data.foo = {})); - })(data = my.data || (my.data = {})); -})(my || (my = {})); + })(foo); + })(data); +})(my); (function (my_1) { - var data; + var data = my_1.data || (my_1.data = {}); (function (data_1) { function data(my) { data_1.foo.buz(); } - })(data = my_1.data || (my_1.data = {})); -})(my || (my = {})); + })(data); +})(my); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js index 5b16fe16dd2df..62d9311b06205 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.js @@ -9,22 +9,22 @@ module my.data.foo { } //// [mergedModuleDeclarationCodeGen3.js] -var my; +var my = my || (my = {}); (function (my) { - var data; + var data = my.data || (my.data = {}); (function (data) { function buz() { } data.buz = buz; - })(data = my.data || (my.data = {})); -})(my || (my = {})); + })(data); +})(my); (function (my_1) { - var data; + var data = my_1.data || (my_1.data = {}); (function (data_1) { - var foo; + var foo = data_1.foo || (data_1.foo = {}); (function (foo_1) { function data(my, foo) { data_1.buz(); } - })(foo = data_1.foo || (data_1.foo = {})); - })(data = my_1.data || (my_1.data = {})); -})(my || (my = {})); + })(foo); + })(data); +})(my); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js index 9a351c5c55e02..9171ab4ec4ed5 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.js @@ -17,32 +17,32 @@ module superContain { } //// [mergedModuleDeclarationCodeGen4.js] -var superContain; +var superContain = superContain || (superContain = {}); (function (superContain) { - var contain; + var contain = superContain.contain || (superContain.contain = {}); (function (contain_1) { - var my; + var my = contain_1.my || (contain_1.my = {}); (function (my) { - var buz; + var buz = my.buz || (my.buz = {}); (function (buz) { - var data; + var data = buz.data || (buz.data = {}); (function (data) { function foo() { } data.foo = foo; - })(data = buz.data || (buz.data = {})); - })(buz = my.buz || (my.buz = {})); - })(my = contain_1.my || (contain_1.my = {})); + })(data); + })(buz); + })(my); (function (my_1) { - var buz; + var buz = my_1.buz || (my_1.buz = {}); (function (buz_1) { - var data; + var data = buz_1.data || (buz_1.data = {}); (function (data_1) { function bar(contain, my, buz, data) { data_1.foo(); } data_1.bar = bar; - })(data = buz_1.data || (buz_1.data = {})); - })(buz = my_1.buz || (my_1.buz = {})); - })(my = contain_1.my || (contain_1.my = {})); - })(contain = superContain.contain || (superContain.contain = {})); -})(superContain || (superContain = {})); + })(data); + })(buz); + })(my); + })(contain); +})(superContain); diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js index e67b189ba7882..79adfbed55d8d 100644 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js @@ -19,23 +19,23 @@ module M.buz.plop { } //// [mergedModuleDeclarationCodeGen5.js] -var M; +var M = M || (M = {}); (function (M_1) { - var buz; + var buz = M_1.buz || (M_1.buz = {}); (function (buz) { - var plop; + var plop = buz.plop || (buz.plop = {}); (function (plop) { function doom() { } plop.doom = doom; function M() { } plop.M = M; - })(plop = buz.plop || (buz.plop = {})); - })(buz = M_1.buz || (M_1.buz = {})); -})(M || (M = {})); + })(plop); + })(buz); +})(M); (function (M) { - var buz; + var buz = M.buz || (M.buz = {}); (function (buz_1) { - var plop; + var plop = buz_1.plop || (buz_1.plop = {}); (function (plop_1) { function gunk() { } function buz() { } @@ -45,9 +45,9 @@ var M; return fudge; }()); plop_1.fudge = fudge; - var plop; + var plop = plop_1.plop || (plop_1.plop = {}); (function (plop) { - })(plop = plop_1.plop || (plop_1.plop = {})); + })(plop); // Emit these references as follows var v1 = gunk; // gunk var v2 = buz; // buz @@ -55,6 +55,6 @@ var M; plop_1.v4 = plop_1.M; // _plop.M plop_1.v5 = fudge; // fudge plop_1.v6 = plop; // plop - })(plop = buz_1.plop || (buz_1.plop = {})); - })(buz = M.buz || (M.buz = {})); -})(M || (M = {})); + })(plop); + })(buz); +})(M); diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js index df8c0f8470c71..ac6c8d0c11268 100644 --- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js +++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.js @@ -8,11 +8,11 @@ module M { } //// [mergedModuleDeclarationWithSharedExportedVar.js] -var M; +var M = M || (M = {}); (function (M) { M.v = 10; M.v; -})(M || (M = {})); +})(M); (function (M) { M.v; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/metadataOfClassFromModule.js b/tests/baselines/reference/metadataOfClassFromModule.js index 127e5878843eb..f2ba526ae08eb 100644 --- a/tests/baselines/reference/metadataOfClassFromModule.js +++ b/tests/baselines/reference/metadataOfClassFromModule.js @@ -21,7 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, var __metadata = (this && this.__metadata) || function (k, v) { if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); }; -var MyModule; +var MyModule = MyModule || (MyModule = {}); (function (MyModule) { function inject(target, key) { } MyModule.inject = inject; @@ -41,4 +41,4 @@ var MyModule; return Person; }()); MyModule.Person = Person; -})(MyModule || (MyModule = {})); +})(MyModule); diff --git a/tests/baselines/reference/metadataOfUnion.js b/tests/baselines/reference/metadataOfUnion.js index 71820c60e005f..e36da7076669f 100644 --- a/tests/baselines/reference/metadataOfUnion.js +++ b/tests/baselines/reference/metadataOfUnion.js @@ -69,13 +69,13 @@ var B = /** @class */ (function () { ], B.prototype, "z"); return B; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; E[E["D"] = 3] = "D"; -})(E || (E = {})); +})(E); var D = /** @class */ (function () { function D() { } diff --git a/tests/baselines/reference/methodContainingLocalFunction.js b/tests/baselines/reference/methodContainingLocalFunction.js index 266178b35f865..a5c4f5a867121 100644 --- a/tests/baselines/reference/methodContainingLocalFunction.js +++ b/tests/baselines/reference/methodContainingLocalFunction.js @@ -97,7 +97,7 @@ var C = /** @class */ (function () { }; return C; }()); -var M; +var M = M || (M = {}); (function (M) { function exhibitBug() { function localFunction() { } @@ -105,8 +105,8 @@ var M; x = localFunction; } M.exhibitBug = exhibitBug; -})(M || (M = {})); -var E; +})(M); +var E = E || (E = {}); (function (E) { E[E["A"] = (function () { function localFunction() { } @@ -114,4 +114,4 @@ var E; x = localFunction; return 0; })()] = "A"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js index 87bb005deaa02..3ddd04355e98c 100644 --- a/tests/baselines/reference/missingFunctionImplementation.js +++ b/tests/baselines/reference/missingFunctionImplementation.js @@ -134,7 +134,7 @@ var C8 = /** @class */ (function () { (function (C8) { function m(a, b) { } C8.m = m; -})(C8 || (C8 = {})); +})(C8); // merged with namespace, static methods, duplicate declarations var C9 = /** @class */ (function () { function C9() { @@ -143,22 +143,22 @@ var C9 = /** @class */ (function () { return C9; }()); (function (C9) { -})(C9 || (C9 = {})); +})(C9); // merged namespaces -var N10; +var N10 = {}; (function (N10) { -})(N10 || (N10 = {})); +})(N10); (function (N10) { function m(a) { } N10.m = m; -})(N10 || (N10 = {})); +})(N10); // merged namespaces, duplicate defintions -var N12; +var N12 = {}; (function (N12) { function m(a) { } N12.m = m; -})(N12 || (N12 = {})); +})(N12); (function (N12) { function m(a) { } N12.m = m; -})(N12 || (N12 = {})); +})(N12); diff --git a/tests/baselines/reference/missingReturnStatement.js b/tests/baselines/reference/missingReturnStatement.js index 64392ceaf6ef3..bc17019373d16 100644 --- a/tests/baselines/reference/missingReturnStatement.js +++ b/tests/baselines/reference/missingReturnStatement.js @@ -8,7 +8,7 @@ module Test { //// [missingReturnStatement.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var Bug = /** @class */ (function () { function Bug() { @@ -18,4 +18,4 @@ var Test; return Bug; }()); Test.Bug = Bug; -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js index db1bc28a14432..546f49459b8d4 100644 --- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.js +++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.js @@ -43,20 +43,20 @@ module E { //// [mixingFunctionAndAmbientModule1.js] -var A; +var A = A || (A = {}); (function (A) { function My(s) { } -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { function My(s) { } -})(B || (B = {})); -var C; +})(B); +var C = C || (C = {}); (function (C) { -})(C || (C = {})); -var D; +})(C); +var D = D || (D = {}); (function (D) { -})(D || (D = {})); -var E; +})(D); +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/moduleAliasInterface.js b/tests/baselines/reference/moduleAliasInterface.js index a7475964d7355..936648bf34c3b 100644 --- a/tests/baselines/reference/moduleAliasInterface.js +++ b/tests/baselines/reference/moduleAliasInterface.js @@ -56,7 +56,7 @@ module B1 { //// [moduleAliasInterface.js] -var _modes; +var _modes = _modes || (_modes = {}); (function (_modes) { var Mode = /** @class */ (function () { function Mode() { @@ -64,9 +64,9 @@ var _modes; return Mode; }()); _modes.Mode = Mode; -})(_modes || (_modes = {})); +})(_modes); // _modes. // produces an internal error - please implement in derived class -var editor; +var editor = editor || (editor = {}); (function (editor) { var i; // If you just use p1:modes, the compiler accepts it - should be an error @@ -77,9 +77,9 @@ var editor; }; return Bug; }()); -})(editor || (editor = {})); +})(editor); var modesOuter = _modes; -var editor2; +var editor2 = editor2 || (editor2 = {}); (function (editor2) { var i; var Bug = /** @class */ (function () { @@ -87,7 +87,7 @@ var editor2; } // no error here, since modesOuter is declared externally return Bug; }()); - var Foo; + var Foo = Foo || (Foo = {}); (function (Foo) { var Bar = /** @class */ (function () { function Bar() { @@ -95,14 +95,14 @@ var editor2; return Bar; }()); Foo.Bar = Bar; - })(Foo || (Foo = {})); + })(Foo); var Bug2 = /** @class */ (function () { function Bug2(p1, p2) { } return Bug2; }()); -})(editor2 || (editor2 = {})); -var A1; +})(editor2); +var A1 = A1 || (A1 = {}); (function (A1) { var A1C1 = /** @class */ (function () { function A1C1() { @@ -110,9 +110,9 @@ var A1; return A1C1; }()); A1.A1C1 = A1C1; -})(A1 || (A1 = {})); -var B1; +})(A1); +var B1 = B1 || (B1 = {}); (function (B1) { var i; var c; -})(B1 || (B1 = {})); +})(B1); diff --git a/tests/baselines/reference/moduleAndInterfaceWithSameName.js b/tests/baselines/reference/moduleAndInterfaceWithSameName.js index 96c58249b4729..7341c5b63bca8 100644 --- a/tests/baselines/reference/moduleAndInterfaceWithSameName.js +++ b/tests/baselines/reference/moduleAndInterfaceWithSameName.js @@ -32,25 +32,25 @@ module Foo3 { } //// [moduleAndInterfaceWithSameName.js] -var Foo1; +var Foo1 = Foo1 || (Foo1 = {}); (function (Foo1) { - var Bar; + var Bar = Foo1.Bar || (Foo1.Bar = {}); (function (Bar) { Bar.x = 42; - })(Bar = Foo1.Bar || (Foo1.Bar = {})); -})(Foo1 || (Foo1 = {})); -var Foo2; + })(Bar); +})(Foo1); +var Foo2 = Foo2 || (Foo2 = {}); (function (Foo2) { - var Bar; + var Bar = Bar || (Bar = {}); (function (Bar) { Bar.x = 42; - })(Bar || (Bar = {})); -})(Foo2 || (Foo2 = {})); + })(Bar); +})(Foo2); var z2 = Foo2.Bar.y; // Error for using interface name as a value. -var Foo3; +var Foo3 = Foo3 || (Foo3 = {}); (function (Foo3) { - var Bar; + var Bar = Foo3.Bar || (Foo3.Bar = {}); (function (Bar) { Bar.x = 42; - })(Bar = Foo3.Bar || (Foo3.Bar = {})); -})(Foo3 || (Foo3 = {})); + })(Bar); +})(Foo3); diff --git a/tests/baselines/reference/moduleAssignmentCompat1.js b/tests/baselines/reference/moduleAssignmentCompat1.js index 7066283b39951..1f7808d69acb2 100644 --- a/tests/baselines/reference/moduleAssignmentCompat1.js +++ b/tests/baselines/reference/moduleAssignmentCompat1.js @@ -17,7 +17,7 @@ b = a; //// [moduleAssignmentCompat1.js] -var A; +var A = A || (A = {}); (function (A) { var C = /** @class */ (function () { function C() { @@ -25,8 +25,8 @@ var A; return C; }()); A.C = C; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var C = /** @class */ (function () { function C() { @@ -39,7 +39,7 @@ var B; } return D; }()); -})(B || (B = {})); +})(B); var a; var b; // no error diff --git a/tests/baselines/reference/moduleAssignmentCompat2.js b/tests/baselines/reference/moduleAssignmentCompat2.js index c88d5707c99d2..b7153fe1fafbe 100644 --- a/tests/baselines/reference/moduleAssignmentCompat2.js +++ b/tests/baselines/reference/moduleAssignmentCompat2.js @@ -14,7 +14,7 @@ a = b; b = a; // error //// [moduleAssignmentCompat2.js] -var A; +var A = A || (A = {}); (function (A) { var C = /** @class */ (function () { function C() { @@ -22,8 +22,8 @@ var A; return C; }()); A.C = C; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var C = /** @class */ (function () { function C() { @@ -37,7 +37,7 @@ var B; return D; }()); B.D = D; -})(B || (B = {})); +})(B); var a; var b; a = b; diff --git a/tests/baselines/reference/moduleAssignmentCompat3.js b/tests/baselines/reference/moduleAssignmentCompat3.js index 7115faea9df59..f1141b1088804 100644 --- a/tests/baselines/reference/moduleAssignmentCompat3.js +++ b/tests/baselines/reference/moduleAssignmentCompat3.js @@ -15,14 +15,14 @@ b = a; //// [moduleAssignmentCompat3.js] -var A; +var A = A || (A = {}); (function (A) { A.x = 1; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { B.x = ""; -})(B || (B = {})); +})(B); var a; var b; // both errors diff --git a/tests/baselines/reference/moduleAssignmentCompat4.js b/tests/baselines/reference/moduleAssignmentCompat4.js index da7167bb9f28c..d6de0dbba4aa9 100644 --- a/tests/baselines/reference/moduleAssignmentCompat4.js +++ b/tests/baselines/reference/moduleAssignmentCompat4.js @@ -17,20 +17,20 @@ a = b; b = a; // error //// [moduleAssignmentCompat4.js] -var A; +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M) { var C = /** @class */ (function () { function C() { } return C; }()); - })(M = A.M || (A.M = {})); -})(A || (A = {})); -var B; + })(M); +})(A); +var B = B || (B = {}); (function (B) { - var M; + var M = B.M || (B.M = {}); (function (M) { var D = /** @class */ (function () { function D() { @@ -38,8 +38,8 @@ var B; return D; }()); M.D = D; - })(M = B.M || (B.M = {})); -})(B || (B = {})); + })(M); +})(B); var a; var b; a = b; diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js index 818c49c9edf8f..a507ec5af6312 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js @@ -34,10 +34,10 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; exports.__esModule = true; -var Observable; +var Observable = {}; (function (Observable) { var someValue; -})(Observable = exports.Observable || (exports.Observable = {})); +})(Observable); //// [map.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js index 1dca750a6148f..6d9509654b29a 100644 --- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js +++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js @@ -36,9 +36,9 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; exports.__esModule = true; -var Observable; +var Observable = {}; (function (Observable) { -})(Observable = exports.Observable || (exports.Observable = {})); +})(Observable); //// [map.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js index 02e2fb313c470..94772f4eba192 100644 --- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js +++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js @@ -52,10 +52,10 @@ exports.a = 1; //// [x.js] "use strict"; exports.__esModule = true; -var N1; +var N1 = {}; (function (N1) { N1.x = 1; -})(N1 || (N1 = {})); +})(N1); //// [observable.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js index 85b30f4d0027f..a6341088fd82a 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js @@ -34,10 +34,10 @@ let y = x.map(x => x + 1); //// [observable.js] "use strict"; exports.__esModule = true; -var Observable; +var Observable = {}; (function (Observable) { var someValue; -})(Observable = exports.Observable || (exports.Observable = {})); +})(Observable); //// [map.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js index 4c67c63d1bb78..38282890f957b 100644 --- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js +++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js @@ -36,9 +36,9 @@ let z2 = Observable.someAnotherValue.toLowerCase(); //// [observable.js] "use strict"; exports.__esModule = true; -var Observable; +var Observable = {}; (function (Observable) { -})(Observable = exports.Observable || (exports.Observable = {})); +})(Observable); //// [map.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.js b/tests/baselines/reference/moduleClassArrayCodeGenTest.js index 463706ed51fc2..e46fcbb2daed5 100644 --- a/tests/baselines/reference/moduleClassArrayCodeGenTest.js +++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.js @@ -12,7 +12,7 @@ var t2: M.B[] = []; //// [moduleClassArrayCodeGenTest.js] // Invalid code gen for Array of Module class -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -25,6 +25,6 @@ var M; } return B; }()); -})(M || (M = {})); +})(M); var t = []; var t2 = []; diff --git a/tests/baselines/reference/moduleCodeGenTest3.js b/tests/baselines/reference/moduleCodeGenTest3.js index e48e13e6057df..9f18514d31bcf 100644 --- a/tests/baselines/reference/moduleCodeGenTest3.js +++ b/tests/baselines/reference/moduleCodeGenTest3.js @@ -4,8 +4,8 @@ module Baz { export var x = "hello"; } Baz.x = "goodbye"; //// [moduleCodeGenTest3.js] -var Baz; +var Baz = Baz || (Baz = {}); (function (Baz) { Baz.x = "hello"; -})(Baz || (Baz = {})); +})(Baz); Baz.x = "goodbye"; diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js index 525973402895a..9ee6f6a3a2252 100644 --- a/tests/baselines/reference/moduleCodeGenTest5.js +++ b/tests/baselines/reference/moduleCodeGenTest5.js @@ -44,13 +44,13 @@ var C2 = /** @class */ (function () { C2.prototype.p2 = function () { }; return C2; }()); -var E1; +var E1 = {}; (function (E1) { E1[E1["A"] = 0] = "A"; -})(E1 = exports.E1 || (exports.E1 = {})); +})(E1); var u = E1.A; -var E2; +var E2 = {}; (function (E2) { E2[E2["B"] = 0] = "B"; -})(E2 || (E2 = {})); +})(E2); var v = E2.B; diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js index f877ad74bc36a..5ded694c1c1d7 100644 --- a/tests/baselines/reference/moduleCodegenTest4.js +++ b/tests/baselines/reference/moduleCodegenTest4.js @@ -7,9 +7,9 @@ void 0; //// [moduleCodegenTest4.js] "use strict"; exports.__esModule = true; -var Baz; +var Baz = {}; (function (Baz) { Baz.x = "hello"; -})(Baz = exports.Baz || (exports.Baz = {})); +})(Baz); Baz.x = "goodbye"; void 0; diff --git a/tests/baselines/reference/moduleCrashBug1.js b/tests/baselines/reference/moduleCrashBug1.js index 5354935829c29..9f25c2bf8297d 100644 --- a/tests/baselines/reference/moduleCrashBug1.js +++ b/tests/baselines/reference/moduleCrashBug1.js @@ -22,12 +22,12 @@ var m : _modes; //// [moduleCrashBug1.js] -var _modes; +var _modes = _modes || (_modes = {}); (function (_modes) { var Mode = /** @class */ (function () { function Mode() { } return Mode; }()); -})(_modes || (_modes = {})); +})(_modes); var m; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 4db7e7ca153d2..4379ad9e10c02 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -45,13 +45,13 @@ export enum Utensils { // Shouldn't error exports.__esModule = true; exports.Foo = 2; exports.Foo = 42; // Should error -var FooBar; +var FooBar = {}; (function (FooBar) { FooBar.member1 = 2; -})(FooBar = exports.FooBar || (exports.FooBar = {})); +})(FooBar); (function (FooBar) { FooBar.member2 = 42; -})(FooBar = exports.FooBar || (exports.FooBar = {})); +})(FooBar); var Kettle = /** @class */ (function () { function Kettle() { this.member1 = 2; @@ -68,12 +68,12 @@ var Kettle = /** @class */ (function () { exports.Kettle = Kettle; exports.Pot = 2; exports.Pot = 42; // Shouldn't error -var Utensils; +var Utensils = {}; (function (Utensils) { Utensils[Utensils["Spoon"] = 0] = "Spoon"; Utensils[Utensils["Fork"] = 1] = "Fork"; Utensils[Utensils["Knife"] = 2] = "Knife"; -})(Utensils = exports.Utensils || (exports.Utensils = {})); +})(Utensils); (function (Utensils) { Utensils[Utensils["Spork"] = 3] = "Spork"; -})(Utensils = exports.Utensils || (exports.Utensils = {})); +})(Utensils); diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js index d7be29877b753..4bf9e18fe697d 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.js +++ b/tests/baselines/reference/moduleElementsInWrongContext3.js @@ -32,7 +32,7 @@ module P { } //// [moduleElementsInWrongContext3.js] -var P; +var P = P || (P = {}); (function (P) { { export = M; @@ -55,4 +55,4 @@ var P; import { baz } from "ambient"; import "ambient"; } -})(P || (P = {})); +})(P); diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js index 60a6385b22576..29dd0c2fa0607 100644 --- a/tests/baselines/reference/moduleExports1.js +++ b/tests/baselines/reference/moduleExports1.js @@ -17,11 +17,11 @@ if (!module.exports) module.exports = ""; define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var TypeScript; + var TypeScript = {}; (function (TypeScript) { - var Strasse; + var Strasse = TypeScript.Strasse || (TypeScript.Strasse = {}); (function (Strasse) { - var Street; + var Street = Strasse.Street || (Strasse.Street = {}); (function (Street) { var Rue = /** @class */ (function () { function Rue() { @@ -29,9 +29,9 @@ define(["require", "exports"], function (require, exports) { return Rue; }()); Street.Rue = Rue; - })(Street = Strasse.Street || (Strasse.Street = {})); - })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {})); - })(TypeScript = exports.TypeScript || (exports.TypeScript = {})); + })(Street); + })(Strasse); + })(TypeScript); var rue = new TypeScript.Strasse.Street.Rue(); rue.address = "1 Main Street"; void 0; diff --git a/tests/baselines/reference/moduleIdentifiers.js b/tests/baselines/reference/moduleIdentifiers.js index d3a654b867028..6ded4a76c81c4 100644 --- a/tests/baselines/reference/moduleIdentifiers.js +++ b/tests/baselines/reference/moduleIdentifiers.js @@ -11,10 +11,10 @@ var x1 = M.a; //var q: m.P; //// [moduleIdentifiers.js] -var M; +var M = M || (M = {}); (function (M) { M.a = 1; -})(M || (M = {})); +})(M); //var p: M.P; //var m: M = M; var x1 = M.a; diff --git a/tests/baselines/reference/moduleImport.js b/tests/baselines/reference/moduleImport.js index 76d46f2ebfe8c..b853cb76db172 100644 --- a/tests/baselines/reference/moduleImport.js +++ b/tests/baselines/reference/moduleImport.js @@ -14,11 +14,11 @@ module X { } //// [moduleImport.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { - var C; + var C = B.C || (B.C = {}); (function (C) { var XYZ = X.Y.Z; function ping(x) { @@ -26,10 +26,10 @@ var A; XYZ.pong(x - 1); } C.ping = ping; - })(C = B.C || (B.C = {})); - })(B = A.B || (A.B = {})); -})(A || (A = {})); -var X; + })(C); + })(B); +})(A); +var X = X || (X = {}); (function (X) { var ABC = A.B.C; function pong(x) { @@ -37,4 +37,4 @@ var X; ABC.ping(x - 1); } X.pong = pong; -})(X || (X = {})); +})(X); diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js index 211e4efeb46cb..11c82fc2516f6 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js @@ -47,9 +47,9 @@ module TypeScript.Syntax { //// [moduleMemberWithoutTypeAnnotation1.js] -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { - var Parser; + var Parser = TypeScript.Parser || (TypeScript.Parser = {}); (function (Parser) { var SyntaxCursor = /** @class */ (function () { function SyntaxCursor() { @@ -59,8 +59,8 @@ var TypeScript; }; return SyntaxCursor; }()); - })(Parser = TypeScript.Parser || (TypeScript.Parser = {})); -})(TypeScript || (TypeScript = {})); + })(Parser); +})(TypeScript); (function (TypeScript) { ; ; @@ -79,7 +79,7 @@ var TypeScript; return PositionedToken; }()); TypeScript.PositionedToken = PositionedToken; -})(TypeScript || (TypeScript = {})); +})(TypeScript); (function (TypeScript) { var SyntaxNode = /** @class */ (function () { function SyntaxNode() { @@ -95,9 +95,9 @@ var TypeScript; return SyntaxNode; }()); TypeScript.SyntaxNode = SyntaxNode; -})(TypeScript || (TypeScript = {})); +})(TypeScript); (function (TypeScript) { - var Syntax; + var Syntax = TypeScript.Syntax || (TypeScript.Syntax = {}); (function (Syntax) { function childIndex() { } Syntax.childIndex = childIndex; @@ -110,5 +110,5 @@ var TypeScript; return VariableWidthTokenWithTrailingTrivia; }()); Syntax.VariableWidthTokenWithTrailingTrivia = VariableWidthTokenWithTrailingTrivia; - })(Syntax = TypeScript.Syntax || (TypeScript.Syntax = {})); -})(TypeScript || (TypeScript = {})); + })(Syntax); +})(TypeScript); diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js index bfdd92025131e..cdc683f3c09e2 100644 --- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js +++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.js @@ -18,9 +18,9 @@ module TypeScript { //// [moduleMemberWithoutTypeAnnotation2.js] -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { - var CompilerDiagnostics; + var CompilerDiagnostics = TypeScript.CompilerDiagnostics || (TypeScript.CompilerDiagnostics = {}); (function (CompilerDiagnostics) { CompilerDiagnostics.diagnosticWriter = null; function Alert(output) { @@ -29,5 +29,5 @@ var TypeScript; } } CompilerDiagnostics.Alert = Alert; - })(CompilerDiagnostics = TypeScript.CompilerDiagnostics || (TypeScript.CompilerDiagnostics = {})); -})(TypeScript || (TypeScript = {})); + })(CompilerDiagnostics); +})(TypeScript); diff --git a/tests/baselines/reference/moduleMerge.js b/tests/baselines/reference/moduleMerge.js index 4671597429721..c514b0b2435ce 100644 --- a/tests/baselines/reference/moduleMerge.js +++ b/tests/baselines/reference/moduleMerge.js @@ -25,7 +25,7 @@ module A //// [moduleMerge.js] // This should not compile both B classes are in the same module this should be a collission -var A; +var A = A || (A = {}); (function (A) { var B = /** @class */ (function () { function B() { @@ -35,7 +35,7 @@ var A; }; return B; }()); -})(A || (A = {})); +})(A); (function (A) { var B = /** @class */ (function () { function B() { @@ -46,4 +46,4 @@ var A; return B; }()); A.B = B; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/moduleNewExportBug.js b/tests/baselines/reference/moduleNewExportBug.js index 4f472a28620d6..99ce6c2b567bb 100644 --- a/tests/baselines/reference/moduleNewExportBug.js +++ b/tests/baselines/reference/moduleNewExportBug.js @@ -14,7 +14,7 @@ var c : mod1.C; // ERROR: C should not be visible //// [moduleNewExportBug.js] -var mod1; +var mod1 = mod1 || (mod1 = {}); (function (mod1) { var C = /** @class */ (function () { function C() { @@ -22,5 +22,5 @@ var mod1; C.prototype.moo = function () { }; return C; }()); -})(mod1 || (mod1 = {})); +})(mod1); var c; // ERROR: C should not be visible diff --git a/tests/baselines/reference/moduleNoEmit.js b/tests/baselines/reference/moduleNoEmit.js index a298efd13aac0..49d333d4d039d 100644 --- a/tests/baselines/reference/moduleNoEmit.js +++ b/tests/baselines/reference/moduleNoEmit.js @@ -4,7 +4,7 @@ module Foo { } //// [moduleNoEmit.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { 1 + 1; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/moduleProperty1.js b/tests/baselines/reference/moduleProperty1.js index 3848203a66ffb..15c915a4f891d 100644 --- a/tests/baselines/reference/moduleProperty1.js +++ b/tests/baselines/reference/moduleProperty1.js @@ -12,15 +12,15 @@ module M2 { } //// [moduleProperty1.js] -var M; +var M = M || (M = {}); (function (M) { var x = 10; // variable local to this module body var y = x; // property visible only in module M.z = y; // property visible to any code -})(M || (M = {})); -var M2; +})(M); +var M2 = M2 || (M2 = {}); (function (M2) { var x = 10; // variable local to this module body y = x; // can't use private in modules M2.z = y; // property visible to any code -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/moduleProperty2.js b/tests/baselines/reference/moduleProperty2.js index 7ed1c89108c96..ec3e1873b4623 100644 --- a/tests/baselines/reference/moduleProperty2.js +++ b/tests/baselines/reference/moduleProperty2.js @@ -15,7 +15,7 @@ module N { } //// [moduleProperty2.js] -var M; +var M = M || (M = {}); (function (M) { function f() { var x; @@ -23,9 +23,9 @@ var M; var y; var test1 = x; var test2 = y; // y visible because same module -})(M || (M = {})); -var N; +})(M); +var N = N || (N = {}); (function (N) { var test3 = M.y; // nope y private property of M var test4 = M.z; // ok public property of M -})(N || (N = {})); +})(N); diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js index 3d48286968345..b086aa30af252 100644 --- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js @@ -9,7 +9,7 @@ module M { //// [moduleReopenedTypeOtherBlock.js] -var M; +var M = M || (M = {}); (function (M) { var C1 = /** @class */ (function () { function C1() { @@ -17,7 +17,7 @@ var M; return C1; }()); M.C1 = C1; -})(M || (M = {})); +})(M); (function (M) { var C2 = /** @class */ (function () { function C2() { @@ -26,4 +26,4 @@ var M; return C2; }()); M.C2 = C2; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.js b/tests/baselines/reference/moduleReopenedTypeSameBlock.js index 3b6c43afbd974..745bfe816b26f 100644 --- a/tests/baselines/reference/moduleReopenedTypeSameBlock.js +++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.js @@ -7,7 +7,7 @@ module M { //// [moduleReopenedTypeSameBlock.js] -var M; +var M = M || (M = {}); (function (M) { var C1 = /** @class */ (function () { function C1() { @@ -15,7 +15,7 @@ var M; return C1; }()); M.C1 = C1; -})(M || (M = {})); +})(M); (function (M) { var C2 = /** @class */ (function () { function C2() { @@ -24,4 +24,4 @@ var M; return C2; }()); M.C2 = C2; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index d1f6dc7abc7cf..41d18c07f8753 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -16,11 +16,11 @@ export enum Animals { //// [c.js] "use strict"; exports.__esModule = true; -var Animals; +var Animals = {}; (function (Animals) { Animals[Animals["Cat"] = 0] = "Cat"; Animals[Animals["Dog"] = 1] = "Dog"; -})(Animals = exports.Animals || (exports.Animals = {})); +})(Animals); ; //// [b.js] "use strict"; diff --git a/tests/baselines/reference/moduleScopingBug.js b/tests/baselines/reference/moduleScopingBug.js index a8d22b3492bc4..88c296a3454d5 100644 --- a/tests/baselines/reference/moduleScopingBug.js +++ b/tests/baselines/reference/moduleScopingBug.js @@ -30,7 +30,7 @@ module M //// [moduleScopingBug.js] -var M; +var M = M || (M = {}); (function (M) { var outer; function f() { @@ -42,8 +42,8 @@ var M; } return C; }()); - var X; + var X = X || (X = {}); (function (X) { var inner = outer; // Error: outer not visible - })(X || (X = {})); -})(M || (M = {})); + })(X); +})(M); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js index f9a90fd515155..9aacf5e7aa667 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt.js @@ -12,24 +12,24 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M_1) { var M = Z.M; function bar() { } M_1.bar = bar; M.bar(); // Should call Z.M.bar - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js index 1366f52e7f8b4..dfbfa76cca3e0 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt2.js @@ -12,24 +12,24 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt2.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M) { M.M = Z.M; function bar() { } M.bar = bar; M.M.bar(); // Should call Z.M.bar - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js index efdcebe84e96d..a995f93ead2c9 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt3.js @@ -17,24 +17,24 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt3.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M_1) { var M = Z.M; function bar() { } M_1.bar = bar; M.bar(); // Should call Z.M.bar - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js index e9cd456f3f3f8..1b6d32b187f76 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt4.js @@ -13,24 +13,24 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt4.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M_1) { var M = Z.M; function bar() { } M_1.bar = bar; M.bar(); // Should call Z.M.bar - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js index 72aa36022634d..04d5c74c3e98a 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt5.js @@ -17,23 +17,23 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt5.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M_1) { function bar() { } M_1.bar = bar; M.bar(); // Should call Z.M.bar - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js index fbad13359b8eb..4fd50a8fbc5f0 100644 --- a/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js +++ b/tests/baselines/reference/moduleSharesNameWithImportDeclarationInsideIt6.js @@ -11,22 +11,22 @@ module A.M { } //// [moduleSharesNameWithImportDeclarationInsideIt6.js] -var Z; +var Z = Z || (Z = {}); (function (Z) { - var M; + var M = Z.M || (Z.M = {}); (function (M) { function bar() { return ""; } M.bar = bar; - })(M = Z.M || (Z.M = {})); -})(Z || (Z = {})); -var A; + })(M); +})(Z); +var A = A || (A = {}); (function (A) { - var M; + var M = A.M || (A.M = {}); (function (M_1) { function bar() { } M_1.bar = bar; - })(M = A.M || (A.M = {})); -})(A || (A = {})); + })(M); +})(A); diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js index 02421199ce60e..c9f4bd305500f 100644 --- a/tests/baselines/reference/moduleSymbolMerging.js +++ b/tests/baselines/reference/moduleSymbolMerging.js @@ -15,15 +15,15 @@ module B { //// [A.js] //// [B.js] /// -var A; +var A = A || (A = {}); (function (A) { ; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { function f() { return null; } B.f = f; -})(B || (B = {})); +})(B); //// [A.d.ts] diff --git a/tests/baselines/reference/moduleUnassignedVariable.js b/tests/baselines/reference/moduleUnassignedVariable.js index e8719742ab6b0..32738b1decf40 100644 --- a/tests/baselines/reference/moduleUnassignedVariable.js +++ b/tests/baselines/reference/moduleUnassignedVariable.js @@ -9,9 +9,9 @@ module Bar { //// [moduleUnassignedVariable.js] -var Bar; +var Bar = Bar || (Bar = {}); (function (Bar) { Bar.a = 1; function fooA() { return Bar.a; } // Correct: return Bar.a function fooB() { return Bar.b; } // Incorrect: return b -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.js b/tests/baselines/reference/moduleVariableArrayIndexer.js index fce3bf081a08f..3f708e006f160 100644 --- a/tests/baselines/reference/moduleVariableArrayIndexer.js +++ b/tests/baselines/reference/moduleVariableArrayIndexer.js @@ -6,8 +6,8 @@ module Bar { //// [moduleVariableArrayIndexer.js] -var Bar; +var Bar = Bar || (Bar = {}); (function (Bar) { Bar.a = 1; var t = undefined[Bar.a][Bar.a]; // CG: var t = undefined[Bar.a][a]; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/moduleVariables.js b/tests/baselines/reference/moduleVariables.js index 3f5047c62660c..2993605516ca4 100644 --- a/tests/baselines/reference/moduleVariables.js +++ b/tests/baselines/reference/moduleVariables.js @@ -19,15 +19,15 @@ module M { //// [moduleVariables.js] var x = 1; -var M; +var M = M || (M = {}); (function (M) { M.x = 2; console.log(M.x); // 2 -})(M || (M = {})); +})(M); (function (M) { console.log(M.x); // 2 -})(M || (M = {})); +})(M); (function (M) { var x = 3; console.log(x); // 3 -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/moduleVisibilityTest1.js b/tests/baselines/reference/moduleVisibilityTest1.js index 99ff355df7209..06510ffd3796c 100644 --- a/tests/baselines/reference/moduleVisibilityTest1.js +++ b/tests/baselines/reference/moduleVisibilityTest1.js @@ -66,30 +66,30 @@ c.someMethodThatCallsAnOuterMethod(); //// [moduleVisibilityTest1.js] -var OuterMod; +var OuterMod = OuterMod || (OuterMod = {}); (function (OuterMod) { function someExportedOuterFunc() { return -1; } OuterMod.someExportedOuterFunc = someExportedOuterFunc; - var OuterInnerMod; + var OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {}); (function (OuterInnerMod) { function someExportedOuterInnerFunc() { return "foo"; } OuterInnerMod.someExportedOuterInnerFunc = someExportedOuterInnerFunc; - })(OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {})); -})(OuterMod || (OuterMod = {})); + })(OuterInnerMod); +})(OuterMod); var OuterInnerAlias = OuterMod.OuterInnerMod; -var M; +var M = M || (M = {}); (function (M) { - var InnerMod; + var InnerMod = M.InnerMod || (M.InnerMod = {}); (function (InnerMod) { function someExportedInnerFunc() { return -2; } InnerMod.someExportedInnerFunc = someExportedInnerFunc; - })(InnerMod = M.InnerMod || (M.InnerMod = {})); - var E; + })(InnerMod); + var E = M.E || (M.E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E = M.E || (M.E = {})); + })(E); M.x = 5; var y = M.x + M.x; var B = /** @class */ (function () { @@ -113,11 +113,11 @@ var M; M.C = C; var someModuleVar = 4; function someModuleFunction() { return 5; } -})(M || (M = {})); +})(M); (function (M) { M.c = M.x; M.meb = M.E.B; -})(M || (M = {})); +})(M); var cprime = null; var c = new M.C(); var z = M.x; diff --git a/tests/baselines/reference/moduleVisibilityTest2.js b/tests/baselines/reference/moduleVisibilityTest2.js index 0030c9ec3541e..15deba21539b4 100644 --- a/tests/baselines/reference/moduleVisibilityTest2.js +++ b/tests/baselines/reference/moduleVisibilityTest2.js @@ -67,30 +67,30 @@ c.someMethodThatCallsAnOuterMethod(); //// [moduleVisibilityTest2.js] -var OuterMod; +var OuterMod = OuterMod || (OuterMod = {}); (function (OuterMod) { function someExportedOuterFunc() { return -1; } OuterMod.someExportedOuterFunc = someExportedOuterFunc; - var OuterInnerMod; + var OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {}); (function (OuterInnerMod) { function someExportedOuterInnerFunc() { return "foo"; } OuterInnerMod.someExportedOuterInnerFunc = someExportedOuterInnerFunc; - })(OuterInnerMod = OuterMod.OuterInnerMod || (OuterMod.OuterInnerMod = {})); -})(OuterMod || (OuterMod = {})); + })(OuterInnerMod); +})(OuterMod); var OuterInnerAlias = OuterMod.OuterInnerMod; -var M; +var M = M || (M = {}); (function (M) { - var InnerMod; + var InnerMod = InnerMod || (InnerMod = {}); (function (InnerMod) { function someExportedInnerFunc() { return -2; } InnerMod.someExportedInnerFunc = someExportedInnerFunc; - })(InnerMod || (InnerMod = {})); - var E; + })(InnerMod); + var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; - })(E || (E = {})); + })(E); var x = 5; var y = x + x; var B = /** @class */ (function () { @@ -114,11 +114,11 @@ var M; M.C = C; var someModuleVar = 4; function someModuleFunction() { return 5; } -})(M || (M = {})); +})(M); (function (M) { M.c = x; M.meb = M.E.B; -})(M || (M = {})); +})(M); var cprime = null; var c = new M.C(); var z = M.x; diff --git a/tests/baselines/reference/moduleVisibilityTest3.js b/tests/baselines/reference/moduleVisibilityTest3.js index b746f4ecc2736..ba7677d17598e 100644 --- a/tests/baselines/reference/moduleVisibilityTest3.js +++ b/tests/baselines/reference/moduleVisibilityTest3.js @@ -27,16 +27,16 @@ module editor { //// [moduleVisibilityTest3.js] -var _modes; +var _modes = _modes || (_modes = {}); (function (_modes) { var Mode = /** @class */ (function () { function Mode() { } return Mode; }()); -})(_modes || (_modes = {})); +})(_modes); //_modes. // produces an internal error - please implement in derived class -var editor; +var editor = editor || (editor = {}); (function (editor) { var i; // If you just use p1:modes, the compiler accepts it - should be an error @@ -46,4 +46,4 @@ var editor; } return Bug; }()); -})(editor || (editor = {})); +})(editor); diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js index 8b84b3aa5e7f4..e47ad777985ce 100644 --- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js +++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js @@ -72,7 +72,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var A; +var A = A || (A = {}); (function (A_1) { var A = /** @class */ (function () { function A() { @@ -98,19 +98,19 @@ var A; } return BB; }(A)); - var Module; + var Module = Module || (Module = {}); (function (Module) { var A = /** @class */ (function () { function A() { } return A; }()); - })(Module || (Module = {})); - var Color; + })(Module); + var Color = Color || (Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color || (Color = {})); + })(Color); var x = 12; function F(s) { return 2; @@ -120,8 +120,8 @@ var A; return 'hello ' + s; }; var ol = { s: 'hello', id: 2, isvalid: true }; -})(A || (A = {})); -var Y; +})(A); +var Y = Y || (Y = {}); (function (Y) { var A = /** @class */ (function () { function A() { @@ -151,19 +151,19 @@ var Y; return BB; }(A)); Y.BB = BB; - var Module; + var Module = Y.Module || (Y.Module = {}); (function (Module) { var A = /** @class */ (function () { function A() { } return A; }()); - })(Module = Y.Module || (Y.Module = {})); - var Color; + })(Module); + var Color = Y.Color || (Y.Color = {}); (function (Color) { Color[Color["Blue"] = 0] = "Blue"; Color[Color["Red"] = 1] = "Red"; - })(Color = Y.Color || (Y.Color = {})); + })(Color); Y.x = 12; function F(s) { return 2; @@ -174,4 +174,4 @@ var Y; return 'hello ' + s; }; Y.ol = { s: 'hello', id: 2, isvalid: true }; -})(Y || (Y = {})); +})(Y); diff --git a/tests/baselines/reference/moduleWithTryStatement1.js b/tests/baselines/reference/moduleWithTryStatement1.js index 9b3f43dc36a72..2a3aae132adac 100644 --- a/tests/baselines/reference/moduleWithTryStatement1.js +++ b/tests/baselines/reference/moduleWithTryStatement1.js @@ -9,11 +9,11 @@ var v = M; //// [moduleWithTryStatement1.js] -var M; +var M = M || (M = {}); (function (M) { try { } catch (e) { } -})(M || (M = {})); +})(M); var v = M; diff --git a/tests/baselines/reference/moduleWithValuesAsType.js b/tests/baselines/reference/moduleWithValuesAsType.js index 4e26f1029a1a2..72b0c5a39c216 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.js +++ b/tests/baselines/reference/moduleWithValuesAsType.js @@ -6,8 +6,8 @@ module A { var a: A; // no error //// [moduleWithValuesAsType.js] -var A; +var A = A || (A = {}); (function (A) { var b = 1; -})(A || (A = {})); +})(A); var a; // no error diff --git a/tests/baselines/reference/module_augmentExistingAmbientVariable.js b/tests/baselines/reference/module_augmentExistingAmbientVariable.js index 99e5a1ddfa304..bd029cf6541a8 100644 --- a/tests/baselines/reference/module_augmentExistingAmbientVariable.js +++ b/tests/baselines/reference/module_augmentExistingAmbientVariable.js @@ -6,7 +6,7 @@ module console { } //// [module_augmentExistingAmbientVariable.js] -var console; +var console = console || (console = {}); (function (console) { console.x = 2; -})(console || (console = {})); +})(console); diff --git a/tests/baselines/reference/module_augmentExistingVariable.js b/tests/baselines/reference/module_augmentExistingVariable.js index ac320428e410e..ee021524cd0c9 100644 --- a/tests/baselines/reference/module_augmentExistingVariable.js +++ b/tests/baselines/reference/module_augmentExistingVariable.js @@ -7,7 +7,7 @@ module console { //// [module_augmentExistingVariable.js] var console; -var console; +var console = console || (console = {}); (function (console) { console.x = 2; -})(console || (console = {})); +})(console); diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index de7a5434e4df6..cf5e09c38c081 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -233,7 +233,7 @@ var m3eVar: mAmbient.m3.e; //// [moduledecl.js] -var m0; +var m0 = m0 || (m0 = {}); (function (m0) { function f1() { } @@ -244,8 +244,8 @@ var m0; } return c1; }()); -})(m0 || (m0 = {})); -var m1; +})(m0); +var m1 = m1 || (m1 = {}); (function (m1) { function f1() { } @@ -266,42 +266,42 @@ var m1; return c1; }()); m1.c1 = c1; -})(m1 || (m1 = {})); -var m; +})(m1); +var m = m || (m = {}); (function (m) { - var m2; + var m2 = m.m2 || (m.m2 = {}); (function (m2) { var a = 10; - })(m2 = m.m2 || (m.m2 = {})); - var m3; + })(m2); + var m3 = m.m3 || (m.m3 = {}); (function (m3) { - })(m3 = m.m3 || (m.m3 = {})); -})(m || (m = {})); + })(m3); +})(m); (function (m) { - var m25; + var m25 = m.m25 || (m.m25 = {}); (function (m25) { - var m5; + var m5 = m25.m5 || (m25.m5 = {}); (function (m5) { - })(m5 = m25.m5 || (m25.m5 = {})); - })(m25 = m.m25 || (m.m25 = {})); -})(m || (m = {})); -var m13; + })(m5); + })(m25); +})(m); +var m13 = m13 || (m13 = {}); (function (m13) { - var m4; + var m4 = m13.m4 || (m13.m4 = {}); (function (m4) { - var m2; + var m2 = m4.m2 || (m4.m2 = {}); (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { - })(m3 = m2.m3 || (m2.m3 = {})); - })(m2 = m4.m2 || (m4.m2 = {})); + })(m3); + })(m2); function f() { return 20; } m4.f = f; - })(m4 = m13.m4 || (m13.m4 = {})); -})(m13 || (m13 = {})); -var exportTests; + })(m4); +})(m13); +var exportTests = exportTests || (exportTests = {}); (function (exportTests) { var C1_public = /** @class */ (function () { function C1_public() { @@ -356,7 +356,7 @@ var exportTests; return C3_public; }()); exportTests.C3_public = C3_public; -})(exportTests || (exportTests = {})); +})(exportTests); function foo() { return mAmbient.foo(); } diff --git a/tests/baselines/reference/multiModuleClodule1.js b/tests/baselines/reference/multiModuleClodule1.js index 18ab88c42d2c4..62e5353df53d3 100644 --- a/tests/baselines/reference/multiModuleClodule1.js +++ b/tests/baselines/reference/multiModuleClodule1.js @@ -30,11 +30,11 @@ var C = /** @class */ (function () { (function (C) { C.x = 1; var y = 2; -})(C || (C = {})); +})(C); (function (C) { function foo() { } C.foo = foo; function baz() { return ''; } -})(C || (C = {})); +})(C); var c = new C(C.x); c.foo = C.foo; diff --git a/tests/baselines/reference/multiModuleFundule1.js b/tests/baselines/reference/multiModuleFundule1.js index 43bfe0b35fa00..de770ccfbad9b 100644 --- a/tests/baselines/reference/multiModuleFundule1.js +++ b/tests/baselines/reference/multiModuleFundule1.js @@ -16,11 +16,11 @@ var r3 = C.foo(); function C(x) { } (function (C) { C.x = 1; -})(C || (C = {})); +})(C); (function (C) { function foo() { } C.foo = foo; -})(C || (C = {})); +})(C); var r = C(2); var r2 = new C(2); // using void returning function as constructor var r3 = C.foo(); diff --git a/tests/baselines/reference/multipleDefaultExports02.errors.txt b/tests/baselines/reference/multipleDefaultExports02.errors.txt index 97a36e064557d..47c30fe659595 100644 --- a/tests/baselines/reference/multipleDefaultExports02.errors.txt +++ b/tests/baselines/reference/multipleDefaultExports02.errors.txt @@ -1,15 +1,19 @@ tests/cases/conformance/es6/modules/m1.ts(1,25): error TS2323: Cannot redeclare exported variable 'default'. tests/cases/conformance/es6/modules/m1.ts(1,25): error TS2393: Duplicate function implementation. +tests/cases/conformance/es6/modules/m1.ts(1,25): error TS2735: Merged default exports must have the same name. tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2323: Cannot redeclare exported variable 'default'. tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2393: Duplicate function implementation. +tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2735: Merged default exports must have the same name. -==== tests/cases/conformance/es6/modules/m1.ts (4 errors) ==== +==== tests/cases/conformance/es6/modules/m1.ts (6 errors) ==== export default function foo() { ~~~ !!! error TS2323: Cannot redeclare exported variable 'default'. ~~~ !!! error TS2393: Duplicate function implementation. + ~~~ +!!! error TS2735: Merged default exports must have the same name. } @@ -18,6 +22,8 @@ tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2393: Duplicate functio !!! error TS2323: Cannot redeclare exported variable 'default'. ~~~ !!! error TS2393: Duplicate function implementation. + ~~~ +!!! error TS2735: Merged default exports must have the same name. } diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index 284b24ef4f9e0..09aedf7d3435f 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -14,11 +14,11 @@ export module M { //// [multipleExports.js] "use strict"; exports.__esModule = true; -var M; +var M = {}; (function (M) { M.v = 0; -})(M = exports.M || (exports.M = {})); +})(M); var x = 0; (function (M) { M.v; -})(M = exports.M || (exports.M = {})); +})(M); diff --git a/tests/baselines/reference/multivar.js b/tests/baselines/reference/multivar.js index 0147f5e763ca6..272d42a7b7f10 100644 --- a/tests/baselines/reference/multivar.js +++ b/tests/baselines/reference/multivar.js @@ -49,7 +49,7 @@ var b5 = 10; //// [multivar.js] var a, b, c; var x = 1, y = 2, z = 3; -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { m2.b2 = 10; var m1; @@ -70,7 +70,7 @@ var m2; m2.C2 = C2; var m; var b2; -})(m2 || (m2 = {})); +})(m2); var d; var a22, b22 = 10, c22 = 30, dn; var nn; diff --git a/tests/baselines/reference/nameCollision.js b/tests/baselines/reference/nameCollision.js index c7c2f97156f6c..3cacacc846b51 100644 --- a/tests/baselines/reference/nameCollision.js +++ b/tests/baselines/reference/nameCollision.js @@ -47,17 +47,17 @@ module D { } //// [nameCollision.js] -var A; +var A = A || (A = {}); (function (A_1) { // these 2 statements force an underscore before the 'A' // in the generated function call. var A = 12; var _A = ''; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var A = 12; -})(B || (B = {})); +})(B); (function (B_1) { // re-opened module with colliding name // this should add an underscore. @@ -66,35 +66,35 @@ var B; } return B; }()); -})(B || (B = {})); -var X; +})(B); +var X = X || (X = {}); (function (X_1) { var X = 13; - var Y; + var Y = X_1.Y || (X_1.Y = {}); (function (Y_1) { var Y = 13; - var Z; + var Z = Y_1.Z || (Y_1.Z = {}); (function (Z_1) { var X = 12; var Y = 12; var Z = 12; - })(Z = Y_1.Z || (Y_1.Z = {})); - })(Y = X_1.Y || (X_1.Y = {})); -})(X || (X = {})); -var Y; + })(Z); + })(Y); +})(X); +var Y = Y || (Y = {}); (function (Y_2) { - var Y; + var Y = Y_2.Y || (Y_2.Y = {}); (function (Y_3) { - var Y; + var Y = Y_3.Y || (Y_3.Y = {}); (function (Y) { Y[Y["Red"] = 0] = "Red"; Y[Y["Blue"] = 1] = "Blue"; - })(Y = Y_3.Y || (Y_3.Y = {})); - })(Y = Y_2.Y || (Y_2.Y = {})); -})(Y || (Y = {})); + })(Y); + })(Y); +})(Y); // no collision, since interface doesn't // generate code. -var D; +var D = D || (D = {}); (function (D) { D.E = 'hello'; -})(D || (D = {})); +})(D); diff --git a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js index a13c38cf737e7..48bc5af5fb50f 100644 --- a/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js +++ b/tests/baselines/reference/nameCollisionWithBlockScopedVariable1.js @@ -10,15 +10,15 @@ module M { } //// [nameCollisionWithBlockScopedVariable1.js] -var M; +var M = M || (M = {}); (function (M) { class C { } M.C = C; -})(M || (M = {})); +})(M); (function (M_1) { { let M = 0; new M_1.C(); } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js index b8d44897cdacc..f96a42dea0eb7 100644 --- a/tests/baselines/reference/nameCollisions.js +++ b/tests/baselines/reference/nameCollisions.js @@ -48,10 +48,10 @@ module T { } //// [nameCollisions.js] -var T; +var T = T || (T = {}); (function (T) { var x = 2; - var x; + var x = x || (x = {}); (function (x) { var Bar = /** @class */ (function () { function Bar() { @@ -59,16 +59,16 @@ var T; return Bar; }()); x.Bar = Bar; - })(x || (x = {})); - var z; + })(x); + var z = z || (z = {}); (function (z) { var t; - })(z || (z = {})); + })(z); var z; // error - var y; + var y = y || (y = {}); (function (y) { var b; - })(y || (y = {})); + })(y); var y = /** @class */ (function () { function y() { } @@ -103,4 +103,4 @@ var T; } return cli2; }()); -})(T || (T = {})); +})(T); diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js index d070638417bdd..81d8f92e78582 100644 --- a/tests/baselines/reference/nameWithRelativePaths.js +++ b/tests/baselines/reference/nameWithRelativePaths.js @@ -37,10 +37,10 @@ exports.f = f; //// [foo_2.js] "use strict"; exports.__esModule = true; -var M2; +var M2 = {}; (function (M2) { M2.x = true; -})(M2 = exports.M2 || (exports.M2 = {})); +})(M2); //// [foo_3.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.js b/tests/baselines/reference/namedFunctionExpressionInModule.js index 7f255c416f119..e25ff94d470d0 100644 --- a/tests/baselines/reference/namedFunctionExpressionInModule.js +++ b/tests/baselines/reference/namedFunctionExpressionInModule.js @@ -7,9 +7,9 @@ module Variables{ //// [namedFunctionExpressionInModule.js] -var Variables; +var Variables = Variables || (Variables = {}); (function (Variables) { var x = function bar(a, b, c) { }; x(1, 2, 3); -})(Variables || (Variables = {})); +})(Variables); diff --git a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.js b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.js index 866aa225db931..2de7312a905f8 100644 --- a/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.js +++ b/tests/baselines/reference/namespaceMergedWithImportAliasNoCrash.js @@ -23,10 +23,10 @@ Library.foo; // should be an error //// [file2.js] "use strict"; exports.__esModule = true; -var Lib; +var Lib = {}; +exports.Lib = Lib; (function (Lib) { Lib.foo = ""; -})(Lib || (Lib = {})); -exports.Lib = Lib; +})(Lib); Lib.foo; // should work var x; // should be an error diff --git a/tests/baselines/reference/namespaces2.js b/tests/baselines/reference/namespaces2.js index fc347f9be14b5..716f044fc878b 100644 --- a/tests/baselines/reference/namespaces2.js +++ b/tests/baselines/reference/namespaces2.js @@ -8,9 +8,9 @@ module A { var c: A.B.C = new A.B.C(); //// [namespaces2.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { var C = /** @class */ (function () { function C() { @@ -18,6 +18,6 @@ var A; return C; }()); B.C = C; - })(B = A.B || (A.B = {})); -})(A || (A = {})); + })(B); +})(A); var c = new A.B.C(); diff --git a/tests/baselines/reference/namespacesDeclaration2.js b/tests/baselines/reference/namespacesDeclaration2.js index 7c74da322d826..cc0f75079eec6 100644 --- a/tests/baselines/reference/namespacesDeclaration2.js +++ b/tests/baselines/reference/namespacesDeclaration2.js @@ -15,14 +15,14 @@ var foo: M.F; let x: ns.A; //// [namespacesDeclaration2.js] -var N; +var N = N || (N = {}); (function (N) { function S() { } -})(N || (N = {})); -var M; +})(N); +var M = M || (M = {}); (function (M) { function F() { } -})(M || (M = {})); +})(M); var foge; var foo; var x; diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js index f69ab91321534..29c2893b0b312 100644 --- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js @@ -73,9 +73,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsNumber1 = -ANY1; diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js index 13347a2af68d5..eb83859ef63ab 100644 --- a/tests/baselines/reference/negateOperatorWithBooleanType.js +++ b/tests/baselines/reference/negateOperatorWithBooleanType.js @@ -45,9 +45,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsNumber1 = -BOOLEAN; diff --git a/tests/baselines/reference/negateOperatorWithEnumType.js b/tests/baselines/reference/negateOperatorWithEnumType.js index e33e78110772b..ae0452beb034c 100644 --- a/tests/baselines/reference/negateOperatorWithEnumType.js +++ b/tests/baselines/reference/negateOperatorWithEnumType.js @@ -19,16 +19,16 @@ var ResultIsNumber3 = -(ENUM1.B + ENUM1[""]); //// [negateOperatorWithEnumType.js] // - operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsNumber1 = -ENUM; diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js index 7605aa1e0ae40..acaa230db02a6 100644 --- a/tests/baselines/reference/negateOperatorWithNumberType.js +++ b/tests/baselines/reference/negateOperatorWithNumberType.js @@ -52,9 +52,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsNumber1 = -NUMBER; diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js index cb3b6c092b4fb..91ae5187bf24f 100644 --- a/tests/baselines/reference/negateOperatorWithStringType.js +++ b/tests/baselines/reference/negateOperatorWithStringType.js @@ -51,9 +51,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsNumber1 = -STRING; diff --git a/tests/baselines/reference/nestedModulePrivateAccess.js b/tests/baselines/reference/nestedModulePrivateAccess.js index 2c0e8a8e465f3..171971ae46330 100644 --- a/tests/baselines/reference/nestedModulePrivateAccess.js +++ b/tests/baselines/reference/nestedModulePrivateAccess.js @@ -7,11 +7,11 @@ module a{ } //// [nestedModulePrivateAccess.js] -var a; +var a = a || (a = {}); (function (a) { var x; - var b; + var b = b || (b = {}); (function (b) { var y = x; // should not be an error - })(b || (b = {})); -})(a || (a = {})); + })(b); +})(a); diff --git a/tests/baselines/reference/nestedModules.js b/tests/baselines/reference/nestedModules.js index c602bb765e292..5d97c67a76c95 100644 --- a/tests/baselines/reference/nestedModules.js +++ b/tests/baselines/reference/nestedModules.js @@ -33,19 +33,19 @@ var p: M2.X.Point; //// [nestedModules.js] -var A; +var A = A || (A = {}); (function (A) { - var B; + var B = A.B || (A.B = {}); (function (B) { var Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C' - })(B = A.B || (A.B = {})); -})(A || (A = {})); -var M2; + })(B); +})(A); +var M2 = M2 || (M2 = {}); (function (M2) { - var X; + var X = M2.X || (M2.X = {}); (function (X) { - })(X = M2.X || (M2.X = {})); -})(M2 || (M2 = {})); + })(X); +})(M2); var m = M2.X; var point; var point = m.Point; diff --git a/tests/baselines/reference/nestedSelf.js b/tests/baselines/reference/nestedSelf.js index cbc6c5ae55c3b..9bcdfa841b313 100644 --- a/tests/baselines/reference/nestedSelf.js +++ b/tests/baselines/reference/nestedSelf.js @@ -9,7 +9,7 @@ module M { //// [nestedSelf.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -22,4 +22,4 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/newArrays.js b/tests/baselines/reference/newArrays.js index 56c8f7d3a0bae..5435bf167d647 100644 --- a/tests/baselines/reference/newArrays.js +++ b/tests/baselines/reference/newArrays.js @@ -13,7 +13,7 @@ module M { } //// [newArrays.js] -var M; +var M = M || (M = {}); (function (M) { var Foo = /** @class */ (function () { function Foo() { @@ -30,4 +30,4 @@ var M; }; return Gar; }()); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/newOperator.js b/tests/baselines/reference/newOperator.js index 160d385c0634b..21686f2fa5a07 100644 --- a/tests/baselines/reference/newOperator.js +++ b/tests/baselines/reference/newOperator.js @@ -69,7 +69,7 @@ var f = new q(); var t5 = new new Date; // Can be an expression new String; -var M; +var M = M || (M = {}); (function (M) { var T = /** @class */ (function () { function T() { @@ -77,7 +77,7 @@ var M; return T; }()); M.T = T; -})(M || (M = {})); +})(M); var S = /** @class */ (function () { function S() { } diff --git a/tests/baselines/reference/noImplicitAnyIndexing.js b/tests/baselines/reference/noImplicitAnyIndexing.js index 2fe60873e6128..d4eae88ffe741 100644 --- a/tests/baselines/reference/noImplicitAnyIndexing.js +++ b/tests/baselines/reference/noImplicitAnyIndexing.js @@ -49,10 +49,10 @@ var mResult3 = m[hi]; //// [noImplicitAnyIndexing.js] -var MyEmusEnum; +var MyEmusEnum = MyEmusEnum || (MyEmusEnum = {}); (function (MyEmusEnum) { MyEmusEnum[MyEmusEnum["emu"] = 0] = "emu"; -})(MyEmusEnum || (MyEmusEnum = {})); +})(MyEmusEnum); // Should be okay; should be a string. var strRepresentation1 = MyEmusEnum[0]; // Should be okay; should be a string. diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.js b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.js index 7d871d8321746..05f317523c654 100644 --- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.js +++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.js @@ -48,10 +48,10 @@ var mResult3 = m[hi]; //// [noImplicitAnyIndexingSuppressed.js] -var MyEmusEnum; +var MyEmusEnum = MyEmusEnum || (MyEmusEnum = {}); (function (MyEmusEnum) { MyEmusEnum[MyEmusEnum["emu"] = 0] = "emu"; -})(MyEmusEnum || (MyEmusEnum = {})); +})(MyEmusEnum); // Should be okay; should be a string. var strRepresentation1 = MyEmusEnum[0]; // Should be okay; should be a string. diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js index d34f52eaa4f19..85ac7268f8f1b 100644 --- a/tests/baselines/reference/noImplicitAnyParametersInModule.js +++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js @@ -46,7 +46,7 @@ module M { } //// [noImplicitAnyParametersInModule.js] -var M; +var M = M || (M = {}); (function (M) { // No implicit-'any' errors. function m_f1() { } @@ -97,4 +97,4 @@ var M; } return ""; }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/noUnusedLocals_selfReference.js b/tests/baselines/reference/noUnusedLocals_selfReference.js index c676560b64a17..55cbe4c039740 100644 --- a/tests/baselines/reference/noUnusedLocals_selfReference.js +++ b/tests/baselines/reference/noUnusedLocals_selfReference.js @@ -43,16 +43,16 @@ var C = /** @class */ (function () { C.prototype.m = function () { C; }; return C; }()); -var E; +var E = {}; (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 0] = "B"; -})(E || (E = {})); +})(E); ; -var N; +var N = {}; (function (N) { N; -})(N || (N = {})); +})(N); var P = /** @class */ (function () { function P() { } diff --git a/tests/baselines/reference/noUnusedLocals_selfReference_skipsBlockLocations.js b/tests/baselines/reference/noUnusedLocals_selfReference_skipsBlockLocations.js index 2b33ed8c31dad..8434888fdb52f 100644 --- a/tests/baselines/reference/noUnusedLocals_selfReference_skipsBlockLocations.js +++ b/tests/baselines/reference/noUnusedLocals_selfReference_skipsBlockLocations.js @@ -18,7 +18,7 @@ namespace n { //// [noUnusedLocals_selfReference_skipsBlockLocations.js] -var n; +var n = n || (n = {}); (function (n) { function f() { f; @@ -33,4 +33,4 @@ var n; h; } } -})(n || (n = {})); +})(n); diff --git a/tests/baselines/reference/nonExportedElementsOfMergedModules.js b/tests/baselines/reference/nonExportedElementsOfMergedModules.js index 623d8b0036ed0..978697892558b 100644 --- a/tests/baselines/reference/nonExportedElementsOfMergedModules.js +++ b/tests/baselines/reference/nonExportedElementsOfMergedModules.js @@ -17,24 +17,24 @@ module One { //// [nonExportedElementsOfMergedModules.js] -var One; +var One = One || (One = {}); (function (One) { - var A; + var A = A || (A = {}); (function (A) { A[A["X"] = 0] = "X"; - })(A || (A = {})); - var B; + })(A); + var B = B || (B = {}); (function (B) { - })(B || (B = {})); -})(One || (One = {})); + })(B); +})(One); (function (One) { - var A; + var A = A || (A = {}); (function (A) { A[A["Y"] = 0] = "Y"; - })(A || (A = {})); - var B; + })(A); + var B = B || (B = {}); (function (B) { - })(B || (B = {})); + })(B); B.x; B.y; -})(One || (One = {})); +})(One); diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js index 836f8866a4101..60988b81d6196 100644 --- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js +++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js @@ -30,9 +30,9 @@ var C = /** @class */ (function () { } return C; }()); -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); var v1; var v2; var v3; @@ -43,9 +43,9 @@ function f() { } return C; }()); - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); + })(E); var v1; var v2; var v3; diff --git a/tests/baselines/reference/nonInstantiatedModule.js b/tests/baselines/reference/nonInstantiatedModule.js index 8807c756a92f6..6005952f74f27 100644 --- a/tests/baselines/reference/nonInstantiatedModule.js +++ b/tests/baselines/reference/nonInstantiatedModule.js @@ -46,10 +46,10 @@ module M3 { } //// [nonInstantiatedModule.js] -var M; +var M = M || (M = {}); (function (M) { M.a = 1; -})(M || (M = {})); +})(M); // primary expression var m; var m = M; @@ -57,21 +57,21 @@ var a1; var a1 = M.a; var a2; var a2 = m.a; -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { - var Point; + var Point = M2.Point || (M2.Point = {}); (function (Point) { function Origin() { return { x: 0, y: 0 }; } Point.Origin = Origin; - })(Point = M2.Point || (M2.Point = {})); -})(M2 || (M2 = {})); + })(Point); +})(M2); var p; var p; var p2; var p2; -var M3; +var M3 = M3 || (M3 = {}); (function (M3) { var Utils = /** @class */ (function () { function Utils() { @@ -79,4 +79,4 @@ var M3; return Utils; }()); M3.Utils = Utils; -})(M3 || (M3 = {})); +})(M3); diff --git a/tests/baselines/reference/nullAssignableToEveryType.js b/tests/baselines/reference/nullAssignableToEveryType.js index 50914b366f8c9..fbcb1a4725c2e 100644 --- a/tests/baselines/reference/nullAssignableToEveryType.js +++ b/tests/baselines/reference/nullAssignableToEveryType.js @@ -51,10 +51,10 @@ var C = /** @class */ (function () { }()); var ac; var ai; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var ae; var b = null; var c = null; diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js index 700d56f0fbe29..e8994c0e191ec 100644 --- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js +++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js @@ -133,10 +133,10 @@ var C2 = /** @class */ (function () { var c2; var r12 = true ? c2 : null; var r12 = true ? null : c2; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var r13 = true ? E : null; var r13 = true ? null : E; var r14 = true ? E.A : null; @@ -144,7 +144,7 @@ var r14 = true ? null : E.A; function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var af; var r15 = true ? af : null; var r15 = true ? null : af; @@ -155,7 +155,7 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); var ac; var r16 = true ? ac : null; var r16 = true ? null : ac; diff --git a/tests/baselines/reference/numberAssignableToEnum.js b/tests/baselines/reference/numberAssignableToEnum.js index 888aa9f7f2046..13837c12837c1 100644 --- a/tests/baselines/reference/numberAssignableToEnum.js +++ b/tests/baselines/reference/numberAssignableToEnum.js @@ -6,10 +6,10 @@ e = n; n = e; //// [numberAssignableToEnum.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var n; var e; e = n; diff --git a/tests/baselines/reference/numberAssignableToEnumInsideUnion.js b/tests/baselines/reference/numberAssignableToEnumInsideUnion.js index 584b395212d67..289727efc6687 100644 --- a/tests/baselines/reference/numberAssignableToEnumInsideUnion.js +++ b/tests/baselines/reference/numberAssignableToEnumInsideUnion.js @@ -5,10 +5,10 @@ let z: E | boolean = n; //// [numberAssignableToEnumInsideUnion.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; -})(E || (E = {})); +})(E); var n; var z = n; diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.js b/tests/baselines/reference/objectLitArrayDeclNoNew.js index c724482d36426..a7935d23a03cf 100644 --- a/tests/baselines/reference/objectLitArrayDeclNoNew.js +++ b/tests/baselines/reference/objectLitArrayDeclNoNew.js @@ -29,7 +29,7 @@ module Test { //// [objectLitArrayDeclNoNew.js] "use strict"; -var Test; +var Test = Test || (Test = {}); (function (Test) { var Gar = /** @class */ (function () { function Gar() { @@ -46,4 +46,4 @@ var Test; }; } Test.bug = bug; -})(Test || (Test = {})); +})(Test); diff --git a/tests/baselines/reference/objectLiteralEnumPropertyNames.js b/tests/baselines/reference/objectLiteralEnumPropertyNames.js index 8f01ebc7e7097..363ff0bf92c98 100644 --- a/tests/baselines/reference/objectLiteralEnumPropertyNames.js +++ b/tests/baselines/reference/objectLiteralEnumPropertyNames.js @@ -56,11 +56,11 @@ const um = { //// [objectLiteralEnumPropertyNames.js] var _a, _b, _c, _d, _e, _f, _g, _h, _j; // Fixes #16887 -var Strs; +var Strs = Strs || (Strs = {}); (function (Strs) { Strs["A"] = "a"; Strs["B"] = "b"; -})(Strs || (Strs = {})); +})(Strs); var x = (_a = {}, _a[Strs.A] = 'xo', _a[Strs.B] = 'xe', @@ -83,11 +83,11 @@ var uz = (_e = {}, _e[a] = 'zo', _e[b] = 'ze', _e); -var Nums; +var Nums = Nums || (Nums = {}); (function (Nums) { Nums[Nums["A"] = 0] = "A"; Nums[Nums["B"] = 1] = "B"; -})(Nums || (Nums = {})); +})(Nums); var n = (_f = {}, _f[Nums.A] = 1, _f[Nums.B] = 2, diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js index 65ba94f86a3db..e1736d08e00b4 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesErrorWithModule.js @@ -18,14 +18,14 @@ m.y.x; //// [objectLiteralShorthandPropertiesErrorWithModule.js] // module export var x = "Foo"; -var m; +var m = m || (m = {}); (function (m) { -})(m || (m = {})); -var n; +})(m); +var n = n || (n = {}); (function (n) { var z = 10000; n.y = { m: .x // error }; -})(n || (n = {})); +})(n); m.y.x; diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js index 69395b0df4930..9b0e80c09befc 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModule.js @@ -16,13 +16,13 @@ module m { //// [objectLiteralShorthandPropertiesWithModule.js] // module export -var m; +var m = m || (m = {}); (function (m) { -})(m || (m = {})); +})(m); (function (m) { var z = m.x; var y = { a: m.x, x: m.x }; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js index de51ca232d1b8..6461ac5133421 100644 --- a/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js +++ b/tests/baselines/reference/objectLiteralShorthandPropertiesWithModuleES6.js @@ -13,13 +13,13 @@ module m { //// [objectLiteralShorthandPropertiesWithModuleES6.js] -var m; +var m = m || (m = {}); (function (m) { -})(m || (m = {})); +})(m); (function (m) { var z = m.x; var y = { a: m.x, x: m.x }; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/objectTypesIdentity2.js b/tests/baselines/reference/objectTypesIdentity2.js index 125b8a4641fd7..d448daf0601f9 100644 --- a/tests/baselines/reference/objectTypesIdentity2.js +++ b/tests/baselines/reference/objectTypesIdentity2.js @@ -83,10 +83,10 @@ var C = /** @class */ (function () { return C; }()); var a; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var b = { foo: E.A }; function foo5(x) { } function foo5b(x) { } diff --git a/tests/baselines/reference/operatorAddNullUndefined.js b/tests/baselines/reference/operatorAddNullUndefined.js index 4d52dbb234c68..1059bcb24241e 100644 --- a/tests/baselines/reference/operatorAddNullUndefined.js +++ b/tests/baselines/reference/operatorAddNullUndefined.js @@ -18,10 +18,10 @@ var x15 = E.x + null var x16 = E.x + undefined //// [operatorAddNullUndefined.js] -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 0] = "x"; -})(E || (E = {})); +})(E); var x1 = null + null; var x2 = null + undefined; var x3 = undefined + null; diff --git a/tests/baselines/reference/outfile-concat.js b/tests/baselines/reference/outfile-concat.js index b243ab98e5c21..b311f293eb038 100644 --- a/tests/baselines/reference/outfile-concat.js +++ b/tests/baselines/reference/outfile-concat.js @@ -12,13 +12,13 @@ declare class C { {"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;ACVD,cAAM,CAAC;IACH,WAAW;CAGd"} //// [/src/2/second-output.js] -var N; +var N = N || (N = {}); (function (N) { function f() { console.log('testing'); } f(); -})(N || (N = {})); +})(N); var C = (function () { function C() { } @@ -30,7 +30,7 @@ var C = (function () { //# sourceMappingURL=second-output.js.map //// [/src/2/second-output.js.map] -{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAIA,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} +{"version":3,"file":"second-output.js","sourceRoot":"","sources":["../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAIA,IAAU,CAAC,GAAD,CAAC,KAAD,CAAC,OAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,EAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"} //// [/src/first/bin/first-output.d.ts] interface TheFirst { @@ -90,13 +90,13 @@ function f() { return "JS does hoists"; } //# sourceMappingURL=first-output.js.map -var N; +var N = N || (N = {}); (function (N) { function f() { console.log('testing'); } f(); -})(N || (N = {})); +})(N); var C = (function () { function C() { } @@ -111,5 +111,5 @@ c.doSomething(); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":"ACIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":"ACIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;ACED,IAAU,CAAC,GAAD,CAAC,KAAD,CAAC,OAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,EAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js index e987adc353ea5..83aba06eb1379 100644 --- a/tests/baselines/reference/overload1.js +++ b/tests/baselines/reference/overload1.js @@ -53,7 +53,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var O; +var O = O || (O = {}); (function (O) { var A = /** @class */ (function () { function A() { @@ -77,7 +77,7 @@ var O; return C; }(B)); O.C = C; -})(O || (O = {})); +})(O); var e = x.g(new O.A()); // matches overload but bad assignment var y = x.f(3); // good y = x.f("nope"); // can't assign number to string diff --git a/tests/baselines/reference/overload2.js b/tests/baselines/reference/overload2.js index 72d9eb0322ff3..bf3b0ff5c76e0 100644 --- a/tests/baselines/reference/overload2.js +++ b/tests/baselines/reference/overload2.js @@ -17,12 +17,12 @@ function foo1(x: number) { //// [overload2.js] -var A; +var A = A || (A = {}); (function (A) { -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { -})(B || (B = {})); +})(B); // should be ok function foo(x) { } diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js index 4a85517555553..dcb0ad1ff9fac 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js @@ -24,7 +24,7 @@ bug3(fprime); bug3(function(x:string):string { return x; }); //// [overloadResolutionOverNonCTLambdas.js] -var Bugs; +var Bugs = Bugs || (Bugs = {}); (function (Bugs) { var A = /** @class */ (function () { function A() { @@ -49,7 +49,7 @@ var Bugs; }); return result; } -})(Bugs || (Bugs = {})); +})(Bugs); function bug3(f) { return f("s"); } function fprime(x) { return x; } bug3(fprime); diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js index cf125bebbf515..5c4c227132747 100644 --- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js +++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.js @@ -22,11 +22,11 @@ module Bugs { } //// [overloadResolutionOverNonCTObjectLit.js] -var Bugs; +var Bugs = Bugs || (Bugs = {}); (function (Bugs) { function bug3() { var tokens = []; tokens.push({ startIndex: 1, type: '', bracket: 3 }); tokens.push(({ startIndex: 1, type: '', bracket: 3, state: null, length: 10 })); } -})(Bugs || (Bugs = {})); +})(Bugs); diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js index 42c371dd21831..c5b9d3530c7f7 100644 --- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js +++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js @@ -9,8 +9,8 @@ module M { } //// [overloadsInDifferentContainersDisagreeOnAmbient.js] -var M; +var M = M || (M = {}); (function (M) { function f() { } M.f = f; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.js b/tests/baselines/reference/parameterPropertyInConstructor2.js index 80c2a74101921..76415ce585f77 100644 --- a/tests/baselines/reference/parameterPropertyInConstructor2.js +++ b/tests/baselines/reference/parameterPropertyInConstructor2.js @@ -9,7 +9,7 @@ module mod { //// [parameterPropertyInConstructor2.js] -var mod; +var mod = mod || (mod = {}); (function (mod) { var Customers = /** @class */ (function () { function Customers(names, ages) { @@ -18,4 +18,4 @@ var mod; } return Customers; }()); -})(mod || (mod = {})); +})(mod); diff --git a/tests/baselines/reference/parseEntityNameWithReservedWord.js b/tests/baselines/reference/parseEntityNameWithReservedWord.js index 2de1b14b0593f..01763908ea460 100644 --- a/tests/baselines/reference/parseEntityNameWithReservedWord.js +++ b/tests/baselines/reference/parseEntityNameWithReservedWord.js @@ -4,8 +4,8 @@ const x: Bool.false = Bool.false; //// [parseEntityNameWithReservedWord.js] -var Bool; +var Bool = Bool || (Bool = {}); (function (Bool) { Bool[Bool["false"] = 0] = "false"; -})(Bool || (Bool = {})); +})(Bool); var x = Bool["false"]; diff --git a/tests/baselines/reference/parserComputedPropertyName16.js b/tests/baselines/reference/parserComputedPropertyName16.js index 7f0c07e38c247..9c9706bf6fdcf 100644 --- a/tests/baselines/reference/parserComputedPropertyName16.js +++ b/tests/baselines/reference/parserComputedPropertyName16.js @@ -4,7 +4,7 @@ enum E { } //// [parserComputedPropertyName16.js] -var E; +var E = E || (E = {}); (function (E) { E[E[e] = 1] = e; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserComputedPropertyName26.js b/tests/baselines/reference/parserComputedPropertyName26.js index fe47249a22eef..1341fca551274 100644 --- a/tests/baselines/reference/parserComputedPropertyName26.js +++ b/tests/baselines/reference/parserComputedPropertyName26.js @@ -6,8 +6,8 @@ enum E { } //// [parserComputedPropertyName26.js] -var E; +var E = E || (E = {}); (function (E) { // No ASI E[E[e] = 0[e2] = 1] = e; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserComputedPropertyName30.js b/tests/baselines/reference/parserComputedPropertyName30.js index cdad5321cff6b..566a0f608debe 100644 --- a/tests/baselines/reference/parserComputedPropertyName30.js +++ b/tests/baselines/reference/parserComputedPropertyName30.js @@ -6,9 +6,9 @@ enum E { } //// [parserComputedPropertyName30.js] -var E; +var E = E || (E = {}); (function (E) { // no ASI, comma expected E[E[e] = id++] = e; E[E[e2] = 1] = e2; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserComputedPropertyName34.js b/tests/baselines/reference/parserComputedPropertyName34.js index f5a6daa56e53f..2c8c4598a6e59 100644 --- a/tests/baselines/reference/parserComputedPropertyName34.js +++ b/tests/baselines/reference/parserComputedPropertyName34.js @@ -6,9 +6,9 @@ enum E { } //// [parserComputedPropertyName34.js] -var E; +var E = E || (E = {}); (function (E) { // no ASI, comma expected E[E[e] = id++] = e; E[E[e2] = 1] = e2; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserES5ComputedPropertyName6.js b/tests/baselines/reference/parserES5ComputedPropertyName6.js index a2fdae9c32ebd..297b0ca52755b 100644 --- a/tests/baselines/reference/parserES5ComputedPropertyName6.js +++ b/tests/baselines/reference/parserES5ComputedPropertyName6.js @@ -4,7 +4,7 @@ enum E { } //// [parserES5ComputedPropertyName6.js] -var E; +var E = E || (E = {}); (function (E) { E[E[e] = 1] = e; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserEnum1.js b/tests/baselines/reference/parserEnum1.js index 10f24cc86017d..182ed310ecc11 100644 --- a/tests/baselines/reference/parserEnum1.js +++ b/tests/baselines/reference/parserEnum1.js @@ -9,10 +9,10 @@ //// [parserEnum1.js] "use strict"; exports.__esModule = true; -var SignatureFlags; +var SignatureFlags = {}; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["IsIndexer"] = 1] = "IsIndexer"; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; -})(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +})(SignatureFlags); diff --git a/tests/baselines/reference/parserEnum2.js b/tests/baselines/reference/parserEnum2.js index b1f28f6c5025a..43c5da8730c49 100644 --- a/tests/baselines/reference/parserEnum2.js +++ b/tests/baselines/reference/parserEnum2.js @@ -9,10 +9,10 @@ //// [parserEnum2.js] "use strict"; exports.__esModule = true; -var SignatureFlags; +var SignatureFlags = {}; (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["IsIndexer"] = 1] = "IsIndexer"; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; -})(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +})(SignatureFlags); diff --git a/tests/baselines/reference/parserEnum3.js b/tests/baselines/reference/parserEnum3.js index 3e5595911285a..9d15e7ebfa09a 100644 --- a/tests/baselines/reference/parserEnum3.js +++ b/tests/baselines/reference/parserEnum3.js @@ -5,6 +5,6 @@ //// [parserEnum3.js] "use strict"; exports.__esModule = true; -var SignatureFlags; +var SignatureFlags = {}; (function (SignatureFlags) { -})(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +})(SignatureFlags); diff --git a/tests/baselines/reference/parserEnum4.js b/tests/baselines/reference/parserEnum4.js index 90919ed8347ed..240dcdcf52c3f 100644 --- a/tests/baselines/reference/parserEnum4.js +++ b/tests/baselines/reference/parserEnum4.js @@ -6,6 +6,6 @@ //// [parserEnum4.js] "use strict"; exports.__esModule = true; -var SignatureFlags; +var SignatureFlags = {}; (function (SignatureFlags) { -})(SignatureFlags = exports.SignatureFlags || (exports.SignatureFlags = {})); +})(SignatureFlags); diff --git a/tests/baselines/reference/parserEnum5.js b/tests/baselines/reference/parserEnum5.js index 89d92dee6cfe7..2a441151d803c 100644 --- a/tests/baselines/reference/parserEnum5.js +++ b/tests/baselines/reference/parserEnum5.js @@ -4,16 +4,16 @@ enum E3 { a: 1, } enum E1 { a, b: 1, c, d: 2 = 3 } //// [parserEnum5.js] -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["a"] = 0] = "a"; -})(E2 || (E2 = {})); -var E3; +})(E2); +var E3 = E3 || (E3 = {}); (function (E3) { E3[E3["a"] = 0] = "a"; E3[E3[1] = 1] = 1; -})(E3 || (E3 = {})); -var E1; +})(E3); +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["a"] = 0] = "a"; E1[E1["b"] = 1] = "b"; @@ -21,4 +21,4 @@ var E1; E1[E1["c"] = 3] = "c"; E1[E1["d"] = 4] = "d"; E1[E1[2] = 3] = 2; -})(E1 || (E1 = {})); +})(E1); diff --git a/tests/baselines/reference/parserEnum6.js b/tests/baselines/reference/parserEnum6.js index 0c9ff2fcab9e0..80d715dcaa0f5 100644 --- a/tests/baselines/reference/parserEnum6.js +++ b/tests/baselines/reference/parserEnum6.js @@ -4,9 +4,9 @@ enum E { } //// [parserEnum6.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserEnum7.js b/tests/baselines/reference/parserEnum7.js index 86809cf325f3c..f5c9f6f22f961 100644 --- a/tests/baselines/reference/parserEnum7.js +++ b/tests/baselines/reference/parserEnum7.js @@ -4,9 +4,9 @@ enum E { } //// [parserEnum7.js] -var E; +var E = E || (E = {}); (function (E) { E[E[1] = 0] = 1; E[E[2] = 1] = 2; E[E[3] = 2] = 3; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserEnumDeclaration1.js b/tests/baselines/reference/parserEnumDeclaration1.js index e53aa967b8db8..e78c9b7d6011a 100644 --- a/tests/baselines/reference/parserEnumDeclaration1.js +++ b/tests/baselines/reference/parserEnumDeclaration1.js @@ -5,8 +5,8 @@ enum E { } //// [parserEnumDeclaration1.js] -var E; +var E = E || (E = {}); (function (E) { E[E["Foo"] = 1] = "Foo"; E[E["Bar"] = 2] = "Bar"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserEnumDeclaration4.js b/tests/baselines/reference/parserEnumDeclaration4.js index 47450d419e157..ebfda63d5bb09 100644 --- a/tests/baselines/reference/parserEnumDeclaration4.js +++ b/tests/baselines/reference/parserEnumDeclaration4.js @@ -3,7 +3,7 @@ enum void { } //// [parserEnumDeclaration4.js] -var ; +var = || ( = {}); (function () { -})( || ( = {})); +})(); void {}; diff --git a/tests/baselines/reference/parserEnumDeclaration5.js b/tests/baselines/reference/parserEnumDeclaration5.js index 9888cf16e02e5..572d55689646c 100644 --- a/tests/baselines/reference/parserEnumDeclaration5.js +++ b/tests/baselines/reference/parserEnumDeclaration5.js @@ -7,10 +7,10 @@ enum E { } //// [parserEnumDeclaration5.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 1] = "A"; E[E["B"] = 2] = "B"; E[E["C"] = 2] = "C"; E[E["D"] = 3] = "D"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserEnumDeclaration6.js b/tests/baselines/reference/parserEnumDeclaration6.js index a29226fbd1d7b..4336dfe9960a7 100644 --- a/tests/baselines/reference/parserEnumDeclaration6.js +++ b/tests/baselines/reference/parserEnumDeclaration6.js @@ -7,10 +7,10 @@ enum E { } //// [parserEnumDeclaration6.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 1] = "A"; E[E["B"] = 2] = "B"; E[E["C"] = 2] = "C"; E[E["D"] = 3] = "D"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js index be0bb67511dfa..ab1ce1a461268 100644 --- a/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js +++ b/tests/baselines/reference/parserErrantAccessibilityModifierInModule1.js @@ -6,9 +6,9 @@ module M { } //// [parserErrantAccessibilityModifierInModule1.js] -var M; +var M = M || (M = {}); (function (M) { var x = 10; // variable local to this module body y = x; // property visible only in module M.z = y; // property visible to any code -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js index 583b059fe94c7..20e091e072e0b 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js @@ -7,14 +7,14 @@ module M { } //// [parserErrorRecovery_ClassElement2.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { } return C; }()); - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); -})(M || (M = {})); + })(E); +})(M); diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js index 36d98fa54003e..79ca7e96d17f9 100644 --- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js +++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js @@ -8,14 +8,14 @@ module M { # //// [parserErrorRecovery_ClassElement3.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { } return C; }()); - var E; + var E = E || (E = {}); (function (E) { - })(E || (E = {})); -})(M || (M = {})); + })(E); +})(M); diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js index 117b7f7d9a2fe..7fd26ba89c6b6 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js @@ -30,7 +30,7 @@ var dist = p.getDist(); //// [parserErrorRecovery_IncompleteMemberVariable1.js] // Module -var Shapes; +var Shapes = Shapes || (Shapes = {}); (function (Shapes) { // Class var Point = /** @class */ (function () { @@ -46,7 +46,7 @@ var Shapes; return Point; }()); Shapes.Point = Point; -})(Shapes || (Shapes = {})); +})(Shapes); // Local variables var p = new Shapes.Point(3, 4); var dist = p.getDist(); diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js index 2ff2b37182226..0079080edbc3a 100644 --- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js +++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js @@ -30,7 +30,7 @@ var dist = p.getDist(); //// [parserErrorRecovery_IncompleteMemberVariable2.js] // Module -var Shapes; +var Shapes = Shapes || (Shapes = {}); (function (Shapes) { // Class var Point = /** @class */ (function () { @@ -46,7 +46,7 @@ var Shapes; return Point; }()); Shapes.Point = Point; -})(Shapes || (Shapes = {})); +})(Shapes); // Local variables var p = new Shapes.Point(3, 4); var dist = p.getDist(); diff --git a/tests/baselines/reference/parserExportAssignment5.js b/tests/baselines/reference/parserExportAssignment5.js index 03b1d798d5da4..c9b6a39cd2516 100644 --- a/tests/baselines/reference/parserExportAssignment5.js +++ b/tests/baselines/reference/parserExportAssignment5.js @@ -4,7 +4,7 @@ module M { } //// [parserExportAssignment5.js] -var M; +var M = M || (M = {}); (function (M) { export = A; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/parserExportAssignment9.js b/tests/baselines/reference/parserExportAssignment9.js index 2600ae629e9b3..c4314f05ba419 100644 --- a/tests/baselines/reference/parserExportAssignment9.js +++ b/tests/baselines/reference/parserExportAssignment9.js @@ -8,11 +8,11 @@ module Bar { } //// [parserExportAssignment9.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { export default foo; -})(Foo || (Foo = {})); -var Bar; +})(Foo); +var Bar = Bar || (Bar = {}); (function (Bar) { export default bar; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/parserFunctionDeclaration7.js b/tests/baselines/reference/parserFunctionDeclaration7.js index ee96259f88d35..f04fbf16a9ae3 100644 --- a/tests/baselines/reference/parserFunctionDeclaration7.js +++ b/tests/baselines/reference/parserFunctionDeclaration7.js @@ -4,6 +4,6 @@ module M { } //// [parserFunctionDeclaration7.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/parserInterfaceKeywordInEnum.js b/tests/baselines/reference/parserInterfaceKeywordInEnum.js index 3d9ad901101a8..b40064aa96a09 100644 --- a/tests/baselines/reference/parserInterfaceKeywordInEnum.js +++ b/tests/baselines/reference/parserInterfaceKeywordInEnum.js @@ -5,7 +5,7 @@ enum Bar { //// [parserInterfaceKeywordInEnum.js] -var Bar; +var Bar = Bar || (Bar = {}); (function (Bar) { Bar[Bar["interface"] = 0] = "interface"; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/parserInterfaceKeywordInEnum1.js b/tests/baselines/reference/parserInterfaceKeywordInEnum1.js index 2ef101d91a29f..83512baf93952 100644 --- a/tests/baselines/reference/parserInterfaceKeywordInEnum1.js +++ b/tests/baselines/reference/parserInterfaceKeywordInEnum1.js @@ -8,7 +8,7 @@ enum Bar { //// [parserInterfaceKeywordInEnum1.js] "use strict"; -var Bar; +var Bar = Bar || (Bar = {}); (function (Bar) { Bar[Bar["interface"] = 0] = "interface"; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/parserModule1.js b/tests/baselines/reference/parserModule1.js index 484c74f721c62..40a0db1937725 100644 --- a/tests/baselines/reference/parserModule1.js +++ b/tests/baselines/reference/parserModule1.js @@ -34,7 +34,7 @@ //// [parserModule1.js] "use strict"; exports.__esModule = true; -var CompilerDiagnostics; +var CompilerDiagnostics = {}; (function (CompilerDiagnostics) { CompilerDiagnostics.debug = false; CompilerDiagnostics.diagnosticWriter = null; @@ -59,4 +59,4 @@ var CompilerDiagnostics; } } CompilerDiagnostics.assert = assert; -})(CompilerDiagnostics = exports.CompilerDiagnostics || (exports.CompilerDiagnostics = {})); +})(CompilerDiagnostics); diff --git a/tests/baselines/reference/parserRealSource1.js b/tests/baselines/reference/parserRealSource1.js index e9cf326b542ea..ffb1f9a3d8d9b 100644 --- a/tests/baselines/reference/parserRealSource1.js +++ b/tests/baselines/reference/parserRealSource1.js @@ -158,9 +158,9 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { - var CompilerDiagnostics; + var CompilerDiagnostics = TypeScript.CompilerDiagnostics || (TypeScript.CompilerDiagnostics = {}); (function (CompilerDiagnostics) { CompilerDiagnostics.debug = false; CompilerDiagnostics.diagnosticWriter = null; @@ -185,7 +185,7 @@ var TypeScript; } } CompilerDiagnostics.assert = assert; - })(CompilerDiagnostics = TypeScript.CompilerDiagnostics || (TypeScript.CompilerDiagnostics = {})); + })(CompilerDiagnostics); var NullLogger = /** @class */ (function () { function NullLogger() { } @@ -292,4 +292,4 @@ var TypeScript; return result; } TypeScript.stringToLiteral = stringToLiteral; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js index 3d35d1563b12f..9aed27eefa06c 100644 --- a/tests/baselines/reference/parserRealSource10.js +++ b/tests/baselines/reference/parserRealSource10.js @@ -472,9 +472,9 @@ var __extends = (this && this.__extends) || (function () { }; })(); /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { - var TokenID; + var TokenID = TypeScript.TokenID || (TypeScript.TokenID = {}); (function (TokenID) { // Keywords TokenID[TokenID["Any"] = 0] = "Any"; @@ -593,7 +593,7 @@ var TypeScript; TokenID[TokenID["Lim"] = 112] = "Lim"; TokenID[TokenID["LimFixed"] = 105] = "LimFixed"; TokenID[TokenID["LimKeyword"] = 53] = "LimKeyword"; - })(TokenID = TypeScript.TokenID || (TypeScript.TokenID = {})); + })(TokenID); TypeScript.tokenTable = new TokenInfo[]; TypeScript.nodeTypeTable = new string[]; TypeScript.nodeTypeToTokTable = new number[]; @@ -610,7 +610,7 @@ var TypeScript; TypeScript.noRegexTable[TokenID.CloseBrace] = true; TypeScript.noRegexTable[TokenID.True] = true; TypeScript.noRegexTable[TokenID.False] = true; - var OperatorPrecedence; + var OperatorPrecedence = TypeScript.OperatorPrecedence || (TypeScript.OperatorPrecedence = {}); (function (OperatorPrecedence) { OperatorPrecedence[OperatorPrecedence["None"] = 0] = "None"; OperatorPrecedence[OperatorPrecedence["Comma"] = 1] = "Comma"; @@ -628,8 +628,8 @@ var TypeScript; OperatorPrecedence[OperatorPrecedence["Multiplicative"] = 13] = "Multiplicative"; OperatorPrecedence[OperatorPrecedence["Unary"] = 14] = "Unary"; OperatorPrecedence[OperatorPrecedence["Lim"] = 15] = "Lim"; - })(OperatorPrecedence = TypeScript.OperatorPrecedence || (TypeScript.OperatorPrecedence = {})); - var Reservation; + })(OperatorPrecedence); + var Reservation = TypeScript.Reservation || (TypeScript.Reservation = {}); (function (Reservation) { Reservation[Reservation["None"] = 0] = "None"; Reservation[Reservation["Javascript"] = 1] = "Javascript"; @@ -639,7 +639,7 @@ var TypeScript; Reservation[Reservation["TypeScriptAndJS"] = 5] = "TypeScriptAndJS"; Reservation[Reservation["TypeScriptAndJSFuture"] = 6] = "TypeScriptAndJSFuture"; Reservation[Reservation["TypeScriptAndJSFutureStrict"] = 12] = "TypeScriptAndJSFutureStrict"; - })(Reservation = TypeScript.Reservation || (TypeScript.Reservation = {})); + })(Reservation); var TokenInfo = /** @class */ (function () { function TokenInfo(tokenId, reservation, binopPrecedence, binopNodeType, unopPrecedence, unopNodeType, text, ers) { this.tokenId = tokenId; @@ -781,7 +781,7 @@ var TypeScript; return TypeScript.tokenTable[tokenId]; } TypeScript.lookupToken = lookupToken; - var TokenClass; + var TokenClass = TypeScript.TokenClass || (TypeScript.TokenClass = {}); (function (TokenClass) { TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation"; TokenClass[TokenClass["Keyword"] = 1] = "Keyword"; @@ -790,7 +790,7 @@ var TypeScript; TokenClass[TokenClass["Whitespace"] = 4] = "Whitespace"; TokenClass[TokenClass["Identifier"] = 5] = "Identifier"; TokenClass[TokenClass["Literal"] = 6] = "Literal"; - })(TokenClass = TypeScript.TokenClass || (TypeScript.TokenClass = {})); + })(TokenClass); var SavedToken = /** @class */ (function () { function SavedToken(tok, minChar, limChar) { this.tok = tok; @@ -941,4 +941,4 @@ var TypeScript; } } TypeScript.initializeStaticTokens = initializeStaticTokens; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js index b87f9155aa581..6394fe2dbf676 100644 --- a/tests/baselines/reference/parserRealSource11.js +++ b/tests/baselines/reference/parserRealSource11.js @@ -2381,7 +2381,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var ASTSpan = /** @class */ (function () { function ASTSpan() { @@ -4664,4 +4664,4 @@ var TypeScript; return DebuggerStatement; }(Statement)); TypeScript.DebuggerStatement = DebuggerStatement; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource12.js b/tests/baselines/reference/parserRealSource12.js index 18cb042f36d3b..c36b9aa3d636d 100644 --- a/tests/baselines/reference/parserRealSource12.js +++ b/tests/baselines/reference/parserRealSource12.js @@ -534,7 +534,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var AstWalkOptions = /** @class */ (function () { function AstWalkOptions() { @@ -730,7 +730,7 @@ var TypeScript; return globalAstWalkerFactory; } TypeScript.getAstWalkerFactory = getAstWalkerFactory; - var ChildrenWalkers; + var ChildrenWalkers = ChildrenWalkers || (ChildrenWalkers = {}); (function (ChildrenWalkers) { function walkNone(preAst, parent, walker) { // Nothing to do @@ -1028,5 +1028,5 @@ var TypeScript; } } ChildrenWalkers.walkLabeledStatementChildren = walkLabeledStatementChildren; - })(ChildrenWalkers || (ChildrenWalkers = {})); -})(TypeScript || (TypeScript = {})); + })(ChildrenWalkers); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource13.js b/tests/baselines/reference/parserRealSource13.js index 7c1ecdc7372df..246ede1a39dee 100644 --- a/tests/baselines/reference/parserRealSource13.js +++ b/tests/baselines/reference/parserRealSource13.js @@ -150,9 +150,9 @@ module TypeScript.AstWalkerWithDetailCallback { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { - var AstWalkerWithDetailCallback; + var AstWalkerWithDetailCallback = TypeScript.AstWalkerWithDetailCallback || (TypeScript.AstWalkerWithDetailCallback = {}); (function (AstWalkerWithDetailCallback) { function walk(script, callback) { var pre = function (cur, parent) { @@ -179,5 +179,5 @@ var TypeScript; } return true; } - })(AstWalkerWithDetailCallback = TypeScript.AstWalkerWithDetailCallback || (TypeScript.AstWalkerWithDetailCallback = {})); -})(TypeScript || (TypeScript = {})); + })(AstWalkerWithDetailCallback); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js index e72435c775b59..2fc47eb03c6d9 100644 --- a/tests/baselines/reference/parserRealSource14.js +++ b/tests/baselines/reference/parserRealSource14.js @@ -579,7 +579,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { function lastOf(items) { return (items === null || items.length === 0) ? null : items[items.length - 1]; @@ -957,7 +957,7 @@ var TypeScript; return AstPathContext; }()); TypeScript.AstPathContext = AstPathContext; - var GetAstPathOptions; + var GetAstPathOptions = TypeScript.GetAstPathOptions || (TypeScript.GetAstPathOptions = {}); (function (GetAstPathOptions) { GetAstPathOptions[GetAstPathOptions["Default"] = 0] = "Default"; GetAstPathOptions[GetAstPathOptions["EdgeInclusive"] = 1] = "EdgeInclusive"; @@ -969,7 +969,7 @@ var TypeScript; // we don't find the "precomment" attached to the errorneous empty stmt. //TODO: It would be nice to be able to get rid of this. GetAstPathOptions[GetAstPathOptions["DontPruneSearchBasedOnPosition"] = 2] = "DontPruneSearchBasedOnPosition"; - })(GetAstPathOptions = TypeScript.GetAstPathOptions || (TypeScript.GetAstPathOptions = {})); + })(GetAstPathOptions); /// /// Return the stack of AST nodes containing "position" /// @@ -1075,4 +1075,4 @@ var TypeScript; TypeScript.getAstWalkerFactory().walk(ast, pre, post, null, path); } TypeScript.walkAST = walkAST; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource2.js b/tests/baselines/reference/parserRealSource2.js index 2028cbd4efe35..695534d51aac5 100644 --- a/tests/baselines/reference/parserRealSource2.js +++ b/tests/baselines/reference/parserRealSource2.js @@ -275,13 +275,13 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { function hasFlag(val, flag) { return (val & flag) != 0; } TypeScript.hasFlag = hasFlag; - var ErrorRecoverySet; + var ErrorRecoverySet = TypeScript.ErrorRecoverySet || (TypeScript.ErrorRecoverySet = {}); (function (ErrorRecoverySet) { ErrorRecoverySet[ErrorRecoverySet["None"] = 0] = "None"; ErrorRecoverySet[ErrorRecoverySet["Comma"] = 1] = "Comma"; @@ -321,8 +321,8 @@ var TypeScript; ErrorRecoverySet[ErrorRecoverySet["ExprStart"] = 520158210] = "ExprStart"; ErrorRecoverySet[ErrorRecoverySet["StmtStart"] = 1608580098] = "StmtStart"; ErrorRecoverySet[ErrorRecoverySet["Postfix"] = 49280] = "Postfix"; - })(ErrorRecoverySet = TypeScript.ErrorRecoverySet || (TypeScript.ErrorRecoverySet = {})); - var AllowedElements; + })(ErrorRecoverySet); + var AllowedElements = TypeScript.AllowedElements || (TypeScript.AllowedElements = {}); (function (AllowedElements) { AllowedElements[AllowedElements["None"] = 0] = "None"; AllowedElements[AllowedElements["ModuleDeclarations"] = 4] = "ModuleDeclarations"; @@ -332,8 +332,8 @@ var TypeScript; AllowedElements[AllowedElements["Properties"] = 2048] = "Properties"; AllowedElements[AllowedElements["Global"] = 1052] = "Global"; AllowedElements[AllowedElements["QuickParse"] = 3100] = "QuickParse"; - })(AllowedElements = TypeScript.AllowedElements || (TypeScript.AllowedElements = {})); - var Modifiers; + })(AllowedElements); + var Modifiers = TypeScript.Modifiers || (TypeScript.Modifiers = {}); (function (Modifiers) { Modifiers[Modifiers["None"] = 0] = "None"; Modifiers[Modifiers["Private"] = 1] = "Private"; @@ -344,8 +344,8 @@ var TypeScript; Modifiers[Modifiers["Getter"] = 32] = "Getter"; Modifiers[Modifiers["Setter"] = 64] = "Setter"; Modifiers[Modifiers["Static"] = 128] = "Static"; - })(Modifiers = TypeScript.Modifiers || (TypeScript.Modifiers = {})); - var ASTFlags; + })(Modifiers); + var ASTFlags = TypeScript.ASTFlags || (TypeScript.ASTFlags = {}); (function (ASTFlags) { ASTFlags[ASTFlags["None"] = 0] = "None"; ASTFlags[ASTFlags["ExplicitSemicolon"] = 1] = "ExplicitSemicolon"; @@ -363,8 +363,8 @@ var TypeScript; // The flag is used to communicate this piece of information to the calling parseTerm, which intern will remove it. // Once we have a better way to associate information with nodes, this flag should not be used. ASTFlags[ASTFlags["SkipNextRParen"] = 2048] = "SkipNextRParen"; - })(ASTFlags = TypeScript.ASTFlags || (TypeScript.ASTFlags = {})); - var DeclFlags; + })(ASTFlags); + var DeclFlags = TypeScript.DeclFlags || (TypeScript.DeclFlags = {}); (function (DeclFlags) { DeclFlags[DeclFlags["None"] = 0] = "None"; DeclFlags[DeclFlags["Exported"] = 1] = "Exported"; @@ -375,8 +375,8 @@ var TypeScript; DeclFlags[DeclFlags["LocalStatic"] = 32] = "LocalStatic"; DeclFlags[DeclFlags["GetAccessor"] = 64] = "GetAccessor"; DeclFlags[DeclFlags["SetAccessor"] = 128] = "SetAccessor"; - })(DeclFlags = TypeScript.DeclFlags || (TypeScript.DeclFlags = {})); - var ModuleFlags; + })(DeclFlags); + var ModuleFlags = TypeScript.ModuleFlags || (TypeScript.ModuleFlags = {}); (function (ModuleFlags) { ModuleFlags[ModuleFlags["None"] = 0] = "None"; ModuleFlags[ModuleFlags["Exported"] = 1] = "Exported"; @@ -392,8 +392,8 @@ var TypeScript; ModuleFlags[ModuleFlags["IsWholeFile"] = 1024] = "IsWholeFile"; ModuleFlags[ModuleFlags["IsDynamic"] = 2048] = "IsDynamic"; ModuleFlags[ModuleFlags["MustCaptureThis"] = 4096] = "MustCaptureThis"; - })(ModuleFlags = TypeScript.ModuleFlags || (TypeScript.ModuleFlags = {})); - var SymbolFlags; + })(ModuleFlags); + var SymbolFlags = TypeScript.SymbolFlags || (TypeScript.SymbolFlags = {}); (function (SymbolFlags) { SymbolFlags[SymbolFlags["None"] = 0] = "None"; SymbolFlags[SymbolFlags["Exported"] = 1] = "Exported"; @@ -416,8 +416,8 @@ var TypeScript; SymbolFlags[SymbolFlags["RecursivelyReferenced"] = 131072] = "RecursivelyReferenced"; SymbolFlags[SymbolFlags["Bound"] = 262144] = "Bound"; SymbolFlags[SymbolFlags["CompilerGenerated"] = 524288] = "CompilerGenerated"; - })(SymbolFlags = TypeScript.SymbolFlags || (TypeScript.SymbolFlags = {})); - var VarFlags; + })(SymbolFlags); + var VarFlags = TypeScript.VarFlags || (TypeScript.VarFlags = {}); (function (VarFlags) { VarFlags[VarFlags["None"] = 0] = "None"; VarFlags[VarFlags["Exported"] = 1] = "Exported"; @@ -438,8 +438,8 @@ var TypeScript; VarFlags[VarFlags["ClassSuperMustBeFirstCallInConstructor"] = 32768] = "ClassSuperMustBeFirstCallInConstructor"; VarFlags[VarFlags["Constant"] = 65536] = "Constant"; VarFlags[VarFlags["MustCaptureThis"] = 131072] = "MustCaptureThis"; - })(VarFlags = TypeScript.VarFlags || (TypeScript.VarFlags = {})); - var FncFlags; + })(VarFlags); + var FncFlags = TypeScript.FncFlags || (TypeScript.FncFlags = {}); (function (FncFlags) { FncFlags[FncFlags["None"] = 0] = "None"; FncFlags[FncFlags["Exported"] = 1] = "Exported"; @@ -462,19 +462,19 @@ var TypeScript; FncFlags[FncFlags["IsFunctionExpression"] = 131072] = "IsFunctionExpression"; FncFlags[FncFlags["ClassMethod"] = 262144] = "ClassMethod"; FncFlags[FncFlags["ClassPropertyMethodExported"] = 524288] = "ClassPropertyMethodExported"; - })(FncFlags = TypeScript.FncFlags || (TypeScript.FncFlags = {})); - var SignatureFlags; + })(FncFlags); + var SignatureFlags = TypeScript.SignatureFlags || (TypeScript.SignatureFlags = {}); (function (SignatureFlags) { SignatureFlags[SignatureFlags["None"] = 0] = "None"; SignatureFlags[SignatureFlags["IsIndexer"] = 1] = "IsIndexer"; SignatureFlags[SignatureFlags["IsStringIndexer"] = 2] = "IsStringIndexer"; SignatureFlags[SignatureFlags["IsNumberIndexer"] = 4] = "IsNumberIndexer"; - })(SignatureFlags = TypeScript.SignatureFlags || (TypeScript.SignatureFlags = {})); + })(SignatureFlags); function ToDeclFlags(fncOrVarOrSymbolOrModuleFlags) { return fncOrVarOrSymbolOrModuleFlags; } TypeScript.ToDeclFlags = ToDeclFlags; - var TypeFlags; + var TypeFlags = TypeScript.TypeFlags || (TypeScript.TypeFlags = {}); (function (TypeFlags) { TypeFlags[TypeFlags["None"] = 0] = "None"; TypeFlags[TypeFlags["HasImplementation"] = 1] = "HasImplementation"; @@ -485,8 +485,8 @@ var TypeScript; TypeFlags[TypeFlags["HasBaseType"] = 32] = "HasBaseType"; TypeFlags[TypeFlags["HasBaseTypeOfObject"] = 64] = "HasBaseTypeOfObject"; TypeFlags[TypeFlags["IsClass"] = 128] = "IsClass"; - })(TypeFlags = TypeScript.TypeFlags || (TypeScript.TypeFlags = {})); - var TypeRelationshipFlags; + })(TypeFlags); + var TypeRelationshipFlags = TypeScript.TypeRelationshipFlags || (TypeScript.TypeRelationshipFlags = {}); (function (TypeRelationshipFlags) { TypeRelationshipFlags[TypeRelationshipFlags["SuccessfulComparison"] = 0] = "SuccessfulComparison"; TypeRelationshipFlags[TypeRelationshipFlags["SourceIsNullTargetIsVoidOrUndefined"] = 1] = "SourceIsNullTargetIsVoidOrUndefined"; @@ -496,18 +496,18 @@ var TypeScript; TypeRelationshipFlags[TypeRelationshipFlags["IncompatibleReturnTypes"] = 16] = "IncompatibleReturnTypes"; TypeRelationshipFlags[TypeRelationshipFlags["IncompatiblePropertyTypes"] = 32] = "IncompatiblePropertyTypes"; TypeRelationshipFlags[TypeRelationshipFlags["IncompatibleParameterTypes"] = 64] = "IncompatibleParameterTypes"; - })(TypeRelationshipFlags = TypeScript.TypeRelationshipFlags || (TypeScript.TypeRelationshipFlags = {})); - var CodeGenTarget; + })(TypeRelationshipFlags); + var CodeGenTarget = TypeScript.CodeGenTarget || (TypeScript.CodeGenTarget = {}); (function (CodeGenTarget) { CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3"; CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5"; - })(CodeGenTarget = TypeScript.CodeGenTarget || (TypeScript.CodeGenTarget = {})); - var ModuleGenTarget; + })(CodeGenTarget); + var ModuleGenTarget = TypeScript.ModuleGenTarget || (TypeScript.ModuleGenTarget = {}); (function (ModuleGenTarget) { ModuleGenTarget[ModuleGenTarget["Synchronous"] = 0] = "Synchronous"; ModuleGenTarget[ModuleGenTarget["Asynchronous"] = 1] = "Asynchronous"; ModuleGenTarget[ModuleGenTarget["Local"] = 2] = "Local"; - })(ModuleGenTarget = TypeScript.ModuleGenTarget || (TypeScript.ModuleGenTarget = {})); + })(ModuleGenTarget); // Compiler defaults to generating ES5-compliant code for // - getters and setters TypeScript.codeGenTarget = CodeGenTarget.ES3; @@ -531,4 +531,4 @@ var TypeScript; return builder; } TypeScript.flagsToString = flagsToString; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource3.js b/tests/baselines/reference/parserRealSource3.js index f0e22395cfe5e..28c50e6b294f8 100644 --- a/tests/baselines/reference/parserRealSource3.js +++ b/tests/baselines/reference/parserRealSource3.js @@ -123,10 +123,10 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback - var NodeType; + var NodeType = TypeScript.NodeType || (TypeScript.NodeType = {}); (function (NodeType) { NodeType[NodeType["None"] = 0] = "None"; NodeType[NodeType["Empty"] = 1] = "Empty"; @@ -237,5 +237,5 @@ var TypeScript; NodeType[NodeType["Debugger"] = 106] = "Debugger"; NodeType[NodeType["GeneralNode"] = 71] = "GeneralNode"; NodeType[NodeType["LastAsg"] = 41] = "LastAsg"; - })(NodeType = TypeScript.NodeType || (TypeScript.NodeType = {})); -})(TypeScript || (TypeScript = {})); + })(NodeType); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js index 0851b867c276c..d5880daf37631 100644 --- a/tests/baselines/reference/parserRealSource4.js +++ b/tests/baselines/reference/parserRealSource4.js @@ -299,7 +299,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var BlockIntrinsics = /** @class */ (function () { function BlockIntrinsics() { @@ -561,4 +561,4 @@ var TypeScript; return SimpleHashTable; }()); TypeScript.SimpleHashTable = SimpleHashTable; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource5.js b/tests/baselines/reference/parserRealSource5.js index 834371a0dc8a0..925af065252be 100644 --- a/tests/baselines/reference/parserRealSource5.js +++ b/tests/baselines/reference/parserRealSource5.js @@ -70,7 +70,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { // TODO: refactor indent logic for use in emit var PrintContext = /** @class */ (function () { @@ -126,4 +126,4 @@ var TypeScript; return ast; } TypeScript.postPrintAST = postPrintAST; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource6.js b/tests/baselines/reference/parserRealSource6.js index 50b643a55f9a0..8e110eaca137b 100644 --- a/tests/baselines/reference/parserRealSource6.js +++ b/tests/baselines/reference/parserRealSource6.js @@ -225,7 +225,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var TypeCollectionContext = /** @class */ (function () { function TypeCollectionContext(scopeChain, checker) { @@ -420,4 +420,4 @@ var TypeScript; return context; } TypeScript.findEnclosingScopeAt = findEnclosingScopeAt; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource7.js b/tests/baselines/reference/parserRealSource7.js index f2681caaa822d..0a466a0cf5c45 100644 --- a/tests/baselines/reference/parserRealSource7.js +++ b/tests/baselines/reference/parserRealSource7.js @@ -837,7 +837,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var Continuation = /** @class */ (function () { function Continuation(normalBlock) { @@ -1516,4 +1516,4 @@ var TypeScript; return ast; } TypeScript.postCollectTypes = postCollectTypes; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js index 95e8a421fc83c..df636004683d8 100644 --- a/tests/baselines/reference/parserRealSource8.js +++ b/tests/baselines/reference/parserRealSource8.js @@ -470,7 +470,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var AssignScopeContext = /** @class */ (function () { function AssignScopeContext(scopeChain, typeFlow, modDeclChain) { @@ -872,4 +872,4 @@ var TypeScript; return ast; } TypeScript.postAssignScopes = postAssignScopes; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserRealSource9.js b/tests/baselines/reference/parserRealSource9.js index 0a64f8153b928..ad2016299d08c 100644 --- a/tests/baselines/reference/parserRealSource9.js +++ b/tests/baselines/reference/parserRealSource9.js @@ -213,7 +213,7 @@ module TypeScript { // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. // See LICENSE.txt in the project root for complete license information. /// -var TypeScript; +var TypeScript = TypeScript || (TypeScript = {}); (function (TypeScript) { var Binder = /** @class */ (function () { function Binder(checker) { @@ -398,4 +398,4 @@ var TypeScript; return Binder; }()); TypeScript.Binder = Binder; -})(TypeScript || (TypeScript = {})); +})(TypeScript); diff --git a/tests/baselines/reference/parserSkippedTokens16.js b/tests/baselines/reference/parserSkippedTokens16.js index 2c3a9be876df5..ad1d518bb31fa 100644 --- a/tests/baselines/reference/parserSkippedTokens16.js +++ b/tests/baselines/reference/parserSkippedTokens16.js @@ -16,8 +16,8 @@ function Foo() { } { } 4 + ; 5; -var M; +var M = M || (M = {}); (function (M) { function a(T) { } -})(M || (M = {})); +})(M); var x = ; diff --git a/tests/baselines/reference/parserSuperExpression1.js b/tests/baselines/reference/parserSuperExpression1.js index e955125969907..7aa7b17c1261e 100644 --- a/tests/baselines/reference/parserSuperExpression1.js +++ b/tests/baselines/reference/parserSuperExpression1.js @@ -22,9 +22,9 @@ var C = /** @class */ (function () { }; return C; }()); -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { - var M2; + var M2 = M1.M2 || (M1.M2 = {}); (function (M2) { var C = /** @class */ (function () { function C() { @@ -34,5 +34,5 @@ var M1; }; return C; }()); - })(M2 = M1.M2 || (M1.M2 = {})); -})(M1 || (M1 = {})); + })(M2); +})(M1); diff --git a/tests/baselines/reference/parserSuperExpression4.js b/tests/baselines/reference/parserSuperExpression4.js index 71837fc935e12..41c0c02b6e41e 100644 --- a/tests/baselines/reference/parserSuperExpression4.js +++ b/tests/baselines/reference/parserSuperExpression4.js @@ -22,9 +22,9 @@ var C = /** @class */ (function () { }; return C; }()); -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { - var M2; + var M2 = M1.M2 || (M1.M2 = {}); (function (M2) { var C = /** @class */ (function () { function C() { @@ -34,5 +34,5 @@ var M1; }; return C; }()); - })(M2 = M1.M2 || (M1.M2 = {})); -})(M1 || (M1 = {})); + })(M2); +})(M1); diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js index 769f184ef2c95..21c339b3c988a 100644 --- a/tests/baselines/reference/parserharness.js +++ b/tests/baselines/reference/parserharness.js @@ -2134,14 +2134,14 @@ else if (typeof require === "function") { else { throw new Error('Unknown context'); } -var Harness; +var Harness = Harness || (Harness = {}); (function (Harness) { // Settings Harness.userSpecifiedroot = ""; var global = Function("return this").call(null); Harness.usePull = false; // Assert functions - var Assert; + var Assert = Harness.Assert || (Harness.Assert = {}); (function (Assert) { Assert.bugIds = []; Assert.throwAssertError = function (error) { @@ -2250,7 +2250,7 @@ var Harness; } } Assert.arrayContainsOnce = arrayContainsOnce; - })(Assert = Harness.Assert || (Harness.Assert = {})); + })(Assert); /** Splits the given string on \r\n or on only \n if that fails */ function splitContentByNewlines(content) { // Split up the input file by line @@ -2508,9 +2508,9 @@ var Harness; }(Runnable)); Harness.Run = Run; // Performance test - var Perf; + var Perf = Harness.Perf || (Harness.Perf = {}); (function (Perf) { - var Clock; + var Clock = Perf.Clock || (Perf.Clock = {}); (function (Clock) { if (typeof WScript !== "undefined" && typeof global['WScript'].InitializeProjection !== "undefined") { // Running in JSHost. @@ -2526,7 +2526,7 @@ var Harness; }; Clock.resolution = 1000; } - })(Clock = Perf.Clock || (Perf.Clock = {})); + })(Clock); var Timer = /** @class */ (function () { function Timer() { this.time = 0; @@ -2653,9 +2653,9 @@ var Harness; Perf.benchmarks.push(BenchmarkClass); } Perf.addBenchmark = addBenchmark; - })(Perf = Harness.Perf || (Harness.Perf = {})); + })(Perf); /** Functionality for compiling TypeScript code */ - var Compiler; + var Compiler = Harness.Compiler || (Harness.Compiler = {}); (function (Compiler) { /** Aggregate various writes into a single array of lines. Useful for passing to the * TypeScript compiler to fill with source code or errors. @@ -3303,11 +3303,11 @@ var Harness; } } Compiler.defineCompilationContextForTest = defineCompilationContextForTest; - })(Compiler = Harness.Compiler || (Harness.Compiler = {})); + })(Compiler); /** Parses the test cases files * extracts options and individual files in a multifile test */ - var TestCaseParser; + var TestCaseParser = Harness.TestCaseParser || (Harness.TestCaseParser = {}); (function (TestCaseParser) { optionRegex = /^[\/]{2}\s*@(\w+):\s*(\S*)/gm; // multiple matches on multiple lines // List of allowed metadata names @@ -3412,7 +3412,7 @@ var Harness; return { settings: settings, testUnitData: files }; } TestCaseParser.makeUnitsFromTest = makeUnitsFromTest; - })(TestCaseParser = Harness.TestCaseParser || (Harness.TestCaseParser = {})); + })(TestCaseParser); var ScriptInfo = /** @class */ (function () { function ScriptInfo(name, content, isResident, maxScriptVersions) { this.name = name; @@ -3689,7 +3689,7 @@ var Harness; } Harness.run = run; /** Runs TypeScript or Javascript code. */ - var Runner; + var Runner = Harness.Runner || (Harness.Runner = {}); (function (Runner) { function runCollateral(path, callback) { path = switchToForwardSlashes(path); @@ -3725,9 +3725,9 @@ var Harness; }); } Runner.runString = runString; - })(Runner = Harness.Runner || (Harness.Runner = {})); + })(Runner); /** Support class for baseline files */ - var Baseline; + var Baseline = Harness.Baseline || (Harness.Baseline = {}); (function (Baseline) { var reportFilename = 'baseline-report.html'; var firstRun = true; @@ -3858,10 +3858,10 @@ var Harness; } } Baseline.runBaseline = runBaseline; - })(Baseline = Harness.Baseline || (Harness.Baseline = {})); + })(Baseline); var currentRun = new Run(); global.describe = describe; global.run = run; global.it = it; global.assert = Harness.Assert; -})(Harness || (Harness = {})); +})(Harness); diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js index da91d0cc92e61..690bd9b64c197 100644 --- a/tests/baselines/reference/parserindenter.js +++ b/tests/baselines/reference/parserindenter.js @@ -757,7 +757,7 @@ module Formatting { // limitations under the License. // /// -var Formatting; +var Formatting = Formatting || (Formatting = {}); (function (Formatting) { var Indenter = /** @class */ (function () { function Indenter(logger, tree, snapshot, languageHostIndentation, editorOptions, firstToken, smartIndent) { @@ -1342,4 +1342,4 @@ var Formatting; return Indenter; }()); Formatting.Indenter = Indenter; -})(Formatting || (Formatting = {})); +})(Formatting); diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js index e7780740645a6..ef0aa2f8d44f1 100644 --- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js @@ -76,9 +76,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any other type var var ResultIsNumber1 = +ANY1; diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js index f0c6540db0ba8..e6b93a2789d07 100644 --- a/tests/baselines/reference/plusOperatorWithBooleanType.js +++ b/tests/baselines/reference/plusOperatorWithBooleanType.js @@ -45,9 +45,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsNumber1 = +BOOLEAN; diff --git a/tests/baselines/reference/plusOperatorWithEnumType.js b/tests/baselines/reference/plusOperatorWithEnumType.js index 39bd1777f6f0d..a6bcf27e10976 100644 --- a/tests/baselines/reference/plusOperatorWithEnumType.js +++ b/tests/baselines/reference/plusOperatorWithEnumType.js @@ -20,16 +20,16 @@ var ResultIsNumber4 = +(ENUM[0] + ENUM1["B"]); //// [plusOperatorWithEnumType.js] // + operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsNumber1 = +ENUM; diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js index aba1ad745285b..205a3a5406d3f 100644 --- a/tests/baselines/reference/plusOperatorWithNumberType.js +++ b/tests/baselines/reference/plusOperatorWithNumberType.js @@ -52,9 +52,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsNumber1 = +NUMBER; diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js index 3893bc1cb8c13..b6de05df16937 100644 --- a/tests/baselines/reference/plusOperatorWithStringType.js +++ b/tests/baselines/reference/plusOperatorWithStringType.js @@ -51,9 +51,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsNumber1 = +STRING; diff --git a/tests/baselines/reference/preserveConstEnums.js b/tests/baselines/reference/preserveConstEnums.js index 3f27825283fe0..227f95f18cdc8 100644 --- a/tests/baselines/reference/preserveConstEnums.js +++ b/tests/baselines/reference/preserveConstEnums.js @@ -4,8 +4,8 @@ const enum E { } //// [preserveConstEnums.js] -var E; +var E = E || (E = {}); (function (E) { E[E["Value"] = 1] = "Value"; E[E["Value2"] = 1] = "Value2"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/primaryExpressionMods.js b/tests/baselines/reference/primaryExpressionMods.js index ee96135d7eacd..2166ca99a22ff 100644 --- a/tests/baselines/reference/primaryExpressionMods.js +++ b/tests/baselines/reference/primaryExpressionMods.js @@ -13,10 +13,10 @@ var q: m.P; // Error //// [primaryExpressionMods.js] -var M; +var M = M || (M = {}); (function (M) { M.a = 1; -})(M || (M = {})); +})(M); var p; // Used as ModuleName var m = M; // Used as TypeName and PrimaryExpression (error on TypeName) var m2 = M; // Used as PrimaryExpression in TypeQuery diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.js b/tests/baselines/reference/primtiveTypesAreIdentical.js index 19bdadb4ceeb1..1848f3e655bc2 100644 --- a/tests/baselines/reference/primtiveTypesAreIdentical.js +++ b/tests/baselines/reference/primtiveTypesAreIdentical.js @@ -38,9 +38,9 @@ function foo2(x) { } function foo3(x) { } function foo4(x) { } function foo5(x) { } -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function foo6(x) { } function foo7(x) { } diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index 0edef02a54dfd..03280fa98eb91 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -1538,7 +1538,7 @@ var privateClassWithPrivateModuleSetAccessorTypes = /** @class */ (function () { }); return privateClassWithPrivateModuleSetAccessorTypes; }()); -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -2017,8 +2017,8 @@ var publicModule; }); return privateClassWithPrivateModuleSetAccessorTypes; }()); -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -2497,7 +2497,7 @@ var privateModule; }); return privateClassWithPrivateModuleSetAccessorTypes; }()); -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyAccessorDeclFile_GlobalFile.js] var publicClassInGlobal = /** @class */ (function () { function publicClassInGlobal() { @@ -2594,7 +2594,7 @@ var publicClassInGlobalWithWithPublicSetAccessorTypes = /** @class */ (function }); return publicClassInGlobalWithWithPublicSetAccessorTypes; }()); -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var privateClass = /** @class */ (function () { function privateClass() { @@ -2607,7 +2607,7 @@ var publicModuleInGlobal; return publicClass; }()); publicModuleInGlobal.publicClass = publicClass; - var privateModule; + var privateModule = privateModule || (privateModule = {}); (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -3086,7 +3086,7 @@ var publicModuleInGlobal; }); return privateClassWithPrivateModuleSetAccessorTypes; }()); - })(privateModule || (privateModule = {})); + })(privateModule); var publicClassWithWithPrivateGetAccessorTypes = /** @class */ (function () { function publicClassWithWithPrivateGetAccessorTypes() { } @@ -3553,7 +3553,7 @@ var publicModuleInGlobal; }); return privateClassWithPrivateModuleSetAccessorTypes; }()); -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); //// [privacyAccessorDeclFile_externalModule.d.ts] diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index 42f7639986913..8cd40b4372e93 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -150,7 +150,7 @@ function createWidget1() { return new Widget1(); } exports.createWidget1 = createWidget1; -var SpecializedWidget; +var SpecializedWidget = {}; (function (SpecializedWidget) { var Widget2 = /** @class */ (function () { function Widget2() { @@ -163,7 +163,7 @@ var SpecializedWidget; return new Widget2(); } SpecializedWidget.createWidget2 = createWidget2; -})(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +})(SpecializedWidget); //// [privacyCannotNameAccessorDeclFile_exporter.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index 80c9e0157ee49..158497809866b 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -113,7 +113,7 @@ function createWidget1() { return new Widget1(); } exports.createWidget1 = createWidget1; -var SpecializedWidget; +var SpecializedWidget = {}; (function (SpecializedWidget) { var Widget2 = /** @class */ (function () { function Widget2() { @@ -126,7 +126,7 @@ var SpecializedWidget; return new Widget2(); } SpecializedWidget.createWidget2 = createWidget2; -})(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +})(SpecializedWidget); //// [privacyCannotNameVarTypeDeclFile_exporter.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index 8ddcc60a8ff19..ff62695da8db7 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -20,7 +20,7 @@ module Query { "use strict"; exports.__esModule = true; exports.x = 1; // Makes this an external module -var Query; +var Query = {}; (function (Query) { function fromDoWhile(doWhile) { return null; @@ -31,7 +31,7 @@ var Query; return true; }); } -})(Query || (Query = {})); +})(Query); //// [privacyCheckAnonymousFunctionParameter.d.ts] diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index f18f47c20c312..4106f246e7fe0 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -19,18 +19,18 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; exports.x = 1; // Makes this an external module - var Q; + var Q = {}; (function (Q) { function foo(x) { return x; } Q.foo = foo; - })(Q || (Q = {})); + })(Q); (function (Q) { function bar() { Q.foo(null); } - })(Q || (Q = {})); + })(Q); }); diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js index c2f88dc08f574..697bfc6696ed6 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js @@ -21,7 +21,7 @@ define(["require", "exports"], function (require, exports) { } (function (Foo) { Foo.x = "hello"; - })(Foo || (Foo = {})); + })(Foo); return Foo; }); diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js index ae3e7f350b0c6..18b5225b3553c 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js @@ -9,12 +9,12 @@ module Outer { //// [privacyCheckTypeOfInvisibleModuleError.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { - var Inner; + var Inner = Inner || (Inner = {}); (function (Inner) { - })(Inner || (Inner = {})); -})(Outer || (Outer = {})); + })(Inner); +})(Outer); //// [privacyCheckTypeOfInvisibleModuleError.d.ts] diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js index 4a3a1bb08bc83..bac4cc4e5ea24 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js @@ -9,12 +9,12 @@ module Outer { //// [privacyCheckTypeOfInvisibleModuleNoError.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { - var Inner; + var Inner = Inner || (Inner = {}); (function (Inner) { - })(Inner || (Inner = {})); -})(Outer || (Outer = {})); + })(Inner); +})(Outer); //// [privacyCheckTypeOfInvisibleModuleNoError.d.ts] diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js index a25de1228bd64..00090e8993c53 100644 --- a/tests/baselines/reference/privacyClass.js +++ b/tests/baselines/reference/privacyClass.js @@ -143,7 +143,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); exports.__esModule = true; -var m1; +var m1 = {}; (function (m1) { var m1_c_public = /** @class */ (function () { function m1_c_public() { @@ -240,8 +240,8 @@ var m1; return m1_C12_public; }(m1_c_private)); m1.m1_C12_public = m1_C12_public; -})(m1 = exports.m1 || (exports.m1 = {})); -var m2; +})(m1); +var m2 = {}; (function (m2) { var m2_c_public = /** @class */ (function () { function m2_c_public() { @@ -338,7 +338,7 @@ var m2; return m2_C12_public; }(m2_c_private)); m2.m2_C12_public = m2_C12_public; -})(m2 || (m2 = {})); +})(m2); var glo_c_public = /** @class */ (function () { function glo_c_public() { } diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index d3ad3eedb9965..b1d80bdc26c3e 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -112,7 +112,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); exports.__esModule = true; -var publicModule; +var publicModule = {}; (function (publicModule) { var publicClassInPublicModule = /** @class */ (function () { function publicClassInPublicModule() { @@ -172,8 +172,8 @@ var publicModule; return publicClassExtendingFromPrivateModuleClass; }(privateModule.publicClassInPrivateModule)); publicModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var publicClassInPrivateModule = /** @class */ (function () { function publicClassInPrivateModule() { @@ -233,7 +233,7 @@ var privateModule; return publicClassExtendingFromPrivateModuleClass; }(privateModule.publicClassInPrivateModule)); privateModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass; -})(privateModule || (privateModule = {})); +})(privateModule); var publicClass = /** @class */ (function () { function publicClass() { } @@ -306,7 +306,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var publicClassInPublicModule = /** @class */ (function () { function publicClassInPublicModule() { @@ -351,7 +351,7 @@ var publicModuleInGlobal; return publicClassExtendingPrivateClassInModule; }(privateClassInPublicModule)); publicModuleInGlobal.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule; -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); var publicClassInGlobal = /** @class */ (function () { function publicClassInGlobal() { } diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 615a03fe07d4b..72620f28cf41e 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -96,7 +96,7 @@ class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceI //// [privacyClassImplementsClauseDeclFile_externalModule.js] "use strict"; exports.__esModule = true; -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClassImplementingPublicInterfaceInModule = /** @class */ (function () { function privateClassImplementingPublicInterfaceInModule() { @@ -137,8 +137,8 @@ var publicModule; return publicClassImplementingPrivateAndPublicInterface; }()); publicModule.publicClassImplementingPrivateAndPublicInterface = publicClassImplementingPrivateAndPublicInterface; -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClassImplementingPublicInterfaceInModule = /** @class */ (function () { function privateClassImplementingPublicInterfaceInModule() { @@ -173,7 +173,7 @@ var privateModule; return publicClassImplementingFromPrivateModuleInterface; }()); privateModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; -})(privateModule || (privateModule = {})); +})(privateModule); var privateClassImplementingPublicInterface = /** @class */ (function () { function privateClassImplementingPublicInterface() { } @@ -208,7 +208,7 @@ var publicClassImplementingFromPrivateModuleInterface = /** @class */ (function }()); exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface; //// [privacyClassImplementsClauseDeclFile_GlobalFile.js] -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var privateClassImplementingPublicInterfaceInModule = /** @class */ (function () { function privateClassImplementingPublicInterfaceInModule() { @@ -232,7 +232,7 @@ var publicModuleInGlobal; return publicClassImplementingPrivateInterfaceInModule; }()); publicModuleInGlobal.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule; -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); var publicClassImplementingPublicInterfaceInGlobal = /** @class */ (function () { function publicClassImplementingPublicInterfaceInGlobal() { } diff --git a/tests/baselines/reference/privacyFunc.js b/tests/baselines/reference/privacyFunc.js index cc1173731259a..36f6500ba0f08 100644 --- a/tests/baselines/reference/privacyFunc.js +++ b/tests/baselines/reference/privacyFunc.js @@ -229,7 +229,7 @@ function f10_public(): C6_public { //// [privacyFunc.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -379,7 +379,7 @@ var m1; return new C2_private(); //error } m1.f12_public = f12_public; -})(m1 || (m1 = {})); +})(m1); var C6_public = /** @class */ (function () { function C6_public() { } diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index c0cc5b584c97a..944d4be5ed078 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -169,7 +169,7 @@ function createWidget1() { return new Widget1(); } exports.createWidget1 = createWidget1; -var SpecializedWidget; +var SpecializedWidget = {}; (function (SpecializedWidget) { var Widget2 = /** @class */ (function () { function Widget2() { @@ -182,7 +182,7 @@ var SpecializedWidget; return new Widget2(); } SpecializedWidget.createWidget2 = createWidget2; -})(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +})(SpecializedWidget); //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index bde8a71b7c8b6..ad2c599153210 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -176,7 +176,7 @@ function createWidget1() { return new Widget1(); } exports.createWidget1 = createWidget1; -var SpecializedWidget; +var SpecializedWidget = {}; (function (SpecializedWidget) { var Widget2 = /** @class */ (function () { function Widget2() { @@ -189,7 +189,7 @@ var SpecializedWidget; return new Widget2(); } SpecializedWidget.createWidget2 = createWidget2; -})(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {})); +})(SpecializedWidget); //// [privacyFunctionReturnTypeDeclFile_exporter.js] "use strict"; exports.__esModule = true; diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index b6827934bf2ab..0a7242f4f4e19 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -799,7 +799,7 @@ var privateClassWithPrivateModuleParameterTypes = /** @class */ (function () { }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -912,8 +912,8 @@ var publicModule; }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1026,7 +1026,7 @@ var privateModule; }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyFunctionParameterDeclFile_GlobalFile.js] var publicClassInGlobal = /** @class */ (function () { function publicClassInGlobal() { @@ -1050,7 +1050,7 @@ var publicClassWithWithPublicParmeterTypesInGlobal = /** @class */ (function () }()); function publicFunctionWithPublicParmeterTypesInGlobal(param) { } -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1063,7 +1063,7 @@ var publicModuleInGlobal; return publicClass; }()); publicModuleInGlobal.publicClass = publicClass; - var privateModule; + var privateModule = privateModule || (privateModule = {}); (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1176,7 +1176,7 @@ var publicModuleInGlobal; }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } - })(privateModule || (privateModule = {})); + })(privateModule); var publicClassWithWithPrivateParmeterTypes = /** @class */ (function () { function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { this.param1 = param1; @@ -1277,7 +1277,7 @@ var publicModuleInGlobal; }()); function privateFunctionWithPrivateModuleParameterTypes(param) { } -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); //// [privacyFunctionParameterDeclFile_externalModule.d.ts] diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 1d10cb2083a88..17028288568ba 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -1401,7 +1401,7 @@ function privateFunctionWithPrivateModuleParameterTypes() { function privateFunctionWithPrivateModuleParameterTypes1() { return new privateModule.publicClass(); } -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1609,8 +1609,8 @@ var publicModule; function privateFunctionWithPrivateModuleParameterTypes1() { return new privateModule.publicClass(); } -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1818,7 +1818,7 @@ var privateModule; function privateFunctionWithPrivateModuleParameterTypes1() { return new privateModule.publicClass(); } -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyFunctionReturnTypeDeclFile_GlobalFile.js] var publicClassInGlobal = /** @class */ (function () { function publicClassInGlobal() { @@ -1860,7 +1860,7 @@ function publicFunctionWithPublicParmeterTypesInGlobal() { function publicFunctionWithPublicParmeterTypesInGlobal1() { return new publicClassInGlobal(); } -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var privateClass = /** @class */ (function () { function privateClass() { @@ -1873,7 +1873,7 @@ var publicModuleInGlobal; return publicClass; }()); publicModuleInGlobal.publicClass = publicClass; - var privateModule; + var privateModule = privateModule || (privateModule = {}); (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -2081,7 +2081,7 @@ var publicModuleInGlobal; function privateFunctionWithPrivateModuleParameterTypes1() { return new privateModule.publicClass(); } - })(privateModule || (privateModule = {})); + })(privateModule); var publicClassWithWithPrivateParmeterTypes = /** @class */ (function () { function publicClassWithWithPrivateParmeterTypes() { } @@ -2277,7 +2277,7 @@ var publicModuleInGlobal; function privateFunctionWithPrivateModuleParameterTypes1() { return new privateModule.publicClass(); } -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); //// [privacyFunctionReturnTypeDeclFile_externalModule.d.ts] diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js index 92fd5e82bec8c..391f2fb157e40 100644 --- a/tests/baselines/reference/privacyGetter.js +++ b/tests/baselines/reference/privacyGetter.js @@ -211,7 +211,7 @@ class C8_private { define(["require", "exports"], function (require, exports) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); - var m1; + var m1 = {}; (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -309,8 +309,8 @@ define(["require", "exports"], function (require, exports) { }); return C4_private; }()); - })(m1 = exports.m1 || (exports.m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { var m2_C1_public = /** @class */ (function () { function m2_C1_public() { @@ -408,7 +408,7 @@ define(["require", "exports"], function (require, exports) { }); return m2_C4_private; }()); - })(m2 || (m2 = {})); + })(m2); var C5_private = /** @class */ (function () { function C5_private() { } diff --git a/tests/baselines/reference/privacyGloClass.js b/tests/baselines/reference/privacyGloClass.js index 3836dc446d671..f6f65cafc1b9e 100644 --- a/tests/baselines/reference/privacyGloClass.js +++ b/tests/baselines/reference/privacyGloClass.js @@ -74,7 +74,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var m1_c_public = /** @class */ (function () { function m1_c_public() { @@ -171,7 +171,7 @@ var m1; return m1_C12_public; }(m1_c_private)); m1.m1_C12_public = m1_C12_public; -})(m1 || (m1 = {})); +})(m1); var glo_c_public = /** @class */ (function () { function glo_c_public() { } diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js index 7e08522bfe1fe..522b7f47ad19d 100644 --- a/tests/baselines/reference/privacyGloFunc.js +++ b/tests/baselines/reference/privacyGloFunc.js @@ -534,7 +534,7 @@ export function f12_public(): C5_private { //error define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var m1; + var m1 = {}; (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -684,8 +684,8 @@ define(["require", "exports"], function (require, exports) { return new C2_private(); //error } m1.f12_public = f12_public; - })(m1 = exports.m1 || (exports.m1 = {})); - var m2; + })(m1); + var m2 = {}; (function (m2) { var m2_C1_public = /** @class */ (function () { function m2_C1_public() { @@ -835,7 +835,7 @@ define(["require", "exports"], function (require, exports) { return new m2_C2_private(); } m2.f12_public = f12_public; - })(m2 || (m2 = {})); + })(m2); var C5_private = /** @class */ (function () { function C5_private() { } diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js index 392272b4d0248..14ae6bcb61851 100644 --- a/tests/baselines/reference/privacyGloGetter.js +++ b/tests/baselines/reference/privacyGloGetter.js @@ -89,7 +89,7 @@ class C7_public { } //// [privacyGloGetter.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -187,7 +187,7 @@ var m1; }); return C4_private; }()); -})(m1 || (m1 = {})); +})(m1); var C6_public = /** @class */ (function () { function C6_public() { } diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js index 3ca1bf812d3bf..8a73fb98e5ed5 100644 --- a/tests/baselines/reference/privacyGloImport.js +++ b/tests/baselines/reference/privacyGloImport.js @@ -153,9 +153,9 @@ module m2 { } //// [privacyGloImport.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { - var m1_M1_public; + var m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {}); (function (m1_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -168,8 +168,8 @@ var m1; } m1_M1_public.f1 = f1; m1_M1_public.v1 = c1; - })(m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {})); - var m1_M2_private; + })(m1_M1_public); + var m1_M2_private = m1_M2_private || (m1_M2_private = {}); (function (m1_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -182,7 +182,7 @@ var m1; } m1_M2_private.f1 = f1; m1_M2_private.v1 = c1; - })(m1_M2_private || (m1_M2_private = {})); + })(m1_M2_private); //export declare module "m1_M3_public" { // export function f1(); // export class c1 { @@ -237,8 +237,8 @@ var m1; m1.m1_im2_public = m1_M2_private; //export import m1_im3_public = require("m1_M3_public"); //export import m1_im4_public = require("m1_M4_private"); -})(m1 || (m1 = {})); -var glo_M1_public; +})(m1); +var glo_M1_public = glo_M1_public || (glo_M1_public = {}); (function (glo_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -251,16 +251,16 @@ var glo_M1_public; } glo_M1_public.f1 = f1; glo_M1_public.v1 = c1; -})(glo_M1_public || (glo_M1_public = {})); -var m2; +})(glo_M1_public); +var m2 = m2 || (m2 = {}); (function (m2) { //import m3 = require("use_glo_M1_public"); - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; //import m2 = require("use_glo_M1_public"); - })(m4 || (m4 = {})); -})(m2 || (m2 = {})); + })(m4); +})(m2); //// [privacyGloImport.d.ts] diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js index bdf8025a5edac..0f5707ceba96e 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.js +++ b/tests/baselines/reference/privacyGloImportParseErrors.js @@ -153,9 +153,9 @@ module m2 { } //// [privacyGloImportParseErrors.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { - var m1_M1_public; + var m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {}); (function (m1_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -168,8 +168,8 @@ var m1; } m1_M1_public.f1 = f1; m1_M1_public.v1 = c1; - })(m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {})); - var m1_M2_private; + })(m1_M1_public); + var m1_M2_private = m1_M2_private || (m1_M2_private = {}); (function (m1_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -182,7 +182,7 @@ var m1; } m1_M2_private.f1 = f1; m1_M2_private.v1 = c1; - })(m1_M2_private || (m1_M2_private = {})); + })(m1_M2_private); var m1_im1_private = m1_M1_public; m1.m1_im1_private_v1_public = m1_im1_private.c1; m1.m1_im1_private_v2_public = new m1_im1_private.c1(); @@ -219,8 +219,8 @@ var m1; var m1_im4_private_v4_private = m1_im4_private.f1(); m1.m1_im1_public = m1_M1_public; m1.m1_im2_public = m1_M2_private; -})(m1 || (m1 = {})); -var glo_M1_public; +})(m1); +var glo_M1_public = glo_M1_public || (glo_M1_public = {}); (function (glo_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -233,14 +233,14 @@ var glo_M1_public; } glo_M1_public.f1 = f1; glo_M1_public.v1 = c1; -})(glo_M1_public || (glo_M1_public = {})); -var m2; +})(glo_M1_public); +var m2 = m2 || (m2 = {}); (function (m2_1) { - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; - })(m4 || (m4 = {})); -})(m2 || (m2 = {})); + })(m4); +})(m2); //// [privacyGloImportParseErrors.d.ts] diff --git a/tests/baselines/reference/privacyGloInterface.js b/tests/baselines/reference/privacyGloInterface.js index a75ad86aa934e..f09276ce0edf4 100644 --- a/tests/baselines/reference/privacyGloInterface.js +++ b/tests/baselines/reference/privacyGloInterface.js @@ -120,7 +120,7 @@ interface glo_C3_public extends glo_i_public { //// [privacyGloInterface.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -135,7 +135,7 @@ var m1; } return C2_private; }()); -})(m1 || (m1 = {})); +})(m1); var C5_public = /** @class */ (function () { function C5_public() { } diff --git a/tests/baselines/reference/privacyGloVar.js b/tests/baselines/reference/privacyGloVar.js index 0102efd3e568e..f38b926efa7ac 100644 --- a/tests/baselines/reference/privacyGloVar.js +++ b/tests/baselines/reference/privacyGloVar.js @@ -81,7 +81,7 @@ var glo_v22_public: glo_C1_public = new glo_C1_public(); //// [privacyGloVar.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -133,7 +133,7 @@ var m1; m1.m1_v22_public = new C1_public(); var m1_v23_private = new C2_private(); m1.m1_v24_public = new C2_private(); // error -})(m1 || (m1 = {})); +})(m1); var glo_C1_public = /** @class */ (function () { function glo_C1_public() { } diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 0915fc9983b3c..1c847b54fde21 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -359,9 +359,9 @@ export module m3 { //// [privacyImport.js] "use strict"; exports.__esModule = true; -var m1; +var m1 = {}; (function (m1) { - var m1_M1_public; + var m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {}); (function (m1_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -374,8 +374,8 @@ var m1; } m1_M1_public.f1 = f1; m1_M1_public.v1 = c1; - })(m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {})); - var m1_M2_private; + })(m1_M1_public); + var m1_M2_private = m1_M2_private || (m1_M2_private = {}); (function (m1_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -388,7 +388,7 @@ var m1; } m1_M2_private.f1 = f1; m1_M2_private.v1 = c1; - })(m1_M2_private || (m1_M2_private = {})); + })(m1_M2_private); //export declare module "m1_M3_public" { // export function f1(); // export class c1 { @@ -443,10 +443,10 @@ var m1; m1.m1_im2_public = m1_M2_private; //export import m1_im3_public = require("m1_M3_public"); //export import m1_im4_public = require("m1_M4_private"); -})(m1 = exports.m1 || (exports.m1 = {})); -var m2; +})(m1); +var m2 = {}; (function (m2) { - var m2_M1_public; + var m2_M1_public = m2.m2_M1_public || (m2.m2_M1_public = {}); (function (m2_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -459,8 +459,8 @@ var m2; } m2_M1_public.f1 = f1; m2_M1_public.v1 = c1; - })(m2_M1_public = m2.m2_M1_public || (m2.m2_M1_public = {})); - var m2_M2_private; + })(m2_M1_public); + var m2_M2_private = m2_M2_private || (m2_M2_private = {}); (function (m2_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -473,7 +473,7 @@ var m2; } m2_M2_private.f1 = f1; m2_M2_private.v1 = c1; - })(m2_M2_private || (m2_M2_private = {})); + })(m2_M2_private); //export declare module "m2_M3_public" { // export function f1(); // export class c1 { @@ -529,8 +529,8 @@ var m2; m2.m1_im2_public = m2_M2_private; //export import m1_im3_public = require("m2_M3_public"); //export import m1_im4_public = require("m2_M4_private"); -})(m2 || (m2 = {})); -var glo_M1_public; +})(m2); +var glo_M1_public = {}; (function (glo_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -543,7 +543,7 @@ var glo_M1_public; } glo_M1_public.f1 = f1; glo_M1_public.v1 = c1; -})(glo_M1_public = exports.glo_M1_public || (exports.glo_M1_public = {})); +})(glo_M1_public); //export declare module "glo_M2_public" { // export function f1(); // export class c1 { @@ -551,7 +551,7 @@ var glo_M1_public; // export var v1: { new (): c1; }; // export var v2: c1; //} -var glo_M3_private; +var glo_M3_private = {}; (function (glo_M3_private) { var c1 = /** @class */ (function () { function c1() { @@ -564,7 +564,7 @@ var glo_M3_private; } glo_M3_private.f1 = f1; glo_M3_private.v1 = c1; -})(glo_M3_private = exports.glo_M3_private || (exports.glo_M3_private = {})); +})(glo_M3_private); //export declare module "glo_M4_private" { // export function f1(); // export class c1 { @@ -687,21 +687,21 @@ exports.glo_im2_public = glo_M3_private; //} (function (m2) { //import m3 = require("use_glo_M1_public"); - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; //import m2 = require("use_glo_M1_public"); - })(m4 || (m4 = {})); -})(m2 || (m2 = {})); -var m3; + })(m4); +})(m2); +var m3 = {}; (function (m3) { //import m3 = require("use_glo_M1_public"); - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; //import m2 = require("use_glo_M1_public"); - })(m4 || (m4 = {})); -})(m3 = exports.m3 || (exports.m3 = {})); + })(m4); +})(m3); //// [privacyImport.d.ts] diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js index da869a1122027..6fa3fcea9e39f 100644 --- a/tests/baselines/reference/privacyImportParseErrors.js +++ b/tests/baselines/reference/privacyImportParseErrors.js @@ -359,9 +359,9 @@ export module m3 { //// [privacyImportParseErrors.js] "use strict"; exports.__esModule = true; -var m1; +var m1 = {}; (function (m1) { - var m1_M1_public; + var m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {}); (function (m1_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -374,8 +374,8 @@ var m1; } m1_M1_public.f1 = f1; m1_M1_public.v1 = c1; - })(m1_M1_public = m1.m1_M1_public || (m1.m1_M1_public = {})); - var m1_M2_private; + })(m1_M1_public); + var m1_M2_private = m1_M2_private || (m1_M2_private = {}); (function (m1_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -388,7 +388,7 @@ var m1; } m1_M2_private.f1 = f1; m1_M2_private.v1 = c1; - })(m1_M2_private || (m1_M2_private = {})); + })(m1_M2_private); var m1_im1_private = m1_M1_public; m1.m1_im1_private_v1_public = m1_im1_private.c1; m1.m1_im1_private_v2_public = new m1_im1_private.c1(); @@ -425,10 +425,10 @@ var m1; var m1_im4_private_v4_private = m1_im4_private.f1(); m1.m1_im1_public = m1_M1_public; m1.m1_im2_public = m1_M2_private; -})(m1 = exports.m1 || (exports.m1 = {})); -var m2; +})(m1); +var m2 = {}; (function (m2) { - var m2_M1_public; + var m2_M1_public = m2.m2_M1_public || (m2.m2_M1_public = {}); (function (m2_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -441,8 +441,8 @@ var m2; } m2_M1_public.f1 = f1; m2_M1_public.v1 = c1; - })(m2_M1_public = m2.m2_M1_public || (m2.m2_M1_public = {})); - var m2_M2_private; + })(m2_M1_public); + var m2_M2_private = m2_M2_private || (m2_M2_private = {}); (function (m2_M2_private) { var c1 = /** @class */ (function () { function c1() { @@ -455,7 +455,7 @@ var m2; } m2_M2_private.f1 = f1; m2_M2_private.v1 = c1; - })(m2_M2_private || (m2_M2_private = {})); + })(m2_M2_private); var m1_im1_private = m2_M1_public; m2.m1_im1_private_v1_public = m1_im1_private.c1; m2.m1_im1_private_v2_public = new m1_im1_private.c1(); @@ -493,8 +493,8 @@ var m2; // Parse error to export module m2.m1_im1_public = m2_M1_public; m2.m1_im2_public = m2_M2_private; -})(m2 || (m2 = {})); -var glo_M1_public; +})(m2); +var glo_M1_public = {}; (function (glo_M1_public) { var c1 = /** @class */ (function () { function c1() { @@ -507,8 +507,8 @@ var glo_M1_public; } glo_M1_public.f1 = f1; glo_M1_public.v1 = c1; -})(glo_M1_public = exports.glo_M1_public || (exports.glo_M1_public = {})); -var glo_M3_private; +})(glo_M1_public); +var glo_M3_private = {}; (function (glo_M3_private) { var c1 = /** @class */ (function () { function c1() { @@ -521,7 +521,7 @@ var glo_M3_private; } glo_M3_private.f1 = f1; glo_M3_private.v1 = c1; -})(glo_M3_private = exports.glo_M3_private || (exports.glo_M3_private = {})); +})(glo_M3_private); var glo_im1_private = glo_M1_public; exports.glo_im1_private_v1_public = glo_im1_private.c1; exports.glo_im1_private_v2_public = new glo_im1_private.c1(); @@ -564,15 +564,15 @@ exports.glo_im2_public = glo_M3_private; exports.glo_im3_public = require("glo_M2_public"); exports.glo_im4_public = require("glo_M4_private"); (function (m2_1) { - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; - })(m4 || (m4 = {})); -})(m2 || (m2 = {})); -var m3; + })(m4); +})(m2); +var m3 = {}; (function (m3_1) { - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { var a = 10; - })(m4 || (m4 = {})); -})(m3 = exports.m3 || (exports.m3 = {})); + })(m4); +})(m3); diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js index 947750dfb2f7d..376b8d02c663e 100644 --- a/tests/baselines/reference/privacyInterface.js +++ b/tests/baselines/reference/privacyInterface.js @@ -267,7 +267,7 @@ export interface glo_C6_public extends glo_i_private, glo_i_public { //// [privacyInterface.js] "use strict"; exports.__esModule = true; -var m1; +var m1 = {}; (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -282,8 +282,8 @@ var m1; } return C2_private; }()); -})(m1 = exports.m1 || (exports.m1 = {})); -var m2; +})(m1); +var m2 = {}; (function (m2) { var C1_public = /** @class */ (function () { function C1_public() { @@ -298,7 +298,7 @@ var m2; } return C2_private; }()); -})(m2 || (m2 = {})); +})(m2); var C5_public = /** @class */ (function () { function C5_public() { } diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index 5edf0f819b1c2..0a98c80407486 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -156,7 +156,7 @@ module import_private { "use strict"; exports.__esModule = true; // private elements -var m_private; +var m_private = {}; (function (m_private) { var c_private = /** @class */ (function () { function c_private() { @@ -164,17 +164,17 @@ var m_private; return c_private; }()); m_private.c_private = c_private; - var e_private; + var e_private = m_private.e_private || (m_private.e_private = {}); (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; e_private[e_private["Grumpy"] = 1] = "Grumpy"; - })(e_private = m_private.e_private || (m_private.e_private = {})); + })(e_private); function f_private() { return new c_private(); } m_private.f_private = f_private; m_private.v_private = new c_private(); - var mi_private; + var mi_private = m_private.mi_private || (m_private.mi_private = {}); (function (mi_private) { var c = /** @class */ (function () { function c() { @@ -182,10 +182,10 @@ var m_private; return c; }()); mi_private.c = c; - })(mi_private = m_private.mi_private || (m_private.mi_private = {})); -})(m_private || (m_private = {})); + })(mi_private); +})(m_private); // Public elements -var m_public; +var m_public = {}; (function (m_public) { var c_public = /** @class */ (function () { function c_public() { @@ -193,17 +193,17 @@ var m_public; return c_public; }()); m_public.c_public = c_public; - var e_public; + var e_public = m_public.e_public || (m_public.e_public = {}); (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; e_public[e_public["Grumpy"] = 1] = "Grumpy"; - })(e_public = m_public.e_public || (m_public.e_public = {})); + })(e_public); function f_public() { return new c_public(); } m_public.f_public = f_public; m_public.v_public = 10; - var mi_public; + var mi_public = m_public.mi_public || (m_public.mi_public = {}); (function (mi_public) { var c = /** @class */ (function () { function c() { @@ -211,9 +211,9 @@ var m_public; return c; }()); mi_public.c = c; - })(mi_public = m_public.mi_public || (m_public.mi_public = {})); -})(m_public = exports.m_public || (exports.m_public = {})); -var import_public; + })(mi_public); +})(m_public); +var import_public = {}; (function (import_public) { // Privacy errors - importing private elements import_public.im_public_c_private = m_private.c_private; @@ -253,8 +253,8 @@ var import_public; var privateUse_im_public_mi_public = new import_public.im_public_mi_public.c(); import_public.publicUse_im_public_mi_public = new import_public.im_public_mi_public.c(); var privateUse_im_public_mu_public; -})(import_public = exports.import_public || (exports.import_public = {})); -var import_private; +})(import_public); +var import_private = {}; (function (import_private) { // No Privacy errors - importing private elements import_private.im_private_c_private = m_private.c_private; @@ -294,7 +294,7 @@ var import_private; var privateUse_im_private_mi_public = new import_private.im_private_mi_public.c(); import_private.publicUse_im_private_mi_public = new import_private.im_private_mi_public.c(); var privateUse_im_private_mu_public; -})(import_private || (import_private = {})); +})(import_private); //// [privacyLocalInternalReferenceImportWithExport.d.ts] diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 73266bc1d024c..7c6ac1e091ee3 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -157,7 +157,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; // private elements - var m_private; + var m_private = {}; (function (m_private) { var c_private = /** @class */ (function () { function c_private() { @@ -165,17 +165,17 @@ define(["require", "exports"], function (require, exports) { return c_private; }()); m_private.c_private = c_private; - var e_private; + var e_private = m_private.e_private || (m_private.e_private = {}); (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; e_private[e_private["Grumpy"] = 1] = "Grumpy"; - })(e_private = m_private.e_private || (m_private.e_private = {})); + })(e_private); function f_private() { return new c_private(); } m_private.f_private = f_private; m_private.v_private = new c_private(); - var mi_private; + var mi_private = m_private.mi_private || (m_private.mi_private = {}); (function (mi_private) { var c = /** @class */ (function () { function c() { @@ -183,10 +183,10 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_private.c = c; - })(mi_private = m_private.mi_private || (m_private.mi_private = {})); - })(m_private || (m_private = {})); + })(mi_private); + })(m_private); // Public elements - var m_public; + var m_public = {}; (function (m_public) { var c_public = /** @class */ (function () { function c_public() { @@ -194,17 +194,17 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); m_public.c_public = c_public; - var e_public; + var e_public = m_public.e_public || (m_public.e_public = {}); (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; e_public[e_public["Grumpy"] = 1] = "Grumpy"; - })(e_public = m_public.e_public || (m_public.e_public = {})); + })(e_public); function f_public() { return new c_public(); } m_public.f_public = f_public; m_public.v_public = 10; - var mi_public; + var mi_public = m_public.mi_public || (m_public.mi_public = {}); (function (mi_public) { var c = /** @class */ (function () { function c() { @@ -212,9 +212,9 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_public.c = c; - })(mi_public = m_public.mi_public || (m_public.mi_public = {})); - })(m_public = exports.m_public || (exports.m_public = {})); - var import_public; + })(mi_public); + })(m_public); + var import_public = {}; (function (import_public) { // No Privacy errors - importing private elements var im_private_c_private = m_private.c_private; @@ -254,8 +254,8 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_private_mi_public = new im_private_mi_public.c(); import_public.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; - })(import_public = exports.import_public || (exports.import_public = {})); - var import_private; + })(import_public); + var import_private = {}; (function (import_private) { // No Privacy errors - importing private elements var im_private_c_private = m_private.c_private; @@ -295,7 +295,7 @@ define(["require", "exports"], function (require, exports) { var privateUse_im_private_mi_public = new im_private_mi_public.c(); import_private.publicUse_im_private_mi_public = new im_private_mi_public.c(); var privateUse_im_private_mu_public; - })(import_private || (import_private = {})); + })(import_private); }); diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index b2da49d083ea7..e48dceef4f90e 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -104,7 +104,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; // private elements - var m_private; + var m_private = {}; (function (m_private) { var c_private = /** @class */ (function () { function c_private() { @@ -112,17 +112,17 @@ define(["require", "exports"], function (require, exports) { return c_private; }()); m_private.c_private = c_private; - var e_private; + var e_private = m_private.e_private || (m_private.e_private = {}); (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; e_private[e_private["Grumpy"] = 1] = "Grumpy"; - })(e_private = m_private.e_private || (m_private.e_private = {})); + })(e_private); function f_private() { return new c_private(); } m_private.f_private = f_private; m_private.v_private = new c_private(); - var mi_private; + var mi_private = m_private.mi_private || (m_private.mi_private = {}); (function (mi_private) { var c = /** @class */ (function () { function c() { @@ -130,10 +130,10 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_private.c = c; - })(mi_private = m_private.mi_private || (m_private.mi_private = {})); - })(m_private || (m_private = {})); + })(mi_private); + })(m_private); // Public elements - var m_public; + var m_public = {}; (function (m_public) { var c_public = /** @class */ (function () { function c_public() { @@ -141,17 +141,17 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); m_public.c_public = c_public; - var e_public; + var e_public = m_public.e_public || (m_public.e_public = {}); (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; e_public[e_public["Grumpy"] = 1] = "Grumpy"; - })(e_public = m_public.e_public || (m_public.e_public = {})); + })(e_public); function f_public() { return new c_public(); } m_public.f_public = f_public; m_public.v_public = 10; - var mi_public; + var mi_public = m_public.mi_public || (m_public.mi_public = {}); (function (mi_public) { var c = /** @class */ (function () { function c() { @@ -159,8 +159,8 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_public.c = c; - })(mi_public = m_public.mi_public || (m_public.mi_public = {})); - })(m_public = exports.m_public || (exports.m_public = {})); + })(mi_public); + })(m_public); // Privacy errors - importing private elements exports.im_public_c_private = m_private.c_private; exports.im_public_e_private = m_private.e_private; diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index eefb1a7627fc5..ef6a3297999a4 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -104,7 +104,7 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; // private elements - var m_private; + var m_private = {}; (function (m_private) { var c_private = /** @class */ (function () { function c_private() { @@ -112,17 +112,17 @@ define(["require", "exports"], function (require, exports) { return c_private; }()); m_private.c_private = c_private; - var e_private; + var e_private = m_private.e_private || (m_private.e_private = {}); (function (e_private) { e_private[e_private["Happy"] = 0] = "Happy"; e_private[e_private["Grumpy"] = 1] = "Grumpy"; - })(e_private = m_private.e_private || (m_private.e_private = {})); + })(e_private); function f_private() { return new c_private(); } m_private.f_private = f_private; m_private.v_private = new c_private(); - var mi_private; + var mi_private = m_private.mi_private || (m_private.mi_private = {}); (function (mi_private) { var c = /** @class */ (function () { function c() { @@ -130,10 +130,10 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_private.c = c; - })(mi_private = m_private.mi_private || (m_private.mi_private = {})); - })(m_private || (m_private = {})); + })(mi_private); + })(m_private); // Public elements - var m_public; + var m_public = {}; (function (m_public) { var c_public = /** @class */ (function () { function c_public() { @@ -141,17 +141,17 @@ define(["require", "exports"], function (require, exports) { return c_public; }()); m_public.c_public = c_public; - var e_public; + var e_public = m_public.e_public || (m_public.e_public = {}); (function (e_public) { e_public[e_public["Happy"] = 0] = "Happy"; e_public[e_public["Grumpy"] = 1] = "Grumpy"; - })(e_public = m_public.e_public || (m_public.e_public = {})); + })(e_public); function f_public() { return new c_public(); } m_public.f_public = f_public; m_public.v_public = 10; - var mi_public; + var mi_public = m_public.mi_public || (m_public.mi_public = {}); (function (mi_public) { var c = /** @class */ (function () { function c() { @@ -159,8 +159,8 @@ define(["require", "exports"], function (require, exports) { return c; }()); mi_public.c = c; - })(mi_public = m_public.mi_public || (m_public.mi_public = {})); - })(m_public = exports.m_public || (exports.m_public = {})); + })(mi_public); + })(m_public); // No Privacy errors - importing private elements var im_private_c_private = m_private.c_private; var im_private_e_private = m_private.e_private; diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 840255f7648c7..c439dcd4fd94a 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -572,7 +572,7 @@ var privateClassWithWithPrivateModuleTypeParameters = /** @class */ (function () }()); function privateFunctionWithPrivateMopduleTypeParameters() { } -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -705,8 +705,8 @@ var publicModule; }()); function privateFunctionWithPrivateMopduleTypeParameters() { } -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -815,7 +815,7 @@ var privateModule; privateModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends; function privateFunctionWithPublicTypeParametersWithoutExtends() { } -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyTypeParameterOfFunctionDeclFile.d.ts] diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index b0dfadfce12fc..cc4eb1678154e 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -236,7 +236,7 @@ var privateClassWithTypeParametersFromPrivateModule = /** @class */ (function () }; return privateClassWithTypeParametersFromPrivateModule; }()); -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClassInPublicModule = /** @class */ (function () { function privateClassInPublicModule() { @@ -317,8 +317,8 @@ var publicModule; }; return privateClassWithTypeParametersFromPrivateModule; }()); -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClassInPrivateModule = /** @class */ (function () { function privateClassInPrivateModule() { @@ -382,7 +382,7 @@ var privateModule; }; return privateClassWithPublicTypeParametersWithoutExtends; }()); -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyTypeParametersOfClassDeclFile.d.ts] diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index 25e327c42aa35..b6b4ce53186a6 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -215,7 +215,7 @@ var publicClassT = /** @class */ (function () { return publicClassT; }()); exports.publicClassT = publicClassT; -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClassInPublicModule = /** @class */ (function () { function privateClassInPublicModule() { @@ -239,8 +239,8 @@ var publicModule; return publicClassInPublicModuleT; }()); publicModule.publicClassInPublicModuleT = publicClassInPublicModuleT; -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClassInPrivateModule = /** @class */ (function () { function privateClassInPrivateModule() { @@ -264,7 +264,7 @@ var privateModule; return publicClassInPrivateModuleT; }()); privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT; -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyTypeParametersOfInterfaceDeclFile.d.ts] diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index ccaf7e1f1b70b..1f89a43b38bdd 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -177,7 +177,7 @@ export var glo_v24_public: glo_C2_private = new glo_C2_private(); // error //// [privacyVar.js] "use strict"; exports.__esModule = true; -var m1; +var m1 = {}; (function (m1) { var C1_public = /** @class */ (function () { function C1_public() { @@ -229,8 +229,8 @@ var m1; m1.m1_v22_public = new C1_public(); var m1_v23_private = new C2_private(); m1.m1_v24_public = new C2_private(); // error -})(m1 = exports.m1 || (exports.m1 = {})); -var m2; +})(m1); +var m2 = {}; (function (m2) { var m2_C1_public = /** @class */ (function () { function m2_C1_public() { @@ -282,7 +282,7 @@ var m2; m2.m2_v22_public = new m2_C1_public(); var m2_v23_private = new m2_C2_private(); m2.m2_v24_public = new m2_C2_private(); -})(m2 || (m2 = {})); +})(m2); var glo_C1_public = /** @class */ (function () { function glo_C1_public() { } diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 016ccda1de708..05d7b2d684d52 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -474,7 +474,7 @@ var privateClassWithPrivateModulePropertyTypes = /** @class */ (function () { return privateClassWithPrivateModulePropertyTypes; }()); var privateVarWithPrivateModulePropertyTypes; -var publicModule; +var publicModule = {}; (function (publicModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -523,8 +523,8 @@ var publicModule; return privateClassWithPrivateModulePropertyTypes; }()); var privateVarWithPrivateModulePropertyTypes; -})(publicModule = exports.publicModule || (exports.publicModule = {})); -var privateModule; +})(publicModule); +var privateModule = {}; (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -573,7 +573,7 @@ var privateModule; return privateClassWithPrivateModulePropertyTypes; }()); var privateVarWithPrivateModulePropertyTypes; -})(privateModule || (privateModule = {})); +})(privateModule); //// [privacyVarDeclFile_GlobalFile.js] var publicClassInGlobal = /** @class */ (function () { function publicClassInGlobal() { @@ -586,7 +586,7 @@ var publicClassWithWithPublicPropertyTypesInGlobal = /** @class */ (function () return publicClassWithWithPublicPropertyTypesInGlobal; }()); var publicVarWithPublicPropertyTypesInGlobal; -var publicModuleInGlobal; +var publicModuleInGlobal = publicModuleInGlobal || (publicModuleInGlobal = {}); (function (publicModuleInGlobal) { var privateClass = /** @class */ (function () { function privateClass() { @@ -599,7 +599,7 @@ var publicModuleInGlobal; return publicClass; }()); publicModuleInGlobal.publicClass = publicClass; - var privateModule; + var privateModule = privateModule || (privateModule = {}); (function (privateModule) { var privateClass = /** @class */ (function () { function privateClass() { @@ -648,7 +648,7 @@ var publicModuleInGlobal; return privateClassWithPrivateModulePropertyTypes; }()); var privateVarWithPrivateModulePropertyTypes; - })(privateModule || (privateModule = {})); + })(privateModule); var publicClassWithWithPrivatePropertyTypes = /** @class */ (function () { function publicClassWithWithPrivatePropertyTypes() { } @@ -685,7 +685,7 @@ var publicModuleInGlobal; return privateClassWithPrivateModulePropertyTypes; }()); var privateVarWithPrivateModulePropertyTypes; -})(publicModuleInGlobal || (publicModuleInGlobal = {})); +})(publicModuleInGlobal); //// [privacyVarDeclFile_externalModule.d.ts] diff --git a/tests/baselines/reference/privateInstanceVisibility.js b/tests/baselines/reference/privateInstanceVisibility.js index 51291447d3375..5ddf6bde2c074 100644 --- a/tests/baselines/reference/privateInstanceVisibility.js +++ b/tests/baselines/reference/privateInstanceVisibility.js @@ -39,7 +39,7 @@ class C { //// [privateInstanceVisibility.js] -var Test; +var Test = Test || (Test = {}); (function (Test) { var Example = /** @class */ (function () { function Example() { @@ -53,7 +53,7 @@ var Test; return Example; }()); Test.Example = Example; -})(Test || (Test = {})); +})(Test); var C = /** @class */ (function () { function C() { } diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js index dca198de06950..7c02249a9758f 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js @@ -19,4 +19,4 @@ var C = /** @class */ (function () { }()); (function (C) { C.y = C.bar; // error -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js index bbabc9e60191e..94850c26b47bc 100644 --- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js +++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js @@ -43,4 +43,4 @@ var D = /** @class */ (function (_super) { }(C)); (function (D) { D.y = D.bar; // error -})(D || (D = {})); +})(D); diff --git a/tests/baselines/reference/privateVisibility.js b/tests/baselines/reference/privateVisibility.js index 76723ef244a71..fd07f8b618fc0 100644 --- a/tests/baselines/reference/privateVisibility.js +++ b/tests/baselines/reference/privateVisibility.js @@ -41,7 +41,7 @@ f.privMeth(); // should not work f.privProp; // should not work f.pubMeth(); // should work f.pubProp; // should work -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -52,7 +52,7 @@ var M; }()); M.C = C; M.V = 0; -})(M || (M = {})); +})(M); var c = new M.C(); c.pub; // should work c.priv; // should not work diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js index c4f4e37489dbe..980a9c5e67e8b 100644 --- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js @@ -1,12 +1,12 @@ define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var outer; + var outer = {}; (function (outer) { - var inner; + var inner = outer.inner || (outer.inner = {}); (function (inner) { var local = 1; inner.a = local; - })(inner = outer.inner || (outer.inner = {})); - })(outer = exports.outer || (exports.outer = {})); + })(inner); + })(outer); }); diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js index 345fd8914cc6f..97751e2b778c2 100644 --- a/tests/baselines/reference/project/baseline3/node/nestedModule.js +++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js @@ -1,10 +1,10 @@ "use strict"; exports.__esModule = true; -var outer; +var outer = {}; (function (outer) { - var inner; + var inner = outer.inner || (outer.inner = {}); (function (inner) { var local = 1; inner.a = local; - })(inner = outer.inner || (outer.inner = {})); -})(outer = exports.outer || (exports.outer = {})); + })(inner); +})(outer); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.d.ts new file mode 100644 index 0000000000000..9f363458bb704 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.d.ts @@ -0,0 +1,3 @@ +export default const enum A { + FOO = 2 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.js b/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/constEnum.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.errors.txt b/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.errors.txt new file mode 100644 index 0000000000000..3bebae8ca149a --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.errors.txt @@ -0,0 +1,39 @@ +namespace.ts(2,15): error TS1155: 'const' declarations must be initialized. + + +==== constEnum.ts (0 errors) ==== + export default const enum A { + FOO = 2 + } +==== declareClass.ts (0 errors) ==== + export default declare class A { + FOO: 2 + } +==== declareConstEnum.ts (0 errors) ==== + export default declare const enum A { + FOO, + BAR + } +==== declareEnum.ts (0 errors) ==== + export default declare enum A { + FOO, + BAR + } +==== declareFunction.ts (0 errors) ==== + export default declare function A(): string +==== declareNamespace.ts (0 errors) ==== + export default declare namespace A { + export const FOO: string + } +==== enum.ts (0 errors) ==== + export default enum A { + FOO = 2 + } +==== namespace.ts (1 errors) ==== + export default namespace A { + export const FOO: 2 + ~~~ +!!! error TS1155: 'const' declarations must be initialized. + } +==== type.ts (0 errors) ==== + export default type int = number; \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.json b/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.json new file mode 100644 index 0000000000000..2b3b13f1094eb --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declarationsExportDefault.json @@ -0,0 +1,49 @@ +{ + "scenario": "declarations_ExportDefault", + "projectRoot": "tests/cases/projects/declarations_ExportDefault", + "declaration": true, + "baselineCheck": true, + "inputFiles": [ + "constEnum.ts", + "declareClass.ts", + "declareConstEnum.ts", + "declareEnum.ts", + "declareFunction.ts", + "declareNamespace.ts", + "enum.ts", + "namespace.ts", + "type.ts" + ], + "resolvedInputFiles": [ + "lib.es5.d.ts", + "constEnum.ts", + "declareClass.ts", + "declareConstEnum.ts", + "declareEnum.ts", + "declareFunction.ts", + "declareNamespace.ts", + "enum.ts", + "namespace.ts", + "type.ts" + ], + "emittedFiles": [ + "constEnum.js", + "constEnum.d.ts", + "declareClass.js", + "declareClass.d.ts", + "declareConstEnum.js", + "declareConstEnum.d.ts", + "declareEnum.js", + "declareEnum.d.ts", + "declareFunction.js", + "declareFunction.d.ts", + "declareNamespace.js", + "declareNamespace.d.ts", + "enum.js", + "enum.d.ts", + "namespace.js", + "namespace.d.ts", + "type.js", + "type.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.d.ts new file mode 100644 index 0000000000000..598d51b0ff689 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.d.ts @@ -0,0 +1,3 @@ +export default class A { + FOO: 2; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.js b/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareClass.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.d.ts new file mode 100644 index 0000000000000..3fc32101993be --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.d.ts @@ -0,0 +1,4 @@ +export default const enum A { + FOO = 0, + BAR = 1 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.js b/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareConstEnum.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.d.ts new file mode 100644 index 0000000000000..2e71467d85c37 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.d.ts @@ -0,0 +1,4 @@ +export default enum A { + FOO, + BAR +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.js b/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareEnum.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.d.ts new file mode 100644 index 0000000000000..6c8f7032bb198 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.d.ts @@ -0,0 +1 @@ +export default function A(): string; diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.js b/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareFunction.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.d.ts new file mode 100644 index 0000000000000..6e45695e8e5d7 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.d.ts @@ -0,0 +1,3 @@ +export default namespace A { + const FOO: string; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.js b/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/declareNamespace.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/enum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/enum.d.ts new file mode 100644 index 0000000000000..2fab76f0ef256 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/enum.d.ts @@ -0,0 +1,3 @@ +export default enum A { + FOO = 2 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/enum.js b/tests/baselines/reference/project/declarationsExportDefault/amd/enum.js new file mode 100644 index 0000000000000..f917dd423ff0c --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/enum.js @@ -0,0 +1,9 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; + var A = {}; + exports["default"] = A; + (function (A) { + A[A["FOO"] = 2] = "FOO"; + })(A); +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.d.ts new file mode 100644 index 0000000000000..f8ce7fac6bd9a --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.d.ts @@ -0,0 +1,3 @@ +export default namespace A { + const FOO: 2; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.js b/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.js new file mode 100644 index 0000000000000..8cdc0c15ca273 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/namespace.js @@ -0,0 +1,8 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; + var A = {}; + exports["default"] = A; + (function (A) { + })(A); +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/type.d.ts b/tests/baselines/reference/project/declarationsExportDefault/amd/type.d.ts new file mode 100644 index 0000000000000..1f385310cd430 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/type.d.ts @@ -0,0 +1 @@ +export default type int = number; diff --git a/tests/baselines/reference/project/declarationsExportDefault/amd/type.js b/tests/baselines/reference/project/declarationsExportDefault/amd/type.js new file mode 100644 index 0000000000000..eb08364649a70 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/amd/type.js @@ -0,0 +1,4 @@ +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.__esModule = true; +}); diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.d.ts new file mode 100644 index 0000000000000..9f363458bb704 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.d.ts @@ -0,0 +1,3 @@ +export default const enum A { + FOO = 2 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.js b/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/constEnum.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.errors.txt b/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.errors.txt new file mode 100644 index 0000000000000..3bebae8ca149a --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.errors.txt @@ -0,0 +1,39 @@ +namespace.ts(2,15): error TS1155: 'const' declarations must be initialized. + + +==== constEnum.ts (0 errors) ==== + export default const enum A { + FOO = 2 + } +==== declareClass.ts (0 errors) ==== + export default declare class A { + FOO: 2 + } +==== declareConstEnum.ts (0 errors) ==== + export default declare const enum A { + FOO, + BAR + } +==== declareEnum.ts (0 errors) ==== + export default declare enum A { + FOO, + BAR + } +==== declareFunction.ts (0 errors) ==== + export default declare function A(): string +==== declareNamespace.ts (0 errors) ==== + export default declare namespace A { + export const FOO: string + } +==== enum.ts (0 errors) ==== + export default enum A { + FOO = 2 + } +==== namespace.ts (1 errors) ==== + export default namespace A { + export const FOO: 2 + ~~~ +!!! error TS1155: 'const' declarations must be initialized. + } +==== type.ts (0 errors) ==== + export default type int = number; \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.json b/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.json new file mode 100644 index 0000000000000..2b3b13f1094eb --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declarationsExportDefault.json @@ -0,0 +1,49 @@ +{ + "scenario": "declarations_ExportDefault", + "projectRoot": "tests/cases/projects/declarations_ExportDefault", + "declaration": true, + "baselineCheck": true, + "inputFiles": [ + "constEnum.ts", + "declareClass.ts", + "declareConstEnum.ts", + "declareEnum.ts", + "declareFunction.ts", + "declareNamespace.ts", + "enum.ts", + "namespace.ts", + "type.ts" + ], + "resolvedInputFiles": [ + "lib.es5.d.ts", + "constEnum.ts", + "declareClass.ts", + "declareConstEnum.ts", + "declareEnum.ts", + "declareFunction.ts", + "declareNamespace.ts", + "enum.ts", + "namespace.ts", + "type.ts" + ], + "emittedFiles": [ + "constEnum.js", + "constEnum.d.ts", + "declareClass.js", + "declareClass.d.ts", + "declareConstEnum.js", + "declareConstEnum.d.ts", + "declareEnum.js", + "declareEnum.d.ts", + "declareFunction.js", + "declareFunction.d.ts", + "declareNamespace.js", + "declareNamespace.d.ts", + "enum.js", + "enum.d.ts", + "namespace.js", + "namespace.d.ts", + "type.js", + "type.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.d.ts new file mode 100644 index 0000000000000..598d51b0ff689 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.d.ts @@ -0,0 +1,3 @@ +export default class A { + FOO: 2; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.js b/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareClass.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.d.ts new file mode 100644 index 0000000000000..3fc32101993be --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.d.ts @@ -0,0 +1,4 @@ +export default const enum A { + FOO = 0, + BAR = 1 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.js b/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareConstEnum.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.d.ts new file mode 100644 index 0000000000000..2e71467d85c37 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.d.ts @@ -0,0 +1,4 @@ +export default enum A { + FOO, + BAR +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.js b/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareEnum.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.d.ts new file mode 100644 index 0000000000000..6c8f7032bb198 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.d.ts @@ -0,0 +1 @@ +export default function A(): string; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.js b/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareFunction.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.d.ts new file mode 100644 index 0000000000000..6e45695e8e5d7 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.d.ts @@ -0,0 +1,3 @@ +export default namespace A { + const FOO: string; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.js b/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/declareNamespace.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/enum.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/enum.d.ts new file mode 100644 index 0000000000000..2fab76f0ef256 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/enum.d.ts @@ -0,0 +1,3 @@ +export default enum A { + FOO = 2 +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/enum.js b/tests/baselines/reference/project/declarationsExportDefault/node/enum.js new file mode 100644 index 0000000000000..36c921c8de436 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/enum.js @@ -0,0 +1,7 @@ +"use strict"; +exports.__esModule = true; +var A = {}; +exports["default"] = A; +(function (A) { + A[A["FOO"] = 2] = "FOO"; +})(A); diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/namespace.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/namespace.d.ts new file mode 100644 index 0000000000000..f8ce7fac6bd9a --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/namespace.d.ts @@ -0,0 +1,3 @@ +export default namespace A { + const FOO: 2; +} diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/namespace.js b/tests/baselines/reference/project/declarationsExportDefault/node/namespace.js new file mode 100644 index 0000000000000..612bc2c782159 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/namespace.js @@ -0,0 +1,6 @@ +"use strict"; +exports.__esModule = true; +var A = {}; +exports["default"] = A; +(function (A) { +})(A); diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/type.d.ts b/tests/baselines/reference/project/declarationsExportDefault/node/type.d.ts new file mode 100644 index 0000000000000..1f385310cd430 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/type.d.ts @@ -0,0 +1 @@ +export default type int = number; diff --git a/tests/baselines/reference/project/declarationsExportDefault/node/type.js b/tests/baselines/reference/project/declarationsExportDefault/node/type.js new file mode 100644 index 0000000000000..64cbe53a86127 --- /dev/null +++ b/tests/baselines/reference/project/declarationsExportDefault/node/type.js @@ -0,0 +1,2 @@ +"use strict"; +exports.__esModule = true; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js index 6ecb0c59793af..28e4c360bcdf3 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js @@ -1,10 +1,10 @@ define(["require", "exports", "private_m4"], function (require, exports, private_m4) { "use strict"; exports.__esModule = true; - var usePrivate_m4_m1; + var usePrivate_m4_m1 = {}; (function (usePrivate_m4_m1) { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); - })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); + })(usePrivate_m4_m1); }); diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js index 79310d89c02b4..b3f87bd026a0c 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js @@ -2,9 +2,9 @@ exports.__esModule = true; // only used privately no need to emit var private_m4 = require("private_m4"); -var usePrivate_m4_m1; +var usePrivate_m4_m1 = {}; (function (usePrivate_m4_m1) { var x3 = private_m4.x; var d3 = private_m4.d; var f3 = private_m4.foo(); -})(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {})); +})(usePrivate_m4_m1); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js index 5375f44c01361..8b4dd1114bc88 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js @@ -4,7 +4,7 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); - var m1; + var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,7 +12,7 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); + })(m1); exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js index 395cbeee96693..bbbc640834333 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js @@ -4,7 +4,7 @@ var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); -var m1; +var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,7 +12,7 @@ var m1; var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); +})(m1); // Do not emit multiple used import statements var multiImport_m4 = require("m4"); // Emit used exports.useMultiImport_m4_x4 = multiImport_m4.x; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js index b8a22cfdc1f76..61f629c399045 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js @@ -4,7 +4,7 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); - var m1; + var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,6 +12,6 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) { var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); + })(m1); exports.d = m5.foo2(); }); diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js index 49958bb9814bc..141c8289b6038 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js @@ -4,7 +4,7 @@ var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); -var m1; +var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,7 +12,7 @@ var m1; var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); +})(m1); // Do not emit unused import var m5 = require("m5"); exports.d = m5.foo2(); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js index af5fcb7d87409..d663371131e3c 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js @@ -4,7 +4,7 @@ define(["require", "exports", "m4"], function (require, exports, m4) { exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); - var m1; + var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,5 +12,5 @@ define(["require", "exports", "m4"], function (require, exports, m4) { var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); - })(m1 = exports.m1 || (exports.m1 = {})); + })(m1); }); diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js index 3a5602a21664d..f232b85102910 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js @@ -4,7 +4,7 @@ var m4 = require("m4"); // Emit used exports.x4 = m4.x; exports.d4 = m4.d; exports.f4 = m4.foo(); -var m1; +var m1 = {}; (function (m1) { m1.x2 = m4.x; m1.d2 = m4.d; @@ -12,4 +12,4 @@ var m1; var x3 = m4.x; var d3 = m4.d; var f3 = m4.foo(); -})(m1 = exports.m1 || (exports.m1 = {})); +})(m1); diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js index 6b8e014497187..7bc3bd192002a 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js @@ -11,7 +11,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { m2.c1 = new m2.mExported.me.class1; function f1() { @@ -65,4 +65,4 @@ var m2; } return class4; }(mNonExported.mne.class1)); -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js index 6b8e014497187..7bc3bd192002a 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js @@ -11,7 +11,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { m2.c1 = new m2.mExported.me.class1; function f1() { @@ -65,4 +65,4 @@ var m2; } return class4; }(mNonExported.mne.class1)); -})(m2 || (m2 = {})); +})(m2); diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js index 915bc7b4573b9..1455d4b7736fb 100644 --- a/tests/baselines/reference/project/prologueEmit/amd/out.js +++ b/tests/baselines/reference/project/prologueEmit/amd/out.js @@ -15,7 +15,7 @@ var _this = this; // Add a lambda to ensure global 'this' capture is triggered (function () { return _this.window; }); // class inheritance to ensure __extends is emitted -var m; +var m = m || (m = {}); (function (m) { var base = /** @class */ (function () { function base() { @@ -31,4 +31,4 @@ var m; return child; }(base)); m.child = child; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js index 915bc7b4573b9..1455d4b7736fb 100644 --- a/tests/baselines/reference/project/prologueEmit/node/out.js +++ b/tests/baselines/reference/project/prologueEmit/node/out.js @@ -15,7 +15,7 @@ var _this = this; // Add a lambda to ensure global 'this' capture is triggered (function () { return _this.window; }); // class inheritance to ensure __extends is emitted -var m; +var m = m || (m = {}); (function (m) { var base = /** @class */ (function () { function base() { @@ -31,4 +31,4 @@ var m; return child; }(base)); m.child = child; -})(m || (m = {})); +})(m); diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js index ed444649d06ca..09d9d037a12d5 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js @@ -1,4 +1,4 @@ -var test; +var test = test || (test = {}); (function (test) { var ClassA = /** @class */ (function () { function ClassA() { @@ -7,4 +7,4 @@ var test; return ClassA; }()); test.ClassA = ClassA; -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js index ed444649d06ca..09d9d037a12d5 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js @@ -1,4 +1,4 @@ -var test; +var test = test || (test = {}); (function (test) { var ClassA = /** @class */ (function () { function ClassA() { @@ -7,4 +7,4 @@ var test; return ClassA; }()); test.ClassA = ClassA; -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js index 307f2e7babb48..09fb81bd71da4 100644 --- a/tests/baselines/reference/propertyAccess.js +++ b/tests/baselines/reference/propertyAccess.js @@ -176,13 +176,13 @@ var B = /** @class */ (function (_super) { } return B; }(A)); -var Compass; +var Compass = Compass || (Compass = {}); (function (Compass) { Compass[Compass["North"] = 0] = "North"; Compass[Compass["South"] = 1] = "South"; Compass[Compass["East"] = 2] = "East"; Compass[Compass["West"] = 3] = "West"; -})(Compass || (Compass = {})); +})(Compass); var numIndex = { 3: 'three', 'three': 'three' }; var strIndex = { 'N': Compass.North, 'E': Compass.East }; var bothIndex; diff --git a/tests/baselines/reference/propertyNamesOfReservedWords.js b/tests/baselines/reference/propertyNamesOfReservedWords.js index c640ab64a1667..bac5d56daf2fb 100644 --- a/tests/baselines/reference/propertyNamesOfReservedWords.js +++ b/tests/baselines/reference/propertyNamesOfReservedWords.js @@ -291,7 +291,7 @@ var r4 = i.as; var a; var r5 = a.abstract; var r6 = a.as; -var E; +var E = E || (E = {}); (function (E) { E[E["abstract"] = 0] = "abstract"; E[E["as"] = 1] = "as"; @@ -356,6 +356,6 @@ var E; E[E["volatile"] = 60] = "volatile"; E[E["while"] = 61] = "while"; E[E["with"] = 62] = "with"; -})(E || (E = {})); +})(E); var r7 = E.abstract; var r8 = E.as; diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.js b/tests/baselines/reference/propertyNamesWithStringLiteral.js index 9066432a24129..588f2bcba277c 100644 --- a/tests/baselines/reference/propertyNamesWithStringLiteral.js +++ b/tests/baselines/reference/propertyNamesWithStringLiteral.js @@ -22,9 +22,9 @@ var _Color = /** @class */ (function () { } return _Color; }()); -var Color; +var Color = Color || (Color = {}); (function (Color) { -})(Color || (Color = {})); +})(Color); var a = Color.namedColors["azure"]; var a = Color.namedColors.blue; // Should not error var a = Color.namedColors["pale blue"]; // should not error diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js index 64b46eaa0e37b..ac8e1f54d97e5 100644 --- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js +++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js @@ -21,4 +21,4 @@ var C = /** @class */ (function () { (function (C) { C.f = C.foo; // OK C.b = C.bar; // error -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/qualifiedModuleLocals.js b/tests/baselines/reference/qualifiedModuleLocals.js index 7fcbc0700f8d1..f08cd0e04a987 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.js +++ b/tests/baselines/reference/qualifiedModuleLocals.js @@ -11,10 +11,10 @@ A.a(); //// [qualifiedModuleLocals.js] -var A; +var A = A || (A = {}); (function (A) { function b() { } function a() { A.b(); } // A.b should be an unresolved symbol error A.a = a; -})(A || (A = {})); +})(A); A.a(); diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js index 5bb8ba36751a2..f49ebfe2d6376 100644 --- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js +++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js @@ -11,8 +11,8 @@ module Beta { var x = Alpha.x //// [qualifiedName_ImportDeclarations-entity-names-referencing-a-var.js] -var Alpha; +var Alpha = Alpha || (Alpha = {}); (function (Alpha) { Alpha.x = 100; -})(Alpha || (Alpha = {})); +})(Alpha); var x = Alpha.x; diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js index f88c328bc48f7..dfe8092cb0131 100644 --- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js +++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js @@ -20,10 +20,10 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Alpha; +var Alpha = Alpha || (Alpha = {}); (function (Alpha) { Alpha.x = 100; -})(Alpha || (Alpha = {})); +})(Alpha); var Beta = /** @class */ (function (_super) { __extends(Beta, _super); function Beta() { diff --git a/tests/baselines/reference/qualify.js b/tests/baselines/reference/qualify.js index a1e28bd9dc1c5..5ca5277b72729 100644 --- a/tests/baselines/reference/qualify.js +++ b/tests/baselines/reference/qualify.js @@ -61,38 +61,38 @@ var x:T.I=y; //// [qualify.js] -var M; +var M = M || (M = {}); (function (M) { M.m = 0; - var N; + var N = M.N || (M.N = {}); (function (N) { N.n = 1; - })(N = M.N || (M.N = {})); -})(M || (M = {})); + })(N); +})(M); (function (M) { - var N; + var N = M.N || (M.N = {}); (function (N) { var y = M.m; var x = N.n + y; - })(N = M.N || (M.N = {})); -})(M || (M = {})); -var T; + })(N); +})(M); +var T = T || (T = {}); (function (T) { - var U; + var U = T.U || (T.U = {}); (function (U) { var z = 3; - })(U = T.U || (T.U = {})); -})(T || (T = {})); -var Peer; + })(U); +})(T); +var Peer = Peer || (Peer = {}); (function (Peer) { - var U2; + var U2 = Peer.U2 || (Peer.U2 = {}); (function (U2) { var z = 3; - })(U2 = Peer.U2 || (Peer.U2 = {})); -})(Peer || (Peer = {})); -var Everest; + })(U2); +})(Peer); +var Everest = Everest || (Everest = {}); (function (Everest) { - var K2; + var K2 = Everest.K2 || (Everest.K2 = {}); (function (K2) { var v1; var v2 = v1; @@ -100,7 +100,7 @@ var Everest; var v4 = v1; var v5 = v1; var v6 = v1; - })(K2 = Everest.K2 || (Everest.K2 = {})); -})(Everest || (Everest = {})); + })(K2); +})(Everest); var y; var x = y; diff --git a/tests/baselines/reference/reachabilityChecks1.js b/tests/baselines/reference/reachabilityChecks1.js index 4cc5de737aed1..e0c306f44a599 100644 --- a/tests/baselines/reference/reachabilityChecks1.js +++ b/tests/baselines/reference/reachabilityChecks1.js @@ -78,42 +78,42 @@ function f4() { while (true) ; var x = 1; -var A; +var A = A || (A = {}); (function (A) { while (true) ; var x; -})(A || (A = {})); -var A1; +})(A); +var A1 = A1 || (A1 = {}); (function (A1) { do { } while (true); -})(A1 || (A1 = {})); -var A2; +})(A1); +var A2 = A2 || (A2 = {}); (function (A2) { while (true) ; - var A; + var A = A || (A = {}); (function (A) { var x = 1; - })(A || (A = {})); -})(A2 || (A2 = {})); -var A3; + })(A); +})(A2); +var A3 = A3 || (A3 = {}); (function (A3) { while (true) ; -})(A3 || (A3 = {})); -var A4; +})(A3); +var A4 = A4 || (A4 = {}); (function (A4) { while (true) ; - var A; + var A = A || (A = {}); (function (A) { - var E; + var E = E || (E = {}); (function (E) { E[E["X"] = 0] = "X"; - })(E || (E = {})); - })(A || (A = {})); -})(A4 || (A4 = {})); + })(E); + })(A); +})(A4); function f1(x) { if (x) { return; @@ -131,25 +131,25 @@ function f2() { return A; }()); } -var B; +var B = B || (B = {}); (function (B) { for (;;) ; -})(B || (B = {})); +})(B); function f3() { do { } while (true); - var E; + var E = E || (E = {}); (function (E) { E[E["X"] = 1] = "X"; - })(E || (E = {})); + })(E); } function f4() { if (true) { throw new Error(); } - var E; + var E = E || (E = {}); (function (E) { E[E["X"] = 1] = "X"; - })(E || (E = {})); + })(E); } diff --git a/tests/baselines/reference/reachabilityChecks2.js b/tests/baselines/reference/reachabilityChecks2.js index f5f8245bbe649..472b23418207e 100644 --- a/tests/baselines/reference/reachabilityChecks2.js +++ b/tests/baselines/reference/reachabilityChecks2.js @@ -13,8 +13,8 @@ module A4 { //// [reachabilityChecks2.js] while (true) { } -var A4; +var A4 = A4 || (A4 = {}); (function (A4) { while (true) ; -})(A4 || (A4 = {})); +})(A4); diff --git a/tests/baselines/reference/readonlyMembers.js b/tests/baselines/reference/readonlyMembers.js index 07345379e6f80..60c2127ba2498 100644 --- a/tests/baselines/reference/readonlyMembers.js +++ b/tests/baselines/reference/readonlyMembers.js @@ -107,19 +107,19 @@ p.b = 1; var q = p; q.a = 1; q.b = 1; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; E[E["C"] = 2] = "C"; -})(E || (E = {})); +})(E); E.A = 1; // Error -var N; +var N = N || (N = {}); (function (N) { N.a = 1; N.b = 1; N.c = 1; -})(N || (N = {})); +})(N); N.a = 1; // Error N.b = 1; N.c = 1; diff --git a/tests/baselines/reference/reboundBaseClassSymbol.js b/tests/baselines/reference/reboundBaseClassSymbol.js index 8c2f21602afb7..9a26ebeeb5b12 100644 --- a/tests/baselines/reference/reboundBaseClassSymbol.js +++ b/tests/baselines/reference/reboundBaseClassSymbol.js @@ -6,7 +6,7 @@ module Foo { } //// [reboundBaseClassSymbol.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var A = 1; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/reboundIdentifierOnImportAlias.js b/tests/baselines/reference/reboundIdentifierOnImportAlias.js index 82e892236c0da..15f729faef941 100644 --- a/tests/baselines/reference/reboundIdentifierOnImportAlias.js +++ b/tests/baselines/reference/reboundIdentifierOnImportAlias.js @@ -8,11 +8,11 @@ module Bar { } //// [reboundIdentifierOnImportAlias.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { Foo.x = "hello"; -})(Foo || (Foo = {})); -var Bar; +})(Foo); +var Bar = Bar || (Bar = {}); (function (Bar) { var Foo = 1; -})(Bar || (Bar = {})); +})(Bar); diff --git a/tests/baselines/reference/rectype.js b/tests/baselines/reference/rectype.js index 15c5d9861f481..0867bfdb1ab1c 100644 --- a/tests/baselines/reference/rectype.js +++ b/tests/baselines/reference/rectype.js @@ -14,7 +14,7 @@ module M { //// [rectype.js] -var M; +var M = M || (M = {}); (function (M) { function f(p) { return f; } M.f = f; @@ -23,4 +23,4 @@ var M; f(i); f(f(i)); f((f(f(i)))); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js index 9b59c338b80cc..310f76b88f752 100644 --- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js +++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js @@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var TypeScript2; +var TypeScript2 = TypeScript2 || (TypeScript2 = {}); (function (TypeScript2) { var MemberName = /** @class */ (function () { function MemberName() { @@ -40,5 +40,5 @@ var TypeScript2; return MemberNameArray; }(MemberName)); TypeScript2.MemberNameArray = MemberNameArray; -})(TypeScript2 || (TypeScript2 = {})); +})(TypeScript2); var a = new TypeScript2.MemberNameArray(); diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js index 5122941e1d66d..6d241478b8c17 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js +++ b/tests/baselines/reference/recursiveClassReferenceTest.js @@ -118,13 +118,13 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Sample; +var Sample = Sample || (Sample = {}); (function (Sample) { - var Actions; + var Actions = Sample.Actions || (Sample.Actions = {}); (function (Actions) { - var Thing; + var Thing = Actions.Thing || (Actions.Thing = {}); (function (Thing_1) { - var Find; + var Find = Thing_1.Find || (Thing_1.Find = {}); (function (Find) { var StartFindAction = /** @class */ (function () { function StartFindAction() { @@ -136,14 +136,14 @@ var Sample; return StartFindAction; }()); Find.StartFindAction = StartFindAction; - })(Find = Thing_1.Find || (Thing_1.Find = {})); - })(Thing = Actions.Thing || (Actions.Thing = {})); - })(Actions = Sample.Actions || (Sample.Actions = {})); -})(Sample || (Sample = {})); + })(Find); + })(Thing); + })(Actions); +})(Sample); (function (Sample) { - var Thing; + var Thing = Sample.Thing || (Sample.Thing = {}); (function (Thing) { - var Widgets; + var Widgets = Thing.Widgets || (Thing.Widgets = {}); (function (Widgets) { var FindWidget = /** @class */ (function () { function FindWidget(codeThing) { @@ -163,9 +163,9 @@ var Sample; return FindWidget; }()); Widgets.FindWidget = FindWidget; - })(Widgets = Thing.Widgets || (Thing.Widgets = {})); - })(Thing = Sample.Thing || (Sample.Thing = {})); -})(Sample || (Sample = {})); + })(Widgets); + })(Thing); +})(Sample); var AbstractMode = /** @class */ (function () { function AbstractMode() { } @@ -173,11 +173,11 @@ var AbstractMode = /** @class */ (function () { return AbstractMode; }()); (function (Sample) { - var Thing; + var Thing = Sample.Thing || (Sample.Thing = {}); (function (Thing) { - var Languages; + var Languages = Thing.Languages || (Thing.Languages = {}); (function (Languages) { - var PlainText; + var PlainText = Languages.PlainText || (Languages.PlainText = {}); (function (PlainText) { var State = /** @class */ (function () { function State(mode) { @@ -205,8 +205,8 @@ var AbstractMode = /** @class */ (function () { return Mode; }(AbstractMode)); PlainText.Mode = Mode; - })(PlainText = Languages.PlainText || (Languages.PlainText = {})); - })(Languages = Thing.Languages || (Thing.Languages = {})); - })(Thing = Sample.Thing || (Sample.Thing = {})); -})(Sample || (Sample = {})); + })(PlainText); + })(Languages); + })(Thing); +})(Sample); //# sourceMappingURL=recursiveClassReferenceTest.js.map \ No newline at end of file diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map index 687e1773c26d1..4dd1f2d222296 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.js.map +++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map @@ -1,2 +1,2 @@ //// [recursiveClassReferenceTest.js.map] -{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO;YAC1B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,IAAI,IAAI,EAAE;oBAAC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;iBAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"} \ No newline at end of file +{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;;;;;;;;AA8B1E,IAAO,MAAM,GAAN,MAAM,KAAN,MAAM,OAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,GAAP,cAAO,KAAP,cAAO,OAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,GAAL,aAAK,KAAL,aAAK,OAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,GAAJ,YAAI,KAAJ,YAAI,OAU/B;YAV2B,WAAA,IAAI;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,EAU/B;QAAD,CAAC,EAVqB,KAAK,EAU1B;IAAD,CAAC,EAVa,OAAO,EAUpB;AAAD,CAAC,EAVM,MAAM,EAUZ;AAED,WAAO,MAAM;IAAC,IAAA,KAAK,GAAL,YAAK,KAAL,YAAK,OAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,GAAP,aAAO,KAAP,aAAO,OAoB1B;QApBmB,WAAA,OAAO;YAC1B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,IAAI,IAAI,EAAE;oBAAC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;iBAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,EAoB1B;IAAD,CAAC,EApBa,KAAK,EAoBlB;AAAD,CAAC,EApBM,MAAM,EAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAO,MAAM;IAAC,IAAA,KAAK,GAAL,YAAK,KAAL,YAAK,OAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,GAAT,eAAS,KAAT,eAAS,OAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,GAAT,mBAAS,KAAT,mBAAS,OAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,EAwBtC;QAAD,CAAC,EAxBmB,SAAS,EAwB5B;IAAD,CAAC,EAxBa,KAAK,EAwBlB;AAAD,CAAC,EAxBM,MAAM,EAwBZ"} \ No newline at end of file diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt index 77d5bcca277b1..1e23731b3b345 100644 --- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt +++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt @@ -39,12 +39,15 @@ sourceFile:recursiveClassReferenceTest.ts >>> d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); >>> }; >>>})(); ->>>var Sample; +>>>var Sample = Sample || (Sample = {}); 1 > 2 >^^^^ 3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^ +6 > ^^^^^ +7 > ^^^^^^ +8 > ^^^^^^^ 1 > > > @@ -78,139 +81,183 @@ sourceFile:recursiveClassReferenceTest.ts > 2 >module 3 > Sample -4 > .Actions.Thing.Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } +4 > +5 > Sample +6 > +7 > Sample +8 > .Actions.Thing.Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } 1 >Emitted(16, 1) Source(32, 1) + SourceIndex(0) 2 >Emitted(16, 5) Source(32, 8) + SourceIndex(0) 3 >Emitted(16, 11) Source(32, 14) + SourceIndex(0) -4 >Emitted(16, 12) Source(42, 2) + SourceIndex(0) +4 >Emitted(16, 14) Source(32, 8) + SourceIndex(0) +5 >Emitted(16, 20) Source(32, 14) + SourceIndex(0) +6 >Emitted(16, 25) Source(32, 8) + SourceIndex(0) +7 >Emitted(16, 31) Source(32, 14) + SourceIndex(0) +8 >Emitted(16, 38) Source(42, 2) + SourceIndex(0) --- >>>(function (Sample) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 >module 3 > Sample -1->Emitted(17, 1) Source(32, 1) + SourceIndex(0) +1 >Emitted(17, 1) Source(32, 1) + SourceIndex(0) 2 >Emitted(17, 12) Source(32, 8) + SourceIndex(0) 3 >Emitted(17, 18) Source(32, 14) + SourceIndex(0) --- ->>> var Actions; -1 >^^^^ +>>> var Actions = Sample.Actions || (Sample.Actions = {}); +1->^^^^ 2 > ^^^^ 3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Actions -4 > .Thing.Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } -1 >Emitted(18, 5) Source(32, 15) + SourceIndex(0) +4 > +5 > Actions +6 > +7 > Actions +8 > .Thing.Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } +1->Emitted(18, 5) Source(32, 15) + SourceIndex(0) 2 >Emitted(18, 9) Source(32, 15) + SourceIndex(0) 3 >Emitted(18, 16) Source(32, 22) + SourceIndex(0) -4 >Emitted(18, 17) Source(42, 2) + SourceIndex(0) +4 >Emitted(18, 19) Source(32, 15) + SourceIndex(0) +5 >Emitted(18, 33) Source(32, 22) + SourceIndex(0) +6 >Emitted(18, 38) Source(32, 15) + SourceIndex(0) +7 >Emitted(18, 52) Source(32, 22) + SourceIndex(0) +8 >Emitted(18, 59) Source(42, 2) + SourceIndex(0) --- >>> (function (Actions) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > 3 > Actions -1->Emitted(19, 5) Source(32, 15) + SourceIndex(0) +1 >Emitted(19, 5) Source(32, 15) + SourceIndex(0) 2 >Emitted(19, 16) Source(32, 15) + SourceIndex(0) 3 >Emitted(19, 23) Source(32, 22) + SourceIndex(0) --- ->>> var Thing; -1 >^^^^^^^^ +>>> var Thing = Actions.Thing || (Actions.Thing = {}); +1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^ -4 > ^ -5 > ^^^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Thing -4 > .Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } -1 >Emitted(20, 9) Source(32, 23) + SourceIndex(0) +4 > +5 > Thing +6 > +7 > Thing +8 > .Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } +1->Emitted(20, 9) Source(32, 23) + SourceIndex(0) 2 >Emitted(20, 13) Source(32, 23) + SourceIndex(0) 3 >Emitted(20, 18) Source(32, 28) + SourceIndex(0) -4 >Emitted(20, 19) Source(42, 2) + SourceIndex(0) +4 >Emitted(20, 21) Source(32, 23) + SourceIndex(0) +5 >Emitted(20, 34) Source(32, 28) + SourceIndex(0) +6 >Emitted(20, 39) Source(32, 23) + SourceIndex(0) +7 >Emitted(20, 52) Source(32, 28) + SourceIndex(0) +8 >Emitted(20, 59) Source(42, 2) + SourceIndex(0) --- >>> (function (Thing_1) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > 3 > Thing -1->Emitted(21, 9) Source(32, 23) + SourceIndex(0) +1 >Emitted(21, 9) Source(32, 23) + SourceIndex(0) 2 >Emitted(21, 20) Source(32, 23) + SourceIndex(0) 3 >Emitted(21, 27) Source(32, 28) + SourceIndex(0) --- ->>> var Find; -1 >^^^^^^^^^^^^ +>>> var Find = Thing_1.Find || (Thing_1.Find = {}); +1->^^^^^^^^^^^^ 2 > ^^^^ 3 > ^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Find -4 > { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } -1 >Emitted(22, 13) Source(32, 29) + SourceIndex(0) +4 > +5 > Find +6 > +7 > Find +8 > { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } +1->Emitted(22, 13) Source(32, 29) + SourceIndex(0) 2 >Emitted(22, 17) Source(32, 29) + SourceIndex(0) 3 >Emitted(22, 21) Source(32, 33) + SourceIndex(0) -4 >Emitted(22, 22) Source(42, 2) + SourceIndex(0) +4 >Emitted(22, 24) Source(32, 29) + SourceIndex(0) +5 >Emitted(22, 36) Source(32, 33) + SourceIndex(0) +6 >Emitted(22, 41) Source(32, 29) + SourceIndex(0) +7 >Emitted(22, 53) Source(32, 33) + SourceIndex(0) +8 >Emitted(22, 60) Source(42, 2) + SourceIndex(0) --- >>> (function (Find) { -1->^^^^^^^^^^^^ +1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > 3 > Find -1->Emitted(23, 13) Source(32, 29) + SourceIndex(0) +1 >Emitted(23, 13) Source(32, 29) + SourceIndex(0) 2 >Emitted(23, 24) Source(32, 29) + SourceIndex(0) 3 >Emitted(23, 28) Source(32, 33) + SourceIndex(0) --- @@ -355,7 +402,6 @@ sourceFile:recursiveClassReferenceTest.ts 2 > ^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^ 4 > ^ -5 > ^^^^^-> 1-> 2 > StartFindAction 3 > implements Sample.Thing.IAction { @@ -373,262 +419,243 @@ sourceFile:recursiveClassReferenceTest.ts 3 >Emitted(33, 55) Source(41, 3) + SourceIndex(0) 4 >Emitted(33, 56) Source(41, 3) + SourceIndex(0) --- ->>> })(Find = Thing_1.Find || (Thing_1.Find = {})); -1->^^^^^^^^^^^^ +>>> })(Find); +1 >^^^^^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > Find -5 > -6 > Find -7 > -8 > Find -9 > { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } -1->Emitted(34, 13) Source(42, 1) + SourceIndex(0) +5 > { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } +1 >Emitted(34, 13) Source(42, 1) + SourceIndex(0) 2 >Emitted(34, 14) Source(42, 2) + SourceIndex(0) 3 >Emitted(34, 16) Source(32, 29) + SourceIndex(0) 4 >Emitted(34, 20) Source(32, 33) + SourceIndex(0) -5 >Emitted(34, 23) Source(32, 29) + SourceIndex(0) -6 >Emitted(34, 35) Source(32, 33) + SourceIndex(0) -7 >Emitted(34, 40) Source(32, 29) + SourceIndex(0) -8 >Emitted(34, 52) Source(32, 33) + SourceIndex(0) -9 >Emitted(34, 60) Source(42, 2) + SourceIndex(0) +5 >Emitted(34, 22) Source(42, 2) + SourceIndex(0) --- ->>> })(Thing = Actions.Thing || (Actions.Thing = {})); +>>> })(Thing); 1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^ -9 > ^^^^^^^^ -10> ^-> +5 > ^^ 1 > 2 > } 3 > 4 > Thing -5 > -6 > Thing -7 > -8 > Thing -9 > .Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } +5 > .Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } 1 >Emitted(35, 9) Source(42, 1) + SourceIndex(0) 2 >Emitted(35, 10) Source(42, 2) + SourceIndex(0) 3 >Emitted(35, 12) Source(32, 23) + SourceIndex(0) 4 >Emitted(35, 17) Source(32, 28) + SourceIndex(0) -5 >Emitted(35, 20) Source(32, 23) + SourceIndex(0) -6 >Emitted(35, 33) Source(32, 28) + SourceIndex(0) -7 >Emitted(35, 38) Source(32, 23) + SourceIndex(0) -8 >Emitted(35, 51) Source(32, 28) + SourceIndex(0) -9 >Emitted(35, 59) Source(42, 2) + SourceIndex(0) +5 >Emitted(35, 19) Source(42, 2) + SourceIndex(0) --- ->>> })(Actions = Sample.Actions || (Sample.Actions = {})); -1->^^^^ +>>> })(Actions); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > 2 > } 3 > 4 > Actions -5 > -6 > Actions -7 > -8 > Actions -9 > .Thing.Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } -1->Emitted(36, 5) Source(42, 1) + SourceIndex(0) +5 > .Thing.Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } +1 >Emitted(36, 5) Source(42, 1) + SourceIndex(0) 2 >Emitted(36, 6) Source(42, 2) + SourceIndex(0) 3 >Emitted(36, 8) Source(32, 15) + SourceIndex(0) 4 >Emitted(36, 15) Source(32, 22) + SourceIndex(0) -5 >Emitted(36, 18) Source(32, 15) + SourceIndex(0) -6 >Emitted(36, 32) Source(32, 22) + SourceIndex(0) -7 >Emitted(36, 37) Source(32, 15) + SourceIndex(0) -8 >Emitted(36, 51) Source(32, 22) + SourceIndex(0) -9 >Emitted(36, 59) Source(42, 2) + SourceIndex(0) +5 >Emitted(36, 17) Source(42, 2) + SourceIndex(0) --- ->>>})(Sample || (Sample = {})); +>>>})(Sample); 1 > 2 >^ 3 > ^^ 4 > ^^^^^^ -5 > ^^^^^ -6 > ^^^^^^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^-> 1 > 2 >} 3 > 4 > Sample -5 > -6 > Sample -7 > .Actions.Thing.Find { - > export class StartFindAction implements Sample.Thing.IAction { - > - > public getId() { return "yo"; } - > - > public run(Thing:Sample.Thing.ICodeThing):boolean { - > - > return true; - > } - > } - > } +5 > .Actions.Thing.Find { + > export class StartFindAction implements Sample.Thing.IAction { + > + > public getId() { return "yo"; } + > + > public run(Thing:Sample.Thing.ICodeThing):boolean { + > + > return true; + > } + > } + > } 1 >Emitted(37, 1) Source(42, 1) + SourceIndex(0) 2 >Emitted(37, 2) Source(42, 2) + SourceIndex(0) 3 >Emitted(37, 4) Source(32, 8) + SourceIndex(0) 4 >Emitted(37, 10) Source(32, 14) + SourceIndex(0) -5 >Emitted(37, 15) Source(32, 8) + SourceIndex(0) -6 >Emitted(37, 21) Source(32, 14) + SourceIndex(0) -7 >Emitted(37, 29) Source(42, 2) + SourceIndex(0) +5 >Emitted(37, 12) Source(42, 2) + SourceIndex(0) --- >>>(function (Sample) { -1 > +1-> 2 >^^^^^^^^^^^ 3 > ^^^^^^ -1 > +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1-> > > 2 >module 3 > Sample -1 >Emitted(38, 1) Source(44, 1) + SourceIndex(0) +1->Emitted(38, 1) Source(44, 1) + SourceIndex(0) 2 >Emitted(38, 12) Source(44, 8) + SourceIndex(0) 3 >Emitted(38, 18) Source(44, 14) + SourceIndex(0) --- ->>> var Thing; -1 >^^^^ +>>> var Thing = Sample.Thing || (Sample.Thing = {}); +1->^^^^ 2 > ^^^^ 3 > ^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Thing -4 > .Widgets { - > export class FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } - > } -1 >Emitted(39, 5) Source(44, 15) + SourceIndex(0) +4 > +5 > Thing +6 > +7 > Thing +8 > .Widgets { + > export class FindWidget implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } + > } +1->Emitted(39, 5) Source(44, 15) + SourceIndex(0) 2 >Emitted(39, 9) Source(44, 15) + SourceIndex(0) 3 >Emitted(39, 14) Source(44, 20) + SourceIndex(0) -4 >Emitted(39, 15) Source(64, 2) + SourceIndex(0) +4 >Emitted(39, 17) Source(44, 15) + SourceIndex(0) +5 >Emitted(39, 29) Source(44, 20) + SourceIndex(0) +6 >Emitted(39, 34) Source(44, 15) + SourceIndex(0) +7 >Emitted(39, 46) Source(44, 20) + SourceIndex(0) +8 >Emitted(39, 53) Source(64, 2) + SourceIndex(0) --- >>> (function (Thing) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^ -4 > ^-> -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > 3 > Thing -1->Emitted(40, 5) Source(44, 15) + SourceIndex(0) +1 >Emitted(40, 5) Source(44, 15) + SourceIndex(0) 2 >Emitted(40, 16) Source(44, 15) + SourceIndex(0) 3 >Emitted(40, 21) Source(44, 20) + SourceIndex(0) --- ->>> var Widgets; +>>> var Widgets = Thing.Widgets || (Thing.Widgets = {}); 1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^ +8 > ^^^^^^^ 1->. 2 > 3 > Widgets -4 > { - > export class FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } - > } +4 > +5 > Widgets +6 > +7 > Widgets +8 > { + > export class FindWidget implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } + > } 1->Emitted(41, 9) Source(44, 21) + SourceIndex(0) 2 >Emitted(41, 13) Source(44, 21) + SourceIndex(0) 3 >Emitted(41, 20) Source(44, 28) + SourceIndex(0) -4 >Emitted(41, 21) Source(64, 2) + SourceIndex(0) +4 >Emitted(41, 23) Source(44, 21) + SourceIndex(0) +5 >Emitted(41, 36) Source(44, 28) + SourceIndex(0) +6 >Emitted(41, 41) Source(44, 21) + SourceIndex(0) +7 >Emitted(41, 54) Source(44, 28) + SourceIndex(0) +8 >Emitted(41, 61) Source(64, 2) + SourceIndex(0) --- >>> (function (Widgets) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > 3 > Widgets -1->Emitted(42, 9) Source(44, 21) + SourceIndex(0) +1 >Emitted(42, 9) Source(44, 21) + SourceIndex(0) 2 >Emitted(42, 20) Source(44, 21) + SourceIndex(0) 3 >Emitted(42, 27) Source(44, 28) + SourceIndex(0) --- @@ -924,7 +951,6 @@ sourceFile:recursiveClassReferenceTest.ts 2 > ^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^-> 1-> 2 > FindWidget 3 > implements Sample.Thing.IWidget { @@ -952,148 +978,118 @@ sourceFile:recursiveClassReferenceTest.ts 3 >Emitted(60, 44) Source(63, 3) + SourceIndex(0) 4 >Emitted(60, 45) Source(63, 3) + SourceIndex(0) --- ->>> })(Widgets = Thing.Widgets || (Thing.Widgets = {})); -1->^^^^^^^^ +>>> })(Widgets); +1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > Widgets -5 > -6 > Widgets -7 > -8 > Widgets -9 > { - > export class FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } - > } -1->Emitted(61, 9) Source(64, 1) + SourceIndex(0) +5 > { + > export class FindWidget implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } + > } +1 >Emitted(61, 9) Source(64, 1) + SourceIndex(0) 2 >Emitted(61, 10) Source(64, 2) + SourceIndex(0) 3 >Emitted(61, 12) Source(44, 21) + SourceIndex(0) 4 >Emitted(61, 19) Source(44, 28) + SourceIndex(0) -5 >Emitted(61, 22) Source(44, 21) + SourceIndex(0) -6 >Emitted(61, 35) Source(44, 28) + SourceIndex(0) -7 >Emitted(61, 40) Source(44, 21) + SourceIndex(0) -8 >Emitted(61, 53) Source(44, 28) + SourceIndex(0) -9 >Emitted(61, 61) Source(64, 2) + SourceIndex(0) +5 >Emitted(61, 21) Source(64, 2) + SourceIndex(0) --- ->>> })(Thing = Sample.Thing || (Sample.Thing = {})); +>>> })(Thing); 1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ 1 > 2 > } 3 > 4 > Thing -5 > -6 > Thing -7 > -8 > Thing -9 > .Widgets { - > export class FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } - > } +5 > .Widgets { + > export class FindWidget implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } + > } 1 >Emitted(62, 5) Source(64, 1) + SourceIndex(0) 2 >Emitted(62, 6) Source(64, 2) + SourceIndex(0) 3 >Emitted(62, 8) Source(44, 15) + SourceIndex(0) 4 >Emitted(62, 13) Source(44, 20) + SourceIndex(0) -5 >Emitted(62, 16) Source(44, 15) + SourceIndex(0) -6 >Emitted(62, 28) Source(44, 20) + SourceIndex(0) -7 >Emitted(62, 33) Source(44, 15) + SourceIndex(0) -8 >Emitted(62, 45) Source(44, 20) + SourceIndex(0) -9 >Emitted(62, 53) Source(64, 2) + SourceIndex(0) +5 >Emitted(62, 15) Source(64, 2) + SourceIndex(0) --- ->>>})(Sample || (Sample = {})); +>>>})(Sample); 1 > 2 >^ 3 > ^^ 4 > ^^^^^^ -5 > ^^^^^ -6 > ^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >} 3 > 4 > Sample -5 > -6 > Sample -7 > .Thing.Widgets { - > export class FindWidget implements Sample.Thing.IWidget { - > - > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} - > - > private domNode:any = null; - > constructor(private codeThing: Sample.Thing.ICodeThing) { - > // scenario 1 - > codeThing.addWidget("addWidget", this); - > } - > - > public getDomNode() { - > return domNode; - > } - > - > public destroy() { - > - > } - > - > } - > } +5 > .Thing.Widgets { + > export class FindWidget implements Sample.Thing.IWidget { + > + > public gar(runner:(widget:Sample.Thing.IWidget)=>any) { if (true) {return runner(this);}} + > + > private domNode:any = null; + > constructor(private codeThing: Sample.Thing.ICodeThing) { + > // scenario 1 + > codeThing.addWidget("addWidget", this); + > } + > + > public getDomNode() { + > return domNode; + > } + > + > public destroy() { + > + > } + > + > } + > } 1 >Emitted(63, 1) Source(64, 1) + SourceIndex(0) 2 >Emitted(63, 2) Source(64, 2) + SourceIndex(0) 3 >Emitted(63, 4) Source(44, 8) + SourceIndex(0) 4 >Emitted(63, 10) Source(44, 14) + SourceIndex(0) -5 >Emitted(63, 15) Source(44, 8) + SourceIndex(0) -6 >Emitted(63, 21) Source(44, 14) + SourceIndex(0) -7 >Emitted(63, 29) Source(64, 2) + SourceIndex(0) +5 >Emitted(63, 12) Source(64, 2) + SourceIndex(0) --- >>>var AbstractMode = /** @class */ (function () { 1-> @@ -1175,6 +1171,7 @@ sourceFile:recursiveClassReferenceTest.ts 1-> 2 >^^^^^^^^^^^ 3 > ^^^^^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > >interface IState {} @@ -1191,155 +1188,189 @@ sourceFile:recursiveClassReferenceTest.ts 2 >Emitted(70, 12) Source(76, 8) + SourceIndex(0) 3 >Emitted(70, 18) Source(76, 14) + SourceIndex(0) --- ->>> var Thing; -1 >^^^^ +>>> var Thing = Sample.Thing || (Sample.Thing = {}); +1->^^^^ 2 > ^^^^ 3 > ^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Thing -4 > .Languages.PlainText { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } -1 >Emitted(71, 5) Source(76, 15) + SourceIndex(0) +4 > +5 > Thing +6 > +7 > Thing +8 > .Languages.PlainText { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } +1->Emitted(71, 5) Source(76, 15) + SourceIndex(0) 2 >Emitted(71, 9) Source(76, 15) + SourceIndex(0) 3 >Emitted(71, 14) Source(76, 20) + SourceIndex(0) -4 >Emitted(71, 15) Source(100, 2) + SourceIndex(0) +4 >Emitted(71, 17) Source(76, 15) + SourceIndex(0) +5 >Emitted(71, 29) Source(76, 20) + SourceIndex(0) +6 >Emitted(71, 34) Source(76, 15) + SourceIndex(0) +7 >Emitted(71, 46) Source(76, 20) + SourceIndex(0) +8 >Emitted(71, 53) Source(100, 2) + SourceIndex(0) --- >>> (function (Thing) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^ -4 > ^^^-> -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > 3 > Thing -1->Emitted(72, 5) Source(76, 15) + SourceIndex(0) +1 >Emitted(72, 5) Source(76, 15) + SourceIndex(0) 2 >Emitted(72, 16) Source(76, 15) + SourceIndex(0) 3 >Emitted(72, 21) Source(76, 20) + SourceIndex(0) --- ->>> var Languages; +>>> var Languages = Thing.Languages || (Thing.Languages = {}); 1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^ +8 > ^^^^^^^ 1->. 2 > 3 > Languages -4 > .PlainText { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } +4 > +5 > Languages +6 > +7 > Languages +8 > .PlainText { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } 1->Emitted(73, 9) Source(76, 21) + SourceIndex(0) 2 >Emitted(73, 13) Source(76, 21) + SourceIndex(0) 3 >Emitted(73, 22) Source(76, 30) + SourceIndex(0) -4 >Emitted(73, 23) Source(100, 2) + SourceIndex(0) +4 >Emitted(73, 25) Source(76, 21) + SourceIndex(0) +5 >Emitted(73, 40) Source(76, 30) + SourceIndex(0) +6 >Emitted(73, 45) Source(76, 21) + SourceIndex(0) +7 >Emitted(73, 60) Source(76, 30) + SourceIndex(0) +8 >Emitted(73, 67) Source(100, 2) + SourceIndex(0) --- >>> (function (Languages) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > 3 > Languages -1->Emitted(74, 9) Source(76, 21) + SourceIndex(0) +1 >Emitted(74, 9) Source(76, 21) + SourceIndex(0) 2 >Emitted(74, 20) Source(76, 21) + SourceIndex(0) 3 >Emitted(74, 29) Source(76, 30) + SourceIndex(0) --- ->>> var PlainText; -1 >^^^^^^^^^^^^ +>>> var PlainText = Languages.PlainText || (Languages.PlainText = {}); +1->^^^^^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > PlainText -4 > { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } -1 >Emitted(75, 13) Source(76, 31) + SourceIndex(0) +4 > +5 > PlainText +6 > +7 > PlainText +8 > { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } +1->Emitted(75, 13) Source(76, 31) + SourceIndex(0) 2 >Emitted(75, 17) Source(76, 31) + SourceIndex(0) 3 >Emitted(75, 26) Source(76, 40) + SourceIndex(0) -4 >Emitted(75, 27) Source(100, 2) + SourceIndex(0) +4 >Emitted(75, 29) Source(76, 31) + SourceIndex(0) +5 >Emitted(75, 48) Source(76, 40) + SourceIndex(0) +6 >Emitted(75, 53) Source(76, 31) + SourceIndex(0) +7 >Emitted(75, 72) Source(76, 40) + SourceIndex(0) +8 >Emitted(75, 79) Source(100, 2) + SourceIndex(0) --- >>> (function (PlainText) { -1->^^^^^^^^^^^^ +1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > 3 > PlainText -1->Emitted(76, 13) Source(76, 31) + SourceIndex(0) +1 >Emitted(76, 13) Source(76, 31) + SourceIndex(0) 2 >Emitted(76, 24) Source(76, 31) + SourceIndex(0) 3 >Emitted(76, 33) Source(76, 40) + SourceIndex(0) --- @@ -1713,7 +1744,6 @@ sourceFile:recursiveClassReferenceTest.ts 2 > ^^^^^^^^^^^^^^ 3 > ^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > Mode 3 > extends AbstractMode { @@ -1731,212 +1761,170 @@ sourceFile:recursiveClassReferenceTest.ts 3 >Emitted(102, 38) Source(99, 3) + SourceIndex(0) 4 >Emitted(102, 39) Source(99, 3) + SourceIndex(0) --- ->>> })(PlainText = Languages.PlainText || (Languages.PlainText = {})); -1->^^^^^^^^^^^^ +>>> })(PlainText); +1 >^^^^^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > PlainText -5 > -6 > PlainText -7 > -8 > PlainText -9 > { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } -1->Emitted(103, 13) Source(100, 1) + SourceIndex(0) +5 > { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } +1 >Emitted(103, 13) Source(100, 1) + SourceIndex(0) 2 >Emitted(103, 14) Source(100, 2) + SourceIndex(0) 3 >Emitted(103, 16) Source(76, 31) + SourceIndex(0) 4 >Emitted(103, 25) Source(76, 40) + SourceIndex(0) -5 >Emitted(103, 28) Source(76, 31) + SourceIndex(0) -6 >Emitted(103, 47) Source(76, 40) + SourceIndex(0) -7 >Emitted(103, 52) Source(76, 31) + SourceIndex(0) -8 >Emitted(103, 71) Source(76, 40) + SourceIndex(0) -9 >Emitted(103, 79) Source(100, 2) + SourceIndex(0) +5 >Emitted(103, 27) Source(100, 2) + SourceIndex(0) --- ->>> })(Languages = Thing.Languages || (Thing.Languages = {})); +>>> })(Languages); 1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ 1 > 2 > } 3 > 4 > Languages -5 > -6 > Languages -7 > -8 > Languages -9 > .PlainText { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } +5 > .PlainText { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } 1 >Emitted(104, 9) Source(100, 1) + SourceIndex(0) 2 >Emitted(104, 10) Source(100, 2) + SourceIndex(0) 3 >Emitted(104, 12) Source(76, 21) + SourceIndex(0) 4 >Emitted(104, 21) Source(76, 30) + SourceIndex(0) -5 >Emitted(104, 24) Source(76, 21) + SourceIndex(0) -6 >Emitted(104, 39) Source(76, 30) + SourceIndex(0) -7 >Emitted(104, 44) Source(76, 21) + SourceIndex(0) -8 >Emitted(104, 59) Source(76, 30) + SourceIndex(0) -9 >Emitted(104, 67) Source(100, 2) + SourceIndex(0) +5 >Emitted(104, 23) Source(100, 2) + SourceIndex(0) --- ->>> })(Thing = Sample.Thing || (Sample.Thing = {})); +>>> })(Thing); 1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ 1 > 2 > } 3 > 4 > Thing -5 > -6 > Thing -7 > -8 > Thing -9 > .Languages.PlainText { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } +5 > .Languages.PlainText { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } 1 >Emitted(105, 5) Source(100, 1) + SourceIndex(0) 2 >Emitted(105, 6) Source(100, 2) + SourceIndex(0) 3 >Emitted(105, 8) Source(76, 15) + SourceIndex(0) 4 >Emitted(105, 13) Source(76, 20) + SourceIndex(0) -5 >Emitted(105, 16) Source(76, 15) + SourceIndex(0) -6 >Emitted(105, 28) Source(76, 20) + SourceIndex(0) -7 >Emitted(105, 33) Source(76, 15) + SourceIndex(0) -8 >Emitted(105, 45) Source(76, 20) + SourceIndex(0) -9 >Emitted(105, 53) Source(100, 2) + SourceIndex(0) +5 >Emitted(105, 15) Source(100, 2) + SourceIndex(0) --- ->>>})(Sample || (Sample = {})); +>>>})(Sample); 1 > 2 >^ 3 > ^^ 4 > ^^^^^^ -5 > ^^^^^ -6 > ^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >} 3 > 4 > Sample -5 > -6 > Sample -7 > .Thing.Languages.PlainText { - > - > export class State implements IState { - > constructor(private mode: IMode) { } - > public clone():IState { - > return this; - > } - > - > public equals(other:IState):boolean { - > return this === other; - > } - > - > public getMode(): IMode { return mode; } - > } - > - > export class Mode extends AbstractMode { - > - > // scenario 2 - > public getInitialState(): IState { - > return new State(self); - > } - > - > - > } - > } +5 > .Thing.Languages.PlainText { + > + > export class State implements IState { + > constructor(private mode: IMode) { } + > public clone():IState { + > return this; + > } + > + > public equals(other:IState):boolean { + > return this === other; + > } + > + > public getMode(): IMode { return mode; } + > } + > + > export class Mode extends AbstractMode { + > + > // scenario 2 + > public getInitialState(): IState { + > return new State(self); + > } + > + > + > } + > } 1 >Emitted(106, 1) Source(100, 1) + SourceIndex(0) 2 >Emitted(106, 2) Source(100, 2) + SourceIndex(0) 3 >Emitted(106, 4) Source(76, 8) + SourceIndex(0) 4 >Emitted(106, 10) Source(76, 14) + SourceIndex(0) -5 >Emitted(106, 15) Source(76, 8) + SourceIndex(0) -6 >Emitted(106, 21) Source(76, 14) + SourceIndex(0) -7 >Emitted(106, 29) Source(100, 2) + SourceIndex(0) +5 >Emitted(106, 12) Source(100, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=recursiveClassReferenceTest.js.map \ No newline at end of file diff --git a/tests/baselines/reference/recursiveCloduleReference.js b/tests/baselines/reference/recursiveCloduleReference.js index 76e42327b5aac..395f8fe1cf1ac 100644 --- a/tests/baselines/reference/recursiveCloduleReference.js +++ b/tests/baselines/reference/recursiveCloduleReference.js @@ -11,7 +11,7 @@ module M //// [recursiveCloduleReference.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -21,7 +21,7 @@ var M; M.C = C; (function (C_1) { C_1.C = M.C; - })(C = M.C || (M.C = {})); + })(C); ; -})(M || (M = {})); +})(M); ; diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js index 772b561e9a6fb..72c6e2c2b310c 100644 --- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.js +++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.js @@ -17,7 +17,7 @@ module M { //// [recursiveIdenticalOverloadResolution.js] -var M; +var M = M || (M = {}); (function (M) { function f(p) { return f; } ; @@ -25,4 +25,4 @@ var M; f(i); f(f(i)); f((f(f(i)))); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js index 180fd8455ea01..dc3c53ba1ebc5 100644 --- a/tests/baselines/reference/recursiveMods.js +++ b/tests/baselines/reference/recursiveMods.js @@ -26,7 +26,7 @@ export module Foo { //// [recursiveMods.js] "use strict"; exports.__esModule = true; -var Foo; +var Foo = {}; (function (Foo) { var C = /** @class */ (function () { function C() { @@ -34,7 +34,7 @@ var Foo; return C; }()); Foo.C = C; -})(Foo = exports.Foo || (exports.Foo = {})); +})(Foo); (function (Foo) { function Bar() { if (true) { @@ -50,4 +50,4 @@ var Foo; var c = Baz(); return; } -})(Foo = exports.Foo || (exports.Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js index dc623923c6a05..280148f5f1ce8 100644 --- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js +++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js @@ -43,13 +43,13 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var MsPortal; +var MsPortal = MsPortal || (MsPortal = {}); (function (MsPortal) { - var Controls; + var Controls = MsPortal.Controls || (MsPortal.Controls = {}); (function (Controls) { - var Base; + var Base = Controls.Base || (Controls.Base = {}); (function (Base) { - var ItemList; + var ItemList = Base.ItemList || (Base.ItemList = {}); (function (ItemList) { var ItemValue = /** @class */ (function () { function ItemValue(value) { @@ -65,10 +65,10 @@ var MsPortal; return ViewModel; }(ItemValue)); ItemList.ViewModel = ViewModel; - })(ItemList = Base.ItemList || (Base.ItemList = {})); - })(Base = Controls.Base || (Controls.Base = {})); - })(Controls = MsPortal.Controls || (MsPortal.Controls = {})); -})(MsPortal || (MsPortal = {})); + })(ItemList); + })(Base); + })(Controls); +})(MsPortal); // Generates: /* declare module MsPortal.Controls.Base.ItemList { diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js index daef539e7de39..1ac6bc31aa754 100644 --- a/tests/baselines/reference/requireEmitSemicolon.js +++ b/tests/baselines/reference/requireEmitSemicolon.js @@ -23,7 +23,7 @@ export module Database { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var Models; + var Models = {}; (function (Models) { var Person = /** @class */ (function () { function Person(name) { @@ -31,13 +31,13 @@ define(["require", "exports"], function (require, exports) { return Person; }()); Models.Person = Person; - })(Models = exports.Models || (exports.Models = {})); + })(Models); }); //// [requireEmitSemicolon_1.js] define(["require", "exports", "requireEmitSemicolon_0"], function (require, exports, P) { "use strict"; exports.__esModule = true; - var Database; + var Database = {}; (function (Database) { var DB = /** @class */ (function () { function DB() { @@ -48,5 +48,5 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo return DB; }()); Database.DB = DB; - })(Database = exports.Database || (exports.Database = {})); + })(Database); }); diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index f172f37d05396..68f1764efefd2 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -36,5 +36,5 @@ if () ; [1, 2]; (function () { -})( || ( = {})); +})(); void {}; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 23229f93543ee..54c580237b6bd 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -1033,7 +1033,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var rionegrensis; +var rionegrensis = rionegrensis || (rionegrensis = {}); (function (rionegrensis) { var caniventer = /** @class */ (function (_super) { __extends(caniventer, _super); @@ -1111,8 +1111,8 @@ var rionegrensis; return veraecrucis; }(trivirgatus.mixtus)); rionegrensis.veraecrucis = veraecrucis; -})(rionegrensis || (rionegrensis = {})); -var julianae; +})(rionegrensis); +var julianae = julianae || (julianae = {}); (function (julianae) { var steerii = /** @class */ (function () { function steerii() { @@ -1564,8 +1564,8 @@ var julianae; return durangae; }(dogramacii.aurata)); julianae.durangae = durangae; -})(julianae || (julianae = {})); -var ruatanica; +})(julianae); +var ruatanica = ruatanica || (ruatanica = {}); (function (ruatanica) { var hector = /** @class */ (function () { function hector() { @@ -1585,8 +1585,8 @@ var ruatanica; return hector; }()); ruatanica.hector = hector; -})(ruatanica || (ruatanica = {})); -var Lanthanum; +})(ruatanica); +var Lanthanum = Lanthanum || (Lanthanum = {}); (function (Lanthanum) { var suillus = /** @class */ (function () { function suillus() { @@ -1826,8 +1826,8 @@ var Lanthanum; return jugularis; }()); Lanthanum.jugularis = jugularis; -})(Lanthanum || (Lanthanum = {})); -var rendalli; +})(Lanthanum); +var rendalli = rendalli || (rendalli = {}); (function (rendalli) { var zuluensis = /** @class */ (function (_super) { __extends(zuluensis, _super); @@ -2013,8 +2013,8 @@ var rendalli; return crenulata; }(trivirgatus.falconeri)); rendalli.crenulata = crenulata; -})(rendalli || (rendalli = {})); -var trivirgatus; +})(rendalli); +var trivirgatus = trivirgatus || (trivirgatus = {}); (function (trivirgatus) { var tumidifrons = /** @class */ (function () { function tumidifrons() { @@ -2276,8 +2276,8 @@ var trivirgatus; return oconnelli; }()); trivirgatus.oconnelli = oconnelli; -})(trivirgatus || (trivirgatus = {})); -var quasiater; +})(trivirgatus); +var quasiater = quasiater || (quasiater = {}); (function (quasiater) { var bobrinskoi = /** @class */ (function () { function bobrinskoi() { @@ -2309,7 +2309,7 @@ var quasiater; return bobrinskoi; }()); quasiater.bobrinskoi = bobrinskoi; -})(quasiater || (quasiater = {})); +})(quasiater); (function (ruatanica) { var americanus = /** @class */ (function (_super) { __extends(americanus, _super); @@ -2343,8 +2343,8 @@ var quasiater; return americanus; }(imperfecta.ciliolabrum)); ruatanica.americanus = americanus; -})(ruatanica || (ruatanica = {})); -var lavali; +})(ruatanica); +var lavali = lavali || (lavali = {}); (function (lavali) { var wilsoni = /** @class */ (function (_super) { __extends(wilsoni, _super); @@ -2678,8 +2678,8 @@ var lavali; return lepturus; }(Lanthanum.suillus)); lavali.lepturus = lepturus; -})(lavali || (lavali = {})); -var dogramacii; +})(lavali); +var dogramacii = dogramacii || (dogramacii = {}); (function (dogramacii) { var robustulus = /** @class */ (function (_super) { __extends(robustulus, _super); @@ -2893,8 +2893,8 @@ var dogramacii; return aurata; }()); dogramacii.aurata = aurata; -})(dogramacii || (dogramacii = {})); -var lutreolus; +})(dogramacii); +var lutreolus = lutreolus || (lutreolus = {}); (function (lutreolus) { var schlegeli = /** @class */ (function (_super) { __extends(schlegeli, _super); @@ -2988,8 +2988,8 @@ var lutreolus; return schlegeli; }(lavali.beisa)); lutreolus.schlegeli = schlegeli; -})(lutreolus || (lutreolus = {})); -var argurus; +})(lutreolus); +var argurus = argurus || (argurus = {}); (function (argurus) { var dauricus = /** @class */ (function () { function dauricus() { @@ -3063,8 +3063,8 @@ var argurus; return dauricus; }()); argurus.dauricus = dauricus; -})(argurus || (argurus = {})); -var nigra; +})(argurus); +var nigra = nigra || (nigra = {}); (function (nigra) { var dolichurus = /** @class */ (function () { function dolichurus() { @@ -3120,8 +3120,8 @@ var nigra; return dolichurus; }()); nigra.dolichurus = dolichurus; -})(nigra || (nigra = {})); -var panglima; +})(nigra); +var panglima = panglima || (panglima = {}); (function (panglima) { var amphibius = /** @class */ (function (_super) { __extends(amphibius, _super); @@ -3231,7 +3231,7 @@ var panglima; return abidi; }(argurus.dauricus)); panglima.abidi = abidi; -})(panglima || (panglima = {})); +})(panglima); (function (quasiater) { var carolinensis = /** @class */ (function () { function carolinensis() { @@ -3281,8 +3281,8 @@ var panglima; return carolinensis; }()); quasiater.carolinensis = carolinensis; -})(quasiater || (quasiater = {})); -var minutus; +})(quasiater); +var minutus = minutus || (minutus = {}); (function (minutus) { var himalayana = /** @class */ (function (_super) { __extends(himalayana, _super); @@ -3364,8 +3364,8 @@ var minutus; return himalayana; }(lutreolus.punicus)); minutus.himalayana = himalayana; -})(minutus || (minutus = {})); -var caurinus; +})(minutus); +var caurinus = caurinus || (caurinus = {}); (function (caurinus) { var mahaganus = /** @class */ (function (_super) { __extends(mahaganus, _super); @@ -3423,8 +3423,8 @@ var caurinus; return mahaganus; }(panglima.fundatus)); caurinus.mahaganus = mahaganus; -})(caurinus || (caurinus = {})); -var macrorhinos; +})(caurinus); +var macrorhinos = macrorhinos || (macrorhinos = {}); (function (macrorhinos) { var marmosurus = /** @class */ (function () { function marmosurus() { @@ -3438,8 +3438,8 @@ var macrorhinos; return marmosurus; }()); macrorhinos.marmosurus = marmosurus; -})(macrorhinos || (macrorhinos = {})); -var howi; +})(macrorhinos); +var howi = howi || (howi = {}); (function (howi) { var angulatus = /** @class */ (function (_super) { __extends(angulatus, _super); @@ -3455,8 +3455,8 @@ var howi; return angulatus; }(sagitta.stolzmanni)); howi.angulatus = angulatus; -})(howi || (howi = {})); -var daubentonii; +})(howi); +var daubentonii = daubentonii || (daubentonii = {}); (function (daubentonii) { var nesiotes = /** @class */ (function () { function nesiotes() { @@ -3464,7 +3464,7 @@ var daubentonii; return nesiotes; }()); daubentonii.nesiotes = nesiotes; -})(daubentonii || (daubentonii = {})); +})(daubentonii); (function (nigra) { var thalia = /** @class */ (function () { function thalia() { @@ -3520,8 +3520,8 @@ var daubentonii; return thalia; }()); nigra.thalia = thalia; -})(nigra || (nigra = {})); -var sagitta; +})(nigra); +var sagitta = sagitta || (sagitta = {}); (function (sagitta) { var walkeri = /** @class */ (function (_super) { __extends(walkeri, _super); @@ -3537,7 +3537,7 @@ var sagitta; return walkeri; }(minutus.portoricensis)); sagitta.walkeri = walkeri; -})(sagitta || (sagitta = {})); +})(sagitta); (function (minutus) { var inez = /** @class */ (function (_super) { __extends(inez, _super); @@ -3553,7 +3553,7 @@ var sagitta; return inez; }(samarensis.pelurus)); minutus.inez = inez; -})(minutus || (minutus = {})); +})(minutus); (function (macrorhinos) { var konganensis = /** @class */ (function (_super) { __extends(konganensis, _super); @@ -3563,8 +3563,8 @@ var sagitta; return konganensis; }(imperfecta.lasiurus)); macrorhinos.konganensis = konganensis; -})(macrorhinos || (macrorhinos = {})); -var panamensis; +})(macrorhinos); +var panamensis = panamensis || (panamensis = {}); (function (panamensis) { var linulus = /** @class */ (function (_super) { __extends(linulus, _super); @@ -3628,7 +3628,7 @@ var panamensis; return linulus; }(ruatanica.hector)); panamensis.linulus = linulus; -})(panamensis || (panamensis = {})); +})(panamensis); (function (nigra) { var gracilis = /** @class */ (function () { function gracilis() { @@ -3714,8 +3714,8 @@ var panamensis; return gracilis; }()); nigra.gracilis = gracilis; -})(nigra || (nigra = {})); -var samarensis; +})(nigra); +var samarensis = samarensis || (samarensis = {}); (function (samarensis) { var pelurus = /** @class */ (function (_super) { __extends(pelurus, _super); @@ -3961,7 +3961,7 @@ var samarensis; return cahirinus; }()); samarensis.cahirinus = cahirinus; -})(samarensis || (samarensis = {})); +})(samarensis); (function (sagitta) { var leptoceros = /** @class */ (function (_super) { __extends(leptoceros, _super); @@ -4001,7 +4001,7 @@ var samarensis; return leptoceros; }(caurinus.johorensis)); sagitta.leptoceros = leptoceros; -})(sagitta || (sagitta = {})); +})(sagitta); (function (daubentonii) { var nigricans = /** @class */ (function (_super) { __extends(nigricans, _super); @@ -4017,8 +4017,8 @@ var samarensis; return nigricans; }(sagitta.stolzmanni)); daubentonii.nigricans = nigricans; -})(daubentonii || (daubentonii = {})); -var dammermani; +})(daubentonii); +var dammermani = dammermani || (dammermani = {}); (function (dammermani) { var siberu = /** @class */ (function () { function siberu() { @@ -4026,7 +4026,7 @@ var dammermani; return siberu; }()); dammermani.siberu = siberu; -})(dammermani || (dammermani = {})); +})(dammermani); (function (argurus) { var pygmaea = /** @class */ (function (_super) { __extends(pygmaea, _super); @@ -4054,8 +4054,8 @@ var dammermani; return pygmaea; }(rendalli.moojeni)); argurus.pygmaea = pygmaea; -})(argurus || (argurus = {})); -var chrysaeolus; +})(argurus); +var chrysaeolus = chrysaeolus || (chrysaeolus = {}); (function (chrysaeolus) { var sarasinorum = /** @class */ (function (_super) { __extends(sarasinorum, _super); @@ -4107,7 +4107,7 @@ var chrysaeolus; return sarasinorum; }(caurinus.psilurus)); chrysaeolus.sarasinorum = sarasinorum; -})(chrysaeolus || (chrysaeolus = {})); +})(chrysaeolus); (function (argurus) { var wetmorei = /** @class */ (function () { function wetmorei() { @@ -4157,7 +4157,7 @@ var chrysaeolus; return wetmorei; }()); argurus.wetmorei = wetmorei; -})(argurus || (argurus = {})); +})(argurus); (function (argurus) { var oreas = /** @class */ (function (_super) { __extends(oreas, _super); @@ -4215,7 +4215,7 @@ var chrysaeolus; return oreas; }(lavali.wilsoni)); argurus.oreas = oreas; -})(argurus || (argurus = {})); +})(argurus); (function (daubentonii) { var arboreus = /** @class */ (function () { function arboreus() { @@ -4295,8 +4295,8 @@ var chrysaeolus; return arboreus; }()); daubentonii.arboreus = arboreus; -})(daubentonii || (daubentonii = {})); -var patas; +})(daubentonii); +var patas = patas || (patas = {}); (function (patas) { var uralensis = /** @class */ (function () { function uralensis() { @@ -4382,8 +4382,8 @@ var patas; return uralensis; }()); patas.uralensis = uralensis; -})(patas || (patas = {})); -var provocax; +})(patas); +var provocax = provocax || (provocax = {}); (function (provocax) { var melanoleuca = /** @class */ (function (_super) { __extends(melanoleuca, _super); @@ -4405,7 +4405,7 @@ var provocax; return melanoleuca; }(lavali.wilsoni)); provocax.melanoleuca = melanoleuca; -})(provocax || (provocax = {})); +})(provocax); (function (sagitta) { var sicarius = /** @class */ (function () { function sicarius() { @@ -4425,7 +4425,7 @@ var provocax; return sicarius; }()); sagitta.sicarius = sicarius; -})(sagitta || (sagitta = {})); +})(sagitta); (function (howi) { var marcanoi = /** @class */ (function (_super) { __extends(marcanoi, _super); @@ -4519,7 +4519,7 @@ var provocax; return marcanoi; }(Lanthanum.megalonyx)); howi.marcanoi = marcanoi; -})(howi || (howi = {})); +})(howi); (function (argurus) { var gilbertii = /** @class */ (function () { function gilbertii() { @@ -4599,8 +4599,8 @@ var provocax; return gilbertii; }()); argurus.gilbertii = gilbertii; -})(argurus || (argurus = {})); -var petrophilus; +})(argurus); +var petrophilus = petrophilus || (petrophilus = {}); (function (petrophilus) { var minutilla = /** @class */ (function () { function minutilla() { @@ -4608,7 +4608,7 @@ var petrophilus; return minutilla; }()); petrophilus.minutilla = minutilla; -})(petrophilus || (petrophilus = {})); +})(petrophilus); (function (lutreolus) { var punicus = /** @class */ (function () { function punicus() { @@ -4694,7 +4694,7 @@ var petrophilus; return punicus; }()); lutreolus.punicus = punicus; -})(lutreolus || (lutreolus = {})); +})(lutreolus); (function (macrorhinos) { var daphaenodon = /** @class */ (function () { function daphaenodon() { @@ -4738,7 +4738,7 @@ var petrophilus; return daphaenodon; }()); macrorhinos.daphaenodon = daphaenodon; -})(macrorhinos || (macrorhinos = {})); +})(macrorhinos); (function (sagitta) { var cinereus = /** @class */ (function () { function cinereus() { @@ -4818,7 +4818,7 @@ var petrophilus; return cinereus; }()); sagitta.cinereus = cinereus; -})(sagitta || (sagitta = {})); +})(sagitta); (function (nigra) { var caucasica = /** @class */ (function () { function caucasica() { @@ -4826,8 +4826,8 @@ var petrophilus; return caucasica; }()); nigra.caucasica = caucasica; -})(nigra || (nigra = {})); -var gabriellae; +})(nigra); +var gabriellae = gabriellae || (gabriellae = {}); (function (gabriellae) { var klossii = /** @class */ (function (_super) { __extends(klossii, _super); @@ -4915,8 +4915,8 @@ var gabriellae; return echinatus; }()); gabriellae.echinatus = echinatus; -})(gabriellae || (gabriellae = {})); -var imperfecta; +})(gabriellae); +var imperfecta = imperfecta || (imperfecta = {}); (function (imperfecta) { var lasiurus = /** @class */ (function () { function lasiurus() { @@ -5058,7 +5058,7 @@ var imperfecta; return ciliolabrum; }(dogramacii.robustulus)); imperfecta.ciliolabrum = ciliolabrum; -})(imperfecta || (imperfecta = {})); +})(imperfecta); (function (quasiater) { var wattsi = /** @class */ (function () { function wattsi() { @@ -5090,7 +5090,7 @@ var imperfecta; return wattsi; }()); quasiater.wattsi = wattsi; -})(quasiater || (quasiater = {})); +})(quasiater); (function (petrophilus) { var sodyi = /** @class */ (function (_super) { __extends(sodyi, _super); @@ -5154,7 +5154,7 @@ var imperfecta; return sodyi; }(quasiater.bobrinskoi)); petrophilus.sodyi = sodyi; -})(petrophilus || (petrophilus = {})); +})(petrophilus); (function (caurinus) { var megaphyllus = /** @class */ (function (_super) { __extends(megaphyllus, _super); @@ -5212,7 +5212,7 @@ var imperfecta; return megaphyllus; }(imperfecta.lasiurus)); caurinus.megaphyllus = megaphyllus; -})(caurinus || (caurinus = {})); +})(caurinus); (function (minutus) { var portoricensis = /** @class */ (function () { function portoricensis() { @@ -5238,7 +5238,7 @@ var imperfecta; return portoricensis; }()); minutus.portoricensis = portoricensis; -})(minutus || (minutus = {})); +})(minutus); (function (lutreolus) { var foina = /** @class */ (function () { function foina() { @@ -5324,7 +5324,7 @@ var imperfecta; return foina; }()); lutreolus.foina = foina; -})(lutreolus || (lutreolus = {})); +})(lutreolus); (function (lutreolus) { var cor = /** @class */ (function (_super) { __extends(cor, _super); @@ -5394,7 +5394,7 @@ var imperfecta; return cor; }(panglima.fundatus)); lutreolus.cor = cor; -})(lutreolus || (lutreolus = {})); +})(lutreolus); (function (howi) { var coludo = /** @class */ (function () { function coludo() { @@ -5414,7 +5414,7 @@ var imperfecta; return coludo; }()); howi.coludo = coludo; -})(howi || (howi = {})); +})(howi); (function (argurus) { var germaini = /** @class */ (function (_super) { __extends(germaini, _super); @@ -5436,7 +5436,7 @@ var imperfecta; return germaini; }(gabriellae.amicus)); argurus.germaini = germaini; -})(argurus || (argurus = {})); +})(argurus); (function (sagitta) { var stolzmanni = /** @class */ (function () { function stolzmanni() { @@ -5510,7 +5510,7 @@ var imperfecta; return stolzmanni; }()); sagitta.stolzmanni = stolzmanni; -})(sagitta || (sagitta = {})); +})(sagitta); (function (dammermani) { var melanops = /** @class */ (function (_super) { __extends(melanops, _super); @@ -5598,7 +5598,7 @@ var imperfecta; return melanops; }(minutus.inez)); dammermani.melanops = melanops; -})(dammermani || (dammermani = {})); +})(dammermani); (function (argurus) { var peninsulae = /** @class */ (function (_super) { __extends(peninsulae, _super); @@ -5656,7 +5656,7 @@ var imperfecta; return peninsulae; }(patas.uralensis)); argurus.peninsulae = peninsulae; -})(argurus || (argurus = {})); +})(argurus); (function (argurus) { var netscheri = /** @class */ (function () { function netscheri() { @@ -5742,7 +5742,7 @@ var imperfecta; return netscheri; }()); argurus.netscheri = netscheri; -})(argurus || (argurus = {})); +})(argurus); (function (ruatanica) { var Praseodymium = /** @class */ (function (_super) { __extends(Praseodymium, _super); @@ -5830,7 +5830,7 @@ var imperfecta; return Praseodymium; }(ruatanica.hector)); ruatanica.Praseodymium = Praseodymium; -})(ruatanica || (ruatanica = {})); +})(ruatanica); (function (caurinus) { var johorensis = /** @class */ (function (_super) { __extends(johorensis, _super); @@ -5846,7 +5846,7 @@ var imperfecta; return johorensis; }(lutreolus.punicus)); caurinus.johorensis = johorensis; -})(caurinus || (caurinus = {})); +})(caurinus); (function (argurus) { var luctuosa = /** @class */ (function () { function luctuosa() { @@ -5860,7 +5860,7 @@ var imperfecta; return luctuosa; }()); argurus.luctuosa = luctuosa; -})(argurus || (argurus = {})); +})(argurus); (function (panamensis) { var setulosus = /** @class */ (function () { function setulosus() { @@ -5916,7 +5916,7 @@ var imperfecta; return setulosus; }()); panamensis.setulosus = setulosus; -})(panamensis || (panamensis = {})); +})(panamensis); (function (petrophilus) { var rosalia = /** @class */ (function () { function rosalia() { @@ -5954,7 +5954,7 @@ var imperfecta; return rosalia; }()); petrophilus.rosalia = rosalia; -})(petrophilus || (petrophilus = {})); +})(petrophilus); (function (caurinus) { var psilurus = /** @class */ (function (_super) { __extends(psilurus, _super); @@ -6000,7 +6000,7 @@ var imperfecta; return psilurus; }(lutreolus.punicus)); caurinus.psilurus = psilurus; -})(caurinus || (caurinus = {})); +})(caurinus); //// [resolvingClassDeclarationWhenInBaseTypeResolution.d.ts] diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js index 75b52a8c6e81c..61fab1e641c25 100644 --- a/tests/baselines/reference/restInvalidArgumentType.js +++ b/tests/baselines/reference/restInvalidArgumentType.js @@ -65,11 +65,11 @@ var __rest = (this && this.__rest) || function (s, e) { t[p[i]] = s[p[i]]; return t; }; -var E; +var E = E || (E = {}); (function (E) { E[E["v1"] = 0] = "v1"; E[E["v2"] = 1] = "v2"; -})(E || (E = {})); +})(E); ; function f(p1, p2) { var t; diff --git a/tests/baselines/reference/returnTypeParameterWithModules.js b/tests/baselines/reference/returnTypeParameterWithModules.js index 4790fe1341b94..a5fd0b3ddab83 100644 --- a/tests/baselines/reference/returnTypeParameterWithModules.js +++ b/tests/baselines/reference/returnTypeParameterWithModules.js @@ -15,16 +15,16 @@ module M2 { }; //// [returnTypeParameterWithModules.js] -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { function reduce(ar, f, e) { return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]); } M1.reduce = reduce; ; -})(M1 || (M1 = {})); +})(M1); ; -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var A = M1; function compose() { @@ -37,5 +37,5 @@ var M2; } M2.compose2 = compose2; ; -})(M2 || (M2 = {})); +})(M2); ; diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js index d432daed2a721..3521b109a876d 100644 --- a/tests/baselines/reference/reuseInnerModuleMember.js +++ b/tests/baselines/reference/reuseInnerModuleMember.js @@ -22,7 +22,7 @@ exports.__esModule = true; "use strict"; exports.__esModule = true; /// -var bar; +var bar = {}; (function (bar) { var x; -})(bar || (bar = {})); +})(bar); diff --git a/tests/baselines/reference/scannerEnum1.js b/tests/baselines/reference/scannerEnum1.js index 75c182206b942..e920b5eb686ff 100644 --- a/tests/baselines/reference/scannerEnum1.js +++ b/tests/baselines/reference/scannerEnum1.js @@ -7,8 +7,8 @@ //// [scannerEnum1.js] "use strict"; exports.__esModule = true; -var CodeGenTarget; +var CodeGenTarget = {}; (function (CodeGenTarget) { CodeGenTarget[CodeGenTarget["ES3"] = 0] = "ES3"; CodeGenTarget[CodeGenTarget["ES5"] = 1] = "ES5"; -})(CodeGenTarget = exports.CodeGenTarget || (exports.CodeGenTarget = {})); +})(CodeGenTarget); diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.js b/tests/baselines/reference/scopeResolutionIdentifiers.js index 0ffbee0734029..75f5222aa9094 100644 --- a/tests/baselines/reference/scopeResolutionIdentifiers.js +++ b/tests/baselines/reference/scopeResolutionIdentifiers.js @@ -41,17 +41,17 @@ module M3 { //// [scopeResolutionIdentifiers.js] // EveryType used in a nested scope of a different EveryType with the same name, type of the identifier is the one defined in the inner scope var s; -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { var n = M1.s; var n; -})(M1 || (M1 = {})); -var M2; +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { var s; var n = s; var n; -})(M2 || (M2 = {})); +})(M2); function fn() { var s; var n = s; @@ -67,12 +67,12 @@ var C = /** @class */ (function () { }; return C; }()); -var M3; +var M3 = M3 || (M3 = {}); (function (M3) { var s; - var M4; + var M4 = M4 || (M4 = {}); (function (M4) { var n = s; var n; - })(M4 || (M4 = {})); -})(M3 || (M3 = {})); + })(M4); +})(M3); diff --git a/tests/baselines/reference/selfRef.js b/tests/baselines/reference/selfRef.js index 696bf298b9696..7dd7da836909a 100644 --- a/tests/baselines/reference/selfRef.js +++ b/tests/baselines/reference/selfRef.js @@ -19,7 +19,7 @@ module M //// [selfRef.js] -var M; +var M = M || (M = {}); (function (M) { var Test = /** @class */ (function () { function Test() { @@ -36,4 +36,4 @@ var M; return Test; }()); M.Test = Test; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/separate1-2.js b/tests/baselines/reference/separate1-2.js index 6ef155ca0f4f0..e6b9560857d02 100644 --- a/tests/baselines/reference/separate1-2.js +++ b/tests/baselines/reference/separate1-2.js @@ -4,8 +4,8 @@ module X { } //// [separate1-2.js] -var X; +var X = X || (X = {}); (function (X) { function f() { } X.f = f; -})(X || (X = {})); +})(X); diff --git a/tests/baselines/reference/shadowedInternalModule.js b/tests/baselines/reference/shadowedInternalModule.js index 5d8e33d5eeb6c..d85bb6277faf2 100644 --- a/tests/baselines/reference/shadowedInternalModule.js +++ b/tests/baselines/reference/shadowedInternalModule.js @@ -35,15 +35,15 @@ module Z { //// [shadowedInternalModule.js] // all errors imported modules conflict with local variables -var A; +var A = A || (A = {}); (function (A) { A.Point = { x: 0, y: 0 }; -})(A || (A = {})); -var B; +})(A); +var B = B || (B = {}); (function (B) { var A = { x: 0, y: 0 }; -})(B || (B = {})); -var X; +})(B); +var X = X || (X = {}); (function (X) { var Y = /** @class */ (function () { function Y() { @@ -51,8 +51,8 @@ var X; return Y; }()); X.Y = Y; -})(X || (X = {})); -var Z; +})(X); +var Z = Z || (Z = {}); (function (Z) { var Y = 12; -})(Z || (Z = {})); +})(Z); diff --git a/tests/baselines/reference/sourceMap-Comments.js b/tests/baselines/reference/sourceMap-Comments.js index 7db1fe70349af..c66794f2a57c9 100644 --- a/tests/baselines/reference/sourceMap-Comments.js +++ b/tests/baselines/reference/sourceMap-Comments.js @@ -21,9 +21,9 @@ module sas.tools { //// [sourceMap-Comments.js] -var sas; +var sas = sas || (sas = {}); (function (sas) { - var tools; + var tools = sas.tools || (sas.tools = {}); (function (tools) { var Test = /** @class */ (function () { function Test() { @@ -45,6 +45,6 @@ var sas; return Test; }()); tools.Test = Test; - })(tools = sas.tools || (sas.tools = {})); -})(sas || (sas = {})); + })(tools); +})(sas); //# sourceMappingURL=sourceMap-Comments.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-Comments.js.map b/tests/baselines/reference/sourceMap-Comments.js.map index a349925353d12..0cb1e79ca0420 100644 --- a/tests/baselines/reference/sourceMap-Comments.js.map +++ b/tests/baselines/reference/sourceMap-Comments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-Comments.js.map] -{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,CAkBf;IAlBU,WAAA,KAAK;QACZ;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,QAAQ,CAAC,EAAE;oBACP,KAAK,CAAC;wBACF,MAAM;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,MAAM;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,MAAM;iBACb;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,GAAL,SAAK,KAAL,SAAK,QAkBf;AAAD,CAAC,EAlBM,GAAG,KAAH,GAAG,QAkBT"} \ No newline at end of file +{"version":3,"file":"sourceMap-Comments.js","sourceRoot":"","sources":["sourceMap-Comments.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,GAAH,GAAG,KAAH,GAAG,OAkBT;AAlBD,WAAO,GAAG;IAAC,IAAA,KAAK,GAAL,SAAK,KAAL,SAAK,OAkBf;IAlBU,WAAA,KAAK;QACZ;YAAA;YAeA,CAAC;YAdU,kBAAG,GAAV;gBACI,IAAI,CAAC,GAAW,CAAC,CAAC;gBAClB,QAAQ,CAAC,EAAE;oBACP,KAAK,CAAC;wBACF,MAAM;oBACV,KAAK,CAAC;wBACF,gBAAgB;wBAChB,gBAAgB;wBAChB,MAAM;oBACV,KAAK,CAAC;wBACF,WAAW;wBACX,MAAM;iBACb;YACL,CAAC;YACL,WAAC;QAAD,CAAC,AAfD,IAeC;QAfY,UAAI,OAehB,CAAA;IAEL,CAAC,EAlBU,KAAK,EAkBf;AAAD,CAAC,EAlBM,GAAG,EAkBT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt index ad3301e314a41..a7e9a3d4af25f 100644 --- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt @@ -8,93 +8,115 @@ sources: sourceMap-Comments.ts emittedFile:tests/cases/compiler/sourceMap-Comments.js sourceFile:sourceMap-Comments.ts ------------------------------------------------------------------- ->>>var sas; +>>>var sas = sas || (sas = {}); 1 > 2 >^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ 1 > 2 >module 3 > sas -4 > .tools { - > export class Test { - > public doX(): void { - > let f: number = 2; - > switch (f) { - > case 1: - > break; - > case 2: - > //line comment 1 - > //line comment 2 - > break; - > case 3: - > //a comment - > break; - > } - > } - > } - > - > } +4 > +5 > sas +6 > +7 > sas +8 > .tools { + > export class Test { + > public doX(): void { + > let f: number = 2; + > switch (f) { + > case 1: + > break; + > case 2: + > //line comment 1 + > //line comment 2 + > break; + > case 3: + > //a comment + > break; + > } + > } + > } + > + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) -4 >Emitted(1, 9) Source(19, 2) + SourceIndex(0) +4 >Emitted(1, 11) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 14) Source(1, 11) + SourceIndex(0) +6 >Emitted(1, 19) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 22) Source(1, 11) + SourceIndex(0) +8 >Emitted(1, 29) Source(19, 2) + SourceIndex(0) --- >>>(function (sas) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^ -4 > ^-> -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 >module 3 > sas -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) --- ->>> var tools; +>>> var tools = sas.tools || (sas.tools = {}); 1->^^^^ 2 > ^^^^ 3 > ^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^ +8 > ^^^^^^^ 1->. 2 > 3 > tools -4 > { - > export class Test { - > public doX(): void { - > let f: number = 2; - > switch (f) { - > case 1: - > break; - > case 2: - > //line comment 1 - > //line comment 2 - > break; - > case 3: - > //a comment - > break; - > } - > } - > } - > - > } +4 > +5 > tools +6 > +7 > tools +8 > { + > export class Test { + > public doX(): void { + > let f: number = 2; + > switch (f) { + > case 1: + > break; + > case 2: + > //line comment 1 + > //line comment 2 + > break; + > case 3: + > //a comment + > break; + > } + > } + > } + > + > } 1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) 3 >Emitted(3, 14) Source(1, 17) + SourceIndex(0) -4 >Emitted(3, 15) Source(19, 2) + SourceIndex(0) +4 >Emitted(3, 17) Source(1, 12) + SourceIndex(0) +5 >Emitted(3, 26) Source(1, 17) + SourceIndex(0) +6 >Emitted(3, 31) Source(1, 12) + SourceIndex(0) +7 >Emitted(3, 40) Source(1, 17) + SourceIndex(0) +8 >Emitted(3, 47) Source(19, 2) + SourceIndex(0) --- >>> (function (tools) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > 3 > tools -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +1 >Emitted(4, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) 3 >Emitted(4, 21) Source(1, 17) + SourceIndex(0) --- @@ -338,7 +360,6 @@ sourceFile:sourceMap-Comments.ts 2 > ^^^^^^^^^^ 3 > ^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > Test 3 > { @@ -363,95 +384,77 @@ sourceFile:sourceMap-Comments.ts 3 >Emitted(24, 26) Source(17, 6) + SourceIndex(0) 4 >Emitted(24, 27) Source(17, 6) + SourceIndex(0) --- ->>> })(tools = sas.tools || (sas.tools = {})); -1->^^^^ +>>> })(tools); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^ -5 > ^^^ -6 > ^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > > 2 > } 3 > 4 > tools -5 > -6 > tools -7 > -8 > tools -9 > { - > export class Test { - > public doX(): void { - > let f: number = 2; - > switch (f) { - > case 1: - > break; - > case 2: - > //line comment 1 - > //line comment 2 - > break; - > case 3: - > //a comment - > break; - > } - > } - > } - > - > } -1->Emitted(25, 5) Source(19, 1) + SourceIndex(0) +5 > { + > export class Test { + > public doX(): void { + > let f: number = 2; + > switch (f) { + > case 1: + > break; + > case 2: + > //line comment 1 + > //line comment 2 + > break; + > case 3: + > //a comment + > break; + > } + > } + > } + > + > } +1 >Emitted(25, 5) Source(19, 1) + SourceIndex(0) 2 >Emitted(25, 6) Source(19, 2) + SourceIndex(0) 3 >Emitted(25, 8) Source(1, 12) + SourceIndex(0) 4 >Emitted(25, 13) Source(1, 17) + SourceIndex(0) -5 >Emitted(25, 16) Source(1, 12) + SourceIndex(0) -6 >Emitted(25, 25) Source(1, 17) + SourceIndex(0) -7 >Emitted(25, 30) Source(1, 12) + SourceIndex(0) -8 >Emitted(25, 39) Source(1, 17) + SourceIndex(0) -9 >Emitted(25, 47) Source(19, 2) + SourceIndex(0) +5 >Emitted(25, 15) Source(19, 2) + SourceIndex(0) --- ->>>})(sas || (sas = {})); +>>>})(sas); 1 > 2 >^ 3 > ^^ 4 > ^^^ -5 > ^^^^^ -6 > ^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >} 3 > 4 > sas -5 > -6 > sas -7 > .tools { - > export class Test { - > public doX(): void { - > let f: number = 2; - > switch (f) { - > case 1: - > break; - > case 2: - > //line comment 1 - > //line comment 2 - > break; - > case 3: - > //a comment - > break; - > } - > } +5 > .tools { + > export class Test { + > public doX(): void { + > let f: number = 2; + > switch (f) { + > case 1: + > break; + > case 2: + > //line comment 1 + > //line comment 2 + > break; + > case 3: + > //a comment + > break; > } - > - > } + > } + > } + > + > } 1 >Emitted(26, 1) Source(19, 1) + SourceIndex(0) 2 >Emitted(26, 2) Source(19, 2) + SourceIndex(0) 3 >Emitted(26, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(26, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(26, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(26, 15) Source(1, 11) + SourceIndex(0) -7 >Emitted(26, 23) Source(19, 2) + SourceIndex(0) +5 >Emitted(26, 9) Source(19, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-Comments.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js index dc76921c0389f..ac7af4d17b694 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js +++ b/tests/baselines/reference/sourceMap-FileWithComments.js @@ -37,7 +37,7 @@ var dist = p.getDist(); //// [sourceMap-FileWithComments.js] // Module -var Shapes; +var Shapes = Shapes || (Shapes = {}); (function (Shapes) { // Class var Point = /** @class */ (function () { @@ -62,7 +62,7 @@ var Shapes; * this is another comment */ var b = 10; -})(Shapes || (Shapes = {})); +})(Shapes); /** Local Variable */ var p = new Shapes.Point(3, 4); var dist = p.getDist(); diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map index 058789636a4cb..119012eda38d2 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.js.map +++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map @@ -1,2 +1,2 @@ //// [sourceMap-FileWithComments.js.map] -{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAKA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAET,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;KAAA,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX,SAAgB,GAAG;IACnB,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":[],"mappings":"AAKA,SAAS;AACT,IAAO,MAAM,GAAN,MAAM,KAAN,MAAM,OAwBZ;AAxBD,WAAO,MAAM;IAET,QAAQ;IACR;QACI,cAAc;QACd,eAAmB,CAAS,EAAS,CAAS;YAA3B,MAAC,GAAD,CAAC,CAAQ;YAAS,MAAC,GAAD,CAAC,CAAQ;QAAI,CAAC;QAEnD,kBAAkB;QAClB,uBAAO,GAAP,cAAY,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,gBAAgB;QACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,YAAC;KAAA,AATD,IASC;IATY,YAAK,QASjB,CAAA;IAED,+BAA+B;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;IAEX,SAAgB,GAAG;IACnB,CAAC;IADe,UAAG,MAClB,CAAA;IAED;;MAEE;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;AACf,CAAC,EAxBM,MAAM,EAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt index 508930720659a..b2901717d5fda 100644 --- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt @@ -11,7 +11,7 @@ sourceFile:sourceMap-FileWithComments.ts >>>// Module 1 > 2 >^^^^^^^^^ -3 > ^^^-> +3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >// Interface >interface IPoint { > getDist(): number; @@ -22,54 +22,65 @@ sourceFile:sourceMap-FileWithComments.ts 1 >Emitted(1, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(1, 10) Source(6, 10) + SourceIndex(0) --- ->>>var Shapes; +>>>var Shapes = Shapes || (Shapes = {}); 1-> 2 >^^^^ 3 > ^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^ +6 > ^^^^^ +7 > ^^^^^^ +8 > ^^^^^^^ 1-> > 2 >module 3 > Shapes -4 > { - > - > // Class - > export class Point implements IPoint { - > // Constructor - > constructor(public x: number, public y: number) { } - > - > // Instance member - > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } - > - > // Static member - > static origin = new Point(0, 0); - > } - > - > // Variable comment after class - > var a = 10; - > - > export function foo() { - > } - > - > /** comment after function - > * this is another comment - > */ - > var b = 10; - > } +4 > +5 > Shapes +6 > +7 > Shapes +8 > { + > + > // Class + > export class Point implements IPoint { + > // Constructor + > constructor(public x: number, public y: number) { } + > + > // Instance member + > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } + > + > // Static member + > static origin = new Point(0, 0); + > } + > + > // Variable comment after class + > var a = 10; + > + > export function foo() { + > } + > + > /** comment after function + > * this is another comment + > */ + > var b = 10; + > } 1->Emitted(2, 1) Source(7, 1) + SourceIndex(0) 2 >Emitted(2, 5) Source(7, 8) + SourceIndex(0) 3 >Emitted(2, 11) Source(7, 14) + SourceIndex(0) -4 >Emitted(2, 12) Source(31, 2) + SourceIndex(0) +4 >Emitted(2, 14) Source(7, 8) + SourceIndex(0) +5 >Emitted(2, 20) Source(7, 14) + SourceIndex(0) +6 >Emitted(2, 25) Source(7, 8) + SourceIndex(0) +7 >Emitted(2, 31) Source(7, 14) + SourceIndex(0) +8 >Emitted(2, 38) Source(31, 2) + SourceIndex(0) --- >>>(function (Shapes) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^^^^ -1-> +1 > 2 >module 3 > Shapes -1->Emitted(3, 1) Source(7, 1) + SourceIndex(0) +1 >Emitted(3, 1) Source(7, 1) + SourceIndex(0) 2 >Emitted(3, 12) Source(7, 8) + SourceIndex(0) 3 >Emitted(3, 18) Source(7, 14) + SourceIndex(0) --- @@ -457,7 +468,6 @@ sourceFile:sourceMap-FileWithComments.ts 4 > ^^^ 5 > ^^ 6 > ^ -7 > ^^^^^^^^^^^^^^-> 1-> > 2 > var @@ -472,63 +482,58 @@ sourceFile:sourceMap-FileWithComments.ts 5 >Emitted(26, 15) Source(30, 15) + SourceIndex(0) 6 >Emitted(26, 16) Source(30, 16) + SourceIndex(0) --- ->>>})(Shapes || (Shapes = {})); -1-> +>>>})(Shapes); +1 > 2 >^ 3 > ^^ 4 > ^^^^^^ -5 > ^^^^^ -6 > ^^^^^^ -7 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > Shapes -5 > -6 > Shapes -7 > { - > - > // Class - > export class Point implements IPoint { - > // Constructor - > constructor(public x: number, public y: number) { } - > - > // Instance member - > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } - > - > // Static member - > static origin = new Point(0, 0); - > } - > - > // Variable comment after class - > var a = 10; - > - > export function foo() { - > } - > - > /** comment after function - > * this is another comment - > */ - > var b = 10; - > } -1->Emitted(27, 1) Source(31, 1) + SourceIndex(0) +5 > { + > + > // Class + > export class Point implements IPoint { + > // Constructor + > constructor(public x: number, public y: number) { } + > + > // Instance member + > getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); } + > + > // Static member + > static origin = new Point(0, 0); + > } + > + > // Variable comment after class + > var a = 10; + > + > export function foo() { + > } + > + > /** comment after function + > * this is another comment + > */ + > var b = 10; + > } +1 >Emitted(27, 1) Source(31, 1) + SourceIndex(0) 2 >Emitted(27, 2) Source(31, 2) + SourceIndex(0) 3 >Emitted(27, 4) Source(7, 8) + SourceIndex(0) 4 >Emitted(27, 10) Source(7, 14) + SourceIndex(0) -5 >Emitted(27, 15) Source(7, 8) + SourceIndex(0) -6 >Emitted(27, 21) Source(7, 14) + SourceIndex(0) -7 >Emitted(27, 29) Source(31, 2) + SourceIndex(0) +5 >Emitted(27, 12) Source(31, 2) + SourceIndex(0) --- >>>/** Local Variable */ -1 > +1-> 2 >^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^-> -1 > +1-> > > 2 >/** Local Variable */ -1 >Emitted(28, 1) Source(33, 1) + SourceIndex(0) +1->Emitted(28, 1) Source(33, 1) + SourceIndex(0) 2 >Emitted(28, 22) Source(33, 22) + SourceIndex(0) --- >>>var p = new Shapes.Point(3, 4); diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js index 3404a5ee04c15..5521e0ad65e5c 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js @@ -14,11 +14,11 @@ isn't this a lot of fun"; } //// [sourceMap-StringLiteralWithNewLine.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { var x = "test1"; var y = "test 2\ isn't this a lot of fun"; var z = window.document; -})(Foo || (Foo = {})); +})(Foo); //# sourceMappingURL=sourceMap-StringLiteralWithNewLine.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map index 003b442399eb9..1534bab7cc873 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.js.map @@ -1,2 +1,2 @@ //// [sourceMap-StringLiteralWithNewLine.js.map] -{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAOA,IAAO,GAAG,CAKT;AALD,WAAO,GAAG;IACN,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,KAAH,GAAG,QAKT"} \ No newline at end of file +{"version":3,"file":"sourceMap-StringLiteralWithNewLine.js","sourceRoot":"","sources":["sourceMap-StringLiteralWithNewLine.ts"],"names":[],"mappings":"AAOA,IAAO,GAAG,GAAH,GAAG,KAAH,GAAG,OAKT;AALD,WAAO,GAAG;IACN,IAAI,CAAC,GAAG,OAAO,CAAC;IAChB,IAAI,CAAC,GAAG;wBACY,CAAC;IACrB,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;AAC5B,CAAC,EALM,GAAG,EAKT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt index f7f0607ba0102..460ae0957e356 100644 --- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt +++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.sourcemap.txt @@ -8,12 +8,15 @@ sources: sourceMap-StringLiteralWithNewLine.ts emittedFile:tests/cases/compiler/sourceMap-StringLiteralWithNewLine.js sourceFile:sourceMap-StringLiteralWithNewLine.ts ------------------------------------------------------------------- ->>>var Foo; +>>>var Foo = Foo || (Foo = {}); 1 > 2 >^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ 1 >interface Document { >} >interface Window { @@ -24,26 +27,34 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts > 2 >module 3 > Foo -4 > { - > var x = "test1"; - > var y = "test 2\ - > isn't this a lot of fun"; - > var z = window.document; - > } +4 > +5 > Foo +6 > +7 > Foo +8 > { + > var x = "test1"; + > var y = "test 2\ + > isn't this a lot of fun"; + > var z = window.document; + > } 1 >Emitted(1, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(8, 8) + SourceIndex(0) 3 >Emitted(1, 8) Source(8, 11) + SourceIndex(0) -4 >Emitted(1, 9) Source(13, 2) + SourceIndex(0) +4 >Emitted(1, 11) Source(8, 8) + SourceIndex(0) +5 >Emitted(1, 14) Source(8, 11) + SourceIndex(0) +6 >Emitted(1, 19) Source(8, 8) + SourceIndex(0) +7 >Emitted(1, 22) Source(8, 11) + SourceIndex(0) +8 >Emitted(1, 29) Source(13, 2) + SourceIndex(0) --- >>>(function (Foo) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^ 4 > ^^^^^^^-> -1-> +1 > 2 >module 3 > Foo -1->Emitted(2, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(8, 8) + SourceIndex(0) 3 >Emitted(2, 15) Source(8, 11) + SourceIndex(0) --- @@ -121,34 +132,28 @@ sourceFile:sourceMap-StringLiteralWithNewLine.ts 7 >Emitted(6, 28) Source(12, 28) + SourceIndex(0) 8 >Emitted(6, 29) Source(12, 29) + SourceIndex(0) --- ->>>})(Foo || (Foo = {})); +>>>})(Foo); 1 > 2 >^ 3 > ^^ 4 > ^^^ -5 > ^^^^^ -6 > ^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > Foo -5 > -6 > Foo -7 > { - > var x = "test1"; - > var y = "test 2\ - > isn't this a lot of fun"; - > var z = window.document; - > } +5 > { + > var x = "test1"; + > var y = "test 2\ + > isn't this a lot of fun"; + > var z = window.document; + > } 1 >Emitted(7, 1) Source(13, 1) + SourceIndex(0) 2 >Emitted(7, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(7, 4) Source(8, 8) + SourceIndex(0) 4 >Emitted(7, 7) Source(8, 11) + SourceIndex(0) -5 >Emitted(7, 12) Source(8, 8) + SourceIndex(0) -6 >Emitted(7, 15) Source(8, 11) + SourceIndex(0) -7 >Emitted(7, 23) Source(13, 2) + SourceIndex(0) +5 >Emitted(7, 9) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMap-StringLiteralWithNewLine.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js index 4e894fb99ad30..ffaa4fb22a8ae 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js @@ -7,11 +7,11 @@ module Q { } //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js] -var Q; +var Q = Q || (Q = {}); (function (Q) { function P() { // Test this var a = 1; } -})(Q || (Q = {})); +})(Q); //# sourceMappingURL=sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map index dfff2c0285603..8752d54d6d1a5 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map @@ -1,2 +1,2 @@ //// [sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map] -{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC;IACJ,SAAS,CAAC;QACN,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,KAAD,CAAC,QAKP"} \ No newline at end of file +{"version":3,"file":"sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js","sourceRoot":"","sources":["sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,GAAD,CAAC,KAAD,CAAC,OAKP;AALD,WAAO,CAAC;IACJ,SAAS,CAAC;QACN,YAAY;QACZ,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;AACL,CAAC,EALM,CAAC,EAKP"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt index 6f12152b025ae..3abc9297402a8 100644 --- a/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt +++ b/tests/baselines/reference/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.sourcemap.txt @@ -8,35 +8,46 @@ sources: sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts emittedFile:tests/cases/compiler/sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.ts ------------------------------------------------------------------- ->>>var Q; +>>>var Q = Q || (Q = {}); 1 > 2 >^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +8 > ^^^^^^^ 1 > 2 >module 3 > Q -4 > { - > function P() { - > // Test this - > var a = 1; - > } - > } +4 > +5 > Q +6 > +7 > Q +8 > { + > function P() { + > // Test this + > var a = 1; + > } + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0) -4 >Emitted(1, 7) Source(6, 2) + SourceIndex(0) +4 >Emitted(1, 9) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 10) Source(1, 9) + SourceIndex(0) +6 >Emitted(1, 15) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 16) Source(1, 9) + SourceIndex(0) +8 >Emitted(1, 23) Source(6, 2) + SourceIndex(0) --- >>>(function (Q) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^^-> -1-> +1 > 2 >module 3 > Q -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0) --- @@ -86,41 +97,35 @@ sourceFile:sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.t >>> } 1 >^^^^ 2 > ^ -3 > ^^^^^^^^^^^^^^-> +3 > ^^-> 1 > > 2 > } 1 >Emitted(6, 5) Source(5, 5) + SourceIndex(0) 2 >Emitted(6, 6) Source(5, 6) + SourceIndex(0) --- ->>>})(Q || (Q = {})); +>>>})(Q); 1-> 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 >} 3 > 4 > Q -5 > -6 > Q -7 > { - > function P() { - > // Test this - > var a = 1; - > } - > } +5 > { + > function P() { + > // Test this + > var a = 1; + > } + > } 1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) 3 >Emitted(7, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(7, 5) Source(1, 9) + SourceIndex(0) -5 >Emitted(7, 10) Source(1, 8) + SourceIndex(0) -6 >Emitted(7, 11) Source(1, 9) + SourceIndex(0) -7 >Emitted(7, 19) Source(6, 2) + SourceIndex(0) +5 >Emitted(7, 7) Source(6, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapForFunctionInInternalModuleWithCommentPrecedingStatement01.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.js b/tests/baselines/reference/sourceMapSample.js index b9ef2611c9b11..d1bbe2f8f54ba 100644 --- a/tests/baselines/reference/sourceMapSample.js +++ b/tests/baselines/reference/sourceMapSample.js @@ -36,9 +36,9 @@ module Foo.Bar { } //// [sourceMapSample.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { - var Bar; + var Bar = Foo.Bar || (Foo.Bar = {}); (function (Bar) { "use strict"; var Greeter = /** @class */ (function () { @@ -71,6 +71,6 @@ var Foo; for (var j = 0; j < b.length; j++) { b[j].greet(); } - })(Bar = Foo.Bar || (Foo.Bar = {})); -})(Foo || (Foo = {})); + })(Bar); +})(Foo); //# sourceMappingURL=sourceMapSample.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map index c07daa666e0e1..8438a39af2745 100644 --- a/tests/baselines/reference/sourceMapSample.js.map +++ b/tests/baselines/reference/sourceMapSample.js.map @@ -1,2 +1,2 @@ //// [sourceMapSample.js.map] -{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAkCb;IAlCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,uBAA0B;iBAA1B,UAA0B,EAA1B,qBAA0B,EAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChD;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC,EAlCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAkCb;AAAD,CAAC,EAlCM,GAAG,KAAH,GAAG,QAkCT"} \ No newline at end of file +{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,GAAH,GAAG,KAAH,GAAG,OAkCT;AAlCD,WAAO,GAAG;IAAC,IAAA,GAAG,GAAH,OAAG,KAAH,OAAG,OAkCb;IAlCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,uBAA0B;iBAA1B,UAA0B,EAA1B,qBAA0B,EAA1B,IAA0B;gBAA1B,sCAA0B;;YACtD,IAAI,QAAQ,GAAc,EAAE,CAAC;YAC7B,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChD;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC,EAlCU,GAAG,EAkCb;AAAD,CAAC,EAlCM,GAAG,EAkCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt index 2266abdd5af8e..930739d48a40a 100644 --- a/tests/baselines/reference/sourceMapSample.sourcemap.txt +++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt @@ -8,124 +8,147 @@ sources: sourceMapSample.ts emittedFile:tests/cases/compiler/sourceMapSample.js sourceFile:sourceMapSample.ts ------------------------------------------------------------------- ->>>var Foo; +>>>var Foo = Foo || (Foo = {}); 1 > 2 >^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ 1 > 2 >module 3 > Foo -4 > .Bar { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Foo.Bar.Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings: string[]) { - > var greeters: Greeter[] = []; - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +4 > +5 > Foo +6 > +7 > Foo +8 > .Bar { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Foo.Bar.Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings: string[]) { + > var greeters: Greeter[] = []; + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) -4 >Emitted(1, 9) Source(35, 2) + SourceIndex(0) +4 >Emitted(1, 11) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 14) Source(1, 11) + SourceIndex(0) +6 >Emitted(1, 19) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 22) Source(1, 11) + SourceIndex(0) +8 >Emitted(1, 29) Source(35, 2) + SourceIndex(0) --- >>>(function (Foo) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 >module 3 > Foo -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) --- ->>> var Bar; -1 >^^^^ +>>> var Bar = Foo.Bar || (Foo.Bar = {}); +1->^^^^ 2 > ^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Bar -4 > { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Foo.Bar.Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings: string[]) { - > var greeters: Greeter[] = []; - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +4 > +5 > Bar +6 > +7 > Bar +8 > { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Foo.Bar.Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings: string[]) { + > var greeters: Greeter[] = []; + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } +1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) 3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) -4 >Emitted(3, 13) Source(35, 2) + SourceIndex(0) +4 >Emitted(3, 15) Source(1, 12) + SourceIndex(0) +5 >Emitted(3, 22) Source(1, 15) + SourceIndex(0) +6 >Emitted(3, 27) Source(1, 12) + SourceIndex(0) +7 >Emitted(3, 34) Source(1, 15) + SourceIndex(0) +8 >Emitted(3, 41) Source(35, 2) + SourceIndex(0) --- >>> (function (Bar) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^ 4 > ^^^^-> -1-> +1 > 2 > 3 > Bar -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +1 >Emitted(4, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) 3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) --- @@ -780,131 +803,113 @@ sourceFile:sourceMapSample.ts --- >>> } 1 >^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^-> 1 > > } 1 >Emitted(35, 10) Source(34, 6) + SourceIndex(0) --- ->>> })(Bar = Foo.Bar || (Foo.Bar = {})); +>>> })(Bar); 1->^^^^ 2 > ^ 3 > ^^ 4 > ^^^ -5 > ^^^ -6 > ^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ 1-> > 2 > } 3 > 4 > Bar -5 > -6 > Bar -7 > -8 > Bar -9 > { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Foo.Bar.Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings: string[]) { - > var greeters: Greeter[] = []; - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +5 > { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Foo.Bar.Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings: string[]) { + > var greeters: Greeter[] = []; + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1->Emitted(36, 5) Source(35, 1) + SourceIndex(0) 2 >Emitted(36, 6) Source(35, 2) + SourceIndex(0) 3 >Emitted(36, 8) Source(1, 12) + SourceIndex(0) 4 >Emitted(36, 11) Source(1, 15) + SourceIndex(0) -5 >Emitted(36, 14) Source(1, 12) + SourceIndex(0) -6 >Emitted(36, 21) Source(1, 15) + SourceIndex(0) -7 >Emitted(36, 26) Source(1, 12) + SourceIndex(0) -8 >Emitted(36, 33) Source(1, 15) + SourceIndex(0) -9 >Emitted(36, 41) Source(35, 2) + SourceIndex(0) +5 >Emitted(36, 13) Source(35, 2) + SourceIndex(0) --- ->>>})(Foo || (Foo = {})); +>>>})(Foo); 1 > 2 >^ 3 > ^^ 4 > ^^^ -5 > ^^^^^ -6 > ^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >} 3 > 4 > Foo -5 > -6 > Foo -7 > .Bar { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Foo.Bar.Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings: string[]) { - > var greeters: Greeter[] = []; - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +5 > .Bar { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Foo.Bar.Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings: string[]) { + > var greeters: Greeter[] = []; + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1 >Emitted(37, 1) Source(35, 1) + SourceIndex(0) 2 >Emitted(37, 2) Source(35, 2) + SourceIndex(0) 3 >Emitted(37, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(37, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(37, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(37, 15) Source(1, 11) + SourceIndex(0) -7 >Emitted(37, 23) Source(35, 2) + SourceIndex(0) +5 >Emitted(37, 9) Source(35, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapSample.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js index b9c3fcdc4316f..c85a3a612c5bd 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js +++ b/tests/baselines/reference/sourceMapValidationClasses.js @@ -37,9 +37,9 @@ module Foo.Bar { } //// [sourceMapValidationClasses.js] -var Foo; +var Foo = Foo || (Foo = {}); (function (Foo) { - var Bar; + var Bar = Foo.Bar || (Foo.Bar = {}); (function (Bar) { "use strict"; var Greeter = /** @class */ (function () { @@ -73,6 +73,6 @@ var Foo; for (var j = 0; j < b.length; j++) { b[j].greet(); } - })(Bar = Foo.Bar || (Foo.Bar = {})); -})(Foo || (Foo = {})); + })(Bar); +})(Foo); //# sourceMappingURL=sourceMapValidationClasses.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map index 58983bc23bfa5..1a8fec8c82d70 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js.map +++ b/tests/baselines/reference/sourceMapValidationClasses.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClasses.js.map] -{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,CAmCb;IAnCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,UAA8C,EAA9C,qBAA8C,EAA9C,IAA8C;gBAA9C,sCAA8C;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChD;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC,EAnCU,GAAG,GAAH,OAAG,KAAH,OAAG,QAmCb;AAAD,CAAC,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,GAAH,GAAG,KAAH,GAAG,OAmCT;AAnCD,WAAO,GAAG;IAAC,IAAA,GAAG,GAAH,OAAG,KAAH,OAAG,OAmCb;IAnCU,WAAA,GAAG;QACV,YAAY,CAAC;QAEb;YACI,iBAAmB,QAAgB;gBAAhB,aAAQ,GAAR,QAAQ,CAAQ;YACnC,CAAC;YAED,uBAAK,GAAL;gBACI,OAAO,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5C,CAAC;YACL,cAAC;QAAD,CAAC,AAPD,IAOC;QAGD,SAAS,GAAG,CAAC,QAAgB;YACzB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAE1B,SAAS,IAAI,CAAC,QAAgB;YAAE,kBAAiB,mBAAmB,MAAU;iBAA9C,UAA8C,EAA9C,qBAA8C,EAA9C,IAA8C;gBAA9C,sCAA8C;;YAC1E,IAAI,QAAQ,GAAc,EAAE,CAAC,CAAC,0BAA0B;YACxD,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAChD;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACpC,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/B,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC,EAnCU,GAAG,EAmCb;AAAD,CAAC,EAnCM,GAAG,EAmCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index 2ba546aa2df45..cf8206d8a81c1 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -8,126 +8,149 @@ sources: sourceMapValidationClasses.ts emittedFile:tests/cases/compiler/sourceMapValidationClasses.js sourceFile:sourceMapValidationClasses.ts ------------------------------------------------------------------- ->>>var Foo; +>>>var Foo = Foo || (Foo = {}); 1 > 2 >^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ 1 > 2 >module 3 > Foo -4 > .Bar { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { - > var greeters: Greeter[] = []; /* inline block comment */ - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > // This is simple signle line comment - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +4 > +5 > Foo +6 > +7 > Foo +8 > .Bar { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { + > var greeters: Greeter[] = []; /* inline block comment */ + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > // This is simple signle line comment + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 8) Source(1, 11) + SourceIndex(0) -4 >Emitted(1, 9) Source(36, 2) + SourceIndex(0) +4 >Emitted(1, 11) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 14) Source(1, 11) + SourceIndex(0) +6 >Emitted(1, 19) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 22) Source(1, 11) + SourceIndex(0) +8 >Emitted(1, 29) Source(36, 2) + SourceIndex(0) --- >>>(function (Foo) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^^ -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 >module 3 > Foo -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 15) Source(1, 11) + SourceIndex(0) --- ->>> var Bar; -1 >^^^^ +>>> var Bar = Foo.Bar || (Foo.Bar = {}); +1->^^^^ 2 > ^^^^ 3 > ^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 >. +4 > ^^^ +5 > ^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^ +8 > ^^^^^^^ +1->. 2 > 3 > Bar -4 > { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { - > var greeters: Greeter[] = []; /* inline block comment */ - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > // This is simple signle line comment - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } -1 >Emitted(3, 5) Source(1, 12) + SourceIndex(0) +4 > +5 > Bar +6 > +7 > Bar +8 > { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { + > var greeters: Greeter[] = []; /* inline block comment */ + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > // This is simple signle line comment + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } +1->Emitted(3, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(3, 9) Source(1, 12) + SourceIndex(0) 3 >Emitted(3, 12) Source(1, 15) + SourceIndex(0) -4 >Emitted(3, 13) Source(36, 2) + SourceIndex(0) +4 >Emitted(3, 15) Source(1, 12) + SourceIndex(0) +5 >Emitted(3, 22) Source(1, 15) + SourceIndex(0) +6 >Emitted(3, 27) Source(1, 12) + SourceIndex(0) +7 >Emitted(3, 34) Source(1, 15) + SourceIndex(0) +8 >Emitted(3, 41) Source(36, 2) + SourceIndex(0) --- >>> (function (Bar) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^ 4 > ^^^^-> -1-> +1 > 2 > 3 > Bar -1->Emitted(4, 5) Source(1, 12) + SourceIndex(0) +1 >Emitted(4, 5) Source(1, 12) + SourceIndex(0) 2 >Emitted(4, 16) Source(1, 12) + SourceIndex(0) 3 >Emitted(4, 19) Source(1, 15) + SourceIndex(0) --- @@ -802,133 +825,115 @@ sourceFile:sourceMapValidationClasses.ts --- >>> } 1 >^^^^^^^^^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +2 > ^^^^-> 1 > > } 1 >Emitted(36, 10) Source(35, 6) + SourceIndex(0) --- ->>> })(Bar = Foo.Bar || (Foo.Bar = {})); +>>> })(Bar); 1->^^^^ 2 > ^ 3 > ^^ 4 > ^^^ -5 > ^^^ -6 > ^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ 1-> > 2 > } 3 > 4 > Bar -5 > -6 > Bar -7 > -8 > Bar -9 > { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { - > var greeters: Greeter[] = []; /* inline block comment */ - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > // This is simple signle line comment - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +5 > { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { + > var greeters: Greeter[] = []; /* inline block comment */ + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > // This is simple signle line comment + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1->Emitted(37, 5) Source(36, 1) + SourceIndex(0) 2 >Emitted(37, 6) Source(36, 2) + SourceIndex(0) 3 >Emitted(37, 8) Source(1, 12) + SourceIndex(0) 4 >Emitted(37, 11) Source(1, 15) + SourceIndex(0) -5 >Emitted(37, 14) Source(1, 12) + SourceIndex(0) -6 >Emitted(37, 21) Source(1, 15) + SourceIndex(0) -7 >Emitted(37, 26) Source(1, 12) + SourceIndex(0) -8 >Emitted(37, 33) Source(1, 15) + SourceIndex(0) -9 >Emitted(37, 41) Source(36, 2) + SourceIndex(0) +5 >Emitted(37, 13) Source(36, 2) + SourceIndex(0) --- ->>>})(Foo || (Foo = {})); +>>>})(Foo); 1 > 2 >^ 3 > ^^ 4 > ^^^ -5 > ^^^^^ -6 > ^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 >} 3 > 4 > Foo -5 > -6 > Foo -7 > .Bar { - > "use strict"; - > - > class Greeter { - > constructor(public greeting: string) { - > } - > - > greet() { - > return "

" + this.greeting + "

"; - > } - > } - > - > - > function foo(greeting: string): Greeter { - > return new Greeter(greeting); - > } - > - > var greeter = new Greeter("Hello, world!"); - > var str = greeter.greet(); - > - > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { - > var greeters: Greeter[] = []; /* inline block comment */ - > greeters[0] = new Greeter(greeting); - > for (var i = 0; i < restGreetings.length; i++) { - > greeters.push(new Greeter(restGreetings[i])); - > } - > - > return greeters; - > } - > - > var b = foo2("Hello", "World", "!"); - > // This is simple signle line comment - > for (var j = 0; j < b.length; j++) { - > b[j].greet(); - > } - > } +5 > .Bar { + > "use strict"; + > + > class Greeter { + > constructor(public greeting: string) { + > } + > + > greet() { + > return "

" + this.greeting + "

"; + > } + > } + > + > + > function foo(greeting: string): Greeter { + > return new Greeter(greeting); + > } + > + > var greeter = new Greeter("Hello, world!"); + > var str = greeter.greet(); + > + > function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) { + > var greeters: Greeter[] = []; /* inline block comment */ + > greeters[0] = new Greeter(greeting); + > for (var i = 0; i < restGreetings.length; i++) { + > greeters.push(new Greeter(restGreetings[i])); + > } + > + > return greeters; + > } + > + > var b = foo2("Hello", "World", "!"); + > // This is simple signle line comment + > for (var j = 0; j < b.length; j++) { + > b[j].greet(); + > } + > } 1 >Emitted(38, 1) Source(36, 1) + SourceIndex(0) 2 >Emitted(38, 2) Source(36, 2) + SourceIndex(0) 3 >Emitted(38, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(38, 7) Source(1, 11) + SourceIndex(0) -5 >Emitted(38, 12) Source(1, 8) + SourceIndex(0) -6 >Emitted(38, 15) Source(1, 11) + SourceIndex(0) -7 >Emitted(38, 23) Source(36, 2) + SourceIndex(0) +5 >Emitted(38, 9) Source(36, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationClasses.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationEnums.js b/tests/baselines/reference/sourceMapValidationEnums.js index 49027a4bad27c..6cf52f386a729 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.js +++ b/tests/baselines/reference/sourceMapValidationEnums.js @@ -14,20 +14,20 @@ enum e3 { } //// [sourceMapValidationEnums.js] -var e; +var e = e || (e = {}); (function (e) { e[e["x"] = 0] = "x"; e[e["y"] = 1] = "y"; e[e["x"] = 2] = "x"; -})(e || (e = {})); -var e2; +})(e); +var e2 = e2 || (e2 = {}); (function (e2) { e2[e2["x"] = 10] = "x"; e2[e2["y"] = 10] = "y"; e2[e2["z"] = 11] = "z"; e2[e2["x2"] = 12] = "x2"; -})(e2 || (e2 = {})); -var e3; +})(e2); +var e3 = e3 || (e3 = {}); (function (e3) { -})(e3 || (e3 = {})); +})(e3); //# sourceMappingURL=sourceMapValidationEnums.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationEnums.js.map b/tests/baselines/reference/sourceMapValidationEnums.js.map index 9b1ad5bf1571d..f54adc0e0b5f0 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.js.map +++ b/tests/baselines/reference/sourceMapValidationEnums.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationEnums.js.map] -{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":[],"mappings":"AAAA,IAAK,CAIJ;AAJD,WAAK,CAAC;IACF,mBAAC,CAAA;IACD,mBAAC,CAAA;IACD,mBAAC,CAAA;AACL,CAAC,EAJI,CAAC,KAAD,CAAC,QAIL;AACD,IAAK,EAKJ;AALD,WAAK,EAAE;IACH,sBAAM,CAAA;IACN,sBAAM,CAAA;IACN,sBAAC,CAAA;IACD,wBAAE,CAAA;AACN,CAAC,EALI,EAAE,KAAF,EAAE,QAKN;AACD,IAAK,EACJ;AADD,WAAK,EAAE;AACP,CAAC,EADI,EAAE,KAAF,EAAE,QACN"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationEnums.js","sourceRoot":"","sources":["sourceMapValidationEnums.ts"],"names":[],"mappings":"AAAA,IAAK,CAAC,GAAD,CAAC,KAAD,CAAC,MAIL;AAJD,WAAK,CAAC;IACF,mBAAC,CAAA;IACD,mBAAC,CAAA;IACD,mBAAC,CAAA;AACL,CAAC,EAJI,CAAC,EAIL;AACD,IAAK,EAAE,GAAF,EAAE,KAAF,EAAE,MAKN;AALD,WAAK,EAAE;IACH,sBAAM,CAAA;IACN,sBAAM,CAAA;IACN,sBAAC,CAAA;IACD,wBAAE,CAAA;AACN,CAAC,EALI,EAAE,EAKN;AACD,IAAK,EAAE,GAAF,EAAE,KAAF,EAAE,MACN;AADD,WAAK,EAAE;AACP,CAAC,EADI,EAAE,EACN"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt b/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt index 4fb651552767c..e1896050be884 100644 --- a/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationEnums.sourcemap.txt @@ -8,31 +8,45 @@ sources: sourceMapValidationEnums.ts emittedFile:tests/cases/compiler/sourceMapValidationEnums.js sourceFile:sourceMapValidationEnums.ts ------------------------------------------------------------------- ->>>var e; +>>>var e = e || (e = {}); 1 > 2 >^^^^ 3 > ^ -4 > ^^^^^^^^^^^-> +4 > ^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +8 > ^^^^^^ 1 > 2 >enum -3 > e { - > x, - > y, - > x - > } +3 > e +4 > +5 > e +6 > +7 > e +8 > { + > x, + > y, + > x + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 6) + SourceIndex(0) -3 >Emitted(1, 6) Source(5, 2) + SourceIndex(0) +3 >Emitted(1, 6) Source(1, 7) + SourceIndex(0) +4 >Emitted(1, 9) Source(1, 6) + SourceIndex(0) +5 >Emitted(1, 10) Source(1, 7) + SourceIndex(0) +6 >Emitted(1, 15) Source(1, 6) + SourceIndex(0) +7 >Emitted(1, 16) Source(1, 7) + SourceIndex(0) +8 >Emitted(1, 22) Source(5, 2) + SourceIndex(0) --- >>>(function (e) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^^^^^^^^-> -1-> +1 > 2 >enum 3 > e -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 6) + SourceIndex(0) 3 >Emitted(2, 13) Source(1, 7) + SourceIndex(0) --- @@ -74,61 +88,70 @@ sourceFile:sourceMapValidationEnums.ts 2 >Emitted(5, 24) Source(4, 6) + SourceIndex(0) 3 >Emitted(5, 25) Source(4, 6) + SourceIndex(0) --- ->>>})(e || (e = {})); +>>>})(e); 1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > e -5 > -6 > e -7 > { - > x, - > y, - > x - > } +5 > { + > x, + > y, + > x + > } 1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(6, 4) Source(1, 6) + SourceIndex(0) 4 >Emitted(6, 5) Source(1, 7) + SourceIndex(0) -5 >Emitted(6, 10) Source(1, 6) + SourceIndex(0) -6 >Emitted(6, 11) Source(1, 7) + SourceIndex(0) -7 >Emitted(6, 19) Source(5, 2) + SourceIndex(0) +5 >Emitted(6, 7) Source(5, 2) + SourceIndex(0) --- ->>>var e2; -1 > +>>>var e2 = e2 || (e2 = {}); +1-> 2 >^^^^ 3 > ^^ -4 > ^^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^ +1-> > 2 >enum -3 > e2 { - > x = 10, - > y = 10, - > z, - > x2 - > } -1 >Emitted(7, 1) Source(6, 1) + SourceIndex(0) +3 > e2 +4 > +5 > e2 +6 > +7 > e2 +8 > { + > x = 10, + > y = 10, + > z, + > x2 + > } +1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(7, 5) Source(6, 6) + SourceIndex(0) -3 >Emitted(7, 7) Source(11, 2) + SourceIndex(0) +3 >Emitted(7, 7) Source(6, 8) + SourceIndex(0) +4 >Emitted(7, 10) Source(6, 6) + SourceIndex(0) +5 >Emitted(7, 12) Source(6, 8) + SourceIndex(0) +6 >Emitted(7, 17) Source(6, 6) + SourceIndex(0) +7 >Emitted(7, 19) Source(6, 8) + SourceIndex(0) +8 >Emitted(7, 25) Source(11, 2) + SourceIndex(0) --- >>>(function (e2) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ 4 > ^^^^^^^^^^^^^^^-> -1-> +1 > 2 >enum 3 > e2 -1->Emitted(8, 1) Source(6, 1) + SourceIndex(0) +1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(8, 12) Source(6, 6) + SourceIndex(0) 3 >Emitted(8, 14) Source(6, 8) + SourceIndex(0) --- @@ -183,85 +206,87 @@ sourceFile:sourceMapValidationEnums.ts 2 >Emitted(12, 29) Source(10, 7) + SourceIndex(0) 3 >Emitted(12, 30) Source(10, 7) + SourceIndex(0) --- ->>>})(e2 || (e2 = {})); +>>>})(e2); 1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > e2 -5 > -6 > e2 -7 > { - > x = 10, - > y = 10, - > z, - > x2 - > } +5 > { + > x = 10, + > y = 10, + > z, + > x2 + > } 1 >Emitted(13, 1) Source(11, 1) + SourceIndex(0) 2 >Emitted(13, 2) Source(11, 2) + SourceIndex(0) 3 >Emitted(13, 4) Source(6, 6) + SourceIndex(0) 4 >Emitted(13, 6) Source(6, 8) + SourceIndex(0) -5 >Emitted(13, 11) Source(6, 6) + SourceIndex(0) -6 >Emitted(13, 13) Source(6, 8) + SourceIndex(0) -7 >Emitted(13, 21) Source(11, 2) + SourceIndex(0) +5 >Emitted(13, 8) Source(11, 2) + SourceIndex(0) --- ->>>var e3; -1 > +>>>var e3 = e3 || (e3 = {}); +1-> 2 >^^^^ 3 > ^^ -4 > ^^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^ +1-> > 2 >enum -3 > e3 { - > } -1 >Emitted(14, 1) Source(12, 1) + SourceIndex(0) +3 > e3 +4 > +5 > e3 +6 > +7 > e3 +8 > { + > } +1->Emitted(14, 1) Source(12, 1) + SourceIndex(0) 2 >Emitted(14, 5) Source(12, 6) + SourceIndex(0) -3 >Emitted(14, 7) Source(13, 2) + SourceIndex(0) +3 >Emitted(14, 7) Source(12, 8) + SourceIndex(0) +4 >Emitted(14, 10) Source(12, 6) + SourceIndex(0) +5 >Emitted(14, 12) Source(12, 8) + SourceIndex(0) +6 >Emitted(14, 17) Source(12, 6) + SourceIndex(0) +7 >Emitted(14, 19) Source(12, 8) + SourceIndex(0) +8 >Emitted(14, 25) Source(13, 2) + SourceIndex(0) --- >>>(function (e3) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ -4 > ^^^^^^^^-> -1-> +1 > 2 >enum 3 > e3 -1->Emitted(15, 1) Source(12, 1) + SourceIndex(0) +1 >Emitted(15, 1) Source(12, 1) + SourceIndex(0) 2 >Emitted(15, 12) Source(12, 6) + SourceIndex(0) 3 >Emitted(15, 14) Source(12, 8) + SourceIndex(0) --- ->>>})(e3 || (e3 = {})); -1-> +>>>})(e3); +1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> { +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > { > 2 >} 3 > 4 > e3 -5 > -6 > e3 -7 > { - > } -1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) +5 > { + > } +1 >Emitted(16, 1) Source(13, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(16, 4) Source(12, 6) + SourceIndex(0) 4 >Emitted(16, 6) Source(12, 8) + SourceIndex(0) -5 >Emitted(16, 11) Source(12, 6) + SourceIndex(0) -6 >Emitted(16, 13) Source(12, 8) + SourceIndex(0) -7 >Emitted(16, 21) Source(13, 2) + SourceIndex(0) +5 >Emitted(16, 8) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationEnums.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js index 8d5b0f8441fb3..4e1fc006be9fa 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js +++ b/tests/baselines/reference/sourceMapValidationImport.js @@ -11,7 +11,7 @@ var y = new b(); //// [sourceMapValidationImport.js] "use strict"; exports.__esModule = true; -var m; +var m = {}; (function (m) { var c = /** @class */ (function () { function c() { @@ -19,7 +19,7 @@ var m; return c; }()); m.c = c; -})(m = exports.m || (exports.m = {})); +})(m); var a = m.c; exports.b = m.c; var x = new a(); diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map index bf6c7989cfc66..a0ac3580ba96d 100644 --- a/tests/baselines/reference/sourceMapValidationImport.js.map +++ b/tests/baselines/reference/sourceMapValidationImport.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationImport.js.map] -{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;AAAA,IAAc,CAAC,CAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,GAAD,SAAC,KAAD,SAAC,QAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationImport.js","sourceRoot":"","sources":["sourceMapValidationImport.ts"],"names":[],"mappings":";;AAAA,IAAc,CAAC,MAGd;AAHD,WAAc,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,GAAC,IACb,CAAA;AACL,CAAC,EAHa,CAAC,EAGd;AACD,IAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACD,QAAA,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACtB,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,IAAI,CAAC,GAAG,IAAI,SAAC,EAAE,CAAC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt index 8d3a0328a31df..4325334cc34dd 100644 --- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt @@ -10,12 +10,12 @@ sourceFile:sourceMapValidationImport.ts ------------------------------------------------------------------- >>>"use strict"; >>>exports.__esModule = true; ->>>var m; +>>>var m = {}; 1 > 2 >^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^^^^ +5 > ^^^^^-> 1 > 2 >export module 3 > m @@ -26,7 +26,7 @@ sourceFile:sourceMapValidationImport.ts 1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(3, 5) Source(1, 15) + SourceIndex(0) 3 >Emitted(3, 6) Source(1, 16) + SourceIndex(0) -4 >Emitted(3, 7) Source(4, 2) + SourceIndex(0) +4 >Emitted(3, 12) Source(4, 2) + SourceIndex(0) --- >>>(function (m) { 1-> @@ -92,7 +92,6 @@ sourceFile:sourceMapValidationImport.ts 2 > ^^^ 3 > ^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > c 3 > { @@ -103,41 +102,30 @@ sourceFile:sourceMapValidationImport.ts 3 >Emitted(10, 12) Source(3, 6) + SourceIndex(0) 4 >Emitted(10, 13) Source(3, 6) + SourceIndex(0) --- ->>>})(m = exports.m || (exports.m = {})); -1-> +>>>})(m); +1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^ -6 > ^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^-> +1 > > 2 >} 3 > 4 > m -5 > -6 > m -7 > -8 > m -9 > { - > export class c { - > } - > } -1->Emitted(11, 1) Source(4, 1) + SourceIndex(0) +5 > { + > export class c { + > } + > } +1 >Emitted(11, 1) Source(4, 1) + SourceIndex(0) 2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(11, 4) Source(1, 15) + SourceIndex(0) 4 >Emitted(11, 5) Source(1, 16) + SourceIndex(0) -5 >Emitted(11, 8) Source(1, 15) + SourceIndex(0) -6 >Emitted(11, 17) Source(1, 16) + SourceIndex(0) -7 >Emitted(11, 22) Source(1, 15) + SourceIndex(0) -8 >Emitted(11, 31) Source(1, 16) + SourceIndex(0) -9 >Emitted(11, 39) Source(4, 2) + SourceIndex(0) +5 >Emitted(11, 7) Source(4, 2) + SourceIndex(0) --- >>>var a = m.c; -1 > +1-> 2 >^^^^ 3 > ^ 4 > ^^^ @@ -146,7 +134,7 @@ sourceFile:sourceMapValidationImport.ts 7 > ^ 8 > ^ 9 > ^^^^^-> -1 > +1-> > 2 >import 3 > a @@ -155,7 +143,7 @@ sourceFile:sourceMapValidationImport.ts 6 > . 7 > c 8 > ; -1 >Emitted(12, 1) Source(5, 1) + SourceIndex(0) +1->Emitted(12, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(12, 5) Source(5, 8) + SourceIndex(0) 3 >Emitted(12, 6) Source(5, 9) + SourceIndex(0) 4 >Emitted(12, 9) Source(5, 12) + SourceIndex(0) diff --git a/tests/baselines/reference/sourceMapValidationModule.js b/tests/baselines/reference/sourceMapValidationModule.js index 6375e45d445e6..e71ec44de9e5b 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js +++ b/tests/baselines/reference/sourceMapValidationModule.js @@ -14,20 +14,20 @@ module m3 { } //// [sourceMapValidationModule.js] -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { var a = 10; a++; -})(m2 || (m2 = {})); -var m3; +})(m2); +var m3 = m3 || (m3 = {}); (function (m3) { - var m4; + var m4 = m4 || (m4 = {}); (function (m4) { m4.x = 30; - })(m4 || (m4 = {})); + })(m4); function foo() { return m4.x; } m3.foo = foo; -})(m3 || (m3 = {})); +})(m3); //# sourceMappingURL=sourceMapValidationModule.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationModule.js.map b/tests/baselines/reference/sourceMapValidationModule.js.map index 31f56a51d6c5d..ca5dfccf50b90 100644 --- a/tests/baselines/reference/sourceMapValidationModule.js.map +++ b/tests/baselines/reference/sourceMapValidationModule.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationModule.js.map] -{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR;AACD,IAAO,EAAE,CAQR;AARD,WAAO,EAAE;IACL,IAAO,EAAE,CAER;IAFD,WAAO,EAAE;QACM,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER;IAED,SAAgB,GAAG;QACf,OAAO,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,KAAF,EAAE,QAQR"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationModule.js","sourceRoot":"","sources":["sourceMapValidationModule.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,GAAF,EAAE,KAAF,EAAE,OAGR;AAHD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,EAAE,CAAC;AACR,CAAC,EAHM,EAAE,EAGR;AACD,IAAO,EAAE,GAAF,EAAE,KAAF,EAAE,OAQR;AARD,WAAO,EAAE;IACL,IAAO,EAAE,GAAF,EAAE,KAAF,EAAE,OAER;IAFD,WAAO,EAAE;QACM,IAAC,GAAG,EAAE,CAAC;IACtB,CAAC,EAFM,EAAE,EAER;IAED,SAAgB,GAAG;QACf,OAAO,EAAE,CAAC,CAAC,CAAC;IAChB,CAAC;IAFe,MAAG,MAElB,CAAA;AACL,CAAC,EARM,EAAE,EAQR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt index 88589678665a2..d33a63ae5194a 100644 --- a/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationModule.sourcemap.txt @@ -8,33 +8,44 @@ sources: sourceMapValidationModule.ts emittedFile:tests/cases/compiler/sourceMapValidationModule.js sourceFile:sourceMapValidationModule.ts ------------------------------------------------------------------- ->>>var m2; +>>>var m2 = m2 || (m2 = {}); 1 > 2 >^^^^ 3 > ^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^^ 1 > 2 >module 3 > m2 -4 > { - > var a = 10; - > a++; - > } +4 > +5 > m2 +6 > +7 > m2 +8 > { + > var a = 10; + > a++; + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 8) Source(4, 2) + SourceIndex(0) +4 >Emitted(1, 10) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 12) Source(1, 10) + SourceIndex(0) +6 >Emitted(1, 17) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 19) Source(1, 10) + SourceIndex(0) +8 >Emitted(1, 26) Source(4, 2) + SourceIndex(0) --- >>>(function (m2) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ 4 > ^^^-> -1-> +1 > 2 >module 3 > m2 -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0) --- @@ -64,7 +75,6 @@ sourceFile:sourceMapValidationModule.ts 2 > ^ 3 > ^^ 4 > ^ -5 > ^^^^^^^^^^^^^-> 1 > > 2 > a @@ -75,95 +85,113 @@ sourceFile:sourceMapValidationModule.ts 3 >Emitted(4, 8) Source(3, 8) + SourceIndex(0) 4 >Emitted(4, 9) Source(3, 9) + SourceIndex(0) --- ->>>})(m2 || (m2 = {})); -1-> +>>>})(m2); +1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > m2 -5 > -6 > m2 -7 > { - > var a = 10; - > a++; - > } -1->Emitted(5, 1) Source(4, 1) + SourceIndex(0) +5 > { + > var a = 10; + > a++; + > } +1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0) 2 >Emitted(5, 2) Source(4, 2) + SourceIndex(0) 3 >Emitted(5, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(5, 6) Source(1, 10) + SourceIndex(0) -5 >Emitted(5, 11) Source(1, 8) + SourceIndex(0) -6 >Emitted(5, 13) Source(1, 10) + SourceIndex(0) -7 >Emitted(5, 21) Source(4, 2) + SourceIndex(0) +5 >Emitted(5, 8) Source(4, 2) + SourceIndex(0) --- ->>>var m3; -1 > +>>>var m3 = m3 || (m3 = {}); +1-> 2 >^^^^ 3 > ^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^^ +1-> > 2 >module 3 > m3 -4 > { - > module m4 { - > export var x = 30; - > } - > - > export function foo() { - > return m4.x; - > } - > } -1 >Emitted(6, 1) Source(5, 1) + SourceIndex(0) +4 > +5 > m3 +6 > +7 > m3 +8 > { + > module m4 { + > export var x = 30; + > } + > + > export function foo() { + > return m4.x; + > } + > } +1->Emitted(6, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(6, 5) Source(5, 8) + SourceIndex(0) 3 >Emitted(6, 7) Source(5, 10) + SourceIndex(0) -4 >Emitted(6, 8) Source(13, 2) + SourceIndex(0) +4 >Emitted(6, 10) Source(5, 8) + SourceIndex(0) +5 >Emitted(6, 12) Source(5, 10) + SourceIndex(0) +6 >Emitted(6, 17) Source(5, 8) + SourceIndex(0) +7 >Emitted(6, 19) Source(5, 10) + SourceIndex(0) +8 >Emitted(6, 26) Source(13, 2) + SourceIndex(0) --- >>>(function (m3) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ -1-> +4 > ^^^^^^^^^^^^^^^^^-> +1 > 2 >module 3 > m3 -1->Emitted(7, 1) Source(5, 1) + SourceIndex(0) +1 >Emitted(7, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(7, 12) Source(5, 8) + SourceIndex(0) 3 >Emitted(7, 14) Source(5, 10) + SourceIndex(0) --- ->>> var m4; -1 >^^^^ +>>> var m4 = m4 || (m4 = {}); +1->^^^^ 2 > ^^^^ 3 > ^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > { +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^^ +1-> { > 2 > module 3 > m4 -4 > { - > export var x = 30; - > } -1 >Emitted(8, 5) Source(6, 5) + SourceIndex(0) +4 > +5 > m4 +6 > +7 > m4 +8 > { + > export var x = 30; + > } +1->Emitted(8, 5) Source(6, 5) + SourceIndex(0) 2 >Emitted(8, 9) Source(6, 12) + SourceIndex(0) 3 >Emitted(8, 11) Source(6, 14) + SourceIndex(0) -4 >Emitted(8, 12) Source(8, 6) + SourceIndex(0) +4 >Emitted(8, 14) Source(6, 12) + SourceIndex(0) +5 >Emitted(8, 16) Source(6, 14) + SourceIndex(0) +6 >Emitted(8, 21) Source(6, 12) + SourceIndex(0) +7 >Emitted(8, 23) Source(6, 14) + SourceIndex(0) +8 >Emitted(8, 30) Source(8, 6) + SourceIndex(0) --- >>> (function (m4) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^^ 4 > ^^-> -1-> +1 > 2 > module 3 > m4 -1->Emitted(9, 5) Source(6, 5) + SourceIndex(0) +1 >Emitted(9, 5) Source(6, 5) + SourceIndex(0) 2 >Emitted(9, 16) Source(6, 12) + SourceIndex(0) 3 >Emitted(9, 18) Source(6, 14) + SourceIndex(0) --- @@ -173,7 +201,6 @@ sourceFile:sourceMapValidationModule.ts 3 > ^^^ 4 > ^^ 5 > ^ -6 > ^^^^^^^-> 1-> { > export var 2 > x @@ -186,43 +213,38 @@ sourceFile:sourceMapValidationModule.ts 4 >Emitted(10, 18) Source(7, 26) + SourceIndex(0) 5 >Emitted(10, 19) Source(7, 27) + SourceIndex(0) --- ->>> })(m4 || (m4 = {})); -1->^^^^ +>>> })(m4); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^-> +1 > > 2 > } 3 > 4 > m4 -5 > -6 > m4 -7 > { - > export var x = 30; - > } -1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) +5 > { + > export var x = 30; + > } +1 >Emitted(11, 5) Source(8, 5) + SourceIndex(0) 2 >Emitted(11, 6) Source(8, 6) + SourceIndex(0) 3 >Emitted(11, 8) Source(6, 12) + SourceIndex(0) 4 >Emitted(11, 10) Source(6, 14) + SourceIndex(0) -5 >Emitted(11, 15) Source(6, 12) + SourceIndex(0) -6 >Emitted(11, 17) Source(6, 14) + SourceIndex(0) -7 >Emitted(11, 25) Source(8, 6) + SourceIndex(0) +5 >Emitted(11, 12) Source(8, 6) + SourceIndex(0) --- >>> function foo() { -1 >^^^^ +1->^^^^ 2 > ^^^^^^^^^ 3 > ^^^ 4 > ^^^^^-> -1 > +1-> > > 2 > export function 3 > foo -1 >Emitted(12, 5) Source(10, 5) + SourceIndex(0) +1->Emitted(12, 5) Source(10, 5) + SourceIndex(0) 2 >Emitted(12, 14) Source(10, 21) + SourceIndex(0) 3 >Emitted(12, 17) Source(10, 24) + SourceIndex(0) --- @@ -262,7 +284,6 @@ sourceFile:sourceMapValidationModule.ts 2 > ^^^^^^ 3 > ^^^^^^ 4 > ^ -5 > ^^^^-> 1-> 2 > foo 3 > () { @@ -274,37 +295,31 @@ sourceFile:sourceMapValidationModule.ts 3 >Emitted(15, 17) Source(12, 6) + SourceIndex(0) 4 >Emitted(15, 18) Source(12, 6) + SourceIndex(0) --- ->>>})(m3 || (m3 = {})); -1-> +>>>})(m3); +1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > m3 -5 > -6 > m3 -7 > { - > module m4 { - > export var x = 30; - > } - > - > export function foo() { - > return m4.x; - > } - > } -1->Emitted(16, 1) Source(13, 1) + SourceIndex(0) +5 > { + > module m4 { + > export var x = 30; + > } + > + > export function foo() { + > return m4.x; + > } + > } +1 >Emitted(16, 1) Source(13, 1) + SourceIndex(0) 2 >Emitted(16, 2) Source(13, 2) + SourceIndex(0) 3 >Emitted(16, 4) Source(5, 8) + SourceIndex(0) 4 >Emitted(16, 6) Source(5, 10) + SourceIndex(0) -5 >Emitted(16, 11) Source(5, 8) + SourceIndex(0) -6 >Emitted(16, 13) Source(5, 10) + SourceIndex(0) -7 >Emitted(16, 21) Source(13, 2) + SourceIndex(0) +5 >Emitted(16, 8) Source(13, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationModule.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js index 4b9816a6259dd..863df8a192a78 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js @@ -18,11 +18,11 @@ module m1 { } //// [fooResult.js] -var M; +var M = M || (M = {}); (function (M) { M.X = 1; -})(M || (M = {})); -var m1; +})(M); +var m1 = m1 || (m1 = {}); (function (m1) { var c1 = /** @class */ (function () { function c1() { @@ -30,5 +30,5 @@ var m1; return c1; }()); m1.c1 = c1; -})(m1 || (m1 = {})); +})(m1); //# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map index a20d3ecb6dc7f..6bcecc0042f31 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map @@ -1,2 +1,2 @@ //// [fooResult.js.map] -{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC;IACO,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"} \ No newline at end of file +{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,GAAD,CAAC,KAAD,CAAC,OAEP;AAFD,WAAO,CAAC;IACO,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,EAEP;ACFD,IAAO,EAAE,GAAF,EAAE,KAAF,EAAE,OAGR;AAHD,WAAO,EAAE;IACL;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,EAGR"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt index 824ff8ff81705..501c0c570dc02 100644 --- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt +++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt @@ -8,32 +8,43 @@ sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts emittedFile:fooResult.js sourceFile:tests/cases/compiler/a.ts ------------------------------------------------------------------- ->>>var M; +>>>var M = M || (M = {}); 1 > 2 >^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +8 > ^^^^^^^ 1 > 2 >module 3 > M -4 > { - > export var X = 1; - > } +4 > +5 > M +6 > +7 > M +8 > { + > export var X = 1; + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0) -4 >Emitted(1, 7) Source(3, 2) + SourceIndex(0) +4 >Emitted(1, 9) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 10) Source(1, 9) + SourceIndex(0) +6 >Emitted(1, 15) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 16) Source(1, 9) + SourceIndex(0) +8 >Emitted(1, 23) Source(3, 2) + SourceIndex(0) --- >>>(function (M) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^ 4 > ^-> -1-> +1 > 2 >module 3 > M -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0) --- @@ -43,7 +54,6 @@ sourceFile:tests/cases/compiler/a.ts 3 > ^^^ 4 > ^ 5 > ^ -6 > ^^^^^^^-> 1-> { > export var 2 > X @@ -56,63 +66,69 @@ sourceFile:tests/cases/compiler/a.ts 4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0) 5 >Emitted(3, 13) Source(2, 22) + SourceIndex(0) --- ->>>})(M || (M = {})); -1-> +>>>})(M); +1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > M -5 > -6 > M -7 > { - > export var X = 1; - > } -1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) +5 > { + > export var X = 1; + > } +1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0) 2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) 3 >Emitted(4, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(4, 5) Source(1, 9) + SourceIndex(0) -5 >Emitted(4, 10) Source(1, 8) + SourceIndex(0) -6 >Emitted(4, 11) Source(1, 9) + SourceIndex(0) -7 >Emitted(4, 19) Source(3, 2) + SourceIndex(0) +5 >Emitted(4, 7) Source(3, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:fooResult.js sourceFile:tests/cases/compiler/b.ts ------------------------------------------------------------------- ->>>var m1; -1 > +>>>var m1 = m1 || (m1 = {}); +1-> 2 >^^^^ 3 > ^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^^ +1-> 2 >module 3 > m1 -4 > { - > export class c1 { - > } - > } -1 >Emitted(5, 1) Source(1, 1) + SourceIndex(1) +4 > +5 > m1 +6 > +7 > m1 +8 > { + > export class c1 { + > } + > } +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) 2 >Emitted(5, 5) Source(1, 8) + SourceIndex(1) 3 >Emitted(5, 7) Source(1, 10) + SourceIndex(1) -4 >Emitted(5, 8) Source(4, 2) + SourceIndex(1) +4 >Emitted(5, 10) Source(1, 8) + SourceIndex(1) +5 >Emitted(5, 12) Source(1, 10) + SourceIndex(1) +6 >Emitted(5, 17) Source(1, 8) + SourceIndex(1) +7 >Emitted(5, 19) Source(1, 10) + SourceIndex(1) +8 >Emitted(5, 26) Source(4, 2) + SourceIndex(1) --- >>>(function (m1) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 >module 3 > m1 -1->Emitted(6, 1) Source(1, 1) + SourceIndex(1) +1 >Emitted(6, 1) Source(1, 1) + SourceIndex(1) 2 >Emitted(6, 12) Source(1, 8) + SourceIndex(1) 3 >Emitted(6, 14) Source(1, 10) + SourceIndex(1) --- @@ -168,7 +184,6 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^ 3 > ^^^^^ 4 > ^ -5 > ^^^^^^-> 1-> 2 > c1 3 > { @@ -179,32 +194,26 @@ sourceFile:tests/cases/compiler/b.ts 3 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) 4 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) --- ->>>})(m1 || (m1 = {})); -1-> +>>>})(m1); +1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^-> -1-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > m1 -5 > -6 > m1 -7 > { - > export class c1 { - > } - > } -1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) +5 > { + > export class c1 { + > } + > } +1 >Emitted(13, 1) Source(4, 1) + SourceIndex(1) 2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) 3 >Emitted(13, 4) Source(1, 8) + SourceIndex(1) 4 >Emitted(13, 6) Source(1, 10) + SourceIndex(1) -5 >Emitted(13, 11) Source(1, 8) + SourceIndex(1) -6 >Emitted(13, 13) Source(1, 10) + SourceIndex(1) -7 >Emitted(13, 21) Source(4, 2) + SourceIndex(1) +5 >Emitted(13, 8) Source(4, 2) + SourceIndex(1) --- >>>//# sourceMappingURL=fooResult.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js b/tests/baselines/reference/sourcemapValidationDuplicateNames.js index bfe520d2b91d1..16682909a81ac 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js @@ -9,7 +9,7 @@ module m1 { } //// [sourcemapValidationDuplicateNames.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { var x = 10; var c = /** @class */ (function () { @@ -18,8 +18,8 @@ var m1; return c; }()); m1.c = c; -})(m1 || (m1 = {})); +})(m1); (function (m1) { var b = new m1.c(); -})(m1 || (m1 = {})); +})(m1); //# sourceMappingURL=sourcemapValidationDuplicateNames.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map index 2e1a02da8dd28..1b77fdcd4260b 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js.map @@ -1,2 +1,2 @@ //// [sourcemapValidationDuplicateNames.js.map] -{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,CAIR;AAJD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,KAAF,EAAE,QAIR;AACD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,KAAF,EAAE,QAER"} \ No newline at end of file +{"version":3,"file":"sourcemapValidationDuplicateNames.js","sourceRoot":"","sources":["sourcemapValidationDuplicateNames.ts"],"names":[],"mappings":"AAAA,IAAO,EAAE,GAAF,EAAE,KAAF,EAAE,OAIR;AAJD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,EAAE,CAAC;IACX;QAAA;QACA,CAAC;QAAD,QAAC;IAAD,CAAC,AADD,IACC;IADY,IAAC,IACb,CAAA;AACL,CAAC,EAJM,EAAE,EAIR;AACD,WAAO,EAAE;IACL,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;AACvB,CAAC,EAFM,EAAE,EAER"} \ No newline at end of file diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt index 2cab7b3c4aaa8..9f991964ab151 100644 --- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt +++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt @@ -8,34 +8,45 @@ sources: sourcemapValidationDuplicateNames.ts emittedFile:tests/cases/compiler/sourcemapValidationDuplicateNames.js sourceFile:sourcemapValidationDuplicateNames.ts ------------------------------------------------------------------- ->>>var m1; +>>>var m1 = m1 || (m1 = {}); 1 > 2 >^^^^ 3 > ^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^ +6 > ^^^^^ +7 > ^^ +8 > ^^^^^^^ 1 > 2 >module 3 > m1 -4 > { - > var x = 10; - > export class c { - > } - > } +4 > +5 > m1 +6 > +7 > m1 +8 > { + > var x = 10; + > export class c { + > } + > } 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0) 3 >Emitted(1, 7) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 8) Source(5, 2) + SourceIndex(0) +4 >Emitted(1, 10) Source(1, 8) + SourceIndex(0) +5 >Emitted(1, 12) Source(1, 10) + SourceIndex(0) +6 >Emitted(1, 17) Source(1, 8) + SourceIndex(0) +7 >Emitted(1, 19) Source(1, 10) + SourceIndex(0) +8 >Emitted(1, 26) Source(5, 2) + SourceIndex(0) --- >>>(function (m1) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^^ 4 > ^^^-> -1-> +1 > 2 >module 3 > m1 -1->Emitted(2, 1) Source(1, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0) 3 >Emitted(2, 14) Source(1, 10) + SourceIndex(0) --- @@ -113,7 +124,6 @@ sourceFile:sourcemapValidationDuplicateNames.ts 2 > ^^^^ 3 > ^^^^ 4 > ^ -5 > ^^^^^^^^-> 1-> 2 > c 3 > { @@ -124,44 +134,39 @@ sourceFile:sourcemapValidationDuplicateNames.ts 3 >Emitted(9, 13) Source(4, 6) + SourceIndex(0) 4 >Emitted(9, 14) Source(4, 6) + SourceIndex(0) --- ->>>})(m1 || (m1 = {})); -1-> +>>>})(m1); +1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^^^^^-> +1 > > 2 >} 3 > 4 > m1 -5 > -6 > m1 -7 > { - > var x = 10; - > export class c { - > } - > } -1->Emitted(10, 1) Source(5, 1) + SourceIndex(0) +5 > { + > var x = 10; + > export class c { + > } + > } +1 >Emitted(10, 1) Source(5, 1) + SourceIndex(0) 2 >Emitted(10, 2) Source(5, 2) + SourceIndex(0) 3 >Emitted(10, 4) Source(1, 8) + SourceIndex(0) 4 >Emitted(10, 6) Source(1, 10) + SourceIndex(0) -5 >Emitted(10, 11) Source(1, 8) + SourceIndex(0) -6 >Emitted(10, 13) Source(1, 10) + SourceIndex(0) -7 >Emitted(10, 21) Source(5, 2) + SourceIndex(0) +5 >Emitted(10, 8) Source(5, 2) + SourceIndex(0) --- >>>(function (m1) { -1 > +1-> 2 >^^^^^^^^^^^ 3 > ^^ 4 > ^^^^^^^^^^^-> -1 > +1-> > 2 >module 3 > m1 -1 >Emitted(11, 1) Source(6, 1) + SourceIndex(0) +1->Emitted(11, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(11, 12) Source(6, 8) + SourceIndex(0) 3 >Emitted(11, 14) Source(6, 10) + SourceIndex(0) --- @@ -198,31 +203,25 @@ sourceFile:sourcemapValidationDuplicateNames.ts 9 >Emitted(12, 23) Source(7, 23) + SourceIndex(0) 10>Emitted(12, 24) Source(7, 24) + SourceIndex(0) --- ->>>})(m1 || (m1 = {})); +>>>})(m1); 1 > 2 >^ 3 > ^^ 4 > ^^ -5 > ^^^^^ -6 > ^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > m1 -5 > -6 > m1 -7 > { - > var b = new m1.c(); - > } +5 > { + > var b = new m1.c(); + > } 1 >Emitted(13, 1) Source(8, 1) + SourceIndex(0) 2 >Emitted(13, 2) Source(8, 2) + SourceIndex(0) 3 >Emitted(13, 4) Source(6, 8) + SourceIndex(0) 4 >Emitted(13, 6) Source(6, 10) + SourceIndex(0) -5 >Emitted(13, 11) Source(6, 8) + SourceIndex(0) -6 >Emitted(13, 13) Source(6, 10) + SourceIndex(0) -7 >Emitted(13, 21) Source(8, 2) + SourceIndex(0) +5 >Emitted(13, 8) Source(8, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourcemapValidationDuplicateNames.js.map \ No newline at end of file diff --git a/tests/baselines/reference/specializationOfExportedClass.js b/tests/baselines/reference/specializationOfExportedClass.js index 7f066d1ce02fd..e29e942238472 100644 --- a/tests/baselines/reference/specializationOfExportedClass.js +++ b/tests/baselines/reference/specializationOfExportedClass.js @@ -9,7 +9,7 @@ var x = new M.C(); //// [specializationOfExportedClass.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -17,5 +17,5 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); var x = new M.C(); diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js index 9a08fe4c366f2..6f3149c7b9609 100644 --- a/tests/baselines/reference/spreadInvalidArgumentType.js +++ b/tests/baselines/reference/spreadInvalidArgumentType.js @@ -69,11 +69,11 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; -var E; +var E = E || (E = {}); (function (E) { E[E["v1"] = 0] = "v1"; E[E["v2"] = 1] = "v2"; -})(E || (E = {})); +})(E); ; function f(p1, p2) { var t; diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js index 83d72128212c3..7d5032cabb241 100644 --- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js +++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js @@ -164,7 +164,7 @@ var ListWrapper2 = /** @class */ (function () { }; return ListWrapper2; }()); -var tessst; +var tessst = tessst || (tessst = {}); (function (tessst) { /** * Iterates through 'array' by index and performs the callback on each element of array until the callback @@ -183,7 +183,7 @@ var tessst; return undefined; } tessst.funkyFor = funkyFor; -})(tessst || (tessst = {})); +})(tessst); var ListWrapper = /** @class */ (function () { function ListWrapper() { } diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js index 6935283d4e3c2..f16220942111e 100644 --- a/tests/baselines/reference/staticMemberExportAccess.js +++ b/tests/baselines/reference/staticMemberExportAccess.js @@ -32,7 +32,7 @@ var Sammy = /** @class */ (function () { }()); (function (Sammy) { Sammy.x = 1; -})(Sammy || (Sammy = {})); +})(Sammy); var $; var instanceOfClassSammy = new $.sammy(); // should be error var r1 = instanceOfClassSammy.foo(); // r1 is string diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js index 83854f29145b3..9d6e07ba362b4 100644 --- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js +++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js @@ -17,7 +17,7 @@ module Editor { } //// [staticMethodReferencingTypeArgument1.js] -var Editor; +var Editor = Editor || (Editor = {}); (function (Editor) { var List = /** @class */ (function () { function List(isHead, data) { @@ -33,4 +33,4 @@ var Editor; return List; }()); Editor.List = List; -})(Editor || (Editor = {})); +})(Editor); diff --git a/tests/baselines/reference/staticPropertyNameConflicts.js b/tests/baselines/reference/staticPropertyNameConflicts.js index 6167d06dd8492..1308587214e11 100644 --- a/tests/baselines/reference/staticPropertyNameConflicts.js +++ b/tests/baselines/reference/staticPropertyNameConflicts.js @@ -325,15 +325,15 @@ var StaticArgumentsFn_Anonymous = /** @class */ (function () { }()); // === Static properties on default exported classes === // name -var TestOnDefaultExportedClass_1; +var TestOnDefaultExportedClass_1 = TestOnDefaultExportedClass_1 || (TestOnDefaultExportedClass_1 = {}); (function (TestOnDefaultExportedClass_1) { var StaticName = /** @class */ (function () { function StaticName() { } return StaticName; }()); -})(TestOnDefaultExportedClass_1 || (TestOnDefaultExportedClass_1 = {})); -var TestOnDefaultExportedClass_2; +})(TestOnDefaultExportedClass_1); +var TestOnDefaultExportedClass_2 = TestOnDefaultExportedClass_2 || (TestOnDefaultExportedClass_2 = {}); (function (TestOnDefaultExportedClass_2) { var StaticNameFn = /** @class */ (function () { function StaticNameFn() { @@ -342,9 +342,9 @@ var TestOnDefaultExportedClass_2; StaticNameFn.prototype.name = function () { }; // ok return StaticNameFn; }()); -})(TestOnDefaultExportedClass_2 || (TestOnDefaultExportedClass_2 = {})); +})(TestOnDefaultExportedClass_2); // length -var TestOnDefaultExportedClass_3; +var TestOnDefaultExportedClass_3 = TestOnDefaultExportedClass_3 || (TestOnDefaultExportedClass_3 = {}); (function (TestOnDefaultExportedClass_3) { var StaticLength = /** @class */ (function () { function StaticLength() { @@ -352,8 +352,8 @@ var TestOnDefaultExportedClass_3; return StaticLength; }()); TestOnDefaultExportedClass_3.StaticLength = StaticLength; -})(TestOnDefaultExportedClass_3 || (TestOnDefaultExportedClass_3 = {})); -var TestOnDefaultExportedClass_4; +})(TestOnDefaultExportedClass_3); +var TestOnDefaultExportedClass_4 = TestOnDefaultExportedClass_4 || (TestOnDefaultExportedClass_4 = {}); (function (TestOnDefaultExportedClass_4) { var StaticLengthFn = /** @class */ (function () { function StaticLengthFn() { @@ -363,9 +363,9 @@ var TestOnDefaultExportedClass_4; return StaticLengthFn; }()); TestOnDefaultExportedClass_4.StaticLengthFn = StaticLengthFn; -})(TestOnDefaultExportedClass_4 || (TestOnDefaultExportedClass_4 = {})); +})(TestOnDefaultExportedClass_4); // prototype -var TestOnDefaultExportedClass_5; +var TestOnDefaultExportedClass_5 = TestOnDefaultExportedClass_5 || (TestOnDefaultExportedClass_5 = {}); (function (TestOnDefaultExportedClass_5) { var StaticPrototype = /** @class */ (function () { function StaticPrototype() { @@ -373,8 +373,8 @@ var TestOnDefaultExportedClass_5; return StaticPrototype; }()); TestOnDefaultExportedClass_5.StaticPrototype = StaticPrototype; -})(TestOnDefaultExportedClass_5 || (TestOnDefaultExportedClass_5 = {})); -var TestOnDefaultExportedClass_6; +})(TestOnDefaultExportedClass_5); +var TestOnDefaultExportedClass_6 = TestOnDefaultExportedClass_6 || (TestOnDefaultExportedClass_6 = {}); (function (TestOnDefaultExportedClass_6) { var StaticPrototypeFn = /** @class */ (function () { function StaticPrototypeFn() { @@ -384,9 +384,9 @@ var TestOnDefaultExportedClass_6; return StaticPrototypeFn; }()); TestOnDefaultExportedClass_6.StaticPrototypeFn = StaticPrototypeFn; -})(TestOnDefaultExportedClass_6 || (TestOnDefaultExportedClass_6 = {})); +})(TestOnDefaultExportedClass_6); // caller -var TestOnDefaultExportedClass_7; +var TestOnDefaultExportedClass_7 = TestOnDefaultExportedClass_7 || (TestOnDefaultExportedClass_7 = {}); (function (TestOnDefaultExportedClass_7) { var StaticCaller = /** @class */ (function () { function StaticCaller() { @@ -394,8 +394,8 @@ var TestOnDefaultExportedClass_7; return StaticCaller; }()); TestOnDefaultExportedClass_7.StaticCaller = StaticCaller; -})(TestOnDefaultExportedClass_7 || (TestOnDefaultExportedClass_7 = {})); -var TestOnDefaultExportedClass_8; +})(TestOnDefaultExportedClass_7); +var TestOnDefaultExportedClass_8 = TestOnDefaultExportedClass_8 || (TestOnDefaultExportedClass_8 = {}); (function (TestOnDefaultExportedClass_8) { var StaticCallerFn = /** @class */ (function () { function StaticCallerFn() { @@ -405,9 +405,9 @@ var TestOnDefaultExportedClass_8; return StaticCallerFn; }()); TestOnDefaultExportedClass_8.StaticCallerFn = StaticCallerFn; -})(TestOnDefaultExportedClass_8 || (TestOnDefaultExportedClass_8 = {})); +})(TestOnDefaultExportedClass_8); // arguments -var TestOnDefaultExportedClass_9; +var TestOnDefaultExportedClass_9 = TestOnDefaultExportedClass_9 || (TestOnDefaultExportedClass_9 = {}); (function (TestOnDefaultExportedClass_9) { var StaticArguments = /** @class */ (function () { function StaticArguments() { @@ -415,8 +415,8 @@ var TestOnDefaultExportedClass_9; return StaticArguments; }()); TestOnDefaultExportedClass_9.StaticArguments = StaticArguments; -})(TestOnDefaultExportedClass_9 || (TestOnDefaultExportedClass_9 = {})); -var TestOnDefaultExportedClass_10; +})(TestOnDefaultExportedClass_9); +var TestOnDefaultExportedClass_10 = TestOnDefaultExportedClass_10 || (TestOnDefaultExportedClass_10 = {}); (function (TestOnDefaultExportedClass_10) { var StaticArgumentsFn = /** @class */ (function () { function StaticArgumentsFn() { @@ -426,4 +426,4 @@ var TestOnDefaultExportedClass_10; return StaticArgumentsFn; }()); TestOnDefaultExportedClass_10.StaticArgumentsFn = StaticArgumentsFn; -})(TestOnDefaultExportedClass_10 || (TestOnDefaultExportedClass_10 = {})); +})(TestOnDefaultExportedClass_10); diff --git a/tests/baselines/reference/staticPropertyNotInClassType.js b/tests/baselines/reference/staticPropertyNotInClassType.js index d6bbdc75accbc..e52e972c4ee7a 100644 --- a/tests/baselines/reference/staticPropertyNotInClassType.js +++ b/tests/baselines/reference/staticPropertyNotInClassType.js @@ -40,7 +40,7 @@ module Generic { } //// [staticPropertyNotInClassType.js] -var NonGeneric; +var NonGeneric = NonGeneric || (NonGeneric = {}); (function (NonGeneric) { var C = /** @class */ (function () { function C(a, b) { @@ -58,14 +58,14 @@ var NonGeneric; }()); (function (C) { C.bar = ''; // not reflected in class type - })(C || (C = {})); + })(C); var c = new C(1, 2); var r = c.fn(); var r4 = c.foo; // error var r5 = c.bar; // error var r6 = c.x; // error -})(NonGeneric || (NonGeneric = {})); -var Generic; +})(NonGeneric); +var Generic = Generic || (Generic = {}); (function (Generic) { var C = /** @class */ (function () { function C(a, b) { @@ -83,10 +83,10 @@ var Generic; }()); (function (C) { C.bar = ''; // not reflected in class type - })(C || (C = {})); + })(C); var c = new C(1, ''); var r = c.fn(); var r4 = c.foo; // error var r5 = c.bar; // error var r6 = c.x; // error -})(Generic || (Generic = {})); +})(Generic); diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js index 7f98cfe18f1eb..5d82a06877306 100644 --- a/tests/baselines/reference/statics.js +++ b/tests/baselines/reference/statics.js @@ -32,7 +32,7 @@ M.f(); //// [statics.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C(c1, c2, c3) { @@ -61,5 +61,5 @@ var M; return result; } M.f = f; -})(M || (M = {})); +})(M); M.f(); diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js index 29b9df475dd4f..634b70dab192e 100644 --- a/tests/baselines/reference/staticsNotInScopeInClodule.js +++ b/tests/baselines/reference/staticsNotInScopeInClodule.js @@ -16,4 +16,4 @@ var Clod = /** @class */ (function () { }()); (function (Clod) { var p = x; // x isn't in scope here -})(Clod || (Clod = {})); +})(Clod); diff --git a/tests/baselines/reference/strictFunctionTypesErrors.js b/tests/baselines/reference/strictFunctionTypesErrors.js index d0608f6c1acbc..ed3b5a9134cfc 100644 --- a/tests/baselines/reference/strictFunctionTypesErrors.js +++ b/tests/baselines/reference/strictFunctionTypesErrors.js @@ -218,7 +218,7 @@ fc1 = fc2; // Error fc2 = fc1; // Error // Verify that callback parameters aren't loosely checked when types // originate in method declarations -var n1; +var n1 = {}; (function (n1) { var Foo = /** @class */ (function () { function Foo() { @@ -230,9 +230,9 @@ var n1; }()); f1 = f2; f2 = f1; // Error -})(n1 || (n1 = {})); -var n2; +})(n1); +var n2 = {}; (function (n2) { f1 = f2; f2 = f1; // Error -})(n2 || (n2 = {})); +})(n2); diff --git a/tests/baselines/reference/strictModeEnumMemberNameReserved.js b/tests/baselines/reference/strictModeEnumMemberNameReserved.js index 89e1a656b7b86..9302da72f7953 100644 --- a/tests/baselines/reference/strictModeEnumMemberNameReserved.js +++ b/tests/baselines/reference/strictModeEnumMemberNameReserved.js @@ -9,8 +9,8 @@ const x1: E.static = E.static; //// [strictModeEnumMemberNameReserved.js] "use strict"; -var E; +var E = E || (E = {}); (function (E) { E[E["static"] = 0] = "static"; -})(E || (E = {})); +})(E); var x1 = E.static; diff --git a/tests/baselines/reference/strictModeReservedWord2.js b/tests/baselines/reference/strictModeReservedWord2.js index f6adc2389cdf6..4261424ac0c46 100644 --- a/tests/baselines/reference/strictModeReservedWord2.js +++ b/tests/baselines/reference/strictModeReservedWord2.js @@ -26,12 +26,12 @@ const enum bar { //// [strictModeReservedWord2.js] "use strict"; -var package; +var package = package || (package = {}); (function (package) { -})(package || (package = {})); -var foo; +})(package); +var foo = foo || (foo = {}); (function (foo) { foo[foo["public"] = 0] = "public"; foo[foo["private"] = 1] = "private"; foo[foo["pacakge"] = 2] = "pacakge"; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/stringEnumInElementAccess01.js b/tests/baselines/reference/stringEnumInElementAccess01.js index 6dadb919a389c..3e4bba45e17a3 100644 --- a/tests/baselines/reference/stringEnumInElementAccess01.js +++ b/tests/baselines/reference/stringEnumInElementAccess01.js @@ -17,10 +17,10 @@ const snb: string | number | boolean = item[e]; //// [stringEnumInElementAccess01.js] -var E; +var E = E || (E = {}); (function (E) { E["A"] = "a"; E["B"] = "b"; E["C"] = "c"; -})(E || (E = {})); +})(E); var snb = item[e]; diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js index 2c9e54e610bfe..b788b552c6cb0 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js @@ -5,10 +5,10 @@ module m1 { //// [stringLiteralObjectLiteralDeclaration1.js] -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { m1.n = { 'foo bar': 4 }; -})(m1 || (m1 = {})); +})(m1); //// [stringLiteralObjectLiteralDeclaration1.d.ts] diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js index 83e659775604a..5baf9bbf5027b 100644 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js @@ -146,10 +146,10 @@ function f10(x) { } function f11(x) { } function f12(x) { } function f13(x) { } -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function f14(x) { } function f15(x) { } function f16(x) { } diff --git a/tests/baselines/reference/stringLiteralTypesOverloads01.js b/tests/baselines/reference/stringLiteralTypesOverloads01.js index 06b8b46754392..a339ccc6a3eac 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads01.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads01.js @@ -66,12 +66,12 @@ function getFalsyPrimitive(x) { // Should be unreachable. throw "Invalid value"; } -var Consts1; +var Consts1 = Consts1 || (Consts1 = {}); (function (Consts1) { var EMPTY_STRING = getFalsyPrimitive("string"); var ZERO = getFalsyPrimitive('number'); var FALSE = getFalsyPrimitive("boolean"); -})(Consts1 || (Consts1 = {})); +})(Consts1); var string = "string"; var number = "number"; var boolean = "boolean"; @@ -79,7 +79,7 @@ var stringOrNumber = string || number; var stringOrBoolean = string || boolean; var booleanOrNumber = number || boolean; var stringOrBooleanOrNumber = stringOrBoolean || number; -var Consts2; +var Consts2 = Consts2 || (Consts2 = {}); (function (Consts2) { var EMPTY_STRING = getFalsyPrimitive(string); var ZERO = getFalsyPrimitive(number); @@ -88,7 +88,7 @@ var Consts2; var b = getFalsyPrimitive(stringOrBoolean); var c = getFalsyPrimitive(booleanOrNumber); var d = getFalsyPrimitive(stringOrBooleanOrNumber); -})(Consts2 || (Consts2 = {})); +})(Consts2); //// [stringLiteralTypesOverloads01.d.ts] diff --git a/tests/baselines/reference/stringLiteralTypesOverloads02.js b/tests/baselines/reference/stringLiteralTypesOverloads02.js index 97b635f7dc0c8..c8b3acdf4f239 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloads02.js +++ b/tests/baselines/reference/stringLiteralTypesOverloads02.js @@ -64,12 +64,12 @@ function getFalsyPrimitive(x) { // Should be unreachable. throw "Invalid value"; } -var Consts1; +var Consts1 = Consts1 || (Consts1 = {}); (function (Consts1) { var EMPTY_STRING = getFalsyPrimitive("string"); var ZERO = getFalsyPrimitive('number'); var FALSE = getFalsyPrimitive("boolean"); -})(Consts1 || (Consts1 = {})); +})(Consts1); var string = "string"; var number = "number"; var boolean = "boolean"; @@ -77,7 +77,7 @@ var stringOrNumber = string || number; var stringOrBoolean = string || boolean; var booleanOrNumber = number || boolean; var stringOrBooleanOrNumber = stringOrBoolean || number; -var Consts2; +var Consts2 = Consts2 || (Consts2 = {}); (function (Consts2) { var EMPTY_STRING = getFalsyPrimitive(string); var ZERO = getFalsyPrimitive(number); @@ -86,7 +86,7 @@ var Consts2; var b = getFalsyPrimitive(stringOrBoolean); var c = getFalsyPrimitive(booleanOrNumber); var d = getFalsyPrimitive(stringOrBooleanOrNumber); -})(Consts2 || (Consts2 = {})); +})(Consts2); //// [stringLiteralTypesOverloads02.d.ts] diff --git a/tests/baselines/reference/structural1.js b/tests/baselines/reference/structural1.js index 73b033a525c24..71789bec8e9a9 100644 --- a/tests/baselines/reference/structural1.js +++ b/tests/baselines/reference/structural1.js @@ -13,10 +13,10 @@ module M { //// [structural1.js] -var M; +var M = M || (M = {}); (function (M) { function f(i) { } M.f = f; f({ salt: 2, pepper: 0 }); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js index c7577432b760f..519a2b421d5d3 100644 --- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js +++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js @@ -3,9 +3,9 @@ module M { export var x; } var m = M; //// [structuralTypeInDeclareFileForModule.js] -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var m = M; diff --git a/tests/baselines/reference/subtypesOfAny.js b/tests/baselines/reference/subtypesOfAny.js index 3b575f84711b3..96a476cefa4f4 100644 --- a/tests/baselines/reference/subtypesOfAny.js +++ b/tests/baselines/reference/subtypesOfAny.js @@ -145,14 +145,14 @@ var A2 = /** @class */ (function () { } return A2; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -160,4 +160,4 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js index f3b860c88fcca..ca3cd3f671ac7 100644 --- a/tests/baselines/reference/subtypesOfTypeParameter.js +++ b/tests/baselines/reference/subtypesOfTypeParameter.js @@ -146,14 +146,14 @@ var C2 = /** @class */ (function () { } return C2; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -161,7 +161,7 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); // errors throughout function f2(x, y) { var r0 = true ? x : null; diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js index c9b97d8c8c119..ce785178549bc 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js @@ -195,14 +195,14 @@ var C2 = /** @class */ (function () { } return C2; }()); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -210,7 +210,7 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); function f4(x) { var r0 = true ? x : null; // ok var r0 = true ? null : x; // ok diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js index 1f21dfb84b3f3..493ba632982c8 100644 --- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js +++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js @@ -215,7 +215,7 @@ function f(t, u, v) { var r12 = true ? v : new Foo(); var r12 = true ? new Foo() : v; } -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { var Base = /** @class */ (function () { function Base() { @@ -285,8 +285,8 @@ var M1; } return D9; }(Base)); -})(M1 || (M1 = {})); -var M2; +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { var Base2 = /** @class */ (function () { function Base2() { @@ -356,4 +356,4 @@ var M2; } return D9; }(Base2)); -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/subtypesOfUnion.js b/tests/baselines/reference/subtypesOfUnion.js index bf7b060367084..a7f07d3def83b 100644 --- a/tests/baselines/reference/subtypesOfUnion.js +++ b/tests/baselines/reference/subtypesOfUnion.js @@ -53,11 +53,11 @@ interface I2 { } //// [subtypesOfUnion.js] -var E; +var E = E || (E = {}); (function (E) { E[E["e1"] = 0] = "e1"; E[E["e2"] = 1] = "e2"; -})(E || (E = {})); +})(E); var A = /** @class */ (function () { function A() { } @@ -71,7 +71,7 @@ var A2 = /** @class */ (function () { function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -79,4 +79,4 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); diff --git a/tests/baselines/reference/subtypingWithCallSignatures.js b/tests/baselines/reference/subtypingWithCallSignatures.js index 73ca2c6543c10..e1f51521bdee5 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures.js +++ b/tests/baselines/reference/subtypingWithCallSignatures.js @@ -12,10 +12,10 @@ module CallSignature { } //// [subtypingWithCallSignatures.js] -var CallSignature; +var CallSignature = CallSignature || (CallSignature = {}); (function (CallSignature) { var r = foo1(function (x) { return 1; }); // ok because base returns void var r2 = foo1(function (x) { return ''; }); // ok because base returns void var r3 = foo2(function (x, y) { return 1; }); // ok because base returns void var r4 = foo2(function (x) { return ''; }); // ok because base returns void -})(CallSignature || (CallSignature = {})); +})(CallSignature); diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js index 5a754758c2e6e..92e983b2747fe 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.js +++ b/tests/baselines/reference/subtypingWithCallSignatures3.js @@ -134,7 +134,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -215,11 +215,11 @@ var Errors; var r8 = foo16(r8arg); // any var r9arg = function (x) { return null; }; var r9 = foo17(r9arg); // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; -})(Errors || (Errors = {})); -var WithGenericSignaturesInBaseType; +})(Errors); +var WithGenericSignaturesInBaseType = WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}); (function (WithGenericSignaturesInBaseType) { var r2arg2 = function (x) { return ['']; }; var r2 = foo2(r2arg2); // (x:T) => T[] since we can infer from generic signatures now var r3arg2 = function (x) { return null; }; var r3 = foo3(r3arg2); // any -})(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {})); +})(WithGenericSignaturesInBaseType); diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.js b/tests/baselines/reference/subtypingWithConstructSignatures.js index cfbe5db0ccc5d..03d5a35f2d42e 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures.js @@ -16,7 +16,7 @@ module ConstructSignature { } //// [subtypingWithConstructSignatures.js] -var ConstructSignature; +var ConstructSignature = ConstructSignature || (ConstructSignature = {}); (function (ConstructSignature) { var rarg1; var r = foo1(rarg1); // ok because base returns void @@ -26,4 +26,4 @@ var ConstructSignature; var r3 = foo2(r3arg1); // ok because base returns void var r4arg1; var r4 = foo2(r4arg1); // ok because base returns void -})(ConstructSignature || (ConstructSignature = {})); +})(ConstructSignature); diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js index f44a6185873a7..56acfc3a8b434 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.js +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js @@ -136,7 +136,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Errors; +var Errors = Errors || (Errors = {}); (function (Errors) { var Base = /** @class */ (function () { function Base() { @@ -207,11 +207,11 @@ var Errors; var r8 = foo16(r8arg); // any var r9arg; var r9 = foo17(r9arg); // // (x: { (a: T): T; (a: T): T; }): any[]; (x: { (a: T): T; (a: T): T; }): any[]; -})(Errors || (Errors = {})); -var WithGenericSignaturesInBaseType; +})(Errors); +var WithGenericSignaturesInBaseType = WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {}); (function (WithGenericSignaturesInBaseType) { var r2arg2; var r2 = foo2(r2arg2); // (x:T) => T[] since we can infer from generic signatures now var r3arg2; var r3 = foo3(r3arg2); // any -})(WithGenericSignaturesInBaseType || (WithGenericSignaturesInBaseType = {})); +})(WithGenericSignaturesInBaseType); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.js b/tests/baselines/reference/subtypingWithNumericIndexer.js index 4f9bf7df7ed12..b108e5b85d1c8 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer.js @@ -73,7 +73,7 @@ var B2 = /** @class */ (function (_super) { } return B2; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -108,4 +108,4 @@ var Generics; } return B4; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.js b/tests/baselines/reference/subtypingWithNumericIndexer3.js index cdae02cbfeafb..7a199790454bb 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer3.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js @@ -77,7 +77,7 @@ var B2 = /** @class */ (function (_super) { } return B2; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -119,4 +119,4 @@ var Generics; } return B5; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.js b/tests/baselines/reference/subtypingWithNumericIndexer4.js index 47f7da3dbfbb3..66ade3c5b859c 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer4.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js @@ -54,7 +54,7 @@ var B = /** @class */ (function (_super) { } return B; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -75,4 +75,4 @@ var Generics; } return B3; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.js b/tests/baselines/reference/subtypingWithNumericIndexer5.js index 0959d02cad8c7..3fb083d6b3b25 100644 --- a/tests/baselines/reference/subtypingWithNumericIndexer5.js +++ b/tests/baselines/reference/subtypingWithNumericIndexer5.js @@ -55,7 +55,7 @@ var B2 = /** @class */ (function () { } return B2; }()); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var B = /** @class */ (function () { function B() { @@ -82,4 +82,4 @@ var Generics; } return B5; }()); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithObjectMembers.js b/tests/baselines/reference/subtypingWithObjectMembers.js index 9fafef80d8800..4f6d26a1d9a7b 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers.js +++ b/tests/baselines/reference/subtypingWithObjectMembers.js @@ -138,7 +138,7 @@ var B3 = /** @class */ (function (_super) { } return B3; }(A3)); -var TwoLevels; +var TwoLevels = TwoLevels || (TwoLevels = {}); (function (TwoLevels) { var A = /** @class */ (function () { function A() { @@ -176,4 +176,4 @@ var TwoLevels; } return B3; }(A3)); -})(TwoLevels || (TwoLevels = {})); +})(TwoLevels); diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.js b/tests/baselines/reference/subtypingWithObjectMembers5.js index 45a6c3f80c028..e6a2996d57625 100644 --- a/tests/baselines/reference/subtypingWithObjectMembers5.js +++ b/tests/baselines/reference/subtypingWithObjectMembers5.js @@ -66,7 +66,7 @@ module Optional { //// [subtypingWithObjectMembers5.js] // N and M have the same name, same accessibility, same optionality, and N is a subtype of M // foo properties are valid, bar properties cause errors in the derived class declarations -var NotOptional; +var NotOptional = NotOptional || (NotOptional = {}); (function (NotOptional) { var B = /** @class */ (function () { function B() { @@ -83,9 +83,9 @@ var NotOptional; } return B3; }()); -})(NotOptional || (NotOptional = {})); +})(NotOptional); // same cases as above but with optional -var Optional; +var Optional = Optional || (Optional = {}); (function (Optional) { var B = /** @class */ (function () { function B() { @@ -102,4 +102,4 @@ var Optional; } return B3; }()); -})(Optional || (Optional = {})); +})(Optional); diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js index 0e34e0477e17d..ad3505e3961d7 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js +++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js @@ -88,7 +88,7 @@ var Derived = /** @class */ (function (_super) { } return Derived; }(Base)); -var ExplicitPublic; +var ExplicitPublic = ExplicitPublic || (ExplicitPublic = {}); (function (ExplicitPublic) { var A = /** @class */ (function () { function A() { @@ -126,8 +126,8 @@ var ExplicitPublic; } return B3; }(A3)); -})(ExplicitPublic || (ExplicitPublic = {})); -var ImplicitPublic; +})(ExplicitPublic); +var ImplicitPublic = ImplicitPublic || (ImplicitPublic = {}); (function (ImplicitPublic) { var A = /** @class */ (function () { function A() { @@ -165,4 +165,4 @@ var ImplicitPublic; } return B3; }(A3)); -})(ImplicitPublic || (ImplicitPublic = {})); +})(ImplicitPublic); diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js index 87a7012e91e47..120c79f553d0c 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.js @@ -79,10 +79,10 @@ module TwoLevels { var a; var b = { Foo: null }; var r = true ? a : b; -var TwoLevels; +var TwoLevels = TwoLevels || (TwoLevels = {}); (function (TwoLevels) { // object literal case var a; var b = { Foo: null }; var r = true ? a : b; -})(TwoLevels || (TwoLevels = {})); +})(TwoLevels); diff --git a/tests/baselines/reference/subtypingWithStringIndexer.js b/tests/baselines/reference/subtypingWithStringIndexer.js index cfb8f819c29ff..02b286c6d85de 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer.js +++ b/tests/baselines/reference/subtypingWithStringIndexer.js @@ -74,7 +74,7 @@ var B2 = /** @class */ (function (_super) { } return B2; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -109,4 +109,4 @@ var Generics; } return B4; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.js b/tests/baselines/reference/subtypingWithStringIndexer3.js index bafe99f712c4c..4d8216082df40 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer3.js +++ b/tests/baselines/reference/subtypingWithStringIndexer3.js @@ -77,7 +77,7 @@ var B2 = /** @class */ (function (_super) { } return B2; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -119,4 +119,4 @@ var Generics; } return B5; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.js b/tests/baselines/reference/subtypingWithStringIndexer4.js index 7c54c5cefa047..e1d300b4f89f5 100644 --- a/tests/baselines/reference/subtypingWithStringIndexer4.js +++ b/tests/baselines/reference/subtypingWithStringIndexer4.js @@ -54,7 +54,7 @@ var B = /** @class */ (function (_super) { } return B; }(A)); -var Generics; +var Generics = Generics || (Generics = {}); (function (Generics) { var A = /** @class */ (function () { function A() { @@ -75,4 +75,4 @@ var Generics; } return B3; }(A)); -})(Generics || (Generics = {})); +})(Generics); diff --git a/tests/baselines/reference/super1.js b/tests/baselines/reference/super1.js index cd71ab95d38cc..90aab2939d426 100644 --- a/tests/baselines/reference/super1.js +++ b/tests/baselines/reference/super1.js @@ -148,7 +148,7 @@ var SubE3 = /** @class */ (function (_super) { return SubE3; }(Base3)); // Case 4 -var Base4; +var Base4 = Base4 || (Base4 = {}); (function (Base4) { var Sub4 = /** @class */ (function () { function Sub4() { @@ -178,4 +178,4 @@ var Base4; return Sub4E; }()); Base4.Sub4E = Sub4E; -})(Base4 || (Base4 = {})); +})(Base4); diff --git a/tests/baselines/reference/superAccessInFatArrow1.js b/tests/baselines/reference/superAccessInFatArrow1.js index 79c36db1adf6f..b66ed19794957 100644 --- a/tests/baselines/reference/superAccessInFatArrow1.js +++ b/tests/baselines/reference/superAccessInFatArrow1.js @@ -29,7 +29,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var test; +var test = test || (test = {}); (function (test) { var A = /** @class */ (function () { function A() { @@ -55,4 +55,4 @@ var test; return B; }(A)); test.B = B; -})(test || (test = {})); +})(test); diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js index 60d96afeee707..87ec9891a93bf 100644 --- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js @@ -41,7 +41,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var ObjectLiteral; +var ObjectLiteral = ObjectLiteral || (ObjectLiteral = {}); (function (ObjectLiteral) { var ThisInObjectLiteral = { _foo: '1', @@ -55,7 +55,7 @@ var ObjectLiteral; return _super._foo; } }; -})(ObjectLiteral || (ObjectLiteral = {})); +})(ObjectLiteral); var F = /** @class */ (function () { function F() { } diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js index 98271b6e2c4e0..ea6223752ed0b 100644 --- a/tests/baselines/reference/switchStatements.js +++ b/tests/baselines/reference/switchStatements.js @@ -69,13 +69,13 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { function fn(x) { return ''; } M.fn = fn; -})(M || (M = {})); +})(M); var x; switch (x) { case '': diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index d700f9ac51092..d59f2314eb70c 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -13,7 +13,7 @@ module M { } //// [symbolDeclarationEmit12.js] -var M; +var M = M || (M = {}); (function (M) { class C { [Symbol.toPrimitive](x) { } @@ -24,7 +24,7 @@ var M; set [Symbol.toPrimitive](x) { } } M.C = C; -})(M || (M = {})); +})(M); //// [symbolDeclarationEmit12.d.ts] diff --git a/tests/baselines/reference/symbolProperty48.js b/tests/baselines/reference/symbolProperty48.js index 508dd8944ed9b..29adc069e46ca 100644 --- a/tests/baselines/reference/symbolProperty48.js +++ b/tests/baselines/reference/symbolProperty48.js @@ -8,10 +8,10 @@ module M { } //// [symbolProperty48.js] -var M; +var M = M || (M = {}); (function (M) { var Symbol; class C { [Symbol.iterator]() { } } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolProperty49.js b/tests/baselines/reference/symbolProperty49.js index 616683ed4040c..fd92d247551bd 100644 --- a/tests/baselines/reference/symbolProperty49.js +++ b/tests/baselines/reference/symbolProperty49.js @@ -8,9 +8,9 @@ module M { } //// [symbolProperty49.js] -var M; +var M = M || (M = {}); (function (M) { class C { [M.Symbol.iterator]() { } } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolProperty50.js b/tests/baselines/reference/symbolProperty50.js index 76a4274b77869..f662e1e019a7e 100644 --- a/tests/baselines/reference/symbolProperty50.js +++ b/tests/baselines/reference/symbolProperty50.js @@ -8,9 +8,9 @@ module M { } //// [symbolProperty50.js] -var M; +var M = M || (M = {}); (function (M) { class C { [Symbol.iterator]() { } } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolProperty51.js b/tests/baselines/reference/symbolProperty51.js index 7dd45eba091c1..bbad0ef5f8ba4 100644 --- a/tests/baselines/reference/symbolProperty51.js +++ b/tests/baselines/reference/symbolProperty51.js @@ -8,9 +8,9 @@ module M { } //// [symbolProperty51.js] -var M; +var M = M || (M = {}); (function (M) { class C { [Symbol.iterator]() { } } -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolProperty55.js b/tests/baselines/reference/symbolProperty55.js index e19e2d8e2f65c..b01ec04347fc3 100644 --- a/tests/baselines/reference/symbolProperty55.js +++ b/tests/baselines/reference/symbolProperty55.js @@ -14,10 +14,10 @@ module M { var obj = { [Symbol.iterator]: 0 }; -var M; +var M = M || (M = {}); (function (M) { var Symbol; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. obj[Symbol.iterator]; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolProperty56.js b/tests/baselines/reference/symbolProperty56.js index fea4520c2f8d9..a50af218d44bb 100644 --- a/tests/baselines/reference/symbolProperty56.js +++ b/tests/baselines/reference/symbolProperty56.js @@ -14,10 +14,10 @@ module M { var obj = { [Symbol.iterator]: 0 }; -var M; +var M = M || (M = {}); (function (M) { var Symbol; // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator, // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol. obj[Symbol["iterator"]]; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/symbolType19.js b/tests/baselines/reference/symbolType19.js index f3ba0e12472ff..eedd50a8bacd3 100644 --- a/tests/baselines/reference/symbolType19.js +++ b/tests/baselines/reference/symbolType19.js @@ -11,9 +11,9 @@ else { } //// [symbolType19.js] -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); +})(E); var x; x; if (typeof x === "number") { diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js index a59d1d3372324..f9a321537857f 100644 --- a/tests/baselines/reference/systemModule17.js +++ b/tests/baselines/reference/systemModule17.js @@ -70,9 +70,10 @@ System.register(["f1"], function (exports_1, context_1) { x = 1; exports_1("x", x); exports_1("x1", x); + N = {}; (function (N) { N.x = 1; - })(N || (N = {})); + })(N); IX = N.x; exports_1("IX", IX); exports_1("IX1", IX); diff --git a/tests/baselines/reference/systemModule7.js b/tests/baselines/reference/systemModule7.js index 04ddabc523b6c..6c5dfa10cea1c 100644 --- a/tests/baselines/reference/systemModule7.js +++ b/tests/baselines/reference/systemModule7.js @@ -17,11 +17,11 @@ System.register([], function (exports_1, context_1) { return { setters: [], execute: function () { + exports_1("M", M = {}); // filename: instantiatedModule.ts (function (M) { var x = 1; - })(M || (M = {})); - exports_1("M", M); + })(M); } }; }); diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js index ccb6a35411b21..2aae858e1e18e 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js @@ -24,15 +24,17 @@ System.register([], function (exports_1, context_1) { return { setters: [], execute: function () { + TopLevelConstEnum = {}; (function (TopLevelConstEnum) { TopLevelConstEnum[TopLevelConstEnum["X"] = 0] = "X"; - })(TopLevelConstEnum || (TopLevelConstEnum = {})); + })(TopLevelConstEnum); + M = {}; (function (M) { - var NonTopLevelConstEnum; + var NonTopLevelConstEnum = M.NonTopLevelConstEnum || (M.NonTopLevelConstEnum = {}); (function (NonTopLevelConstEnum) { NonTopLevelConstEnum[NonTopLevelConstEnum["X"] = 0] = "X"; - })(NonTopLevelConstEnum = M.NonTopLevelConstEnum || (M.NonTopLevelConstEnum = {})); - })(M || (M = {})); + })(NonTopLevelConstEnum); + })(M); } }; }); diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js index bcf3a505a484f..54841810b85fb 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.js +++ b/tests/baselines/reference/systemModuleDeclarationMerging.js @@ -20,8 +20,7 @@ System.register([], function (exports_1, context_1) { execute: function () { (function (F) { var x; - })(F || (F = {})); - exports_1("F", F); + })(F); C = /** @class */ (function () { function C() { } @@ -30,15 +29,13 @@ System.register([], function (exports_1, context_1) { exports_1("C", C); (function (C) { var x; - })(C || (C = {})); - exports_1("C", C); + })(C); + exports_1("E", E = {}); (function (E) { - })(E || (E = {})); - exports_1("E", E); + })(E); (function (E) { var x; - })(E || (E = {})); - exports_1("E", E); + })(E); } }; }); diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index 1925cec4cd0e3..4b00f67254866 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -27,14 +27,15 @@ System.register([], function (exports_1, context_1) { return TopLevelClass; }()); exports_1("TopLevelClass", TopLevelClass); + exports_1("TopLevelModule", TopLevelModule = {}); (function (TopLevelModule) { var v; - })(TopLevelModule || (TopLevelModule = {})); - exports_1("TopLevelModule", TopLevelModule); + })(TopLevelModule); + exports_1("TopLevelEnum", TopLevelEnum = {}); (function (TopLevelEnum) { TopLevelEnum[TopLevelEnum["E"] = 0] = "E"; - })(TopLevelEnum || (TopLevelEnum = {})); - exports_1("TopLevelEnum", TopLevelEnum); + })(TopLevelEnum); + exports_1("TopLevelModule2", TopLevelModule2 = {}); (function (TopLevelModule2) { var NonTopLevelClass = /** @class */ (function () { function NonTopLevelClass() { @@ -42,18 +43,17 @@ System.register([], function (exports_1, context_1) { return NonTopLevelClass; }()); TopLevelModule2.NonTopLevelClass = NonTopLevelClass; - var NonTopLevelModule; + var NonTopLevelModule = TopLevelModule2.NonTopLevelModule || (TopLevelModule2.NonTopLevelModule = {}); (function (NonTopLevelModule) { var v; - })(NonTopLevelModule = TopLevelModule2.NonTopLevelModule || (TopLevelModule2.NonTopLevelModule = {})); + })(NonTopLevelModule); function NonTopLevelFunction() { } TopLevelModule2.NonTopLevelFunction = NonTopLevelFunction; - var NonTopLevelEnum; + var NonTopLevelEnum = TopLevelModule2.NonTopLevelEnum || (TopLevelModule2.NonTopLevelEnum = {}); (function (NonTopLevelEnum) { NonTopLevelEnum[NonTopLevelEnum["E"] = 0] = "E"; - })(NonTopLevelEnum = TopLevelModule2.NonTopLevelEnum || (TopLevelModule2.NonTopLevelEnum = {})); - })(TopLevelModule2 || (TopLevelModule2 = {})); - exports_1("TopLevelModule2", TopLevelModule2); + })(NonTopLevelEnum); + })(TopLevelModule2); } }; }); diff --git a/tests/baselines/reference/systemNamespaceAliasEmit.js b/tests/baselines/reference/systemNamespaceAliasEmit.js index 3d36bad2ef172..ed623b3cf412d 100644 --- a/tests/baselines/reference/systemNamespaceAliasEmit.js +++ b/tests/baselines/reference/systemNamespaceAliasEmit.js @@ -18,17 +18,19 @@ System.register([], function (exports_1, context_1) { return { setters: [], execute: function () { - (function (ns) { - var value = 1; - })(ns || (ns = {})); + ns = {}; exports_1("ns", ns); exports_1("FooBar", ns); + (function (ns) { + var value = 1; + })(ns); + AnEnum = {}; + exports_1("AnEnum", AnEnum); + exports_1("BarEnum", AnEnum); (function (AnEnum) { AnEnum[AnEnum["ONE"] = 0] = "ONE"; AnEnum[AnEnum["TWO"] = 1] = "TWO"; - })(AnEnum || (AnEnum = {})); - exports_1("AnEnum", AnEnum); - exports_1("BarEnum", AnEnum); + })(AnEnum); } }; }); diff --git a/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.js b/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.js index e8f5104ae74fd..a7a64f558c3bb 100644 --- a/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.js +++ b/tests/baselines/reference/taggedTemplatesInModuleAndGlobal.js @@ -28,7 +28,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } return cooked; }; -var n; +var n = n || (n = {}); (function (n) { function id(x) { return x; @@ -37,7 +37,7 @@ var n; return id(__makeTemplateObject(["hello world"], ["hello world"])); } var result = templateObjectFactory() === templateObjectFactory(); -})(n || (n = {})); +})(n); //// [module.js] "use strict"; var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js index 25b19cc98e1c3..6a22de09d98cc 100644 --- a/tests/baselines/reference/testContainerList.js +++ b/tests/baselines/reference/testContainerList.js @@ -9,7 +9,7 @@ module A { //// [testContainerList.js] // Regression test for #325 -var A; +var A = A || (A = {}); (function (A) { var C = /** @class */ (function () { function C(d) { @@ -17,4 +17,4 @@ var A; } return C; }()); -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/thisBinding.js b/tests/baselines/reference/thisBinding.js index b0b05e23e80d4..4e5328a5f92f7 100644 --- a/tests/baselines/reference/thisBinding.js +++ b/tests/baselines/reference/thisBinding.js @@ -22,7 +22,7 @@ class C { } //// [thisBinding.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -36,7 +36,7 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); var C = /** @class */ (function () { function C() { } diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js index 0b7e223d68958..d6f7ef03334f3 100644 --- a/tests/baselines/reference/thisInInvalidContexts.js +++ b/tests/baselines/reference/thisInInvalidContexts.js @@ -94,11 +94,11 @@ var ClassWithInitializer = /** @class */ (function (_super) { } return ClassWithInitializer; }(BaseErrClass)); -var M; +var M = M || (M = {}); (function (M) { //'this' in module variable var x = this; // Error -})(M || (M = {})); +})(M); //'this' as type parameter constraint // function fn() { } // Error //'this' as a type argument @@ -112,8 +112,8 @@ var ErrClass3 = /** @class */ (function (_super) { return ErrClass3; }(this)); //'this' as a computed enum value -var SomeEnum; +var SomeEnum = SomeEnum || (SomeEnum = {}); (function (SomeEnum) { SomeEnum[SomeEnum["A"] = this] = "A"; SomeEnum[SomeEnum["B"] = this.spaaaace] = "B"; // Also should not be allowed -})(SomeEnum || (SomeEnum = {})); +})(SomeEnum); diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index dfd8c440c5588..81039fd0da7bc 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -95,11 +95,11 @@ var ClassWithInitializer = /** @class */ (function (_super) { } return ClassWithInitializer; }(BaseErrClass)); -var M; +var M = {}; (function (M) { //'this' in module variable var x = this; // Error -})(M || (M = {})); +})(M); //'this' as type parameter constraint // function fn() { } // Error //'this' as a type argument @@ -113,9 +113,9 @@ var ErrClass3 = /** @class */ (function (_super) { return ErrClass3; }(this)); //'this' as a computed enum value -var SomeEnum; +var SomeEnum = {}; (function (SomeEnum) { SomeEnum[SomeEnum["A"] = this] = "A"; SomeEnum[SomeEnum["B"] = this.spaaaace] = "B"; // Also should not be allowed -})(SomeEnum || (SomeEnum = {})); +})(SomeEnum); module.exports = this; diff --git a/tests/baselines/reference/thisInModule.js b/tests/baselines/reference/thisInModule.js index 6158ece472b1a..42eef292401e6 100644 --- a/tests/baselines/reference/thisInModule.js +++ b/tests/baselines/reference/thisInModule.js @@ -5,8 +5,8 @@ module myMod { } //// [thisInModule.js] -var myMod; +var myMod = myMod || (myMod = {}); (function (myMod) { var x; this.x = 5; -})(myMod || (myMod = {})); +})(myMod); diff --git a/tests/baselines/reference/thisInModuleFunction1.js b/tests/baselines/reference/thisInModuleFunction1.js index 614ae58c86f65..cee11989bd43c 100644 --- a/tests/baselines/reference/thisInModuleFunction1.js +++ b/tests/baselines/reference/thisInModuleFunction1.js @@ -7,11 +7,11 @@ module bar { var z = bar.bar(); //// [thisInModuleFunction1.js] -var bar; +var bar = bar || (bar = {}); (function (bar_1) { function bar() { return this; } bar_1.bar = bar; -})(bar || (bar = {})); +})(bar); var z = bar.bar(); diff --git a/tests/baselines/reference/thisKeyword.js b/tests/baselines/reference/thisKeyword.js index 0f5fc56fc91d2..dd7bc1372297d 100644 --- a/tests/baselines/reference/thisKeyword.js +++ b/tests/baselines/reference/thisKeyword.js @@ -4,7 +4,7 @@ module foo { } //// [thisKeyword.js] -var foo; +var foo = foo || (foo = {}); (function (foo) { this.bar = 4; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/thisTypeErrors.js b/tests/baselines/reference/thisTypeErrors.js index 96039071cb655..0c0c85640e8b6 100644 --- a/tests/baselines/reference/thisTypeErrors.js +++ b/tests/baselines/reference/thisTypeErrors.js @@ -78,10 +78,10 @@ var C2 = /** @class */ (function () { C2.y = undefined; return C2; }()); -var N1; +var N1 = N1 || (N1 = {}); (function (N1) { N1.y = this; -})(N1 || (N1 = {})); +})(N1); var C3 = /** @class */ (function () { function C3() { this.x1 = { diff --git a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js index 094c453e0891d..92aa023202a1e 100644 --- a/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js +++ b/tests/baselines/reference/this_inside-enum-should-not-be-allowed.js @@ -10,14 +10,14 @@ module ModuleEnum { } //// [this_inside-enum-should-not-be-allowed.js] -var TopLevelEnum; +var TopLevelEnum = TopLevelEnum || (TopLevelEnum = {}); (function (TopLevelEnum) { TopLevelEnum[TopLevelEnum["ThisWasAllowedButShouldNotBe"] = this] = "ThisWasAllowedButShouldNotBe"; // Should not be allowed -})(TopLevelEnum || (TopLevelEnum = {})); -var ModuleEnum; +})(TopLevelEnum); +var ModuleEnum = ModuleEnum || (ModuleEnum = {}); (function (ModuleEnum) { - var EnumInModule; + var EnumInModule = EnumInModule || (EnumInModule = {}); (function (EnumInModule) { EnumInModule[EnumInModule["WasADifferentError"] = this] = "WasADifferentError"; // this was handled as if this was in a module - })(EnumInModule || (EnumInModule = {})); -})(ModuleEnum || (ModuleEnum = {})); + })(EnumInModule); +})(ModuleEnum); diff --git a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js index 7b175935f3938..b56cb41c1753a 100644 --- a/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js +++ b/tests/baselines/reference/this_inside-object-literal-getters-and-setters.js @@ -17,7 +17,7 @@ module ObjectLiteral { //// [this_inside-object-literal-getters-and-setters.js] -var ObjectLiteral; +var ObjectLiteral = ObjectLiteral || (ObjectLiteral = {}); (function (ObjectLiteral) { var ThisInObjectLiteral = { _foo: '1', @@ -31,4 +31,4 @@ var ObjectLiteral; return this._foo; } }; -})(ObjectLiteral || (ObjectLiteral = {})); +})(ObjectLiteral); diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js index ab66fc4ad961c..a68e94952f09f 100644 --- a/tests/baselines/reference/throwStatements.js +++ b/tests/baselines/reference/throwStatements.js @@ -98,7 +98,7 @@ var D = /** @class */ (function () { return D; }()); function F(x) { return 42; } -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A() { @@ -108,7 +108,7 @@ var M; M.A = A; function F2(x) { return x.toString(); } M.F2 = F2; -})(M || (M = {})); +})(M); var aNumber = 9.9; throw aNumber; var aString = 'this is a string'; diff --git a/tests/baselines/reference/topLevel.js b/tests/baselines/reference/topLevel.js index 05622165a5fef..977e4be789494 100644 --- a/tests/baselines/reference/topLevel.js +++ b/tests/baselines/reference/topLevel.js @@ -45,8 +45,8 @@ var Point = /** @class */ (function () { }()); var result = ""; result += (new Point(3, 4).move(2, 2)); -var M; +var M = M || (M = {}); (function (M) { M.origin = new Point(0, 0); -})(M || (M = {})); +})(M); result += (M.origin.move(1, 1)); diff --git a/tests/baselines/reference/topLevelLambda.js b/tests/baselines/reference/topLevelLambda.js index 3c4f1a3bc8494..f85b7da6dcffc 100644 --- a/tests/baselines/reference/topLevelLambda.js +++ b/tests/baselines/reference/topLevelLambda.js @@ -5,8 +5,8 @@ module M { //// [topLevelLambda.js] -var M; +var M = M || (M = {}); (function (M) { var _this = this; var f = function () { _this.window; }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespace.js b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespace.js index 76d5d9a4dab86..40251dc0e8828 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespace.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespace.js @@ -1,4 +1,4 @@ -var Reflect; +var Reflect = Reflect || (Reflect = {}); (function (Reflect) { var x = 1; -})(Reflect || (Reflect = {})); +})(Reflect); diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js index 3f2dd6cdb56fb..c3c01ef46cc5f 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.rewrittenNamespaceFollowingClass.js @@ -6,4 +6,4 @@ class C { C.bar = 20; (function (C) { C.x = 10; -})(C || (C = {})); +})(C); diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.synthesizedClassAndNamespaceCombination.js b/tests/baselines/reference/transformApi/transformsCorrectly.synthesizedClassAndNamespaceCombination.js index ababb49d717a5..1d046d7356c51 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.synthesizedClassAndNamespaceCombination.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.synthesizedClassAndNamespaceCombination.js @@ -2,4 +2,4 @@ class Foo { } (function (Foo) { ; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToNamespace.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToNamespace.js index d2a32d437fa6a..1950469b183bf 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToNamespace.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToNamespace.js @@ -1,9 +1,10 @@ /*comment*/ -var Foo; +var Foo = Foo || (Foo = {}); +/*comment*/ (function (Foo) { Foo.x = 1; -})(Foo || (Foo = {})); +})(Foo); /*comment*/ (function (Foo) { Foo.y = 1; -})(Foo || (Foo = {})); +})(Foo); diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js index a0ca09cd8405a..eb117b5b57cb4 100644 --- a/tests/baselines/reference/tsxDefaultImports.js +++ b/tests/baselines/reference/tsxDefaultImports.js @@ -16,10 +16,10 @@ let a = Def.E.one; //// [a.js] "use strict"; exports.__esModule = true; -var SomeEnum; +var SomeEnum = {}; (function (SomeEnum) { SomeEnum[SomeEnum["one"] = 0] = "one"; -})(SomeEnum || (SomeEnum = {})); +})(SomeEnum); var SomeClass = /** @class */ (function () { function SomeClass() { } diff --git a/tests/baselines/reference/tsxElementResolution.js b/tests/baselines/reference/tsxElementResolution.js index 5140e1116ced3..20ab65c67467a 100644 --- a/tests/baselines/reference/tsxElementResolution.js +++ b/tests/baselines/reference/tsxElementResolution.js @@ -35,7 +35,7 @@ var Other = /** @class */ (function () { } return Other; }()); -var Dotted; +var Dotted = Dotted || (Dotted = {}); (function (Dotted) { var Name = /** @class */ (function () { function Name() { @@ -43,7 +43,7 @@ var Dotted; return Name; }()); Dotted.Name = Name; -})(Dotted || (Dotted = {})); +})(Dotted); // Should find the intrinsic element, not the class element var a = ; var b = ; diff --git a/tests/baselines/reference/tsxElementResolution7.js b/tests/baselines/reference/tsxElementResolution7.js index 06daf11ceac21..f7a9a9e79afae 100644 --- a/tests/baselines/reference/tsxElementResolution7.js +++ b/tests/baselines/reference/tsxElementResolution7.js @@ -22,18 +22,18 @@ module q { //// [file.jsx] -var my; +var my = my || (my = {}); (function (my) { -})(my || (my = {})); +})(my); // OK ; // Error ; -var q; +var q = q || (q = {}); (function (q) { var mine = my; // OK ; // Error ; -})(q || (q = {})); +})(q); diff --git a/tests/baselines/reference/tsxEmit3.js b/tests/baselines/reference/tsxEmit3.js index c1dc074bfe648..cd46b83bdfeaa 100644 --- a/tests/baselines/reference/tsxEmit3.js +++ b/tests/baselines/reference/tsxEmit3.js @@ -41,7 +41,7 @@ module M { //// [file.jsx] -var M; +var M = M || (M = {}); (function (M) { var Foo = /** @class */ (function () { function Foo() { @@ -49,7 +49,7 @@ var M; return Foo; }()); M.Foo = Foo; - var S; + var S = M.S || (M.S = {}); (function (S) { var Bar = /** @class */ (function () { function Bar() { @@ -59,26 +59,26 @@ var M; S.Bar = Bar; // Emit Foo // Foo, ; - })(S = M.S || (M.S = {})); -})(M || (M = {})); + })(S); +})(M); (function (M) { // Emit M.Foo M.Foo, ; - var S; + var S = M.S || (M.S = {}); (function (S) { // Emit M.Foo M.Foo, ; // Emit S.Bar S.Bar, ; - })(S = M.S || (M.S = {})); -})(M || (M = {})); + })(S); +})(M); (function (M) { // Emit M.S.Bar M.S.Bar, ; -})(M || (M = {})); +})(M); (function (M_1) { var M = 100; // Emit M_1.Foo M_1.Foo, ; -})(M || (M = {})); +})(M); //# sourceMappingURL=file.jsx.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.js.map b/tests/baselines/reference/tsxEmit3.js.map index fd00d8f9c603e..6107ea84c9e15 100644 --- a/tests/baselines/reference/tsxEmit3.js.map +++ b/tests/baselines/reference/tsxEmit3.js.map @@ -1,2 +1,2 @@ //// [file.jsx.map] -{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAKA,IAAO,CAAC,CAQP;AARD,WAAO,CAAC;IACP;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,CAKd;IALD,WAAc,CAAC;QACd;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;QAEpB,WAAW;QACX,gBAAgB;IACjB,CAAC,EALa,CAAC,GAAD,GAAC,KAAD,GAAC,QAKd;AACF,CAAC,EARM,CAAC,KAAD,CAAC,QAQP;AAED,WAAO,CAAC;IACP,aAAa;IACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC;QACd,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;QAEb,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;IACd,CAAC,EANa,CAAC,GAAD,GAAC,KAAD,GAAC,QAMd;AAEF,CAAC,EAZM,CAAC,KAAD,CAAC,QAYP;AAED,WAAO,CAAC;IACP,eAAe;IACf,EAAA,CAAC,CAAC,GAAG,EAAE,CAAC,EAAA,CAAC,CAAC,GAAG,CAAC,AAAD,EAAG,CAAC;AAClB,CAAC,EAHM,CAAC,KAAD,CAAC,QAGP;AAED,WAAO,GAAC;IACP,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,IAAA,GAAG,EAAE,CAAC,IAAA,GAAG,CAAC,AAAD,EAAG,CAAC;AACd,CAAC,EAJM,CAAC,KAAD,CAAC,QAIP"} \ No newline at end of file +{"version":3,"file":"file.jsx","sourceRoot":"","sources":["file.tsx"],"names":[],"mappings":"AAKA,IAAO,CAAC,GAAD,CAAC,KAAD,CAAC,OAQP;AARD,WAAO,CAAC;IACP;QAAmB;QAAgB,CAAC;QAAC,UAAC;IAAD,CAAC,AAAtC,IAAsC;IAAzB,KAAG,MAAsB,CAAA;IACtC,IAAc,CAAC,GAAD,GAAC,KAAD,GAAC,OAKd;IALD,WAAc,CAAC;QACd;YAAA;YAAmB,CAAC;YAAD,UAAC;QAAD,CAAC,AAApB,IAAoB;QAAP,KAAG,MAAI,CAAA;QAEpB,WAAW;QACX,gBAAgB;IACjB,CAAC,EALa,CAAC,EAKd;AACF,CAAC,EARM,CAAC,EAQP;AAED,WAAO,CAAC;IACP,aAAa;IACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;IAEb,IAAc,CAAC,GAAD,GAAC,KAAD,GAAC,OAMd;IAND,WAAc,CAAC;QACd,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;QAEb,aAAa;QACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,CAAC,AAAD,EAAG,CAAC;IACd,CAAC,EANa,CAAC,EAMd;AAEF,CAAC,EAZM,CAAC,EAYP;AAED,WAAO,CAAC;IACP,eAAe;IACf,EAAA,CAAC,CAAC,GAAG,EAAE,CAAC,EAAA,CAAC,CAAC,GAAG,CAAC,AAAD,EAAG,CAAC;AAClB,CAAC,EAHM,CAAC,EAGP;AAED,WAAO,GAAC;IACP,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,eAAe;IACf,IAAA,GAAG,EAAE,CAAC,IAAA,GAAG,CAAC,AAAD,EAAG,CAAC;AACd,CAAC,EAJM,CAAC,EAIP"} \ No newline at end of file diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt index 65333ec127737..442337eb335f9 100644 --- a/tests/baselines/reference/tsxEmit3.sourcemap.txt +++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt @@ -8,12 +8,15 @@ sources: file.tsx emittedFile:tests/cases/conformance/jsx/file.jsx sourceFile:file.tsx ------------------------------------------------------------------- ->>>var M; +>>>var M = M || (M = {}); 1 > 2 >^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^ +6 > ^^^^^ +7 > ^ +8 > ^^^^^^^ 1 >declare module JSX { > interface Element { } > interface IntrinsicElements { } @@ -22,29 +25,37 @@ sourceFile:file.tsx > 2 >module 3 > M -4 > { - > export class Foo { constructor() { } } - > export module S { - > export class Bar { } - > - > // Emit Foo - > // Foo, ; - > } - > } +4 > +5 > M +6 > +7 > M +8 > { + > export class Foo { constructor() { } } + > export module S { + > export class Bar { } + > + > // Emit Foo + > // Foo, ; + > } + > } 1 >Emitted(1, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(1, 5) Source(6, 8) + SourceIndex(0) 3 >Emitted(1, 6) Source(6, 9) + SourceIndex(0) -4 >Emitted(1, 7) Source(14, 2) + SourceIndex(0) +4 >Emitted(1, 9) Source(6, 8) + SourceIndex(0) +5 >Emitted(1, 10) Source(6, 9) + SourceIndex(0) +6 >Emitted(1, 15) Source(6, 8) + SourceIndex(0) +7 >Emitted(1, 16) Source(6, 9) + SourceIndex(0) +8 >Emitted(1, 23) Source(14, 2) + SourceIndex(0) --- >>>(function (M) { -1-> +1 > 2 >^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 >module 3 > M -1->Emitted(2, 1) Source(6, 1) + SourceIndex(0) +1 >Emitted(2, 1) Source(6, 1) + SourceIndex(0) 2 >Emitted(2, 12) Source(6, 8) + SourceIndex(0) 3 >Emitted(2, 13) Source(6, 9) + SourceIndex(0) --- @@ -98,6 +109,7 @@ sourceFile:file.tsx 2 > ^^^^^ 3 > ^^^^^^ 4 > ^ +5 > ^^^^^^^^^^^^^^^-> 1-> 2 > Foo 3 > { constructor() { } } @@ -107,36 +119,47 @@ sourceFile:file.tsx 3 >Emitted(8, 16) Source(7, 40) + SourceIndex(0) 4 >Emitted(8, 17) Source(7, 40) + SourceIndex(0) --- ->>> var S; -1 >^^^^ +>>> var S = M.S || (M.S = {}); +1->^^^^ 2 > ^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ +1-> > 2 > export module 3 > S -4 > { - > export class Bar { } - > - > // Emit Foo - > // Foo, ; - > } -1 >Emitted(9, 5) Source(8, 2) + SourceIndex(0) +4 > +5 > S +6 > +7 > S +8 > { + > export class Bar { } + > + > // Emit Foo + > // Foo, ; + > } +1->Emitted(9, 5) Source(8, 2) + SourceIndex(0) 2 >Emitted(9, 9) Source(8, 16) + SourceIndex(0) 3 >Emitted(9, 10) Source(8, 17) + SourceIndex(0) -4 >Emitted(9, 11) Source(13, 3) + SourceIndex(0) +4 >Emitted(9, 13) Source(8, 16) + SourceIndex(0) +5 >Emitted(9, 16) Source(8, 17) + SourceIndex(0) +6 >Emitted(9, 21) Source(8, 16) + SourceIndex(0) +7 >Emitted(9, 24) Source(8, 17) + SourceIndex(0) +8 >Emitted(9, 31) Source(13, 3) + SourceIndex(0) --- >>> (function (S) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > export module 3 > S -1->Emitted(10, 5) Source(8, 2) + SourceIndex(0) +1 >Emitted(10, 5) Source(8, 2) + SourceIndex(0) 2 >Emitted(10, 16) Source(8, 16) + SourceIndex(0) 3 >Emitted(10, 17) Source(8, 17) + SourceIndex(0) --- @@ -213,91 +236,73 @@ sourceFile:file.tsx >>> // Foo, ; 1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^ -3 > ^^^^^^^-> 1-> > 2 > // Foo, ; 1->Emitted(18, 9) Source(12, 3) + SourceIndex(0) 2 >Emitted(18, 25) Source(12, 19) + SourceIndex(0) --- ->>> })(S = M.S || (M.S = {})); -1->^^^^ +>>> })(S); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^ -5 > ^^^ -6 > ^^^ -7 > ^^^^^ -8 > ^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > S -5 > -6 > S -7 > -8 > S -9 > { - > export class Bar { } - > - > // Emit Foo - > // Foo, ; - > } -1->Emitted(19, 5) Source(13, 2) + SourceIndex(0) +5 > { + > export class Bar { } + > + > // Emit Foo + > // Foo, ; + > } +1 >Emitted(19, 5) Source(13, 2) + SourceIndex(0) 2 >Emitted(19, 6) Source(13, 3) + SourceIndex(0) 3 >Emitted(19, 8) Source(8, 16) + SourceIndex(0) 4 >Emitted(19, 9) Source(8, 17) + SourceIndex(0) -5 >Emitted(19, 12) Source(8, 16) + SourceIndex(0) -6 >Emitted(19, 15) Source(8, 17) + SourceIndex(0) -7 >Emitted(19, 20) Source(8, 16) + SourceIndex(0) -8 >Emitted(19, 23) Source(8, 17) + SourceIndex(0) -9 >Emitted(19, 31) Source(13, 3) + SourceIndex(0) +5 >Emitted(19, 11) Source(13, 3) + SourceIndex(0) --- ->>>})(M || (M = {})); +>>>})(M); 1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > M -5 > -6 > M -7 > { - > export class Foo { constructor() { } } - > export module S { - > export class Bar { } - > - > // Emit Foo - > // Foo, ; - > } - > } +5 > { + > export class Foo { constructor() { } } + > export module S { + > export class Bar { } + > + > // Emit Foo + > // Foo, ; + > } + > } 1 >Emitted(20, 1) Source(14, 1) + SourceIndex(0) 2 >Emitted(20, 2) Source(14, 2) + SourceIndex(0) 3 >Emitted(20, 4) Source(6, 8) + SourceIndex(0) 4 >Emitted(20, 5) Source(6, 9) + SourceIndex(0) -5 >Emitted(20, 10) Source(6, 8) + SourceIndex(0) -6 >Emitted(20, 11) Source(6, 9) + SourceIndex(0) -7 >Emitted(20, 19) Source(14, 2) + SourceIndex(0) +5 >Emitted(20, 7) Source(14, 2) + SourceIndex(0) --- >>>(function (M) { -1 > +1-> 2 >^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^-> -1 > +1-> > > 2 >module 3 > M -1 >Emitted(21, 1) Source(16, 1) + SourceIndex(0) +1->Emitted(21, 1) Source(16, 1) + SourceIndex(0) 2 >Emitted(21, 12) Source(16, 8) + SourceIndex(0) 3 >Emitted(21, 13) Source(16, 9) + SourceIndex(0) --- @@ -323,6 +328,7 @@ sourceFile:file.tsx 9 > 10> ^^ 11> ^ +12> ^^^^^^^^^^-> 1-> > 2 > @@ -347,38 +353,49 @@ sourceFile:file.tsx 10>Emitted(23, 21) Source(18, 14) + SourceIndex(0) 11>Emitted(23, 22) Source(18, 15) + SourceIndex(0) --- ->>> var S; -1 >^^^^ +>>> var S = M.S || (M.S = {}); +1->^^^^ 2 > ^^^^ 3 > ^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^^ +6 > ^^^^^ +7 > ^^^ +8 > ^^^^^^^ +1-> > > 2 > export module 3 > S -4 > { - > // Emit M.Foo - > Foo, ; - > - > // Emit S.Bar - > Bar, ; - > } -1 >Emitted(24, 5) Source(20, 2) + SourceIndex(0) +4 > +5 > S +6 > +7 > S +8 > { + > // Emit M.Foo + > Foo, ; + > + > // Emit S.Bar + > Bar, ; + > } +1->Emitted(24, 5) Source(20, 2) + SourceIndex(0) 2 >Emitted(24, 9) Source(20, 16) + SourceIndex(0) 3 >Emitted(24, 10) Source(20, 17) + SourceIndex(0) -4 >Emitted(24, 11) Source(26, 3) + SourceIndex(0) +4 >Emitted(24, 13) Source(20, 16) + SourceIndex(0) +5 >Emitted(24, 16) Source(20, 17) + SourceIndex(0) +6 >Emitted(24, 21) Source(20, 16) + SourceIndex(0) +7 >Emitted(24, 24) Source(20, 17) + SourceIndex(0) +8 >Emitted(24, 31) Source(26, 3) + SourceIndex(0) --- >>> (function (S) { -1->^^^^ +1 >^^^^ 2 > ^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^-> -1-> +1 > 2 > export module 3 > S -1->Emitted(25, 5) Source(20, 2) + SourceIndex(0) +1 >Emitted(25, 5) Source(20, 2) + SourceIndex(0) 2 >Emitted(25, 16) Source(20, 16) + SourceIndex(0) 3 >Emitted(25, 17) Source(20, 17) + SourceIndex(0) --- @@ -451,7 +468,6 @@ sourceFile:file.tsx 9 > 10> ^^ 11> ^ -12> ^^^^^^-> 1-> > 2 > @@ -476,90 +492,73 @@ sourceFile:file.tsx 10>Emitted(29, 25) Source(25, 15) + SourceIndex(0) 11>Emitted(29, 26) Source(25, 16) + SourceIndex(0) --- ->>> })(S = M.S || (M.S = {})); -1->^^^^ +>>> })(S); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^ -5 > ^^^ -6 > ^^^ -7 > ^^^^^ -8 > ^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > S -5 > -6 > S -7 > -8 > S -9 > { - > // Emit M.Foo - > Foo, ; - > - > // Emit S.Bar - > Bar, ; - > } -1->Emitted(30, 5) Source(26, 2) + SourceIndex(0) +5 > { + > // Emit M.Foo + > Foo, ; + > + > // Emit S.Bar + > Bar, ; + > } +1 >Emitted(30, 5) Source(26, 2) + SourceIndex(0) 2 >Emitted(30, 6) Source(26, 3) + SourceIndex(0) 3 >Emitted(30, 8) Source(20, 16) + SourceIndex(0) 4 >Emitted(30, 9) Source(20, 17) + SourceIndex(0) -5 >Emitted(30, 12) Source(20, 16) + SourceIndex(0) -6 >Emitted(30, 15) Source(20, 17) + SourceIndex(0) -7 >Emitted(30, 20) Source(20, 16) + SourceIndex(0) -8 >Emitted(30, 23) Source(20, 17) + SourceIndex(0) -9 >Emitted(30, 31) Source(26, 3) + SourceIndex(0) +5 >Emitted(30, 11) Source(26, 3) + SourceIndex(0) --- ->>>})(M || (M = {})); +>>>})(M); 1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^-> 1 > > > 2 >} 3 > 4 > M -5 > -6 > M -7 > { - > // Emit M.Foo - > Foo, ; - > - > export module S { - > // Emit M.Foo - > Foo, ; - > - > // Emit S.Bar - > Bar, ; - > } - > - > } +5 > { + > // Emit M.Foo + > Foo, ; + > + > export module S { + > // Emit M.Foo + > Foo, ; + > + > // Emit S.Bar + > Bar, ; + > } + > + > } 1 >Emitted(31, 1) Source(28, 1) + SourceIndex(0) 2 >Emitted(31, 2) Source(28, 2) + SourceIndex(0) 3 >Emitted(31, 4) Source(16, 8) + SourceIndex(0) 4 >Emitted(31, 5) Source(16, 9) + SourceIndex(0) -5 >Emitted(31, 10) Source(16, 8) + SourceIndex(0) -6 >Emitted(31, 11) Source(16, 9) + SourceIndex(0) -7 >Emitted(31, 19) Source(28, 2) + SourceIndex(0) +5 >Emitted(31, 7) Source(28, 2) + SourceIndex(0) --- >>>(function (M) { -1 > +1-> 2 >^^^^^^^^^^^ 3 > ^ 4 > ^^^^^^^^-> -1 > +1-> > > 2 >module 3 > M -1 >Emitted(32, 1) Source(30, 1) + SourceIndex(0) +1->Emitted(32, 1) Source(30, 1) + SourceIndex(0) 2 >Emitted(32, 12) Source(30, 8) + SourceIndex(0) 3 >Emitted(32, 13) Source(30, 9) + SourceIndex(0) --- @@ -621,44 +620,39 @@ sourceFile:file.tsx 14>Emitted(34, 25) Source(32, 18) + SourceIndex(0) 15>Emitted(34, 26) Source(32, 19) + SourceIndex(0) --- ->>>})(M || (M = {})); +>>>})(M); 1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > M -5 > -6 > M -7 > { - > // Emit M.S.Bar - > S.Bar, ; - > } +5 > { + > // Emit M.S.Bar + > S.Bar, ; + > } 1 >Emitted(35, 1) Source(33, 1) + SourceIndex(0) 2 >Emitted(35, 2) Source(33, 2) + SourceIndex(0) 3 >Emitted(35, 4) Source(30, 8) + SourceIndex(0) 4 >Emitted(35, 5) Source(30, 9) + SourceIndex(0) -5 >Emitted(35, 10) Source(30, 8) + SourceIndex(0) -6 >Emitted(35, 11) Source(30, 9) + SourceIndex(0) -7 >Emitted(35, 19) Source(33, 2) + SourceIndex(0) +5 >Emitted(35, 7) Source(33, 2) + SourceIndex(0) --- >>>(function (M_1) { -1 > +1-> 2 >^^^^^^^^^^^ 3 > ^^^ 4 > ^^^-> -1 > +1-> > > 2 >module 3 > M -1 >Emitted(36, 1) Source(35, 1) + SourceIndex(0) +1->Emitted(36, 1) Source(35, 1) + SourceIndex(0) 2 >Emitted(36, 12) Source(35, 8) + SourceIndex(0) 3 >Emitted(36, 15) Source(35, 9) + SourceIndex(0) --- @@ -730,33 +724,27 @@ sourceFile:file.tsx 10>Emitted(39, 25) Source(38, 14) + SourceIndex(0) 11>Emitted(39, 26) Source(38, 15) + SourceIndex(0) --- ->>>})(M || (M = {})); +>>>})(M); 1 > 2 >^ 3 > ^^ 4 > ^ -5 > ^^^^^ -6 > ^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^-> +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > 2 >} 3 > 4 > M -5 > -6 > M -7 > { - > var M = 100; - > // Emit M_1.Foo - > Foo, ; - > } +5 > { + > var M = 100; + > // Emit M_1.Foo + > Foo, ; + > } 1 >Emitted(40, 1) Source(39, 1) + SourceIndex(0) 2 >Emitted(40, 2) Source(39, 2) + SourceIndex(0) 3 >Emitted(40, 4) Source(35, 8) + SourceIndex(0) 4 >Emitted(40, 5) Source(35, 9) + SourceIndex(0) -5 >Emitted(40, 10) Source(35, 8) + SourceIndex(0) -6 >Emitted(40, 11) Source(35, 9) + SourceIndex(0) -7 >Emitted(40, 19) Source(39, 2) + SourceIndex(0) +5 >Emitted(40, 7) Source(39, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=file.jsx.map \ No newline at end of file diff --git a/tests/baselines/reference/tsxPreserveEmit1.js b/tests/baselines/reference/tsxPreserveEmit1.js index 4ad18d0d7900c..0f3560c9040c7 100644 --- a/tests/baselines/reference/tsxPreserveEmit1.js +++ b/tests/baselines/reference/tsxPreserveEmit1.js @@ -38,11 +38,11 @@ define(["require", "exports", "react", "react-router"], function (require, expor Object.defineProperty(exports, "__esModule", { value: true }); var Route = ReactRouter.Route; var routes1 = ; - var M; + var M = {}; (function (M) { - })(M || (M = {})); + })(M); (function (M) { // Should emit 'M.X' in both opening and closing tags var y = ; - })(M || (M = {})); + })(M); }); diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js index 0f0b9a8793da4..1dbc65a74b725 100644 --- a/tests/baselines/reference/tsxReactEmit6.js +++ b/tests/baselines/reference/tsxReactEmit6.js @@ -38,9 +38,9 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); (function (M) { // Should emit M.React.createElement // and M.React.__spread @@ -48,4 +48,4 @@ var M; var spread1 = M.React.createElement("div", __assign({ x: '' }, foo, { y: '' })); // Quotes var x = M.React.createElement("div", null, "This \"quote\" thing"); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule.js b/tests/baselines/reference/twoInterfacesDifferentRootModule.js index 43b61af077f77..cc59d535ef163 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule.js +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule.js @@ -31,7 +31,7 @@ module M2 { //// [twoInterfacesDifferentRootModule.js] // two interfaces with different root modules should not merge -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { var a; var r1 = a.foo; // error @@ -39,4 +39,4 @@ var M2; var b; var r3 = b.foo; // error var r4 = b.bar; -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js index 92eb1130ab8f7..b756af42b05c8 100644 --- a/tests/baselines/reference/twoInterfacesDifferentRootModule2.js +++ b/tests/baselines/reference/twoInterfacesDifferentRootModule2.js @@ -39,9 +39,9 @@ module M { //// [twoInterfacesDifferentRootModule2.js] // two interfaces with different root modules should not merge -var M; +var M = M || (M = {}); (function (M) { - var M2; + var M2 = M2 || (M2 = {}); (function (M2) { var a; var r1 = a.foo; // error @@ -49,11 +49,11 @@ var M; var b; var r3 = b.foo; // error var r4 = b.bar; - })(M2 || (M2 = {})); + })(M2); var a; var r1 = a.foo; var r2 = a.bar; // error var b; var r3 = b.foo; var r4 = b.bar; // error -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js index 7a2e76dc792d1..bfeb4d610293b 100644 --- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js +++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.js @@ -36,11 +36,11 @@ var a; var r = a(); var r2 = a(1); var r3 = a(1, 2); -var G; +var G = G || (G = {}); (function (G) { var a; var r = a(); var r2 = a(true); var r3 = a(true, 2); var r4 = a(1, true); -})(G || (G = {})); +})(G); diff --git a/tests/baselines/reference/typeAliases.js b/tests/baselines/reference/typeAliases.js index a2df358ca3f40..fd748b9d7bc63 100644 --- a/tests/baselines/reference/typeAliases.js +++ b/tests/baselines/reference/typeAliases.js @@ -115,10 +115,10 @@ var x13_2; foo13(x13_1, x13_2); foo13(x13_2, x13_1); var x14; -var E; +var E = E || (E = {}); (function (E) { E[E["x"] = 10] = "x"; -})(E || (E = {})); +})(E); f15(E.x).toLowerCase(); var x; f16(x); diff --git a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js index 4d040cfe13f76..68893d8ffd28d 100644 --- a/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js +++ b/tests/baselines/reference/typeArgumentInferenceWithObjectLiteral.js @@ -48,14 +48,14 @@ foo({ write: function (value) { return s = value; }, read: function () { return s; } }); -var E1; +var E1 = E1 || (E1 = {}); (function (E1) { E1[E1["X"] = 0] = "X"; -})(E1 || (E1 = {})); -var E2; +})(E1); +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["X"] = 0] = "X"; -})(E2 || (E2 = {})); +})(E2); var v1; var v1 = f1({ w: function (x) { return x; }, r: function () { return 0; } }, 0); var v1 = f1({ w: function (x) { return x; }, r: function () { return 0; } }, E1.X); diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js index 0e59e208b810f..9b8745eccc948 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.js @@ -125,7 +125,7 @@ function fun3() { } return args[+randBool()]; } -var n1; +var n1 = n1 || (n1 = {}); (function (n1) { // The following should all come back as strings. // They should be assignable to/from something of a type 'string'. @@ -153,8 +153,8 @@ var n1; n1.c = takeReturnHelloWorld(n1.c); n1.d = takeReturnHelloWorld(n1.d); n1.e = takeReturnHelloWorld(n1.e); -})(n1 || (n1 = {})); -var n2; +})(n1); +var n2 = n2 || (n2 = {}); (function (n2) { // The following (regardless of errors) should come back typed // as "Hello" (or "Hello" | "Hello"). @@ -181,8 +181,8 @@ var n2; n2.c = takeReturnHelloWorld(n2.c); n2.d = takeReturnHelloWorld(n2.d); n2.e = takeReturnHelloWorld(n2.e); -})(n2 || (n2 = {})); -var n3; +})(n2); +var n3 = n3 || (n3 = {}); (function (n3) { // The following (regardless of errors) should come back typed // as "Hello" | "World" (or "World" | "Hello"). @@ -209,7 +209,7 @@ var n3; n3.c = takeReturnHelloWorld(n3.c); n3.d = takeReturnHelloWorld(n3.d); n3.e = takeReturnHelloWorld(n3.e); -})(n3 || (n3 = {})); +})(n3); //// [typeArgumentsWithStringLiteralTypes01.d.ts] diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.js b/tests/baselines/reference/typeFromPropertyAssignment29.js index 8c2750ebb6d6a..36c7b94b7aa77 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.js +++ b/tests/baselines/reference/typeFromPropertyAssignment29.js @@ -123,12 +123,12 @@ function ExpandoMerge(n) { ExpandoMerge.p1 = 111; (function (ExpandoMerge) { ExpandoMerge.p2 = 222; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); (function (ExpandoMerge) { ExpandoMerge.p3 = 333; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge(1); -var Ns; +var Ns = Ns || (Ns = {}); (function (Ns) { function ExpandoNamespace() { } ExpandoNamespace.p6 = 42; @@ -136,7 +136,7 @@ var Ns; return ExpandoNamespace; } Ns.foo = foo; -})(Ns || (Ns = {})); +})(Ns); // Should not work in Typescript -- must be const var ExpandoExpr2 = function (n) { return n.toString(); diff --git a/tests/baselines/reference/typeFromPropertyAssignment31.js b/tests/baselines/reference/typeFromPropertyAssignment31.js index e5c9bda9550b0..96261a0775d77 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment31.js +++ b/tests/baselines/reference/typeFromPropertyAssignment31.js @@ -37,7 +37,7 @@ ExpandoMerge.m = function (n) { }; (function (ExpandoMerge) { ExpandoMerge.p2 = 222; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); ExpandoMerge.p4 = 44444; // ok ExpandoMerge.p6 = 66666; // ok ExpandoMerge.p8 = false; // type error @@ -49,7 +49,7 @@ ExpandoMerge.p8 = false; // type error ExpandoMerge.p7 = 7; ExpandoMerge.p8 = 6; ExpandoMerge.p9 = 7; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); ExpandoMerge.p5 = 555555; // ok ExpandoMerge.p7 = 777777; // ok ExpandoMerge.p9 = false; // type error diff --git a/tests/baselines/reference/typeFromPropertyAssignment32.js b/tests/baselines/reference/typeFromPropertyAssignment32.js index d805f6783587c..4553baa4ece00 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment32.js +++ b/tests/baselines/reference/typeFromPropertyAssignment32.js @@ -47,7 +47,7 @@ ExpandoMerge.p8 = false; // type error ExpandoMerge.p9 = false; // type error var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 + ExpandoMerge.p5 + ExpandoMerge.p6 + ExpandoMerge.p7 + ExpandoMerge.p8 + ExpandoMerge.p9 + ExpandoMerge.m(12) + ExpandoMerge(1001); //// [ns.js] -var ExpandoMerge; +var ExpandoMerge = ExpandoMerge || (ExpandoMerge = {}); (function (ExpandoMerge) { ExpandoMerge.p3 = 333; ExpandoMerge.p4 = 4; @@ -56,7 +56,7 @@ var ExpandoMerge; ExpandoMerge.p7 = 7; ExpandoMerge.p8 = 6; ExpandoMerge.p9 = 7; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); (function (ExpandoMerge) { ExpandoMerge.p2 = 222; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); diff --git a/tests/baselines/reference/typeFromPropertyAssignment33.js b/tests/baselines/reference/typeFromPropertyAssignment33.js index fa431a0f273a6..85cf244f16347 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment33.js +++ b/tests/baselines/reference/typeFromPropertyAssignment33.js @@ -34,7 +34,7 @@ var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 + //// [ns.js] -var ExpandoMerge; +var ExpandoMerge = ExpandoMerge || (ExpandoMerge = {}); (function (ExpandoMerge) { ExpandoMerge.p3 = 333; ExpandoMerge.p4 = 4; @@ -43,10 +43,10 @@ var ExpandoMerge; ExpandoMerge.p7 = 7; ExpandoMerge.p8 = 6; ExpandoMerge.p9 = 7; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); (function (ExpandoMerge) { ExpandoMerge.p2 = 222; -})(ExpandoMerge || (ExpandoMerge = {})); +})(ExpandoMerge); //// [expando.js] function ExpandoMerge(n) { return n; diff --git a/tests/baselines/reference/typeGuardEnums.js b/tests/baselines/reference/typeGuardEnums.js index 1eb4b7552c4c9..40a01b949e887 100644 --- a/tests/baselines/reference/typeGuardEnums.js +++ b/tests/baselines/reference/typeGuardEnums.js @@ -20,12 +20,12 @@ else { //// [typeGuardEnums.js] -var E; +var E = E || (E = {}); (function (E) { -})(E || (E = {})); -var V; +})(E); +var V = V || (V = {}); (function (V) { -})(V || (V = {})); +})(V); var x; if (typeof x === "number") { x; // number|E|V diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index 23d982e398c71..da8bfd714cff0 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -97,7 +97,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision -var Test; +var Test = Test || (Test = {}); (function (Test) { var FileSystemObject = /** @class */ (function () { function FileSystemObject(path) { @@ -170,7 +170,7 @@ var Test; if (general.isMoreSpecific) { general.do(); } -})(Test || (Test = {})); +})(Test); //// [typeGuardOfFormThisMember.d.ts] diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js index ab49438fbdf54..fe925f33d2fa0 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js @@ -47,7 +47,7 @@ var __extends = (this && this.__extends) || (function () { }; })(); // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision -var Test; +var Test = Test || (Test = {}); (function (Test) { var FileSystemObject = /** @class */ (function () { function FileSystemObject(path) { @@ -95,7 +95,7 @@ var Test; file.isNetworked = file.isFile; file.isFSO = file.isNetworked; file.isFile = file.isFSO; -})(Test || (Test = {})); +})(Test); //// [typeGuardOfFormThisMemberErrors.d.ts] diff --git a/tests/baselines/reference/typeGuardOnContainerTypeNoHang.js b/tests/baselines/reference/typeGuardOnContainerTypeNoHang.js index 238676b797418..3261e1e7e1731 100644 --- a/tests/baselines/reference/typeGuardOnContainerTypeNoHang.js +++ b/tests/baselines/reference/typeGuardOnContainerTypeNoHang.js @@ -9,10 +9,10 @@ export namespace TypeGuards { //// [typeGuardOnContainerTypeNoHang.js] "use strict"; exports.__esModule = true; -var TypeGuards; +var TypeGuards = {}; (function (TypeGuards) { function IsObject(value) { return typeof (value) === 'object'; } TypeGuards.IsObject = IsObject; -})(TypeGuards = exports.TypeGuards || (exports.TypeGuards = {})); +})(TypeGuards); diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js index 8ec45de814eeb..714de573240e6 100644 --- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js +++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.js @@ -130,10 +130,10 @@ function foo5(x) { } } } -var m; +var m = m || (m = {}); (function (m) { var x; - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { var b = x; // new scope - number | boolean | string var y; @@ -145,14 +145,14 @@ var m; ? x.toString() // boolean : x.toString(); // number } - })(m2 || (m2 = {})); -})(m || (m = {})); -var m1; + })(m2); +})(m); +var m1 = m1 || (m1 = {}); (function (m1) { var x; - var m2; + var m2 = m2 || (m2 = {}); (function (m2) { - var m3; + var m3 = m2.m3 || (m2.m3 = {}); (function (m3) { var b = x; // new scope - number | boolean | string var y; @@ -164,6 +164,6 @@ var m1; ? x.toString() // boolean : x.toString(); // number } - })(m3 = m2.m3 || (m2.m3 = {})); - })(m2 || (m2 = {})); -})(m1 || (m1 = {})); + })(m3); + })(m2); +})(m1); diff --git a/tests/baselines/reference/typeGuardsInModule.js b/tests/baselines/reference/typeGuardsInModule.js index 6c1ccdbb5afdc..8943f49a8415f 100644 --- a/tests/baselines/reference/typeGuardsInModule.js +++ b/tests/baselines/reference/typeGuardsInModule.js @@ -95,7 +95,7 @@ var num; var strOrNum; var var1; // Inside module -var m1; +var m1 = m1 || (m1 = {}); (function (m1) { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string @@ -113,12 +113,12 @@ var m1; else { strOrNum = m1.var3; // string | number } -})(m1 || (m1 = {})); +})(m1); // local module -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { var var2; - var m3; + var m3 = m3 || (m3 = {}); (function (m3) { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string @@ -140,12 +140,12 @@ var m2; else { strOrNum = m3.var5; // string | number } - })(m3 || (m3 = {})); -})(m2 || (m2 = {})); + })(m3); +})(m2); // Dotted module -var m3; +var m3 = m3 || (m3 = {}); (function (m3) { - var m4; + var m4 = m3.m4 || (m3.m4 = {}); (function (m4) { // global vars in function declaration num = typeof var1 === "string" && var1.length; // string @@ -163,5 +163,5 @@ var m3; else { strOrNum = m4.var3; // string | number } - })(m4 = m3.m4 || (m3.m4 = {})); -})(m3 || (m3 = {})); + })(m4); +})(m3); diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js index b803071d27fcd..d6e4248f36c3d 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js @@ -11,13 +11,13 @@ var y = E; var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures //// [typeOfEnumAndVarRedeclarations.js] -var E; +var E = E || (E = {}); (function (E) { E[E["a"] = 0] = "a"; -})(E || (E = {})); +})(E); (function (E) { E[E["b"] = 1] = "b"; -})(E || (E = {})); +})(E); var x = E; var x; // Shouldnt error var y = E; diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.js b/tests/baselines/reference/typeOfThisInFunctionExpression.js index 13dad696aa2d4..d820bb8a56991 100644 --- a/tests/baselines/reference/typeOfThisInFunctionExpression.js +++ b/tests/baselines/reference/typeOfThisInFunctionExpression.js @@ -72,7 +72,7 @@ var C = /** @class */ (function () { } return C; }()); -var M; +var M = M || (M = {}); (function (M) { function fn() { var p = this; @@ -86,4 +86,4 @@ var M; var x = this; var x; }; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js index 7bca7b1c5b826..3864445f9e852 100644 --- a/tests/baselines/reference/typeResolution.js +++ b/tests/baselines/reference/typeResolution.js @@ -114,11 +114,11 @@ module TopLevelModule2 { define(["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; - var TopLevelModule1; + var TopLevelModule1 = {}; (function (TopLevelModule1) { - var SubModule1; + var SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}); (function (SubModule1) { - var SubSubModule1; + var SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}); (function (SubSubModule1) { var ClassA = /** @class */ (function () { function ClassA() { @@ -199,7 +199,7 @@ define(["require", "exports"], function (require, exports) { } return NonExportedClassQ; }()); - })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); + })(SubSubModule1); // Should have no effect on S1.SS1.ClassA above because it is not exported var ClassA = /** @class */ (function () { function ClassA() { @@ -217,10 +217,10 @@ define(["require", "exports"], function (require, exports) { } return ClassA; }()); - })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); - var SubModule2; + })(SubModule1); + var SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}); (function (SubModule2) { - var SubSubModule2; + var SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}); (function (SubSubModule2) { // No code here since these are the mirror of the above calls var ClassA = /** @class */ (function () { @@ -244,15 +244,15 @@ define(["require", "exports"], function (require, exports) { return ClassC; }()); SubSubModule2.ClassC = ClassC; - })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); - })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); + })(SubSubModule2); + })(SubModule2); var ClassA = /** @class */ (function () { function ClassA() { } ClassA.prototype.AisIn1 = function () { }; return ClassA; }()); - var NotExportedModule; + var NotExportedModule = NotExportedModule || (NotExportedModule = {}); (function (NotExportedModule) { var ClassA = /** @class */ (function () { function ClassA() { @@ -260,11 +260,11 @@ define(["require", "exports"], function (require, exports) { return ClassA; }()); NotExportedModule.ClassA = ClassA; - })(NotExportedModule || (NotExportedModule = {})); - })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); - var TopLevelModule2; + })(NotExportedModule); + })(TopLevelModule1); + var TopLevelModule2 = {}; (function (TopLevelModule2) { - var SubModule3; + var SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}); (function (SubModule3) { var ClassA = /** @class */ (function () { function ClassA() { @@ -273,7 +273,7 @@ define(["require", "exports"], function (require, exports) { return ClassA; }()); SubModule3.ClassA = ClassA; - })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); - })(TopLevelModule2 || (TopLevelModule2 = {})); + })(SubModule3); + })(TopLevelModule2); }); //# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map index 252cafcf671c1..e2c54c00b9861 100644 --- a/tests/baselines/reference/typeResolution.js.map +++ b/tests/baselines/reference/typeResolution.js.map @@ -1,2 +1,2 @@ //// [typeResolution.js.map] -{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,CAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,CAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI,SAAS,EAAE;4BACP,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI,SAAS,EAAE;wBACP,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAwEvB;QAED,IAAc,UAAU,CAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,CAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,GAAb,wBAAa,KAAb,wBAAa,QAO1B;QAGL,CAAC,EAXa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,CAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,KAAjB,iBAAiB,QAEvB;IACL,CAAC,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,CAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,GAAV,0BAAU,KAAV,0BAAU,QAIvB;IACL,CAAC,EANM,eAAe,KAAf,eAAe,QAMrB"} \ No newline at end of file +{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":[],"mappings":";;;IAAA,IAAc,eAAe,MAmG5B;IAnGD,WAAc,eAAe;QACzB,IAAc,UAAU,GAAV,0BAAU,KAAV,0BAAU,OAwEvB;QAxED,WAAc,UAAU;YACpB,IAAc,aAAa,GAAb,wBAAa,KAAb,wBAAa,OAwD1B;YAxDD,WAAc,aAAa;gBACvB;oBAAA;oBAmBA,CAAC;oBAlBU,2BAAU,GAAjB;wBACI,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAnBD,IAmBC;gBAnBY,oBAAM,SAmBlB,CAAA;gBACD;oBAAA;oBAsBA,CAAC;oBArBU,2BAAU,GAAjB;wBACI,+CAA+C;wBAE/C,uCAAuC;wBACvC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,yCAAyC;wBACzC,IAAI,EAAU,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAChC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,qCAAqC;wBACrC,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzE,IAAI,EAAqC,CAAC;wBAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAEzD,sBAAsB;wBACtB,IAAI,EAAc,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;oBACL,aAAC;gBAAD,CAAC,AAtBD,IAsBC;gBAtBY,oBAAM,SAsBlB,CAAA;gBAED;oBACI;wBACI,SAAS,EAAE;4BACP,uCAAuC;4BACvC,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAmD,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACzE,IAAI,EAAc,CAAC;4BAAC,EAAE,CAAC,UAAU,EAAE,CAAC;4BACpC,IAAI,EAAqC,CAAC;4BAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC7D,CAAC;oBACL,CAAC;oBACL,wBAAC;gBAAD,CAAC,AAVD,IAUC;YACL,CAAC,EAxDa,aAAa,EAwD1B;YAED,0EAA0E;YAC1E;gBACI;oBACI,SAAS,EAAE;wBACP,IAAI,EAAwB,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC9C,IAAI,EAAmC,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBACzD,IAAI,EAAmD,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAEzE,sBAAsB;wBACtB,IAAI,EAA4B,CAAC;wBAAC,EAAE,CAAC,UAAU,EAAE,CAAC;oBACtD,CAAC;gBACL,CAAC;gBACL,aAAC;YAAD,CAAC,AAXD,IAWC;QACL,CAAC,EAxEa,UAAU,EAwEvB;QAED,IAAc,UAAU,GAAV,0BAAU,KAAV,0BAAU,OAWvB;QAXD,WAAc,UAAU;YACpB,IAAc,aAAa,GAAb,wBAAa,KAAb,wBAAa,OAO1B;YAPD,WAAc,aAAa;gBACvB,6DAA6D;gBAC7D;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;gBAC/C;oBAAA;oBAA8C,CAAC;oBAAlB,2BAAU,GAAjB,cAAsB,CAAC;oBAAC,aAAC;gBAAD,CAAC,AAA/C,IAA+C;gBAAlC,oBAAM,SAA4B,CAAA;YAGnD,CAAC,EAPa,aAAa,EAO1B;QAGL,CAAC,EAXa,UAAU,EAWvB;QAED;YAAA;YAEA,CAAC;YADU,uBAAM,GAAb,cAAkB,CAAC;YACvB,aAAC;QAAD,CAAC,AAFD,IAEC;QAMD,IAAO,iBAAiB,GAAjB,iBAAiB,KAAjB,iBAAiB,OAEvB;QAFD,WAAO,iBAAiB;YACpB;gBAAA;gBAAsB,CAAC;gBAAD,aAAC;YAAD,CAAC,AAAvB,IAAuB;YAAV,wBAAM,SAAI,CAAA;QAC3B,CAAC,EAFM,iBAAiB,EAEvB;IACL,CAAC,EAnGa,eAAe,EAmG5B;IAED,IAAO,eAAe,MAMrB;IAND,WAAO,eAAe;QAClB,IAAc,UAAU,GAAV,0BAAU,KAAV,0BAAU,OAIvB;QAJD,WAAc,UAAU;YACpB;gBAAA;gBAEA,CAAC;gBADU,yBAAQ,GAAf,cAAoB,CAAC;gBACzB,aAAC;YAAD,CAAC,AAFD,IAEC;YAFY,iBAAM,SAElB,CAAA;QACL,CAAC,EAJa,UAAU,EAIvB;IACL,CAAC,EANM,eAAe,EAMrB"} \ No newline at end of file diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt index 618ce0eb751cd..1a9e0b71f0f54 100644 --- a/tests/baselines/reference/typeResolution.sourcemap.txt +++ b/tests/baselines/reference/typeResolution.sourcemap.txt @@ -11,12 +11,12 @@ sourceFile:typeResolution.ts >>>define(["require", "exports"], function (require, exports) { >>> "use strict"; >>> exports.__esModule = true; ->>> var TopLevelModule1; +>>> var TopLevelModule1 = {}; 1 >^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^^^^ +5 > ^^^^^-> 1 > 2 > export module 3 > TopLevelModule1 @@ -123,12 +123,13 @@ sourceFile:typeResolution.ts 1 >Emitted(4, 5) Source(1, 1) + SourceIndex(0) 2 >Emitted(4, 9) Source(1, 15) + SourceIndex(0) 3 >Emitted(4, 24) Source(1, 30) + SourceIndex(0) -4 >Emitted(4, 25) Source(100, 2) + SourceIndex(0) +4 >Emitted(4, 30) Source(100, 2) + SourceIndex(0) --- >>> (function (TopLevelModule1) { 1->^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > export module 3 > TopLevelModule1 @@ -136,187 +137,209 @@ sourceFile:typeResolution.ts 2 >Emitted(5, 16) Source(1, 15) + SourceIndex(0) 3 >Emitted(5, 31) Source(1, 30) + SourceIndex(0) --- ->>> var SubModule1; -1 >^^^^^^^^ +>>> var SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}); +1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > { +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ +1-> { > 2 > export module 3 > SubModule1 -4 > { - > export module SubSubModule1 { - > export class ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export class ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export interface InterfaceX { XisIn1_1_1(); } - > class NonExportedClassQ { - > constructor() { - > function QQ() { - > /* Sampling of stuff from AisIn1_1_1 */ - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > } - > } - > } - > } - > - > // Should have no effect on S1.SS1.ClassA above because it is not exported - > class ClassA { - > constructor() { - > function AA() { - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Interface reference - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > } - > } -1 >Emitted(6, 9) Source(2, 5) + SourceIndex(0) +4 > +5 > SubModule1 +6 > +7 > SubModule1 +8 > { + > export module SubSubModule1 { + > export class ClassA { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export class ClassB { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export interface InterfaceX { XisIn1_1_1(); } + > class NonExportedClassQ { + > constructor() { + > function QQ() { + > /* Sampling of stuff from AisIn1_1_1 */ + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > } + > } + > } + > } + > + > // Should have no effect on S1.SS1.ClassA above because it is not exported + > class ClassA { + > constructor() { + > function AA() { + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Interface reference + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > } + > } +1->Emitted(6, 9) Source(2, 5) + SourceIndex(0) 2 >Emitted(6, 13) Source(2, 19) + SourceIndex(0) 3 >Emitted(6, 23) Source(2, 29) + SourceIndex(0) -4 >Emitted(6, 24) Source(74, 6) + SourceIndex(0) +4 >Emitted(6, 26) Source(2, 19) + SourceIndex(0) +5 >Emitted(6, 52) Source(2, 29) + SourceIndex(0) +6 >Emitted(6, 57) Source(2, 19) + SourceIndex(0) +7 >Emitted(6, 83) Source(2, 29) + SourceIndex(0) +8 >Emitted(6, 90) Source(74, 6) + SourceIndex(0) --- >>> (function (SubModule1) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^ -4 > ^^-> -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > export module 3 > SubModule1 -1->Emitted(7, 9) Source(2, 5) + SourceIndex(0) +1 >Emitted(7, 9) Source(2, 5) + SourceIndex(0) 2 >Emitted(7, 20) Source(2, 19) + SourceIndex(0) 3 >Emitted(7, 30) Source(2, 29) + SourceIndex(0) --- ->>> var SubSubModule1; +>>> var SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}); 1->^^^^^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ 1-> { > 2 > export module 3 > SubSubModule1 -4 > { - > export class ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export class ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export interface InterfaceX { XisIn1_1_1(); } - > class NonExportedClassQ { - > constructor() { - > function QQ() { - > /* Sampling of stuff from AisIn1_1_1 */ - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > } - > } - > } - > } +4 > +5 > SubSubModule1 +6 > +7 > SubSubModule1 +8 > { + > export class ClassA { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export class ClassB { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export interface InterfaceX { XisIn1_1_1(); } + > class NonExportedClassQ { + > constructor() { + > function QQ() { + > /* Sampling of stuff from AisIn1_1_1 */ + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > } + > } + > } + > } 1->Emitted(8, 13) Source(3, 9) + SourceIndex(0) 2 >Emitted(8, 17) Source(3, 23) + SourceIndex(0) 3 >Emitted(8, 30) Source(3, 36) + SourceIndex(0) -4 >Emitted(8, 31) Source(59, 10) + SourceIndex(0) +4 >Emitted(8, 33) Source(3, 23) + SourceIndex(0) +5 >Emitted(8, 57) Source(3, 36) + SourceIndex(0) +6 >Emitted(8, 62) Source(3, 23) + SourceIndex(0) +7 >Emitted(8, 86) Source(3, 36) + SourceIndex(0) +8 >Emitted(8, 93) Source(59, 10) + SourceIndex(0) --- >>> (function (SubSubModule1) { -1->^^^^^^^^^^^^ +1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > export module 3 > SubSubModule1 -1->Emitted(9, 13) Source(3, 9) + SourceIndex(0) +1 >Emitted(9, 13) Source(3, 9) + SourceIndex(0) 2 >Emitted(9, 24) Source(3, 23) + SourceIndex(0) 3 >Emitted(9, 37) Source(3, 36) + SourceIndex(0) --- @@ -1601,7 +1624,7 @@ sourceFile:typeResolution.ts 2 > ^ 3 > 4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^-> 1 > 2 > } 3 > @@ -1621,100 +1644,89 @@ sourceFile:typeResolution.ts 3 >Emitted(88, 18) Source(48, 13) + SourceIndex(0) 4 >Emitted(88, 22) Source(58, 14) + SourceIndex(0) --- ->>> })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {})); +>>> })(SubSubModule1); 1->^^^^^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 > } 3 > 4 > SubSubModule1 -5 > -6 > SubSubModule1 -7 > -8 > SubSubModule1 -9 > { - > export class ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export class ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export interface InterfaceX { XisIn1_1_1(); } - > class NonExportedClassQ { - > constructor() { - > function QQ() { - > /* Sampling of stuff from AisIn1_1_1 */ - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > } - > } - > } - > } +5 > { + > export class ClassA { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export class ClassB { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export interface InterfaceX { XisIn1_1_1(); } + > class NonExportedClassQ { + > constructor() { + > function QQ() { + > /* Sampling of stuff from AisIn1_1_1 */ + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > } + > } + > } + > } 1->Emitted(89, 13) Source(59, 9) + SourceIndex(0) 2 >Emitted(89, 14) Source(59, 10) + SourceIndex(0) 3 >Emitted(89, 16) Source(3, 23) + SourceIndex(0) 4 >Emitted(89, 29) Source(3, 36) + SourceIndex(0) -5 >Emitted(89, 32) Source(3, 23) + SourceIndex(0) -6 >Emitted(89, 56) Source(3, 36) + SourceIndex(0) -7 >Emitted(89, 61) Source(3, 23) + SourceIndex(0) -8 >Emitted(89, 85) Source(3, 36) + SourceIndex(0) -9 >Emitted(89, 93) Source(59, 10) + SourceIndex(0) +5 >Emitted(89, 31) Source(59, 10) + SourceIndex(0) --- >>> // Should have no effect on S1.SS1.ClassA above because it is not exported -1 >^^^^^^^^^^^^ +1->^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -1 > +1-> > > 2 > // Should have no effect on S1.SS1.ClassA above because it is not exported -1 >Emitted(90, 13) Source(61, 9) + SourceIndex(0) +1->Emitted(90, 13) Source(61, 9) + SourceIndex(0) 2 >Emitted(90, 87) Source(61, 83) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { @@ -1932,7 +1944,7 @@ sourceFile:typeResolution.ts 2 > ^ 3 > 4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^-> 1 > 2 > } 3 > @@ -1953,180 +1965,191 @@ sourceFile:typeResolution.ts 3 >Emitted(106, 14) Source(62, 9) + SourceIndex(0) 4 >Emitted(106, 18) Source(73, 10) + SourceIndex(0) --- ->>> })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {})); +>>> })(SubModule1); 1->^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> > 2 > } 3 > 4 > SubModule1 -5 > -6 > SubModule1 -7 > -8 > SubModule1 -9 > { - > export module SubSubModule1 { - > export class ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export class ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export interface InterfaceX { XisIn1_1_1(); } - > class NonExportedClassQ { - > constructor() { - > function QQ() { - > /* Sampling of stuff from AisIn1_1_1 */ - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > } - > } - > } - > } - > - > // Should have no effect on S1.SS1.ClassA above because it is not exported - > class ClassA { - > constructor() { - > function AA() { - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Interface reference - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > } - > } +5 > { + > export module SubSubModule1 { + > export class ClassA { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export class ClassB { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export interface InterfaceX { XisIn1_1_1(); } + > class NonExportedClassQ { + > constructor() { + > function QQ() { + > /* Sampling of stuff from AisIn1_1_1 */ + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > } + > } + > } + > } + > + > // Should have no effect on S1.SS1.ClassA above because it is not exported + > class ClassA { + > constructor() { + > function AA() { + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Interface reference + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > } + > } 1->Emitted(107, 9) Source(74, 5) + SourceIndex(0) 2 >Emitted(107, 10) Source(74, 6) + SourceIndex(0) 3 >Emitted(107, 12) Source(2, 19) + SourceIndex(0) 4 >Emitted(107, 22) Source(2, 29) + SourceIndex(0) -5 >Emitted(107, 25) Source(2, 19) + SourceIndex(0) -6 >Emitted(107, 51) Source(2, 29) + SourceIndex(0) -7 >Emitted(107, 56) Source(2, 19) + SourceIndex(0) -8 >Emitted(107, 82) Source(2, 29) + SourceIndex(0) -9 >Emitted(107, 90) Source(74, 6) + SourceIndex(0) +5 >Emitted(107, 24) Source(74, 6) + SourceIndex(0) --- ->>> var SubModule2; -1 >^^^^^^^^ +>>> var SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}); +1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ +1-> > > 2 > export module 3 > SubModule2 -4 > { - > export module SubSubModule2 { - > // No code here since these are the mirror of the above calls - > export class ClassA { public AisIn1_2_2() { } } - > export class ClassB { public BisIn1_2_2() { } } - > export class ClassC { public CisIn1_2_2() { } } - > export interface InterfaceY { YisIn1_2_2(); } - > interface NonExportedInterfaceQ { } - > } - > - > export interface InterfaceY { YisIn1_2(); } - > } -1 >Emitted(108, 9) Source(76, 5) + SourceIndex(0) +4 > +5 > SubModule2 +6 > +7 > SubModule2 +8 > { + > export module SubSubModule2 { + > // No code here since these are the mirror of the above calls + > export class ClassA { public AisIn1_2_2() { } } + > export class ClassB { public BisIn1_2_2() { } } + > export class ClassC { public CisIn1_2_2() { } } + > export interface InterfaceY { YisIn1_2_2(); } + > interface NonExportedInterfaceQ { } + > } + > + > export interface InterfaceY { YisIn1_2(); } + > } +1->Emitted(108, 9) Source(76, 5) + SourceIndex(0) 2 >Emitted(108, 13) Source(76, 19) + SourceIndex(0) 3 >Emitted(108, 23) Source(76, 29) + SourceIndex(0) -4 >Emitted(108, 24) Source(87, 6) + SourceIndex(0) +4 >Emitted(108, 26) Source(76, 19) + SourceIndex(0) +5 >Emitted(108, 52) Source(76, 29) + SourceIndex(0) +6 >Emitted(108, 57) Source(76, 19) + SourceIndex(0) +7 >Emitted(108, 83) Source(76, 29) + SourceIndex(0) +8 >Emitted(108, 90) Source(87, 6) + SourceIndex(0) --- >>> (function (SubModule2) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^ -4 > ^^-> -1-> +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > 2 > export module 3 > SubModule2 -1->Emitted(109, 9) Source(76, 5) + SourceIndex(0) +1 >Emitted(109, 9) Source(76, 5) + SourceIndex(0) 2 >Emitted(109, 20) Source(76, 19) + SourceIndex(0) 3 >Emitted(109, 30) Source(76, 29) + SourceIndex(0) --- ->>> var SubSubModule2; +>>> var SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}); 1->^^^^^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ 1-> { > 2 > export module 3 > SubSubModule2 -4 > { - > // No code here since these are the mirror of the above calls - > export class ClassA { public AisIn1_2_2() { } } - > export class ClassB { public BisIn1_2_2() { } } - > export class ClassC { public CisIn1_2_2() { } } - > export interface InterfaceY { YisIn1_2_2(); } - > interface NonExportedInterfaceQ { } - > } +4 > +5 > SubSubModule2 +6 > +7 > SubSubModule2 +8 > { + > // No code here since these are the mirror of the above calls + > export class ClassA { public AisIn1_2_2() { } } + > export class ClassB { public BisIn1_2_2() { } } + > export class ClassC { public CisIn1_2_2() { } } + > export interface InterfaceY { YisIn1_2_2(); } + > interface NonExportedInterfaceQ { } + > } 1->Emitted(110, 13) Source(77, 9) + SourceIndex(0) 2 >Emitted(110, 17) Source(77, 23) + SourceIndex(0) 3 >Emitted(110, 30) Source(77, 36) + SourceIndex(0) -4 >Emitted(110, 31) Source(84, 10) + SourceIndex(0) +4 >Emitted(110, 33) Source(77, 23) + SourceIndex(0) +5 >Emitted(110, 57) Source(77, 36) + SourceIndex(0) +6 >Emitted(110, 62) Source(77, 23) + SourceIndex(0) +7 >Emitted(110, 86) Source(77, 36) + SourceIndex(0) +8 >Emitted(110, 93) Source(84, 10) + SourceIndex(0) --- >>> (function (SubSubModule2) { -1->^^^^^^^^^^^^ +1 >^^^^^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > export module 3 > SubSubModule2 -1->Emitted(111, 13) Source(77, 9) + SourceIndex(0) +1 >Emitted(111, 13) Source(77, 9) + SourceIndex(0) 2 >Emitted(111, 24) Source(77, 23) + SourceIndex(0) 3 >Emitted(111, 37) Source(77, 36) + SourceIndex(0) --- @@ -2360,7 +2383,6 @@ sourceFile:typeResolution.ts 2 > ^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > ClassC 3 > { public CisIn1_2_2() { } } @@ -2370,55 +2392,40 @@ sourceFile:typeResolution.ts 3 >Emitted(133, 46) Source(81, 60) + SourceIndex(0) 4 >Emitted(133, 47) Source(81, 60) + SourceIndex(0) --- ->>> })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {})); -1->^^^^^^^^^^^^ +>>> })(SubSubModule2); +1 >^^^^^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +1 > > export interface InterfaceY { YisIn1_2_2(); } > interface NonExportedInterfaceQ { } > 2 > } 3 > 4 > SubSubModule2 -5 > -6 > SubSubModule2 -7 > -8 > SubSubModule2 -9 > { - > // No code here since these are the mirror of the above calls - > export class ClassA { public AisIn1_2_2() { } } - > export class ClassB { public BisIn1_2_2() { } } - > export class ClassC { public CisIn1_2_2() { } } - > export interface InterfaceY { YisIn1_2_2(); } - > interface NonExportedInterfaceQ { } - > } -1->Emitted(134, 13) Source(84, 9) + SourceIndex(0) +5 > { + > // No code here since these are the mirror of the above calls + > export class ClassA { public AisIn1_2_2() { } } + > export class ClassB { public BisIn1_2_2() { } } + > export class ClassC { public CisIn1_2_2() { } } + > export interface InterfaceY { YisIn1_2_2(); } + > interface NonExportedInterfaceQ { } + > } +1 >Emitted(134, 13) Source(84, 9) + SourceIndex(0) 2 >Emitted(134, 14) Source(84, 10) + SourceIndex(0) 3 >Emitted(134, 16) Source(77, 23) + SourceIndex(0) 4 >Emitted(134, 29) Source(77, 36) + SourceIndex(0) -5 >Emitted(134, 32) Source(77, 23) + SourceIndex(0) -6 >Emitted(134, 56) Source(77, 36) + SourceIndex(0) -7 >Emitted(134, 61) Source(77, 23) + SourceIndex(0) -8 >Emitted(134, 85) Source(77, 36) + SourceIndex(0) -9 >Emitted(134, 93) Source(84, 10) + SourceIndex(0) +5 >Emitted(134, 31) Source(84, 10) + SourceIndex(0) --- ->>> })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {})); +>>> })(SubModule2); 1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ +5 > ^^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > > > export interface InterfaceY { YisIn1_2(); } @@ -2426,39 +2433,31 @@ sourceFile:typeResolution.ts 2 > } 3 > 4 > SubModule2 -5 > -6 > SubModule2 -7 > -8 > SubModule2 -9 > { - > export module SubSubModule2 { - > // No code here since these are the mirror of the above calls - > export class ClassA { public AisIn1_2_2() { } } - > export class ClassB { public BisIn1_2_2() { } } - > export class ClassC { public CisIn1_2_2() { } } - > export interface InterfaceY { YisIn1_2_2(); } - > interface NonExportedInterfaceQ { } - > } - > - > export interface InterfaceY { YisIn1_2(); } - > } +5 > { + > export module SubSubModule2 { + > // No code here since these are the mirror of the above calls + > export class ClassA { public AisIn1_2_2() { } } + > export class ClassB { public BisIn1_2_2() { } } + > export class ClassC { public CisIn1_2_2() { } } + > export interface InterfaceY { YisIn1_2_2(); } + > interface NonExportedInterfaceQ { } + > } + > + > export interface InterfaceY { YisIn1_2(); } + > } 1 >Emitted(135, 9) Source(87, 5) + SourceIndex(0) 2 >Emitted(135, 10) Source(87, 6) + SourceIndex(0) 3 >Emitted(135, 12) Source(76, 19) + SourceIndex(0) 4 >Emitted(135, 22) Source(76, 29) + SourceIndex(0) -5 >Emitted(135, 25) Source(76, 19) + SourceIndex(0) -6 >Emitted(135, 51) Source(76, 29) + SourceIndex(0) -7 >Emitted(135, 56) Source(76, 19) + SourceIndex(0) -8 >Emitted(135, 82) Source(76, 29) + SourceIndex(0) -9 >Emitted(135, 90) Source(87, 6) + SourceIndex(0) +5 >Emitted(135, 24) Source(87, 6) + SourceIndex(0) --- >>> var ClassA = /** @class */ (function () { -1 >^^^^^^^^ +1->^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > +1-> > > -1 >Emitted(136, 9) Source(89, 5) + SourceIndex(0) +1->Emitted(136, 9) Source(89, 5) + SourceIndex(0) --- >>> function ClassA() { 1->^^^^^^^^^^^^ @@ -2508,7 +2507,7 @@ sourceFile:typeResolution.ts 2 > ^ 3 > 4 > ^^^^ -5 > ^^^^^^^^^^^^^^^^^^-> +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > 2 > } 3 > @@ -2520,12 +2519,15 @@ sourceFile:typeResolution.ts 3 >Emitted(141, 10) Source(89, 5) + SourceIndex(0) 4 >Emitted(141, 14) Source(91, 6) + SourceIndex(0) --- ->>> var NotExportedModule; +>>> var NotExportedModule = NotExportedModule || (NotExportedModule = {}); 1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ 1-> > > interface InterfaceY { @@ -2535,23 +2537,31 @@ sourceFile:typeResolution.ts > 2 > module 3 > NotExportedModule -4 > { - > export class ClassA { } - > } +4 > +5 > NotExportedModule +6 > +7 > NotExportedModule +8 > { + > export class ClassA { } + > } 1->Emitted(142, 9) Source(97, 5) + SourceIndex(0) 2 >Emitted(142, 13) Source(97, 12) + SourceIndex(0) 3 >Emitted(142, 30) Source(97, 29) + SourceIndex(0) -4 >Emitted(142, 31) Source(99, 6) + SourceIndex(0) +4 >Emitted(142, 33) Source(97, 12) + SourceIndex(0) +5 >Emitted(142, 50) Source(97, 29) + SourceIndex(0) +6 >Emitted(142, 55) Source(97, 12) + SourceIndex(0) +7 >Emitted(142, 72) Source(97, 29) + SourceIndex(0) +8 >Emitted(142, 79) Source(99, 6) + SourceIndex(0) --- >>> (function (NotExportedModule) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > module 3 > NotExportedModule -1->Emitted(143, 9) Source(97, 5) + SourceIndex(0) +1 >Emitted(143, 9) Source(97, 5) + SourceIndex(0) 2 >Emitted(143, 20) Source(97, 12) + SourceIndex(0) 3 >Emitted(143, 37) Source(97, 29) + SourceIndex(0) --- @@ -2605,7 +2615,6 @@ sourceFile:typeResolution.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^-> 1-> 2 > ClassA 3 > { } @@ -2615,169 +2624,151 @@ sourceFile:typeResolution.ts 3 >Emitted(149, 46) Source(98, 32) + SourceIndex(0) 4 >Emitted(149, 47) Source(98, 32) + SourceIndex(0) --- ->>> })(NotExportedModule || (NotExportedModule = {})); -1->^^^^^^^^ +>>> })(NotExportedModule); +1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +5 > ^^ +1 > > 2 > } 3 > 4 > NotExportedModule -5 > -6 > NotExportedModule -7 > { - > export class ClassA { } - > } -1->Emitted(150, 9) Source(99, 5) + SourceIndex(0) +5 > { + > export class ClassA { } + > } +1 >Emitted(150, 9) Source(99, 5) + SourceIndex(0) 2 >Emitted(150, 10) Source(99, 6) + SourceIndex(0) 3 >Emitted(150, 12) Source(97, 12) + SourceIndex(0) 4 >Emitted(150, 29) Source(97, 29) + SourceIndex(0) -5 >Emitted(150, 34) Source(97, 12) + SourceIndex(0) -6 >Emitted(150, 51) Source(97, 29) + SourceIndex(0) -7 >Emitted(150, 59) Source(99, 6) + SourceIndex(0) +5 >Emitted(150, 31) Source(99, 6) + SourceIndex(0) --- ->>> })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {})); -1->^^^^ +>>> })(TopLevelModule1); +1 >^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^^^^^-> +1 > > 2 > } 3 > 4 > TopLevelModule1 -5 > -6 > TopLevelModule1 -7 > -8 > TopLevelModule1 -9 > { - > export module SubModule1 { - > export module SubSubModule1 { - > export class ClassA { - > public AisIn1_1_1() { - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export class ClassB { - > public BisIn1_1_1() { - > /** Exactly the same as above in AisIn1_1_1 **/ - > - > // Try all qualified names of this type - > var a1: ClassA; a1.AisIn1_1_1(); - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Two variants of qualifying a peer type - > var b1: ClassB; b1.BisIn1_1_1(); - > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); - > - > // Type only accessible from the root - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > - > // Interface reference - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > export interface InterfaceX { XisIn1_1_1(); } - > class NonExportedClassQ { - > constructor() { - > function QQ() { - > /* Sampling of stuff from AisIn1_1_1 */ - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); - > var d1: InterfaceX; d1.XisIn1_1_1(); - > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); - > } - > } - > } - > } - > - > // Should have no effect on S1.SS1.ClassA above because it is not exported - > class ClassA { - > constructor() { - > function AA() { - > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); - > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); - > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); - > - > // Interface reference - > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); - > } - > } - > } - > } - > - > export module SubModule2 { - > export module SubSubModule2 { - > // No code here since these are the mirror of the above calls - > export class ClassA { public AisIn1_2_2() { } } - > export class ClassB { public BisIn1_2_2() { } } - > export class ClassC { public CisIn1_2_2() { } } - > export interface InterfaceY { YisIn1_2_2(); } - > interface NonExportedInterfaceQ { } - > } - > - > export interface InterfaceY { YisIn1_2(); } - > } - > - > class ClassA { - > public AisIn1() { } - > } - > - > interface InterfaceY { - > YisIn1(); - > } - > - > module NotExportedModule { - > export class ClassA { } - > } - > } -1->Emitted(151, 5) Source(100, 1) + SourceIndex(0) +5 > { + > export module SubModule1 { + > export module SubSubModule1 { + > export class ClassA { + > public AisIn1_1_1() { + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export class ClassB { + > public BisIn1_1_1() { + > /** Exactly the same as above in AisIn1_1_1 **/ + > + > // Try all qualified names of this type + > var a1: ClassA; a1.AisIn1_1_1(); + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Two variants of qualifying a peer type + > var b1: ClassB; b1.BisIn1_1_1(); + > var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1(); + > + > // Type only accessible from the root + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > + > // Interface reference + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > export interface InterfaceX { XisIn1_1_1(); } + > class NonExportedClassQ { + > constructor() { + > function QQ() { + > /* Sampling of stuff from AisIn1_1_1 */ + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2(); + > var d1: InterfaceX; d1.XisIn1_1_1(); + > var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3(); + > } + > } + > } + > } + > + > // Should have no effect on S1.SS1.ClassA above because it is not exported + > class ClassA { + > constructor() { + > function AA() { + > var a2: SubSubModule1.ClassA; a2.AisIn1_1_1(); + > var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1(); + > var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1(); + > + > // Interface reference + > var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1(); + > } + > } + > } + > } + > + > export module SubModule2 { + > export module SubSubModule2 { + > // No code here since these are the mirror of the above calls + > export class ClassA { public AisIn1_2_2() { } } + > export class ClassB { public BisIn1_2_2() { } } + > export class ClassC { public CisIn1_2_2() { } } + > export interface InterfaceY { YisIn1_2_2(); } + > interface NonExportedInterfaceQ { } + > } + > + > export interface InterfaceY { YisIn1_2(); } + > } + > + > class ClassA { + > public AisIn1() { } + > } + > + > interface InterfaceY { + > YisIn1(); + > } + > + > module NotExportedModule { + > export class ClassA { } + > } + > } +1 >Emitted(151, 5) Source(100, 1) + SourceIndex(0) 2 >Emitted(151, 6) Source(100, 2) + SourceIndex(0) 3 >Emitted(151, 8) Source(1, 15) + SourceIndex(0) 4 >Emitted(151, 23) Source(1, 30) + SourceIndex(0) -5 >Emitted(151, 26) Source(1, 15) + SourceIndex(0) -6 >Emitted(151, 49) Source(1, 30) + SourceIndex(0) -7 >Emitted(151, 54) Source(1, 15) + SourceIndex(0) -8 >Emitted(151, 77) Source(1, 30) + SourceIndex(0) -9 >Emitted(151, 85) Source(100, 2) + SourceIndex(0) +5 >Emitted(151, 25) Source(100, 2) + SourceIndex(0) --- ->>> var TopLevelModule2; -1 >^^^^ +>>> var TopLevelModule2 = {}; +1->^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > +4 > ^^^^^^ +5 > ^^^^^-> +1-> > > 2 > module @@ -2789,15 +2780,16 @@ sourceFile:typeResolution.ts > } > } > } -1 >Emitted(152, 5) Source(102, 1) + SourceIndex(0) +1->Emitted(152, 5) Source(102, 1) + SourceIndex(0) 2 >Emitted(152, 9) Source(102, 8) + SourceIndex(0) 3 >Emitted(152, 24) Source(102, 23) + SourceIndex(0) -4 >Emitted(152, 25) Source(108, 2) + SourceIndex(0) +4 >Emitted(152, 30) Source(108, 2) + SourceIndex(0) --- >>> (function (TopLevelModule2) { 1->^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > module 3 > TopLevelModule2 @@ -2805,35 +2797,46 @@ sourceFile:typeResolution.ts 2 >Emitted(153, 16) Source(102, 8) + SourceIndex(0) 3 >Emitted(153, 31) Source(102, 23) + SourceIndex(0) --- ->>> var SubModule3; -1 >^^^^^^^^ +>>> var SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}); +1->^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^^^ -4 > ^ -5 > ^^^^^^^^^^-> -1 > { +4 > ^^^ +5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 > ^^^^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^^^^^^ +1-> { > 2 > export module 3 > SubModule3 -4 > { - > export class ClassA { - > public AisIn2_3() { } - > } - > } -1 >Emitted(154, 9) Source(103, 5) + SourceIndex(0) +4 > +5 > SubModule3 +6 > +7 > SubModule3 +8 > { + > export class ClassA { + > public AisIn2_3() { } + > } + > } +1->Emitted(154, 9) Source(103, 5) + SourceIndex(0) 2 >Emitted(154, 13) Source(103, 19) + SourceIndex(0) 3 >Emitted(154, 23) Source(103, 29) + SourceIndex(0) -4 >Emitted(154, 24) Source(107, 6) + SourceIndex(0) +4 >Emitted(154, 26) Source(103, 19) + SourceIndex(0) +5 >Emitted(154, 52) Source(103, 29) + SourceIndex(0) +6 >Emitted(154, 57) Source(103, 19) + SourceIndex(0) +7 >Emitted(154, 83) Source(103, 29) + SourceIndex(0) +8 >Emitted(154, 90) Source(107, 6) + SourceIndex(0) --- >>> (function (SubModule3) { -1->^^^^^^^^ +1 >^^^^^^^^ 2 > ^^^^^^^^^^^ 3 > ^^^^^^^^^^ 4 > ^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> +1 > 2 > export module 3 > SubModule3 -1->Emitted(155, 9) Source(103, 5) + SourceIndex(0) +1 >Emitted(155, 9) Source(103, 5) + SourceIndex(0) 2 >Emitted(155, 20) Source(103, 19) + SourceIndex(0) 3 >Emitted(155, 30) Source(103, 29) + SourceIndex(0) --- @@ -2909,7 +2912,6 @@ sourceFile:typeResolution.ts 2 > ^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^ 4 > ^ -5 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > ClassA 3 > { @@ -2921,69 +2923,52 @@ sourceFile:typeResolution.ts 3 >Emitted(162, 39) Source(106, 10) + SourceIndex(0) 4 >Emitted(162, 40) Source(106, 10) + SourceIndex(0) --- ->>> })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {})); -1->^^^^^^^^ +>>> })(SubModule3); +1 >^^^^^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^ -5 > ^^^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -7 > ^^^^^ -8 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -9 > ^^^^^^^^ -1-> +5 > ^^ +6 > ^^-> +1 > > 2 > } 3 > 4 > SubModule3 -5 > -6 > SubModule3 -7 > -8 > SubModule3 -9 > { - > export class ClassA { - > public AisIn2_3() { } - > } - > } -1->Emitted(163, 9) Source(107, 5) + SourceIndex(0) +5 > { + > export class ClassA { + > public AisIn2_3() { } + > } + > } +1 >Emitted(163, 9) Source(107, 5) + SourceIndex(0) 2 >Emitted(163, 10) Source(107, 6) + SourceIndex(0) 3 >Emitted(163, 12) Source(103, 19) + SourceIndex(0) 4 >Emitted(163, 22) Source(103, 29) + SourceIndex(0) -5 >Emitted(163, 25) Source(103, 19) + SourceIndex(0) -6 >Emitted(163, 51) Source(103, 29) + SourceIndex(0) -7 >Emitted(163, 56) Source(103, 19) + SourceIndex(0) -8 >Emitted(163, 82) Source(103, 29) + SourceIndex(0) -9 >Emitted(163, 90) Source(107, 6) + SourceIndex(0) +5 >Emitted(163, 24) Source(107, 6) + SourceIndex(0) --- ->>> })(TopLevelModule2 || (TopLevelModule2 = {})); -1 >^^^^ +>>> })(TopLevelModule2); +1->^^^^ 2 > ^ 3 > ^^ 4 > ^^^^^^^^^^^^^^^ -5 > ^^^^^ -6 > ^^^^^^^^^^^^^^^ -7 > ^^^^^^^^ -1 > +5 > ^^ +1-> > 2 > } 3 > 4 > TopLevelModule2 -5 > -6 > TopLevelModule2 -7 > { - > export module SubModule3 { - > export class ClassA { - > public AisIn2_3() { } - > } - > } - > } -1 >Emitted(164, 5) Source(108, 1) + SourceIndex(0) +5 > { + > export module SubModule3 { + > export class ClassA { + > public AisIn2_3() { } + > } + > } + > } +1->Emitted(164, 5) Source(108, 1) + SourceIndex(0) 2 >Emitted(164, 6) Source(108, 2) + SourceIndex(0) 3 >Emitted(164, 8) Source(102, 8) + SourceIndex(0) 4 >Emitted(164, 23) Source(102, 23) + SourceIndex(0) -5 >Emitted(164, 28) Source(102, 8) + SourceIndex(0) -6 >Emitted(164, 43) Source(102, 23) + SourceIndex(0) -7 >Emitted(164, 51) Source(108, 2) + SourceIndex(0) +5 >Emitted(164, 25) Source(108, 2) + SourceIndex(0) --- >>>}); >>>//# sourceMappingURL=typeResolution.js.map \ No newline at end of file diff --git a/tests/baselines/reference/typeValueConflict1.js b/tests/baselines/reference/typeValueConflict1.js index f1efa5a631886..ab917b716df99 100644 --- a/tests/baselines/reference/typeValueConflict1.js +++ b/tests/baselines/reference/typeValueConflict1.js @@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { var A = /** @class */ (function () { function A() { @@ -33,8 +33,8 @@ var M1; return A; }()); M1.A = A; -})(M1 || (M1 = {})); -var M2; +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. @@ -45,4 +45,4 @@ var M2; } return B; }(M1.A)); -})(M2 || (M2 = {})); +})(M2); diff --git a/tests/baselines/reference/typeValueConflict2.js b/tests/baselines/reference/typeValueConflict2.js index 24d39bf723a4c..5ee0d1bba6028 100644 --- a/tests/baselines/reference/typeValueConflict2.js +++ b/tests/baselines/reference/typeValueConflict2.js @@ -32,7 +32,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { var A = /** @class */ (function () { function A(a) { @@ -40,8 +40,8 @@ var M1; return A; }()); M1.A = A; -})(M1 || (M1 = {})); -var M2; +})(M1); +var M2 = M2 || (M2 = {}); (function (M2) { var M1 = 0; // Should error. M1 should bind to the variable, not to the module. @@ -52,8 +52,8 @@ var M2; } return B; }(M1.A)); -})(M2 || (M2 = {})); -var M3; +})(M2); +var M3 = M3 || (M3 = {}); (function (M3) { // Shouldn't error var B = /** @class */ (function (_super) { @@ -63,4 +63,4 @@ var M3; } return B; }(M1.A)); -})(M3 || (M3 = {})); +})(M3); diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js index 97edc2d0922ba..e6ecf25e0c1d5 100644 --- a/tests/baselines/reference/typeofANonExportedType.js +++ b/tests/baselines/reference/typeofANonExportedType.js @@ -63,7 +63,7 @@ var C = /** @class */ (function () { }()); var c2; var i2; -var M; +var M = {}; (function (M) { M.foo = ''; var C = /** @class */ (function () { @@ -72,11 +72,11 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); -var E; +})(M); +var E = {}; (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); function foo() { } (function (foo) { foo.y = 1; @@ -86,4 +86,4 @@ function foo() { } return C; }()); foo.C = C; -})(foo || (foo = {})); +})(foo); diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js index 54d1e85c32ceb..56c95a54740d9 100644 --- a/tests/baselines/reference/typeofAnExportedType.js +++ b/tests/baselines/reference/typeofAnExportedType.js @@ -64,7 +64,7 @@ var C = /** @class */ (function () { exports.C = C; var c2; var i2; -var M; +var M = {}; (function (M) { M.foo = ''; var C = /** @class */ (function () { @@ -73,12 +73,12 @@ var M; return C; }()); M.C = C; -})(M = exports.M || (exports.M = {})); +})(M); exports.Z = M; -var E; +var E = {}; (function (E) { E[E["A"] = 0] = "A"; -})(E = exports.E || (exports.E = {})); +})(E); function foo() { } exports.foo = foo; (function (foo) { @@ -89,4 +89,4 @@ exports.foo = foo; return C; }()); foo.C = C; -})(foo = exports.foo || (exports.foo = {})); +})(foo); diff --git a/tests/baselines/reference/typeofEnum.js b/tests/baselines/reference/typeofEnum.js index b8286fac7135f..047fe4046663e 100644 --- a/tests/baselines/reference/typeofEnum.js +++ b/tests/baselines/reference/typeofEnum.js @@ -8,10 +8,10 @@ var e1: typeof E; e1.e1; //// [typeofEnum.js] -var E; +var E = E || (E = {}); (function (E) { E[E["e1"] = 0] = "e1"; E[E["e2"] = 1] = "e2"; -})(E || (E = {})); +})(E); var e1; e1.e1; diff --git a/tests/baselines/reference/typeofInternalModules.js b/tests/baselines/reference/typeofInternalModules.js index 03c41d9e02845..342d43979eb8f 100644 --- a/tests/baselines/reference/typeofInternalModules.js +++ b/tests/baselines/reference/typeofInternalModules.js @@ -25,9 +25,9 @@ x7 = importInst; //// [typeofInternalModules.js] -var Outer; +var Outer = Outer || (Outer = {}); (function (Outer) { - var instantiated; + var instantiated = Outer.instantiated || (Outer.instantiated = {}); (function (instantiated) { var C = /** @class */ (function () { function C() { @@ -35,8 +35,8 @@ var Outer; return C; }()); instantiated.C = C; - })(instantiated = Outer.instantiated || (Outer.instantiated = {})); -})(Outer || (Outer = {})); + })(instantiated); +})(Outer); var importInst = Outer.instantiated; var x1 = importInst.C; var x2 = new x1(); diff --git a/tests/baselines/reference/typeofModuleWithoutExports.js b/tests/baselines/reference/typeofModuleWithoutExports.js index 907e178615c53..b0211124bc193 100644 --- a/tests/baselines/reference/typeofModuleWithoutExports.js +++ b/tests/baselines/reference/typeofModuleWithoutExports.js @@ -9,7 +9,7 @@ module M { var r: typeof M; //// [typeofModuleWithoutExports.js] -var M; +var M = M || (M = {}); (function (M) { var x = 1; var C = /** @class */ (function () { @@ -17,5 +17,5 @@ var M; } return C; }()); -})(M || (M = {})); +})(M); var r; diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js index ca72b70973a25..ef2ddab8d7ed3 100644 --- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js @@ -94,9 +94,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsString1 = typeof ANY1; diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js index e5ad1cf8bbe1d..729d42bcc9d72 100644 --- a/tests/baselines/reference/typeofOperatorWithBooleanType.js +++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js @@ -60,9 +60,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsString1 = typeof BOOLEAN; diff --git a/tests/baselines/reference/typeofOperatorWithEnumType.js b/tests/baselines/reference/typeofOperatorWithEnumType.js index 2e2963b0955aa..0797c3fcf1bb8 100644 --- a/tests/baselines/reference/typeofOperatorWithEnumType.js +++ b/tests/baselines/reference/typeofOperatorWithEnumType.js @@ -29,16 +29,16 @@ z: typeof ENUM1; //// [typeofOperatorWithEnumType.js] // typeof operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsString1 = typeof ENUM; @@ -55,9 +55,9 @@ typeof ENUM1; typeof ENUM1["B"]; typeof ENUM, ENUM1; // use typeof in type query -var z; +var z = z || (z = {}); (function (z) { -})(z || (z = {})); +})(z); ; z: typeof ENUM; z: typeof ENUM1; diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js index 4ee59ba786970..fa216d54aae8c 100644 --- a/tests/baselines/reference/typeofOperatorWithNumberType.js +++ b/tests/baselines/reference/typeofOperatorWithNumberType.js @@ -68,9 +68,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsString1 = typeof NUMBER; diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js index 4dce5b072cb4f..7745223b13a6b 100644 --- a/tests/baselines/reference/typeofOperatorWithStringType.js +++ b/tests/baselines/reference/typeofOperatorWithStringType.js @@ -68,9 +68,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsString1 = typeof STRING; diff --git a/tests/baselines/reference/unaryPlus.js b/tests/baselines/reference/unaryPlus.js index bc070c9655bac..432b98cd1aa0d 100644 --- a/tests/baselines/reference/unaryPlus.js +++ b/tests/baselines/reference/unaryPlus.js @@ -15,11 +15,11 @@ var z = ~"3"; // should be valid // allowed per spec var a = +1; var b = +""; -var E; +var E = E || (E = {}); (function (E) { E[E["some"] = 0] = "some"; E[E["thing"] = 1] = "thing"; -})(E || (E = {})); +})(E); ; var c = +E.some; // also allowed, used to be errors diff --git a/tests/baselines/reference/undeclaredBase.js b/tests/baselines/reference/undeclaredBase.js index 8c48576d6afdc..805cffb29c8f0 100644 --- a/tests/baselines/reference/undeclaredBase.js +++ b/tests/baselines/reference/undeclaredBase.js @@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function (_super) { __extends(C, _super); @@ -27,4 +27,4 @@ var M; return C; }(M.I)); M.C = C; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/undeclaredMethod.js b/tests/baselines/reference/undeclaredMethod.js index 4b269fd0bc304..a27b899350f01 100644 --- a/tests/baselines/reference/undeclaredMethod.js +++ b/tests/baselines/reference/undeclaredMethod.js @@ -13,7 +13,7 @@ c.saltbar(); // crash //// [undeclaredMethod.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -22,7 +22,7 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); var c = new M.C(); c.salt(); // cool c.saltbar(); // crash diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.js b/tests/baselines/reference/undefinedAssignableToEveryType.js index de64f97f70b17..949551587caba 100644 --- a/tests/baselines/reference/undefinedAssignableToEveryType.js +++ b/tests/baselines/reference/undefinedAssignableToEveryType.js @@ -50,10 +50,10 @@ var C = /** @class */ (function () { }()); var ac; var ai; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var ae; var b = undefined; var c = undefined; diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js index c2a2647814e9d..8d42d109f81cb 100644 --- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js +++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js @@ -246,10 +246,10 @@ var D10 = /** @class */ (function (_super) { } return D10; }(Base)); -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); var D11 = /** @class */ (function (_super) { __extends(D11, _super); function D11() { @@ -260,7 +260,7 @@ var D11 = /** @class */ (function (_super) { function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var D12 = /** @class */ (function (_super) { __extends(D12, _super); function D12() { @@ -275,7 +275,7 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); var D13 = /** @class */ (function (_super) { __extends(D13, _super); function D13() { diff --git a/tests/baselines/reference/undefinedTypeAssignment4.js b/tests/baselines/reference/undefinedTypeAssignment4.js index 227111db2546c..a9fd118a86291 100644 --- a/tests/baselines/reference/undefinedTypeAssignment4.js +++ b/tests/baselines/reference/undefinedTypeAssignment4.js @@ -20,6 +20,6 @@ var undefined = /** @class */ (function () { }()); (function (undefined) { undefined.x = 42; -})(undefined || (undefined = {})); +})(undefined); var x; var y; diff --git a/tests/baselines/reference/underscoreEscapedNameInEnum.js b/tests/baselines/reference/underscoreEscapedNameInEnum.js index db40f126739cc..e8302a70d24d9 100644 --- a/tests/baselines/reference/underscoreEscapedNameInEnum.js +++ b/tests/baselines/reference/underscoreEscapedNameInEnum.js @@ -6,8 +6,8 @@ enum E { //// [underscoreEscapedNameInEnum.js] -var E; +var E = E || (E = {}); (function (E) { E[E["__foo"] = 1] = "__foo"; E[E["bar"] = 2] = "bar"; -})(E || (E = {})); +})(E); diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.js b/tests/baselines/reference/unexportedInstanceClassVariables.js index 470ed4c1ff837..91980e4e9282d 100644 --- a/tests/baselines/reference/unexportedInstanceClassVariables.js +++ b/tests/baselines/reference/unexportedInstanceClassVariables.js @@ -13,14 +13,14 @@ module M{ //// [unexportedInstanceClassVariables.js] -var M; +var M = M || (M = {}); (function (M) { var A = /** @class */ (function () { function A(val) { } return A; }()); -})(M || (M = {})); +})(M); (function (M) { var A = /** @class */ (function () { function A() { @@ -28,4 +28,4 @@ var M; return A; }()); var a = new A(); -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js index 70cdcf3c31fd9..1f7ed86f1191e 100644 --- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js +++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js @@ -144,11 +144,11 @@ interface I20 { } //// [unionSubtypeIfEveryConstituentTypeIsSubtype.js] -var e; +var e = e || (e = {}); (function (e) { e[e["e1"] = 0] = "e1"; e[e["e2"] = 1] = "e2"; -})(e || (e = {})); +})(e); var A = /** @class */ (function () { function A() { } @@ -159,14 +159,14 @@ var A2 = /** @class */ (function () { } return A2; }()); -var E2; +var E2 = E2 || (E2 = {}); (function (E2) { E2[E2["A"] = 0] = "A"; -})(E2 || (E2 = {})); +})(E2); function f() { } (function (f) { f.bar = 1; -})(f || (f = {})); +})(f); var c = /** @class */ (function () { function c() { } @@ -174,4 +174,4 @@ var c = /** @class */ (function () { }()); (function (c) { c.bar = 1; -})(c || (c = {})); +})(c); diff --git a/tests/baselines/reference/unknownSymbols2.js b/tests/baselines/reference/unknownSymbols2.js index 034393527041a..69aa4f615209f 100644 --- a/tests/baselines/reference/unknownSymbols2.js +++ b/tests/baselines/reference/unknownSymbols2.js @@ -31,7 +31,7 @@ module M { } //// [unknownSymbols2.js] -var M; +var M = M || (M = {}); (function (M) { var x; var y = x + asdf; @@ -52,8 +52,8 @@ var M; } var a = function () { return asdf; }; var b = function (asdf) { return qwerty; }; - var N; + var N = N || (N = {}); (function (N) { var x = 1; - })(N || (N = {})); -})(M || (M = {})); + })(N); +})(M); diff --git a/tests/baselines/reference/unspecializedConstraints.js b/tests/baselines/reference/unspecializedConstraints.js index a1ef64044c79b..0cdaa8b799d96 100644 --- a/tests/baselines/reference/unspecializedConstraints.js +++ b/tests/baselines/reference/unspecializedConstraints.js @@ -167,7 +167,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var ts; +var ts = ts || (ts = {}); (function (ts) { var Symbol = /** @class */ (function () { function Symbol() { @@ -254,11 +254,11 @@ var ts; }; return Property; }(Symbol)); - var PropertyFlags; + var PropertyFlags = PropertyFlags || (PropertyFlags = {}); (function (PropertyFlags) { PropertyFlags[PropertyFlags["Optional"] = 1] = "Optional"; PropertyFlags[PropertyFlags["Private"] = 2] = "Private"; - })(PropertyFlags || (PropertyFlags = {})); + })(PropertyFlags); var Signature = /** @class */ (function (_super) { __extends(Signature, _super); function Signature(typeParameters, parameters, returnType) { @@ -296,11 +296,11 @@ var ts; }; return Parameter; }(Symbol)); - var ParameterFlags; + var ParameterFlags = ParameterFlags || (ParameterFlags = {}); (function (ParameterFlags) { ParameterFlags[ParameterFlags["Optional"] = 1] = "Optional"; ParameterFlags[ParameterFlags["Rest"] = 2] = "Rest"; - })(ParameterFlags || (ParameterFlags = {})); + })(ParameterFlags); var hasOwnProperty = Object.prototype.hasOwnProperty; function getProperty(map, key) { if (!hasOwnProperty.call(map, key)) @@ -338,4 +338,4 @@ var ts; } return true; } -})(ts || (ts = {})); +})(ts); diff --git a/tests/baselines/reference/unusedClassesinModule1.js b/tests/baselines/reference/unusedClassesinModule1.js index 3739a6cd63686..145337144d247 100644 --- a/tests/baselines/reference/unusedClassesinModule1.js +++ b/tests/baselines/reference/unusedClassesinModule1.js @@ -7,7 +7,7 @@ module A { } //// [unusedClassesinModule1.js] -var A; +var A = A || (A = {}); (function (A) { var Calculator = /** @class */ (function () { function Calculator() { @@ -16,4 +16,4 @@ var A; }; return Calculator; }()); -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/unusedClassesinNamespace1.js b/tests/baselines/reference/unusedClassesinNamespace1.js index b0c085c127dfc..4c9d2aa33b0d8 100644 --- a/tests/baselines/reference/unusedClassesinNamespace1.js +++ b/tests/baselines/reference/unusedClassesinNamespace1.js @@ -6,11 +6,11 @@ namespace Validation { } //// [unusedClassesinNamespace1.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { } return c1; }()); -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedClassesinNamespace2.js b/tests/baselines/reference/unusedClassesinNamespace2.js index 039d34f2ca09d..78aec7ecb40c4 100644 --- a/tests/baselines/reference/unusedClassesinNamespace2.js +++ b/tests/baselines/reference/unusedClassesinNamespace2.js @@ -10,7 +10,7 @@ namespace Validation { } //// [unusedClassesinNamespace2.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -23,4 +23,4 @@ var Validation; return c2; }()); Validation.c2 = c2; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedClassesinNamespace3.js b/tests/baselines/reference/unusedClassesinNamespace3.js index 67a31a67a449f..d1839bf847c27 100644 --- a/tests/baselines/reference/unusedClassesinNamespace3.js +++ b/tests/baselines/reference/unusedClassesinNamespace3.js @@ -12,7 +12,7 @@ namespace Validation { } //// [unusedClassesinNamespace3.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -26,4 +26,4 @@ var Validation; }()); Validation.c2 = c2; Validation.a = new c1(); -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedClassesinNamespace4.js b/tests/baselines/reference/unusedClassesinNamespace4.js index df7d1f6b0e231..306da0cfe147c 100644 --- a/tests/baselines/reference/unusedClassesinNamespace4.js +++ b/tests/baselines/reference/unusedClassesinNamespace4.js @@ -27,7 +27,7 @@ var __extends = (this && this.__extends) || (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -47,4 +47,4 @@ var Validation; } return c3; }(c1)); -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedClassesinNamespace5.js b/tests/baselines/reference/unusedClassesinNamespace5.js index 0c4ef8ee44be7..b7f7ad39ce3d3 100644 --- a/tests/baselines/reference/unusedClassesinNamespace5.js +++ b/tests/baselines/reference/unusedClassesinNamespace5.js @@ -14,7 +14,7 @@ namespace Validation { } //// [unusedClassesinNamespace5.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -32,4 +32,4 @@ var Validation; } return c3; }()); -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces1.js b/tests/baselines/reference/unusedFunctionsinNamespaces1.js index c2f1621c846f1..aa6490246f1e2 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces1.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces1.js @@ -5,8 +5,8 @@ namespace Validation { } //// [unusedFunctionsinNamespaces1.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { function function1() { } -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces2.js b/tests/baselines/reference/unusedFunctionsinNamespaces2.js index 7cd31eac585d8..c6bae081307f9 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces2.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces2.js @@ -5,8 +5,8 @@ namespace Validation { } //// [unusedFunctionsinNamespaces2.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var function1 = function () { }; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces3.js b/tests/baselines/reference/unusedFunctionsinNamespaces3.js index 653fbfee180e9..f2973d5ae9a4c 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces3.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces3.js @@ -5,8 +5,8 @@ namespace Validation { } //// [unusedFunctionsinNamespaces3.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var function1 = function (param1) { }; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces4.js b/tests/baselines/reference/unusedFunctionsinNamespaces4.js index 2abe7ac1909f9..dd74fcdfb33c2 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces4.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces4.js @@ -9,11 +9,11 @@ namespace Validation { } //// [unusedFunctionsinNamespaces4.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var function1 = function () { }; function function2() { } Validation.function2 = function2; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces5.js b/tests/baselines/reference/unusedFunctionsinNamespaces5.js index 48a08295f3da5..67163868eff9f 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces5.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces5.js @@ -17,7 +17,7 @@ namespace Validation { } //// [unusedFunctionsinNamespaces5.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var function1 = function () { }; @@ -29,4 +29,4 @@ var Validation; } function function4() { } -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedFunctionsinNamespaces6.js b/tests/baselines/reference/unusedFunctionsinNamespaces6.js index c69eba626f89b..96db23450433c 100644 --- a/tests/baselines/reference/unusedFunctionsinNamespaces6.js +++ b/tests/baselines/reference/unusedFunctionsinNamespaces6.js @@ -19,7 +19,7 @@ namespace Validation { } //// [unusedFunctionsinNamespaces6.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var function1 = function () { }; @@ -32,4 +32,4 @@ var Validation; function function4() { } Validation.a = function3; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedIdentifiersConsolidated1.js b/tests/baselines/reference/unusedIdentifiersConsolidated1.js index b18ab04d08e29..266421b14c2b0 100644 --- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js +++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js @@ -135,7 +135,7 @@ var Dummy = /** @class */ (function () { }()); var user = "Jane User"; var user2 = "Jane2 User2"; -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var lettersRegexp = /^[A-Za-z]+$/; var numberRegexp = /^[0-9]+$/; @@ -164,8 +164,8 @@ var Validation; } return dummy; }()); -})(Validation || (Validation = {})); -var Greeter; +})(Validation); +var Greeter = Greeter || (Greeter = {}); (function (Greeter) { var class1 = /** @class */ (function () { function class1() { @@ -191,4 +191,4 @@ var Greeter; return class4; }()); Greeter.class4 = class4; -})(Greeter || (Greeter = {})); +})(Greeter); diff --git a/tests/baselines/reference/unusedImports10.js b/tests/baselines/reference/unusedImports10.js index 7c0341d821e55..7d6a114a42f6f 100644 --- a/tests/baselines/reference/unusedImports10.js +++ b/tests/baselines/reference/unusedImports10.js @@ -11,7 +11,7 @@ module B { } //// [unusedImports10.js] -var A; +var A = A || (A = {}); (function (A) { var Calculator = /** @class */ (function () { function Calculator() { @@ -21,4 +21,4 @@ var A; return Calculator; }()); A.Calculator = Calculator; -})(A || (A = {})); +})(A); diff --git a/tests/baselines/reference/unusedInterfaceinNamespace4.js b/tests/baselines/reference/unusedInterfaceinNamespace4.js index 78447bc756a0a..b039bf202f807 100644 --- a/tests/baselines/reference/unusedInterfaceinNamespace4.js +++ b/tests/baselines/reference/unusedInterfaceinNamespace4.js @@ -18,7 +18,7 @@ namespace Validation { } //// [unusedInterfaceinNamespace4.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -26,4 +26,4 @@ var Validation; return c1; }()); Validation.c1 = c1; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedInterfaceinNamespace5.js b/tests/baselines/reference/unusedInterfaceinNamespace5.js index e4aba1deba3e8..263cb094efdc0 100644 --- a/tests/baselines/reference/unusedInterfaceinNamespace5.js +++ b/tests/baselines/reference/unusedInterfaceinNamespace5.js @@ -24,7 +24,7 @@ namespace Validation { } //// [unusedInterfaceinNamespace5.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var c1 = /** @class */ (function () { function c1() { @@ -32,4 +32,4 @@ var Validation; return c1; }()); Validation.c1 = c1; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedLocalsAndParameters.js b/tests/baselines/reference/unusedLocalsAndParameters.js index 5039a9c1712a7..d8d7563262502 100644 --- a/tests/baselines/reference/unusedLocalsAndParameters.js +++ b/tests/baselines/reference/unusedLocalsAndParameters.js @@ -165,9 +165,9 @@ finally { var c = 0; } // in a namespace -var N; +var N = {}; (function (N) { var x; -})(N || (N = {})); +})(N); for (var x = void 0, z = (void 0).z; (x); ) ; diff --git a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js index df8b7d7e48731..2482a9bfefbae 100644 --- a/tests/baselines/reference/unusedLocalsAndParametersDeferred.js +++ b/tests/baselines/reference/unusedLocalsAndParametersDeferred.js @@ -315,11 +315,11 @@ finally { }); } // in a namespace -var N; +var N = {}; (function (N) { var x; defered(function () { x; }); -})(N || (N = {})); +})(N); N; diff --git a/tests/baselines/reference/unusedLocalsStartingWithUnderscore.js b/tests/baselines/reference/unusedLocalsStartingWithUnderscore.js index 54b029445e39d..50dcd5ec9c130 100644 --- a/tests/baselines/reference/unusedLocalsStartingWithUnderscore.js +++ b/tests/baselines/reference/unusedLocalsStartingWithUnderscore.js @@ -20,11 +20,11 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) { var _1 = _a[_i]; } for (var _2 in []) { } -var _ns; +var _ns = {}; (function (_ns) { var _; for (var _i = 0, _a = []; _i < _a.length; _i++) { var _3 = _a[_i]; } for (var _4 in []) { } -})(_ns || (_ns = {})); +})(_ns); diff --git a/tests/baselines/reference/unusedVariablesinNamespaces1.js b/tests/baselines/reference/unusedVariablesinNamespaces1.js index 91d3f0666171d..8f6ad3ccb11ca 100644 --- a/tests/baselines/reference/unusedVariablesinNamespaces1.js +++ b/tests/baselines/reference/unusedVariablesinNamespaces1.js @@ -4,7 +4,7 @@ namespace Validation { } //// [unusedVariablesinNamespaces1.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var lettersRegexp = /^[A-Za-z]+$/; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedVariablesinNamespaces2.js b/tests/baselines/reference/unusedVariablesinNamespaces2.js index c47b4a2beff48..450ea777801f6 100644 --- a/tests/baselines/reference/unusedVariablesinNamespaces2.js +++ b/tests/baselines/reference/unusedVariablesinNamespaces2.js @@ -11,7 +11,7 @@ namespace Validation { } //// [unusedVariablesinNamespaces2.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var lettersRegexp = /^[A-Za-z]+$/; var numberRegexp = /^[0-9]+$/; @@ -24,4 +24,4 @@ var Validation; return LettersOnlyValidator; }()); Validation.LettersOnlyValidator = LettersOnlyValidator; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/unusedVariablesinNamespaces3.js b/tests/baselines/reference/unusedVariablesinNamespaces3.js index 4cd23c58a82fc..7f9a60b84b0ca 100644 --- a/tests/baselines/reference/unusedVariablesinNamespaces3.js +++ b/tests/baselines/reference/unusedVariablesinNamespaces3.js @@ -12,7 +12,7 @@ namespace Validation { } //// [unusedVariablesinNamespaces3.js] -var Validation; +var Validation = Validation || (Validation = {}); (function (Validation) { var lettersRegexp = /^[A-Za-z]+$/; var numberRegexp = /^[0-9]+$/; @@ -26,4 +26,4 @@ var Validation; return LettersOnlyValidator; }()); Validation.LettersOnlyValidator = LettersOnlyValidator; -})(Validation || (Validation = {})); +})(Validation); diff --git a/tests/baselines/reference/useBeforeDeclaration.js b/tests/baselines/reference/useBeforeDeclaration.js index 0c62ee4d7c733..53125e53fe448 100644 --- a/tests/baselines/reference/useBeforeDeclaration.js +++ b/tests/baselines/reference/useBeforeDeclaration.js @@ -21,7 +21,7 @@ namespace ts { //// [test.js] -var ts; +var ts = ts || (ts = {}); (function (ts) { function printVersion() { log("Version: " + ts.sys.version); // the call of sys.version is deferred, should not report an error. @@ -30,8 +30,8 @@ var ts; function log(info) { } ts.log = log; -})(ts || (ts = {})); -var ts; +})(ts); +var ts = ts || (ts = {}); (function (ts) { ts.sys = { version: "2.0.5" }; -})(ts || (ts = {})); +})(ts); diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.js b/tests/baselines/reference/useObjectValuesAndEntries1.js index 7b18fb1fcd92a..772e2aeb86f79 100644 --- a/tests/baselines/reference/useObjectValuesAndEntries1.js +++ b/tests/baselines/reference/useObjectValuesAndEntries1.js @@ -47,11 +47,11 @@ var values3 = Object.values({}); // {}[] var a = ["a", "b", "c"]; var entries4 = Object.entries(a); // [string, string][] var values4 = Object.values(a); // string[] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; -})(E || (E = {})); +})(E); var entries5 = Object.entries(E); // [string, any][] var values5 = Object.values(E); // any[] var i = {}; diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js index f39bf0d83a273..b9d0790090e1b 100644 --- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js +++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js @@ -20,7 +20,7 @@ var c: { name: string }; var c: C.a.B.Id; //// [usingModuleWithExportImportInValuePosition.js] -var A; +var A = A || (A = {}); (function (A) { A.x = 'hello world'; var Point = /** @class */ (function () { @@ -31,11 +31,11 @@ var A; return Point; }()); A.Point = Point; -})(A || (A = {})); -var C; +})(A); +var C = C || (C = {}); (function (C) { C.a = A; -})(C || (C = {})); +})(C); var a = C.a.x; var b = new C.a.Point(0, 0); var c; diff --git a/tests/baselines/reference/validEnumAssignments.js b/tests/baselines/reference/validEnumAssignments.js index 4cb975c42e424..12a0b7a4af372 100644 --- a/tests/baselines/reference/validEnumAssignments.js +++ b/tests/baselines/reference/validEnumAssignments.js @@ -27,11 +27,11 @@ e = 1.0; e = -1; //// [validEnumAssignments.js] -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; E[E["B"] = 1] = "B"; -})(E || (E = {})); +})(E); var n; var a; var e; diff --git a/tests/baselines/reference/validNullAssignments.js b/tests/baselines/reference/validNullAssignments.js index 7b8f1de38b998..290f1a0d5b69a 100644 --- a/tests/baselines/reference/validNullAssignments.js +++ b/tests/baselines/reference/validNullAssignments.js @@ -37,10 +37,10 @@ var c = null; var d = null; var e = null; e = null; // ok -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); E.A = null; // error var C = /** @class */ (function () { function C() { @@ -53,10 +53,10 @@ C = null; // error var g; g = null; // ok I = null; // error -var M; +var M = M || (M = {}); (function (M) { M.x = 1; -})(M || (M = {})); +})(M); M = null; // error var h = null; function i(a) { diff --git a/tests/baselines/reference/validNumberAssignments.js b/tests/baselines/reference/validNumberAssignments.js index e81a5fd1ecb97..ac30c2e39a326 100644 --- a/tests/baselines/reference/validNumberAssignments.js +++ b/tests/baselines/reference/validNumberAssignments.js @@ -14,10 +14,10 @@ var x = 1; var a = x; var b = x; var c = x; -var E; +var E = E || (E = {}); (function (E) { E[E["A"] = 0] = "A"; -})(E || (E = {})); +})(E); ; var d = x; var e = E.A; diff --git a/tests/baselines/reference/varBlock.js b/tests/baselines/reference/varBlock.js index a3309338ecb3c..97c5e0ed3f2f9 100644 --- a/tests/baselines/reference/varBlock.js +++ b/tests/baselines/reference/varBlock.js @@ -40,10 +40,10 @@ declare var c; declare var c = 10; //// [varBlock.js] -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { m2.b2 = 10; -})(m2 || (m2 = {})); -var m3; +})(m2); +var m3 = m3 || (m3 = {}); (function (m3) { -})(m3 || (m3 = {})); +})(m3); diff --git a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js index db5bad4009ab6..303d51c1ab744 100644 --- a/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js +++ b/tests/baselines/reference/varNameConflictsWithImportInDifferentPartOfModule.js @@ -8,11 +8,11 @@ module M1 { } //// [varNameConflictsWithImportInDifferentPartOfModule.js] -var M1; +var M1 = M1 || (M1 = {}); (function (M1) { M1.q = 5; M1.s = ''; -})(M1 || (M1 = {})); +})(M1); (function (M1) { M1.q = M1.s; // Should be an error but isn't -})(M1 || (M1 = {})); +})(M1); diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js index 9e5aa0c797255..b45b6fe919307 100644 --- a/tests/baselines/reference/vararg.js +++ b/tests/baselines/reference/vararg.js @@ -39,7 +39,7 @@ result+=x.fonly("a","b","c","d"); //ok //// [vararg.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -76,7 +76,7 @@ var M; return C; }()); M.C = C; -})(M || (M = {})); +})(M); var x = new M.C(); var result = ""; result += x.f(x, 3, 3); // bad first param diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js index 8f774772c626d..6eb190023312a 100644 --- a/tests/baselines/reference/vardecl.js +++ b/tests/baselines/reference/vardecl.js @@ -128,7 +128,7 @@ var d2; var n2; var n4; var d4; -var m2; +var m2 = m2 || (m2 = {}); (function (m2) { m2.b2 = 10; var m1; @@ -149,7 +149,7 @@ var m2; m2.C2 = C2; var m; var b23; -})(m2 || (m2 = {})); +})(m2); var a22, b22 = 10, c22 = 30; var nn; var normalVar; diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js index e8af78ca5983a..81babc1128aac 100644 --- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js +++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js @@ -126,10 +126,10 @@ class FileService { } //// [variableDeclaratorResolvedDuringContextualTyping.js] -var WinJS; +var WinJS = WinJS || (WinJS = {}); (function (WinJS) { -})(WinJS || (WinJS = {})); -var Errors; +})(WinJS); +var Errors = Errors || (Errors = {}); (function (Errors) { var ConnectionError /* extends Error */ = /** @class */ (function () { function ConnectionError(request) { @@ -137,7 +137,7 @@ var Errors; return ConnectionError; }()); Errors.ConnectionError = ConnectionError; -})(Errors || (Errors = {})); +})(Errors); var FileService = /** @class */ (function () { function FileService() { } diff --git a/tests/baselines/reference/visSyntax.js b/tests/baselines/reference/visSyntax.js index 536ace5346ee7..4fe14b22eb27e 100644 --- a/tests/baselines/reference/visSyntax.js +++ b/tests/baselines/reference/visSyntax.js @@ -12,7 +12,7 @@ module M { //// [visSyntax.js] -var M; +var M = M || (M = {}); (function (M) { var C = /** @class */ (function () { function C() { @@ -21,4 +21,4 @@ var M; }()); M.C = C; M.x = 10; -})(M || (M = {})); +})(M); diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.js b/tests/baselines/reference/voidOperatorWithAnyOtherType.js index 64a65f763a66b..f9295f10bae8e 100644 --- a/tests/baselines/reference/voidOperatorWithAnyOtherType.js +++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.js @@ -80,9 +80,9 @@ var A = /** @class */ (function () { }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // any type var var ResultIsAny1 = void ANY1; diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.js b/tests/baselines/reference/voidOperatorWithBooleanType.js index a9a77a9a90629..b401dea7e0440 100644 --- a/tests/baselines/reference/voidOperatorWithBooleanType.js +++ b/tests/baselines/reference/voidOperatorWithBooleanType.js @@ -48,9 +48,9 @@ var A = /** @class */ (function () { A.foo = function () { return false; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // boolean type var var ResultIsAny1 = void BOOLEAN; diff --git a/tests/baselines/reference/voidOperatorWithEnumType.js b/tests/baselines/reference/voidOperatorWithEnumType.js index d11245b3475b9..5045e331bc907 100644 --- a/tests/baselines/reference/voidOperatorWithEnumType.js +++ b/tests/baselines/reference/voidOperatorWithEnumType.js @@ -24,16 +24,16 @@ void ENUM, ENUM1; //// [voidOperatorWithEnumType.js] // void operator on enum type -var ENUM; +var ENUM = ENUM || (ENUM = {}); (function (ENUM) { -})(ENUM || (ENUM = {})); +})(ENUM); ; -var ENUM1; +var ENUM1 = ENUM1 || (ENUM1 = {}); (function (ENUM1) { ENUM1[ENUM1["A"] = 0] = "A"; ENUM1[ENUM1["B"] = 1] = "B"; ENUM1[ENUM1[""] = 2] = ""; -})(ENUM1 || (ENUM1 = {})); +})(ENUM1); ; // enum type var var ResultIsAny1 = void ENUM; diff --git a/tests/baselines/reference/voidOperatorWithNumberType.js b/tests/baselines/reference/voidOperatorWithNumberType.js index 98e321573ad54..0c76b7c664d73 100644 --- a/tests/baselines/reference/voidOperatorWithNumberType.js +++ b/tests/baselines/reference/voidOperatorWithNumberType.js @@ -56,9 +56,9 @@ var A = /** @class */ (function () { A.foo = function () { return 1; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // number type var var ResultIsAny1 = void NUMBER; diff --git a/tests/baselines/reference/voidOperatorWithStringType.js b/tests/baselines/reference/voidOperatorWithStringType.js index 142c3cdecd62b..465f3dd35b25c 100644 --- a/tests/baselines/reference/voidOperatorWithStringType.js +++ b/tests/baselines/reference/voidOperatorWithStringType.js @@ -55,9 +55,9 @@ var A = /** @class */ (function () { A.foo = function () { return ""; }; return A; }()); -var M; +var M = M || (M = {}); (function (M) { -})(M || (M = {})); +})(M); var objA = new A(); // string type var var ResultIsAny1 = void STRING; diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index 97d528ecd62f6..074c7c74fa375 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -83,20 +83,20 @@ define(["require", "exports"], function (require, exports) { return simpleFunction(); } exports.exportedFunction = exportedFunction; - var m1; + var m1 = {}; (function (m1) { function foo() { return "Hello"; } m1.foo = foo; - })(m1 || (m1 = {})); - var m3; + })(m1); + var m3 = {}; (function (m3) { function foo() { return m1.foo(); } m3.foo = foo; - })(m3 = exports.m3 || (exports.m3 = {})); + })(m3); exports.eVar2 = 10; var eVar22; exports.eVar3 = 10; diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js index 2bf5879ec9b2c..441778c9801e6 100644 --- a/tests/baselines/reference/withImportDecl.js +++ b/tests/baselines/reference/withImportDecl.js @@ -73,13 +73,13 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m n: 2 }; } - var m1; + var m1 = {}; (function (m1) { function foo() { return "Hello"; } m1.foo = foo; - })(m1 || (m1 = {})); + })(m1); var b = new m3.A(); b.foo; }); diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js index 63ffc45411100..7731f6e3b20b0 100644 --- a/tests/baselines/reference/witness.js +++ b/tests/baselines/reference/witness.js @@ -239,12 +239,12 @@ var propAcc1 = { }; var propAcc1; // Property access of module member -var M2; +var M2 = M2 || (M2 = {}); (function (M2) { M2.x = M2.x; var y = M2.x; var y; -})(M2 || (M2 = {})); +})(M2); // Property access of class instance type var C2 = /** @class */ (function () { function C2() { diff --git a/tests/cases/compiler/exportDefaultClodule.ts b/tests/cases/compiler/exportDefaultClodule.ts new file mode 100644 index 0000000000000..19852d490b3ee --- /dev/null +++ b/tests/cases/compiler/exportDefaultClodule.ts @@ -0,0 +1,14 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default class A { + A1: string +} +export default namespace A { + export const A2 = 32; +} + +// @Filename: b.ts +import A from "./a"; + +const a = new A(); +const a2 = A.A2; \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultCloduleWithDifferentNames.ts b/tests/cases/compiler/exportDefaultCloduleWithDifferentNames.ts new file mode 100644 index 0000000000000..6bbeba0daa14c --- /dev/null +++ b/tests/cases/compiler/exportDefaultCloduleWithDifferentNames.ts @@ -0,0 +1,8 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default class A { + A1: string = "init" +} +export default namespace B { + export const A2 = 32; +} diff --git a/tests/cases/compiler/exportDefaultConstEnum.ts b/tests/cases/compiler/exportDefaultConstEnum.ts new file mode 100644 index 0000000000000..41c6abd92386f --- /dev/null +++ b/tests/cases/compiler/exportDefaultConstEnum.ts @@ -0,0 +1,13 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export +default +const +enum +A +{ FOO } + +// @Filename: b.ts +import A from './a'; + +const x = A.FOO; \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareAbstractClass.ts b/tests/cases/compiler/exportDefaultDeclareAbstractClass.ts new file mode 100644 index 0000000000000..b1326d72b670d --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareAbstractClass.ts @@ -0,0 +1,14 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare abstract class A { + foo(): number + } + +// @Filename: b.ts +import A from "./a"; + +class B extends A { + foo() { + return 0; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareClass.ts b/tests/cases/compiler/exportDefaultDeclareClass.ts new file mode 100644 index 0000000000000..e784927654895 --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareClass.ts @@ -0,0 +1,10 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare class A { + foo(): number + } + +// @Filename: b.ts +import A from "./a"; + +const x = new A().foo(); \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareConstEnum.ts b/tests/cases/compiler/exportDefaultDeclareConstEnum.ts new file mode 100644 index 0000000000000..c6296b987062b --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareConstEnum.ts @@ -0,0 +1,8 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare const enum A { FOO } + +// @Filename: b.ts +import A from "./a"; + +const x = A.FOO; \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareEnum.ts b/tests/cases/compiler/exportDefaultDeclareEnum.ts new file mode 100644 index 0000000000000..cdf14633b41f1 --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareEnum.ts @@ -0,0 +1,8 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare enum A { FOO } + +// @Filename: b.ts +import A from "./a"; + +const x = A.FOO; \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareFunction.ts b/tests/cases/compiler/exportDefaultDeclareFunction.ts new file mode 100644 index 0000000000000..ae4e3f1a00405 --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareFunction.ts @@ -0,0 +1,8 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare function A(): number; + +// @Filename: b.ts +import A from "./a"; + +const x: number = A(); \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareModule.ts b/tests/cases/compiler/exportDefaultDeclareModule.ts new file mode 100644 index 0000000000000..b07d294d1aae9 --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareModule.ts @@ -0,0 +1,13 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare module A { + export const A1: number; + export class A2 { + + } +} + +// @Filename: b.ts +import A from "./a"; + +const namespaceAUsage = A.A1 \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultDeclareNamespace.ts b/tests/cases/compiler/exportDefaultDeclareNamespace.ts new file mode 100644 index 0000000000000..827475926fbe6 --- /dev/null +++ b/tests/cases/compiler/exportDefaultDeclareNamespace.ts @@ -0,0 +1,13 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts +export default declare namespace A { + export const A1: number; + export class A2 { + + } +} + +// @Filename: b.ts +import A from "./a"; + +const namespaceAUsage = A.A1 \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleAMD.ts b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleAMD.ts new file mode 100644 index 0000000000000..1877ec9394b16 --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleAMD.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es2015 +// @module: amd +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleCommonJS.ts b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleCommonJS.ts new file mode 100644 index 0000000000000..baaedae94611b --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleCommonJS.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es2015 +// @module: commonjs +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleES2015.ts b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleES2015.ts new file mode 100644 index 0000000000000..81e7c558fbbce --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleES2015.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es2015 +// @module: es2015 +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleSystem.ts b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleSystem.ts new file mode 100644 index 0000000000000..74996532be7c1 --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES2015ModuleSystem.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es2015 +// @module: system +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES5ModuleAMD.ts b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleAMD.ts new file mode 100644 index 0000000000000..991e15a3bdd61 --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleAMD.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es5 +// @module: amd +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES5ModuleCommonJS.ts b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleCommonJS.ts new file mode 100644 index 0000000000000..53fe7143eb686 --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleCommonJS.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es5 +// @module: commonjs +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES5ModuleES2015.ts b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleES2015.ts new file mode 100644 index 0000000000000..e51dc1bc77981 --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleES2015.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es5 +// @module: es2015 +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultEnumTargetES5ModuleSystem.ts b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleSystem.ts new file mode 100644 index 0000000000000..80d0462dda7de --- /dev/null +++ b/tests/cases/compiler/exportDefaultEnumTargetES5ModuleSystem.ts @@ -0,0 +1,62 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @target: es5 +// @module: system +// @Filename: a.ts + +/** + * export default enum A 1 comment + */ +export default enum A { FOO } // export default enum A 1 trailing comment + +/** + * export default enum A 2 comment + */ +export default enum A { + BAR = 2 +} // export default enum A 2 trailing comment + +const enumAUsage = A.FOO; + +/** + * export enum B 1 comment + */ +export enum B { + X = 0, +} // export enum B 1 trailing comment + +// export enum B 2 comment +export enum B { + Y = 1 +} // export enum B 2 trailing comment + +const enumBUsage = B.Y + +namespace ns { + // enum ns.C 1 comment + export enum C { + X = 0 + } // enum ns.C 1 trailing comment + // enum ns.C 2 comment + export enum C { + Y = 1 + } // enum ns.C 2 trailing comment +} +namespace ns { + // enum ns.C 3 comment + export enum C { + Z = 2 + } // enum ns.C 3 trailing comment + + const enumCUSage1 = C.X; +} + +namespace ns { + const enumCUsage2 = C.X +} + +// @Filename: b.ts +import A, { B } from "./a"; + +const enumAExternalUsage1 = A.FOO; +const enumAExternalUsage2 = A[enumAExternalUsage1]; +const enumBExternalUsage1 = B.X; diff --git a/tests/cases/compiler/exportDefaultInvalidModifiers.ts b/tests/cases/compiler/exportDefaultInvalidModifiers.ts new file mode 100644 index 0000000000000..2fcef18f9f401 --- /dev/null +++ b/tests/cases/compiler/exportDefaultInvalidModifiers.ts @@ -0,0 +1,15 @@ +// @Filename: exportDefaultDeclareAbstractFunction.ts +export default declare abstract function(a: number): void + +// @Filename: exportDefaultDeclaresyncFunction.ts +export default declare async function(a: number): void + +// @Filename: exportDefaultDeclareStaticFunction.ts +export default declare static function(a: number): void + +// @Filename: exportDefaultStaticFunction.ts +export default static function(a: number): void + +// @Filename: exportDefaultAbstractConstEnum.ts +export default abstract const enum A {} + diff --git a/tests/cases/compiler/exportDefaultNamespace.ts b/tests/cases/compiler/exportDefaultNamespace.ts new file mode 100644 index 0000000000000..906785a2f95b5 --- /dev/null +++ b/tests/cases/compiler/exportDefaultNamespace.ts @@ -0,0 +1,78 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: a.ts + +/** + * namespace A 1 leading comment + */ +export default namespace A { + export const A1 = 42; +} // namespace A 1 trailing comment + +/** + * namespace A 2 leading comment + */ +export default namespace A { + export function A2() { + return 0xC0FFEE; + } +} // namespace A 2 trailing comment + +const namespaceAUsage1 = A.A1; + +/** + * namespace B 1 leading comment + */ +export namespace B { + export const B1 = 42; +} // namespace B 1 trailing comment + +/** + * namespace B 2 leading comment + */ +export namespace B { + export function B2() { + return 0xC0FFEE; + } +} // namespace B 2 trailing comment + +const namespaceBUsage1 = B.B2(); + +namespace ns { + /** + * namespace C 1 leading comment + */ + export namespace C { + export const C1 = 42; + } // namespace C 1 trailing comment + + /** + * namespace C 2 leading comment + */ + export namespace C { + export function C2() { + return 0xC0FFEE; + } + } // namespace C 2 trailing comment + + const namespaceCUsage1 = C.C1; +} + +namespace ns { + /** + * namespace C 3 leading comment + */ + export namespace C { + export class C3 { } + } // namespace C 3 trailing comment +} + +namespace ns { + const namespaceCUsage2 = C.C1; +} + + +// @Filename: b.ts +import A, { B } from './a'; + +const namespaceAExternalUsage1 = A.A1; +const namespaceBExternalUsage1 = B.B2; \ No newline at end of file diff --git a/tests/cases/compiler/exportDefaultType.ts b/tests/cases/compiler/exportDefaultType.ts new file mode 100644 index 0000000000000..ab04fe42d6743 --- /dev/null +++ b/tests/cases/compiler/exportDefaultType.ts @@ -0,0 +1,8 @@ +// https://github.com/Microsoft/TypeScript/issues/3792 +// @Filename: int.ts +export default type int = number + +// @Filename: b.ts +import int from "./int"; + +const intUsage: int = 23; \ No newline at end of file diff --git a/tests/cases/project/declarationsExportDefault.json b/tests/cases/project/declarationsExportDefault.json new file mode 100644 index 0000000000000..1c1fac2941c74 --- /dev/null +++ b/tests/cases/project/declarationsExportDefault.json @@ -0,0 +1,17 @@ +{ + "scenario": "declarations_ExportDefault", + "projectRoot": "tests/cases/projects/declarations_ExportDefault", + "declaration": true, + "baselineCheck": true, + "inputFiles": [ + "constEnum.ts", + "declareClass.ts", + "declareConstEnum.ts", + "declareEnum.ts", + "declareFunction.ts", + "declareNamespace.ts", + "enum.ts", + "namespace.ts", + "type.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/constEnum.ts b/tests/cases/projects/declarations_ExportDefault/constEnum.ts new file mode 100644 index 0000000000000..be12eaaf4d271 --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/constEnum.ts @@ -0,0 +1,3 @@ +export default const enum A { + FOO = 2 +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/declareClass.ts b/tests/cases/projects/declarations_ExportDefault/declareClass.ts new file mode 100644 index 0000000000000..27e44aef87e7b --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/declareClass.ts @@ -0,0 +1,3 @@ +export default declare class A { + FOO: 2 +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/declareConstEnum.ts b/tests/cases/projects/declarations_ExportDefault/declareConstEnum.ts new file mode 100644 index 0000000000000..64dd10ff65c4c --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/declareConstEnum.ts @@ -0,0 +1,4 @@ +export default declare const enum A { + FOO, + BAR +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/declareEnum.ts b/tests/cases/projects/declarations_ExportDefault/declareEnum.ts new file mode 100644 index 0000000000000..f32d209ee82f6 --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/declareEnum.ts @@ -0,0 +1,4 @@ +export default declare enum A { + FOO, + BAR +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/declareFunction.ts b/tests/cases/projects/declarations_ExportDefault/declareFunction.ts new file mode 100644 index 0000000000000..66260b58d87c1 --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/declareFunction.ts @@ -0,0 +1 @@ +export default declare function A(): string \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/declareNamespace.ts b/tests/cases/projects/declarations_ExportDefault/declareNamespace.ts new file mode 100644 index 0000000000000..c2d99a09289a4 --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/declareNamespace.ts @@ -0,0 +1,3 @@ +export default declare namespace A { + export const FOO: string +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/enum.ts b/tests/cases/projects/declarations_ExportDefault/enum.ts new file mode 100644 index 0000000000000..de92903d9deba --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/enum.ts @@ -0,0 +1,3 @@ +export default enum A { + FOO = 2 +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/namespace.ts b/tests/cases/projects/declarations_ExportDefault/namespace.ts new file mode 100644 index 0000000000000..9a1364b81af4a --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/namespace.ts @@ -0,0 +1,3 @@ +export default namespace A { + export const FOO: 2 +} \ No newline at end of file diff --git a/tests/cases/projects/declarations_ExportDefault/type.ts b/tests/cases/projects/declarations_ExportDefault/type.ts new file mode 100644 index 0000000000000..f6e7ab13d3d53 --- /dev/null +++ b/tests/cases/projects/declarations_ExportDefault/type.ts @@ -0,0 +1 @@ +export default type int = number; \ No newline at end of file